[HttpKernel+FrameworkBundle] Added Kernel::reset() and Console\Application::reset()

lyrixx · lyrixx · commit fa26c2df82fc · 2019-07-08T11:22:10.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Deprecated the `controller_name_converter` and `resolve_controller_name_subscriber` services
  * The `ControllerResolver` and `DelegatingLoader` classes have been marked as `final`
  * Added support for configuring chained cache pools
+* `Application` implements `ResetInterface`
 
 4.3.0
 -----
@@ -34,8 +35,8 @@ CHANGELOG
    options if you're using Symfony's serializer.
  * [BC Break] Removed the `framework.messenger.routing.send_and_handle` configuration.
    Instead of setting it to true, configure a `SyncTransport` and route messages to it.
- * Added information about deprecated aliases in `debug:autowiring` 
- * Added php ini session options `sid_length` and `sid_bits_per_character` 
+ * Added information about deprecated aliases in `debug:autowiring`
+ * Added php ini session options `sid_length` and `sid_bits_per_character`
    to the `session` section of the configuration
  * Added support for Translator paths, Twig paths in translation commands.
  * Added support for PHP files with translations in translation commands.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -24,11 +24,12 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Application extends BaseApplication
+class Application extends BaseApplication implements ResetInterface
 {
     private $kernel;
     private $commandsRegistered = false;
@@ -55,6 +56,14 @@ public function getKernel()
         return $this->kernel;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->kernel->reset();
+    }
+
     /**
      * Runs the current application.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -20,6 +20,7 @@
         "ext-xml": "*",
         "symfony/cache": "^4.4|^5.0",
         "symfony/config": "^4.2|^5.0",
+        "symfony/contracts": "~1.0",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/error-catcher": "^4.4|^5.0",
         "symfony/http-foundation": "^4.3|^5.0",
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
 * The `DebugHandlersListener` class has been marked as `final`
+* `HttpKernel` implements `ResetInterface`
 
 4.3.0
 -----
@@ -36,8 +37,8 @@ CHANGELOG
 
  * deprecated `KernelInterface::getRootDir()` and the `kernel.root_dir` parameter
  * deprecated `KernelInterface::getName()` and the `kernel.name` parameter
- * deprecated the first and second constructor argument of `ConfigDataCollector` 
- * deprecated `ConfigDataCollector::getApplicationName()` 
+ * deprecated the first and second constructor argument of `ConfigDataCollector`
+ * deprecated `ConfigDataCollector::getApplicationName()`
  * deprecated `ConfigDataCollector::getApplicationVersion()`
 
 4.1.0
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -36,6 +36,7 @@
 use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\AddAnnotatedClassesToCachePass;
 use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * The Kernel is the heart of the Symfony system.
@@ -47,7 +48,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-abstract class Kernel implements KernelInterface, RebootableInterface, TerminableInterface
+abstract class Kernel implements KernelInterface, RebootableInterface, TerminableInterface, ResetInterface
 {
     /**
      * @var BundleInterface[]
@@ -150,6 +151,16 @@ public function reboot($warmupDir)
         $this->boot();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        if ($this->container->has('services_resetter')) {
+            $this->container->get('services_resetter')->reset();
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
+        "symfony/contracts": "~1.0",
         "symfony/error-catcher": "^4.4|^5.0",
         "symfony/event-dispatcher": "^4.3",
         "symfony/http-foundation": "^4.4|^5.0",
