From 666952902cb49f7b702955f0e95d4756375a5afd Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Sun, 26 Mar 2017 21:09:39 +0200 Subject: [PATCH 01/13] Renaming the library directory to lib following Stripe. --- {library => lib}/BarionClient.php | 0 {library => lib}/common/Constants.php | 0 {library => lib}/common/Enumerations.php | 0 {library => lib}/helpers/BarionHelper.php | 0 {library => lib}/helpers/iBarionModel.php | 0 {library => lib}/helpers/loader.php | 0 {library => lib}/models/ApiErrorModel.php | 0 {library => lib}/models/BankCardModel.php | 0 {library => lib}/models/BaseRequestModel.php | 0 {library => lib}/models/BaseResponseModel.php | 0 {library => lib}/models/FinishReservationRequestModel.php | 0 {library => lib}/models/FinishReservationResponseModel.php | 0 {library => lib}/models/FundingInformationModel.php | 0 {library => lib}/models/ItemModel.php | 0 {library => lib}/models/PayeeTransactionModel.php | 0 {library => lib}/models/PayeeTransactionToFinishModel.php | 0 {library => lib}/models/PaymentQRRequestModel.php | 0 {library => lib}/models/PaymentStateRequestModel.php | 0 {library => lib}/models/PaymentStateResponseModel.php | 0 {library => lib}/models/PaymentTransactionModel.php | 0 {library => lib}/models/PreparePaymentRequestModel.php | 0 {library => lib}/models/PreparePaymentResponseModel.php | 0 {library => lib}/models/RefundRequestModel.php | 0 {library => lib}/models/RefundResponseModel.php | 0 {library => lib}/models/TransactionDetailModel.php | 0 {library => lib}/models/TransactionResponseModel.php | 0 {library => lib}/models/TransactionToFinishModel.php | 0 {library => lib}/models/TransactionToRefundModel.php | 0 {library => lib}/models/UserModel.php | 0 {library => lib}/models/UserNameModel.php | 0 {library => lib}/ssl/cacert.pem | 0 {library => lib}/ssl/gd_bundle-g2.crt | 0 32 files changed, 0 insertions(+), 0 deletions(-) rename {library => lib}/BarionClient.php (100%) rename {library => lib}/common/Constants.php (100%) rename {library => lib}/common/Enumerations.php (100%) rename {library => lib}/helpers/BarionHelper.php (100%) rename {library => lib}/helpers/iBarionModel.php (100%) rename {library => lib}/helpers/loader.php (100%) rename {library => lib}/models/ApiErrorModel.php (100%) rename {library => lib}/models/BankCardModel.php (100%) rename {library => lib}/models/BaseRequestModel.php (100%) rename {library => lib}/models/BaseResponseModel.php (100%) rename {library => lib}/models/FinishReservationRequestModel.php (100%) rename {library => lib}/models/FinishReservationResponseModel.php (100%) rename {library => lib}/models/FundingInformationModel.php (100%) rename {library => lib}/models/ItemModel.php (100%) rename {library => lib}/models/PayeeTransactionModel.php (100%) rename {library => lib}/models/PayeeTransactionToFinishModel.php (100%) rename {library => lib}/models/PaymentQRRequestModel.php (100%) rename {library => lib}/models/PaymentStateRequestModel.php (100%) rename {library => lib}/models/PaymentStateResponseModel.php (100%) rename {library => lib}/models/PaymentTransactionModel.php (100%) rename {library => lib}/models/PreparePaymentRequestModel.php (100%) rename {library => lib}/models/PreparePaymentResponseModel.php (100%) rename {library => lib}/models/RefundRequestModel.php (100%) rename {library => lib}/models/RefundResponseModel.php (100%) rename {library => lib}/models/TransactionDetailModel.php (100%) rename {library => lib}/models/TransactionResponseModel.php (100%) rename {library => lib}/models/TransactionToFinishModel.php (100%) rename {library => lib}/models/TransactionToRefundModel.php (100%) rename {library => lib}/models/UserModel.php (100%) rename {library => lib}/models/UserNameModel.php (100%) rename {library => lib}/ssl/cacert.pem (100%) rename {library => lib}/ssl/gd_bundle-g2.crt (100%) diff --git a/library/BarionClient.php b/lib/BarionClient.php similarity index 100% rename from library/BarionClient.php rename to lib/BarionClient.php diff --git a/library/common/Constants.php b/lib/common/Constants.php similarity index 100% rename from library/common/Constants.php rename to lib/common/Constants.php diff --git a/library/common/Enumerations.php b/lib/common/Enumerations.php similarity index 100% rename from library/common/Enumerations.php rename to lib/common/Enumerations.php diff --git a/library/helpers/BarionHelper.php b/lib/helpers/BarionHelper.php similarity index 100% rename from library/helpers/BarionHelper.php rename to lib/helpers/BarionHelper.php diff --git a/library/helpers/iBarionModel.php b/lib/helpers/iBarionModel.php similarity index 100% rename from library/helpers/iBarionModel.php rename to lib/helpers/iBarionModel.php diff --git a/library/helpers/loader.php b/lib/helpers/loader.php similarity index 100% rename from library/helpers/loader.php rename to lib/helpers/loader.php diff --git a/library/models/ApiErrorModel.php b/lib/models/ApiErrorModel.php similarity index 100% rename from library/models/ApiErrorModel.php rename to lib/models/ApiErrorModel.php diff --git a/library/models/BankCardModel.php b/lib/models/BankCardModel.php similarity index 100% rename from library/models/BankCardModel.php rename to lib/models/BankCardModel.php diff --git a/library/models/BaseRequestModel.php b/lib/models/BaseRequestModel.php similarity index 100% rename from library/models/BaseRequestModel.php rename to lib/models/BaseRequestModel.php diff --git a/library/models/BaseResponseModel.php b/lib/models/BaseResponseModel.php similarity index 100% rename from library/models/BaseResponseModel.php rename to lib/models/BaseResponseModel.php diff --git a/library/models/FinishReservationRequestModel.php b/lib/models/FinishReservationRequestModel.php similarity index 100% rename from library/models/FinishReservationRequestModel.php rename to lib/models/FinishReservationRequestModel.php diff --git a/library/models/FinishReservationResponseModel.php b/lib/models/FinishReservationResponseModel.php similarity index 100% rename from library/models/FinishReservationResponseModel.php rename to lib/models/FinishReservationResponseModel.php diff --git a/library/models/FundingInformationModel.php b/lib/models/FundingInformationModel.php similarity index 100% rename from library/models/FundingInformationModel.php rename to lib/models/FundingInformationModel.php diff --git a/library/models/ItemModel.php b/lib/models/ItemModel.php similarity index 100% rename from library/models/ItemModel.php rename to lib/models/ItemModel.php diff --git a/library/models/PayeeTransactionModel.php b/lib/models/PayeeTransactionModel.php similarity index 100% rename from library/models/PayeeTransactionModel.php rename to lib/models/PayeeTransactionModel.php diff --git a/library/models/PayeeTransactionToFinishModel.php b/lib/models/PayeeTransactionToFinishModel.php similarity index 100% rename from library/models/PayeeTransactionToFinishModel.php rename to lib/models/PayeeTransactionToFinishModel.php diff --git a/library/models/PaymentQRRequestModel.php b/lib/models/PaymentQRRequestModel.php similarity index 100% rename from library/models/PaymentQRRequestModel.php rename to lib/models/PaymentQRRequestModel.php diff --git a/library/models/PaymentStateRequestModel.php b/lib/models/PaymentStateRequestModel.php similarity index 100% rename from library/models/PaymentStateRequestModel.php rename to lib/models/PaymentStateRequestModel.php diff --git a/library/models/PaymentStateResponseModel.php b/lib/models/PaymentStateResponseModel.php similarity index 100% rename from library/models/PaymentStateResponseModel.php rename to lib/models/PaymentStateResponseModel.php diff --git a/library/models/PaymentTransactionModel.php b/lib/models/PaymentTransactionModel.php similarity index 100% rename from library/models/PaymentTransactionModel.php rename to lib/models/PaymentTransactionModel.php diff --git a/library/models/PreparePaymentRequestModel.php b/lib/models/PreparePaymentRequestModel.php similarity index 100% rename from library/models/PreparePaymentRequestModel.php rename to lib/models/PreparePaymentRequestModel.php diff --git a/library/models/PreparePaymentResponseModel.php b/lib/models/PreparePaymentResponseModel.php similarity index 100% rename from library/models/PreparePaymentResponseModel.php rename to lib/models/PreparePaymentResponseModel.php diff --git a/library/models/RefundRequestModel.php b/lib/models/RefundRequestModel.php similarity index 100% rename from library/models/RefundRequestModel.php rename to lib/models/RefundRequestModel.php diff --git a/library/models/RefundResponseModel.php b/lib/models/RefundResponseModel.php similarity index 100% rename from library/models/RefundResponseModel.php rename to lib/models/RefundResponseModel.php diff --git a/library/models/TransactionDetailModel.php b/lib/models/TransactionDetailModel.php similarity index 100% rename from library/models/TransactionDetailModel.php rename to lib/models/TransactionDetailModel.php diff --git a/library/models/TransactionResponseModel.php b/lib/models/TransactionResponseModel.php similarity index 100% rename from library/models/TransactionResponseModel.php rename to lib/models/TransactionResponseModel.php diff --git a/library/models/TransactionToFinishModel.php b/lib/models/TransactionToFinishModel.php similarity index 100% rename from library/models/TransactionToFinishModel.php rename to lib/models/TransactionToFinishModel.php diff --git a/library/models/TransactionToRefundModel.php b/lib/models/TransactionToRefundModel.php similarity index 100% rename from library/models/TransactionToRefundModel.php rename to lib/models/TransactionToRefundModel.php diff --git a/library/models/UserModel.php b/lib/models/UserModel.php similarity index 100% rename from library/models/UserModel.php rename to lib/models/UserModel.php diff --git a/library/models/UserNameModel.php b/lib/models/UserNameModel.php similarity index 100% rename from library/models/UserNameModel.php rename to lib/models/UserNameModel.php diff --git a/library/ssl/cacert.pem b/lib/ssl/cacert.pem similarity index 100% rename from library/ssl/cacert.pem rename to lib/ssl/cacert.pem diff --git a/library/ssl/gd_bundle-g2.crt b/lib/ssl/gd_bundle-g2.crt similarity index 100% rename from library/ssl/gd_bundle-g2.crt rename to lib/ssl/gd_bundle-g2.crt From 68ec01d4cd3f72f0d855b2a1b485a61d9d1026ab Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Sun, 26 Mar 2017 21:10:04 +0200 Subject: [PATCH 02/13] Renaming the changelog to use markdown format and display nicely on github. --- changelog.txt => CHANGELOG.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.txt => CHANGELOG.md (100%) diff --git a/changelog.txt b/CHANGELOG.md similarity index 100% rename from changelog.txt rename to CHANGELOG.md From 17af9fd859aa9f23a18141499511d335fd8b69c6 Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Sun, 26 Mar 2017 21:11:22 +0200 Subject: [PATCH 03/13] Adding a basic gitignore file. --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fd5106f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_STORE From 5d9a807e57b77d87094e82622387b26dde19a8ec Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Sun, 26 Mar 2017 21:11:41 +0200 Subject: [PATCH 04/13] Initial composer.json file added. --- composer.json | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..e63f9f4 --- /dev/null +++ b/composer.json @@ -0,0 +1,35 @@ +{ + "name": "snufkin/barion-web-php", + "description": "Barion PHP Library", + "keywords": [ + "barion", + "payment processing", + "api" + ], + "homepage": "https://www.barion.com", + "license": "MIT", + "authors": [ + { + "name": "Barion and contributors", + "homepage": "https://github.com/barion/barion-web-php" + } + ], + "require": { + "php": ">=5.3.3", + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "autoload": { + "psr-4": { "Barion\\" : "lib/" } + }, + "extra": { + "branch-alias": { + "master": "1.0-dev" + } + } +} From bf7d84e567734b4c7a54484712801c2d21467306 Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Sun, 26 Mar 2017 21:15:03 +0200 Subject: [PATCH 05/13] Using dev-master as the primary branch indicator following composer requirements. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e63f9f4..db5297b 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ }, "extra": { "branch-alias": { - "master": "1.0-dev" + "dev-master": "1.0-dev" } } } From 3722e62e09d9e67be6c19c9b5acf5fab541c79ed Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Sun, 26 Mar 2017 21:43:29 +0200 Subject: [PATCH 06/13] Updating the gitignore and composer.json with composer generate provided variables. --- .gitignore | 2 ++ composer.json | 51 ++++++++++++++++++--------------------------------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index fd5106f..9df1f6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .DS_STORE + +/vendor/ diff --git a/composer.json b/composer.json index db5297b..95307c1 100644 --- a/composer.json +++ b/composer.json @@ -1,35 +1,20 @@ { - "name": "snufkin/barion-web-php", - "description": "Barion PHP Library", - "keywords": [ - "barion", - "payment processing", - "api" - ], - "homepage": "https://www.barion.com", - "license": "MIT", - "authors": [ - { - "name": "Barion and contributors", - "homepage": "https://github.com/barion/barion-web-php" - } - ], - "require": { - "php": ">=5.3.3", - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*", - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" - }, - "autoload": { - "psr-4": { "Barion\\" : "lib/" } - }, - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - } + "name": "snufkin/barion-web-php", + "description": "Barion PHP library", + "type": "library", + "require": { + "php-mod/curl": "^1.6", + "php": "^5.6" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "license": "MIT", + "authors": [ + { + "name": "Balazs Dianiska", + "email": "balazs.dianiska@acquia.com" + } + ], + "minimum-stability": "dev" } From 8d1d94548b9a35fe67eafdb2015bb5698f480704 Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Sun, 26 Mar 2017 21:51:48 +0200 Subject: [PATCH 07/13] Updating the composer.json with previous information overridden by composer generate. --- composer.json | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 95307c1..4d7768e 100644 --- a/composer.json +++ b/composer.json @@ -1,20 +1,31 @@ { - "name": "snufkin/barion-web-php", - "description": "Barion PHP library", - "type": "library", - "require": { - "php-mod/curl": "^1.6", - "php": "^5.6" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "license": "MIT", - "authors": [ - { - "name": "Balazs Dianiska", - "email": "balazs.dianiska@acquia.com" - } - ], - "minimum-stability": "dev" + "name": "snufkin/barion-web-php", + "description": "Barion PHP library", + "keywords": [ + "barion", + "payment processing", + "api" + ], + "homepage": "https://www.barion.com", + "authors": [ + { + "name": "Barion and contributors", + "homepage": "https://github.com/barion/barion-web-php" + } + ], + "type": "library", + "require": { + "php-mod/curl": "^1.6", + "php": "^5.6" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "license": "MIT", + "minimum-stability": "dev", + "autoload": { + "psr-4": { + "Barion\\": "lib/", + } + } } From 5c60d8a816c666f8a3019543f790c4081e84b4c6 Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Mon, 27 Mar 2017 12:04:18 +0200 Subject: [PATCH 08/13] Removing trailing comma. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4d7768e..8c4eec3 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "autoload": { "psr-4": { - "Barion\\": "lib/", + "Barion\\": "lib/" } } } From 8ebf1c94f8365140bc60ba8ea7195530148baaa6 Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Mon, 27 Mar 2017 12:50:50 +0200 Subject: [PATCH 09/13] Applying the correct license. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8c4eec3..b069d41 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "require-dev": { "phpunit/phpunit": "^6.0" }, - "license": "MIT", + "license": "Apache-2.0", "minimum-stability": "dev", "autoload": { "psr-4": { From 8f40e8b15e6bbac0317ba714607cf0b99be68307 Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Mon, 27 Mar 2017 15:35:38 +0200 Subject: [PATCH 10/13] Updating the changelog with the actual changes. --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85d441e..ec9f5f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ Changelog for "barion/barion-web-php" ---------------------------------------- +v1.3.0: 2017-03-27 +- Added composer support and published the fork on packagist. + v1.2.7: 2017-02-14 - MERGE: Added FundingInformation and BankCard to PaymentStateResponse - MERGE: Added currency to PaymentStateResponseModel and TransactionDetailModel @@ -35,4 +38,4 @@ v1.0.0 : 2015-11-17 ---------------------------------------- © 2016 Barion Payment Inc. -All rights reserved. \ No newline at end of file +All rights reserved. From 1ad677cdbc2fbe637c821794c579e1aa635a2fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morva=20Krist=C3=B3f?= Date: Mon, 17 Apr 2017 15:12:35 +0200 Subject: [PATCH 11/13] The package uses the cURL PHP extension, not an other package --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b069d41..4b52391 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ ], "type": "library", "require": { - "php-mod/curl": "^1.6", + "ext-curl": "*", "php": "^5.6" }, "require-dev": { From ca3a0c864e2d9b4f470ca6d7728fbb93a476fd15 Mon Sep 17 00:00:00 2001 From: Balazs Dianiska Date: Mon, 17 Apr 2017 21:03:29 +0200 Subject: [PATCH 12/13] Removing phpunit as dev dependency, and using the barion namespace for the module. --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index b069d41..8a33fd0 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "snufkin/barion-web-php", + "name": "barion/barion-web-php", "description": "Barion PHP library", "keywords": [ "barion", @@ -18,9 +18,6 @@ "php-mod/curl": "^1.6", "php": "^5.6" }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, "license": "Apache-2.0", "minimum-stability": "dev", "autoload": { From c0b59fc1c2e95a5c83bed1350fc1e4e30beed27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morva=20Krist=C3=B3f?= Date: Mon, 17 Apr 2017 14:47:58 +0200 Subject: [PATCH 13/13] Supporting PHP7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 65984c6..1fa1984 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "type": "library", "require": { "ext-curl": "*", - "php": "^5.6" + "php": ">=5.6" }, "license": "Apache-2.0", "minimum-stability": "dev",