Merge branch 'master' into feature/math-biginteger

src/Event.php

@@ -109,6 +109,7 @@ public function getTarget()
      * 
      * @param  array|ArrayAccess|object $params 
      * @return Event
+     * @throws Exception\InvalidArgumentException
      */
     public function setParams($params)
     {

src/EventInterface.php

@@ -20,6 +20,8 @@
 
 namespace Zend\EventManager;
 
+use ArrayAccess;
+
 /**
  * Representation of an event
  *

src/EventManager.php

@@ -20,12 +20,12 @@
 
 namespace Zend\EventManager;
 
-use Zend\Stdlib\CallbackHandler,
-    Zend\Stdlib\Exception\InvalidCallbackException,
-    Zend\Stdlib\PriorityQueue,
-    ArrayObject,
-    SplPriorityQueue,
-    Traversable;
+use ArrayAccess;
+use ArrayObject;
+use SplPriorityQueue;
+use Traversable;
+use Zend\Stdlib\CallbackHandler;
+use Zend\Stdlib\PriorityQueue;
 
 /**
  * Event manager: notification system
@@ -70,7 +70,6 @@ class EventManager implements EventManagerInterface
      * SharedEventManagerInterface.
      *
      * @param  null|string|int|array|Traversable $identifiers
-     * @return void
      */
     public function __construct($identifiers = null)
     {
@@ -176,6 +175,7 @@ public function addIdentifiers($identifiers)
      * @param  array|ArrayAccess $argv Array of arguments; typically, should be associative
      * @param  null|callback $callback
      * @return ResponseCollection All listener return values
+     * @throws Exception\InvalidCallbackException
      */
     public function trigger($event, $target = null, $argv = array(), $callback = null)
     {
@@ -199,7 +199,7 @@ public function trigger($event, $target = null, $argv = array(), $callback = nul
         }
 
         if ($callback && !is_callable($callback)) {
-            throw new InvalidCallbackException('Invalid callback provided');
+            throw new Exception\InvalidCallbackException('Invalid callback provided');
         }
 
         return $this->triggerListeners($event, $e, $callback);
@@ -216,7 +216,8 @@ public function trigger($event, $target = null, $argv = array(), $callback = nul
      * @param  string|object $target Object calling emit, or symbol describing target (such as static method name)
      * @param  array|ArrayAccess $argv Array of arguments; typically, should be associative
      * @param  Callable $callback
-     * @throws InvalidCallbackException if invalid callback provided
+     * @return ResponseCollection
+     * @throws Exception\InvalidCallbackException if invalid callback provided
      */
     public function triggerUntil($event, $target, $argv = null, $callback = null)
     {
@@ -240,7 +241,7 @@ public function triggerUntil($event, $target, $argv = null, $callback = null)
         }
 
         if (!is_callable($callback)) {
-            throw new InvalidCallbackException('Invalid callback provided');
+            throw new Exception\InvalidCallbackException('Invalid callback provided');
         }
 
         return $this->triggerListeners($event, $e, $callback);
@@ -264,6 +265,7 @@ public function triggerUntil($event, $target, $argv = null, $callback = null)
      * @param  callback|int $callback If string $event provided, expects PHP callback; for a ListenerAggregateInterface $event, this will be the priority
      * @param  int $priority If provided, the priority at which to register the callback
      * @return CallbackHandler|mixed CallbackHandler if attaching callback (to allow later unsubscribe); mixed if attaching aggregate
+     * @throws Exception\InvalidArgumentException
      */
     public function attach($event, $callback = null, $priority = 1)
     {

src/EventManagerInterface.php

@@ -20,9 +20,9 @@
 
 namespace Zend\EventManager;
 
-use Zend\Stdlib\CallbackHandler,
-    Traversable,
-    ArrayObject;
+use ArrayObject;
+use Traversable;
+use Zend\Stdlib\CallbackHandler;
 
 /**
  * Interface for messengers
@@ -84,7 +84,7 @@ public function attach($event, $callback = null, $priority = 1);
      * Detach an event listener
      * 
      * @param  CallbackHandler|ListenerAggregateInterface $listener 
-     * @return void
+     * @return bool
      */
     public function detach($listener);
 

src/EventsCapableInterface.php

@@ -35,7 +35,7 @@ interface EventsCapableInterface
      *
      * Lazy-loads an EventManager instance if none registered.
      *
-     * @return EventCollection
+     * @return EventManagerInterface
      */
     public function events();
 }

src/Exception/DomainException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Zend\EventManager\Exception;
+
+class DomainException extends \DomainException implements ExceptionInterface
+{
+}

src/Exception/InvalidArgumentException.php

@@ -28,7 +28,6 @@
  * @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 InvalidArgumentException extends \InvalidArgumentException implements 
-    ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }

src/Exception/InvalidCallbackException.php

@@ -0,0 +1,33 @@
+<?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_Stdlib
+ * @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\EventManager\Exception;
+
+/**
+ * Invalid callback exception
+ *
+ * @category   Zend
+ * @package    Zend_EventManager
+ * @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 InvalidCallbackException extends DomainException implements ExceptionInterface
+{
+}

src/Filter/FilterInterface.php

@@ -20,6 +20,7 @@
 
 namespace Zend\EventManager\Filter;
 
+use Zend\EventManager\ResponseCollection;
 use Zend\Stdlib\CallbackHandler;
 
 /**

src/Filter/FilterIterator.php

@@ -20,8 +20,8 @@
 
 namespace Zend\EventManager\Filter;
 
-use Zend\Stdlib\CallbackHandler,
-    Zend\Stdlib\SplPriorityQueue;
+use Zend\Stdlib\CallbackHandler;
+use Zend\Stdlib\SplPriorityQueue;
 
 /**
  * Specialized priority queue implementation for use with an intercepting 
@@ -96,7 +96,7 @@ public function remove($datum)
      * @param  mixed $context 
      * @param  array $params 
      * @param  FilterIterator $chain 
-     * @return void
+     * @return mixed
      */
     public function next($context = null, array $params = array(), $chain = null)
     {

src/FilterChain.php

@@ -20,8 +20,7 @@
 
 namespace Zend\EventManager;
 
-use Zend\Stdlib\CallbackHandler,
-    Zend\Stdlib\Exception\InvalidCallbackException;
+use Zend\Stdlib\CallbackHandler;
 
 /**
  * FilterChain: intercepting filter manager
@@ -42,8 +41,6 @@ class FilterChain implements Filter\FilterInterface
      * Constructor
      *
      * Initializes Filter\FilterIterator in which filters will be aggregated
-     * 
-     * @return void
      */
     public function __construct()
     {
@@ -81,11 +78,12 @@ public function run($context, array $argv = array())
      * @param  callback $callback PHP Callback
      * @param  int $priority Priority in the queue at which to execute; defaults to 1 (higher numbers == higher priority)
      * @return CallbackHandler (to allow later unsubscribe)
+     * @throws Exception\InvalidCallbackException
      */
     public function attach($callback, $priority = 1)
     {
         if (empty($callback)) {
-            throw new InvalidCallbackException('No callback provided');
+            throw new Exception\InvalidCallbackException('No callback provided');
         }
         $filter = new CallbackHandler($callback, array('priority' => $priority));
         $this->filters->insert($filter, $priority);
@@ -106,7 +104,7 @@ public function detach(CallbackHandler $filter)
     /**
      * Retrieve all filters
      * 
-     * @return FilterIterator
+     * @return Filter\FilterIterator
      */
     public function getFilters()
     {
@@ -133,6 +131,6 @@ public function clearFilters()
      */
     public function getResponses()
     {
-        return $this->responses;
+        return null;
     }
 }

src/GlobalEventManager.php

@@ -20,9 +20,9 @@
 
 namespace Zend\EventManager;
 
-use Zend\Stdlib\CallbackHandler,
-    Zend\Stdlib\PriorityQueue,
-    ArrayObject;
+use ArrayObject;
+use Zend\Stdlib\CallbackHandler;
+use Zend\Stdlib\PriorityQueue;
 
 /**
  * Event manager: notification system
@@ -56,7 +56,7 @@ public static function setEventCollection(EventManagerInterface $events = null)
     /**
      * Get event collection on which this operates
      * 
-     * @return void
+     * @return EventManagerInterface
      */
     public static function getEventCollection()
     {
@@ -147,6 +147,6 @@ public static function getListeners($event)
      */
     public static function clearListeners($event)
     {
-        return static::getEventCollection()->clearListeners($event);
+        static::getEventCollection()->clearListeners($event);
     }
 }

src/ListenerAggregateInterface.php

@@ -42,7 +42,6 @@ interface ListenerAggregateInterface
      * implementation will pass this to the aggregate.
      *
      * @param EventManagerInterface $events
-     * @param null|int $priority Optional priority "hint" to use when attaching listeners
      */
     public function attach(EventManagerInterface $events);
 

src/ResponseCollection.php

@@ -86,6 +86,7 @@ public function last()
      * Check if any of the responses match the given value.
      *
      * @param  mixed $value The value to look for among responses
+     * @return bool
      */
     public function contains($value)
     {

src/SharedEventManager.php

@@ -20,8 +20,8 @@
 
 namespace Zend\EventManager;
 
-use Zend\Stdlib\CallbackHandler,
-    Zend\Stdlib\PriorityQueue;
+use Zend\Stdlib\CallbackHandler;
+use Zend\Stdlib\PriorityQueue;
 
 /**
  * Shared/contextual EventManager

src/SharedEventManagerInterface.php

@@ -20,8 +20,8 @@
 
 namespace Zend\EventManager;
 
-use Zend\Stdlib\CallbackHandler,
-    Zend\Stdlib\PriorityQueue;
+use Zend\Stdlib\CallbackHandler;
+use Zend\Stdlib\PriorityQueue;
 
 /**
  * Interface for shared event listener collections