Merge pull request #35 from peter279k/issue_#34

Resolves issue #34

Author: j0k3r

.travis.yml

@@ -33,7 +33,7 @@ before_script:
     - composer install --prefer-dist --no-interaction -o
 
 script:
-    - ./vendor/bin/simple-phpunit -v --coverage-clover=coverage.clover
+    - XDEBUG_MODE=coverage ./vendor/bin/simple-phpunit -v --coverage-clover=coverage.clover
     - if [ "$CS_FIXER" = "run" ]; then php vendor/bin/php-cs-fixer fix --verbose --dry-run ; fi;
 
 after_script:

lib/Imgur/Api/Album.php

@@ -122,7 +122,6 @@ public function favoriteAlbum($albumId)
      * (Not available for anonymous albums.).
      *
      * @param string $albumId
-     * @param array  $imageIds
      *
      * @see https://api.imgur.com/endpoints/album#album-set-to
      *
@@ -138,7 +137,6 @@ public function setAlbumImages($albumId, array $imageIds)
      * (Not available for anonymous albums. Adding images to an anonymous album is only available during image uploading.).
      *
      * @param string $albumId
-     * @param array  $imageIds
      *
      * @see https://api.imgur.com/endpoints/album#album-add-to
      *
@@ -154,7 +152,6 @@ public function addImages($albumId, array $imageIds)
      * For anonymous albums, $deletehashOrAlbumId should be the deletehash that is returned at creation.
      *
      * @param string $deletehashOrAlbumId
-     * @param array  $imageIds
      *
      * @see https://api.imgur.com/endpoints/album#album-remove-from
      *

lib/Imgur/Api/CustomGallery.php

@@ -64,8 +64,6 @@ public function image($imageId)
     /**
      * Add tags to a user's custom gallery.
      *
-     * @param array $tags
-     *
      * @see https://api.imgur.com/endpoints/custom_gallery#custom-gallery-add
      *
      * @return bool
@@ -78,8 +76,6 @@ public function addTags(array $tags)
     /**
      * Remove tags from a custom gallery.
      *
-     * @param array $tags
-     *
      * @see https://api.imgur.com/endpoints/custom_gallery#custom-gallery-remove
      *
      * @return bool

lib/Imgur/Api/Image.php

@@ -49,7 +49,7 @@ public function upload($data)
         }
 
         if ('file' === $data['type']) {
-            $data['image'] = '@' . $data['image'];
+            $data['image'] = fopen($data['image'], 'r');
         }
 
         return $this->post('image', $data);

lib/Imgur/Auth/OAuth2.php

@@ -62,9 +62,8 @@ class OAuth2 implements AuthInterface
     /**
      * Instantiates the OAuth2 class, but does not trigger the authentication process.
      *
-     * @param HttpClientInterface $httpClient
-     * @param string              $clientId
-     * @param string              $clientSecret
+     * @param string $clientId
+     * @param string $clientSecret
      */
     public function __construct(HttpClientInterface $httpClient, $clientId, $clientSecret)
     {

lib/Imgur/Client.php

@@ -81,9 +81,6 @@ public function getHttpClient()
         return $this->httpClient;
     }
 
-    /**
-     * @param HttpClientInterface $httpClient
-     */
     public function setHttpClient(HttpClientInterface $httpClient)
     {
         $this->httpClient = $httpClient;

lib/Imgur/HttpClient/HttpClient.php

@@ -36,7 +36,6 @@ class HttpClient implements HttpClientInterface
     protected $stack;
 
     /**
-     * @param array           $options
      * @param ClientInterface $client
      */
     public function __construct(array $options = [], ClientInterface $client = null)
@@ -108,7 +107,20 @@ public function performRequest($url, $parameters, $httpMethod = 'GET')
         }
 
         if ('POST' === $httpMethod || 'PUT' === $httpMethod || 'DELETE' === $httpMethod) {
-            $options['form_params'] = $parameters;
+            if ('POST' === $httpMethod && isset($parameters['type']) && 'file' === $parameters['type']) {
+                $options['multipart'] = [
+                    [
+                        'name' => 'type',
+                        'contents' => $parameters['type'],
+                    ],
+                    [
+                        'name' => 'image',
+                        'contents' => $parameters['image'],
+                    ],
+                ];
+            } else {
+                $options['form_params'] = $parameters;
+            }
         }
 
         // will throw an Imgur\Exception\ExceptionInterface if sth goes wrong

lib/Imgur/Middleware/AuthMiddleware.php

@@ -23,8 +23,6 @@ public function __construct($token, $clientId)
 
     /**
      * Add Authorization header to the request.
-     *
-     * @param RequestInterface $request
      */
     public function addAuthHeader(RequestInterface $request)
     {

lib/Imgur/Middleware/ErrorMiddleware.php

@@ -21,9 +21,6 @@ public function __construct(callable $nextHandler)
     }
 
     /**
-     * @param RequestInterface $request
-     * @param array            $options
-     *
      * @return PromiseInterface
      */
     public function __invoke(RequestInterface $request, array $options)
@@ -50,8 +47,6 @@ public static function error()
 
     /**
      * Check for an error.
-     *
-     * @param ResponseInterface $response
      */
     public function checkError(ResponseInterface $response)
     {
@@ -96,8 +91,6 @@ public function checkError(ResponseInterface $response)
 
     /**
      * Check if user hit limit.
-     *
-     * @param ResponseInterface $response
      */
     private function checkUserRateLimit(ResponseInterface $response)
     {
@@ -111,8 +104,6 @@ private function checkUserRateLimit(ResponseInterface $response)
 
     /**
      * Check if client hit limit.
-     *
-     * @param ResponseInterface $response
      */
     private function checkClientRateLimit(ResponseInterface $response)
     {
@@ -129,8 +120,6 @@ private function checkClientRateLimit(ResponseInterface $response)
 
     /**
      * Check if client hit post limit.
-     *
-     * @param ResponseInterface $response
      */
     private function checkPostRateLimit(ResponseInterface $response)
     {