[HttpFoundation] fixed some unit tests

symfony · Sep 10, 2013 · 6ec2cba · 6ec2cba
1 parent e7386a8
commit 6ec2cba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -410,6 +410,10 @@ public function duplicate(array $query = null, array $request = null, array $att
             $dup->attributes->set('_format', $this->get('_format'));
         }
 
+        if (!$dup->getRequestFormat(null)) {
+            $dup->setRequestFormat($format = $this->getRequestFormat(null));
+        }
+
         return $dup;
     }
 

diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -284,6 +284,12 @@ public function testDuplicateWithFormat()
 
         $this->assertEquals('json', $dup->getRequestFormat());
         $this->assertEquals('json', $dup->attributes->get('_format'));
+
+        $request = new Request();
+        $request->setRequestFormat('xml');
+        $dup = $request->duplicate();
+
+        $this->assertEquals('xml', $dup->getRequestFormat());
     }
 
     /**