Symfony bootstrap cleanup, the new 'kernel.reset' tag should do the job

Author: acasademont

Bootstraps/Symfony.php

@@ -2,7 +2,6 @@
 
 namespace PHPPM\Bootstraps;
 
-use PHPPM\Symfony\StrongerNativeSessionStorage;
 use PHPPM\Utils;
 use Symfony\Component\HttpFoundation\Request;
 use function PHPPM\register_file;
@@ -63,30 +62,8 @@ public function getApplication()
             throw new \Exception("Symfony Kernel class was not found in the configured locations. Given: '$class'");
         }
 
-        //since we need to change some services, we need to manually change some services
         $app = new $class($this->appenv, $this->debug);
 
-        // We need to change some services, before the boot, because they would
-        // otherwise be instantiated and passed to other classes which makes it
-        // impossible to replace them.
-
-        Utils::bindAndCall(function () use ($app) {
-            // init bundles
-            $app->initializeBundles();
-
-            // init container
-            $app->initializeContainer();
-        }, $app);
-
-        Utils::bindAndCall(function () use ($app) {
-            foreach ($app->getBundles() as $bundle) {
-                $bundle->setContainer($app->container);
-                $bundle->boot();
-            }
-
-            $app->booted = true;
-        }, $app);
-
         if ($trustedProxies = getenv('TRUSTED_PROXIES')) {
             Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
         }
@@ -119,8 +96,6 @@ protected function getVendorDir()
      */
     public function preHandle($app)
     {
-        //resets Kernels startTime, so Symfony can correctly calculate the execution time
-        Utils::hijackProperty($app, 'startTime', microtime(true));
     }
 
     /**
@@ -133,7 +108,7 @@ public function postHandle($app)
         $container = $app->getContainer();
 
         if ($container->has('doctrine')) {
-            $doctrineRegistry = $container->get("doctrine");
+            $doctrineRegistry = $container->get('doctrine');
             foreach ($doctrineRegistry->getManagers() as $curManagerName => $curManager) {
                 if (!$curManager->isOpen()) {
                     $doctrineRegistry->resetManager($curManagerName);
@@ -143,11 +118,6 @@ public function postHandle($app)
             }
         }
 
-        //resets stopwatch, so it can correctly calculate the execution time
-        if ($container->has('debug.stopwatch')) {
-            $container->get('debug.stopwatch')->__construct();
-        }
-
         //Symfony\Bundle\TwigBundle\Loader\FilesystemLoader
         //->Twig_Loader_Filesystem
         if ($container->has('twig.loader')) {
@@ -161,44 +131,12 @@ public function postHandle($app)
 
         //reset all profiler stuff currently supported
         if ($container->has('profiler')) {
-            $profiler = $container->get('profiler');
-
-            // since Symfony does not reset Profiler::disable() calls after each request, we need to do it,
-            // so the profiler bar is visible after the second request as well.
-            $profiler->enable();
-
             //PropelLogger
             if ($container->has('propel.logger')) {
                 $propelLogger = $container->get('propel.logger');
                 Utils::hijackProperty($propelLogger, 'queries', []);
             }
 
-            //Doctrine
-            //Doctrine\Bundle\DoctrineBundle\DataCollector\DoctrineDataCollector
-            if ($profiler->has('db')) {
-                Utils::bindAndCall(function () {
-                    //$logger: \Doctrine\DBAL\Logging\DebugStack
-                    foreach ($this->loggers as $logger) {
-                        Utils::hijackProperty($logger, 'queries', []);
-                    }
-                }, $profiler->get('db'), null, 'Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector');
-            }
-
-            //EventDataCollector
-            if ($profiler->has('events')) {
-                Utils::hijackProperty($profiler->get('events'), 'data', [
-                    'called_listeners' => [],
-                    'not_called_listeners' => [],
-                ]);
-            }
-
-            //TwigDataCollector
-            if ($profiler->has('twig')) {
-                Utils::bindAndCall(function () {
-                    Utils::hijackProperty($this->profile, 'profiles', []);
-                }, $profiler->get('twig'));
-            }
-
             //Logger
             if ($container->has('logger')) {
                 $logger = $container->get('logger');