[Bug] NormalizeArrayListener should not run on FormRequest

Closes #62

Author: vimishor

lib/Bitbucket/API/Http/Client.php

@@ -113,7 +113,8 @@ public function delete($endpoint, $params = array(), $headers = array())
      */
     public function request($endpoint, $params = array(), $method = 'GET', array $headers = array())
     {
-        $request = $this->createRequest($method, $endpoint);
+        //$request = $this->createRequest($method, $endpoint);
+        $request = ($this->requestObj !== null) ? $this->requestObj : $this->createRequest($method, $endpoint);
 
         // add a default content-type if none was set
         if (empty($headers['Content-Type']) && in_array(strtoupper($method), array('POST', 'PUT'), true)) {

lib/Bitbucket/API/Http/Listener/NormalizeArrayListener.php

@@ -11,6 +11,7 @@
 
 namespace Bitbucket\API\Http\Listener;
 
+use Buzz\Message\Form\FormRequestInterface;
 use Buzz\Message\MessageInterface;
 use Buzz\Message\RequestInterface;
 
@@ -39,6 +40,10 @@ public function getName()
      */
     public function preSend(RequestInterface $request)
     {
+        if ($request instanceof FormRequestInterface) {
+            return;
+        }
+
         $request->setContent(
             // Transform: "foo[0]=xxx&foo[1]=yyy" to "foo=xxx&foo=yyy"
             preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $request->getContent())

test/Bitbucket/Tests/API/Http/Listener/NormalizeArrayListenerTest.php

@@ -2,8 +2,10 @@
 
 namespace Bitbucket\Tests\API\Http\Listener;
 
+use Bitbucket\API\Api;
 use Bitbucket\API\Http\Listener\NormalizeArrayListener;
 use Bitbucket\Tests\API as Tests;
+use Buzz\Message\Form\FormRequest;
 use Buzz\Message\Request;
 
 /**
@@ -35,4 +37,34 @@ public function testPHPArrayToApiArrayConversion()
 
         $this->assertEquals('branch=master&exclude=aaa&exclude=ccc&include=bbb', $request->getContent());
     }
+
+    /**
+     * @ticket 62
+     */
+    public function testShouldNotRunOnFormData()
+    {
+        $api = new Api(array(), $this->getHttpClient());
+        $this->assertInstanceOf('\Bitbucket\API\Api', $api);
+
+        $api->getClient()
+            ->setApiVersion('2.0')
+        ;
+
+        $headers = array('Content-Type' => 'multipart/form-data');
+        $request = new FormRequest();
+        $request->setField('issue_id', 4);
+        $request->setHeaders($headers);
+        $api->getClient()->setRequest($request);
+
+        $this->assertTrue($api->getClient()->isListener('normalize_array'));
+
+        $response = $api->getClient()->request(
+            sprintf('repositories/%s/%s/issues/%d/attachments', 'gentlero', 'eof', 4),
+            array(),
+            'POST',
+            $headers
+        );
+
+        $this->assertInstanceOf('\Buzz\Message\MessageInterface', $response);
+    }
 }