Merge branch 'develop' of git://github.com/zendframework/zf2 into dev…

…elop

src/EventManager.php

@@ -447,19 +447,15 @@ protected function triggerListeners($event, EventInterface $e, $callback = null)
         $wildcardListeners       = $this->getListeners('*');
         if (count($sharedListeners) || count($sharedWildcardListeners) || count($wildcardListeners)) {
             $listeners = clone $listeners;
-        }
-
-        // Shared listeners on this specific event
-        $this->insertListeners($listeners, $sharedListeners);
 
-        // Shared wildcard listeners
-        $this->insertListeners($listeners, $sharedWildcardListeners);
+            // Shared listeners on this specific event
+            $this->insertListeners($listeners, $sharedListeners);
 
-        // Add wildcard listeners
-        $this->insertListeners($listeners, $wildcardListeners);
+            // Shared wildcard listeners
+            $this->insertListeners($listeners, $sharedWildcardListeners);
 
-        if ($listeners->isEmpty()) {
-            return $responses;
+            // Add wildcard listeners
+            $this->insertListeners($listeners, $wildcardListeners);
         }
 
         foreach ($listeners as $listener) {
@@ -535,10 +531,6 @@ protected function getSharedListeners($event)
      */
     protected function insertListeners($masterListeners, $listeners)
     {
-        if (!count($listeners)) {
-            return;
-        }
-
         foreach ($listeners as $listener) {
             $priority = $listener->getMetadatum('priority');
             if (null === $priority) {

src/EventManagerAwareTrait.php

@@ -0,0 +1,22 @@
+<?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
+ * @package   Zend_EventManager
+ */
+
+namespace Zend\EventManager;
+
+use \Zend\EventManager\ProvidesEvents;
+
+/**
+ * @category Zend
+ * @package  Zend_EventManager
+ */
+trait EventManagerAwareTrait
+{
+    use ProvidesEvents;
+}

test/EventManagerAwareTraitTest.php

@@ -0,0 +1,46 @@
+<?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
+ * @package   Zend_EventManager
+ */
+
+namespace ZendTest\EventManager;
+
+use \PHPUnit_Framework_TestCase as TestCase;
+use \Zend\EventManager\EventManager;
+
+/**
+ * @requires PHP 5.4
+ */
+class EventManagerAwareTraitTest extends TestCase
+{
+    public function testSetEventManager()
+    {
+        $object = $this->getObjectForTrait('\Zend\EventManager\EventManagerAwareTrait');
+
+        $this->assertAttributeEquals(null, 'events', $object);
+
+        $eventManager = new EventManager;
+
+        $object->setEventManager($eventManager);
+
+        $this->assertAttributeEquals($eventManager, 'events', $object);
+    }
+
+    public function testGetEventManager()
+    {
+        $object = $this->getObjectForTrait('\Zend\EventManager\EventManagerAwareTrait');
+
+        $this->assertInstanceOf('\Zend\EventManager\EventManagerInterface', $object->getEventManager());
+
+        $eventManager = new EventManager;
+
+        $object->setEventManager($eventManager);
+
+        $this->assertSame($eventManager, $object->getEventManager());
+    }
+}