Initial error handling

Author: glaubinix

src/Api/Customers.php

@@ -2,6 +2,8 @@
 
 namespace PrivatePackagist\ApiClient\Api;
 
+use PrivatePackagist\ApiClient\Exception\InvalidArgumentException;
+
 class Customers extends AbstractApi
 {
     public function all()
@@ -26,6 +28,12 @@ public function listPackages($customerId)
 
     public function addPackages($customerId, array $packages)
     {
+        foreach ($packages as $package) {
+            if (!isset($package['name'])) {
+                throw new InvalidArgumentException('Parameter "name" is requried.');
+            }
+        }
+
         return $this->post(sprintf('/customers/%s/packages/', $customerId), $packages);
     }
 

src/Client.php

@@ -5,25 +5,31 @@
 use Http\Client\Common\Plugin;
 use Http\Discovery\UriFactoryDiscovery;
 use PrivatePackagist\ApiClient\HttpClient\HttpPluginClientBuilder;
+use PrivatePackagist\ApiClient\HttpClient\Message\ResponseMediator;
+use PrivatePackagist\ApiClient\HttpClient\Plugin\ExceptionThrower;
 use PrivatePackagist\ApiClient\HttpClient\Plugin\PathPrepend;
 use PrivatePackagist\ApiClient\HttpClient\Plugin\RequestSignature;
 
 class Client
 {
     /** @var HttpPluginClientBuilder */
     private $httpClientBuilder;
+    /** @var ResponseMediator */
+    private $responseMediator;
 
     /** @param string $privatePackagistUrl */
-    public function __construct(HttpPluginClientBuilder $httpClientBuilder = null, $privatePackagistUrl = null)
+    public function __construct(HttpPluginClientBuilder $httpClientBuilder = null, $privatePackagistUrl = null, ResponseMediator $responseMediator = null)
     {
         $this->httpClientBuilder = $builder = $httpClientBuilder ?: new HttpPluginClientBuilder();
         $privatePackagistUrl = $privatePackagistUrl ? : 'https://packagist.com';
+        $this->responseMediator = $responseMediator ? $responseMediator : new ResponseMediator();
 
         $builder->addPlugin(new Plugin\AddHostPlugin(UriFactoryDiscovery::find()->createUri($privatePackagistUrl)));
         $builder->addPlugin(new PathPrepend('/api'));
         $builder->addPlugin(new Plugin\HeaderDefaultsPlugin([
-            'User-Agent' => 'php-private-packagist-api (http://github.com/packagist/private-packagist-api)', // @todo
+            'User-Agent' => 'php-private-packagist-api (https://github.com/packagist/private-packagist-api-client)',
         ]));
+        $builder->addPlugin(new ExceptionThrower($this->responseMediator));
     }
 
     /**
@@ -38,12 +44,12 @@ public function authenticate($token, $secret)
 
     public function customers()
     {
-        return new Api\Customers($this);
+        return new Api\Customers($this, $this->responseMediator);
     }
 
     public function packages()
     {
-        return new Api\Packages($this);
+        return new Api\Packages($this, $this->responseMediator);
     }
 
     public function getHttpClient()

src/Exception/ErrorException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace PrivatePackagist\ApiClient\Exception;
+
+class ErrorException extends \ErrorException implements ExceptionInterface
+{
+}

src/Exception/ExceptionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace PrivatePackagist\ApiClient\Exception;
+
+interface ExceptionInterface
+{
+}

src/Exception/InvalidArgumentException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace PrivatePackagist\ApiClient\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}

src/Exception/RuntimeException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace PrivatePackagist\ApiClient\Exception;
+
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}

src/HttpClient/Plugin/ExceptionThrower.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace PrivatePackagist\ApiClient\HttpClient\Plugin;
+
+use Http\Client\Common\Plugin;
+use PrivatePackagist\ApiClient\Exception\ErrorException;
+use PrivatePackagist\ApiClient\Exception\RuntimeException;
+use PrivatePackagist\ApiClient\HttpClient\Message\ResponseMediator;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+class ExceptionThrower implements Plugin
+{
+    /** @var ResponseMediator */
+    private $responseMediator;
+
+    public function __construct(ResponseMediator $responseMediator = null)
+    {
+        $this->responseMediator = $responseMediator ? $responseMediator : new ResponseMediator();
+    }
+
+    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    {
+        return $next($request)->then(function (ResponseInterface $response) {
+            if ($response->getStatusCode() < 400 || $response->getStatusCode() > 600) {
+                return $response;
+            }
+
+            $content = $this->responseMediator->getContent($response);
+            if (is_array($content) && isset($content['message'])) {
+                if ($response->getStatusCode() === 400) {
+                    throw new ErrorException($content['message'], $response->getStatusCode());
+                }
+            }
+
+            throw new RuntimeException(isset($content['message']) ? $content['message'] : $content, $response->getStatusCode());
+        });
+    }
+}

tests/Api/CustomersTest.php

@@ -98,6 +98,18 @@ public function testAddPackages()
         $this->assertSame($expected, $api->addPackages(1, $packages));
     }
 
+    /**
+     * @expectedException \PrivatePackagist\ApiClient\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Parameter "name" is requried.
+     */
+    public function testAddPackagesMissingName()
+    {
+        /** @var Customers&\PHPUnit_Framework_MockObject_MockObject $api */
+        $api = $this->getApiMock();
+
+        $api->addPackages(1, [[]]);
+    }
+
     public function testRemovePackage()
     {
         $expected = '';