Merge pull request #128 from aaa2000/upload-file-project

Upload a file in a project

Author: radutopala

lib/Gitlab/Api/AbstractApi.php

@@ -57,11 +57,12 @@ protected function get($path, array $parameters = array(), $requestHeaders = arr
      * @param string $path
      * @param array $parameters
      * @param array $requestHeaders
+     * @param array $files
      * @return mixed
      */
-    protected function post($path, array $parameters = array(), $requestHeaders = array())
+    protected function post($path, array $parameters = array(), $requestHeaders = array(), array $files = array())
     {
-        $response = $this->client->getHttpClient()->post($path, $parameters, $requestHeaders);
+        $response = $this->client->getHttpClient()->post($path, $parameters, $requestHeaders, $files);
 
         return $response->getContent();
     }

lib/Gitlab/Api/Projects.php

@@ -473,4 +473,14 @@ public function removeVariable($project_id, $key)
     {
         return $this->delete($this->getProjectPath($project_id, 'variables/'.$this->encodePath($key)));
     }
+
+    /**
+     * @param int $project_id
+     * @param string $file
+     * @return mixed
+     */
+    public function uploadFile($project_id, $file)
+    {
+        return $this->post($this->getProjectPath($project_id, 'uploads'), array(), array(), array('file' => $file));
+    }
 }

lib/Gitlab/HttpClient/HttpClient.php

@@ -2,12 +2,14 @@
 
 use Buzz\Client\ClientInterface;
 use Buzz\Listener\ListenerInterface;
+use Buzz\Message\Form\FormUpload;
 
 use Gitlab\Exception\ErrorException;
 use Gitlab\Exception\RuntimeException;
 use Gitlab\HttpClient\Listener\ErrorListener;
 use Gitlab\HttpClient\Message\Request;
 use Gitlab\HttpClient\Message\Response;
+use Gitlab\HttpClient\Message\FormRequest;
 
 /**
  * Performs requests on Gitlab API. API documentation should be self-explanatory.
@@ -112,9 +114,9 @@ public function get($path, array $parameters = array(), array $headers = array()
     /**
      * {@inheritDoc}
      */
-    public function post($path, array $parameters = array(), array $headers = array())
+    public function post($path, array $parameters = array(), array $headers = array(), array $files = array())
     {
-        return $this->request($path, $parameters, 'POST', $headers);
+        return $this->request($path, $parameters, 'POST', $headers, $files);
     }
 
     /**
@@ -144,13 +146,11 @@ public function put($path, array $parameters = array(), array $headers = array()
     /**
      * {@inheritDoc}
      */
-    public function request($path, array $parameters = array(), $httpMethod = 'GET', array $headers = array())
+    public function request($path, array $parameters = array(), $httpMethod = 'GET', array $headers = array(), array $files = array())
     {
         $path = trim($this->baseUrl.$path, '/');
 
-        $request = $this->createRequest($httpMethod, $path);
-        $request->addHeaders($headers);
-        $request->setContent(http_build_query($parameters));
+        $request = $this->createRequest($httpMethod, $path, $parameters, $headers, $files);
 
         $hasListeners = 0 < count($this->listeners);
         if ($hasListeners) {
@@ -200,13 +200,31 @@ public function getLastResponse()
     /**
      * @param string $httpMethod
      * @param string $url
-     * @return Request
+     * @param array $parameters
+     * @param array $headers
+     * @param array $files
+     *
+     * @return FormRequest|Request
      */
-    private function createRequest($httpMethod, $url)
+    private function createRequest($httpMethod, $url, array $parameters, array $headers, array $files)
     {
-        $request = new Request($httpMethod);
+        if (empty($files)) {
+            $request = new Request($httpMethod);
+            $request->setContent(http_build_query($parameters));
+        } else {
+            $request = new FormRequest($httpMethod);
+            foreach ($parameters as $name => $value) {
+                $request->setField($name, $value);
+            }
+
+            foreach ($files as $name => $file) {
+                $upload = new FormUpload($file);
+                $request->setField($name, $upload);
+            }
+        }
         $request->setHeaders($this->headers);
         $request->fromUrl($url);
+        $request->addHeaders($headers);
 
         return $request;
     }

lib/Gitlab/HttpClient/HttpClientInterface.php

@@ -24,13 +24,14 @@ public function get($path, array $parameters = array(), array $headers = array()
     /**
      * Send a POST request
      *
-     * @param string $path       Request path
-     * @param array  $parameters POST Parameters
-     * @param array  $headers    Reconfigure the request headers for this call only
+     * @param string $path Request path
+     * @param array $parameters POST Parameters
+     * @param array $headers Reconfigure the request headers for this call only
+     * @param array $files Files paths of files to upload
      *
      * @return array Data
      */
-    public function post($path, array $parameters = array(), array $headers = array());
+    public function post($path, array $parameters = array(), array $headers = array(), array $files = array());
 
     /**
      * Send a PATCH request

lib/Gitlab/HttpClient/Message/FormRequest.php

@@ -0,0 +1,8 @@
+<?php namespace Gitlab\HttpClient\Message;
+
+use Buzz\Message\Form\FormRequest as BaseFormRequest;
+
+class FormRequest extends BaseFormRequest
+{
+
+}

test/Gitlab/Tests/Api/AbstractApiTest.php

@@ -146,9 +146,9 @@ public function get($path, array $parameters = array(), $requestHeaders = array(
     /**
      * {@inheritDoc}
      */
-    public function post($path, array $parameters = array(), $requestHeaders = array())
+    public function post($path, array $parameters = array(), $requestHeaders = array(), array $files = array())
     {
-        return parent::post($path, $parameters, $requestHeaders);
+        return parent::post($path, $parameters, $requestHeaders, $files);
     }
 
     /**