use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
+use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
use Symfony\Component\HttpKernel\Config\EnvParametersResource;
use Symfony\Component\HttpKernel\Config\FileLocator;
use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
-use Symfony\Component\HttpKernel\DependencyInjection\AddClassesToCachePass;
+use Symfony\Component\HttpKernel\DependencyInjection\AddAnnotatedClassesToCachePass;
use Symfony\Component\Config\Loader\LoaderResolver;
use Symfony\Component\Config\Loader\DelegatingLoader;
use Symfony\Component\Config\ConfigCache;
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-abstract class Kernel implements KernelInterface, TerminableInterface
+abstract class Kernel implements KernelInterface, RebootableInterface, TerminableInterface
{
/**
* @var BundleInterface[]
protected $startTime;
protected $loadClassCache;
- const VERSION = '3.2.13';
- const VERSION_ID = 30213;
+ private $projectDir;
+ private $warmupDir;
+ private $requestStackSize = 0;
+ private $resetServices = false;
+
+ const VERSION = '3.4.9';
+ const VERSION_ID = 30409;
const MAJOR_VERSION = 3;
- const MINOR_VERSION = 2;
- const RELEASE_VERSION = 13;
+ const MINOR_VERSION = 4;
+ const RELEASE_VERSION = 9;
const EXTRA_VERSION = '';
- const END_OF_MAINTENANCE = '07/2017';
- const END_OF_LIFE = '01/2018';
+ const END_OF_MAINTENANCE = '11/2020';
+ const END_OF_LIFE = '11/2021';
/**
- * Constructor.
- *
* @param string $environment The environment
* @param bool $debug Whether to enable debugging or not
*/
$this->booted = false;
$this->container = null;
+ $this->requestStackSize = 0;
+ $this->resetServices = false;
}
/**
public function boot()
{
if (true === $this->booted) {
+ if (!$this->requestStackSize && $this->resetServices) {
+ if ($this->container->has('services_resetter')) {
+ $this->container->get('services_resetter')->reset();
+ }
+ $this->resetServices = false;
+ }
+
return;
}
+ if ($this->debug && !isset($_ENV['SHELL_VERBOSITY']) && !isset($_SERVER['SHELL_VERBOSITY'])) {
+ putenv('SHELL_VERBOSITY=3');
+ $_ENV['SHELL_VERBOSITY'] = 3;
+ $_SERVER['SHELL_VERBOSITY'] = 3;
+ }
if ($this->loadClassCache) {
$this->doLoadClassCache($this->loadClassCache[0], $this->loadClassCache[1]);
$this->booted = true;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function reboot($warmupDir)
+ {
+ $this->shutdown();
+ $this->warmupDir = $warmupDir;
+ $this->boot();
+ }
+
/**
* {@inheritdoc}
*/
}
$this->container = null;
+ $this->requestStackSize = 0;
+ $this->resetServices = false;
}
/**
*/
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
{
- if (false === $this->booted) {
- $this->boot();
- }
+ $this->boot();
+ ++$this->requestStackSize;
+ $this->resetServices = true;
- return $this->getHttpKernel()->handle($request, $type, $catch);
+ try {
+ return $this->getHttpKernel()->handle($request, $type, $catch);
+ } finally {
+ --$this->requestStackSize;
+ }
}
/**
/**
* {@inheritdoc}
*/
- public function getBundle($name, $first = true)
+ public function getBundle($name, $first = true/*, $noDeprecation = false */)
{
+ $noDeprecation = false;
+ if (func_num_args() >= 3) {
+ $noDeprecation = func_get_arg(2);
+ }
+
+ if (!$first && !$noDeprecation) {
+ @trigger_error(sprintf('Passing "false" as the second argument to %s() is deprecated as of 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
+ }
+
if (!isset($this->bundleMap[$name])) {
throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, get_class($this)));
}
$isResource = 0 === strpos($path, 'Resources') && null !== $dir;
$overridePath = substr($path, 9);
$resourceBundle = null;
- $bundles = $this->getBundle($bundleName, false);
+ $bundles = $this->getBundle($bundleName, false, true);
$files = array();
foreach ($bundles as $bundle) {
return $this->rootDir;
}
+ /**
+ * Gets the application root dir (path of the project's composer file).
+ *
+ * @return string The project root dir
+ */
+ public function getProjectDir()
+ {
+ if (null === $this->projectDir) {
+ $r = new \ReflectionObject($this);
+ $dir = $rootDir = dirname($r->getFileName());
+ while (!file_exists($dir.'/composer.json')) {
+ if ($dir === dirname($dir)) {
+ return $this->projectDir = $rootDir;
+ }
+ $dir = dirname($dir);
+ }
+ $this->projectDir = $dir;
+ }
+
+ return $this->projectDir;
+ }
+
/**
* {@inheritdoc}
*/
*
* @param string $name The cache name prefix
* @param string $extension File extension of the resulting file
+ *
+ * @deprecated since version 3.3, to be removed in 4.0. The class cache is not needed anymore when using PHP 7.0.
*/
public function loadClassCache($name = 'classes', $extension = '.php')
{
+ if (\PHP_VERSION_ID >= 70000) {
+ @trigger_error(__METHOD__.'() is deprecated since Symfony 3.3, to be removed in 4.0.', E_USER_DEPRECATED);
+ }
+
$this->loadClassCache = array($name, $extension);
}
/**
* @internal
+ *
+ * @deprecated since version 3.3, to be removed in 4.0.
*/
public function setClassCache(array $classes)
{
- file_put_contents($this->getCacheDir().'/classes.map', sprintf('<?php return %s;', var_export($classes, true)));
+ if (\PHP_VERSION_ID >= 70000) {
+ @trigger_error(__METHOD__.'() is deprecated since Symfony 3.3, to be removed in 4.0.', E_USER_DEPRECATED);
+ }
+
+ file_put_contents(($this->warmupDir ?: $this->getCacheDir()).'/classes.map', sprintf('<?php return %s;', var_export($classes, true)));
}
/**
*/
public function setAnnotatedClassCache(array $annotatedClasses)
{
- file_put_contents($this->getCacheDir().'/annotations.map', sprintf('<?php return %s;', var_export($annotatedClasses, true)));
+ file_put_contents(($this->warmupDir ?: $this->getCacheDir()).'/annotations.map', sprintf('<?php return %s;', var_export($annotatedClasses, true)));
}
/**
return 'UTF-8';
}
+ /**
+ * @deprecated since version 3.3, to be removed in 4.0.
+ */
protected function doLoadClassCache($name, $extension)
{
- if (!$this->booted && is_file($this->getCacheDir().'/classes.map')) {
- ClassCollectionLoader::load(include($this->getCacheDir().'/classes.map'), $this->getCacheDir(), $name, $this->debug, false, $extension);
+ if (\PHP_VERSION_ID >= 70000) {
+ @trigger_error(__METHOD__.'() is deprecated since Symfony 3.3, to be removed in 4.0.', E_USER_DEPRECATED);
+ }
+ $cacheDir = $this->warmupDir ?: $this->getCacheDir();
+
+ if (!$this->booted && is_file($cacheDir.'/classes.map')) {
+ ClassCollectionLoader::load(include($cacheDir.'/classes.map'), $cacheDir, $name, $this->debug, false, $extension);
}
}
$this->bundles[$name] = $bundle;
if ($parentName = $bundle->getParent()) {
+ @trigger_error('Bundle inheritance is deprecated as of 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+
if (isset($directChildren[$parentName])) {
throw new \LogicException(sprintf('Bundle "%s" is directly extended by two bundles "%s" and "%s".', $parentName, $name, $directChildren[$parentName]));
}
}
}
+ /**
+ * The extension point similar to the Bundle::build() method.
+ *
+ * Use this method to register compiler passes and manipulate the container during the building process.
+ */
+ protected function build(ContainerBuilder $container)
+ {
+ }
+
/**
* Gets the container class.
*
protected function initializeContainer()
{
$class = $this->getContainerClass();
- $cache = new ConfigCache($this->getCacheDir().'/'.$class.'.php', $this->debug);
- $fresh = true;
- if (!$cache->isFresh()) {
+ $cacheDir = $this->warmupDir ?: $this->getCacheDir();
+ $cache = new ConfigCache($cacheDir.'/'.$class.'.php', $this->debug);
+ $oldContainer = null;
+ if ($fresh = $cache->isFresh()) {
+ // Silence E_WARNING to ignore "include" failures - don't use "@" to prevent silencing fatal errors
+ $errorLevel = error_reporting(\E_ALL ^ \E_WARNING);
+ $fresh = $oldContainer = false;
+ try {
+ if (\is_object($this->container = include $cache->getPath())) {
+ $this->container->set('kernel', $this);
+ $oldContainer = $this->container;
+ $fresh = true;
+ }
+ } catch (\Throwable $e) {
+ } catch (\Exception $e) {
+ } finally {
+ error_reporting($errorLevel);
+ }
+ }
+
+ if ($fresh) {
+ return;
+ }
+
+ if ($this->debug) {
+ $collectedLogs = array();
+ $previousHandler = defined('PHPUNIT_COMPOSER_INSTALL');
+ $previousHandler = $previousHandler ?: set_error_handler(function ($type, $message, $file, $line) use (&$collectedLogs, &$previousHandler) {
+ if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
+ return $previousHandler ? $previousHandler($type, $message, $file, $line) : false;
+ }
+
+ if (isset($collectedLogs[$message])) {
+ ++$collectedLogs[$message]['count'];
+
+ return;
+ }
+
+ $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
+ // Clean the trace by removing first frames added by the error handler itself.
+ for ($i = 0; isset($backtrace[$i]); ++$i) {
+ if (isset($backtrace[$i]['file'], $backtrace[$i]['line']) && $backtrace[$i]['line'] === $line && $backtrace[$i]['file'] === $file) {
+ $backtrace = array_slice($backtrace, 1 + $i);
+ break;
+ }
+ }
+
+ $collectedLogs[$message] = array(
+ 'type' => $type,
+ 'message' => $message,
+ 'file' => $file,
+ 'line' => $line,
+ 'trace' => $backtrace,
+ 'count' => 1,
+ );
+ });
+ }
+
+ try {
+ $container = null;
$container = $this->buildContainer();
$container->compile();
- $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
+ } finally {
+ if ($this->debug && true !== $previousHandler) {
+ restore_error_handler();
- $fresh = false;
+ file_put_contents($cacheDir.'/'.$class.'Deprecations.log', serialize(array_values($collectedLogs)));
+ file_put_contents($cacheDir.'/'.$class.'Compiler.log', null !== $container ? implode("\n", $container->getCompiler()->getLog()) : '');
+ }
}
- require_once $cache->getPath();
+ if (null === $oldContainer) {
+ $errorLevel = error_reporting(\E_ALL ^ \E_WARNING);
+ try {
+ $oldContainer = include $cache->getPath();
+ } catch (\Throwable $e) {
+ } catch (\Exception $e) {
+ } finally {
+ error_reporting($errorLevel);
+ }
+ }
+ $oldContainer = is_object($oldContainer) ? new \ReflectionClass($oldContainer) : false;
- $this->container = new $class();
+ $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
+ $this->container = require $cache->getPath();
$this->container->set('kernel', $this);
- if (!$fresh && $this->container->has('cache_warmer')) {
+ if ($oldContainer && get_class($this->container) !== $oldContainer->name) {
+ // Because concurrent requests might still be using them,
+ // old container files are not removed immediately,
+ // but on a next dump of the container.
+ static $legacyContainers = array();
+ $oldContainerDir = dirname($oldContainer->getFileName());
+ $legacyContainers[$oldContainerDir.'.legacy'] = true;
+ foreach (glob(dirname($oldContainerDir).DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) {
+ if (!isset($legacyContainers[$legacyContainer]) && @unlink($legacyContainer)) {
+ (new Filesystem())->remove(substr($legacyContainer, 0, -7));
+ }
+ }
+
+ touch($oldContainerDir.'.legacy');
+ }
+
+ if ($this->container->has('cache_warmer')) {
$this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'));
}
}
return array_merge(
array(
'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir,
+ 'kernel.project_dir' => realpath($this->getProjectDir()) ?: $this->getProjectDir(),
'kernel.environment' => $this->environment,
'kernel.debug' => $this->debug,
'kernel.name' => $this->name,
- 'kernel.cache_dir' => realpath($this->getCacheDir()) ?: $this->getCacheDir(),
+ 'kernel.cache_dir' => realpath($cacheDir = $this->warmupDir ?: $this->getCacheDir()) ?: $cacheDir,
'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
'kernel.bundles' => $bundles,
'kernel.bundles_metadata' => $bundlesMetadata,
'kernel.charset' => $this->getCharset(),
'kernel.container_class' => $this->getContainerClass(),
),
- $this->getEnvParameters()
+ $this->getEnvParameters(false)
);
}
* Only the parameters starting with "SYMFONY__" are considered.
*
* @return array An array of parameters
+ *
+ * @deprecated since version 3.3, to be removed in 4.0
*/
protected function getEnvParameters()
{
+ if (0 === func_num_args() || func_get_arg(0)) {
+ @trigger_error(sprintf('The %s() method is deprecated as of 3.3 and will be removed in 4.0. Use the %%env()%% syntax to get the value of any environment variable from configuration files instead.', __METHOD__), E_USER_DEPRECATED);
+ }
+
$parameters = array();
foreach ($_SERVER as $key => $value) {
if (0 === strpos($key, 'SYMFONY__')) {
+ @trigger_error(sprintf('The support of special environment variables that start with SYMFONY__ (such as "%s") is deprecated as of 3.3 and will be removed in 4.0. Use the %%env()%% syntax instead to get the value of environment variables in configuration files.', $key), E_USER_DEPRECATED);
$parameters[strtolower(str_replace('__', '.', substr($key, 9)))] = $value;
}
}
*/
protected function buildContainer()
{
- foreach (array('cache' => $this->getCacheDir(), 'logs' => $this->getLogDir()) as $name => $dir) {
+ foreach (array('cache' => $this->warmupDir ?: $this->getCacheDir(), 'logs' => $this->getLogDir()) as $name => $dir) {
if (!is_dir($dir)) {
if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
$container->merge($cont);
}
- $container->addCompilerPass(new AddClassesToCachePass($this));
+ $container->addCompilerPass(new AddAnnotatedClassesToCachePass($this));
$container->addResource(new EnvParametersResource('SYMFONY__'));
return $container;
/**
* Prepares the ContainerBuilder before it is compiled.
- *
- * @param ContainerBuilder $container A ContainerBuilder instance
*/
protected function prepareContainer(ContainerBuilder $container)
{
foreach ($this->bundles as $bundle) {
if ($extension = $bundle->getContainerExtension()) {
$container->registerExtension($extension);
- $extensions[] = $extension->getAlias();
}
if ($this->debug) {
$container->addObjectResource($bundle);
}
}
+
foreach ($this->bundles as $bundle) {
$bundle->build($container);
}
+ $this->build($container);
+
+ foreach ($container->getExtensions() as $extension) {
+ $extensions[] = $extension->getAlias();
+ }
+
// ensure these extensions are implicitly loaded
$container->getCompilerPassConfig()->setMergePass(new MergeExtensionConfigurationPass($extensions));
}
$container = new ContainerBuilder();
$container->getParameterBag()->add($this->getKernelParameters());
+ if ($this instanceof CompilerPassInterface) {
+ $container->addCompilerPass($this, PassConfig::TYPE_BEFORE_OPTIMIZATION, -10000);
+ }
if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator')) {
$container->setProxyInstantiator(new RuntimeInstantiator());
}
$dumper = new PhpDumper($container);
if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper')) {
- $dumper->setProxyDumper(new ProxyDumper(md5($cache->getPath())));
+ $dumper->setProxyDumper(new ProxyDumper());
}
- $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath(), 'debug' => $this->debug));
+ $content = $dumper->dump(array(
+ 'class' => $class,
+ 'base_class' => $baseClass,
+ 'file' => $cache->getPath(),
+ 'as_files' => true,
+ 'debug' => $this->debug,
+ 'inline_class_loader_parameter' => \PHP_VERSION_ID >= 70000 && !$this->loadClassCache && !class_exists(ClassCollectionLoader::class, false) ? 'container.dumper.inline_class_loader' : null,
+ 'build_time' => $container->hasParameter('kernel.container_build_time') ? $container->getParameter('kernel.container_build_time') : time(),
+ ));
+
+ $rootCode = array_pop($content);
+ $dir = dirname($cache->getPath()).'/';
+ $fs = new Filesystem();
- $cache->write($content, $container->getResources());
+ foreach ($content as $file => $code) {
+ $fs->dumpFile($dir.$file, $code);
+ @chmod($dir.$file, 0666 & ~umask());
+ }
+ @unlink(dirname($dir.$file).'.legacy');
+
+ $cache->write($rootCode, $container->getResources());
}
/**
* Returns a loader for the container.
*
- * @param ContainerInterface $container The service container
- *
* @return DelegatingLoader The loader
*/
protected function getContainerLoader(ContainerInterface $container)
new YamlFileLoader($container, $locator),
new IniFileLoader($container, $locator),
new PhpFileLoader($container, $locator),
+ new GlobFileLoader($container, $locator),
new DirectoryLoader($container, $locator),
new ClosureLoader($container),
));
do {
$token = $tokens[++$i];
$output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
- } while ($token[0] !== T_END_HEREDOC);
+ } while (T_END_HEREDOC !== $token[0]);
$rawChunk = '';
} elseif (T_WHITESPACE === $token[0]) {
if ($ignoreSpace) {
public function unserialize($data)
{
- list($environment, $debug) = unserialize($data);
+ if (\PHP_VERSION_ID >= 70000) {
+ list($environment, $debug) = unserialize($data, array('allowed_classes' => false));
+ } else {
+ list($environment, $debug) = unserialize($data);
+ }
$this->__construct($environment, $debug);
}
projects / yaffs-website / blobdiff