[ZendBundle] removed all non-class parameters

symfony · Mar 30, 2011 · 6aa8a17 · 6aa8a17
1 parent 702e658
commit 6aa8a17
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 66 deletions.
diff --git a/src/Symfony/Bundle/ZendBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/ZendBundle/DependencyInjection/Configuration.php
@@ -40,6 +40,7 @@ public function getConfigTree()
                     ->children()
                         ->scalarNode('priority')->defaultValue('INFO')->end()
                         ->scalarNode('path')->defaultValue('%kernel.logs_dir%/%kernel.environment%.log')->end()
+                        ->scalarNode('format')->defaultValue("%%timestamp%% %%priorityName%%: %%message%%\n")->end()
                         ->booleanNode('log_errors')->defaultFalse()->end()
                     ->end()
                 ->end()

diff --git a/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php b/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php
@@ -49,18 +49,16 @@ public function load(array $configs, ContainerBuilder $container)
 
             $config = $config['logger'];
 
-            $container->setParameter('zend.logger.priority', is_int($config['priority']) ? $config['priority'] : constant('\\Zend\\Log\\Logger::'.strtoupper($config['priority'])));
-            $container->setParameter('zend.logger.path', $config['path']);
+            $container->getDefinition('zend.logger.filter')->setArgument(0, is_int($config['priority']) ? $config['priority'] : constant('\\Zend\\Log\\Logger::'.strtoupper($config['priority'])));
+            $container->getDefinition('zend.logger.writer.filesystem')->setArgument(0, $config['path']);
 
             $definition = $container->findDefinition('zend.logger');
             if ($config['log_errors']) {
                 $container->findDefinition('zend.logger')->addMethodCall('registerErrorHandler');
-            } else {
-                if ($definition->hasMethodCall('registerErrorHandler')) {
-                    $container->findDefinition('zend.logger')->removeMethodCall('registerErrorHandler');
-                }
             }
 
+            $container->getDefinition('zend.formatter.filesystem')->setArgument(0, $config['format']);
+
             $this->addClassesToCompile(array(
                 'Zend\\Log\\Factory',
                 'Zend\\Log\\Filter',

diff --git a/src/Symfony/Bundle/ZendBundle/Resources/config/logger.xml b/src/Symfony/Bundle/ZendBundle/Resources/config/logger.xml
@@ -6,26 +6,23 @@
 
     <parameters>
         <parameter key="zend.logger.class">Symfony\Bundle\ZendBundle\Logger\Logger</parameter>
-        <parameter key="zend.logger.log_errors">true</parameter>
         <parameter key="zend.logger.writer.debug.class">Symfony\Bundle\ZendBundle\Logger\DebugLogger</parameter>
         <parameter key="zend.logger.writer.filesystem.class">Zend\Log\Writer\Stream</parameter>
         <parameter key="zend.formatter.filesystem.class">Zend\Log\Formatter\Simple</parameter>
-        <parameter key="zend.formatter.filesystem.format">%%timestamp%% %%priorityName%%: %%message%%
-</parameter>
     </parameters>
 
     <services>
         <service id="zend.logger" class="%zend.logger.class%" public="false" />
 
         <service id="zend.logger.writer.filesystem" class="%zend.logger.writer.filesystem.class%" public="false">
             <tag name="zend.logger.writer" />
-            <argument>%zend.logger.path%</argument>
+            <argument /> <!-- path -->
             <call method="addFilter"><argument type="service" id="zend.logger.filter" /></call>
             <call method="setFormatter"><argument type="service" id="zend.formatter.filesystem" /></call>
         </service>
 
         <service id="zend.formatter.filesystem" class="%zend.formatter.filesystem.class%" public="false">
-            <argument>%zend.formatter.filesystem.format%</argument>
+            <argument /> <!-- format -->
         </service>
 
         <service id="zend.logger.writer.debug" class="%zend.logger.writer.debug.class%" public="false">
@@ -34,7 +31,7 @@
         </service>
 
         <service id="zend.logger.filter" class="Zend\Log\Filter\Priority" public="false">
-            <argument>%zend.logger.priority%</argument>
+            <argument /> <!-- priority -->
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/ZendBundle/Tests/DependencyInjection/ZendExtensionTest.php b/src/Symfony/Bundle/ZendBundle/Tests/DependencyInjection/ZendExtensionTest.php
diff --git a/src/Symfony/Bundle/ZendBundle/Tests/TestCase.php b/src/Symfony/Bundle/ZendBundle/Tests/TestCase.php