[HttpKernel] removed the need to keep the compiled classes in the container

fabpot · fabpot · commit eb7c86b7a812 · 2011-07-22T19:10:59.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddClassesToCachePass.php
@@ -14,6 +14,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Sets the classes to compile in the cache for the container.
@@ -22,6 +23,13 @@
  */
 class AddClassesToCachePass implements CompilerPassInterface
 {
+    private $kernel;
+
+    public function __construct(Kernel $kernel)
+    {
+        $this->kernel = $kernel;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -34,6 +42,6 @@ public function process(ContainerBuilder $container)
             }
         }
 
-        $container->setParameter('kernel.compiled_classes', array_unique($classes));
+        $this->kernel->setClassCache($container->getParameterBag()->resolveValue(array_unique($classes)));
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -20,7 +20,6 @@
 use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
-use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
@@ -402,6 +401,14 @@ public function loadClassCache($name = 'classes', $extension = '.php')
         }
     }
 
+    /**
+     * Used internally.
+     */
+    public function setClassCache(array $classes)
+    {
+        file_put_contents($this->getCacheDir().'/classes.map', sprintf('<?php return %s;', var_export($classes, true)));
+    }
+
     /**
      * Gets the request start time (not available if debug is disabled).
      *
@@ -641,8 +648,6 @@ protected function buildContainer()
         $container->addCompilerPass(new AddClassesToCachePass($this));
         $container->compile();
 
-        file_put_contents($this->getCacheDir().'/classes.map', sprintf('<?php return %s;', var_export($container->getParameter('kernel.compiled_classes'), true)));
-
         return $container;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`15`	`15`	`use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;`
`16`	`16`	`use Symfony\Component\HttpKernel\DependencyInjection\Extension;`
	`17`	`+use Symfony\Component\HttpKernel\Kernel;`
`17`	`18`
`18`	`19`	`/**`
`19`	`20`	`* Sets the classes to compile in the cache for the container.`
`@@ -22,6 +23,13 @@`
`22`	`23`	`*/`
`23`	`24`	`class AddClassesToCachePass implements CompilerPassInterface`
`24`	`25`	`{`
	`26`	`+ private $kernel;`
	`27`	`+`
	`28`	`+ public function __construct(Kernel $kernel)`
	`29`	`+ {`
	`30`	`+ $this->kernel = $kernel;`
	`31`	`+ }`
	`32`	`+`
`25`	`33`	`/**`
`26`	`34`	`* {@inheritDoc}`
`27`	`35`	`*/`
`@@ -34,6 +42,6 @@ public function process(ContainerBuilder $container)`
`34`	`42`	`}`
`35`	`43`	`}`
`36`	`44`
`37`		`- $container->setParameter('kernel.compiled_classes', array_unique($classes));`
	`45`	`+ $this->kernel->setClassCache($container->getParameterBag()->resolveValue(array_unique($classes)));`
`38`	`46`	`}`
`39`	`47`	`}`