Merge branch 'hotfix/3679' into develop

weierophinney · weierophinney · commit d7ffaed305f1 · 2013-02-06T12:21:53.000-06:00
Forward port zendframework/zendframework#3679
diff --git a/src/Headers.php b/src/Headers.php
@@ -126,7 +126,7 @@ public function getPluginClassLoader()
      */
     public function addHeaders($headers)
     {
-        if (!is_array($headers) && !$headers instanceof \Traversable) {
+        if (!is_array($headers) && !$headers instanceof Traversable) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Expected array or Traversable; received "%s"',
                 (is_object($headers) ? get_class($headers) : gettype($headers))

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function getPluginClassLoader()`
`126`	`126`	`*/`
`127`	`127`	`public function addHeaders($headers)`
`128`	`128`	`{`
`129`		`- if (!is_array($headers) && !$headers instanceof \Traversable) {`
	`129`	`+ if (!is_array($headers) && !$headers instanceof Traversable) {`
`130`	`130`	`throw new Exception\InvalidArgumentException(sprintf(`
`131`	`131`	`'Expected array or Traversable; received "%s"',`
`132`	`132`	`(is_object($headers) ? get_class($headers) : gettype($headers))`