Merge branch 'hotfix/112' into develop

Forward port #112

Author: weierophinney

Diff for: CHANGELOG.md

@@ -117,6 +117,9 @@ for full details on how to migrate your v2 application.
 - [#107](https://github.com/zendframework/zend-mvc/pull/107) fixes an incorrect
   import statement in the `DiStrictAbstractServiceFactoryFactory` that prevented
   it from working.
+- [#112](https://github.com/zendframework/zend-mvc/pull/112) fixes how the
+  `Forward` plugin detects and detaches event listeners to ensure it works
+  against either v2 or v3 releases of zend-eventmanager.
 
 ## 2.7.5 - 2016-04-06
 

Diff for: src/Controller/Plugin/Forward.php

@@ -179,32 +179,39 @@ protected function detachProblemListeners(SharedEvents $sharedEvents)
             foreach ($eventArray as $eventName => $classArray) {
                 $results[$id][$eventName] = [];
                 $events = $this->getSharedListenersById($id, $eventName, $sharedEvents);
-                foreach ($events as $priority => $currentEvent) {
-                    $currentCallback = $currentEvent;
-
-                    // zend-eventmanager v2 compatibility:
-                    if ($currentCallback instanceof CallbackHandler) {
-                        $currentCallback = $currentEvent->getCallback();
-                        $priority        = $currentEvent->getMetadatum('priority');
+                foreach ($events as $priority => $currentPriorityEvents) {
+                    // v2 fix
+                    if (!is_array($currentPriorityEvents)) {
+                        $currentPriorityEvents = [$currentPriorityEvents];
                     }
+                    // v3
+                    foreach ($currentPriorityEvents as $currentEvent) {
+                        $currentCallback = $currentEvent;
+
+                        // zend-eventmanager v2 compatibility:
+                        if ($currentCallback instanceof CallbackHandler) {
+                            $currentCallback = $currentEvent->getCallback();
+                            $priority = $currentEvent->getMetadatum('priority');
+                        }
 
-                    // If we have an array, grab the object
-                    if (is_array($currentCallback)) {
-                        $currentCallback = array_shift($currentCallback);
-                    }
+                        // If we have an array, grab the object
+                        if (is_array($currentCallback)) {
+                            $currentCallback = array_shift($currentCallback);
+                        }
 
-                    // This routine is only valid for object callbacks
-                    if (!is_object($currentCallback)) {
-                        continue;
-                    }
+                        // This routine is only valid for object callbacks
+                        if (!is_object($currentCallback)) {
+                            continue;
+                        }
 
-                    foreach ($classArray as $class) {
-                        if ($currentCallback instanceof $class) {
-                            // Pass $currentEvent; when using zend-eventmanager v2,
-                            // this is the CallbackHandler, while in v3 it's
-                            // the actual listener.
-                            $this->detachSharedListener($id, $currentEvent, $sharedEvents);
-                            $results[$id][$eventName][$priority] = $currentEvent;
+                        foreach ($classArray as $class) {
+                            if ($currentCallback instanceof $class) {
+                                // Pass $currentEvent; when using zend-eventmanager v2,
+                                // this is the CallbackHandler, while in v3 it's
+                                // the actual listener.
+                                $this->detachSharedListener($id, $currentEvent, $sharedEvents);
+                                $results[$id][$eventName][$priority] = $currentEvent;
+                            }
                         }
                     }
                 }