Merge branch 'release/v1.4.0'

secucard · May 30, 2017 · c382d40 · c382d40
2 parents f856119 + d9922b8
commit c382d40
Show file tree

Hide file tree

Showing 88 changed files with 1,162 additions and 1,546 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ phpunit.phar
 .buildpath
 .project
 .settings/
-.idea
+.idea
+/composer.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,14 +18,42 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Removed
 
+
+
+## [1.4.0] - 2017-05-30
+
+### Added
+- PaymentService: refund method
+- PaymentService: capture method
+- PaymentService: updateBasket method
+- PaymentService: reverseAccrual method
+- PaymentService: initSubsequent method
+- PaymentService: setShippingInformation method
+- PaymentService: updateSubscription method
+- Product Document: UploadsService
+- Product Service: IdentCasesService
+
+### Changed
+- Updated dependency "guzzle" to ~6.2
+- Updated dependency "jsonmapper" to ~1.1
+
+### Fixed
+- PHP 5.5 incompatibility (const array)
+- Wrong parent class of class RedirectUrl
+- PSR-2 Coding Style conformance
+
+### Removed
+- Removed tests, because the need to be reworked
+- Remove development dependency "phpunit"
+
 ## [1.3.1] - 2017-04-28
 
 ### Fixed
 - Get default User-Agent
 
 
 
-## [1.3.0] - 2017-04-26
+## [1.3.0] - 2017-04-26 [YANKED]
 
 ### Deprecated
 - Pass an array for API client configuration in the constructor of the class "SecucardConnect" is deprecated.
@@ -56,39 +84,34 @@ Not published
 
 
 ## [1.1.2] - 2017-01-09
-Commit-ID: 7c69043
 
 ### Changed
 - Fix push service for ident service
 
 
 
 ## [1.1.1] - 2017-01-18
-Commit-ID: 5fa107d
 
 ###Added
 - Provider to Services.IdentRequest
 
 
 
 ## [1.1.0] - 2016-12-06
-Commit-ID: 7ac3ee6
 
 ###Added
 - Credit card payment
 
 
 
 ## [1.0.9] - 2016-11-29
-Commit-ID: 7daf776
 
 ### Changed
 - Fix fatal on cancel request
 
 
 
 ## [1.0.8] - 2016-11-29
-Commit-ID: 562487e
 
 ### Changed
 - Fix fatal on delete request
@@ -99,7 +122,6 @@ Commit-ID: 562487e
 
 
 ## [1.0.7] - 2016-11-23
-Commit-ID: 4f6f80f
 
 ### Added
 - Basket
@@ -108,7 +130,6 @@ Commit-ID: 4f6f80f
 
 
 ## [1.0.6] - 2016-10-14
-Commit-ID: 9fdcc06
 
 ### Added
 - Basket
@@ -121,7 +142,6 @@ Commit-ID: 9fdcc06
 - composer.lock file
 
 ## [1.0.5] - 2016-04-29
-Commit-ID: 57989cc
 
 ### Added
 - X-Action header support.
@@ -133,7 +153,6 @@ Commit-ID: 57989cc
 
 
 ## [1.0.4] - 2016-04-28
-Commit-ID: 3d8185e
 
 ### Added
 - Add expire time to JSON token export.
@@ -144,31 +163,27 @@ Commit-ID: 3d8185e
 
 
 ## [1.0.3] - 2016-04-21
-Commit-ID: 7202f07
 
 ### Changed
 - unknown
 
 
 
 ## [1.0.2] - 2016-04-20
-Commit-ID: f08127f
 
 ### Changed
 - Readme
 
 
 
 ## [1.0.1] - 2016-04-06
-Commit-ID: c8923d5
 
 ###Added
 - Client method for getting token JSON for JS usage.
 
 
 
 ## [1.0.0] - 2016-03-12
-Commit-ID: 61d5f43
 
 ###Added
 - payment services.
@@ -218,23 +233,20 @@ Commit-ID: 61d5f43
 
 
 ## [0.1.3] - 2015-10-15
-Commit-ID: 17cc357
 
 ### Changed
 - Correctly implemented processPush method for handling pushes
 
 
 
 ## [0.1.2] - 2015-09-22
-Commit-ID: d40c9d4
 
 ### Changed
 - Fix updating and deleting Models
 
 
 
 ## [0.1.1] - 2015-08-05
-Commit-ID: c241859
 
 ### Added
 - Added const to model Smart/Transactions
@@ -245,7 +257,6 @@ Commit-ID: c241859
 
 
 ## [0.1.0] - 2015-08-04
-Commit-ID: 9035f25
 
 ### Added
 - Receipts for Smart/Transactions
@@ -256,15 +267,13 @@ Commit-ID: 9035f25
 
 
 ## [0.0.5] - 2015-07-03
-Commit-ID: 9bfdc86
 
 ### Changed
 - Fix creation of Secupaydebits
 
 
 
 ## [0.0.4] - 2015-07-03
-Commit-ID: 2bbec34
 
 ### Added
 - "Payment" product
@@ -275,7 +284,6 @@ Commit-ID: 2bbec34
 
 
 ## [0.0.3] - 2015-05-13
-Commit-ID: a2be050
 
 ### Added
 - "Smart" product
@@ -286,7 +294,6 @@ Commit-ID: a2be050
 
 
 ## [0.0.2] - 2015-02-04
-Commit-ID: 5b5eb23
 
 ### Added
 - License
@@ -304,5 +311,31 @@ Commit-ID: 5b5eb23
 
 
 ## [0.0.1] - 2014-11-03
