Merge branch 'release/2.2.2'

.gitignore

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

.travis.yml

@@ -52,6 +52,8 @@ before_install:
     if [[ "$COVERAGE" != "1" && -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]]; then
       phpenv config-rm xdebug.ini
     fi
+  # Set Xdebug mode for coverage.
+  - export XDEBUG_MODE=coverage
   # Raise PHP memory limit to 2048MB
   - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   # Validate composer.json file.
@@ -72,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.
@@ -87,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.2.2] - 2021-04-26
+- Happy 2021.
+
 ## [2.2.1] - 2021-01-14
 - Prevent updating eot if (retry) payment period end date is (before) current eot time.
 - Code quality.
@@ -81,15 +84,16 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 - Added HTML admin views from the Pronamic iDEAL plugin.
 
 ## [1.1.1] - 2015-03-03
-- Changed WordPress pay core library requirment from `~1.0.0` to `>=1.0.0`.
+- Changed WordPress pay core library requirement from `~1.0.0` to `>=1.0.0`.
 
 ## [1.1.0] - 2015-02-12
 - Show errors if they occur.
 
 ## 1.0.0 - 2015-01-20
 - First release.
 
-[unreleased]: https://github.com/wp-pay-extensions/s2member/compare/2.2.1...HEAD
+[unreleased]: https://github.com/wp-pay-extensions/s2member/compare/2.2.2...HEAD
+[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
 [2.1.3]: https://github.com/wp-pay-extensions/s2member/compare/2.1.2...2.1.3

composer.json

@@ -55,24 +55,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",
 		"wpsharks/s2member": "190822"
 	},
 	"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"
 	}
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "s2member",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "s2Member 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/Extension.php

@@ -15,7 +15,7 @@
 /**
  * Title: s2Member extension
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

src/S2Member.php

@@ -5,7 +5,7 @@
 /**
  * Title: s2Member
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

src/S2MemberDependency.php

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

src/Settings.php

@@ -5,7 +5,7 @@
 /**
  * Title: s2Member settings
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma
@@ -22,7 +22,7 @@ public function __construct() {
 	}
 
 	/**
-	 * Admin intialize
+	 * Admin initialize
 	 */
 	public function admin_init() {
 		// Settings - General

src/Shortcodes.php

@@ -21,7 +21,7 @@
 /**
  * Title: s2Member shortcodes
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma
@@ -75,7 +75,7 @@ public function create_hash( $data ) {
 	 * period represents one of the predetermined durations they can
 	 * selected from the dropdown.
 	 *
-	 * cost is set by the shortcode generator.  Must be ISO standard format ( . as decimal seperator )
+	 * cost is set by the shortcode generator.  Must be ISO standard format ( . as decimal separator )
 	 *
 	 * level is the level access upon payment will be granted.
 	 *

src/Util.php

@@ -8,7 +8,7 @@
 /**
  * Title: s2Member utility class
  * Description:
- * Copyright: 2005-2020 Pronamic
+ * Copyright: 2005-2021 Pronamic
  * Company: Pronamic
  *
  * @author  Remco Tolsma

tests/bootstrap.php

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

tests/phpstan/bootstrap.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Definitions for PHPStan.
+ *
+ * @author    Pronamic <[email protected]>
+ * @copyright 2005-2021 Pronamic
+ * @license   GPL-3.0-or-later
+ * @package   Pronamic\WordPress\Pay
+ */
+
+define( 'SCRIPT_DEBUG', true );

vendor-bin/phpstan/composer.json

@@ -0,0 +1,6 @@
+{
+	"require-dev": {
+		"phpstan/phpstan": "^0.12",
+		"szepeviktor/phpstan-wordpress": "^0.7"
+	}
+}