merged branch Tobion/patch-2 (PR #5997)

fabpot · fabpot · commit 7b4a27893a92 · 2012-11-13T13:49:04.000+01:00
This PR was merged into the 2.1 branch. Commits ------- 7569ee2 [Routing] removed irrelevant string cast in Route Discussion ---------- [Routing] removed irrelevant string cast in Route Even if the passed key is an integer, casting to string won't make any difference in array keys (it remains an int key).
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -143,7 +143,7 @@ public function setOptions(array $options)
     public function addOptions(array $options)
     {
         foreach ($options as $name => $option) {
-            $this->options[(string) $name] = $option;
+            $this->options[$name] = $option;
         }
         $this->compiled = null;
 
@@ -220,7 +220,7 @@ public function setDefaults(array $defaults)
     public function addDefaults(array $defaults)
     {
         foreach ($defaults as $name => $default) {
-            $this->defaults[(string) $name] = $default;
+            $this->defaults[$name] = $default;
         }
         $this->compiled = null;
 
@@ -263,7 +263,7 @@ public function hasDefault($name)
      */
     public function setDefault($name, $default)
     {
-        $this->defaults[(string) $name] = $default;
+        $this->defaults[$name] = $default;
         $this->compiled = null;
 
         return $this;

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public function setOptions(array $options)`
`143`	`143`	`public function addOptions(array $options)`
`144`	`144`	`{`
`145`	`145`	`foreach ($options as $name => $option) {`
`146`		`- $this->options[(string) $name] = $option;`
	`146`	`+ $this->options[$name] = $option;`
`147`	`147`	`}`
`148`	`148`	`$this->compiled = null;`
`149`	`149`
`@@ -220,7 +220,7 @@ public function setDefaults(array $defaults)`
`220`	`220`	`public function addDefaults(array $defaults)`
`221`	`221`	`{`
`222`	`222`	`foreach ($defaults as $name => $default) {`
`223`		`- $this->defaults[(string) $name] = $default;`
	`223`	`+ $this->defaults[$name] = $default;`
`224`	`224`	`}`
`225`	`225`	`$this->compiled = null;`
`226`	`226`
`@@ -263,7 +263,7 @@ public function hasDefault($name)`
`263`	`263`	`*/`
`264`	`264`	`public function setDefault($name, $default)`
`265`	`265`	`{`
`266`		`- $this->defaults[(string) $name] = $default;`
	`266`	`+ $this->defaults[$name] = $default;`
`267`	`267`	`$this->compiled = null;`
`268`	`268`
`269`	`269`	`return $this;`