[HttpKernel] add "kernel.mode" for build-time env, keep "kernel.environment" for the runtime env

nicolas-grekas · nicolas-grekas · commit 6888c01419a5 · 2020-07-15T14:05:58.000+02:00
diff --git a/UPGRADE-5.2.md b/UPGRADE-5.2.md
@@ -6,6 +6,13 @@ DependencyInjection
 
  * Deprecated `Definition::setPrivate()` and `Alias::setPrivate()`, use `setPublic()` instead
 
+HttpKernel
+----------
+
+ * Deprecated the `Kernel::$environment` property, use `Kernel::$mode` instead
+ * Deprecated the `KernelInterface::getEnvironment()` method, use `KernelInterface::getMode()` instead
+ * Deprecated the `ConfigDataCollector::getEnv()` method, use `ConfigDataCollector::getMode()` instead
+
 Mime
 ----
 
diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
@@ -68,6 +68,9 @@ HttpKernel
 
  * Made `WarmableInterface::warmUp()` return a list of classes or files to preload on PHP 7.4+
  * Removed support for `service:action` syntax to reference controllers. Use `serviceOrFqcn::method` instead.
+ * Removed the `Kernel::$environment` property, use `Kernel::$mode` instead
+ * Removed the `KernelInterface::getEnvironment()` method, use `KernelInterface::getMode()` instead
+ * Removed the `ConfigDataCollector::getEnv()` method, use `ConfigDataCollector::getMode()` instead
 
 Inflector
 ---------
diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -27,6 +27,7 @@ class AppVariable
     private $tokenStorage;
     private $requestStack;
     private $environment;
+    private $mode;
     private $debug;
 
     public function setTokenStorage(TokenStorageInterface $tokenStorage)
@@ -44,6 +45,11 @@ public function setEnvironment(string $environment)
         $this->environment = $environment;
     }
 
+    public function setMode(string $mode): void
+    {
+        $this->mode = $mode;
+    }
+
     public function setDebug(bool $debug)
     {
         $this->debug = $debug;
@@ -130,6 +136,18 @@ public function getEnvironment()
         return $this->environment;
     }
 
+    /**
+     * Returns the current app mode name (e.g 'dev').
+     */
+    public function getMode(): string
+    {
+        if (null === $this->mode) {
+            throw new \RuntimeException('The "app.mode" variable is not available.');
+        }
+
+        return $this->mode;
+    }
+
     /**
      * Returns the current app debug mode.
      *
diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -45,6 +45,13 @@ public function testEnvironment()
         $this->assertEquals('dev', $this->appVariable->getEnvironment());
     }
 
+    public function testMode()
+    {
+        $this->appVariable->setMode('dev');
+
+        $this->assertEquals('dev', $this->appVariable->getMode());
+    }
+
     /**
      * @runInSeparateProcess
      */
@@ -120,6 +127,12 @@ public function testEnvironmentNotSet()
         $this->appVariable->getEnvironment();
     }
 
+    public function testModeNotSet()
+    {
+        $this->expectException('RuntimeException');
+        $this->appVariable->getMode();
+    }
+
     public function testDebugNotSet()
     {
         $this->expectException('RuntimeException');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ['<info>Kernel</>'],
             new TableSeparator(),
             ['Type', \get_class($kernel)],
-            ['Environment', $kernel->getEnvironment()],
+            ['Mode', $kernel->getMode()],
             ['Debug', $kernel->isDebug() ? 'true' : 'false'],
             ['Charset', $kernel->getCharset()],
             ['Cache directory', self::formatPath($kernel->getCacheDir(), $kernel->getProjectDir()).' (<comment>'.self::formatFileSize($kernel->getCacheDir()).'</>)'],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -60,11 +60,11 @@ protected function configure()
             ])
             ->setDescription('Clears the cache')
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> command clears the application cache for a given environment
+The <info>%command.name%</info> command clears the application cache for a given mode
 and debug mode:
 
