Merge branch 'master' into feature/math-biginteger

src/ModuleEvent.php

@@ -90,19 +90,11 @@ public function getConfigListener()
     /**
      * Set module object to compose in this event
      *
-     * @param  Listener\ConfigMergerInterface $listener
+     * @param  Listener\ConfigMergerInterface $configListener
      * @return ModuleEvent
      */
-    public function setConfigListener($configListener)
+    public function setConfigListener(Listener\ConfigMergerInterface $configListener)
     {
-        if (!$configListener instanceof Listener\ConfigMergerInterface) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s::%s() expects an object implementing Zend\ModuleManager\Listener\ConfigMergerInterface as an argument; %s provided',
-                __CLASS__, 
-                __METHOD__, 
-                (is_object($configListener) ? get_class($configListener) : gettype($configListener))
-            ));
-        }
         $this->setParam('configListener', $configListener);
         return $this;
     }

test/ModuleEventTest.php

@@ -93,10 +93,4 @@ public function testCanRetrieveConfigListenerViaGetter()
         $test = $this->event->getConfigListener();
         $this->assertSame($configListener, $test);
     }
-
-    public function testPassingNonConfigMergerToSetConfigListenerRaisesException()
-    {
-        $this->setExpectedException('Zend\ModuleManager\Exception\InvalidArgumentException');
-        $this->event->setConfigListener(new StdClass);
-    }
 }