[HttpKernel] deprecated the Kernel name

fabpot · fabpot · commit 98ff750ee148 · 2018-10-15T17:39:36.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -367,7 +367,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
             } else {
                 $seed = '_'.$container->getParameter('kernel.root_dir');
             }
-            $seed .= '.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment').'.'.$container->getParameter('kernel.debug');
+            $seed .= '.'.$container->getParameter('kernel.container_class').'.'.$container->getParameter('kernel.environment').'.'.$container->getParameter('kernel.debug');
             $namespace = 'sf_'.$this->getMappingResourceExtension().'_'.$objectManagerName.'_'.ContainerBuilder::hash($seed);
 
             $cacheDriver['namespace'] = $namespace;
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -271,7 +271,7 @@ protected function createContainer(array $data = array())
             'kernel.cache_dir' => __DIR__,
             'kernel.debug' => false,
             'kernel.environment' => 'test',
-            'kernel.name' => 'kernel',
+            'kernel.container_class' => 'kernel',
             'kernel.root_dir' => __DIR__,
         ), $data)));
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -71,7 +71,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             array('<info>Kernel</>'),
             new TableSeparator(),
             array('Type', \get_class($kernel)),
-            array('Name', $kernel->getName()),
             array('Environment', $kernel->getEnvironment()),
             array('Debug', $kernel->isDebug() ? 'true' : 'false'),
             array('Charset', $kernel->getCharset()),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -148,7 +148,7 @@ public function all($namespace = null)
      */
     public function getLongVersion()
     {
-        return parent::getLongVersion().sprintf(' (kernel: <comment>%s</>, env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getName(), $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
+        return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
     }
 
     public function add(Command $command)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
@@ -30,7 +30,7 @@ public function testPoolRefsAreWeak()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('kernel.root_dir', 'foo');
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
@@ -35,7 +35,7 @@ public function testNamespaceArgumentIsReplaced()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('kernel.root_dir', 'foo');
         $adapter = new Definition();
@@ -57,7 +57,7 @@ public function testNamespaceArgumentIsNotReplacedIfArrayAdapterIsUsed()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.environment', 'prod');
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.root_dir', 'foo');
 
         $container->register('cache.adapter.array', ArrayAdapter::class)->addArgument(0);
@@ -75,7 +75,7 @@ public function testArgsAreReplaced()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('cache.prefix.seed', 'foo');
         $cachePool = new Definition();
@@ -100,7 +100,7 @@ public function testWithNameAttribute()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('cache.prefix.seed', 'foo');
         $cachePool = new Definition();
@@ -126,7 +126,7 @@ public function testThrowsExceptionWhenCachePoolTagHasUnknownAttributes()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('kernel.root_dir', 'foo');
         $adapter = new Definition();
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
@@ -46,13 +46,9 @@ public function __construct($varDir, $testCase, $rootConfig, $environment, $debu
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getContainerClass()
     {
-        if (null === $this->name) {
-            $this->name = parent::getName().substr(md5($this->rootConfig), -16);
-        }
-
-        return $this->name;
+        return parent::getContainerClass().substr(md5($this->rootConfig), -16);
     }
 
     public function registerBundles()
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -50,13 +50,6 @@
                 </span>
             </div>
 
-            {% if 'n/a' is not same as(collector.appname) %}
-                <div class="sf-toolbar-info-piece">
-                    <b>Kernel name</b>
-                    <span>{{ collector.appname }}</span>
-                </div>
-            {% endif %}
-
             {% if 'n/a' is not same as(collector.env) %}
                 <div class="sf-toolbar-info-piece">
                     <b>Environment</b>
diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
@@ -52,7 +52,7 @@ public function process(ContainerBuilder $container)
         } else {
             $seed = '_'.$container->getParameter('kernel.root_dir');
         }
-        $seed .= '.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment');
+        $seed .= '.'.$container->getParameter('kernel.container_class').'.'.$container->getParameter('kernel.environment');
 
         $pools = array();
         $clearers = array();
diff --git a/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolClearerPassTest.php b/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolClearerPassTest.php
@@ -27,7 +27,7 @@ public function testPoolRefsAreWeak()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('kernel.root_dir', 'foo');
 
diff --git a/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php b/src/Symfony/Component/Cache/Tests/DependencyInjection/CachePoolPassTest.php
@@ -32,7 +32,7 @@ public function testNamespaceArgumentIsReplaced()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('kernel.root_dir', 'foo');
         $adapter = new Definition();
@@ -54,7 +54,7 @@ public function testNamespaceArgumentIsNotReplacedIfArrayAdapterIsUsed()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.environment', 'prod');
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.root_dir', 'foo');
 
         $container->register('cache.adapter.array', ArrayAdapter::class)->addArgument(0);
@@ -72,7 +72,7 @@ public function testArgsAreReplaced()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('cache.prefix.seed', 'foo');
         $cachePool = new Definition();
