Merge branch 'release/2.1.3'

pronamic · Apr 26, 2021 · 7d7e15d · 7d7e15d
2 parents 9b6efe8 + 61947f1
commit 7d7e15d
Show file tree

Hide file tree

Showing 44 changed files with 2,344 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,9 @@
 /composer.lock
 /vendor/
 
+# Composer bin plugin
+/vendor-bin/**/vendor
+
 # Eclipse
 /.buildpath
 /.project

diff --git a/.phplint.yml b/.phplint.yml
@@ -0,0 +1,10 @@
+path: ./
+jobs: 10
+cache: build/phplint.cache
+extensions:
+  - php
+exclude:
+  - build
+  - node_modules
+  - vendor
+  - wordpress
diff --git a/.travis.yml b/.travis.yml
@@ -74,6 +74,10 @@ install:
   - composer self-update
   # Install Composer packages.
   - composer install
+  # PHPStan
+  - if [ "$PHPSTAN" == "1" ]; then composer bin phpstan install; fi
+  # Psalm
+  - if [ "$PSALM" == "1" ]; then composer bin psalm install; fi
   # Test on specific WordPress version.
   - composer require --dev --update-with-dependencies roots/wordpress:${WP_VERSION} wp-phpunit/wp-phpunit:${WP_VERSION}
   # List available packages.
@@ -89,9 +93,9 @@ script:
   # PHP Mess Detector
   - if [ "$PHPMD" == "1" ]; then composer run-script phpmd; fi
   # PHPStan
-  - if [ "$PHPSTAN" == "1" ]; then phpstan analyze; fi
+  - if [ "$PHPSTAN" == "1" ]; then composer run-script phpstan; fi
   # Psalm
-  - if [ "$PSALM" == "1" ]; then psalm; fi
+  - if [ "$PSALM" == "1" ]; then composer run-script psalm; fi
 
 after_success:
   - if [ "$COVERAGE" == "1" ]; then composer run-script coveralls; fi

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,11 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [2.1.3] - 2021-04-26
+- Happy 2021.
+
 ## [2.1.2] - 2021-01-18
-- Added support for In3 pament method.
+- Added support for In3 payment method.
 - Added partial support for Santander 'Betaal per maand' payment method.
 
 ## [2.1.1] - 2020-06-02
@@ -60,7 +63,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## 1.0.0 - 2015-01-19
 - First release.
 
-[unreleased]: https://github.com/wp-pay-gateways/multisafepay/compare/2.1.2...HEAD
+[unreleased]: https://github.com/wp-pay-gateways/multisafepay/compare/2.1.3...HEAD
+[2.1.3]: https://github.com/wp-pay-gateways/multisafepay/compare/2.1.2...2.1.3
 [2.1.2]: https://github.com/wp-pay-gateways/multisafepay/compare/2.1.1...2.1.2
 [2.1.1]: https://github.com/wp-pay-gateways/multisafepay/compare/2.1.0...2.1.1
 [2.1.0]: https://github.com/wp-pay-gateways/multisafepay/compare/2.0.6...2.1.0

diff --git a/composer.json b/composer.json
@@ -34,26 +34,32 @@
 	"require": {
 		"php": ">=5.6.20",
 		"ext-simplexml": "*",
-		"wp-pay/core": "^2.4"
+		"wp-pay/core": "^2.6"
 	},
 	"require-dev": {
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-		"php-coveralls/php-coveralls": "^2.1",
+		"bamarni/composer-bin-plugin": "^1.4",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+		"overtrue/phplint": "^1.2",
+		"php-coveralls/php-coveralls": "^2.4",
 		"phpcompatibility/php-compatibility": "^9.2",
 		"phpcompatibility/phpcompatibility-wp": "^2.0",
 		"phpmd/phpmd": "^2.7",
 		"phpunit/phpunit": "^5.7 || ^6.0",
-		"roots/wordpress": "^5.2",
+		"roots/wordpress": "^5.6",
 		"squizlabs/php_codesniffer": "^3.4",
-		"wp-coding-standards/wpcs": "^2.1",
-		"wp-phpunit/wp-phpunit": "^5.2"
+		"wp-coding-standards/wpcs": "^2.3",
+		"wp-phpunit/wp-phpunit": "^5.6"
 	},
 	"scripts": {
-		"coveralls": "vendor/bin/coveralls -v",
+		"coveralls": "vendor/bin/php-coveralls -v",
 		"phpcbf": "vendor/bin/phpcbf",
 		"phpcs": "vendor/bin/phpcs -s -v",
-		"phplint": "find src tests -name '*.php' | xargs -n 1 -P 4 php -l",
+		"phplint": "vendor/bin/phplint",
 		"phpmd": "vendor/bin/phpmd src,tests text phpmd.ruleset.xml --suffixes php",
-		"phpunit": "vendor/bin/phpunit"
+		"phpstan": "vendor/bin/phpstan analyse",
+		"phpunit": "vendor/bin/phpunit",
+		"post-install-cmd": "echo 'Optionally run: composer bin all install'",
+		"post-update-cmd": "echo 'Optionally run: composer bin all update'",
+		"psalm": "vendor/bin/psalm"
 	}
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "multisafepay",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "MultiSafepay driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,6 +1,9 @@
+includes:
+	- vendor-bin/phpstan/vendor/szepeviktor/phpstan-wordpress/extension.neon
 parameters:
 	customRulesetUsed: false
 	level: max
-	bootstrap: tests/bootstrap.php
+	bootstrapFiles:
+		- tests/phpstan/bootstrap.php
 	paths:
-		- src
+		- src/
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -33,7 +33,6 @@
         <MissingReturnType errorLevel="info" />
         <MissingPropertyType errorLevel="info" />
         <InvalidDocblock errorLevel="info" />
