Fabien Potencier преди 14 години
родител
ревизия
8359419913
променени са 2 файла, в които са добавени 2 реда и са изтрити 4 реда
  1. 2 3
      src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
  2. 0 1
      src/Symfony/Component/HttpKernel/Kernel.php

+ 2 - 3
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -132,8 +132,6 @@ class FrameworkExtension extends Extension
 
             'Symfony\\Component\\EventDispatcher\\Event',
 
-            'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerInterface',
-            'Symfony\\Bundle\\FrameworkBundle\\Controller\\BaseController',
             'Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller',
         ));
     }
@@ -479,7 +477,8 @@ class FrameworkExtension extends Extension
 
     protected function addCompiledClasses($container, array $classes)
     {
-        $container->setParameter('kernel.compiled_classes', array_merge($container->getParameter('kernel.compiled_classes'), $classes));
+        $current = $container->hasParameter('kernel.compiled_classes') ? $container->getParameter('kernel.compiled_classes') : array();
+        $container->setParameter('kernel.compiled_classes', array_merge($current, $classes));
     }
 
     /**

+ 0 - 1
src/Symfony/Component/HttpKernel/Kernel.php

@@ -318,7 +318,6 @@ abstract class Kernel implements HttpKernelInterface, \Serializable
                 'kernel.bundle_dirs'      => $this->bundleDirs,
                 'kernel.bundles'          => $bundles,
                 'kernel.charset'          => 'UTF-8',
-                'kernel.compiled_classes' => array(),
             ),
             $this->getEnvParameters()
         );