[Http] Fixing issue related to nested POST data. Resolves guzzle#20

davedevelopment · Feb 14, 2012 · 6edccc2 · 6edccc2
1 parent f3a5b01
commit 6edccc2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Guzzle/Http/Message/EntityEnclosingRequest.php b/src/Guzzle/Http/Message/EntityEnclosingRequest.php
@@ -127,7 +127,7 @@ public function getPostFields()
     public function getPostFiles()
     {
         return $this->postFields->filter(function($key, $value) {
-            return $value && $value[0] == '@';
+            return $value && is_string($value) && $value[0] == '@';
         })->map(function($key, $value) {
             return str_replace('@', '', $value);
         })->getAll();

diff --git a/tests/Guzzle/Tests/Http/Message/EntityEnclosingRequestTest.php b/tests/Guzzle/Tests/Http/Message/EntityEnclosingRequestTest.php
@@ -303,4 +303,18 @@ public function testThrowsExceptionWhenContentLengthCannotBeDeterminedAndUsingHt
         $request->setProtocolVersion('1.0');
         $request->setBody(fopen($this->getServer()->getUrl(), 'r'));
     }
+
+    /**
+     * @covers Guzzle\Http\Message\EntityEnclosingRequest::getPostFiles
+     */
+    public function testAllowsNestedPostData()
+    {
+        $request = new EntityEnclosingRequest('POST', 'http://test.com/');
+        $request->addPostFields(array(
+            'a' => array('b', 'c')
+        ));
+        $this->assertEquals(array(
+            'a' => array('b', 'c')
+        ), $request->getPostFields());
+    }
 }