Merge pull request #151 from heidelpay/develop

Release 1.2.6.0

.gitignore

@@ -7,4 +7,4 @@
 /vendor/
 /composer.lock
 /build
-/LessonsLearned.md
+/myreport.html/

.travis.yml

@@ -3,22 +3,51 @@ dist: trusty
 matrix:
   fast_finish: true
   include:
-    - php: 7.0
-      env: deps=no
-    - php: 7.0
-      env: deps=high
-    - php: 7.1
-      env: deps=no
-    - php: 7.1
-      env: deps=high
-    - php: 7.2
-      env: deps=no
-    - php: 7.2
-      env: deps=high
-    - php: 7.3
-      env: deps=no
-    - php: 7.3
-      env: deps=high
+    - name: "php 7.0 (install) - unit"
+      php: 7.0
+      env:
+        - DEPS=NO
+        - LEVEL=UNIT
+    - name: "php 7.0 (update) - unit"
+      php: 7.0
+      env:
+        - DEPS=HIGH
+        - LEVEL=UNIT
+    - name: "php 7.0 (update) - integration"
+      php: 7.0
+      env:
+        - DEPS=HIGH
+        - LEVEL=INTEGRATION
+    - name: "php 7.1 (install) - unit"
+      php: 7.1
+      env:
+        - DEPS=NO
+        - LEVEL=UNIT
+    - name: "php 7.1 (update) - unit"
+      php: 7.1
+      env:
+        - DEPS=HIGH
+        - LEVEL=UNIT
+    - name: "php 7.2 (install) - unit"
+      php: 7.2
+      env:
+        - DEPS=NO
+        - LEVEL=UNIT
+    - name: "php 7.2 (update) - unit"
+      php: 7.2
+      env:
+        - DEPS=HIGH
+        - LEVEL=UNIT
+    - name: "php 7.3 (install) - unit"
+      php: 7.3
+      env:
+        - DEPS=NO
+        - LEVEL=UNIT
+    - name: "php 7.3 (update) - unit"
+      php: 7.3
+      env:
+        - DEPS=HIGH
+        - LEVEL=UNIT
 cache:
   directories:
     - $HOME/.composer/cache

CHANGELOG.md

@@ -3,18 +3,35 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [1.2.5.1][1.2.5.1]
+## [1.2.6.0][1.2.6.0]
 
-### Fix
+### Added
+*   Example for Payment Type `Przelewy24`.
+
+### Fixed
 *   A bug which led to an error when trying to cancel the initial transaction of a charged invoice.
+*   Composer: PHP version constraint.
+*   Several minor issues.
+
+### Changed
+*   Refactor travis config.
+*   Refactor heidelpay facade to implement service interfaces.
+*   Move payment cancel methods to cancel service. 
+*   Cleanup doc comments.
+*   Refactor unit tests.
+*   Refactor access modifiers of setters intended for system access only.
+
+### Remove
+*   Move method doc blocks to service interfaces.
+*   Remove dead code.
 
 ## [1.2.5.0][1.2.5.0]
 
 ### Added
-*   Hire purchase direct debit payment type (FlexiPay Rate) including example implementation.
+*   Hire purchase direct debit payment type (FlexiPay® Rate) including example implementation.
 *   Additional parameters from payment type to transactions.
 *   Facade method to update payment type.
-*   Property invoiceId to `Payment` class.
+*   Property `invoiceId` to `Payment` class.
 *   Added card details to `Card` payment type.
 *   Property `card3ds` to `Paypage`.
 *   Geolocation to `Customer` resource.
@@ -23,7 +40,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Changed
 *   Refactor invoice guaranteed tests to make them independent from each other.
 *   Response Code for basket item image extension error has been deprecated since it has been removed from the API.
-*   Refactored cancellation feature to support FlexiPay Rate cancel.
+*   Refactored cancellation feature to support FlexiPay® Rate cancel.
 *   Remove trailing slash from routes.
 *   Float values are now rounded with 4 decimal places when exposed to the API. The value of the local object will be updated as well.
 
