Merge branch 'release/2.0.2'

Author: remcotolsma

.gitignore

@@ -2,6 +2,7 @@
 /build/
 
 # Composer
+/composer.lock
 /vendor/
 
 # Eclipse
@@ -10,7 +11,11 @@
 /.settings
 
 # Node.js
+/package-lock.json
 /node_modules/
 
+# WordPress
+/wordpress/
+
 # WordPress content
 /wp-content/

.scrutinizer.yml

@@ -0,0 +1,59 @@
+build:
+  environment:
+    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"
+  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
+
+filter:
+  excluded_paths:
+    # Exclude the external `xmlseclibs.php` library.
+    - 'includes/xmlseclibs/*'
+
+checks:
+  php:
+    coding_standard:
+      name: WordPress
+    code_rating: true
+    duplication: true
+
+build_failure_conditions:
+  - 'issues.label("bug").exists'
+
+coding_style:
+    php:
+        indentation:
+            general:
+                use_tabs: true
+        spaces:
+            around_operators:
+                unary_additive: true
+                concatenation: true
+                negation: true
+            within:
+                brackets: false
+                array_initializer: true
+                grouping: true
+                function_call: true
+                function_declaration: true
+                if: true
+                for: true
+                while: true
+                switch: true
+                catch: true
+                type_cast: false

.travis.yml

@@ -4,31 +4,46 @@ sudo: false
 
 language: php
 
-php:
-- 5.4
-- 5.5
-- 5.6
-- 7.0
-- 7.1
-- 7.2
-- nightly
-- hhvm
+env:
+  global:
+    - COMPOSER_NO_INTERACTION=1
+    - WP_VERSION=*
 
-matrix:
+jobs:
   include:
+    - php: 7.3
+      env: WP_VERSION=^5.0 COVERAGE=1 PHPCS=1
+    - php: 7.2
+      env: WP_VERSION=^4.9
+    - php: 7.2
+      env: WP_VERSION=^4.8
+    - php: 7.2
+      env: WP_VERSION=^4.7
+    - php: 7.3
+      env: WP_MULTISITE=1
+    - php: 7.3
+      env: PHPSTAN=1
+    - php: 7.3
+      env: PHPMD=1
+    - php: 7.3
+      env: PSALM=1
+    - php: 7.2
+    - php: 7.1
+    - php: 7.0
+    - php: 5.6
+    - php: 5.5
+    - php: 5.4
     - php: 5.3
       dist: precise
       env: TRAVIS_DIST_PRECISE=1
-    - php: 5.6
-      env: WP_MULTISITE=1
-    - php: 5.6
-      env: WP_VERSION=4.8
-    - php: 5.6
-      env: WP_VERSION=4.7 COVERAGE=1 GRUNT=1
-  fast_finish: true
+    - php: nightly
+    - php: hhvm
   allow_failures:
     - php: hhvm
     - php: nightly
+    - env: PHPMD=1
+    - env: PHPSTAN=1
+    - env: PSALM=1
 
 cache:
   directories:
@@ -39,6 +54,23 @@ cache:
 before_install:
   # Install latest version of Node.js (https://github.com/creationix/nvm).
   - if [ "${TRAVIS_DIST_PRECISE}" == "1" ]; then nvm install node; fi
+  # Create database for PHPUnit tests.
+  - mysql -e 'CREATE DATABASE wp_phpunit_tests;'
+  # Remove Xdebug for a huge performance increase:
+  - |
+    if [[ "$COVERAGE" != "1" && -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]]; then
+      phpenv config-rm xdebug.ini
+    fi
+  # Raise PHP memory limit to 2048MB
+  - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  # Validate composer.json file.
+  - composer validate --strict
+  # Add Composer global vendor/bin to path.
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
+  # PHPStan
+  - if [ "$PHPSTAN" == "1" ]; then composer global require phpstan/phpstan; fi
+  # Psalm
+  - if [ "$PSALM" == "1" ]; then composer global require vimeo/psalm; fi
 
 install:
   # Install Grunt command line interface (https://github.com/gruntjs/grunt-cli).
@@ -49,16 +81,25 @@ install:
   - composer self-update
   # Install Composer packages.
   - composer install
-
-before_script:
-  - wget https://raw.githubusercontent.com/wp-cli/sample-plugin/master/bin/install-wp-tests.sh
-  - bash install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
+  # Test on specific WordPress version.
+  - composer require --dev --update-with-dependencies roots/wordpress:${WP_VERSION} wp-phpunit/wp-phpunit:${WP_VERSION}
+  # List available packages.
+  - composer show
 
 script:
