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

…e_interfaces

.travis/run-tests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-travisdir=$(dirname $(readlink /proc/$$/fd/255))
+travisdir=$(dirname "$0")
 testdir="$travisdir/../tests"
 testedcomponents=(`cat "$travisdir/tested-components"`)
 result=0

.travis/skipped-components

@@ -1,5 +1,6 @@
 Zend/Amf
 Zend/Date
+Zend/Dojo
 Zend/Queue
 Zend/Service
 Zend/Test

.travis/tested-components

@@ -22,17 +22,19 @@ Zend/Form
 Zend/GData
 Zend/Http
 Zend/InfoCard
+Zend/InputFilter
 Zend/Json
 Zend/Ldap
 Zend/Loader
 Zend/Locale
 Zend/Log
 Zend/Mail
 Zend/Markup
+Zend/Math
 Zend/Measure
 Zend/Memory
 Zend/Mime
-Zend/Module
+Zend/ModuleManager
 Zend/Mvc
 Zend/Navigation
 Zend/OAuth

src/Exception/ExceptionInterface.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Log\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface ExceptionInterface
+{}

src/Exception/InvalidArgumentException.php

@@ -32,5 +32,5 @@
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\Log\Exception
+    implements ExceptionInterface
 {}

src/Exception/RuntimeException.php

@@ -32,5 +32,5 @@
  */
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\Log\Exception
+    implements ExceptionInterface
 {}

src/Filter/FilterInterface.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Log\Filter;
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface FilterInterface
+{
+    /**
+     * Returns TRUE to accept the message, FALSE to block it.
+     *
+     * @param array $event event data
+     * @return boolean accepted?
+     */
+    public function filter(array $event);
+}

src/Filter/Priority.php

@@ -21,8 +21,7 @@
 
 namespace Zend\Log\Filter;
 
-use Zend\Log\Exception,
-    Zend\Log\Filter;
+use Zend\Log\Exception;
 
 /**
  * @category   Zend
@@ -31,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Priority implements Filter
+class Priority implements FilterInterface
 {
     /**
      * @var int

src/Filter/Regex.php

@@ -24,8 +24,7 @@
  */
 namespace Zend\Log\Filter;
 
-use Zend\Log\Exception,
-    Zend\Log\Filter;
+use Zend\Log\Exception;
 
 /**
  * @category   Zend
@@ -34,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Regex implements Filter
+class Regex implements FilterInterface
 {
     /**
      * Regex to match
@@ -47,7 +46,6 @@ class Regex implements Filter
      * Filter out any log messages not matching the pattern
      *
      * @param string $regex Regular expression to test the log message
-     * @return Message
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($regex)

src/Filter/SuppressFilter.php

@@ -21,8 +21,7 @@
 
 namespace Zend\Log\Filter;
 
-use Zend\Log\Exception,
-    Zend\Log\Filter;
+use Zend\Log\Exception;
 
 /**
  * @category   Zend
@@ -31,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class SuppressFilter implements Filter
+class SuppressFilter implements FilterInterface
 {
     /**
      * @var boolean

src/Filter/Validator.php

@@ -22,7 +22,6 @@
 namespace Zend\Log\Filter;
 
 use Zend\Log\Exception,
-    Zend\Log\Filter,
     Zend\Validator\ValidatorInterface as ZendValidator;
 
 /**
@@ -32,7 +31,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Validator implements Filter
+class Validator implements FilterInterface
 {
     /**
      * Regex to match

src/Formatter/ErrorHandler.php

@@ -23,8 +23,8 @@
  * @namespace
  */
 namespace Zend\Log\Formatter;
-use Zend\Log\Formatter,
-    Zend\Log\Exception;
+
+use Zend\Log\Exception;
 
 /**
  * @category   Zend
@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class ErrorHandler implements Formatter
+class ErrorHandler implements FormatterInterface
 {
     const DEFAULT_FORMAT = '%timestamp% %priorityName% (%priority%) %message% (errno %extra[errno]%) in %extra[file]% on line %extra[line]%';
 
@@ -48,7 +48,6 @@ class ErrorHandler implements Formatter
      * Class constructor
      *
      * @param  null|string  $format  Format specifier for log messages
-     * @return void
      * @throws Zend\Log\Exception\InvalidArgumentException
      */
     public function __construct($format = null)

src/Formatter/ExceptionHandler.php

@@ -24,16 +24,14 @@
  */
 namespace Zend\Log\Formatter;
 
-use Zend\Log\Formatter;
-
 /**
  * @category   Zend
  * @package    Zend_Log
  * @subpackage Formatter
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class ExceptionHandler implements Formatter
+class ExceptionHandler implements FormatterInterface
 {
     /**
      * This method formats the event for the PHP Exception

src/Formatter/FormatterInterface.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Log\Formatter;
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+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
+     */
+    public function format($event);
+}

src/Formatter/Simple.php

@@ -21,8 +21,7 @@
 
 namespace Zend\Log\Formatter;
 
-use Zend\Log\Formatter,
-    Zend\Log\Exception;
+use Zend\Log\Exception;
 
 /**
  * @category   Zend
@@ -31,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Simple implements Formatter
+class Simple implements FormatterInterface
 {
     /**
      * @var string

src/Formatter/Xml.php

@@ -21,11 +21,10 @@
 
 namespace Zend\Log\Formatter;
 
-use Traversable;
-use Zend\Stdlib\ArrayUtils;
-use DOMDocument,
-    DOMElement,
-    Zend\Log\Formatter;
+use Traversable,
+    Zend\Stdlib\ArrayUtils,
+    DOMDocument,
+    DOMElement;
 
 /**
  * @category   Zend
@@ -34,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Xml implements Formatter
+class Xml implements FormatterInterface
 {
     /**
      * @var string Name of root element

src/Logger.php

@@ -35,7 +35,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Logger implements Loggable, Pluggable
+class Logger implements LoggerInterface, Pluggable
 {
     /**
      * @const int defined from the BSD Syslog message severities
@@ -211,7 +211,7 @@ public function addWriter($writer, $priority=1)
     {
         if (is_string($writer)) {
             $writer = $this->plugin($writer);
-        } elseif (!$writer instanceof Writer) {
+        } elseif (!$writer instanceof Writer\WriterInterface) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Writer must implement Zend\Log\Writer; received "%s"',
                 is_object($writer) ? get_class($writer) : gettype($writer)
@@ -245,7 +245,7 @@ public function setWriters($writers)
             throw new Exception\InvalidArgumentException('Writers must be a SplPriorityQueue of Zend\Log\Writer');
         }
         foreach ($writers->toArray() as $writer) {
-            if (!$writer instanceof Writer) {
+            if (!$writer instanceof Writer\WriterInterface) {
                 throw new Exception\InvalidArgumentException('Writers must be a SplPriorityQueue of Zend\Log\Writer');
             }
         }

src/LoggerAware.php → src/LoggerAwareInterface.php

@@ -23,7 +23,7 @@
  */
 namespace Zend\Log;
 
-use Zend\Log\Logger;
+use Zend\Log\LoggerInterface;
 
 /**
  * Logger aware interface
@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface LoggerAware
+interface LoggerAwareInterface
 {
-    public function setLogger(Logger $logger);
+    public function setLogger(LoggerInterface $logger);
 }

src/Loggable.php → src/LoggerInterface.php

@@ -29,7 +29,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Loggable
+interface LoggerInterface
 {
     /**
      * @param string $message