@@ -94,6 +111,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [1.2.0.0][1.2.0.0]
 
+### This update contains breaking changes and you might have to update your implementation
+
 ### Changed
 *   Refactored all examples.
 *   Fixed iDeal example.
@@ -203,7 +222,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [1.1.0.0][1.1.0.0]
 
-###### This update contains breaking changes and you will most certainly have to update your implementation
+### This update contains breaking changes and you might have to update your implementation
 
 ### Changed
 *   Payment types `Prepayment`, `Invoice` and `Invoice guaranteed` can no longer perform the authorize transaction but only direct charge.
@@ -337,4 +356,4 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [1.2.3.0]: https://github.com/heidelpay/heidelpayPHP/compare/1.2.2.0..1.2.3.0
 [1.2.4.0]: https://github.com/heidelpay/heidelpayPHP/compare/1.2.3.0..1.2.4.0
 [1.2.5.0]: https://github.com/heidelpay/heidelpayPHP/compare/1.2.4.0..1.2.5.0
-[1.2.5.1]: https://github.com/heidelpay/heidelpayPHP/compare/1.2.5.0..1.2.5.1
+[1.2.6.0]: https://github.com/heidelpay/heidelpayPHP/compare/1.2.5.0..1.2.6.0

README.md

@@ -29,11 +29,11 @@ Please refer to the following documentation for installation instructions and us
 *   SEPA direct debit (guaranteed)
 *   SOFORT
 *   EPS
-*   FlexiPay Direct (PIS)
+*   FlexiPay® Direct (PIS)
 *   Alipay
 *   WeChat Pay
 *   Invoice Factoring
-*   FlexiPay Rate (Hire Purchase Direct Debit)
+*   FlexiPay® Rate (Hire Purchase Direct Debit)
 
 ## Supported features
 *   Webhooks and event handling

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": "^7.0.0|^7.1.0|^7.2.0|^7.3.0",
+    "php": "~7.0.0|~7.1.0|~7.2.0|~7.3.0",
     "ext-json": "*"
   },
   "require-dev": {

examples/Alipay/Constants.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 require_once __DIR__ . '/../Constants.php';

examples/Alipay/Controller.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/Alipay/ReturnController.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/Alipay/index.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/Card/Constants.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 require_once __DIR__ . '/../Constants.php';

examples/Card/Controller.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/Card/ReturnController.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/Card/index.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/CardRecurring/Constants.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 require_once __DIR__ . '/../Constants.php';

examples/CardRecurring/Controller.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/CardRecurring/ReturnController.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */
@@ -65,12 +65,8 @@ function redirect($url, $merchantMessage = '', $clientMessage = '')
     /** @var Card $paymentType */
     $paymentType = $heidelpay->fetchPaymentType($paymentTypeId);
 
-    switch (true) {
-        case $paymentType->isRecurring():
-            redirect(SUCCESS_URL);
-            break;
-        default:
-            break;
+    if ($paymentType->isRecurring()) {
+        redirect(SUCCESS_URL);
     }
 
 } catch (HeidelpayApiException $e) {

examples/CardRecurring/index.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/Constants.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 require_once __DIR__ . '/_enableExamples.php';

examples/EPSCharge/Constants.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 require_once __DIR__ . '/../Constants.php';

examples/EPSCharge/Controller.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/EPSCharge/ReturnController.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/EPSCharge/index.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/EmbeddedPayPage/Constants.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 require_once __DIR__ . '/../Constants.php';

examples/EmbeddedPayPage/Controller.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/EmbeddedPayPage/ReturnController.php

@@ -21,7 +21,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/EmbeddedPayPage/index.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 /** Require the constants of this example */

examples/ExampleDebugHandler.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/test/integration
+ * @package  heidelpayPHP\examples
  */
 namespace heidelpayPHP\examples;
 

examples/Failure.php

@@ -20,7 +20,7 @@
  *
  * @author  Simon Gabriel <[email protected]>
  *
- * @package  heidelpayPHP/examples
+ * @package  heidelpayPHP\examples
  */
 
 session_start();