Bläddra i källkod

made a small refactoring of some DIC extensions

Fabien Potencier 14 år sedan
förälder
incheckning
db2f8ea6cb
1 ändrade filer med 9 tillägg och 16 borttagningar
  1. 9 16
      src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php

+ 9 - 16
src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php

@@ -22,13 +22,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
  */
 class ZendExtension extends Extension
 {
-    public function configLoad(array $configs, ContainerBuilder $container)
-    {
-        foreach ($configs as $config) {
-            $this->doConfigLoad($config, $container);
-        }
-    }
-
     /**
      * Loads the Zend Framework configuration.
      *
@@ -41,10 +34,16 @@ class ZendExtension extends Extension
      * @param array            $config    An array of configuration settings
      * @param ContainerBuilder $container A ContainerBuilder instance
      */
-    protected function doConfigLoad($config, ContainerBuilder $container)
+    public function configLoad(array $configs, ContainerBuilder $container)
     {
-        if (isset($config['logger'])) {
-            $this->registerLoggerConfiguration($config, $container);
+        $loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
+        $loader->load('logger.xml');
+        $container->setAlias('logger', 'zend.logger');
+
+        foreach ($configs as $config) {
+            if (isset($config['logger'])) {
+                $this->registerLoggerConfiguration($config, $container);
+            }
         }
     }
 
@@ -62,12 +61,6 @@ class ZendExtension extends Extension
     {
         $config = $config['logger'];
 
-        if (!$container->hasDefinition('zend.logger')) {
-            $loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
-            $loader->load('logger.xml');
-            $container->setAlias('logger', 'zend.logger');
-        }
-
         if (isset($config['priority'])) {
             $container->setParameter('zend.logger.priority', is_int($config['priority']) ? $config['priority'] : constant('\\Zend\\Log\\Logger::'.strtoupper($config['priority'])));
         }