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

Fixed files permissions
zendframework · Feb 28, 2013 · f86b028 · f86b028
commit f86b028
Show file tree

Hide file tree

Showing 67 changed files with 2,068 additions and 329 deletions.
diff --git a/composer.json b/composer.json
@@ -38,8 +38,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -5,14 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- */
 interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Exception;
 
 /**
  * Invalid argument exception
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Exception
  */
 class InvalidArgumentException
     extends \InvalidArgumentException

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Exception;
 
 /**
  * Runtime argument exception
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Exception
  */
 class RuntimeException
     extends \RuntimeException

diff --git a/src/Filter/FilterInterface.php b/src/Filter/FilterInterface.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Filter;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- */
 interface FilterInterface
 {
     /**

diff --git a/src/Filter/Mock.php b/src/Filter/Mock.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Filter;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- */
 class Mock implements FilterInterface
 {
     /**

diff --git a/src/Filter/Priority.php b/src/Filter/Priority.php
@@ -5,19 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Filter;
 
 use Traversable;
 use Zend\Log\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- */
 class Priority implements FilterInterface
 {
     /**

diff --git a/src/Filter/Regex.php b/src/Filter/Regex.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Filter;
@@ -14,11 +13,6 @@
 use Zend\Log\Exception;
 use Zend\Stdlib\ErrorHandler;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- */
 class Regex implements FilterInterface
 {
     /**

diff --git a/src/Filter/SuppressFilter.php b/src/Filter/SuppressFilter.php
@@ -5,24 +5,43 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Filter;
 
+use Traversable;
+use Zend\Log\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- */
 class SuppressFilter implements FilterInterface
 {
     /**
      * @var bool
      */
     protected $accept = true;
 
+    /**
+     * This is a simple boolean filter.
+     *
+     * @param int|array|Traversable $suppress
+     * @throws Exception\InvalidArgumentException
+     */
+    public function __construct($suppress = false)
+    {
+        if ($suppress instanceof Traversable) {
+            $suppress = iterator_to_array($suppress);
+        }
+        if (is_array($suppress)) {
+            $suppress = isset($suppress['suppress']) ? $suppress['suppress'] : false;
+        }
+        if (!is_bool($suppress)) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                    'Suppress must be an boolean; received "%s"', gettype($suppress)
+            ));
+        }
+
+        $this->suppress($suppress);
+    }
+
     /**
      * This is a simple boolean filter.
      *

diff --git a/src/Filter/Validator.php b/src/Filter/Validator.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Filter;
@@ -14,11 +13,6 @@
 use Zend\Log\Exception;
 use Zend\Validator\ValidatorInterface as ZendValidator;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- */
 class Validator implements FilterInterface
 {
     /**

diff --git a/src/Formatter/Base.php b/src/Formatter/Base.php
@@ -5,19 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Formatter;
 
 use DateTime;
 use Traversable;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- */
 class Base implements FormatterInterface
 {
     /**
@@ -32,10 +26,18 @@ class Base implements FormatterInterface
      * Class constructor
      *
      * @see http://php.net/manual/en/function.date.php
-     * @param null|string $dateTimeFormat Format for DateTime objects
+     * @param null|string|array|Traversable $dateTimeFormat Format for DateTime objects
      */
     public function __construct($dateTimeFormat = null)
     {
+        if ($dateTimeFormat instanceof Traversable) {
+            $dateTimeFormat = iterator_to_array($dateTimeFormat);
+        }
+
+        if (is_array($dateTimeFormat)) {
+            $dateTimeFormat = isset($dateTimeFormat['dateTimeFormat'])? $dateTimeFormat['dateTimeFormat'] : null;
+        }
+
         if (null !== $dateTimeFormat) {
             $this->dateTimeFormat = $dateTimeFormat;
         }

diff --git a/src/Formatter/ChromePhp.php b/src/Formatter/ChromePhp.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Log\Formatter;
+
+class ChromePhp implements FormatterInterface
+{
+    /**
+     * Formats the given event data into a single line to be written by the writer.
+     *
+     * @param array $event The event data which should be formatted.
+     * @return string
+     */
+    public function format($event)
+    {
+        return $event['message'];
+    }
+
+    /**
+     * This method is implemented for FormatterInterface but not used.
+     *
+     * @return string
+     */
+    public function getDateTimeFormat()
+    {
+        return '';
+    }
+
+    /**
+     * This method is implemented for FormatterInterface but not used.
+     *
+     * @param string $dateTimeFormat
+     * @return FormatterInterface
+     */
+    public function setDateTimeFormat($dateTimeFormat)
+    {
+        return $this;
+    }
+}
diff --git a/src/Formatter/Db.php b/src/Formatter/Db.php
@@ -5,18 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Formatter;
 
 use DateTime;
+use Traversable;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- */
 class Db implements FormatterInterface
 {
     /**
@@ -35,6 +30,14 @@ class Db implements FormatterInterface
      */
     public function __construct($dateTimeFormat = null)
     {
+        if ($dateTimeFormat instanceof Traversable) {
+            $dateTimeFormat = iterator_to_array($dateTimeFormat);
+        }
+
+        if (is_array($dateTimeFormat)) {
+            $dateTimeFormat = isset($dateTimeFormat['dateTimeFormat'])? $dateTimeFormat['dateTimeFormat'] : null;
+        }
+
         if (null !== $dateTimeFormat) {
             $this->setDateTimeFormat($dateTimeFormat);
         }

diff --git a/src/Formatter/ErrorHandler.php b/src/Formatter/ErrorHandler.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Formatter;
 
 use DateTime;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- */
 class ErrorHandler extends Simple
 {
     const DEFAULT_FORMAT = '%timestamp% %priorityName% (%priority%) %message% (errno %extra[errno]%) in %extra[file]% on line %extra[line]%';

diff --git a/src/Formatter/ExceptionHandler.php b/src/Formatter/ExceptionHandler.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Log
  */
 
 namespace Zend\Log\Formatter;
 
 use DateTime;
 
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- */
 class ExceptionHandler implements FormatterInterface
 {
     /**