Merge branch 'master' of git://github.com/zendframework/zf2 into cache_filesystem

marc-mabe · marc-mabe · commit f2f20f397557 · 2012-01-03T22:40:14.000+01:00
diff --git a/src/Options.php b/src/Options.php
@@ -34,16 +34,16 @@
 abstract class Options implements ParameterObject
 {
     /**
-     * @param  array|Traversable|null $config
+     * @param  array|Traversable|null $options
      * @return Options
      * @throws Exception\InvalidArgumentException
      */
-    public function __construct($config = null)
+    public function __construct($options = null)
     {
-        if (is_null($config)) {
+        if (is_null($options)) {
             return;
         }
-        $this->processArray($config);
+        $this->processArray($options);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -34,16 +34,16 @@`
`34`	`34`	`abstract class Options implements ParameterObject`
`35`	`35`	`{`
`36`	`36`	`/**`
`37`		`- * @param array\|Traversable\|null $config`
	`37`	`+ * @param array\|Traversable\|null $options`
`38`	`38`	`* @return Options`
`39`	`39`	`* @throws Exception\InvalidArgumentException`
`40`	`40`	`*/`
`41`		`- public function __construct($config = null)`
	`41`	`+ public function __construct($options = null)`
`42`	`42`	`{`
`43`		`- if (is_null($config)) {`
	`43`	`+ if (is_null($options)) {`
`44`	`44`	`return;`
`45`	`45`	`}`
`46`		`- $this->processArray($config);`
	`46`	`+ $this->processArray($options);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`