Merge branch 'master' of git://github.com/zendframework/zf2 into string

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-log",
-    "description": "Zend\\Log component",
+    "description": "component for general purpose logging",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -10,11 +10,11 @@
     "homepage": "https://github.com/zendframework/zend-log",
     "autoload": {
         "psr-4": {
-            "Zend\\Log\\": "src/"
+            "Zend\\Log": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23",
+        "php": ">=5.3.3",
         "zendframework/zend-servicemanager": "self.version",
         "zendframework/zend-stdlib": "self.version"
     },

src/Filter/Priority.php

@@ -48,7 +48,7 @@ class Priority implements FilterInterface
      *
      * @param int $priority Priority
      * @param string $operator Comparison operator
-     * @return void
+     * @return Priority
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($priority, $operator = null)

src/Filter/Regex.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Log\Filter;
 
 use Zend\Log\Exception;
@@ -46,6 +43,7 @@ class Regex implements FilterInterface
      * Filter out any log messages not matching the pattern
      *
      * @param string $regex Regular expression to test the log message
+     * @return Regex
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($regex)

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
@@ -43,7 +43,8 @@ class Validator implements FilterInterface
     /**
      * Filter out any log messages not matching the validator
      *
-     * @param  ZendValidator $validator
+     * @param ZendValidator $validator
+     * @return Validator
      */
     public function __construct(ZendValidator $validator)
     {

src/Formatter/ErrorHandler.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Log\Formatter;
 
 use Zend\Log\Exception;
@@ -47,8 +44,9 @@ class ErrorHandler implements FormatterInterface
     /**
      * Class constructor
      *
-     * @param  null|string  $format  Format specifier for log messages
-     * @throws Zend\Log\Exception\InvalidArgumentException
+     * @param null|string $format Format specifier for log messages
+     * @return ErrorHandler
+     * @throws Exception\InvalidArgumentException
      */
     public function __construct($format = null)
     {

src/Formatter/ExceptionHandler.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Log\Formatter;
 
 /**
@@ -36,35 +33,39 @@ class ExceptionHandler implements FormatterInterface
     /**
      * This method formats the event for the PHP Exception
      *
-     * @param  array $event
+     * @param array $event
      * @return string
      */
     public function format($event)
     {
-        $output = $event['timestamp'] . ' ' . $event['priorityName'] . ' (' .
-                  $event['priority'] . ') ' . $event['message'] .' in ' .
-                  $event['extra']['file'] . ' on line ' . $event['extra']['line'];
+        $output = $event['timestamp'] . ' ' . $event['priorityName'] . ' ('
+                . $event['priority'] . ') ' . $event['message'] .' in '
+                . $event['extra']['file'] . ' on line ' . $event['extra']['line'];
+
         if (!empty($event['extra']['trace'])) {
             $outputTrace = '';
             foreach ($event['extra']['trace'] as $trace) {
-                $outputTrace .= "File  : {$trace['file']}\n" .
-                                "Line  : {$trace['line']}\n" .
-                                "Func  : {$trace['function']}\n" .
-                                "Class : {$trace['class']}\n" .
-                                "Type  : " . $this->getType($trace['type']) . "\n" .
-                                "Args  : " . print_r($trace['args'], true) . "\n";
+                $outputTrace .= "File  : {$trace['file']}\n"
+                              . "Line  : {$trace['line']}\n"
+                              . "Func  : {$trace['function']}\n"
+                              . "Class : {$trace['class']}\n"
+                              . "Type  : " . $this->getType($trace['type']) . "\n"
+                              . "Args  : " . print_r($trace['args'], true) . "\n";
             }
-            $output.= "\n[Trace]\n" . $outputTrace;
+            $output .= "\n[Trace]\n" . $outputTrace;
         }
+
         return $output;
     }
+
     /**
      * Get the type of a function
      * 
-     * @param  string $type
+     * @param string $type
      * @return string 
      */
-    protected function getType($type) {
+    protected function getType($type)
+    {
         switch ($type) {
             case "::" :
                 return "static";

src/Formatter/FormatterInterface.php

@@ -31,8 +31,8 @@ interface FormatterInterface
     /**
      * Formats data into a single line to be written by the writer.
      *
-     * @param  array    $event    event data
-     * @return string             formatted line to write to the log
+     * @param array $event event data
+     * @return string formatted line to write to the log
      */
     public function format($event);
 }