From 75207f352e640f6b942a2daf943c269287f6c689 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Fri, 11 May 2012 08:17:31 -0500
Subject: [PATCH 1/3] [zen-12] Removed Dojo from test suite

- Dojo integration largely relied on integration with Zend\Form; removing from
  testing for now, as it has not been refactored to work with the new Zend\Form
  code.
---
 .travis/skipped-components | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis/skipped-components b/.travis/skipped-components
index 31bcaa87..171dfe9d 100644
--- a/.travis/skipped-components
+++ b/.travis/skipped-components
@@ -1,5 +1,6 @@
 Zend/Amf
 Zend/Date
+Zend/Dojo
 Zend/Queue
 Zend/Service
 Zend/Test

From 28bdea26bc8c3890baa9fd0039278d8f6ed513ba Mon Sep 17 00:00:00 2001
From: prolic <saschaprolic@googlemail.com>
Date: Mon, 14 May 2012 21:30:13 +0200
Subject: [PATCH 2/3] renamed interfaces in zend\log

---
 src/Exception/ExceptionInterface.php       | 30 ++++++++
 src/Exception/InvalidArgumentException.php |  2 +-
 src/Exception/RuntimeException.php         |  2 +-
 src/Filter/FilterInterface.php             | 38 +++++++++
 src/Filter/Priority.php                    |  5 +-
 src/Filter/Regex.php                       |  6 +-
 src/Filter/SuppressFilter.php              |  5 +-
 src/Filter/Validator.php                   |  3 +-
 src/Formatter/ErrorHandler.php             |  7 +-
 src/Formatter/ExceptionHandler.php         |  4 +-
 src/Formatter/FormatterInterface.php       | 38 +++++++++
 src/Formatter/Simple.php                   |  5 +-
 src/Formatter/Xml.php                      | 11 ++-
 src/LoggableInterface.php                  | 89 ++++++++++++++++++++++
 src/Logger.php                             |  6 +-
 src/LoggerAwareInterface.php               | 39 ++++++++++
 src/Writer/AbstractWriter.php              | 11 ++-
 src/Writer/Db.php                          |  5 +-
 src/Writer/WriterInterface.php             | 64 ++++++++++++++++
 src/WriterBroker.php                       |  2 +-
 20 files changed, 330 insertions(+), 42 deletions(-)
 create mode 100644 src/Exception/ExceptionInterface.php
 create mode 100644 src/Filter/FilterInterface.php
 create mode 100644 src/Formatter/FormatterInterface.php
 create mode 100644 src/LoggableInterface.php
 create mode 100644 src/LoggerAwareInterface.php
 create mode 100644 src/Writer/WriterInterface.php

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
new file mode 100644
index 00000000..c1e89950
--- /dev/null
+++ b/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 license@zend.com 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
+{}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index a536b223..92776eb4 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -32,5 +32,5 @@
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\Log\Exception
+    implements ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index d732be1f..81070256 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -32,5 +32,5 @@
  */
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\Log\Exception
+    implements ExceptionInterface
 {}
diff --git a/src/Filter/FilterInterface.php b/src/Filter/FilterInterface.php
new file mode 100644
index 00000000..0a2a6233
--- /dev/null
+++ b/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 license@zend.com 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);
+}
diff --git a/src/Filter/Priority.php b/src/Filter/Priority.php
index 16ffb92c..577d29f1 100644
--- a/src/Filter/Priority.php
+++ b/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
diff --git a/src/Filter/Regex.php b/src/Filter/Regex.php
index dd21261f..61ec35b0 100644
--- a/src/Filter/Regex.php
+++ b/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)
diff --git a/src/Filter/SuppressFilter.php b/src/Filter/SuppressFilter.php
index ecb55320..662d2a2c 100644
--- a/src/Filter/SuppressFilter.php
+++ b/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
diff --git a/src/Filter/Validator.php b/src/Filter/Validator.php
index 19231cd0..4a1598f1 100644
--- a/src/Filter/Validator.php
+++ b/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
diff --git a/src/Formatter/ErrorHandler.php b/src/Formatter/ErrorHandler.php
index de0c22cd..68679461 100644
--- a/src/Formatter/ErrorHandler.php
+++ b/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)
diff --git a/src/Formatter/ExceptionHandler.php b/src/Formatter/ExceptionHandler.php
index d5922a8e..2f605a6c 100644
--- a/src/Formatter/ExceptionHandler.php
+++ b/src/Formatter/ExceptionHandler.php
@@ -24,8 +24,6 @@
  */
 namespace Zend\Log\Formatter;
 
