Merge branch 'release/3.0.0'

.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,12 @@ 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`.
+
 ## [2.2.2] - 2021-04-26
 - Happy 2021.
 
@@ -92,7 +98,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## 1.0.0 - 2015-01-20
 - First release.
 
-[unreleased]: https://github.com/wp-pay-extensions/s2member/compare/2.2.2...HEAD
+[unreleased]: https://github.com/wp-pay-extensions/s2member/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/wp-pay-extensions/s2member/compare/2.2.2...3.0.0
 [2.2.2]: https://github.com/wp-pay-extensions/s2member/compare/2.2.1...2.2.2
 [2.2.1]: https://github.com/wp-pay-extensions/s2member/compare/2.2.0...2.2.1
 [2.2.0]: https://github.com/wp-pay-extensions/s2member/compare/2.1.3...2.2.0

composer.json

@@ -52,26 +52,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.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",
-		"wp-phpunit/wp-phpunit": "^5.6",
+		"pronamic/wp-coding-standards": "^1.0",
+		"roots/wordpress": "^5.8",
+		"wp-phpunit/wp-phpunit": "^5.8",
 		"wpsharks/s2member": "190822"
 	},
 	"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": "s2member",
-  "version": "2.2.2",
+  "version": "3.0.0",
   "description": "s2Member driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

phpcs.xml.dist

@@ -1,36 +1,20 @@
 <?xml version="1.0"?>
 
 <ruleset name="WordPress Pay s2Member 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">
+	<rule ref="PronamicWP">
 		<exclude name="Generic.CodeAnalysis.UselessOverridingMethod.Found" />
-		<exclude name="Generic.Files.LowercasedFilename.NotFound" />
 
 		<exclude name="Squiz.Commenting" />
 
 		<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" />
+
+		<exclude name="WordPressVIPMinimum.Functions.RestrictedFunctions.wp_mail_wp_mail" />
 	</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/Shortcodes.php

@@ -4,7 +4,7 @@
 
 use c_ws_plugin__s2member_list_servers;
 use Pronamic\WordPress\DateTime\DateTime;
-use Pronamic\WordPress\Money\TaxedMoney;
+use Pronamic\WordPress\Money\Money;
 use Pronamic\WordPress\Pay\Address;
 use Pronamic\WordPress\Pay\ContactName;
 use Pronamic\WordPress\Pay\Core\Util as Core_Util;
@@ -356,7 +356,7 @@ public function handle_payment() {
 
 		$line = $payment->lines->new_line();
 
-		$price = new TaxedMoney( $data['cost'], 'EUR' );
+		$price = new Money( $data['cost'], 'EUR' );
 
 		$line->set_name( $description );
 		$line->set_quantity( 1 );