Merge branch 'release/2.3.0'

.gitignore

@@ -5,6 +5,9 @@
 /composer.lock
 /vendor/
 
+# Composer bin plugin
+/vendor-bin/**/vendor
+
 # Eclipse
 /.buildpath
 /.project

.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

CHANGELOG.md

@@ -7,6 +7,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [2.3.0] - 2021-04-26
+- Added support for single-page checkout.
+
 ## [2.2.3] - 2021-02-08
 - Fixed showing payment method specific input fields.
 
@@ -116,7 +119,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## 1.0.0 - 2016-02-01
 - First release.
 
-[unreleased]: https://github.com/wp-pay-extensions/memberpress/compare/2.2.3...HEAD
+[unreleased]: https://github.com/wp-pay-extensions/memberpress/compare/2.3.0...HEAD
+[2.3.0]: https://github.com/wp-pay-extensions/memberpress/compare/2.2.3...2.3.0
 [2.2.3]: https://github.com/wp-pay-extensions/memberpress/compare/2.2.2...2.2.3
 [2.2.2]: https://github.com/wp-pay-extensions/memberpress/compare/2.2.1...2.2.2
 [2.2.1]: https://github.com/wp-pay-extensions/memberpress/compare/2.2.0...2.2.1

Gruntfile.js

@@ -2,7 +2,7 @@
  * Grunt tasks.
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

composer.json

@@ -36,24 +36,29 @@
 		"wp-pay/core": "^2.6"
 	},
 	"require-dev": {
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
-		"php-coveralls/php-coveralls": "^2.1",
+		"bamarni/composer-bin-plugin": "^1.4",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+		"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.6",
 		"squizlabs/php_codesniffer": "^3.4",
-		"wp-coding-standards/wpcs": "^2.1",
+		"wp-coding-standards/wpcs": "^2.3",
 		"wp-phpunit/wp-phpunit": "^5.6",
 		"wp-premium/memberpress-basic": "^1.3"
 	},
 	"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",
 		"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"
 	}
 }

gateways/MeprApplePayGateway.php

@@ -3,7 +3,7 @@
  * Apple Pay gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprBankTransferGateway.php

@@ -3,7 +3,7 @@
  * Bank transfer gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprBitcoinGateway.php

@@ -3,7 +3,7 @@
  * Bitcoin gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprCreditCardGateway.php

@@ -3,7 +3,7 @@
  * Credit card gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprDirectDebitBancontactGateway.php

@@ -3,7 +3,7 @@
  * Direct Debit mandate via Bancontact gateway alias.
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprDirectDebitGateway.php

@@ -3,7 +3,7 @@
  * Direct Debit gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprDirectDebitIDealGateway.php

@@ -3,7 +3,7 @@
  * Direct Debit mandate via iDEAL gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprDirectDebitSofortGateway.php

@@ -3,7 +3,7 @@
  * Direct Debit mandate via Sofort gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprIDealGateway.php

@@ -3,7 +3,7 @@
  * IDeal gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprMisterCashGateway.php

@@ -3,7 +3,7 @@
  * Bancontact/Mister Cash gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprPronamicGateway.php

@@ -3,7 +3,7 @@
  * Pronamic gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprPronamicPayPalGateway.php

@@ -3,7 +3,7 @@
  * Pronamic PayPal gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprPrzelewy24Gateway.php

@@ -3,7 +3,7 @@
  * Przelewy24 gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

gateways/MeprSofortGateway.php

@@ -3,7 +3,7 @@
  * Sofort gateway alias
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "memberpress",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "description": "MemberPress driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

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/

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" />

src/Admin/AdminSubscriptions.php

@@ -3,7 +3,7 @@
  * Admin subscriptions
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

src/Admin/AdminTransactions.php

@@ -3,7 +3,7 @@
  * Admin transactions
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

src/Extension.php

@@ -3,7 +3,7 @@
  * Extension
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */

src/Gateways/ApplePayGateway.php

@@ -3,15 +3,14 @@
  * Apple Pay gateway
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */
 
 namespace Pronamic\WordPress\Pay\Extensions\MemberPress\Gateways;
 
 use Pronamic\WordPress\Pay\Core\PaymentMethods;
-use Pronamic\WordPress\Pay\Extensions\MemberPress\Pronamic;
 
 /**
  * WordPress pay MemberPress Apple Pay gateway
@@ -62,6 +61,6 @@ public function get_alias() {
 	 * @return string
 	 */
 	protected function get_icon() {
-		return Pronamic::get_method_icon_url( $this->payment_method );
+		return PaymentMethods::get_icon_url( PaymentMethods::APPLE_PAY );
 	}
 }

src/Gateways/BancontactGateway.php

@@ -3,15 +3,14 @@
  * Bancontact/Mister Cash gateway
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */
 
 namespace Pronamic\WordPress\Pay\Extensions\MemberPress\Gateways;
 
 use Pronamic\WordPress\Pay\Core\PaymentMethods;
-use Pronamic\WordPress\Pay\Extensions\MemberPress\Pronamic;
 
 /**
  * WordPress pay MemberPress Bancontact/Mister Cash gateway
@@ -44,6 +43,6 @@ public function get_alias() {
 	 * @return string
 	 */
 	protected function get_icon() {
-		return Pronamic::get_method_icon_url( $this->payment_method );
+		return PaymentMethods::get_icon_url( PaymentMethods::BANCONTACT );
 	}
 }

src/Gateways/BankTransferGateway.php

@@ -3,15 +3,14 @@
  * Bank transfer gateway
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */
 
 namespace Pronamic\WordPress\Pay\Extensions\MemberPress\Gateways;
 
 use Pronamic\WordPress\Pay\Core\PaymentMethods;
-use Pronamic\WordPress\Pay\Extensions\MemberPress\Pronamic;
 
 /**
  * WordPress pay MemberPress bank transfer gateway
@@ -44,6 +43,6 @@ public function get_alias() {
 	 * @return string
 	 */
 	protected function get_icon() {
-		return Pronamic::get_method_icon_url( $this->payment_method );
+		return PaymentMethods::get_icon_url( PaymentMethods::BANK_TRANSFER );
 	}
 }

src/Gateways/BitcoinGateway.php

@@ -3,15 +3,14 @@
  * Bitcoin gateway
  *
  * @author    Pronamic <[email protected]>
- * @copyright 2005-2020 Pronamic
+ * @copyright 2005-2021 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Extensions\MemberPress
  */
 
 namespace Pronamic\WordPress\Pay\Extensions\MemberPress\Gateways;
 
 use Pronamic\WordPress\Pay\Core\PaymentMethods;
-use Pronamic\WordPress\Pay\Extensions\MemberPress\Pronamic;
 
 /**
  * WordPress pay MemberPress Bitcoin gateway
@@ -44,6 +43,6 @@ public function get_alias() {
 	 * @return string
 	 */
 	protected function get_icon() {
-		return Pronamic::get_method_icon_url( $this->payment_method );
+		return PaymentMethods::get_icon_url( PaymentMethods::BITCOIN );
 	}
 }