-Commit-ID: 787f4fa
-First release
+First release
+
+
+
+
+[0.0.2]:https://github.com/secucard/secucard-connect-php-sdk/compare/v0.0.1...v0.0.2
+[0.0.3]:https://github.com/secucard/secucard-connect-php-sdk/compare/v0.0.2...v0.0.3
+[0.0.4]:https://github.com/secucard/secucard-connect-php-sdk/compare/v0.0.3...v0.0.4
+[0.0.5]:https://github.com/secucard/secucard-connect-php-sdk/compare/v0.0.4...v0.0.5
+[0.1.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/v0.0.5...v0.1.0
+[0.1.1]:https://github.com/secucard/secucard-connect-php-sdk/compare/v0.1.0...v0.1.1
+[0.1.2]:https://github.com/secucard/secucard-connect-php-sdk/compare/v0.1.1...v0.1.2
+[0.1.3]:https://github.com/secucard/secucard-connect-php-sdk/compare/v0.1.2...v0.1.3
+[1.0.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/v0.1.3...v1.0.0
+[1.0.1]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.0...v1.0.1
+[1.0.2]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.1...v1.0.2
+[1.0.3]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.2...v1.0.3
+[1.0.4]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.3...v1.0.4
+[1.0.5]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.4...v1.0.5
+[1.0.6]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.5...v1.0.6
+[1.0.7]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.6...v1.0.7
+[1.0.8]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.7...v1.0.8
+[1.0.9]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.8...v1.0.9
+[1.1.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.0.9...v1.1.0
+[1.1.1]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.1.0...v1.1.1
+[1.1.2]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.1.1...v1.1.2
+[1.3.1]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.1.2...v1.3.1
+[1.4.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/v1.3.1...v1.4.0
diff --git a/composer.json b/composer.json
@@ -3,26 +3,16 @@
     "description": "secucard connect PHP client SDK",
 	"license": "Apache-2.0",
     "homepage": "https://github.com/secucard/secucard-connect-php-sdk",
-    "version": "v1.3.1",
+    "version": "v1.4.0",
     "require": {
         "php": ">=5.5.0",
-        "guzzlehttp/guzzle": "~6.0",
+        "guzzlehttp/guzzle": "~6.2",
         "psr/log": "~1.0",
-        "netresearch/jsonmapper": "v0.10.0"
+        "netresearch/jsonmapper": "~1.1"
     },
-
-    "require-dev": {
-        "phpunit/phpunit": "4.8"
-    },
-
     "autoload": {
         "psr-4": {
             "SecucardConnect\\": "src/SecucardConnect"
         }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "SecucardConnect\\": "tests/SecucardConnect"
-        }
     }
 }
diff --git a/doc/guide/README.md b/doc/guide/README.md
@@ -1,8 +1,8 @@
-#PHP SDK Guide
+# PHP SDK Guide
 
-##Getting Started
+## Getting Started
 
-###Initialize the client
+### Initialize the client
 ```php
 include "vendor/autoload.php";
 
@@ -26,7 +26,7 @@ $store = new DummyStorage();
 $secucard = new SecucardConnect($config, $logger, $store, $store, $credentials);
 ```
 
-###List all existing customers (without pagination)
+### List all existing customers (without pagination)
 ```php
 $service = $secucard->payment->customers;
 
@@ -38,7 +38,7 @@ if (empty($customers)) {
 print_r($customers);
 ```
 
-###List all existing customers (with pagination)
+### List all existing customers (with pagination)
 If you have many customers, you would need following code to get them all.
 ```php
 $service = $secucard->payment->customers;
@@ -56,4 +56,4 @@ if (empty($customers)) {
 }
 
 print_r($customers);
-```
+```
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/src/SecucardConnect/ApiClientConfiguration.php b/src/SecucardConnect/ApiClientConfiguration.php
@@ -15,7 +15,7 @@ class ApiClientConfiguration
     const ACCEPT_LANGUAGE_DE = 'de';
 
     // The following fields are required when creating the client
-    const REQUIRED_FIELDS = [
+    protected static $REQUIRED_FIELDS = [
         'base_url',
         'auth_path',
         'api_path',
@@ -121,7 +121,7 @@ public function isValid()
     {
         $data = $this->toArray();
 
-        $missing = array_diff(self::REQUIRED_FIELDS, array_keys($data));
+        $missing = array_diff(self::$REQUIRED_FIELDS, array_keys($data));
 
         if ($missing) {
             throw new \InvalidArgumentException('Config is missing the following keys: ' . implode(', ', $missing));

diff --git a/src/SecucardConnect/Auth/AuthCodes.php b/src/SecucardConnect/Auth/AuthCodes.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by IntelliJ IDEA.
- * User: tk
- * Date: 03.12.15
- * Time: 23:07
- */
 
 namespace SecucardConnect\Auth;
 

diff --git a/src/SecucardConnect/Auth/BadAuthException.php b/src/SecucardConnect/Auth/BadAuthException.php
@@ -4,9 +4,7 @@
 namespace SecucardConnect\Auth;
 
 
-use Exception;
 use SecucardConnect\Client\AuthError;
-use SecucardConnect\Product\Common\Model\Error;
 
 /**
  * Thrown when a authorization attempt failed due bad request data like missing, invalid, misused data.

diff --git a/src/SecucardConnect/Auth/GrantTypeInterface.php b/src/SecucardConnect/Auth/GrantTypeInterface.php
@@ -9,12 +9,15 @@ interface GrantTypeInterface
 {
     /**
      * Function to return grant_type for current type
+     *
      * @return string
      */
     public function getType();
 
     /**
      * Function to add parameters for authorization request
+     *
+     * @param array $params
      */
     public function addParameters(&$params);
 }