Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Preparing to tag 2.1.0 -- all new features from develop are now merged to master.
  • Loading branch information
weierophinney committed Jan 29, 2013

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Showing 27 changed files with 258 additions and 85 deletions.
4 changes: 0 additions & 4 deletions src/Event.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/EventInterface.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/EventManager.php
Original file line number Diff line number Diff line change
@@ -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
{
5 changes: 0 additions & 5 deletions src/EventManagerAwareInterface.php
Original file line number Diff line number Diff line change
@@ -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
{
17 changes: 17 additions & 0 deletions src/EventManagerAwareTrait.php
Original file line number Diff line number Diff line change
@@ -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-2012 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;
}
4 changes: 0 additions & 4 deletions src/EventManagerInterface.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/EventsCapableInterface.php
Original file line number Diff line number Diff line change
@@ -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
{
1 change: 0 additions & 1 deletion src/Exception/DomainException.php
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 0 additions & 4 deletions src/Exception/ExceptionInterface.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/Exception/InvalidCallbackException.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/Filter/FilterInterface.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/Filter/FilterIterator.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/FilterChain.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/GlobalEventManager.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/ListenerAggregateInterface.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/ProvidesEvents.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 0 additions & 4 deletions src/ResponseCollection.php
Original file line number Diff line number Diff line change
@@ -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
{
34 changes: 34 additions & 0 deletions src/SharedEventAggregateAwareInterface.php
Original file line number Diff line number Diff line change
@@ -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-2012 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);
}
Loading

0 comments on commit d748fa1

Please sign in to comment.