Revert "Merge branch 'livedocx-2.0' of http://github.com/jonathanmaro…

…n/zf2 into merges/jonathanmaron-livedocx"

This reverts commit 239626850ab598a70f0b6008bdeb002c6f81a39f, reversing
changes made to 3addea5bec77bafc51fa1a9605a1c31a10f442f8.

src/Filter/Priority.php

@@ -53,7 +53,7 @@ class Priority extends AbstractFilter
      * @param  string   $operator  Comparison operator
      * @throws \Zend\Log\Exception\InvalidArgumentException
      */
-    public function __construct($priority, $operator = \NULL)
+    public function __construct($priority, $operator = null)
     {
         if (! is_integer($priority)) {
             throw new \Zend\Log\Exception\InvalidArgumentException('Priority must be an integer');
@@ -88,7 +88,7 @@ static public function factory($config = array())
         }
 
         return new self(
-            $config['priority'], 
+            (int) $config['priority'], 
             $config['operator']
         );
     }

src/Logger.php

@@ -230,7 +230,7 @@ protected function _constructFromConfig($type, $config, $namespace)
             );
         }
 
-        return call_user_func(array($className, 'factory'), $params);
+        return $className::factory($params);
     }
 
     /**

src/Writer/Db.php

@@ -101,7 +101,7 @@ static public function factory($config = array())
      * 
      * @throws \Zend\Log\Exception\InvalidArgumentException
      */
-    public function setFormatter(Zend_Log_Formatter_Interface $formatter)
+    public function setFormatter(\Zend\Log\Formatter $formatter)
     {
         throw new Log\Exception\InvalidArgumentException(get_class() . ' does not support formatting');
     }

src/Writer/Firebug.php

@@ -32,7 +32,7 @@
  * @uses       \Zend\Log\Logger
  * @uses       \Zend\Log\Formatter\Firebug
  * @uses       \Zend\Log\Writer\AbstractWriter
- * @uses       \Zend\Wildfire\Plugin\FirePhp\FirePhp
+ * @uses       \Zend\Wildfire\Plugin\FirePhp
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Writer
@@ -46,20 +46,20 @@ class Firebug extends AbstractWriter
      * Maps logging priorities to logging display styles
      * @var array
      */
-    protected $_priorityStyles = array(Log\Logger::EMERG  => FirePhp\FirePhp::ERROR,
-                                       Log\Logger::ALERT  => FirePhp\FirePhp::ERROR,
-                                       Log\Logger::CRIT   => FirePhp\FirePhp::ERROR,
-                                       Log\Logger::ERR    => FirePhp\FirePhp::ERROR,
-                                       Log\Logger::WARN   => FirePhp\FirePhp::WARN,
-                                       Log\Logger::NOTICE => FirePhp\FirePhp::INFO,
-                                       Log\Logger::INFO   => FirePhp\FirePhp::INFO,
-                                       Log\Logger::DEBUG  => FirePhp\FirePhp::LOG);
+    protected $_priorityStyles = array(Log\Logger::EMERG  => FirePhp::ERROR,
+                                       Log\Logger::ALERT  => FirePhp::ERROR,
+                                       Log\Logger::CRIT   => FirePhp::ERROR,
+                                       Log\Logger::ERR    => FirePhp::ERROR,
+                                       Log\Logger::WARN   => FirePhp::WARN,
+                                       Log\Logger::NOTICE => FirePhp::INFO,
+                                       Log\Logger::INFO   => FirePhp::INFO,
+                                       Log\Logger::DEBUG  => FirePhp::LOG);
 
     /**
      * The default logging style for un-mapped priorities
      * @var string
      */
-    protected $_defaultPriorityStyle = FirePhp\FirePhp::LOG;
+    protected $_defaultPriorityStyle = FirePhp::LOG;
 
     /**
      * Flag indicating whether the log writer is enabled
@@ -189,9 +189,9 @@ protected function _write($event)
 
         $label = isset($event['firebugLabel'])?$event['firebugLabel']:null;
 
-        FirePhp\FirePhp::getInstance()->send($message,
-                                                          $label,
-                                                          $type,
-                                                          array('traceOffset'=>6));
+        FirePhp::getInstance()->send($message,
+                                     $label,
+                                     $type,
+                                     array('traceOffset'=>6));
     }
 }