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

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

Hide file tree

Showing 28 changed files with 264 additions and 85 deletions.
diff --git a/composer.json b/composer.json
@@ -15,6 +15,12 @@
         "php": ">=5.3.3",
         "zendframework/zend-stdlib": "self.version"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
+        }
+    },
     "homepage": "https://github.com/zendframework/zend-event-manager",
     "autoload-dev": {
         "psr-4": {

diff --git a/src/Event.php b/src/Event.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_EventManager
  */
 
 namespace Zend\EventManager;
@@ -17,9 +16,6 @@
  *
  * Encapsulates the target context and parameters passed, and provides some
  * behavior for interacting with the event manager.
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 class Event implements EventInterface
 {

diff --git a/src/EventInterface.php b/src/EventInterface.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_EventManager
  */
 
 namespace Zend\EventManager;
@@ -14,9 +13,6 @@
 
 /**
  * Representation of an event
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 interface EventInterface
 {

diff --git a/src/EventManager.php b/src/EventManager.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_EventManager
  */
 
 namespace Zend\EventManager;
@@ -21,9 +20,6 @@
  *
  * Use the EventManager when you want to create a per-instance notification
  * system for your objects.
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 class EventManager implements EventManagerInterface
 {

diff --git a/src/EventManagerAwareInterface.php b/src/EventManagerAwareInterface.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_EventManager
  */
 
 namespace Zend\EventManager;
 
 /**
  * Interface to automate setter injection for an EventManager instance
- *
- * @category   Zend
- * @package    Zend_EventManager
- * @subpackage UnitTest
  */
 interface EventManagerAwareInterface extends EventsCapableInterface
 {

diff --git a/src/EventManagerAwareTrait.php b/src/EventManagerAwareTrait.php
@@ -0,0 +1,17 @@
+<?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\EventManager;
+
+use \Zend\EventManager\ProvidesEvents;
+
+trait EventManagerAwareTrait
+{
+    use ProvidesEvents;
+}
diff --git a/src/EventManagerInterface.php b/src/EventManagerInterface.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_EventManager
  */
 
 namespace Zend\EventManager;
@@ -15,9 +14,6 @@
 
 /**
  * Interface for messengers
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 interface EventManagerInterface extends SharedEventManagerAwareInterface
 {

diff --git a/src/EventsCapableInterface.php b/src/EventsCapableInterface.php
@@ -5,16 +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_EventManager
  */
 
 namespace Zend\EventManager;
 
 /**
  * Interface providing events that can be attached, detached and triggered.
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 interface EventsCapableInterface
 {

diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.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_EventManager
  */
 
 namespace Zend\EventManager\Exception;

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -5,16 +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_EventManager
  */
 
 namespace Zend\EventManager\Exception;
 
 /**
  * Base exception interface
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 interface ExceptionInterface
 {

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,16 +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_EventManager
  */
 
 namespace Zend\EventManager\Exception;
 
 /**
  * Invalid argument exception
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {

diff --git a/src/Exception/InvalidCallbackException.php b/src/Exception/InvalidCallbackException.php
@@ -5,16 +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_EventManager
  */
 
 namespace Zend\EventManager\Exception;
 
 /**
  * Invalid callback exception
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 class InvalidCallbackException extends DomainException implements ExceptionInterface
 {

diff --git a/src/Filter/FilterInterface.php b/src/Filter/FilterInterface.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_EventManager
  */
 
 namespace Zend\EventManager\Filter;
@@ -15,9 +14,6 @@
 
 /**
  * Interface for intercepting filter chains
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 interface FilterInterface
 {

diff --git a/src/Filter/FilterIterator.php b/src/Filter/FilterIterator.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_EventManager
  */
 
 namespace Zend\EventManager\Filter;
@@ -18,9 +17,6 @@
  * filter chain.
  *
  * Allows removal
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 class FilterIterator extends SplPriorityQueue
 {

diff --git a/src/FilterChain.php b/src/FilterChain.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_EventManager
  */
 
 namespace Zend\EventManager;
@@ -14,9 +13,6 @@
 
 /**
  * FilterChain: intercepting filter manager
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 class FilterChain implements Filter\FilterInterface
 {

diff --git a/src/GlobalEventManager.php b/src/GlobalEventManager.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_EventManager
  */
 
 namespace Zend\EventManager;
@@ -18,9 +17,6 @@
  *
  * Use the EventManager when you want to create a per-instance notification
  * system for your objects.
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 class GlobalEventManager
 {

diff --git a/src/ListenerAggregateInterface.php b/src/ListenerAggregateInterface.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_EventManager
  */
 
 namespace Zend\EventManager;
@@ -17,9 +16,6 @@
  * with an EventManager, without an event name. The {@link attach()} method will
  * then be called with the current EventManager instance, allowing the class to
  * wire up one or more listeners.
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 interface ListenerAggregateInterface
 {

diff --git a/src/ProvidesEvents.php b/src/ProvidesEvents.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_EventManager
  */
 
 namespace Zend\EventManager;
@@ -14,9 +13,6 @@
 
 /**
  * A trait for objects that provide events
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 trait ProvidesEvents
 {

diff --git a/src/ResponseCollection.php b/src/ResponseCollection.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_EventManager
  */
 
 namespace Zend\EventManager;
@@ -14,9 +13,6 @@
 
 /**
  * Collection of signal handler return values
- *
- * @category   Zend
- * @package    Zend_EventManager
  */
 class ResponseCollection extends SplStack
 {

diff --git a/src/SharedEventAggregateAwareInterface.php b/src/SharedEventAggregateAwareInterface.php
@@ -0,0 +1,34 @@
+<?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\EventManager;
+
+
+/**
+ * Interface for allowing attachment of shared aggregate listeners.
+ */
+interface SharedEventAggregateAwareInterface
+{
+    /**
+     * Attach a listener aggregate
+     *
+     * @param  SharedListenerAggregateInterface $aggregate
+     * @param  int $priority If provided, a suggested priority for the aggregate to use
+     * @return mixed return value of {@link SharedListenerAggregateInterface::attachShared()}
+     */
+    public function attachAggregate(SharedListenerAggregateInterface $aggregate, $priority = 1);
+
+    /**
+     * Detach a listener aggregate
+     *
+     * @param  SharedListenerAggregateInterface $aggregate
+     * @return mixed return value of {@link SharedListenerAggregateInterface::detachShared()}
+    */
+    public function detachAggregate(SharedListenerAggregateInterface $aggregate);
+}