Merge pull request #37 from Adyen/develop

Merge from 'develop'

.travis.yml

@@ -1,11 +1,19 @@
+sudo: false
+dist: trusty
 language: php
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - nightly
+matrix:
+  allow_failures:
+    - php: nightly
+  include:
+    - php: 7.1
+    - php: 7.2
+    - php: 7.1
+    - php: 7.0
+    - php: 5.6
+    - php: 5.6
+    - php: 5.5
+    - php: 5.4
+    - dist: precise
+      php: 5.3
 before_script:
   - composer install

src/Adyen/Client.php

@@ -8,13 +8,14 @@
 
 class Client
 {
-    const LIB_VERSION                    = "1.3.0";
+    const LIB_VERSION                   = "1.4.0";
     const USER_AGENT_SUFFIX             = "adyen-php-api-library/";
     const ENDPOINT_TEST                 = "https://pal-test.adyen.com";
     const ENDPOINT_LIVE                 = "https://pal-live.adyen.com";
-    const ENPOINT_TEST_DIRECTORY_LOOKUP = "https://test.adyen.com/hpp/directory.shtml";
-    const ENPOINT_LIVE_DIRECTORY_LOOKUP = "https://live.adyen.com/hpp/directory.shtml";
-    const API_VERSION                   = "v25";
+    const ENPOINT_TEST_DIRECTORY_LOOKUP = "https://test.adyen.com/hpp/directory/v2.shtml";
+    const ENPOINT_LIVE_DIRECTORY_LOOKUP = "https://live.adyen.com/hpp/directory/v2.shtml";
+    const API_VERSION                   = "v30";
+    const API_RECURRING_VERSION         = "v25";
 
     /**
      * @var Adyen_Config $config
@@ -153,6 +154,17 @@ public function getApiVersion()
         return self::API_VERSION;
     }
 
+    /**
+     * Get the version of the Recurring API endpoint
+     *
+     * @return string
+     */
+    public function getApiRecurringVersion()
+    {
+        return self::API_RECURRING_VERSION;
+    }
+
+
     /**
      * @param HttpClient\ClientInterface $httpClient
      */

src/Adyen/Service/ResourceModel/Recurring/Disable.php

@@ -11,7 +11,7 @@ class Disable extends \Adyen\Service\AbstractResource
 
     public function __construct($service)
     {
-        $endpoint = $service->getClient()->getConfig()->get('endpoint') . '/pal/servlet/Recurring/' . $service->getClient()->getApiVersion() . '/disable';
+        $endpoint = $service->getClient()->getConfig()->get('endpoint') . '/pal/servlet/Recurring/' . $service->getClient()->getApiRecurringVersion() . '/disable';
         parent::__construct($service, $endpoint, $this->_requiredFields);
     }
 

src/Adyen/Service/ResourceModel/Recurring/ListRecurringDetails.php

@@ -14,7 +14,7 @@ class ListRecurringDetails extends \Adyen\Service\AbstractResource
 
     public function __construct($service)
     {
-        $endpoint = $service->getClient()->getConfig()->get('endpoint') . '/pal/servlet/Recurring/' . $service->getClient()->getApiVersion() . '/listRecurringDetails';
+        $endpoint = $service->getClient()->getConfig()->get('endpoint') . '/pal/servlet/Recurring/' . $service->getClient()->getApiRecurringVersion() . '/listRecurringDetails';
         parent::__construct($service, $endpoint, $this->_requiredFields);
     }