From 3695a1e476dc6f1b7c0c2ca8415e3be848ddc3a0 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 21 Aug 2017 19:08:49 +0300 Subject: [PATCH] Working on GoCardless --- app/Constants.php | 3 +- app/Models/AccountGateway.php | 3 +- app/Models/Gateway.php | 1 + .../GoCardlessV2RedirectPaymentDriver.php | 17 + composer.json | 5 + composer.lock | 614 +++++++++++------- database/seeds/PaymentLibrariesSeeder.php | 9 +- .../partials/payment_credentials.blade.php | 4 + 8 files changed, 408 insertions(+), 248 deletions(-) create mode 100644 app/Ninja/PaymentDrivers/GoCardlessV2RedirectPaymentDriver.php diff --git a/app/Constants.php b/app/Constants.php index adc806c8ff1a..f986319fcdef 100644 --- a/app/Constants.php +++ b/app/Constants.php @@ -271,11 +271,9 @@ if (! defined('APP_NAME')) { define('GATEWAY_SAGE_PAY_DIRECT', 20); define('GATEWAY_SAGE_PAY_SERVER', 21); define('GATEWAY_STRIPE', 23); - define('GATEWAY_GOCARDLESS', 6); define('GATEWAY_TWO_CHECKOUT', 27); define('GATEWAY_BEANSTREAM', 29); define('GATEWAY_PSIGATE', 30); - define('GATEWAY_MOOLAH', 31); define('GATEWAY_BITPAY', 42); define('GATEWAY_DWOLLA', 43); define('GATEWAY_CHECKOUT_COM', 47); @@ -283,6 +281,7 @@ if (! defined('APP_NAME')) { define('GATEWAY_WEPAY', 60); define('GATEWAY_BRAINTREE', 61); define('GATEWAY_CUSTOM', 62); + define('GATEWAY_GOCARDLESS', 64); // The customer exists, but only as a local concept // The remote gateway doesn't understand the concept of customers diff --git a/app/Models/AccountGateway.php b/app/Models/AccountGateway.php index 514fea0cfb3f..75068013a71b 100644 --- a/app/Models/AccountGateway.php +++ b/app/Models/AccountGateway.php @@ -64,9 +64,10 @@ class AccountGateway extends EntityModel public static function paymentDriverClass($provider) { $folder = 'App\\Ninja\\PaymentDrivers\\'; + $provider = str_replace('\\', '', $provider); $class = $folder . $provider . 'PaymentDriver'; $class = str_replace('_', '', $class); - + if (class_exists($class)) { return $class; } else { diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php index 793473fe9f36..8215f135d72d 100644 --- a/app/Models/Gateway.php +++ b/app/Models/Gateway.php @@ -47,6 +47,7 @@ class Gateway extends Eloquent GATEWAY_BRAINTREE, GATEWAY_AUTHORIZE_NET, GATEWAY_MOLLIE, + GATEWAY_GOCARDLESS, GATEWAY_CUSTOM, ]; diff --git a/app/Ninja/PaymentDrivers/GoCardlessV2RedirectPaymentDriver.php b/app/Ninja/PaymentDrivers/GoCardlessV2RedirectPaymentDriver.php new file mode 100644 index 000000000000..a7fc8819c9a6 --- /dev/null +++ b/app/Ninja/PaymentDrivers/GoCardlessV2RedirectPaymentDriver.php @@ -0,0 +1,17 @@ +redirect_flow_id) { + $data['transaction_reference'] = $ref; + } + + return $data; + } +} diff --git a/composer.json b/composer.json index fea2bd3b9446..6cb12efc67dd 100644 --- a/composer.json +++ b/composer.json @@ -37,6 +37,7 @@ "descubraomundo/omnipay-pagarme": "dev-master", "digitickets/omnipay-barclays-epdq": "~3.0", "digitickets/omnipay-datacash": "~3.0", + "digitickets/omnipay-gocardlessv2": "dev-master", "digitickets/omnipay-realex": "~5.0", "dioscouri/omnipay-cybersource": "dev-master", "doctrine/dbal": "2.5.x", @@ -161,6 +162,10 @@ { "type": "vcs", "url": "https://github.com/hillelcoren/l5-google-cloud-storage" + }, + { + "type": "vcs", + "url": "https://github.com/hillelcoren/omnipay-gocardlessv2" } ] } diff --git a/composer.lock b/composer.lock index a3d7da98e61b..13995b5e5b67 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "f57537fe1dab41aac024b12e4a284570", - "content-hash": "9d0ce024f2c50440bf896ecc2a37350f", + "hash": "ce4160f7ad045f2d76f99f30d8f719f5", + "content-hash": "c27b5f0b317314ab549d058742a6565b", "packages": [ { "name": "agmscode/omnipay-agms", @@ -69,12 +69,12 @@ "source": { "type": "git", "url": "https://github.com/xcaliber-tech/omnipay-skrill.git", - "reference": "41a7a03c5b90d496720e288bebc157d898837ccd" + "reference": "e8f3f76103e1f311b4d922c9b0b14689aa7938b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/xcaliber-tech/omnipay-skrill/zipball/41a7a03c5b90d496720e288bebc157d898837ccd", - "reference": "41a7a03c5b90d496720e288bebc157d898837ccd", + "url": "https://api.github.com/repos/xcaliber-tech/omnipay-skrill/zipball/e8f3f76103e1f311b4d922c9b0b14689aa7938b4", + "reference": "e8f3f76103e1f311b4d922c9b0b14689aa7938b4", "shasum": "" }, "require": { @@ -115,7 +115,7 @@ "payment", "skrill" ], - "time": "2016-01-13 16:33:07" + "time": "2017-07-24 10:13:29" }, { "name": "anahkiasen/former", @@ -330,16 +330,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.31.3", + "version": "3.33.3", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "0b3b64ce80d3381aa25c7bab69411a4a8297b6cb" + "reference": "2820644f411fa261f126727c1c00de15227b9520" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0b3b64ce80d3381aa25c7bab69411a4a8297b6cb", - "reference": "0b3b64ce80d3381aa25c7bab69411a4a8297b6cb", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2820644f411fa261f126727c1c00de15227b9520", + "reference": "2820644f411fa261f126727c1c00de15227b9520", "shasum": "" }, "require": { @@ -406,7 +406,7 @@ "s3", "sdk" ], - "time": "2017-07-12 18:22:23" + "time": "2017-08-18 18:04:40" }, { "name": "barracudanetworks/archivestream-php", @@ -508,16 +508,16 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v2.4.1", + "version": "v2.4.3", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "af98b3a4ccac9364f2145fae974ff3392ec402b1" + "reference": "d7c88f08131f6404cb714f3f6cf0642f6afa3903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/af98b3a4ccac9364f2145fae974ff3392ec402b1", - "reference": "af98b3a4ccac9364f2145fae974ff3392ec402b1", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/d7c88f08131f6404cb714f3f6cf0642f6afa3903", + "reference": "d7c88f08131f6404cb714f3f6cf0642f6afa3903", "shasum": "" }, "require": { @@ -527,19 +527,6 @@ "symfony/finder": "~2.7|~3.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - }, - "laravel": { - "providers": [ - "Barryvdh\\Debugbar\\ServiceProvider" - ], - "aliases": { - "Debugbar": "Barryvdh\\Debugbar\\Facade" - } - } - }, "autoload": { "psr-4": { "Barryvdh\\Debugbar\\": "src/" @@ -566,20 +553,20 @@ "profiler", "webprofiler" ], - "time": "2017-06-14 07:44:44" + "time": "2017-07-21 11:56:48" }, { "name": "barryvdh/laravel-ide-helper", - "version": "v2.4.0", + "version": "v2.4.1", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "87a02ff574f722c685e011f76692ab869ab64f6c" + "reference": "2b1273c45e2f8df7a625563e2283a17c14f02ae8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/87a02ff574f722c685e011f76692ab869ab64f6c", - "reference": "87a02ff574f722c685e011f76692ab869ab64f6c", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/2b1273c45e2f8df7a625563e2283a17c14f02ae8", + "reference": "2b1273c45e2f8df7a625563e2283a17c14f02ae8", "shasum": "" }, "require": { @@ -639,7 +626,7 @@ "phpstorm", "sublime" ], - "time": "2017-06-16 14:08:59" + "time": "2017-07-16 00:24:12" }, { "name": "barryvdh/reflection-docblock", @@ -692,16 +679,16 @@ }, { "name": "braintree/braintree_php", - "version": "3.23.1", + "version": "3.24.0", "source": { "type": "git", "url": "https://github.com/braintree/braintree_php.git", - "reference": "8a66302c0ae9d4be120f8c4e02603027f2067196" + "reference": "c0e856104f95a75c08db4af5b5ace8fe0e80e573" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/braintree/braintree_php/zipball/8a66302c0ae9d4be120f8c4e02603027f2067196", - "reference": "8a66302c0ae9d4be120f8c4e02603027f2067196", + "url": "https://api.github.com/repos/braintree/braintree_php/zipball/c0e856104f95a75c08db4af5b5ace8fe0e80e573", + "reference": "c0e856104f95a75c08db4af5b5ace8fe0e80e573", "shasum": "" }, "require": { @@ -735,7 +722,7 @@ } ], "description": "Braintree PHP Client Library", - "time": "2017-05-05 21:51:18" + "time": "2017-08-10 16:54:00" }, { "name": "cardgate/omnipay-cardgate", @@ -1440,6 +1427,92 @@ ], "time": "2016-11-17 13:32:25" }, + { + "name": "digitickets/omnipay-gocardlessv2", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/hillelcoren/omnipay-gocardlessv2.git", + "reference": "1aa9e5deb3371d4c186331c4a2e2089bf7583a9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hillelcoren/omnipay-gocardlessv2/zipball/1aa9e5deb3371d4c186331c4a2e2089bf7583a9e", + "reference": "1aa9e5deb3371d4c186331c4a2e2089bf7583a9e", + "shasum": "" + }, + "require": { + "gocardless/gocardless-pro": "^1", + "omnipay/common": "~2.0", + "php": "^5.5|^7" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.0", + "omnipay/tests": "~2.0", + "satooshi/php-coveralls": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Omnipay\\GoCardlessV2\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Omnipay\\GoCardlessV2Tests\\": "tests/" + } + }, + "scripts": { + "run-sa": [ + "vendor/bin/phpstan analyse --ansi --no-progress -c phpstan.neon -l 4 src tests" + ], + "run-fixer": [ + "vendor/bin/php-cs-fixer fix" + ], + "run-tests": [ + "vendor/bin/phpunit" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Digitickets Contributors", + "homepage": "https://github.com/digitickets/omnipay-gocardlessv2/contributors" + }, + { + "name": "Kayla Daniels", + "email": "kayladnls@gmail.com", + "role": "Original Developer of Base Package" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com", + "role": "Original Developer of Base Package" + }, + { + "name": "Omnipay Contributors", + "homepage": "https://github.com/thephpleague/omnipay-braintree/contributors", + "role": "Original Base Package" + } + ], + "description": "GoCardless gateway for Omnipay payment processing library, using the v2 GoCardless API", + "homepage": "https://github.com/digitickets/omnipay-gocardlessv2", + "keywords": [ + "gateway", + "gocardless", + "merchant", + "omnipay", + "pay", + "payment", + "purchase" + ], + "support": { + "source": "https://github.com/hillelcoren/omnipay-gocardlessv2/tree/master" + }, + "time": "2017-08-21 09:05:32" + }, { "name": "digitickets/omnipay-realex", "version": "5.0.0", @@ -1641,16 +1714,16 @@ }, { "name": "doctrine/cache", - "version": "v1.6.1", + "version": "v1.6.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3" + "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/b6f544a20f4807e81f7044d31e679ccbb1866dc3", - "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3", + "url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b", + "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b", "shasum": "" }, "require": { @@ -1707,7 +1780,7 @@ "cache", "caching" ], - "time": "2016-10-29 11:16:17" + "time": "2017-07-22 12:49:21" }, { "name": "doctrine/collections", @@ -1778,16 +1851,16 @@ }, { "name": "doctrine/common", - "version": "v2.7.2", + "version": "v2.7.3", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "930297026c8009a567ac051fd545bf6124150347" + "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/930297026c8009a567ac051fd545bf6124150347", - "reference": "930297026c8009a567ac051fd545bf6124150347", + "url": "https://api.github.com/repos/doctrine/common/zipball/4acb8f89626baafede6ee5475bc5844096eba8a9", + "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9", "shasum": "" }, "require": { @@ -1847,20 +1920,20 @@ "persistence", "spl" ], - "time": "2017-01-13 14:02:13" + "time": "2017-07-22 08:35:12" }, { "name": "doctrine/dbal", - "version": "v2.5.12", + "version": "v2.5.13", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44" + "reference": "729340d8d1eec8f01bff708e12e449a3415af873" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/7b9e911f9d8b30d43b96853dab26898c710d8f44", - "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/729340d8d1eec8f01bff708e12e449a3415af873", + "reference": "729340d8d1eec8f01bff708e12e449a3415af873", "shasum": "" }, "require": { @@ -1918,37 +1991,37 @@ "persistence", "queryobject" ], - "time": "2017-02-08 12:53:47" + "time": "2017-07-22 20:44:48" }, { "name": "doctrine/inflector", - "version": "v1.1.0", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "90b2128806bfde671b6952ab8bea493942c1fdae" + "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", - "reference": "90b2128806bfde671b6952ab8bea493942c1fdae", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462", + "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Inflector\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -1985,7 +2058,7 @@ "singularize", "string" ], - "time": "2015-11-06 14:35:42" + "time": "2017-07-22 12:18:28" }, { "name": "doctrine/lexer", @@ -2147,21 +2220,24 @@ }, { "name": "firebase/php-jwt", - "version": "v4.0.0", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "dccf163dc8ed7ed6a00afc06c51ee5186a428d35" + "reference": "9984a4d3a32ae7673d6971ea00bae9d0a1abba0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/dccf163dc8ed7ed6a00afc06c51ee5186a428d35", - "reference": "dccf163dc8ed7ed6a00afc06c51ee5186a428d35", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", + "reference": "9984a4d3a32ae7673d6971ea00bae9d0a1abba0e", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "require-dev": { + "phpunit/phpunit": " 4.8.35" + }, "type": "library", "autoload": { "psr-4": { @@ -2186,7 +2262,7 @@ ], "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", "homepage": "https://github.com/firebase/php-jwt", - "time": "2016-07-18 04:51:16" + "time": "2017-06-27 22:17:23" }, { "name": "fotografde/omnipay-checkoutcom", @@ -2299,29 +2375,31 @@ }, { "name": "fzaninotto/faker", - "version": "v1.6.0", + "version": "v1.7.1", "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123" + "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123", - "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d", + "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d", "shasum": "" }, "require": { - "php": "^5.3.3|^7.0" + "php": "^5.3.3 || ^7.0" }, "require-dev": { "ext-intl": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" + "phpunit/phpunit": "^4.0 || ^5.0", + "squizlabs/php_codesniffer": "^1.5" }, "type": "library", "extra": { - "branch-alias": [] + "branch-alias": { + "dev-master": "1.8-dev" + } }, "autoload": { "psr-4": { @@ -2343,7 +2421,7 @@ "faker", "fixtures" ], - "time": "2016-04-29 12:21:54" + "time": "2017-08-15 16:48:10" }, { "name": "gatepay/FedACHdir", @@ -2362,6 +2440,58 @@ "type": "library", "time": "2016-10-12 12:00:38" }, + { + "name": "gocardless/gocardless-pro", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/gocardless/gocardless-pro-php.git", + "reference": "48ae4c194e4735007de58b67176a9cb6548e83d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/gocardless/gocardless-pro-php/zipball/48ae4c194e4735007de58b67176a9cb6548e83d5", + "reference": "48ae4c194e4735007de58b67176a9cb6548e83d5", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "guzzlehttp/guzzle": "^6.0", + "php": ">=5.5" + }, + "require-dev": { + "phpdocumentor/phpdocumentor": "2.*", + "phpunit/phpunit": "4.6.*", + "satooshi/php-coveralls": "~0.6.1", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "GoCardlessPro\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "GoCardless and contributors", + "homepage": "https://github.com/gocardless/gocardless-pro-php/contributors" + } + ], + "description": "GoCardless Pro PHP Client Library", + "homepage": "https://gocardless.com/", + "keywords": [ + "api", + "direct debit", + "gocardless" + ], + "time": "2017-05-19 13:01:53" + }, { "name": "google/apiclient", "version": "v2.2.0", @@ -2423,16 +2553,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.14", + "version": "v0.20", "source": { "type": "git", "url": "https://github.com/google/google-api-php-client-services.git", - "reference": "b8c3ee8adab9eaffc3825cabc12740ad6e2ed76f" + "reference": "c1a6e6ac716c6563ca6c240120cde69fde49af4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/b8c3ee8adab9eaffc3825cabc12740ad6e2ed76f", - "reference": "b8c3ee8adab9eaffc3825cabc12740ad6e2ed76f", + "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/c1a6e6ac716c6563ca6c240120cde69fde49af4f", + "reference": "c1a6e6ac716c6563ca6c240120cde69fde49af4f", "shasum": "" }, "require": { @@ -2456,24 +2586,24 @@ "keywords": [ "google" ], - "time": "2017-07-10 00:18:15" + "time": "2017-08-20 00:20:36" }, { "name": "google/auth", - "version": "v1.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/google/google-auth-library-php.git", - "reference": "db77bd2de0bcc40bf50ebe851e9eed332aeaa4df" + "reference": "db8e3022a308cb0e988026d38e67b91a42b41622" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/db77bd2de0bcc40bf50ebe851e9eed332aeaa4df", - "reference": "db77bd2de0bcc40bf50ebe851e9eed332aeaa4df", + "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/db8e3022a308cb0e988026d38e67b91a42b41622", + "reference": "db8e3022a308cb0e988026d38e67b91a42b41622", "shasum": "" }, "require": { - "firebase/php-jwt": "~2.0|~3.0|~4.0", + "firebase/php-jwt": "~2.0|~3.0|~4.0|~5.0", "guzzlehttp/guzzle": "~5.3.1|~6.0", "guzzlehttp/psr7": "~1.2", "php": ">=5.4", @@ -2504,24 +2634,24 @@ "google", "oauth2" ], - "time": "2017-06-13 18:00:07" + "time": "2017-07-31 16:34:40" }, { "name": "google/cloud", - "version": "v0.34.1", + "version": "v0.36.0", "source": { "type": "git", "url": "https://github.com/GoogleCloudPlatform/google-cloud-php.git", - "reference": "a2a9ef78a359f2a40e09118c09113e4710f8bbd0" + "reference": "eebf5291ab903647c7e8422f1b2361355db66b59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GoogleCloudPlatform/google-cloud-php/zipball/a2a9ef78a359f2a40e09118c09113e4710f8bbd0", - "reference": "a2a9ef78a359f2a40e09118c09113e4710f8bbd0", + "url": "https://api.github.com/repos/GoogleCloudPlatform/google-cloud-php/zipball/eebf5291ab903647c7e8422f1b2361355db66b59", + "reference": "eebf5291ab903647c7e8422f1b2361355db66b59", "shasum": "" }, "require": { - "google/auth": "^1.0", + "google/auth": "~0.9|^1.0", "guzzlehttp/guzzle": "^5.3|^6.0", "guzzlehttp/psr7": "^1.2", "monolog/monolog": "~1", @@ -2531,18 +2661,18 @@ "rize/uri-template": "~0.3" }, "replace": { - "google/cloud-bigquery": "0.2.1", - "google/cloud-core": "1.6.0", + "google/cloud-bigquery": "0.2.2", + "google/cloud-core": "1.8.0", "google/cloud-datastore": "1.0.0", "google/cloud-error-reporting": "0.4.1", "google/cloud-language": "0.4.0", - "google/cloud-logging": "1.3.0", + "google/cloud-logging": "1.3.1", "google/cloud-monitoring": "0.4.1", - "google/cloud-pubsub": "0.6.0", - "google/cloud-spanner": "0.3.1", - "google/cloud-speech": "0.6.0", + "google/cloud-pubsub": "0.6.1", + "google/cloud-spanner": "0.4.0", + "google/cloud-speech": "0.6.1", "google/cloud-storage": "1.1.3", - "google/cloud-trace": "0.3.0", + "google/cloud-trace": "0.3.1", "google/cloud-translate": "1.0.0", "google/cloud-videointelligence": "0.3.1", "google/cloud-vision": "0.4.0" @@ -2562,9 +2692,8 @@ }, "suggest": { "google/gax": "Required to support gRPC", - "google/proto-client-php": "Required to support gRPC", - "phpseclib/phpseclib": "May be used in place of OpenSSL for creating signed Cloud Storage URLs. Please require version ^2.", - "symfony/lock": "Required for the Spanner cached based session pool. Please require the following commit: 3.3.x-dev#1ba6ac9" + "google/proto-client": "Required to support gRPC", + "phpseclib/phpseclib": "May be used in place of OpenSSL for creating signed Cloud Storage URLs. Please require version ^2." }, "bin": [ "src/Core/bin/google-cloud-batch" @@ -2624,7 +2753,7 @@ "translation", "vision" ], - "time": "2017-07-12 18:33:11" + "time": "2017-08-02 20:02:30" }, { "name": "guzzle/guzzle", @@ -3247,16 +3376,16 @@ }, { "name": "jaybizzle/crawler-detect", - "version": "v1.2.50", + "version": "v1.2.51", "source": { "type": "git", "url": "https://github.com/JayBizzle/Crawler-Detect.git", - "reference": "c9638a5d7d6fc4ecfb35f32a9cc6d05bc4f5a914" + "reference": "be9074b1206ba7b5ac5662f900295edc088a9da8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/c9638a5d7d6fc4ecfb35f32a9cc6d05bc4f5a914", - "reference": "c9638a5d7d6fc4ecfb35f32a9cc6d05bc4f5a914", + "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/be9074b1206ba7b5ac5662f900295edc088a9da8", + "reference": "be9074b1206ba7b5ac5662f900295edc088a9da8", "shasum": "" }, "require": { @@ -3292,7 +3421,7 @@ "crawlerdetect", "php crawler detect" ], - "time": "2017-07-03 20:56:40" + "time": "2017-08-07 18:48:00" }, { "name": "jaybizzle/laravel-crawler-detect", @@ -3903,16 +4032,16 @@ }, { "name": "league/flysystem", - "version": "1.0.40", + "version": "1.0.41", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61" + "reference": "f400aa98912c561ba625ea4065031b7a41e5a155" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3828f0b24e2c1918bb362d57a53205d6dc8fde61", - "reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f400aa98912c561ba625ea4065031b7a41e5a155", + "reference": "f400aa98912c561ba625ea4065031b7a41e5a155", "shasum": "" }, "require": { @@ -3933,13 +4062,13 @@ "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3", "league/flysystem-azure": "Allows you to use Windows Azure Blob storage", "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching", - "league/flysystem-copy": "Allows you to use Copy.com storage", "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem", "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", "league/flysystem-webdav": "Allows you to use WebDAV storage", "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", - "spatie/flysystem-dropbox": "Allows you to use Dropbox storage" + "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", + "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" }, "type": "library", "extra": { @@ -3982,7 +4111,7 @@ "sftp", "storage" ], - "time": "2017-04-28 10:15:08" + "time": "2017-08-06 17:41:04" }, { "name": "league/flysystem-aws-s3-v3", @@ -4310,16 +4439,16 @@ }, { "name": "maatwebsite/excel", - "version": "2.1.19", + "version": "2.1.20", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "f4535ac21968f6086438e098cdf289b350aa993c" + "reference": "a8baf7de1030d261318f90fa5c273a47ef616b59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/f4535ac21968f6086438e098cdf289b350aa993c", - "reference": "f4535ac21968f6086438e098cdf289b350aa993c", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/a8baf7de1030d261318f90fa5c273a47ef616b59", + "reference": "a8baf7de1030d261318f90fa5c273a47ef616b59", "shasum": "" }, "require": { @@ -4335,7 +4464,7 @@ }, "require-dev": { "mockery/mockery": "~0.9", - "orchestra/testbench": "3.1.*", + "orchestra/testbench": "3.1.*|3.2.*|3.3.*|3.4.*|3.5.*", "phpseclib/phpseclib": "~1.0", "phpunit/phpunit": "~4.0" }, @@ -4384,7 +4513,7 @@ "import", "laravel" ], - "time": "2017-07-02 07:00:56" + "time": "2017-07-26 18:04:04" }, { "name": "maximebf/debugbar", @@ -4725,21 +4854,21 @@ }, { "name": "mpdf/mpdf", - "version": "v6.1.3", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/mpdf/mpdf.git", - "reference": "7f138bf7508eac895ac2c13d2509b056ac7e7e97" + "reference": "e7310ce53b5c11db1f0b781fe0a69066608ac6e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mpdf/mpdf/zipball/7f138bf7508eac895ac2c13d2509b056ac7e7e97", - "reference": "7f138bf7508eac895ac2c13d2509b056ac7e7e97", + "url": "https://api.github.com/repos/mpdf/mpdf/zipball/e7310ce53b5c11db1f0b781fe0a69066608ac6e2", + "reference": "e7310ce53b5c11db1f0b781fe0a69066608ac6e2", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": ">=5.4.0", + "php": "^5.4.0 || 7.0.*", "setasign/fpdi": "1.6.*" }, "require-dev": { @@ -4772,7 +4901,7 @@ "php", "utf-8" ], - "time": "2016-12-12 10:42:18" + "time": "2017-07-09 16:46:12" }, { "name": "mtdowling/cron-expression", @@ -4979,16 +5108,16 @@ }, { "name": "nwidart/laravel-modules", - "version": "1.26.0", + "version": "1.27.1", "source": { "type": "git", "url": "https://github.com/nWidart/laravel-modules.git", - "reference": "d819c4ace5e5a6b0c168d88170d20e90b958667a" + "reference": "ca3a1b5bbd22d5e91c413fbf6a29e6ad18f58961" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nWidart/laravel-modules/zipball/d819c4ace5e5a6b0c168d88170d20e90b958667a", - "reference": "d819c4ace5e5a6b0c168d88170d20e90b958667a", + "url": "https://api.github.com/repos/nWidart/laravel-modules/zipball/ca3a1b5bbd22d5e91c413fbf6a29e6ad18f58961", + "reference": "ca3a1b5bbd22d5e91c413fbf6a29e6ad18f58961", "shasum": "" }, "require": { @@ -4996,10 +5125,10 @@ "php": ">=5.5" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^1.11", + "friendsofphp/php-cs-fixer": "^2.4", "mockery/mockery": "~0.9", "orchestra/testbench": "^3.1|^3.2|^3.3|^3.4", - "phpro/grumphp": "^0.9.1", + "phpro/grumphp": "^0.11", "phpunit/phpunit": "~5.7" }, "type": "library", @@ -5041,7 +5170,7 @@ "nwidart", "rad" ], - "time": "2017-07-06 19:33:38" + "time": "2017-07-31 09:06:50" }, { "name": "omnipay/2checkout", @@ -6258,16 +6387,16 @@ }, { "name": "omnipay/payfast", - "version": "v2.1.2", + "version": "v2.1.3", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-payfast.git", - "reference": "f352e89e5901756e861ddcadaed9b8693aaaa239" + "reference": "21741c7197509bfc295c0b9a944fcd7c1b3a0633" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-payfast/zipball/f352e89e5901756e861ddcadaed9b8693aaaa239", - "reference": "f352e89e5901756e861ddcadaed9b8693aaaa239", + "url": "https://api.github.com/repos/thephpleague/omnipay-payfast/zipball/21741c7197509bfc295c0b9a944fcd7c1b3a0633", + "reference": "21741c7197509bfc295c0b9a944fcd7c1b3a0633", "shasum": "" }, "require": { @@ -6311,7 +6440,7 @@ "payfast", "payment" ], - "time": "2014-09-29 01:07:03" + "time": "2017-08-15 07:52:52" }, { "name": "omnipay/payflow", @@ -6670,12 +6799,12 @@ "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-stripe.git", - "reference": "f5d5ef91f420d7f0bc83692cde7bb4474043c454" + "reference": "26a33414a75939af75064022112005d5e51fc9ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/f5d5ef91f420d7f0bc83692cde7bb4474043c454", - "reference": "f5d5ef91f420d7f0bc83692cde7bb4474043c454", + "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/26a33414a75939af75064022112005d5e51fc9ea", + "reference": "26a33414a75939af75064022112005d5e51fc9ea", "shasum": "" }, "require": { @@ -6719,7 +6848,7 @@ "payment", "stripe" ], - "time": "2017-07-01 03:24:42" + "time": "2017-07-14 09:22:01" }, { "name": "omnipay/targetpay", @@ -7464,16 +7593,16 @@ }, { "name": "ramsey/uuid", - "version": "3.6.1", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e" + "reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", - "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/0ef23d1b10cf1bc576e9d865a7e9c47982c5715e", + "reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e", "shasum": "" }, "require": { @@ -7542,7 +7671,7 @@ "identifier", "uuid" ], - "time": "2017-03-26 20:37:53" + "time": "2017-08-04 13:39:04" }, { "name": "rize/uri-template", @@ -7643,17 +7772,17 @@ "source": { "type": "git", "url": "https://github.com/simshaun/recurr.git", - "reference": "7a6480d1b64bb31de4d63d680cfecea27659a201" + "reference": "7d0e8942cb1d00d4bc11d5eb87fa990d77b0de61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simshaun/recurr/zipball/7a6480d1b64bb31de4d63d680cfecea27659a201", - "reference": "7a6480d1b64bb31de4d63d680cfecea27659a201", + "url": "https://api.github.com/repos/simshaun/recurr/zipball/7d0e8942cb1d00d4bc11d5eb87fa990d77b0de61", + "reference": "7d0e8942cb1d00d4bc11d5eb87fa990d77b0de61", "shasum": "" }, "require": { "doctrine/collections": "~1.3", - "php": ">=5.3.0" + "php": ">=5.5.0" }, "require-dev": { "phpunit/phpunit": "~4.5" @@ -7689,7 +7818,7 @@ "recurring", "rrule" ], - "time": "2017-05-05 22:06:58" + "time": "2017-08-03 23:25:58" }, { "name": "softcommerce/omnipay-paytrace", @@ -7799,7 +7928,7 @@ }, { "name": "symfony/class-loader", - "version": "v3.3.4", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", @@ -7855,7 +7984,7 @@ }, { "name": "symfony/config", - "version": "v3.2.11", + "version": "v3.2.13", "source": { "type": "git", "url": "https://github.com/symfony/config.git", @@ -7971,7 +8100,7 @@ }, { "name": "symfony/css-selector", - "version": "v3.3.4", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -8081,16 +8210,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v3.2.11", + "version": "v3.2.13", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "dcec2b3ae52a6fe92154321682b01028deea6406" + "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/dcec2b3ae52a6fe92154321682b01028deea6406", - "reference": "dcec2b3ae52a6fe92154321682b01028deea6406", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761", + "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761", "shasum": "" }, "require": { @@ -8140,7 +8269,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-06-03 15:50:21" + "time": "2017-07-28 15:22:55" }, { "name": "symfony/event-dispatcher", @@ -8204,16 +8333,16 @@ }, { "name": "symfony/filesystem", - "version": "v3.3.4", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "311fa718389efbd8b627c272b9324a62437018cc" + "reference": "427987eb4eed764c3b6e38d52a0f87989e010676" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/311fa718389efbd8b627c272b9324a62437018cc", - "reference": "311fa718389efbd8b627c272b9324a62437018cc", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/427987eb4eed764c3b6e38d52a0f87989e010676", + "reference": "427987eb4eed764c3b6e38d52a0f87989e010676", "shasum": "" }, "require": { @@ -8249,7 +8378,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-06-24 09:29:48" + "time": "2017-07-11 07:17:58" }, { "name": "symfony/finder", @@ -8439,7 +8568,7 @@ }, { "name": "symfony/options-resolver", - "version": "v3.3.4", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -8493,16 +8622,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937" + "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", + "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", "shasum": "" }, "require": { @@ -8514,7 +8643,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -8548,20 +8677,20 @@ "portable", "shim" ], - "time": "2017-06-09 14:24:12" + "time": "2017-06-14 15:44:48" }, { "name": "symfony/polyfill-php54", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "7dd1a8b9f0442273fdfeb1c4f5eaff6890a82789" + "reference": "b7763422a5334c914ef0298ed21b253d25913a6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/7dd1a8b9f0442273fdfeb1c4f5eaff6890a82789", - "reference": "7dd1a8b9f0442273fdfeb1c4f5eaff6890a82789", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/b7763422a5334c914ef0298ed21b253d25913a6e", + "reference": "b7763422a5334c914ef0298ed21b253d25913a6e", "shasum": "" }, "require": { @@ -8570,7 +8699,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -8606,20 +8735,20 @@ "portable", "shim" ], - "time": "2017-06-09 08:25:21" + "time": "2017-06-14 15:44:48" }, { "name": "symfony/polyfill-php55", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d" + "reference": "29b1381d66f16e0581aab0b9f678ccf073288f68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/94566239a7720cde0820f15f0cc348ddb51ba51d", - "reference": "94566239a7720cde0820f15f0cc348ddb51ba51d", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/29b1381d66f16e0581aab0b9f678ccf073288f68", + "reference": "29b1381d66f16e0581aab0b9f678ccf073288f68", "shasum": "" }, "require": { @@ -8629,7 +8758,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -8662,20 +8791,20 @@ "portable", "shim" ], - "time": "2017-06-09 08:25:21" + "time": "2017-06-14 15:44:48" }, { "name": "symfony/polyfill-php56", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929" + "reference": "e85ebdef569b84e8709864e1a290c40f156b30ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929", - "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e85ebdef569b84e8709864e1a290c40f156b30ca", + "reference": "e85ebdef569b84e8709864e1a290c40f156b30ca", "shasum": "" }, "require": { @@ -8685,7 +8814,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -8718,20 +8847,20 @@ "portable", "shim" ], - "time": "2017-06-09 08:25:21" + "time": "2017-06-14 15:44:48" }, { "name": "symfony/polyfill-util", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d" + "reference": "67925d1cf0b84bd234a83bebf26d4eb281744c6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", - "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/67925d1cf0b84bd234a83bebf26d4eb281744c6d", + "reference": "67925d1cf0b84bd234a83bebf26d4eb281744c6d", "shasum": "" }, "require": { @@ -8740,7 +8869,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -8770,7 +8899,7 @@ "polyfill", "shim" ], - "time": "2017-06-09 08:25:21" + "time": "2017-07-05 15:09:33" }, { "name": "symfony/process", @@ -9025,16 +9154,16 @@ }, { "name": "symfony/yaml", - "version": "v3.3.4", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "1f93a8d19b8241617f5074a123e282575b821df8" + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/1f93a8d19b8241617f5074a123e282575b821df8", - "reference": "1f93a8d19b8241617f5074a123e282575b821df8", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed", + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed", "shasum": "" }, "require": { @@ -9076,7 +9205,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-06-15 12:58:50" + "time": "2017-07-23 12:43:26" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -10002,16 +10131,16 @@ }, { "name": "zendframework/zend-validator", - "version": "2.9.1", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-validator.git", - "reference": "c9a8160a0191e34bb98ac1ecd4e453391c424bb3" + "reference": "07ef29e31353592e99eb32b2feb7248681ffb630" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/c9a8160a0191e34bb98ac1ecd4e453391c424bb3", - "reference": "c9a8160a0191e34bb98ac1ecd4e453391c424bb3", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/07ef29e31353592e99eb32b2feb7248681ffb630", + "reference": "07ef29e31353592e99eb32b2feb7248681ffb630", "shasum": "" }, "require": { @@ -10030,7 +10159,7 @@ "zendframework/zend-i18n": "^2.6", "zendframework/zend-math": "^2.6", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.6.2", + "zendframework/zend-session": "^2.8", "zendframework/zend-uri": "^2.5" }, "suggest": { @@ -10040,14 +10169,14 @@ "zendframework/zend-i18n-resources": "Translations of validator messages", "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator", "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", - "zendframework/zend-session": "Zend\\Session component, required by the Csrf validator", + "zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator", "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.9-dev", - "dev-develop": "2.10-dev" + "dev-master": "2.10-dev", + "dev-develop": "2.11-dev" }, "zf": { "component": "Zend\\Validator", @@ -10069,7 +10198,7 @@ "validator", "zf2" ], - "time": "2017-05-17 22:06:13" + "time": "2017-08-14 20:36:46" }, { "name": "zendframework/zendservice-apple-apns", @@ -10160,16 +10289,16 @@ }, { "name": "zircote/swagger-php", - "version": "2.0.10", + "version": "2.0.11", "source": { "type": "git", "url": "https://github.com/zircote/swagger-php.git", - "reference": "68e25262d95b9f70f145b488f49be0d6cc73302b" + "reference": "d010ab67536784f8b578cb4ba7d15c906f3e1a45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zircote/swagger-php/zipball/68e25262d95b9f70f145b488f49be0d6cc73302b", - "reference": "68e25262d95b9f70f145b488f49be0d6cc73302b", + "url": "https://api.github.com/repos/zircote/swagger-php/zipball/d010ab67536784f8b578cb4ba7d15c906f3e1a45", + "reference": "d010ab67536784f8b578cb4ba7d15c906f3e1a45", "shasum": "" }, "require": { @@ -10218,7 +10347,7 @@ "rest", "service discovery" ], - "time": "2017-05-12 22:02:20" + "time": "2017-08-16 08:32:59" } ], "packages-dev": [ @@ -10582,22 +10711,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", "shasum": "" }, "require": { "php": ">=5.5", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "phpdocumentor/type-resolver": "^0.3.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -10623,24 +10752,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30 07:12:33" + "time": "2017-08-08 06:39:58" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -10670,7 +10799,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25 06:54:22" + "time": "2017-06-03 08:32:36" }, { "name": "phpspec/php-diff", @@ -10708,16 +10837,16 @@ }, { "name": "phpspec/phpspec", - "version": "2.5.7", + "version": "2.5.8", "source": { "type": "git", "url": "https://github.com/phpspec/phpspec.git", - "reference": "a1dd5db803e75591c0e3cc1a054f7942133b4d05" + "reference": "d8a153dcb52f929b448c0bf2cc19c7388951adb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/phpspec/zipball/a1dd5db803e75591c0e3cc1a054f7942133b4d05", - "reference": "a1dd5db803e75591c0e3cc1a054f7942133b4d05", + "url": "https://api.github.com/repos/phpspec/phpspec/zipball/d8a153dcb52f929b448c0bf2cc19c7388951adb1", + "reference": "d8a153dcb52f929b448c0bf2cc19c7388951adb1", "shasum": "" }, "require": { @@ -10734,7 +10863,7 @@ "symfony/yaml": "~2.1|~3.0" }, "require-dev": { - "behat/behat": "^3.0.11", + "behat/behat": "^3.0.11,!=3.3.1", "ciaranmcnulty/versionbasedtestskipper": "^0.2.1", "phpunit/phpunit": "~4.4", "symfony/filesystem": "~2.1|~3.0" @@ -10782,7 +10911,7 @@ "testing", "tests" ], - "time": "2017-05-12 06:09:08" + "time": "2017-07-29 17:19:38" }, { "name": "phpspec/prophecy", @@ -11642,16 +11771,16 @@ }, { "name": "symfony/browser-kit", - "version": "v3.3.4", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "3a4435e79a8401746e8525e98039199d0924b4e5" + "reference": "8079a6b3668ef15cdbf73a4c7d31081abb8bb5f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3a4435e79a8401746e8525e98039199d0924b4e5", - "reference": "3a4435e79a8401746e8525e98039199d0924b4e5", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/8079a6b3668ef15cdbf73a4c7d31081abb8bb5f0", + "reference": "8079a6b3668ef15cdbf73a4c7d31081abb8bb5f0", "shasum": "" }, "require": { @@ -11695,11 +11824,11 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-06-24 09:29:48" + "time": "2017-07-12 13:03:20" }, { "name": "symfony/dom-crawler", - "version": "v3.3.4", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -11816,6 +11945,7 @@ "delatbabel/omnipay-fatzebra": 20, "dercoder/omnipay-paysafecard": 20, "descubraomundo/omnipay-pagarme": 20, + "digitickets/omnipay-gocardlessv2": 20, "dioscouri/omnipay-cybersource": 20, "gatepay/fedachdir": 20, "incube8/omnipay-multicards": 20, diff --git a/database/seeds/PaymentLibrariesSeeder.php b/database/seeds/PaymentLibrariesSeeder.php index d57be08e2fa4..9b4c551ad8fc 100644 --- a/database/seeds/PaymentLibrariesSeeder.php +++ b/database/seeds/PaymentLibrariesSeeder.php @@ -14,7 +14,7 @@ class PaymentLibrariesSeeder extends Seeder ['name' => 'CardSave', 'provider' => 'CardSave'], ['name' => 'Eway Rapid', 'provider' => 'Eway_RapidShared', 'is_offsite' => true], ['name' => 'FirstData Connect', 'provider' => 'FirstData_Connect'], - ['name' => 'GoCardless', 'provider' => 'GoCardless', 'is_offsite' => true], + ['name' => 'GoCardless', 'provider' => 'GoCardless', 'is_offsite' => true, 'payment_library_id' => 2], ['name' => 'Migs ThreeParty', 'provider' => 'Migs_ThreeParty'], ['name' => 'Migs TwoParty', 'provider' => 'Migs_TwoParty'], ['name' => 'Mollie', 'provider' => 'Mollie', 'is_offsite' => true, 'sort_order' => 7], @@ -70,12 +70,15 @@ class PaymentLibrariesSeeder extends Seeder ['name' => 'WeChat Express', 'provider' => 'WeChat_Express', 'payment_library_id' => 2], ['name' => 'WePay', 'provider' => 'WePay', 'is_offsite' => false], ['name' => 'Braintree', 'provider' => 'Braintree', 'sort_order' => 2], - ['name' => 'Custom', 'provider' => 'Custom', 'is_offsite' => true, 'sort_order' => 8], + ['name' => 'Custom', 'provider' => 'Custom', 'is_offsite' => true, 'sort_order' => 9], ['name' => 'FirstData Payeezy', 'provider' => 'FirstData_Payeezy'], + //['name' => 'GoCardless', 'provider' => 'GoCardlessV2\Redirect', 'sort_order' => 8, 'is_offsite' => true], ]; foreach ($gateways as $gateway) { - $record = Gateway::where('name', '=', $gateway['name'])->first(); + $record = Gateway::whereName($gateway['name']) + ->whereProvider($gateway['provider']) + ->first(); if ($record) { $record->fill($gateway); $record->save(); diff --git a/resources/views/accounts/partials/payment_credentials.blade.php b/resources/views/accounts/partials/payment_credentials.blade.php index b2e641f4e0a1..dc3d7aae054f 100644 --- a/resources/views/accounts/partials/payment_credentials.blade.php +++ b/resources/views/accounts/partials/payment_credentials.blade.php @@ -45,3 +45,7 @@ {!! Former::populateField(GATEWAY_BRAINTREE . '_merchantId', env('BRAINTREE_TEST_MERCHANT_ID')) !!} {!! Former::populateField(GATEWAY_BRAINTREE . '_testMode', 1) !!} {!! Former::populateField('enable_paypal', 1) !!} + + +{!! Former::populateField(GATEWAY_GOCARDLESS . '_accessToken', env('GOCARDLESS_TEST_TOKEN')) !!} +{!! Former::populateField(GATEWAY_GOCARDLESS . '_testMode', 1) !!}