bug #19549 [HttpFoundation] fixed Request::getContent() reusage bug (1ma)

fabpot · fabpot · commit 2345ec1210ab · 2016-08-15T16:08:50.000-07:00
This PR was squashed before being merged into the 2.7 branch (closes #19549). Discussion ---------- [HttpFoundation] fixed Request::getContent() reusage bug | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | After calling ```Request::getContent(true)```, subsequent calls to the same instance method (withouth the ```$asResource``` flag) always returned ```false``` instead of the request body as a plain string. A unit test already existed to guard against this behaviour (the 'Resource then fetch' case) but it yielded a false positive because it was comparing ```''``` to ```false``` using PHPUnit's ```assertEquals``` method instead of ```assertSame```. For completeness sake I also added the missing usage permutations in the data provider, which already worked OK. Commits ------- c42ac66 [HttpFoundation] fixed Request::getContent() reusage bug
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1516,7 +1516,7 @@ public function getContent($asResource = false)
             return stream_get_contents($this->content);
         }
 
-        if (null === $this->content) {
+        if (null === $this->content || false === $this->content) {
             $this->content = file_get_contents('php://input');
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1042,8 +1042,16 @@ public function testGetContentCantBeCalledTwiceWithResources($first, $second)
         $req->getContent($second);
     }
 
+    public function getContentCantBeCalledTwiceWithResourcesProvider()
+    {
+        return array(
+            'Resource then fetch' => array(true, false),
+            'Resource then resource' => array(true, true),
+        );
+    }
+
     /**
-     * @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
+     * @dataProvider getContentCanBeCalledTwiceWithResourcesProvider
      * @requires PHP 5.6
      */
     public function testGetContentCanBeCalledTwiceWithResources($first, $second)
@@ -1060,12 +1068,14 @@ public function testGetContentCanBeCalledTwiceWithResources($first, $second)
             $b = stream_get_contents($b);
         }
 
-        $this->assertEquals($a, $b);
+        $this->assertSame($a, $b);
     }
 
-    public function getContentCantBeCalledTwiceWithResourcesProvider()
+    public function getContentCanBeCalledTwiceWithResourcesProvider()
     {
         return array(
+            'Fetch then fetch' => array(false, false),
+            'Fetch then resource' => array(false, true),
             'Resource then fetch' => array(true, false),
             'Resource then resource' => array(true, true),
         );

Original file line number	Diff line number	Diff line change
`@@ -1516,7 +1516,7 @@ public function getContent($asResource = false)`
`1516`	`1516`	`return stream_get_contents($this->content);`
`1517`	`1517`	`}`
`1518`	`1518`
`1519`		`- if (null === $this->content) {`
	`1519`	`+ if (null === $this->content \|\| false === $this->content) {`
`1520`	`1520`	`$this->content = file_get_contents('php://input');`
`1521`	`1521`	`}`
`1522`	`1522`