-use Zend\Log\Formatter;
-
 /**
  * @category   Zend
  * @package    Zend_Log
@@ -33,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 ExceptionHandler implements Formatter
+class ExceptionHandler implements FormatterInterface
 {
     /**
      * This method formats the event for the PHP Exception
diff --git a/src/Formatter/FormatterInterface.php b/src/Formatter/FormatterInterface.php
new file mode 100644
index 00000000..1aa82870
--- /dev/null
+++ b/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 license@zend.com 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);
+}
diff --git a/src/Formatter/Simple.php b/src/Formatter/Simple.php
index 2008495d..28dec5ba 100644
--- a/src/Formatter/Simple.php
+++ b/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
diff --git a/src/Formatter/Xml.php b/src/Formatter/Xml.php
index ddfe7a13..6594163c 100644
--- a/src/Formatter/Xml.php
+++ b/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
diff --git a/src/LoggableInterface.php b/src/LoggableInterface.php
new file mode 100644
index 00000000..4d7cf487
--- /dev/null
+++ b/src/LoggableInterface.php
@@ -0,0 +1,89 @@
+<?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 license@zend.com 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
+ */
+namespace Zend\Log;
+
+/**
+ * @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 LoggableInterface
+{
+    /**
+     * @param string $message
+     * @param array|\Traversable $extra
+     * @return LoggabbleInterface
+     */
+    public function emerg($message, $extra = array());
+
+    /**
+     * @param string $message
+     * @param array|\Traversable $extra
+     * @return LoggabbleInterface
+     */
+    public function alert($message, $extra = array());
+
+    /**
+     * @param string $message
+     * @param array|\Traversable $extra
+     * @return LoggabbleInterface
+     */
+    public function crit($message, $extra = array());
+
+    /**
+     * @param string $message
+     * @param array|\Traversable $extra
+     * @return LoggabbleInterface
+     */
+    public function err($message, $extra = array());
+
+    /**
+     * @param string $message
+     * @param array|\Traversable $extra
+     * @return LoggabbleInterface
+     */
+    public function warn($message, $extra = array());
+
+    /**
+     * @param string $message
+     * @param array|\Traversable $extra
+     * @return LoggabbleInterface
+     */
+    public function notice($message, $extra = array());
+
+    /**
+     * @param string $message
+     * @param array|\Traversable $extra
+     * @return LoggabbleInterface
+     */
+    public function info($message, $extra = array());
+
+    /**
+     * @param string $message
+     * @param array|\Traversable $extra
+     * @return LoggabbleInterface
+     */
+    public function debug($message, $extra = array());
+}
diff --git a/src/Logger.php b/src/Logger.php
index 05fbadf7..eb3a2ab2 100644
--- a/src/Logger.php
+++ b/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 LoggableInterface, 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');
             }
         }
diff --git a/src/LoggerAwareInterface.php b/src/LoggerAwareInterface.php
new file mode 100644
index 00000000..96d88ce5
--- /dev/null
+++ b/src/LoggerAwareInterface.php
@@ -0,0 +1,39 @@
+<?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 license@zend.com 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
+ */
+namespace Zend\Log;
+
+use Zend\Log\Logger;
+
+/**
+ * Logger aware interface
+ *
+ * @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 LoggerAwareInterface
+{
+    public function setLogger(Logger $logger);
+}
diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
index a642db22..32dcd266 100644
--- a/src/Writer/AbstractWriter.php
+++ b/src/Writer/AbstractWriter.php
@@ -21,9 +21,8 @@
 
 namespace Zend\Log\Writer;
 
-use Zend\Log\Writer,
-    Zend\Log\Filter,
-    Zend\Log\Formatter,
+use Zend\Log\Filter,
+    Zend\Log\Formatter\FormatterInterface as Formatter,
     Zend\Log\Exception;
 
 /**
@@ -33,7 +32,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
  */
