Merge remote-tracking branch 'prolic/log' into prolic-zen-52

Conflicts:
	library/Zend/Log/Logger.php

src/Filter/Validator.php

@@ -21,8 +21,8 @@
 
 namespace Zend\Log\Filter;
 
-use Zend\Log\Exception,
-    Zend\Validator\ValidatorInterface as ZendValidator;
+use Zend\Log\Exception;
+use Zend\Validator\ValidatorInterface as ZendValidator;
 
 /**
  * @category   Zend

src/Formatter/Xml.php

@@ -21,10 +21,10 @@
 
 namespace Zend\Log\Formatter;
 
-use Traversable,
-    Zend\Stdlib\ArrayUtils,
-    DOMDocument,
-    DOMElement;
+use Traversable;
+use Zend\Stdlib\ArrayUtils;
+use DOMDocument;
+use DOMElement;
 
 /**
  * @category   Zend

src/Logger.php

@@ -20,10 +20,10 @@
 
 namespace Zend\Log;
 
-use DateTime,
-    Zend\Stdlib\SplPriorityQueue,
-    Traversable,
-    Zend\Stdlib\ArrayUtils;
+use DateTime;
+use Zend\Stdlib\SplPriorityQueue;
+use Traversable;
+use Zend\Stdlib\ArrayUtils;
 
 /**
  * Logging messages with a stack of backends
@@ -50,7 +50,7 @@ class Logger implements LoggerInterface
 
     /**
      * The format of the date used for a log entry (ISO 8601 date)
-     * 
+     *
      * @see http://nl3.php.net/manual/en/function.date.php
      * @var string
      */
@@ -88,18 +88,18 @@ class Logger implements LoggerInterface
 
     /**
      * Registered error handler
-     * 
+     *
      * @var boolean
      */
     protected static $registeredErrorHandler = false;
-       
+
     /**
      * Registered exception handler
-     * 
+     *
      * @var boolean
      */
     protected static $registeredExceptionHandler = false;
-    
+
     /**
      * Constructor
      *
@@ -215,25 +215,25 @@ public function addWriter($writer, $priority=1)
                 is_object($writer) ? get_class($writer) : gettype($writer)
             ));
         }
-        
+
         $this->writers->insert($writer, $priority);
 
         return $this;
     }
 
     /**
      * Get writers
-     * 
-     * @return SplPriorityQueue 
+     *
+     * @return SplPriorityQueue
      */
     public function getWriters()
     {
         return $this->writers;
     }
     /**
      * Set the writers
-     * 
-     * @param  SplPriorityQueue $writers 
+     *
+     * @param  SplPriorityQueue $writers
      * @throws Exception\InvalidArgumentException
      * @return Logger
      */
@@ -283,14 +283,14 @@ public function log($priority, $message, $extra = array())
         if ($this->writers->count() === 0) {
             throw new Exception\RuntimeException('No log writer specified');
         }
-        
+
         $date = new DateTime();
         $timestamp = $date->format($this->getDateTimeFormat());
 
         if (is_array($message)) {
             $message = var_export($message, true);
         }
