PR zendframework/zendframework#4022

Merge branch 'hotfix/3685' of git://github.com/wryck7/zf2 into wryck7-hotfix/3685

src/EventManager.php

@@ -157,7 +157,7 @@ public function setIdentifiers($identifiers)
     public function addIdentifiers($identifiers)
     {
         if (is_array($identifiers) || $identifiers instanceof Traversable) {
-            $this->identifiers = array_unique($this->identifiers + (array) $identifiers);
+            $this->identifiers = array_unique(array_merge($this->identifiers, (array) $identifiers));
         } elseif ($identifiers !== null) {
             $this->identifiers = array_unique(array_merge($this->identifiers, array($identifiers)));
         }

test/EventManagerTest.php

@@ -592,7 +592,12 @@ public function testIdentifierGetterSettersWorkWithArrays()
         $this->assertSame($this->events->getIdentifiers(), $identifiers);
         $identifiers[] = 'baz';
         $this->assertInstanceOf('Zend\EventManager\EventManager', $this->events->addIdentifiers($identifiers));
-        $this->assertSame($this->events->getIdentifiers(), $identifiers);
+
+        // This is done because the keys doesn't matter, just the values
+        $expectedIdentifiers = $this->events->getIdentifiers();
+        sort($expectedIdentifiers);
+        sort($identifiers);
+        $this->assertSame($expectedIdentifiers, $identifiers);
     }
 
     public function testIdentifierGetterSettersWorkWithTraversables()
@@ -602,7 +607,13 @@ public function testIdentifierGetterSettersWorkWithTraversables()
         $this->assertSame($this->events->getIdentifiers(), (array) $identifiers);
         $identifiers = new ArrayIterator(array('foo', 'bar', 'baz'));
         $this->assertInstanceOf('Zend\EventManager\EventManager', $this->events->addIdentifiers($identifiers));
-        $this->assertSame($this->events->getIdentifiers(), (array) $identifiers);
+
+        // This is done because the keys doesn't matter, just the values
+        $expectedIdentifiers = $this->events->getIdentifiers();
+        sort($expectedIdentifiers);
+        $identifiers = (array) $identifiers;
+        sort($identifiers);
+        $this->assertSame($expectedIdentifiers, $identifiers);
     }
 
     public function testListenersAttachedWithWildcardAreTriggeredForAllEvents()