Merge pull request #119 from CurrencyCloud/sdkphp-95

Support for Symphony dispatcher 5.0, guzzle 7.0 and phpunit 8.0

Author: jonathancouchman

.travis.yml

@@ -1,7 +1,8 @@
 language: php
 
 php:
-  - 7.1
+  - 7.3
+  - 7.4
 
 before_script:
   - composer self-update

README.md

@@ -17,7 +17,7 @@ it will be far easier to simply make use of Composer to do the dependency manage
 
 
 ### Supported PHP version
-This library aims to support and is tested against PHP 7.1 and greater.
+This library aims to support and is tested against PHP 7.4.
 
 ## Installation
 The recommended way to install Currencycloud SDK is through

composer.json

@@ -14,15 +14,15 @@
   "homepage": "https://github.com/CurrencyCloud/currencycloud-php",
   "license": "MIT",
   "require": {
-    "php": ">=7.1",
-    "guzzlehttp/guzzle": "~6.1",
-    "symfony/yaml": "^2.7|^3.0|^4.0",
-    "symfony/event-dispatcher": "^2.7|^3.0|^4.0"
+    "php": ">=7.2",
+    "guzzlehttp/guzzle": "~6.1||~7.0",
+    "symfony/yaml": "^2.7||^3.0||^4.0",
+    "symfony/event-dispatcher": "^5.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.7",
+    "phpunit/phpunit": "^8.0",
     "php-vcr/php-vcr": "~1.2",
-    "php-vcr/phpunit-testlistener-vcr": "~1.1"
+    "php-vcr/phpunit-testlistener-vcr": "^3.2"
   },
   "suggest": {
 

phpunit.xml.dist

@@ -18,7 +18,7 @@
     </testsuites>
 
     <listeners>
-        <listener class="PHPUnit_Util_Log_VCR" file="vendor/php-vcr/phpunit-testlistener-vcr/PHPUnit/Util/Log/VCR.php" />
+        <listener class="VCR\PHPUnit\TestListener\VCRTestListener" file="vendor/php-vcr/phpunit-testlistener-vcr/src/VCRTestListener.php" />
     </listeners>
 
     <filter>

src/Client.php

@@ -58,14 +58,14 @@ public function request(
         array $options,
         $secured
     ) {
-        $this->eventDispatcher->dispatch(BeforeClientRequestEvent::NAME, new BeforeClientRequestEvent(
+        $this->eventDispatcher->dispatch( new BeforeClientRequestEvent(
             $method,
             $uri,
             $queryParams,
             $requestParams,
             $options,
             $secured
-        ));
+        ), BeforeClientRequestEvent::NAME);
 
         $originalRequest = [
             'method' => $method,
@@ -134,7 +134,7 @@ public function request(
                         $url,
                         $originalRequest
                     );
-                    $this->eventDispatcher->dispatch(ClientHttpErrorEvent::NAME, $event);
+                    $this->eventDispatcher->dispatch($event, ClientHttpErrorEvent::NAME);
                     $interceptedResponse = $event->getInterceptedResponse();
                     if (null !== $interceptedResponse) {
                         return $interceptedResponse;

src/EventDispatcher/Event/BeforeClientRequestEvent.php

@@ -2,7 +2,7 @@
 
 namespace CurrencyCloud\EventDispatcher\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 final class BeforeClientRequestEvent extends Event
 {

src/EventDispatcher/Event/ClientHttpErrorEvent.php

@@ -3,7 +3,8 @@
 namespace CurrencyCloud\EventDispatcher\Event;
 
 use Psr\Http\Message\ResponseInterface;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
+
 
 final class ClientHttpErrorEvent extends Event
 {

tests/BaseCurrencyCloudTestCase.php

@@ -5,10 +5,11 @@
 use CurrencyCloud\Client;
 use CurrencyCloud\SimpleEntityManager;
 use DateTime;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
+
 use ReflectionClass;
 
-class BaseCurrencyCloudTestCase extends PHPUnit_Framework_TestCase
+class BaseCurrencyCloudTestCase extends TestCase
 {
 
     /**
@@ -55,7 +56,7 @@ protected function getMockedEntityManager($expectedModel, $changeSet)
 
     protected function validateObjectStrictName($object, $dummy)
     {
-        $this->assertInternalType('object', $object);
+        $this->assertIsObject( $object);
         foreach ($dummy as $key => $original) {
             $parts = explode('_', $key);
             $uCased = implode('', array_map('ucfirst', $parts));
@@ -125,4 +126,17 @@ protected function setIdProperty($object, $value, $propertyName = 'id')
         $property->setAccessible(true);
         $property->setValue($object, $value);
     }
+
+
+    protected function getMock($className){
+        return $this->createMock($className);
+    }
+
+    protected function setExpectedException(string $class, string $string=null)
+    {
+        $this->expectException($class);
+        if($string){
+            $this->expectExceptionMessage($string);
+        }
+    }
 }

tests/Core/SessionTest.php

@@ -5,18 +5,20 @@
 use CurrencyCloud\Session;
 use InvalidArgumentException;
 use LogicException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class SessionTest extends PHPUnit_Framework_TestCase
+
+class SessionTest extends TestCase
 {
 
     /**
      * @var Session
      */
     private $session;
 
-    public function setUp()
+    public function setUp():void
     {
+        parent::setUp();
         $this->session = new Session(Session::ENVIRONMENT_DEMONSTRATION, 'a', 'b');
     }
 
@@ -37,7 +39,10 @@ public function invalidEnvironmentThrowsException()
      */
     public function invalidLoginIdThrowsException()
     {
-        $this->setExpectedException(InvalidArgumentException::class, 'Login ID can not be nul');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Login ID can not be null');
+
         new Session(Session::ENVIRONMENT_DEMONSTRATION, null, 'test');
     }
 
@@ -90,4 +95,10 @@ public function onBehalfOfCanBeSetAfterUnset()
         $this->session->setOnBehalfOf('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaab');
         $this->assertEquals('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaab', $this->session->getOnBehalfOf());
     }
+
+    private function setExpectedException(string $class, string $string)
+    {
+        $this->expectException($class);
+        $this->expectExceptionMessage($string);
+    }
 }

tests/VCR/Error/Test.php

@@ -67,7 +67,7 @@ public function containsFullDetailForApiError()
             $this->assertSame('auth_invalid_user_login_details', $e->getApiCode());
 
             $errors = $e->getErrors();
-            $this->assertInternalType('array', $errors);
+            $this->assertIsArray( $errors);
             $this->assertArrayHasKey(0, $errors);
             $this->assertCount(1, $errors);
             $sub = $errors[0];
@@ -83,14 +83,14 @@ public function containsFullDetailForApiError()
 
             $params = $sub['params'];
 
-            $this->assertInternalType('array', $params);
+            $this->assertIsArray( $params);
             $this->assertCount(1, $params);
             $this->assertArrayHasKey('length', $params);
             $this->assertSame(64, $params['length']);
 
             $params = $e->getParameters();
 
-            $this->assertInternalType('array', $params);
+            $this->assertIsArray($params);
             $this->assertCount(2, $params);
             $this->assertArrayHasKey('login_id', $params);
             $this->assertArrayHasKey('api_key', $params);