-  <info>php %command.full_name% --env=dev</info>
-  <info>php %command.full_name% --env=prod --no-debug</info>
+  <info>php %command.full_name% --mode=dev</info>
+  <info>php %command.full_name% --mode=prod --no-debug</info>
 EOF
             )
         ;
@@ -89,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realCacheDir));
         }
 
-        $io->comment(sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->comment(sprintf('Clearing the cache for the <info>%s</info> mode with debug <info>%s</info>', $kernel->getMode(), var_export($kernel->isDebug(), true)));
         $this->cacheClearer->clear($realCacheDir);
 
         // The current event dispatcher is stale, let's not use it anymore
@@ -179,7 +179,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $io->comment('Finished');
         }
 
-        $io->success(sprintf('Cache for the "%s" environment (debug=%s) was successfully cleared.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->success(sprintf('Cache for the "%s" mode (debug=%s) was successfully cleared.', $kernel->getMode(), var_export($kernel->isDebug(), true)));
 
         return 0;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io = new SymfonyStyle($input, $output);
 
         $kernel = $this->getApplication()->getKernel();
-        $io->comment(sprintf('Warming up the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->comment(sprintf('Warming up the cache for the <info>%s</info> mode with debug <info>%s</info>', $kernel->getMode(), var_export($kernel->isDebug(), true)));
 
         if (!$input->getOption('no-optional-warmers')) {
             $this->cacheWarmer->enableOptionalWarmers();
@@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             Preloader::append($preloadFile, $preload);
         }
 
-        $io->success(sprintf('Cache for the "%s" environment (debug=%s) was successfully warmed.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->success(sprintf('Cache for the "%s" mode (debug=%s) was successfully warmed.', $kernel->getMode(), var_export($kernel->isDebug(), true)));
 
         return 0;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -85,7 +85,7 @@ protected function configure()
 
 Display a specific environment variable by specifying its name with the <info>--env-var</info> option:
 
-  <info>php %command.full_name% --env-var=APP_ENV</info>
+  <info>php %command.full_name% --env-var=APP_MODE</info>
 
 Use the --tags option to display tagged <comment>public</comment> services grouped by tag:
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -41,6 +41,7 @@ public function __construct(KernelInterface $kernel)
 
         $inputDefinition = $this->getDefinition();
         $inputDefinition->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'The Environment name.', $kernel->getEnvironment()));
+        $inputDefinition->addOption(new InputOption('--mode', null, InputOption::VALUE_REQUIRED, 'The Mode name.', $kernel->getMode()));
         $inputDefinition->addOption(new InputOption('--no-debug', null, InputOption::VALUE_NONE, 'Switches off debug mode.'));
     }
 
@@ -147,7 +148,7 @@ public function all($namespace = null)
      */
     public function getLongVersion()
     {
-        return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
+        return parent::getLongVersion().sprintf(' (mode: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getMode(), $this->kernel->isDebug() ? 'true' : 'false');
     }
 
     public function add(Command $command)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -69,7 +69,7 @@ trait MicroKernelTrait
     public function getCacheDir(): string
     {
         if (isset($_SERVER['APP_CACHE_DIR'])) {
-            return $_SERVER['APP_CACHE_DIR'].'/'.$this->environment;
+            return $_SERVER['APP_CACHE_DIR'].'/'.$this->mode;
         }
 
         return parent::getCacheDir();
@@ -90,7 +90,7 @@ public function registerBundles(): iterable
     {
         $contents = require $this->getProjectDir().'/config/bundles.php';
         foreach ($contents as $class => $envs) {
-            if ($envs[$this->environment] ?? $envs['all'] ?? false) {
+            if ($envs[$this->mode] ?? $envs['all'] ?? false) {
                 yield new $class();
             }
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -104,6 +104,10 @@ protected static function createKernel(array $options = [])
 
         if (isset($options['environment'])) {
             $env = $options['environment'];
+        } elseif (isset($_ENV['APP_MODE'])) {
+            $env = $_ENV['APP_MODE'];
+        } elseif (isset($_SERVER['APP_MODE'])) {
+            $env = $_SERVER['APP_MODE'];
         } elseif (isset($_ENV['APP_ENV'])) {
             $env = $_ENV['APP_ENV'];
         } elseif (isset($_SERVER['APP_ENV'])) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1477,6 +1477,7 @@ protected function createContainer(array $data = [])
             'kernel.project_dir' => __DIR__,
             'kernel.debug' => false,
             'kernel.environment' => 'test',
+            'kernel.mode' => 'test',
             'kernel.name' => 'kernel',
             'kernel.container_class' => 'testContainer',
             'container.build_hash' => 'Abc1234',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
@@ -64,7 +64,7 @@ public function getProjectDir(): string
 
     public function getCacheDir(): string
     {
-        return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/cache/'.$this->environment;
+        return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/cache/'.$this->mode;
     }
 
     public function getLogDir(): string
@@ -89,7 +89,7 @@ public function __sleep(): array
 
     public function __wakeup()
     {
-        $this->__construct($this->varDir, $this->testCase, $this->rootConfig, $this->environment, $this->debug);
+        $this->__construct($this->varDir, $this->testCase, $this->rootConfig, $this->mode, $this->debug);
     }
 
     protected function getKernelParameters(): array
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
@@ -22,12 +22,14 @@
  */
 class AppKernel extends Kernel
 {
+    protected $mode;
+
     private $varDir;
     private $testCase;
     private $rootConfig;
     private $authenticatorManagerEnabled;
 
-    public function __construct($varDir, $testCase, $rootConfig, $environment, $debug, $authenticatorManagerEnabled = false)
+    public function __construct($varDir, $testCase, $rootConfig, $mode, $debug, $authenticatorManagerEnabled = false)
     {
         if (!is_dir(__DIR__.'/'.$testCase)) {
             throw new \InvalidArgumentException(sprintf('The test case "%s" does not exist.', $testCase));
@@ -42,7 +44,8 @@ public function __construct($varDir, $testCase, $rootConfig, $environment, $debu
         $this->rootConfig = $rootConfig;
         $this->authenticatorManagerEnabled = $authenticatorManagerEnabled;
 
-        parent::__construct($environment, $debug);
+        $this->mode = $mode;
+        parent::__construct($mode, $debug);
     }
 
     /**
@@ -69,7 +72,7 @@ public function getProjectDir(): string
 
     public function getCacheDir(): string
     {
-        return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/cache/'.$this->environment;
+        return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/cache/'.$this->mode;
     }
 
     public function getLogDir(): string
@@ -92,7 +95,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
     public function serialize()
     {
-        return serialize([$this->varDir, $this->testCase, $this->rootConfig, $this->getEnvironment(), $this->isDebug()]);
+        return serialize([$this->varDir, $this->testCase, $this->rootConfig, $this->mode, $this->isDebug()]);
     }
 
     public function unserialize($str)
diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 5.2.0
 -----
 
+ * the `app.env` variable is now runtime-dependent when the `APP_RUNTIME_ENV` env var is defined
+ * added the `app.mode` variable: it's the build-time equivalent of `app.env`
  * deprecated the public `twig` service to private
 
 5.0.0
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
@@ -70,6 +70,7 @@
 
         ->set('twig.app_variable', AppVariable::class)
             ->call('setEnvironment', [param('kernel.environment')])
+            ->call('setMode', [param('kernel.mode')])
             ->call('setDebug', [param('kernel.debug')])
             ->call('setTokenStorage', [service('security.token_storage')->ignoreOnInvalid()])
             ->call('setRequestStack', [service('request_stack')->ignoreOnInvalid()])
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -246,6 +246,7 @@ public function testRuntimeLoader()
         $container->registerExtension(new TwigExtension());
         $container->loadFromExtension('twig');
         $container->setParameter('kernel.environment', 'test');
+        $container->setParameter('kernel.mode', 'test');
         $container->setParameter('debug.file_link_format', 'test');
         $container->setParameter('foo', 'FooClass');
         $container->register('http_kernel', 'FooClass');
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php
@@ -69,7 +69,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
     public function getCacheDir(): string
     {
-        return sys_get_temp_dir().'/'.Kernel::VERSION.'/EmptyAppKernel/cache/'.$this->environment;
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/EmptyAppKernel/cache/'.$this->mode;
     }
 
     public function getLogDir(): string
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
@@ -77,7 +77,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
     public function getCacheDir(): string
     {
-        return sys_get_temp_dir().'/'.Kernel::VERSION.'/NoTemplatingEntryKernel/cache/'.$this->environment;
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/NoTemplatingEntryKernel/cache/'.$this->mode;
     }
 
     public function getLogDir(): string
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -20,7 +20,7 @@
         "symfony/config": "^4.4|^5.0",
         "symfony/twig-bridge": "^5.0",
         "symfony/http-foundation": "^4.4|^5.0",
-        "symfony/http-kernel": "^5.0",
+        "symfony/http-kernel": "^5.2",
         "symfony/polyfill-ctype": "~1.8",
         "twig/twig": "^2.10|^3.0"
     },
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -38,7 +38,14 @@
                 </span>
             </div>
 
-            {% if 'n/a' is not same as(collector.env) %}
+            {% if collector.mode is defined %}
+                {% if 'n/a' is not same as(collector.mode) %}
+                    <div class="sf-toolbar-info-piece">
+                        <b>Mode</b>
+                        <span>{{ collector.mode }}</span>
+                    </div>
+                {% endif %}
+            {% elseif 'n/a' is not same as(collector.env) %}
                 <div class="sf-toolbar-info-piece">
                     <b>Environment</b>
                     <span>{{ collector.env }}</span>
@@ -116,7 +123,14 @@
             <span class="label">Symfony version</span>
         </div>
 
-        {% if 'n/a' != collector.env %}
+        {% if collector.mode is defined %}
+            {% if 'n/a' is not same as(collector.mode) %}
+                <div class="metric">
+                    <span class="value">{{ collector.mode }}</span>
+                    <span class="label">Mode</span>
+                </div>
+            {% endif %}
+        {% elseif 'n/a' != collector.env %}
             <div class="metric">
                 <span class="value">{{ collector.env }}</span>
                 <span class="label">Environment</span>
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -8,6 +8,11 @@ CHANGELOG
  * made the public `http_cache` service handle requests when available
  * allowed enabling trusted hosts and proxies using new `kernel.trusted_hosts`,
    `kernel.trusted_proxies` and `kernel.trusted_headers` parameters
+ * made parameter `kernel.environment` runtime-dependent when the `APP_RUNTIME_ENV` env var is set
+ * added parameter `kernel.mode`: it's the build-time equivalent of `kernel.environment`
+ * deprecated the `Kernel::$environment` property, use `Kernel::$mode` instead
+ * deprecated the `KernelInterface::getEnvironment()` method, use `KernelInterface::getMode()` instead
+ * deprecated the `ConfigDataCollector::getEnv()` method, use `ConfigDataCollector::getMode()` instead
 
 5.1.0
 -----
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ protected function configure()`
`60`	`60`	`])`
`61`	`61`	`->setDescription('Clears the cache')`
`62`	`62`	`->setHelp(<<<'EOF'`
`63`		`-The <info>%command.name%</info> command clears the application cache for a given environment`
	`63`	`+The <info>%command.name%</info> command clears the application cache for a given mode`
`64`	`64`	`and debug mode:`
`65`	`65`
`66`		`- <info>php %command.full_name% --env=dev</info>`
`67`		`- <info>php %command.full_name% --env=prod --no-debug</info>`
	`66`	`+ <info>php %command.full_name% --mode=dev</info>`
	`67`	`+ <info>php %command.full_name% --mode=prod --no-debug</info>`
`68`	`68`	`EOF`
`69`	`69`	`)`
`70`	`70`	`;`
`@@ -89,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`89`	`89`	`throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realCacheDir));`
`90`	`90`	`}`
`91`	`91`
`92`		`- $io->comment(sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));`
	`92`	`+ $io->comment(sprintf('Clearing the cache for the <info>%s</info> mode with debug <info>%s</info>', $kernel->getMode(), var_export($kernel->isDebug(), true)));`
`93`	`93`	`$this->cacheClearer->clear($realCacheDir);`
`94`	`94`
`95`	`95`	`// The current event dispatcher is stale, let's not use it anymore`
`@@ -179,7 +179,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`179`	`179`	`$io->comment('Finished');`
`180`	`180`	`}`
`181`	`181`
`182`		`- $io->success(sprintf('Cache for the "%s" environment (debug=%s) was successfully cleared.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));`
	`182`	`+ $io->success(sprintf('Cache for the "%s" mode (debug=%s) was successfully cleared.', $kernel->getMode(), var_export($kernel->isDebug(), true)));`
`183`	`183`
`184`	`184`	`return 0;`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`72`	`72`	`$io = new SymfonyStyle($input, $output);`
`73`	`73`
`74`	`74`	`$kernel = $this->getApplication()->getKernel();`
`75`		`- $io->comment(sprintf('Warming up the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));`
	`75`	`+ $io->comment(sprintf('Warming up the cache for the <info>%s</info> mode with debug <info>%s</info>', $kernel->getMode(), var_export($kernel->isDebug(), true)));`
`76`	`76`
`77`	`77`	`if (!$input->getOption('no-optional-warmers')) {`
`78`	`78`	`$this->cacheWarmer->enableOptionalWarmers();`
`@@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`84`	`84`	`Preloader::append($preloadFile, $preload);`
`85`	`85`	`}`
`86`	`86`
`87`		`- $io->success(sprintf('Cache for the "%s" environment (debug=%s) was successfully warmed.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));`
	`87`	`+ $io->success(sprintf('Cache for the "%s" mode (debug=%s) was successfully warmed.', $kernel->getMode(), var_export($kernel->isDebug(), true)));`
`88`	`88`
`89`	`89`	`return 0;`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public function __construct(KernelInterface $kernel)`
`41`	`41`
`42`	`42`	`$inputDefinition = $this->getDefinition();`
`43`	`43`	`$inputDefinition->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'The Environment name.', $kernel->getEnvironment()));`
	`44`	`+ $inputDefinition->addOption(new InputOption('--mode', null, InputOption::VALUE_REQUIRED, 'The Mode name.', $kernel->getMode()));`
`44`	`45`	`$inputDefinition->addOption(new InputOption('--no-debug', null, InputOption::VALUE_NONE, 'Switches off debug mode.'));`
`45`	`46`	`}`
`46`	`47`
`@@ -147,7 +148,7 @@ public function all($namespace = null)`
`147`	`148`	`*/`
`148`	`149`	`public function getLongVersion()`
`149`	`150`	`{`
`150`		`- return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');`
	`151`	`+ return parent::getLongVersion().sprintf(' (mode: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getMode(), $this->kernel->isDebug() ? 'true' : 'false');`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`public function add(Command $command)`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ trait MicroKernelTrait`
`69`	`69`	`public function getCacheDir(): string`
`70`	`70`	`{`
`71`	`71`	`if (isset($_SERVER['APP_CACHE_DIR'])) {`
`72`		`- return $_SERVER['APP_CACHE_DIR'].'/'.$this->environment;`
	`72`	`+ return $_SERVER['APP_CACHE_DIR'].'/'.$this->mode;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`return parent::getCacheDir();`
`@@ -90,7 +90,7 @@ public function registerBundles(): iterable`
`90`	`90`	`{`
`91`	`91`	`$contents = require $this->getProjectDir().'/config/bundles.php';`
`92`	`92`	`foreach ($contents as $class => $envs) {`
`93`		`- if ($envs[$this->environment] ?? $envs['all'] ?? false) {`
	`93`	`+ if ($envs[$this->mode] ?? $envs['all'] ?? false) {`
`94`	`94`	`yield new $class();`
`95`	`95`	`}`
`96`	`96`	`}`