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.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
remcotolsma committed Feb 1, 2016
2 parents a10cf8e + 76cfe7f commit fb9ed99
Show file tree
Hide file tree
Showing 11 changed files with 103 additions and 82 deletions.
8 changes: 4 additions & 4 deletions composer.json
Expand Up @@ -29,10 +29,10 @@
"require": {
"php": ">=5.2.4",
"xrstf/composer-php52": "1.*",
"wp-pay/core": "dev-develop",
"wp-pay-gateways/common": "dev-develop",
"wp-pay-gateways/ideal": "dev-develop",
"wp-pay-gateways/ideal-advanced": "dev-develop"
"wp-pay/core": "^1.3.1",
"wp-pay-gateways/common": "^1.0.0",
"wp-pay-gateways/ideal": "^1.1.1",
"wp-pay-gateways/ideal-advanced": "^1.1.2"
},
"require-dev": {
"phpmd/phpmd": "^2.2.3",
Expand Down
159 changes: 86 additions & 73 deletions composer.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -34,9 +34,9 @@
"homepage": "http://www.wp-pay.org/gateways/fortis-bank-ideal-integrated/",
"devDependencies": {
"grunt": "~0.4.5",
"grunt-contrib-jshint": "^0.11.3",
"grunt-contrib-jshint": "^0.12.0",
"grunt-phpcs": "^0.4.0",
"grunt-phplint": "0.0.6",
"grunt-phplint": "0.0.8",
"grunt-phpmd": "^0.1.1",
"grunt-phpunit": "^0.3.6",
"load-grunt-tasks": "^3.4.0"
Expand Down
1 change: 1 addition & 0 deletions src/Config.php
Expand Up @@ -5,6 +5,7 @@
* Description:
* Copyright: Copyright (c) 2005 - 2016
* Company: Pronamic
*
* @author Remco Tolsma
* @version 1.0.0
*/
Expand Down
3 changes: 2 additions & 1 deletion src/ConfigFactory.php
Expand Up @@ -5,11 +5,12 @@
* Description:
* Copyright: Copyright (c) 2005 - 2016
* Company: Pronamic
*
* @author Remco Tolsma
* @version 1.0.0
*/
class Pronamic_WP_Pay_Gateways_FortisBank_IDealIntegrated_ConfigFactory extends Pronamic_WP_Pay_Gateways_IDealAdvanced_ConfigFactory {
public function __construct() {
parent::__construct( 'Pronamic_WP_Pay_Gateways_FortisBank_IDealIntegrated_Config', 'Pronamic_WP_Pay_Gateways_FortisBank_IDealIntegrated_ConfigTest' );
parent::__construct( 'Pronamic_WP_Pay_Gateways_FortisBank_IDealIntegrated_Config', 'Pronamic_WP_Pay_Gateways_FortisBank_IDealIntegrated_TestConfig' );
}
}
1 change: 1 addition & 0 deletions src/Integration.php
Expand Up @@ -5,6 +5,7 @@
* Description:
* Copyright: Copyright (c) 2005 - 2016
* Company: Pronamic
*
* @author Remco Tolsma
* @version 1.0.0
*/
Expand Down
1 change: 1 addition & 0 deletions src/TestConfig.php
Expand Up @@ -5,6 +5,7 @@
* Description:
* Copyright: Copyright (c) 2005 - 2016
* Company: Pronamic
*
* @author Remco Tolsma
* @version 1.0.0
*/
Expand Down
1 change: 1 addition & 0 deletions tests/ConfigFactoryTest.php
Expand Up @@ -5,6 +5,7 @@
* Description:
* Copyright: Copyright (c) 2005 - 2016
* Company: Pronamic
*
* @author Remco Tolsma
* @version 1.0.0
*/
Expand Down
3 changes: 2 additions & 1 deletion tests/ConfigTest.php
Expand Up @@ -3,8 +3,9 @@
/**
* Title: Fortis Bank - iDEAL Integrated - Config test
* Description:
* Copyright: Copyright (c) 2005 - 2014
* Copyright: Copyright (c) 2005 - 2016
* Company: Pronamic
*
* @author Remco Tolsma
* @version 1.0.0
*/
Expand Down
1 change: 1 addition & 0 deletions tests/IntegrationTest.php
Expand Up @@ -5,6 +5,7 @@
* Description:
* Copyright: Copyright (c) 2005 - 2016
* Company: Pronamic
*
* @author Remco Tolsma
* @version 1.0.0
*/
Expand Down
3 changes: 2 additions & 1 deletion tests/TestConfigTest.php
Expand Up @@ -3,8 +3,9 @@
/**
* Title: Fortis Bank - iDEAL Integrated - Config test test
* Description:
* Copyright: Copyright (c) 2005 - 2014
* Copyright: Copyright (c) 2005 - 2016
* Company: Pronamic
*
* @author Remco Tolsma
* @version 1.0.0
*/
Expand Down

0 comments on commit fb9ed99

Please sign in to comment.