-abstract class AbstractWriter implements Writer
+abstract class AbstractWriter implements WriterInterface
 {
     /**
      * Filter chain
@@ -52,7 +51,7 @@ abstract class AbstractWriter implements Writer
     /**
      * Add a filter specific to this writer.
      *
-     * @param  Filter|int $filter
+     * @param  Filter\FilterInterface|int $filter
      * @return AbstractWriter
      * @throws Exception\InvalidArgumentException
      */
@@ -62,7 +61,7 @@ public function addFilter($filter)
             $filter = new Filter\Priority($filter);
         }
 
-        if (!$filter instanceof Filter) {
+        if (!$filter instanceof Filter\FilterInterface) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Filter must implement Zend\Log\Filter; received %s',
                 is_object($filter) ? get_class($filter) : gettype($filter)
diff --git a/src/Writer/Db.php b/src/Writer/Db.php
index 5c67d8e0..a0c9d49d 100644
--- a/src/Writer/Db.php
+++ b/src/Writer/Db.php
@@ -75,7 +75,7 @@ class Db extends AbstractWriter
     public function __construct(Adapter $db, $tableName, array $columnMap = null, $separator = null)
     {
         if ($db === null) {
-            Exception\InvalidArgumentException('You must pass a valid Zend\Db\Adapter\Adapter');
+            throw new Exception\InvalidArgumentException('You must pass a valid Zend\Db\Adapter\Adapter');
         }
         
         $this->db        = $db;
@@ -90,10 +90,11 @@ public function __construct(Adapter $db, $tableName, array $columnMap = null, $s
     /**
      * Formatting is not possible on this writer
      *
+     * @param Formatter\FormatterInterface $formatter
      * @return void
      * @throws Exception\InvalidArgumentException
      */
-    public function setFormatter(Formatter $formatter)
+    public function setFormatter(Formatter\FormatterInterface $formatter)
     {
         throw new Exception\InvalidArgumentException(get_class() . ' does not support formatting');
     }
diff --git a/src/Writer/WriterInterface.php b/src/Writer/WriterInterface.php
new file mode 100644
index 00000000..4b88d872
--- /dev/null
+++ b/src/Writer/WriterInterface.php
@@ -0,0 +1,64 @@
+<?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 license@zend.com 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\Writer;
+
+use Zend\Log\Formatter\FormatterInterface as Formatter,
+    Zend\Log\Filter\FilterInterface as 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 WriterInterface
+{
+    /**
+     * Add a log filter to the writer
+     *
+     * @param  int|Filter $filter
+     * @return WriterInterface
+     */
+    public function addFilter($filter);
+
+    /**
+     * Set a message formatter for the writer
+     *
+     * @param Formatter $formatter
+     * @return WriterInterface
+     */
+    public function setFormatter(Formatter $formatter);
+
+    /**
+     * Write a log message
+     *
+     * @param  array $event
+     * @return WriterInterface
+     */
+    public function write(array $event);
+
+    /**
+     * Perform shutdown activities
+     *
+     * @return void
+     */
+    public function shutdown();
+}
diff --git a/src/WriterBroker.php b/src/WriterBroker.php
index 9128d434..9a93ecd5 100644
--- a/src/WriterBroker.php
+++ b/src/WriterBroker.php
@@ -47,7 +47,7 @@ class WriterBroker extends PluginBroker
      */
     protected function validatePlugin($plugin)
     {
-        if (!$plugin instanceof Writer) {
+        if (!$plugin instanceof Writer\WriterInterface) {
             throw new Exception\InvalidArgumentException('Writer must implement Zend\Log\Writer');
         }
 

From 04d08c3e053301c45c588d7cbb96bcd5114ff46d Mon Sep 17 00:00:00 2001
From: Maks3w <github.maks3w@virtualplanets.net>
Date: Fri, 18 May 2012 00:22:37 +0200
Subject: [PATCH 3/3] [Travis] Enable Zend\Math tests

---
 .travis/tested-components | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis/tested-components b/.travis/tested-components
index b1f4a794..9b338206 100644
--- a/.travis/tested-components
+++ b/.travis/tested-components
@@ -29,6 +29,7 @@ Zend/Locale
 Zend/Log
 Zend/Mail
 Zend/Markup
+Zend/Math
 Zend/Measure
 Zend/Memory
 Zend/Mime