[Routing] small refactoring in Router

Tobion · Tobion · commit dd0403f117b2 · 2012-08-29T09:36:18.000+03:00
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
@@ -83,17 +83,15 @@ public function setOptions(array $options)
 
         // check option names and live merge, if errors are encountered Exception will be thrown
         $invalid = array();
-        $isInvalid = false;
         foreach ($options as $key => $value) {
             if (array_key_exists($key, $this->options)) {
                 $this->options[$key] = $value;
             } else {
-                $isInvalid = true;
                 $invalid[] = $key;
             }
         }
 
-        if ($isInvalid) {
+        if ($invalid) {
             throw new \InvalidArgumentException(sprintf('The Router does not support the following options: "%s".', implode('\', \'', $invalid)));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -83,17 +83,15 @@ public function setOptions(array $options)`
`83`	`83`
`84`	`84`	`// check option names and live merge, if errors are encountered Exception will be thrown`
`85`	`85`	`$invalid = array();`
`86`		`- $isInvalid = false;`
`87`	`86`	`foreach ($options as $key => $value) {`
`88`	`87`	`if (array_key_exists($key, $this->options)) {`
`89`	`88`	`$this->options[$key] = $value;`
`90`	`89`	`} else {`
`91`		`- $isInvalid = true;`
`92`	`90`	`$invalid[] = $key;`
`93`	`91`	`}`
`94`	`92`	`}`
`95`	`93`
`96`		`- if ($isInvalid) {`
	`94`	`+ if ($invalid) {`
`97`	`95`	`throw new \InvalidArgumentException(sprintf('The Router does not support the following options: "%s".', implode('\', \'', $invalid)));`
`98`	`96`	`}`
`99`	`97`	`}`