Update Failing Tests and update PR/3

bosunski · Oct 4, 2019 · 7af9007 · 7af9007
1 parent edb7180
commit 7af9007
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.1.3|^7.2",
         "psr/http-message": "^1.0",
         "psr/cache": "^1.0",
         "php-http/httplug": "1.0.0|2.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/App/PaystackApplication.php b/src/App/PaystackApplication.php
@@ -24,6 +24,7 @@
 use Http\Message\RequestFactory;
 use Http\Message\StreamFactory;
 use Illuminate\Container\Container;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use ReflectionException;
 use Xeviant\Paystack\Client;
 use Xeviant\Paystack\Config as PaystackConfig;
@@ -192,7 +193,7 @@ public function makeApi(string $apiName): ApiInterface
     {
         try {
             return $this->make($apiName);
-        } catch (ReflectionException $e) {
+        } catch (BindingResolutionException $e) {
             throw new InvalidArgumentException(sprintf('Undefined API called: "%s', $apiName));
         }
     }

diff --git a/src/Client.php b/src/Client.php
@@ -138,7 +138,7 @@ public function api($name): ApiInterface
         try {
             return $this->app->makeApi($name);
         } catch (InvalidArgumentException $e) {
-            throw new InvalidArgumentException($e->getMessage());
+            throw $e;
         }
     }
 

diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -3,6 +3,7 @@
 namespace Xeviant\Paystack\Tests;
 
 use Http\Client\HttpClient;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Xeviant\Paystack\Api\Balance;
 use Xeviant\Paystack\Api\Bank;
 use Xeviant\Paystack\Api\BulkCharges;
@@ -21,6 +22,8 @@
 use Xeviant\Paystack\Api\TransferRecipients;
 use Xeviant\Paystack\Api\Transfers;
 use Xeviant\Paystack\Client;
+use Xeviant\Paystack\Exception\BadMethodCallException;
+use Xeviant\Paystack\Exception\InvalidArgumentException;
 
 final class ClientTest extends TestCase
 {
@@ -78,24 +81,22 @@ public function shouldMagicallyGetApiInstance($apiName, $class)
 
     /**
      * @test
-     * @expectedException \Xeviant\Paystack\Exception\InvalidArgumentException
-     *
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function shouldNotBeAbleToGetApiInstanceThatDoesntExits()
     {
+        $this->expectException(InvalidArgumentException::class);
         $client = new Client();
         $client->api('this_doesnt_exist');
     }
 
     /**
      * @test
-     * @expectedException \Xeviant\Paystack\Exception\BadMethodCallException
      *
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function shouldNotBeAbleToGetMagicApiInstanceThatDoesntExits()
     {
+        $this->expectException(BadMethodCallException::class);
         $client = new Client();
         $client->doesNotExist();
     }