-        <MisplacedRequiredParam errorLevel="info" />
 
         <PropertyNotSetInConstructor errorLevel="info" />
         <MissingConstructor errorLevel="info" />

diff --git a/src/Client.php b/src/Client.php
@@ -19,7 +19,7 @@
 /**
  * Title: MultiSafepay Connect client
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Config.php b/src/Config.php
@@ -7,7 +7,7 @@
 /**
  * Title: MultiSafepay config
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Customer.php b/src/Customer.php
@@ -3,9 +3,9 @@
 namespace Pronamic\WordPress\Pay\Gateways\MultiSafepay;
 
 /**
- * Title: MutliSafepay Connect customer
+ * Title: MultiSafepay Connect customer
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Gateway.php b/src/Gateway.php
@@ -12,9 +12,9 @@
 use Pronamic\WordPress\Pay\Payments\Payment;
 
 /**
- * Title: MultiSafepay Connect gateay
+ * Title: MultiSafepay Connect gateway
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/GatewayInfo.php b/src/GatewayInfo.php
@@ -3,9 +3,9 @@
 namespace Pronamic\WordPress\Pay\Gateways\MultiSafepay;
 
 /**
- * Title: MutliSafepay Connect gateway info
+ * Title: MultiSafepay Connect gateway info
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Integration.php b/src/Integration.php
@@ -7,7 +7,7 @@
 /**
  * Title: MultiSafepay Connect integration
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma
@@ -41,7 +41,6 @@ public function __construct( $args = array() ) {
 
 		parent::__construct( $args );
 
-
 		// Filters.
 		$function = array( WooCommerce::class, 'woocommerce_available_payment_gateways' );
 

diff --git a/src/Merchant.php b/src/Merchant.php
@@ -3,9 +3,9 @@
 namespace Pronamic\WordPress\Pay\Gateways\MultiSafepay;
 
 /**
- * Title: MutliSafepay Connect merchant
+ * Title: MultiSafepay Connect merchant
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Methods.php b/src/Methods.php
@@ -7,7 +7,7 @@
 /**
  * Title: MultiSafepay connect payment methods
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/MultiSafepay.php b/src/MultiSafepay.php
@@ -5,7 +5,7 @@
 /**
  * Title: MultiSafepay
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Signature.php b/src/Signature.php
@@ -5,9 +5,9 @@
 use Pronamic\WordPress\Pay\Core\Util;
 
 /**
- * Title: MutliSafepay Connect signature
+ * Title: MultiSafepay Connect signature
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Statuses.php b/src/Statuses.php
@@ -7,7 +7,7 @@
 /**
  * Title: MultiSafepay statuses constants
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/Transaction.php b/src/Transaction.php
@@ -3,9 +3,9 @@
 namespace Pronamic\WordPress\Pay\Gateways\MultiSafepay;
 
 /**
- * Title: MutliSafepay Connect transaction
+ * Title: MultiSafepay Connect transaction
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/WooCommerce.php b/src/WooCommerce.php
@@ -3,7 +3,7 @@
  * WooCommerce.
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay
  */

diff --git a/src/XML/DirectTransactionRequestMessage.php b/src/XML/DirectTransactionRequestMessage.php
@@ -11,7 +11,7 @@
 /**
  * Title: MultiSafepay Connect XML direct transaction request message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/DirectTransactionResponseMessage.php b/src/XML/DirectTransactionResponseMessage.php
@@ -9,7 +9,7 @@
 /**
  * Title: MultiSafepay Connect XML direct transaction response message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/GatewaysRequestMessage.php b/src/XML/GatewaysRequestMessage.php
@@ -9,7 +9,7 @@
 /**
  * Title: MultiSafepay Connect XML gateways request message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/GatewaysResponseMessage.php b/src/XML/GatewaysResponseMessage.php
@@ -8,7 +8,7 @@
 /**
  * Title: MultiSafepay Connect XML gateways response message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/IDealIssuersRequestMessage.php b/src/XML/IDealIssuersRequestMessage.php
@@ -8,7 +8,7 @@
 /**
  * Title: MultiSafepay Connect XML iDEAL issuers request message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/IDealIssuersResponseMessage.php b/src/XML/IDealIssuersResponseMessage.php
@@ -8,7 +8,7 @@
 /**
  * Title: MultiSafepay Connect XML iDEAL issuers response message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/Message.php b/src/XML/Message.php
@@ -5,7 +5,7 @@
 /**
  * Title: MultiSafepay Connect XML message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/RedirectTransactionRequestMessage.php b/src/XML/RedirectTransactionRequestMessage.php
@@ -10,7 +10,7 @@
 /**
  * Title: MultiSafepay Connect XML redirect transaction request message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/RedirectTransactionResponseMessage.php b/src/XML/RedirectTransactionResponseMessage.php
@@ -8,7 +8,7 @@
 /**
  * Title: MultiSafepay Connect XML redirect transaction response message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/RequestMessage.php b/src/XML/RequestMessage.php
@@ -10,7 +10,7 @@
 /**
  * Title: MultiSafepay Connect XML request message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/ResponseMessage.php b/src/XML/ResponseMessage.php
@@ -5,7 +5,7 @@
 /**
  * Title: MultiSafepay Connect XML response message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/StatusRequestMessage.php b/src/XML/StatusRequestMessage.php
@@ -8,7 +8,7 @@
 /**
  * Title: MultiSafepay Connect XML status request message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

diff --git a/src/XML/StatusResponseMessage.php b/src/XML/StatusResponseMessage.php
@@ -9,7 +9,7 @@
 /**
  * Title: MultiSafepay Connect XML status response message
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma