Merge branch 'hotfix/3679' into develop

Forward port zendframework/zendframework#3679

src/Listener/ConfigListener.php

@@ -277,7 +277,7 @@ protected function addConfigPaths($paths, $type)
         if (!is_array($paths)) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($paths))
             );
@@ -323,7 +323,7 @@ protected function addConfig($key, $config)
         if (!is_array($config)) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Config being merged must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.', gettype($config))
             );
         }

src/Listener/ListenerOptions.php

@@ -89,7 +89,7 @@ public function setModulePaths($modulePaths)
         if (!is_array($modulePaths) && !$modulePaths instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($modulePaths))
             );
@@ -131,7 +131,7 @@ public function setConfigGlobPaths($configGlobPaths)
         if (!is_array($configGlobPaths) && !$configGlobPaths instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($configGlobPaths))
             );
@@ -153,7 +153,7 @@ public function setConfigStaticPaths($configStaticPaths)
         if (!is_array($configStaticPaths) && !$configStaticPaths instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($configStaticPaths))
             );
@@ -186,7 +186,7 @@ public function setExtraConfig($extraConfig)
         if (!is_array($extraConfig) && !$extraConfig instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($extraConfig))
             );

src/ModuleManager.php

@@ -203,7 +203,7 @@ public function setModules($modules)
             $this->modules = $modules;
         } else {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Parameter to %s\'s %s method must be an array or implement the \\Traversable interface',
+                'Parameter to %s\'s %s method must be an array or implement the Traversable interface',
                 __CLASS__, __METHOD__
             ));
         }