Merge pull request #4 from heidelpay/develop

heidelpay GmbH re-branding
heidelpay · Mar 1, 2018 · 3029c2e · 3029c2e
2 parents f91aa5a + 037cdb0
commit 3029c2e
Show file tree

Hide file tree

Showing 28 changed files with 66 additions and 61 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,10 @@ matrix:
       env: deps=no
     - php: 7.1
       env: deps=high
+    - php: 7.2
+      env: deps=no
+    - php: 7.2
+      env: deps=high
 
 cache:
   directories:

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -3,7 +3,7 @@ Lizenzvereinbarung Plug-in
 
 I. Präambel
 
-Diese Lizenzvereinbarung Plug-in (nachfolgend – „Vereinbarung“) bildet einen Vertrag zwischen dem Nutzer des Plug-ins und der Heidelberger Payment GmbH (nachfolgend „heidelpay“).
+Diese Lizenzvereinbarung Plug-in (nachfolgend – „Vereinbarung“) bildet einen Vertrag zwischen dem Nutzer des Plug-ins und der heidelpay GmbH (nachfolgend „heidelpay“).
 
 Das Plug-in von heidelpay ist ein Software-Programm, welches die Schnittstelle zum Payment-System von heidelpay mit einer Anwendung (zum Beispiel: Shopsystem, Warenwirtschaft, Debitorenmanagement etc.) verbindet. Das Plug-in dient dem Datenaustausch zwischen dem Payment-System von heidelpay und der Anwendung. Das Plug-in erweitert den Funktionsumfang der Anwendung hinsichtlich der mit heidelpay gesondert vertraglich vereinbarten Leistungen. 
 
@@ -32,7 +32,7 @@ IV. Lizenz
 	1. Diese Vereinbarung räumt nur solchen Nutzern Nutzungsrechte ein, die Unternehmer im Sinne des BGB sind. Eine Nutzung durch Verbraucher ist nicht gestattet. 
 	2. Die von heidelpay im Rahmen dieser Vereinbarung gewährte Lizenz, ist für den Nutzer unentgeltlich.
 	3. Unter der Voraussetzung der Einhaltung der Bestimmungen dieser Vereinbarung, erteilt heidelpay dem Nut-zer das zeitlich unbefristete, widerrufliche, räumlich auf Europa begrenzte Recht, das Plug-in zu verändern, unverändert oder in veränderter Form zu dem in der Präambel dargestellten Zweck für geschäftliche Zwecke zu nutzen, d.h. das Plug-in zu speichern, ablaufen zu lassen, zu vervielfältigen, zu verbreiten und öffentlich zugänglich zu machen.
-	4. Heidelpay kann neue Versionen/Updates des Plug-ins anbieten, die zum Beispiel Fehlerbehebungen und neue Funktionalitäten beinhalten können. Heidelpay empfiehlt daher die regelmässige Überprüfung der Ak-tualität des Plug-in, dies wird auf der Seite http://dev.heidelpay.de veröffentlicht. Auch diese neuen Versio-nen/Updates unterliegen den Bedingungen dieser Vereinbarung.
+	4. Heidelpay kann neue Versionen/Updates des Plug-ins anbieten, die zum Beispiel Fehlerbehebungen und neue Funktionalitäten beinhalten können. Heidelpay empfiehlt daher die regelmässige Überprüfung der Ak-tualität des Plug-in, dies wird auf der Seite http://dev.heidelpay.com veröffentlicht. Auch diese neuen Versio-nen/Updates unterliegen den Bedingungen dieser Vereinbarung.
 
 V. Beschränkungen
 

