Merge branch 'master' of https://github.com/zendframework/zf2

cdekok · cdekok · commit 22352883f776 · 2013-03-07T20:39:19.000+01:00
diff --git a/src/UriNormalize.php b/src/UriNormalize.php
@@ -34,7 +34,7 @@ class UriNormalize extends AbstractFilter
     /**
      * Sets filter options
      *
-     * @param  string|array|\Zend\Config\Config $options
+     * @param  array|\Traversable|null $options
      * @return void
      */
     public function __construct($options = null)

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class UriNormalize extends AbstractFilter`
`34`	`34`	`/**`
`35`	`35`	`* Sets filter options`
`36`	`36`	`*`
`37`		`- * @param string\|array\|\Zend\Config\Config $options`
	`37`	`+ * @param array\|\Traversable\|null $options`
`38`	`38`	`* @return void`
`39`	`39`	`*/`
`40`	`40`	`public function __construct($options = null)`