-  - if [[ -z "$GRUNT" ]]; then grunt phpunit; fi
-  - if [[ -z "$GRUNT" ]]; then grunt phplint; fi
-  - if [[ "$GRUNT" == "1" ]]; then grunt; fi
+  # PHPLint
+  - composer run-script phplint
+  # PHPUnit
+  - composer run-script phpunit
+  # PHP_CodeSniffer
+  - if [ "$PHPCS" == "1" ]; then composer run-script phpcs; fi
+  # PHP Mess Detector
+  - if [ "$PHPMD" == "1" ]; then composer run-script phpmd; fi
+  # PHPStan
+  - if [ "$PHPSTAN" == "1" ]; then phpstan analyze; fi
+  # Psalm
+  - if [ "$PSALM" == "1" ]; then psalm; fi
 
 after_success:
-  - if [ $COVERAGE == "1" ]; then php vendor/bin/coveralls -v; fi
-  - if [ $COVERAGE == "1" ]; then bash <(curl -s https://codecov.io/bash); fi
+  - if [ "$COVERAGE" == "1" ]; then composer run-script coveralls; fi
+  - if [ "$COVERAGE" == "1" ]; then bash <(curl -s https://codecov.io/bash); fi

CHANGELOG.md

@@ -7,6 +7,10 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [2.0.2] - 2019-03-29
+- Added support for additional payment data like customer, adresses, payment lines, etc.
+- Added gateway for AfterPay, Bancontact, Bank Transfer, Credit Card, Focum, Giropay, Maestro, PayPal and SOFORT.
+
 ## [2.0.1] - 2018-12-12
 - Update item methods in payment data.
 
@@ -36,7 +40,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.0.1...HEAD
+[unreleased]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.0.2...HEAD
+[2.0.2]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/1.0.5...2.0.0
 [1.0.5]: https://github.com/wp-pay-extensions/wp-e-commerce/compare/1.0.4...1.0.5

Gruntfile.js

@@ -18,11 +18,12 @@ module.exports = function( grunt ) {
         // PHP Code Sniffer
         phpcs: {
             application: {
-                src: [
-                    '**/*.php',
-                    '!node_modules/**',
-                    '!vendor/**',
-                    '!wp-content/**'
+				src: [
+					'**/*.php',
+					'!node_modules/**',
+					'!vendor/**',
+					'!wordpress/**',
+					'!wp-content/**'
                 ]
             },
             options: {
@@ -60,5 +61,5 @@ module.exports = function( grunt ) {
 	} );
 
 	// Default task(s).
-	grunt.registerTask( 'default', [ 'jshint', 'phplint', 'phpmd', 'phpcs' ] );
+	grunt.registerTask( 'default', [ 'jshint', 'phplint', 'phpmd', 'phpcs', 'phpunit' ] );
 };

composer.json

@@ -35,14 +35,50 @@
 	},
 	"require": {
 		"php": "^5.3",
-		"wp-pay/core": "^2.0"
+		"wp-pay/core": "^2.1"
 	},
+	"repositories": [
+		{
+			"type": "package",
+			"package": {
+				"name": "wp-e-commerce/WP-e-Commerce",
+				"version": "3.14.0",
+				"dist": {
+					"url": "https://github.com/wp-e-commerce/WP-e-Commerce/archive/3.14.0.zip",
+					"type": "zip"
+				},
+				"source": {
+					"url": "https://github.com/wp-e-commerce/WP-e-Commerce",
+					"type": "github",
+					"reference": "tags/3.14.0"
+				},
+				"autoload": {
+					"classmap": [
+						"."
+					]
+				}
+			}
+		}
+	],
 	"require-dev": {
-		"php-coveralls/php-coveralls": "^1.0",
+		"wp-e-commerce/WP-e-Commerce": "^3.14",
+		"dealerdirect/phpcodesniffer-composer-installer": "^0.5",
+		"php-coveralls/php-coveralls": "^1.1",
+		"phpcompatibility/php-compatibility": "^9.1",
+		"phpcompatibility/phpcompatibility-wp": "^2.0",
 		"phpmd/phpmd": "^2.4",
 		"phpunit/phpunit": "^4.8",
+		"roots/wordpress": "^5.0",
 		"squizlabs/php_codesniffer": "^2.9",
-		"wimg/php-compatibility": "^8.1",
-		"wp-coding-standards/wpcs": "^0.14.1"
+		"wp-coding-standards/wpcs": "^1.2",
+		"wp-phpunit/wp-phpunit": "^5.0"
+	},
+	"scripts": {
+		"coveralls": "vendor/bin/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"
 	}
 }