@@ -97,7 +97,7 @@ public function testWithNameAttribute()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('cache.prefix.seed', 'foo');
         $cachePool = new Definition();
@@ -123,7 +123,7 @@ public function testThrowsExceptionWhenCachePoolTagHasUnknownAttributes()
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
-        $container->setParameter('kernel.name', 'app');
+        $container->setParameter('kernel.container_class', 'app');
         $container->setParameter('kernel.environment', 'prod');
         $container->setParameter('kernel.root_dir', 'foo');
         $adapter = new Definition();
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+4.2.0
+-----
+
+ * deprecated `KernelInterface::getName()` and the `kernel.name` parameter
+
 4.1.0
 -----
 
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -60,7 +60,7 @@ public function collect(Request $request, Response $response, \Exception $except
             'token' => $response->headers->get('X-Debug-Token'),
             'symfony_version' => Kernel::VERSION,
             'symfony_state' => 'unknown',
-            'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
+            'name' => 'n/a',
             'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
             'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
             'php_version' => PHP_VERSION,
@@ -227,6 +227,8 @@ public function getPhpTimezone()
      * Gets the application name.
      *
      * @return string The application name
+     *
+     * @deprecated since Symfony 4.2
      */
     public function getAppName()
     {
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -55,6 +55,9 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     protected $environment;
     protected $debug;
     protected $booted = false;
+    /**
+     * @deprecated since Symfony 4.2
+     */
     protected $name;
     protected $startTime;
 
@@ -78,7 +81,7 @@ public function __construct(string $environment, bool $debug)
         $this->environment = $environment;
         $this->debug = $debug;
         $this->rootDir = $this->getRootDir();
-        $this->name = $this->getName();
+        $this->name = $this->getName(false);
     }
 
     public function __clone()
@@ -268,8 +271,12 @@ public function locateResource($name, $dir = null, $first = true)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getName(/* $triggerDeprecation = true */)
     {
+        if (0 === \func_num_args() || func_get_arg(0)) {
+            @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         if (null === $this->name) {
             $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));
             if (ctype_digit($this->name[0])) {
@@ -421,7 +428,7 @@ protected function build(ContainerBuilder $container)
      */
     protected function getContainerClass()
     {
-        return $this->name.ucfirst($this->environment).($this->debug ? 'Debug' : '').'ProjectContainer';
+        return str_replace('\\', '_', \get_class($this)).ucfirst($this->environment).($this->debug ? 'Debug' : '').'Container';
     }
 
     /**
@@ -576,6 +583,9 @@ protected function getKernelParameters()
             'kernel.project_dir' => realpath($this->getProjectDir()) ?: $this->getProjectDir(),
             'kernel.environment' => $this->environment,
             'kernel.debug' => $this->debug,
+            /*
+             * @deprecated since Symfony 4.2
+             */
             'kernel.name' => $this->name,
             'kernel.cache_dir' => realpath($cacheDir = $this->warmupDir ?: $this->getCacheDir()) ?: $cacheDir,
             'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php
@@ -100,6 +100,8 @@ public function locateResource($name, $dir = null, $first = true);
      * Gets the name of the kernel.
      *
      * @return string The kernel name
+     *
+     * @deprecated since Symfony 4.2
      */
     public function getName();
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -30,7 +30,7 @@ public function testCollect()
         $this->assertSame('test', $c->getEnv());
         $this->assertTrue($c->isDebug());
         $this->assertSame('config', $c->getName());
-        $this->assertSame('testkernel', $c->getAppName());
+        $this->assertSame('n/a', $c->getAppName());
         $this->assertRegExp('~^'.preg_quote($c->getPhpVersion(), '~').'~', PHP_VERSION);
         $this->assertRegExp('~'.preg_quote((string) $c->getPhpVersionExtra(), '~').'$~', PHP_VERSION);
         $this->assertSame(PHP_INT_SIZE * 8, $c->getPhpArchitecture());
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -75,7 +75,7 @@ public function testInitializeContainerClearsOldContainers()
         $kernel->boot();
 
         $containerDir = __DIR__.'/Fixtures/cache/custom/'.substr(\get_class($kernel->getContainer()), 0, 16);
-        $this->assertTrue(unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta'));
+        $this->assertTrue(unlink(__DIR__.'/Fixtures/cache/custom/FixturesSymfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta'));
         $this->assertFileExists($containerDir);
         $this->assertFileNotExists($containerDir.'.legacy');
 
@@ -302,13 +302,19 @@ public function testGetRootDir()
         $this->assertEquals(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures', realpath($kernel->getRootDir()));
     }
 
+    /**
+     * @group legacy
+     */
     public function testGetName()
     {
         $kernel = new KernelForTest('test', true);
 
         $this->assertEquals('Fixtures', $kernel->getName());
     }
 
+    /**
+     * @group legacy
+     */
     public function testOverrideGetName()
     {
         $kernel = new KernelForOverrideName('test', true);
@@ -506,6 +512,9 @@ public function testKernelWithoutBundles()
         $this->assertTrue($kernel->getContainer()->getParameter('test_executed'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testKernelRootDirNameStartingWithANumber()
     {
         $dir = __DIR__.'/Fixtures/123';
@@ -532,14 +541,14 @@ public function testKernelReset()
 
         $containerClass = \get_class($kernel->getContainer());
         $containerFile = (new \ReflectionClass($kernel->getContainer()))->getFileName();
-        unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta');
+        unlink(__DIR__.'/Fixtures/cache/custom/FixturesSymfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta');
 
         $kernel = new CustomProjectDirKernel();
         $kernel->boot();
 
         $this->assertInstanceOf($containerClass, $kernel->getContainer());
         $this->assertFileExists($containerFile);
-        unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta');
+        unlink(__DIR__.'/Fixtures/cache/custom/FixturesSymfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta');
 
         $kernel = new CustomProjectDirKernel(function ($container) { $container->register('foo', 'stdClass')->setPublic(true); });
         $kernel->boot();
@@ -707,9 +716,9 @@ class CustomProjectDirKernel extends Kernel
     private $buildContainer;
     private $httpKernel;
 
-    public function __construct(\Closure $buildContainer = null, HttpKernelInterface $httpKernel = null, $name = 'custom')
+    public function __construct(\Closure $buildContainer = null, HttpKernelInterface $httpKernel = null, $env = 'custom')
     {
-        parent::__construct($name, true);
+        parent::__construct($env, true);
 
         $this->baseDir = 'foo';
         $this->buildContainer = $buildContainer;
@@ -725,6 +734,11 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     {
     }
 
+    protected function getContainerClass()
+    {
+        return $this->name.parent::getContainerClass();
+    }
+
     public function getProjectDir()
     {
         return $this->baseDir;

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD`
`367`	`367`	`} else {`
`368`	`368`	`$seed = '_'.$container->getParameter('kernel.root_dir');`
`369`	`369`	`}`
`370`		`- $seed .= '.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment').'.'.$container->getParameter('kernel.debug');`
	`370`	`+ $seed .= '.'.$container->getParameter('kernel.container_class').'.'.$container->getParameter('kernel.environment').'.'.$container->getParameter('kernel.debug');`
`371`	`371`	`$namespace = 'sf_'.$this->getMappingResourceExtension().'_'.$objectManagerName.'_'.ContainerBuilder::hash($seed);`
`372`	`372`
`373`	`373`	`$cacheDriver['namespace'] = $namespace;`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ protected function createContainer(array $data = array())`
`271`	`271`	`'kernel.cache_dir' => __DIR__,`
`272`	`272`	`'kernel.debug' => false,`
`273`	`273`	`'kernel.environment' => 'test',`
`274`		`- 'kernel.name' => 'kernel',`
	`274`	`+ 'kernel.container_class' => 'kernel',`
`275`	`275`	`'kernel.root_dir' => __DIR__,`
`276`	`276`	`), $data)));`
`277`	`277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function all($namespace = null)`
`148`	`148`	`*/`
`149`	`149`	`public function getLongVersion()`
`150`	`150`	`{`
`151`		`- return parent::getLongVersion().sprintf(' (kernel: <comment>%s</>, env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getName(), $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');`
	`151`	`+ return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`public function add(Command $command)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function testPoolRefsAreWeak()`
`30`	`30`	`{`
`31`	`31`	`$container = new ContainerBuilder();`
`32`	`32`	`$container->setParameter('kernel.debug', false);`
`33`		`- $container->setParameter('kernel.name', 'app');`
	`33`	`+ $container->setParameter('kernel.container_class', 'app');`
`34`	`34`	`$container->setParameter('kernel.environment', 'prod');`
`35`	`35`	`$container->setParameter('kernel.root_dir', 'foo');`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function process(ContainerBuilder $container)`
`52`	`52`	`} else {`
`53`	`53`	`$seed = '_'.$container->getParameter('kernel.root_dir');`
`54`	`54`	`}`
`55`		`- $seed .= '.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment');`
	`55`	`+ $seed .= '.'.$container->getParameter('kernel.container_class').'.'.$container->getParameter('kernel.environment');`
`56`	`56`
`57`	`57`	`$pools = array();`
`58`	`58`	`$clearers = array();`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function testPoolRefsAreWeak()`
`27`	`27`	`{`
`28`	`28`	`$container = new ContainerBuilder();`
`29`	`29`	`$container->setParameter('kernel.debug', false);`
`30`		`- $container->setParameter('kernel.name', 'app');`
	`30`	`+ $container->setParameter('kernel.container_class', 'app');`
`31`	`31`	`$container->setParameter('kernel.environment', 'prod');`
`32`	`32`	`$container->setParameter('kernel.root_dir', 'foo');`
`33`	`33`