diff --git a/README.md b/README.md
@@ -5,8 +5,9 @@
 [![PHP 5.6](https://img.shields.io/badge/php-5.6-blue.svg)](http://www.php.net)
 [![PHP 7.0](https://img.shields.io/badge/php-7.0-blue.svg)](http://www.php.net)
 [![PHP 7.1](https://img.shields.io/badge/php-7.1-blue.svg)](http://www.php.net)
+[![PHP 7.2](https://img.shields.io/badge/php-7.2-blue.svg)](http://www.php.net)
 
-![Logo](https://dev.heidelpay.de/devHeidelpay_400_180.jpg)
+![Logo](http://dev.heidelpay.com/devHeidelpay_400_180.jpg)
 
 # Welcome to the heidelpay basket api
 

diff --git a/composer.json b/composer.json
@@ -5,19 +5,19 @@
   "authors": [
     {
       "name": "Jens Richter",
-      "email": "development@heidelpay.de",
+      "email": "development@heidelpay.com",
       "homepage": "http://dev.heidelpay.com",
       "role": "Developer"
     },
     {
       "name": "Stephano Vogel",
-      "email": "development@heidelpay.de",
+      "email": "development@heidelpay.com",
       "homepage": "http://dev.heidelpay.com",
       "role": "Developer"
     }
   ],
   "require": {
-    "php": "~5.6.0|~7.0.0|~7.1.0",
+    "php": ">=5.6.0",
     "lib-curl": ">=7.26.0",
     "lib-openssl": ">=1.0.1.5"
   },
@@ -37,9 +37,9 @@
     }
   },
   "support": {
-    "email": "development@heidelpay.de"
+    "email": "development@heidelpay.com"
   },
-  "homepage": "https://dev.heidelpay.de",
+  "homepage": "http://dev.heidelpay.com",
   "minimum-stability": "dev",
   "type": "library",
   "keywords": [

diff --git a/lib/Adapter/AdapterInterface.php b/lib/Adapter/AdapterInterface.php
@@ -10,11 +10,11 @@
  * Interface for connection adapters
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\interfaces\adapter
  */

diff --git a/lib/Adapter/CurlAdapter.php b/lib/Adapter/CurlAdapter.php
@@ -13,11 +13,11 @@
  * based on a standard library like zend-http or guzzlehttp.
  *
  * @license Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
- * @link https://dev.heidelpay.de/PhpApi
+ * @link http://dev.heidelpay.com/PhpBaketApi
  *
- * @author Jens Richter <development@heidelpay.de>
+ * @author Jens Richter <development@heidelpay.com>
  *
  * @package heidelpay
  */

diff --git a/lib/BasketError.php b/lib/BasketError.php
@@ -12,11 +12,11 @@
  * @version 1.2
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Interaction\Object
  */

diff --git a/lib/Exception/BasketException.php b/lib/Exception/BasketException.php
@@ -8,11 +8,11 @@
  * Basket Exception Class
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Exception
  */

diff --git a/lib/Exception/BasketItemException.php b/lib/Exception/BasketItemException.php
@@ -8,11 +8,11 @@
  * BasketItem Exception Class
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Exception
  */

diff --git a/lib/Exception/CurlAdapterException.php b/lib/Exception/CurlAdapterException.php
@@ -8,11 +8,11 @@
  * Curl Adapter Exception Class
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Exception
  */

diff --git a/lib/Exception/InvalidBasketitemIdException.php b/lib/Exception/InvalidBasketitemIdException.php
@@ -8,11 +8,11 @@
  * Invalid BasketItem Id Exception Class
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Exception
  */

diff --git a/lib/Exception/InvalidBasketitemPositionException.php b/lib/Exception/InvalidBasketitemPositionException.php
@@ -8,11 +8,11 @@
  * Invalid BasketItem Id Exception Class
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Exception
  */

diff --git a/lib/Exception/ParameterOverflowException.php b/lib/Exception/ParameterOverflowException.php
@@ -8,11 +8,11 @@
  * Parameter Overflow Exception Class
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Exception
  */

diff --git a/lib/Exception/RequestException.php b/lib/Exception/RequestException.php
@@ -8,11 +8,11 @@
  * Request Exception Class
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Exception
  */

diff --git a/lib/Object/AbstractObject.php b/lib/Object/AbstractObject.php
@@ -10,11 +10,11 @@
  * Abstract Class for all object implementations of the heidelpay PHP Basket API implementation
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Object
  */

diff --git a/lib/Object/Authentication.php b/lib/Object/Authentication.php
@@ -8,12 +8,12 @@
  * Authentication object for the heidelpay basket api
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Jens Richter <development@heidelpay.de>
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Jens Richter <development@heidelpay.com>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Object
  */

diff --git a/lib/Object/Basket.php b/lib/Object/Basket.php
@@ -13,12 +13,12 @@
  * @version 1.2
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Jens Richter <development@heidelpay.de>
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Jens Richter <development@heidelpay.com>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Object
  */

diff --git a/lib/Object/BasketItem.php b/lib/Object/BasketItem.php
@@ -12,12 +12,12 @@
  * @version 1.2
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Jens Richter <development@heidelpay.de>
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Jens Richter <development@heidelpay.com>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Object
  */

diff --git a/lib/Request.php b/lib/Request.php
@@ -14,12 +14,12 @@
  * Implementation for creating and sending a request to the heidelpay Basket API.
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Jens Richter <development@heidelpay.de>
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Jens Richter <development@heidelpay.com>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\Interaction\Object
  */

diff --git a/lib/Response.php b/lib/Response.php
@@ -12,11 +12,11 @@
  * Representation of the heidelpay Basket API Response
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\interaction\object
  */

diff --git a/tests/Integration/RequestTest.php b/tests/Integration/RequestTest.php
@@ -13,11 +13,11 @@
  * Integration Testsuite for all requests to the API
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\tests\integration
  */

diff --git a/tests/Unit/BasketErrorTest.php b/tests/Unit/BasketErrorTest.php
@@ -11,11 +11,11 @@
  * Unit tests for the BasketError object
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\tests\unit
  */

diff --git a/tests/Unit/Object/AuthenticationTest.php b/tests/Unit/Object/AuthenticationTest.php
@@ -10,11 +10,11 @@
  * Authentication Unit Tests
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Jens Richter <development@heidelpay.de>
+ * @author Jens Richter <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\tests\unit\object
  */

diff --git a/tests/Unit/Object/BasketItemTest.php b/tests/Unit/Object/BasketItemTest.php
@@ -10,11 +10,11 @@
  * Unit tests for the BasketItem Objects
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\tests\unit\object
  */

diff --git a/tests/Unit/Object/BasketTest.php b/tests/Unit/Object/BasketTest.php
@@ -12,11 +12,11 @@
  * Tests for the PHP Basket API Object
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Jens Richter <development@heidelpay.de>
+ * @author Jens Richter <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\tests\unit\object
  */

diff --git a/tests/Unit/RequestTest.php b/tests/Unit/RequestTest.php
@@ -12,11 +12,11 @@
  * Unit tests for the Request object
  *
  * @license Use of this software requires acceptance of the License Agreement. See LICENSE file.
- * @copyright Copyright © 2017-present Heidelberger Payment GmbH. All rights reserved.
+ * @copyright Copyright © 2017-present heidelpay GmbH. All rights reserved.
  *
  * @link http://dev.heidelpay.com/php-basket-api
  *
- * @author Stephano Vogel <development@heidelpay.de>
+ * @author Stephano Vogel <development@heidelpay.com>
  *
  * @package heidelpay\php-basket-api\test\unit
  */