Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
remcotolsma committed Aug 5, 2021
2 parents 7d7e15d + 919424f commit 70c8c9e
Show file tree
Hide file tree
Showing 9 changed files with 327 additions and 250 deletions.
35 changes: 23 additions & 12 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.3] - 2021-04-26
- Happy 2021.

Expand Down Expand Up @@ -63,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/multisafepay/compare/2.1.3...HEAD
[unreleased]: https://github.com/wp-pay-gateways/multisafepay/compare/3.0.0...HEAD
[3.0.0]: https://github.com/wp-pay-gateways/multisafepay/compare/3.0.0...3.0.0
[2.1.3]: https://github.com/wp-pay-gateways/multisafepay/compare/2.1.2...2.1.3
[2.1.2]: https://github.com/wp-pay-gateways/multisafepay/compare/2.1.1...2.1.2
[2.1.1]: https://github.com/wp-pay-gateways/multisafepay/compare/2.1.0...2.1.1
Expand Down
14 changes: 5 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,22 @@
"require": {
"php": ">=5.6.20",
"ext-simplexml": "*",
"wp-pay/core": "^2.6"
"wp-pay/core": "^3.0"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
"overtrue/phplint": "^1.2",
"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"
},
"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": "vendor/bin/phplint",
"phpmd": "vendor/bin/phpmd src,tests text phpmd.ruleset.xml --suffixes php",
"phpstan": "vendor/bin/phpstan analyse",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "multisafepay",
"version": "2.1.3",
"version": "3.0.0",
"description": "MultiSafepay driver for the WordPress payment processing library.",
"repository": {
"type": "git",
Expand Down
16 changes: 1 addition & 15 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
@@ -1,26 +1,12 @@
<?xml version="1.0"?>

<ruleset name="WordPress Pay MultiSafepay 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="Squiz.Commenting" />

<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
Expand Down
4 changes: 0 additions & 4 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/Gateway.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function get_credit_card_issuers() {
/**
* Get payment methods
*
* @see Pronamic_WP_Pay_Gateway::get_payment_methods()
* @see Core_Gateway::get_payment_methods()
*/
public function get_available_payment_methods() {
$payment_methods = array();
Expand Down Expand Up @@ -147,7 +147,7 @@ public function get_available_payment_methods() {
/**
* Get supported payment methods
*
* @see Pronamic_WP_Pay_Gateway::get_supported_payment_methods()
* @see Core_Gateway::get_supported_payment_methods()
*/
public function get_supported_payment_methods() {
return array(
Expand Down Expand Up @@ -213,7 +213,7 @@ public function start( Payment $payment ) {
$transaction = new Transaction();
$transaction->id = uniqid();
$transaction->currency = $payment->get_total_amount()->get_currency()->get_alphabetic_code();
$transaction->amount = $payment->get_total_amount()->get_cents();
$transaction->amount = $payment->get_total_amount()->get_minor_units()->format( 0, '', '' );
$transaction->description = $transaction_description;

switch ( $payment_method ) {
Expand Down
64 changes: 34 additions & 30 deletions vendor-bin/phpstan/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 70c8c9e

Please sign in to comment.