From 07d288b60c65538139e878afcbcb8cd2805f9e64 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 27 Oct 2015 09:58:18 +1100 Subject: [PATCH] pre merge --- composer.lock | 95 ++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/composer.lock b/composer.lock index 7c1534c5c2ea..5be1f98db9a0 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,11 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "48ed13e4113a177339d3a20f31dbc6bb", + "content-hash": "3d1306c92248f0fe4015c722de827c81", "packages": [ { "name": "alfaproject/omnipay-neteller", @@ -339,7 +340,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chumper/Datatable/zipball/7fa47cb5469f07c620fb69dee94b8e1a96943ee2", + "url": "https://api.github.com/repos/Chumper/Datatable/zipball/b44834db3d4e560d4368c1a04248b9e6a422ccff", "reference": "7fa47cb", "shasum": "" }, @@ -351,7 +352,7 @@ }, "require-dev": { "mockery/mockery": "dev-master", - "orchestra/testbench": "2.1.*", + "orchestra/testbench": "3.1.*", "phpunit/phpunit": "3.7.*" }, "type": "library", @@ -380,7 +381,7 @@ "jquery", "laravel" ], - "time": "2015-04-20 09:21:21" + "time": "2015-10-26 01:21:31" }, { "name": "classpreloader/classpreloader", @@ -501,16 +502,16 @@ }, { "name": "coatesap/omnipay-paymentsense", - "version": "v2.0.0", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/coatesap/omnipay-paymentsense.git", - "reference": "4a5a87ef140abf8e09ff27cd0e6502ac1e79e434" + "reference": "664e00a726b99b65b08381f8409263795f2986a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/coatesap/omnipay-paymentsense/zipball/4a5a87ef140abf8e09ff27cd0e6502ac1e79e434", - "reference": "4a5a87ef140abf8e09ff27cd0e6502ac1e79e434", + "url": "https://api.github.com/repos/coatesap/omnipay-paymentsense/zipball/664e00a726b99b65b08381f8409263795f2986a2", + "reference": "664e00a726b99b65b08381f8409263795f2986a2", "shasum": "" }, "require": { @@ -530,8 +531,8 @@ } }, "autoload": { - "psr-0": { - "Omnipay\\PaymentSense\\": "src/" + "psr-4": { + "Coatesap\\PaymentSense\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -545,8 +546,9 @@ } ], "description": "PaymentSense driver for the Omnipay payment processing library", - "homepage": "https://github.com/coatesap/paymentsense", + "homepage": "https://github.com/coatesap/omnipay-paymentsense", "keywords": [ + "driver", "gateway", "merchant", "omnipay", @@ -555,7 +557,7 @@ "payment sense", "paymentsense" ], - "time": "2014-03-18 17:17:57" + "time": "2015-10-13 07:08:13" }, { "name": "coatesap/omnipay-realex", @@ -2057,16 +2059,16 @@ }, { "name": "laravel/socialite", - "version": "v2.0.13", + "version": "v2.0.14", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "5995d2c9c60b47362412a84286e2a0707e0db386" + "reference": "b15f4be0ac739405120d74b837af423aa71502d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/5995d2c9c60b47362412a84286e2a0707e0db386", - "reference": "5995d2c9c60b47362412a84286e2a0707e0db386", + "url": "https://api.github.com/repos/laravel/socialite/zipball/b15f4be0ac739405120d74b837af423aa71502d9", + "reference": "b15f4be0ac739405120d74b837af423aa71502d9", "shasum": "" }, "require": { @@ -2107,7 +2109,7 @@ "laravel", "oauth" ], - "time": "2015-09-24 20:59:56" + "time": "2015-10-16 15:39:46" }, { "name": "laravelcollective/html", @@ -2245,16 +2247,16 @@ }, { "name": "league/oauth1-client", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth1-client.git", - "reference": "4d4edd9b6014f882e319231a9b3351e3a1dfdc81" + "reference": "cef3ceda13c78f89c323e4d5e6301c0eb7cea422" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/4d4edd9b6014f882e319231a9b3351e3a1dfdc81", - "reference": "4d4edd9b6014f882e319231a9b3351e3a1dfdc81", + "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/cef3ceda13c78f89c323e4d5e6301c0eb7cea422", + "reference": "cef3ceda13c78f89c323e4d5e6301c0eb7cea422", "shasum": "" }, "require": { @@ -2304,7 +2306,7 @@ "tumblr", "twitter" ], - "time": "2015-08-22 09:49:14" + "time": "2015-10-23 04:02:07" }, { "name": "lokielse/omnipay-alipay", @@ -2357,16 +2359,16 @@ }, { "name": "maximebf/debugbar", - "version": "v1.10.4", + "version": "v1.10.5", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "7b2006e6e095126b5a061ec33fca3d90ea8a8219" + "reference": "30e53e8a28284b69dd223c9f5ee8957befd72636" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/7b2006e6e095126b5a061ec33fca3d90ea8a8219", - "reference": "7b2006e6e095126b5a061ec33fca3d90ea8a8219", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e53e8a28284b69dd223c9f5ee8957befd72636", + "reference": "30e53e8a28284b69dd223c9f5ee8957befd72636", "shasum": "" }, "require": { @@ -2409,7 +2411,7 @@ "keywords": [ "debug" ], - "time": "2015-02-05 07:51:20" + "time": "2015-10-19 20:35:12" }, { "name": "mfauveau/omnipay-pacnet", @@ -2468,16 +2470,16 @@ }, { "name": "monolog/monolog", - "version": "1.17.1", + "version": "1.17.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24", + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24", "shasum": "" }, "require": { @@ -2491,10 +2493,11 @@ "aws/aws-sdk-php": "^2.4.9", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", + "jakub-onderka/php-parallel-lint": "0.9", "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "~0.11", + "raven/raven": "^0.13", "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" @@ -2540,7 +2543,7 @@ "logging", "psr-3" ], - "time": "2015-08-31 09:17:37" + "time": "2015-10-14 12:51:02" }, { "name": "mtdowling/cron-expression", @@ -4826,12 +4829,12 @@ "target-dir": "Symfony/Component/Console", "source": { "type": "git", - "url": "https://github.com/symfony/Console.git", + "url": "https://github.com/symfony/console.git", "reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/0e5e18ae09d3f5c06367759be940e9ed3f568359", + "url": "https://api.github.com/repos/symfony/console/zipball/0e5e18ae09d3f5c06367759be940e9ed3f568359", "reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359", "shasum": "" }, @@ -4884,12 +4887,12 @@ "target-dir": "Symfony/Component/Debug", "source": { "type": "git", - "url": "https://github.com/symfony/Debug.git", + "url": "https://github.com/symfony/debug.git", "reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/fca5696e0c9787722baa8f2ad6940dfd7a6a6941", + "url": "https://api.github.com/repos/symfony/debug/zipball/fca5696e0c9787722baa8f2ad6940dfd7a6a6941", "reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941", "shasum": "" }, @@ -5102,12 +5105,12 @@ "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", - "url": "https://github.com/symfony/HttpFoundation.git", + "url": "https://github.com/symfony/http-foundation.git", "reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c", "reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c", "shasum": "" }, @@ -5156,12 +5159,12 @@ "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", - "url": "https://github.com/symfony/HttpKernel.git", + "url": "https://github.com/symfony/http-kernel.git", "reference": "a3f0ed713255c0400a2db38b3ed01989ef4b7322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/a3f0ed713255c0400a2db38b3ed01989ef4b7322", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a3f0ed713255c0400a2db38b3ed01989ef4b7322", "reference": "a3f0ed713255c0400a2db38b3ed01989ef4b7322", "shasum": "" }, @@ -6439,16 +6442,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.12", + "version": "4.8.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "00194eb95989190a73198390ceca081ad3441a7f" + "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/00194eb95989190a73198390ceca081ad3441a7f", - "reference": "00194eb95989190a73198390ceca081ad3441a7f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/625f8c345606ed0f3a141dfb88f4116f0e22978e", + "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e", "shasum": "" }, "require": { @@ -6507,7 +6510,7 @@ "testing", "xunit" ], - "time": "2015-10-12 03:36:47" + "time": "2015-10-23 06:48:33" }, { "name": "phpunit/phpunit-mock-objects",