[ZendBundle] updated the Zend Framework bundle to use ZF2

symfony · Jun 7, 2010 · 409a742 · 409a742
1 parent 294e54f
commit 409a742
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/Symfony/Framework/ZendBundle/DependencyInjection/ZendExtension.php b/src/Symfony/Framework/ZendBundle/DependencyInjection/ZendExtension.php
@@ -49,7 +49,7 @@ public function loggerLoad($config, BuilderConfiguration $configuration)
         }
 
         if (isset($config['priority'])) {
-            $configuration->setParameter('zend.logger.priority', is_int($config['priority']) ? $config['priority'] : constant('\Zend_Log::'.strtoupper($config['priority'])));
+            $configuration->setParameter('zend.logger.priority', is_int($config['priority']) ? $config['priority'] : constant('\\Zend\\Log\\Logger::'.strtoupper($config['priority'])));
         }
 
         if (isset($config['path'])) {

diff --git a/src/Symfony/Framework/ZendBundle/Logger/DebugLogger.php b/src/Symfony/Framework/ZendBundle/Logger/DebugLogger.php
@@ -2,6 +2,8 @@
 
 namespace Symfony\Framework\ZendBundle\Logger;
 
+use Zend\Log\Writer\AbstractWriter;
+
 /*
  * This file is part of the Symfony framework.
  *
@@ -18,7 +20,7 @@
  * @subpackage Framework_ZendBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class DebugLogger extends \Zend_Log_Writer_Abstract
+class DebugLogger extends AbstractWriter
 {
     protected $logs = array();
 
@@ -37,7 +39,7 @@ protected function _write($event)
         $this->logs[] = $event;
     }
 
-    static public function factory($config)
+    static public function factory($config = array())
     {
     }
 }
diff --git a/src/Symfony/Framework/ZendBundle/Logger/Logger.php b/src/Symfony/Framework/ZendBundle/Logger/Logger.php
@@ -2,6 +2,7 @@
 
 namespace Symfony\Framework\ZendBundle\Logger;
 
+use Zend\Log\Logger as BaseLogger;
 use Symfony\Foundation\LoggerInterface;
 
 /*
@@ -20,7 +21,7 @@
  * @subpackage Framework_ZendBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class Logger extends \Zend_Log implements LoggerInterface
+class Logger extends BaseLogger implements LoggerInterface
 {
     public function emerg($message)
     {

diff --git a/src/Symfony/Framework/ZendBundle/Resources/config/logger.xml b/src/Symfony/Framework/ZendBundle/Resources/config/logger.xml
@@ -6,10 +6,10 @@
 
   <parameters>
     <parameter key="zend.logger.class">Symfony\Framework\ZendBundle\Logger\Logger</parameter>
-    <parameter key="zend.logger.priority" type="constant">Zend_Log::CRIT</parameter>
+    <parameter key="zend.logger.priority" type="constant">Zend\Log\Logger::CRIT</parameter>
     <parameter key="zend.logger.writer.debug.class">Symfony\Framework\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.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>
@@ -34,7 +34,7 @@
       <call method="addFilter"><argument type="service" id="zend.logger.filter" /></call>
     </service>
 
-    <service id="zend.logger.filter" class="Zend_Log_Filter_Priority">
+    <service id="zend.logger.filter" class="Zend\Log\Filter\Priority">
       <argument>%zend.logger.priority%</argument>
     </service>
   </services>