Skip to content

Commit

Permalink
Merge branch 'release/2.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
remcotolsma committed Aug 27, 2019
2 parents b16d98e + dcddf77 commit 16d5567
Show file tree
Hide file tree
Showing 15 changed files with 191 additions and 4,206 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -2,6 +2,7 @@
/build/

# Composer
/composer.lock
/vendor/

# Eclipse
Expand All @@ -10,6 +11,7 @@
/.settings

# Node.js
/package-lock.json
/node_modules/

# WordPress
Expand Down
8 changes: 6 additions & 2 deletions CHANGELOG.md
Expand Up @@ -7,6 +7,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
## [Unreleased][unreleased]
-

## [2.0.4] - 2019-08-27
- Updated packages.

## [2.0.3] - 2019-05-15
- Set country from billing address.

Expand Down Expand Up @@ -54,7 +57,7 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
- Make sure to use language and country values from payment data object.

## [1.2.1] - 2015-03-03
- Changed WordPress pay core library requirment from ~1.0.0 to >=1.0.0.
- Changed WordPress pay core library requirment from `~1.0.0` to `>=1.0.0`.

## [1.2.0] - 2015-02-16
- Added support for multiple payment methods.
Expand All @@ -66,7 +69,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
## 1.0.0 - 2015-01-19
- First release.

[unreleased]: https://github.com/wp-pay-gateways/icepay/compare/2.0.3...HEAD
[unreleased]: https://github.com/wp-pay-gateways/icepay/compare/2.0.4...HEAD
[2.0.4]: https://github.com/wp-pay-gateways/icepay/compare/2.0.3...2.0.4
[2.0.3]: https://github.com/wp-pay-gateways/icepay/compare/2.0.2...2.0.3
[2.0.2]: https://github.com/wp-pay-gateways/icepay/compare/2.0.1...2.0.2
[2.0.1]: https://github.com/wp-pay-gateways/icepay/compare/2.0.0...2.0.1
Expand Down
27 changes: 11 additions & 16 deletions composer.json
Expand Up @@ -28,30 +28,25 @@
"Pronamic\\WordPress\\Pay\\Gateways\\Icepay\\": "src/"
}
},
"config": {
"platform": {
"php": "5.3.3"
}
},
"require": {
"php": "^5.3",
"php": ">=5.6.20",
"icepay/icepay": "~2.4.0",
"wp-pay/core": "^2.1"
"wp-pay/core": "^2.2"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5",
"php-coveralls/php-coveralls": "^1.1",
"phpcompatibility/php-compatibility": "^9.1",
"php-coveralls/php-coveralls": "^2.1",
"phpcompatibility/php-compatibility": "^9.2",
"phpcompatibility/phpcompatibility-wp": "^2.0",
"phpmd/phpmd": "^2.4",
"phpunit/phpunit": "^4.8",
"roots/wordpress": "^5.0",
"squizlabs/php_codesniffer": "^2.9",
"wp-coding-standards/wpcs": "^1.2",
"wp-phpunit/wp-phpunit": "^5.0"
"phpmd/phpmd": "^2.7",
"phpunit/phpunit": "^5.7 || ^6.0",
"roots/wordpress": "^5.2",
"squizlabs/php_codesniffer": "^3.4",
"wp-coding-standards/wpcs": "^2.1",
"wp-phpunit/wp-phpunit": "^5.2"
},
"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",
Expand Down

0 comments on commit 16d5567

Please sign in to comment.