Merge branch 'release/2.2.1'

wp-pay-extensions · Jan 14, 2021 · 3f5953a · 3f5953a
2 parents 39bfdc4 + 2eb230f
commit 3f5953a
Show file tree

Hide file tree

Showing 8 changed files with 647 additions and 301 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -0,0 +1,316 @@
+name: QA
+
+on: [ push, pull_request ]
+
+env:
+  COMPOSER_NO_INTERACTION: 1
+  WP_TESTS_DB_PASS: password
+  wp-version: '*'
+
+jobs:
+  coding-standards:
+    name: Coding Standards (PHP ${{ matrix.php-version }})
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - 7.4
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: bcmath, intl, mbstring, mysql
+          ini-values: memory_limit=2048M
+          tools: composer, phpcs
+          coverage: none
+
+      - name: Composer validation
+        run: composer validate --strict
+
+      # https://github.com/actions/cache/blob/master/examples.md#php---composer
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Require WordPress
+        run: composer require --dev --no-update --no-progress --no-suggest roots/wordpress:${{ env.wp-version }} wp-phpunit/wp-phpunit:${{ env.wp-version }}
+
+      - name: Install Composer dependencies
+        run: composer update --no-progress --no-suggest
+
+      - name: List Composer packages
+        run: composer show
+
+      - name: PHPLint
+        run: composer run-script phplint
+
+      - name: PHP Code Sniffer
+        run: composer run-script phpcs
+
+      - name: PHP Mess Detector
+        continue-on-error: true
+        run: composer run-script phpmd
+
+  static-code-analysis:
+    name: Static Code Analysis (PHP ${{ matrix.php-version }})
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php-version:
+          - 7.4
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: bcmath, intl, mbstring, mysql
+          ini-values: memory_limit=2048M
+          tools: composer
+          coverage: none
+
+      # https://github.com/actions/cache/blob/master/examples.md#php---composer
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer update --no-progress --no-suggest
+
+      - name: PHPStan static code analysis
+        run: composer bin phpstan install && composer run-script phpstan
+
+  tests:
+    name: Tests — PHP ${{ matrix.php-version }} ${{ matrix.name }}
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # PHP Compatibility and WordPress Versions: https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
+          - name: WP 5.6
+            php-version: 7.4
+            wp-version: 5.6.*
+          - name: WP 5.5
+            php-version: 7.4
+            wp-version: 5.5.*
+          # WordPress and PHP 7.4: https://make.wordpress.org/core/2019/10/11/wordpress-and-php-7-4/.
+          - name: WP 5.4
+            php-version: 7.4
+            wp-version: 5.4.*
+          - name: WP 5.3
+            php-version: 7.4
+            wp-version: 5.3.*
+          # WordPress 5.2 (or lower) will trigger PHP 7.4 (or higher) errors.
+          # @link https://make.wordpress.org/core/2019/10/11/wordpress-and-php-7-4/.
+          - name: WP 5.2
+            php-version: 7.3
+            wp-version: 5.2.*
+          - name: WP 5.1
+            php-version: 7.3
+            wp-version: 5.1.*
+          - name: WP 5.0
+            php-version: 7.3
+            wp-version: 5.0.*
+          - name: WP 4.9
+            php-version: 7.3
+            wp-version: 4.9.*
+          # WordPress 4.8 (or lower) will trigger PHP 7.2 (or higher) errors.
+          # @link https://make.wordpress.org/core/2018/10/15/wordpress-and-php-7-3/
+          # @link https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/
+          # @link https://make.wordpress.org/core/tag/4-9/?s=7.2
+          - name: WP 4.8
+            php-version: 7.1
+            wp-version: 4.8.*
+          - name: WP 4.7
+            php-version: 7.1
+            wp-version: 4.7.*
+          - name: Multisite
+            php-version: 7.4
+            WP_MULTISITE: 1
+          - php-version: 7.4
+          - php-version: 7.3
+          - php-version: 7.2
+          - php-version: 7.1
+          - php-version: 7.0
+          - php-version: 5.6
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: false
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: wp_phpunit_tests
+        ports:
+          - 3306/tcp
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: bcmath, intl, mbstring, mysql
+          ini-values: memory_limit=2048M
+          tools: composer
+          coverage: none
+
+      # https://github.com/actions/cache/blob/master/examples.md#php---composer
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Start MySQL service
+        run: sudo service mysql start
+
+      - name: Require WordPress
+        run: composer require --dev --no-update --no-progress --no-suggest roots/wordpress:${{ matrix.wp-version || env.wp-version }} wp-phpunit/wp-phpunit:${{ matrix.wp-version || env.wp-version }}
+
+      - name: Install Composer dependencies
+        run: composer update --no-progress --no-suggest
+
+      - name: List Composer packages
+        run: composer show
+
+      - name: PHPLint
+        run: composer run-script phplint
+
+      - name: PHPUnit test suite
+        env:
+          WP_TESTS_DB_HOST: 127.0.0.1:${{ job.services.mysql.ports['3306'] }}
+        run: composer run-script phpunit
+
+  code-coverage:
+    name: Code Coverage (PHP ${{ matrix.php-version }})
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - 7.4
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: false
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: wp_phpunit_tests
+        ports:
+          - 3306/tcp
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: bcmath, intl, mbstring, mysql
+          ini-values: memory_limit=2048M
+          tools: composer
+          coverage: xdebug
+
+      # https://github.com/actions/cache/blob/master/examples.md#php---composer
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Start MySQL service
+        run: sudo service mysql start
+
+      - name: Require WordPress
+        run: composer require --dev --no-update --no-progress --no-suggest roots/wordpress:${{ env.wp-version }} wp-phpunit/wp-phpunit:${{ env.wp-version }}
+
+      - name: Install Composer dependencies
+        run: composer update --no-progress --no-suggest
+
+      - name: List Composer packages
+        run: composer show
+
+      - name: PHPLint
+        run: composer run-script phplint
+
+      - name: PHPUnit test suite
+        env:
+          WP_TESTS_DB_HOST: 127.0.0.1:${{ job.services.mysql.ports['3306'] }}
+        run: composer run-script phpunit
+
+      - name: Coveralls code coverage
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          composer run-script coveralls
+          bash <(curl -s https://codecov.io/bash)
+
+  es-sass-linting:
+    name: Scripts and Styles
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # https://github.com/actions/cache/blob/master/examples.md#macos-and-ubuntu
+      - uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12'
+
+      - name: Install Node packages
+        run: npm install
+
+      - name: ESLint
+        run: npm run-script eslint
+
+      - name: Sass Lint
+        run: npm run-script sass-lint
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 - 
 
+## [2.2.1] - 2021-01-14
+- Prevent updating eot if (retry) payment period end date is (before) current eot time.
+- Code quality.
+- Fix using removed payment data class and multiple status update actions.
+- Fix setting subscription next payment date for new subscriptions (removes payment data class).
+
 ## [2.2.0] - 2020-11-09
 - Added support for new subscription phases and periods.
 - Fixed processing list servers for recurring payments.
@@ -83,7 +89,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.0...HEAD
+[unreleased]: https://github.com/wp-pay-extensions/s2member/compare/2.2.1...HEAD
+[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
 [2.1.2]: https://github.com/wp-pay-extensions/s2member/compare/2.1.1...2.1.2

diff --git a/composer.json b/composer.json
@@ -52,19 +52,19 @@
 	],
 	"require": {
 		"php": ">=5.6.20",
-		"wp-pay/core": "^2.4"
+		"wp-pay/core": "^2.6"
 	},
 	"require-dev": {
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
 		"php-coveralls/php-coveralls": "^2.1",
 		"phpcompatibility/php-compatibility": "^9.2",
 		"phpcompatibility/phpcompatibility-wp": "^2.0",
 		"phpmd/phpmd": "^2.7",
 		"phpunit/phpunit": "^5.7 || ^6.0",
-		"roots/wordpress": "^5.2",
+		"roots/wordpress": "^5.6",
 		"squizlabs/php_codesniffer": "^3.4",
 		"wp-coding-standards/wpcs": "^2.1",
-		"wp-phpunit/wp-phpunit": "^5.2",
+		"wp-phpunit/wp-phpunit": "^5.6",
 		"wpsharks/s2member": "190822"
 	},
 	"scripts": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "s2member",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "s2Member driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",
@@ -32,8 +32,8 @@
   },
   "homepage": "http://www.wp-pay.org/extensions/s2member/",
   "devDependencies": {
-    "grunt": "^1.0.4",
-    "grunt-contrib-jshint": "^2.1.0",
+    "grunt": "^1.3.0",
+    "grunt-contrib-jshint": "^3.0.0",
     "grunt-phpcs": "^0.4.0",
     "grunt-phplint": "0.1.0",
     "grunt-phpmd": "^0.1.1",