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`.
+- Added support for SprayPay payment method.
+
 ## [2.1.3] - 2021-04-26
 - Happy 2021.
 
@@ -62,7 +69,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ### Added
 - First release.
 
-[unreleased]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.1.3...HEAD
+[unreleased]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.1.3...3.0.0
 [2.1.3]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.1.2...2.1.3
 [2.1.2]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.1.1...2.1.2
 [2.1.1]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.1.0...2.1.1

composer.json

@@ -33,7 +33,7 @@
 	},
 	"require": {
 		"php": ">=5.6.20",
-		"wp-pay/core": "^2.6"
+		"wp-pay/core": "^3.0"
 	},
 	"repositories": [
 		{
@@ -59,24 +59,19 @@
 		}
 	],
 	"require-dev": {
-		"wp-e-commerce/wp-e-commerce": "^3.14",
 		"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.3",
+		"pronamic/wp-coding-standards": "^1.0",
+		"roots/wordpress": "^5.8",
 		"wp-e-commerce/wp-e-commerce": "^3.14",
-		"wp-phpunit/wp-phpunit": "^5.6"
+		"wp-phpunit/wp-phpunit": "^5.8"
 	},
 	"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": "wp-e-commerce",
-  "version": "2.1.3",
+  "version": "3.0.0",
   "description": "WP eCommerce driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

phpcs.xml.dist

@@ -1,33 +1,14 @@
 <?xml version="1.0"?>
 
 <ruleset name="WordPress Pay WP eCommerce 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.Files.LowercasedFilename.NotFound" />
 
+	<rule ref="PronamicWP">
 		<exclude name="Squiz.PHP.CommentedOutCode.Found" />
 
-		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
-		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
-
 		<exclude name="WordPress.Security.SafeRedirect.wp_redirect_wp_redirect" />
 	</rule>
 </ruleset>

phpunit.xml.dist

@@ -20,10 +20,6 @@
         </whitelist>
     </filter>
 
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-
     <php>
         <env name="WP_PHPUNIT__TESTS_CONFIG" value="tests/wp-config.php"/>
     </php>

src/Extension.php

@@ -150,6 +150,11 @@ public function merchants_modules( $gateways = array() ) {
 				'display_name' => __( 'SOFORT', 'pronamic_ideal' ),
 				'internalname' => 'wpsc_merchant_pronamic_sofort',
 			),
+			'SprayPayGateway'     => array(
+				'name'         => __( 'Pronamic - SprayPay', 'pronamic_ideal' ),
+				'display_name' => __( 'SprayPay', 'pronamic_ideal' ),
+				'internalname' => 'wpsc_merchant_pronamic_spraypay',
+			),
 		);
 
 		foreach ( $classes as $class => $args ) {

src/Gateways/SprayPayGateway.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * SPrayPay Gateway.
+ *
+ * @author    Pronamic <info@pronamic.eu>
+ * @copyright 2005-2021 Pronamic
+ * @license   GPL-3.0-or-later
+ * @package   Pronamic\WordPress\Pay\Extensions\WPeCommerce
+ */
+
+namespace Pronamic\WordPress\Pay\Extensions\WPeCommerce\Gateways;
+
+use Pronamic\WordPress\Pay\Core\PaymentMethods;
+
+/**
+ * SprayPay Gateway.
+ *
+ * @author  Reüel van der Steege
+ * @version 2.2.0
+ * @version 2.2.0
+ */
+class SprayPayGateway extends Gateway {
+	/**
+	 * Payment method
+	 *
+	 * @var string $payment_method
+	 */
+	const PAYMENT_METHOD = PaymentMethods::SPRAYPAY;
+}