Skip to content
This repository has been archived by the owner on Feb 6, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
remcotolsma committed May 6, 2015
2 parents 33dd3e1 + ec8a7c2 commit d5464ea
Show file tree
Hide file tree
Showing 44 changed files with 1,163 additions and 124 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* text=auto

*.http text eol=crlf
25 changes: 13 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- hhvm

- 5.3
- 5.4
- 5.5
env:
matrix:
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=1
- WP_VERSION=3.5.1 WP_MULTISITE=0
- WP_VERSION=3.5.1 WP_MULTISITE=1

global:
- secure: GZuBoHlpcrgIBwu4Y254Enq2ahpC36jnyXhB2YJLI1+3xqmf4qq7IjxuOLmZkIHA/VCls7L7+avarrw/lT/z7ZeaCVJ0x/oK34WcHm84dP21wIe+jPlom7TN1leWTNbqAXfrrYvQJGEF9JweKw5WWRBhvXtgXiT2ckvBijuVAdA=
- secure: DAcE4hAgVJPQOU+qvU77S6rseu+9Mc9sKamPZRUEVNFY+xU/B5ZuVivRJd0VtGHzgRqsZXRMXih96Nau5TSSxV28C/Sd8bnu0VzA1UnV07uKhwOyb7vRi+KbdNN0ICFPuqw7RFgoqytV4BpKRer+ZQDohpN7XdiBumrrrBREZyk=
- secure: OgtWjiebuZowAhHEthCbFocW/4LnapqqXNlZr9+KI93IgpHoubiimO0WSNL3S2//CO47qyuENNYOmUQWlXcQ1qIlhB/fzZ911CDU0oT2f1CSFihoUemRXRXYbuXHD52kT7eQttqHYCVmPWeH++B5r7kzYa2kNgP9fCJ3Vk29nCc=
- secure: h3rVFMIzYoTE9Y/WEhVUKV1LU7Oq5m0MI/2ufTTR+yFrX9qIX08QbE6ZnDvCihOVDCDT0rx6AcnaB+u1ay2gTsedmHw44GJbI37xiLFx+C9F6edXtTjlUkF/WG/06N/NYmb1lsxb2sgmMXl8vOcT1CpBnvxr07eDpzGG534fdXQ=
before_script:
- composer install
- 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

- composer install
- 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
after_script:
- php vendor/bin/coveralls
- php vendor/bin/coveralls
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 1.2.0
* Added support for direct transaction request for iDEAL.

## 1.1.1
* Updated WordPress pay core library to version 1.1.1.
* If payment description is empty the payment ID is used.
Expand Down
12 changes: 8 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@ module.exports = function( grunt ) {
// PHP Code Sniffer
phpcs: {
application: {
dir: [ 'src', 'tests' ],
src: [
'src/**/*',
'tests/**/*',
'!tests/Mock/**',
'!node_modules/**',
'!vendor/**'
],
},
options: {
standard: 'phpcs.ruleset.xml',
extensions: 'php',
ignore: 'node_modules'
standard: 'phpcs.ruleset.xml'
}
},

Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
**MultiSafepay Connect driver for the WordPress payment processing library.**

[![Build Status](https://travis-ci.org/wp-pay-gateways/multisafepay-connect.svg?branch=develop)](https://travis-ci.org/wp-pay-gateways/multisafepay-connect)
[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/multisafepay-connect/badge.png?branch=develop)](https://coveralls.io/r/wp-pay-gateways/multisafepay-connect?branch=develop)
[![Latest Stable Version](https://poser.pugx.org/wp-pay-gateways/multisafepay-connect/v/stable.svg)](https://packagist.org/packages/wp-pay-gateways/multisafepay-connect)
[![Total Downloads](https://poser.pugx.org/wp-pay-gateways/multisafepay-connect/downloads.svg)](https://packagist.org/packages/wp-pay-gateways/multisafepay-connect)
[![Latest Unstable Version](https://poser.pugx.org/wp-pay-gateways/multisafepay-connect/v/unstable.svg)](https://packagist.org/packages/wp-pay-gateways/multisafepay-connect)
[![License](https://poser.pugx.org/wp-pay-gateways/multisafepay-connect/license.svg)](https://packagist.org/packages/wp-pay-gateways/multisafepay-connect)
[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/multisafepay-connect/badge.svg?branch=develop)](https://coveralls.io/r/wp-pay-gateways/multisafepay-connect?branch=develop)
[![Latest Stable Version](https://poser.pugx.org/wp-pay-gateways/multisafepay-connect/v/stable)](https://packagist.org/packages/wp-pay-gateways/multisafepay-connect)
[![Total Downloads](https://poser.pugx.org/wp-pay-gateways/multisafepay-connect/downloads)](https://packagist.org/packages/wp-pay-gateways/multisafepay-connect)
[![Latest Unstable Version](https://poser.pugx.org/wp-pay-gateways/multisafepay-connect/v/unstable)](https://packagist.org/packages/wp-pay-gateways/multisafepay-connect)
[![License](https://poser.pugx.org/wp-pay-gateways/multisafepay-connect/license)](https://packagist.org/packages/wp-pay-gateways/multisafepay-connect)
[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)

## Documentation

* [MultiSafepay](https://multisafepay.com/)
* [MultiSafepay API](https://multisafepay.com/nl/Artikelen-Support-Zakelijk/asp-en-php-download-zakelijk.html)
* [MutliSafepay - Implementation manual Connect (UK)](http://www.wp-pay.org/wp-content/uploads/2015/04/multisafepay-connect-en.pdf)
* [MultiSafepay Implementatie handleiding Connect (NL)](http://www.wp-pay.org/wp-content/uploads/2015/04/multisafepay-connect-nl.pdf)
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"require": {
"php": ">=5.2.4",
"wp-pay/core": ">=1.2.0",
"wp-pay/core": ">=1.2.1",
"wp-pay-gateways/multisafepay": ">=1.1.1"
},
"require-dev": {
Expand Down
64 changes: 32 additions & 32 deletions composer.lock

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "multisafepay-connect",
"version": "1.1.1",
"version": "1.2.0",
"description": "MultiSafepay Connect driver for the WordPress payment processing library.",
"repository": {
"type": "git",
Expand Down Expand Up @@ -37,7 +37,7 @@
"grunt": "~0.4.5",
"grunt-phplint": "0.0.5",
"grunt-phpmd": "^0.1.1",
"grunt-phpcs": "^0.2.3",
"grunt-contrib-jshint": "^0.11.0"
"grunt-phpcs": "^0.4.0",
"grunt-contrib-jshint": "^0.11.2"
}
}
4 changes: 4 additions & 0 deletions phpcs.ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@

<exclude name="WordPress.VIP.RestrictedVariables.cache_constraints" />
</rule>

<rule ref="WordPress.VIP.RestrictedFunctions.file_get_contents">
<exclude-pattern>*/tests/*</exclude-pattern>
</rule>
</ruleset>
Loading

0 comments on commit d5464ea

Please sign in to comment.