-               
+
         foreach ($this->writers->toArray() as $writer) {
             $writer->write(array(
                 'timestamp'    => $timestamp,
@@ -383,11 +383,11 @@ public function debug($message, $extra = array())
     {
         return $this->log(self::DEBUG, $message, $extra);
     }
-    
+
     /**
      * Register logging system as an error handler to log PHP errors
      *
-     * @link http://www.php.net/manual/en/function.set-error-handler.php 
+     * @link http://www.php.net/manual/en/function.set-error-handler.php
      *
      * @param  Logger $logger
      * @return boolean
@@ -402,7 +402,7 @@ public static function registerErrorHandler(Logger $logger)
         if ($logger === null) {
             throw new Exception\InvalidArgumentException('Invalid Logger specified');
         }
-        
+
         $errorHandlerMap = array(
             E_NOTICE            => self::NOTICE,
             E_USER_NOTICE       => self::NOTICE,
@@ -417,7 +417,7 @@ public static function registerErrorHandler(Logger $logger)
             E_DEPRECATED        => self::DEBUG,
             E_USER_DEPRECATED   => self::DEBUG
         );
-        
+
         set_error_handler(function($errno, $errstr, $errfile, $errline, $errcontext) use ($errorHandlerMap, $logger) {
             $errorLevel = error_reporting();
 
@@ -435,7 +435,7 @@ public static function registerErrorHandler(Logger $logger)
     }
     /**
      * Unregister error handler
-     * 
+     *
      */
     public static function unregisterErrorHandler()
     {
@@ -444,27 +444,27 @@ public static function unregisterErrorHandler()
     }
     /**
      * Register logging system as an exception handler to log PHP exceptions
-     * 
+     *
      * @link http://www.php.net/manual/en/function.set-exception-handler.php
-     * 
+     *
      * @param Logger $logger
-     * @return type 
+     * @return type
      */
     public static function registerExceptionHandler(Logger $logger)
     {
         // Only register once per instance
         if (self::$registeredExceptionHandler) {
             return false;
         }
-        
+
         if ($logger === null) {
             throw new Exception\InvalidArgumentException('Invalid Logger specified');
         }
-        
+
         set_exception_handler(function ($exception) use ($logger){
-            $extra = array ('file'  => $exception->getFile(), 
+            $extra = array ('file'  => $exception->getFile(),
                             'line'  => $exception->getLine(),
-                            'trace' => $exception->getTrace());  
+                            'trace' => $exception->getTrace());
             if (isset($exception->xdebug_message)) {
                 $extra['xdebug'] = $exception->xdebug_message;
             }
@@ -473,7 +473,7 @@ public static function registerExceptionHandler(Logger $logger)
         self::$registeredExceptionHandler = true;
         return true;
     }
-    
+
     /**
      * Unregister exception handler
      */

src/Writer/AbstractWriter.php

@@ -21,9 +21,9 @@
 
 namespace Zend\Log\Writer;
 
-use Zend\Log\Filter,
-    Zend\Log\Formatter\FormatterInterface as Formatter,
-    Zend\Log\Exception;
+use Zend\Log\Filter;
+use Zend\Log\Formatter\FormatterInterface as Formatter;
+use Zend\Log\Exception;
 
 /**
  * @category   Zend

src/Writer/Db.php

@@ -21,9 +21,9 @@
 
 namespace Zend\Log\Writer;
 
-use Zend\Log\Formatter,
-    Zend\Log\Exception,
-    Zend\Db\Adapter\Adapter;
+use Zend\Log\Formatter;
+use Zend\Log\Exception;
+use Zend\Db\Adapter\Adapter;
 
 /**
  * @category   Zend

src/Writer/Mail.php

@@ -21,11 +21,11 @@
 
 namespace Zend\Log\Writer;
 
-use Zend\Log\Formatter\Simple as SimpleFormatter,
-    Zend\Log\Exception,
-    Zend\Mail\Message as MailMessage,
-    Zend\Mail\Transport,
-    Zend\Mail\Transport\Exception as TransportException;
+use Zend\Log\Formatter\Simple as SimpleFormatter;
+use Zend\Log\Exception;
+use Zend\Mail\Message as MailMessage;
+use Zend\Mail\Transport;
+use Zend\Mail\Transport\Exception as TransportException;
 
 /**
  * Class used for writing log messages to email via Zend\Mail.

src/Writer/Stream.php

@@ -21,8 +21,8 @@
 
 namespace Zend\Log\Writer;
 
-use Zend\Log\Formatter\Simple as SimpleFormatter,
-    Zend\Log\Exception;
+use Zend\Log\Formatter\Simple as SimpleFormatter;
+use Zend\Log\Exception;
 
 /**
  * @category   Zend

src/Writer/Syslog.php

@@ -21,9 +21,9 @@
 
 namespace Zend\Log\Writer;
 
-use Zend\Log\Logger,
-    Zend\Log\Formatter,
-    Zend\Log\Exception;
+use Zend\Log\Logger;
+use Zend\Log\Formatter;
+use Zend\Log\Exception;
 
 /**
  * Writes log messages to syslog

src/Writer/WriterInterface.php

@@ -20,8 +20,8 @@
 
 namespace Zend\Log\Writer;
 
-use Zend\Log\Formatter\FormatterInterface as Formatter,
-    Zend\Log\Filter\FilterInterface as Filter;
+use Zend\Log\Formatter\FormatterInterface as Formatter;
+use Zend\Log\Filter\FilterInterface as Filter;
 
 /**
  * @category   Zend

test/Filter/ChainingTest.php

@@ -21,8 +21,8 @@
 
 namespace ZendTest\Log\Filter;
 
-use \Zend\Log\Logger,
-    \Zend\Log\Writer;
+use \Zend\Log\Logger;
+use \Zend\Log\Writer;
 
 /**
  * @category   Zend

test/Filter/PriorityTest.php

@@ -21,8 +21,8 @@
 
 namespace ZendTest\Log\Filter;
 
-use \Zend\Log\Logger,
-    \Zend\Log\Filter\Priority;
+use \Zend\Log\Logger;
+use \Zend\Log\Filter\Priority;
 
 /**
  * @category   Zend

test/Filter/RegexTest.php

@@ -21,9 +21,9 @@
 
 namespace ZendTest\Log\Filter;
 
-use Zend\Log\Logger,
-    Zend\Log\Filter\Regex,
-    Zend\Config\Config;
+use Zend\Log\Logger;
+use Zend\Log\Filter\Regex;
+use Zend\Config\Config;
 
 /**
  * @category   Zend

test/Filter/SuppressFilterTest.php

@@ -21,8 +21,8 @@
 
 namespace ZendTest\Log\Filter;
 
-use \Zend\Log\Filter\SuppressFilter,
-    \Zend\Log\Logger;
+use \Zend\Log\Filter\SuppressFilter;
+use \Zend\Log\Logger;
 
 /**
  * @category   Zend

test/Filter/ValidatorTest.php

@@ -21,11 +21,11 @@
 
 namespace ZendTest\Log\Filter;
 
-use Zend\Log\Logger,
-    Zend\Log\Filter\Validator,
-    Zend\Validator\ValidatorChain,
-    Zend\Validator\Alnum,
-    Zend\Validator\Int;
+use Zend\Log\Logger;
+use Zend\Log\Filter\Validator;
+use Zend\Validator\ValidatorChain;
+use Zend\Validator\Alnum;
+use Zend\Validator\Int;
 
 /**
  * @category   Zend

test/Formatter/SimpleTest.php

@@ -21,8 +21,8 @@
 
 namespace ZendTest\Log\Formatter;
 
-use ZendTest\Log\TestAsset\StringObject,
-    \Zend\Log\Formatter\Simple;
+use ZendTest\Log\TestAsset\StringObject;
+use \Zend\Log\Formatter\Simple;
 
 /**
  * @category   Zend

test/Formatter/XmlTest.php

@@ -21,8 +21,8 @@
 
 namespace ZendTest\Log\Formatter;
 
-use ZendTest\Log\TestAsset\SerializableObject,
-    Zend\Log\Formatter\Xml as XmlFormatter;
+use ZendTest\Log\TestAsset\SerializableObject;
+use Zend\Log\Formatter\Xml as XmlFormatter;
 
 /**
  * @category   Zend

test/LoggerTest.php

@@ -21,9 +21,9 @@
 
 namespace ZendTest\Log;
 
-use Zend\Log\Logger,
-    Zend\Log\Writer\Mock as MockWriter,
-    Zend\Stdlib\SplPriorityQueue;
+use Zend\Log\Logger;
+use Zend\Log\Writer\Mock as MockWriter;
+use Zend\Stdlib\SplPriorityQueue;
 
 /**
  * @category   Zend

test/Writer/AbstractTest.php

@@ -21,9 +21,9 @@
 
 namespace ZendTest\Log\Writer;
 
-use ZendTest\Log\TestAsset\ConcreteWriter,
-    Zend\Log\Formatter\Simple as SimpleFormatter,
-    Zend\Log\Filter\Regex as RegexFilter;
+use ZendTest\Log\TestAsset\ConcreteWriter;
+use Zend\Log\Formatter\Simple as SimpleFormatter;
+use Zend\Log\Filter\Regex as RegexFilter;
 
 /**
  * @category   Zend