Merge branch 'release/3.0.0'

Author: remcotolsma

.scrutinizer.yml

@@ -1,25 +1,36 @@
 build:
+  nodes:
+    analysis:
+      tests:
+        override:
+          - php-scrutinizer-run
+
+    coverage:
+      tests:
+        override:
+          - command: ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+            coverage:
+              file: build/logs/clover.xml
+              format: clover
+
   environment:
     php: 7.3.0
     variables:
       WP_TESTS_DB_NAME: 'wp_phpunit_tests'
       WP_TESTS_DB_USER: 'root'
       WP_TESTS_DB_PASS: ''
-      WP_TESTS_DB_HOST: 'localhost'
-  project_setup:
-    before:
-      - mysql -e "CREATE DATABASE wp_phpunit_tests"
+      WP_TESTS_DB_HOST: '127.0.0.1'
+
+  services:
+    mysql: 5.7
+
   dependencies:
     override:
       - composer install --ignore-platform-reqs --no-interaction
-  nodes:
-    coverage:
-      tests:
-        override:
-          - command: ./vendor/bin/phpunit
-            coverage:
-              file: build/logs/clover.xml
-              format: clover
+
+  project_setup:
+    before:
+      - mysql -e "CREATE DATABASE wp_phpunit_tests"
 
 filter:
   excluded_paths:

CHANGELOG.md

@@ -7,6 +7,13 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [3.0.0] - 2021-08-05
+- Updated to `pronamic/wp-pay-core`  version `3.0.0`.
+- Updated to `pronamic/wp-money`  version `2.0.0`.
+- Changed `TaxedMoney` to `Money`, no tax info.
+- Switched to `pronamic/wp-coding-standards`.
+- Simplified gateway registration for all active payment methods.
+
 ## [2.2.1] - 2021-04-26
 - Happy 2021.
 
@@ -64,7 +71,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## 1.0.0 - 2016-03-23
 - First release.
 
-[unreleased]: https://github.com/wp-pay-extensions/give/compare/2.2.1...HEAD
+[unreleased]: https://github.com/wp-pay-extensions/give/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/wp-pay-extensions/give/compare/2.2.1...3.0.0
 [2.2.1]: https://github.com/wp-pay-extensions/give/compare/2.2.0...2.2.1
 [2.2.0]: https://github.com/wp-pay-extensions/give/compare/2.1.1...2.2.0
 [2.1.1]: https://github.com/wp-pay-extensions/give/compare/2.1.0...2.1.1

composer.json

@@ -42,26 +42,22 @@
 	],
 	"require": {
 		"php": ">=5.6.20",
-		"wp-pay/core": "^2.6"
+		"wp-pay/core": "^3.0"
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.4",
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
 		"php-coveralls/php-coveralls": "^2.4",
-		"phpcompatibility/php-compatibility": "^9.1",
-		"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.3",
-		"wp-phpunit/wp-phpunit": "^5.6",
+		"pronamic/wp-coding-standards": "^1.0",
+		"roots/wordpress": "^5.8",
+		"wp-phpunit/wp-phpunit": "^5.8",
 		"wpackagist-plugin/give": "^2.9"
 	},
 	"scripts": {
 		"coveralls": "vendor/bin/php-coveralls -v",
 		"phpcbf": "vendor/bin/phpcbf",
-		"phpcs": "vendor/bin/phpcs -s -v",
+		"phpcs": "XDEBUG_MODE=off 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",
 		"phpstan": "vendor/bin/phpstan analyse",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "give",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "description": "Give driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

phpcs.xml.dist

@@ -1,34 +1,12 @@
 <?xml version="1.0"?>
 
 <ruleset name="WordPress Pay Give rules">
-	<config name="minimum_supported_wp_version" value="4.7" />
-
-	<config name="testVersion" value="5.6-" />
-
 	<file>.</file>
 
-	<arg name="colors"/>
-	<arg name="extensions" value="php" />
-	<arg value="sp" />
-
-	<exclude-pattern>node_modules/*</exclude-pattern>
 	<exclude-pattern>tests/bootstrap.php</exclude-pattern>
 	<exclude-pattern>tests/wp-config.php</exclude-pattern>
-	<exclude-pattern>vendor/*</exclude-pattern>
-	<exclude-pattern>wordpress/*</exclude-pattern>
-	<exclude-pattern type="relative">^wp-content/*</exclude-pattern>
-
-	<rule ref="PHPCompatibilityWP" />
-
-	<rule ref="WordPress">
-		<exclude name="Generic.CodeAnalysis.UselessOverridingMethod.Found" />
-		<exclude name="Generic.Files.LowercasedFilename.NotFound" />
 
+	<rule ref="PronamicWP">
 		<exclude name="Squiz.Commenting" />
-
-		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
-		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
-
-		<exclude name="WordPress.PHP.DiscouragedFunctions.DiscouragedWithAlternative" />
 	</rule>
 </ruleset>

src/BancontactGateway.php

@@ -93,30 +93,53 @@ public function give_payment_gateways( $gateways ) {
 		if ( null === $this->gateways ) {
 			$this->gateways = array();
 
-			$classes = array(
-				'Gateway',
-				'BancontactGateway',
-				'BankTransferGateway',
-				'CreditCardGateway',
-				'DirectDebitGateway',
-				'IDealGateway',
-				'SofortGateway',
+			// Get active and remove unsupported recurring-only payment methods.
+			$payment_methods = array_merge( array( null ), PaymentMethods::get_active_payment_methods() );
+
+			$payment_methods = array_diff(
+				$payment_methods,
+				\array_keys( PaymentMethods::get_direct_debit_methods() )
 			);
 
-			if ( PaymentMethods::is_active( PaymentMethods::GULDEN ) ) {
-				$classes[] = 'GuldenGateway';
-			}
+			// Create gateways for payment methods.
+			foreach ( $payment_methods as $payment_method ) {
+				// Gateway identifier.
+				$id = 'pronamic_pay';
+
+				if ( ! empty( $payment_method ) ) {
+					$id = \sprintf( 'pronamic_pay_%s', $payment_method );
+
+					// Use `mister_cash` instead of `bancontact` for backwards compatibility.
+					if ( PaymentMethods::BANCONTACT === $payment_method ) {
+						$id = 'pronamic_pay_mister_cash';
+					}
+				}
 
-			foreach ( $classes as $class ) {
-				$class = __NAMESPACE__ . '\\' . $class;
+				// New gateway.
+				$gateway = new Gateway( $id, $payment_method );
 
-				$gateway = new $class();
+				$name = PaymentMethods::get_name( $payment_method, __( 'Pronamic', 'pronamic_ideal' ) );
+
+				// Admin label.
+				$admin_label = \__( 'Pronamic', 'pronamic_ideal' );
+
+				if ( null !== $payment_method ) {
+					$admin_label = sprintf( '%s - %s', \__( 'Pronamic', 'pronamic_ideal' ), $name );
+				}
 
 				$this->gateways[ $gateway->id ] = array(
-					'admin_label'    => $gateway->name,
-					'checkout_label' => $gateway->name,
+					'admin_label'    => $admin_label,
+					'checkout_label' => $name,
 				);
 			}
+
+			// Sort gateways alphabetically.
+			uasort(
+				$this->gateways,
+				function ( $a, $b ) {
+					return strnatcasecmp( $a['admin_label'], $b['admin_label'] );
+				}
+			);
 		}
 
 		return array_merge( $gateways, $this->gateways );