merged branch Tobion/headerbag (PR #5282)

fabpot · fabpot · commit d3625b0c2bf9 · 2012-08-17T10:18:18.000+02:00
Commits
-------

ccb6dad [HttpFoundation] fixed undefined offset for assoc arrays in HeaderBag

Discussion
----------

[HttpFoundation] fixed undefined offset for assoc arrays in HeaderBag

`get` is assuming the headers are zero-indexed. So something like this would otherwise create a php warning.
```
$bag-&gt;set('foo', array('bad-assoc-index' =&gt; 'value'));
$this-&gt;assertSame('value', $bag-&gt;get('foo'));
```
diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -157,7 +157,7 @@ public function set($key, $values, $replace = true)
     {
         $key = strtr(strtolower($key), '_', '-');
 
-        $values = (array) $values;
+        $values = array_values((array) $values);
 
         if (true === $replace || !isset($this->headers[$key])) {
             $this->headers[$key] = $values;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
@@ -68,6 +68,14 @@ public function testGet()
         $this->assertEquals( array('bar', 'bor'), $bag->get('foo', 'nope', false), '->get return all values as array');
     }
 
+    public function testSetAssociativeArray()
+    {
+        $bag = new HeaderBag();
+        $bag->set('foo', array('bad-assoc-index' => 'value'));
+        $this->assertSame('value', $bag->get('foo'));
+        $this->assertEquals(array('value'), $bag->get('foo', 'nope', false), 'assoc indices of multi-valued headers are ignored');
+    }
+
     /**
      * @covers Symfony\Component\HttpFoundation\HeaderBag::contains
      */

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function set($key, $values, $replace = true)`
`157`	`157`	`{`
`158`	`158`	`$key = strtr(strtolower($key), '_', '-');`
`159`	`159`
`160`		`- $values = (array) $values;`
	`160`	`+ $values = array_values((array) $values);`
`161`	`161`
`162`	`162`	`if (true === $replace \|\| !isset($this->headers[$key])) {`
`163`	`163`	`$this->headers[$key] = $values;`