From 4976d5b057af3a2cd8af4c05b3ee67ec70d43389 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 7 Jun 2016 21:13:29 +0300 Subject: [PATCH] Fix for tests --- app/Http/Requests/EntityRequest.php | 16 +- app/Models/EntityModel.php | 2 +- composer.lock | 491 ++++++++++++++++------------ 3 files changed, 287 insertions(+), 222 deletions(-) diff --git a/app/Http/Requests/EntityRequest.php b/app/Http/Requests/EntityRequest.php index 8679d3ca4195..894824a68493 100644 --- a/app/Http/Requests/EntityRequest.php +++ b/app/Http/Requests/EntityRequest.php @@ -9,7 +9,7 @@ class EntityRequest extends Request { protected $entityType; private $entity; - public function entity() + public function entity() { if ($this->entity) { return $this->entity; @@ -20,24 +20,24 @@ class EntityRequest extends Request { foreach (['_id', 's'] as $suffix) { $field = $this->entityType . $suffix; if ($this->$field) { - $publicId= $this->$field; - } + $publicId= $this->$field; + } } if ( ! $publicId) { $publicId = Input::get('public_id') ?: Input::get('id'); } if ( ! $publicId) { return null; - } - + } + $class = Utils::getEntityClass($this->entityType); - - if (method_exists($class, 'withTrashed')) { + + if (method_exists($class, 'trashed')) { $this->entity = $class::scope($publicId)->withTrashed()->firstOrFail(); } else { $this->entity = $class::scope($publicId)->firstOrFail(); } - + return $this->entity; } diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php index 4a6bffbc9e6b..470284320af4 100644 --- a/app/Models/EntityModel.php +++ b/app/Models/EntityModel.php @@ -33,7 +33,7 @@ class EntityModel extends Eloquent $entity->setRelation('user', $user); $entity->setRelation('account', $account); - if (method_exists($className, 'withTrashed')){ + if (method_exists($className, 'trashed')){ $lastEntity = $className::withTrashed() ->scope(false, $entity->account_id); } else { diff --git a/composer.lock b/composer.lock index a2888a4263ac..36dce687cb1e 100644 --- a/composer.lock +++ b/composer.lock @@ -323,16 +323,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.18.9", + "version": "3.18.15", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "965caffc3f6712cdc5ba88dadaad055b125dd95b" + "reference": "a50c0971d42867ac8184c52c5f35b27255a695b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/965caffc3f6712cdc5ba88dadaad055b125dd95b", - "reference": "965caffc3f6712cdc5ba88dadaad055b125dd95b", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a50c0971d42867ac8184c52c5f35b27255a695b2", + "reference": "a50c0971d42867ac8184c52c5f35b27255a695b2", "shasum": "" }, "require": { @@ -399,20 +399,20 @@ "s3", "sdk" ], - "time": "2016-05-17 22:39:16" + "time": "2016-06-02 20:13:40" }, { "name": "barracudanetworks/archivestream-php", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/barracudanetworks/ArchiveStream-php.git", - "reference": "9a81c7de7f0cd5ea2150fc3dc00f1c43178362b6" + "reference": "c4e10449abde2c3283d2bda378cfb458dec08ca1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barracudanetworks/ArchiveStream-php/zipball/9a81c7de7f0cd5ea2150fc3dc00f1c43178362b6", - "reference": "9a81c7de7f0cd5ea2150fc3dc00f1c43178362b6", + "url": "https://api.github.com/repos/barracudanetworks/ArchiveStream-php/zipball/c4e10449abde2c3283d2bda378cfb458dec08ca1", + "reference": "c4e10449abde2c3283d2bda378cfb458dec08ca1", "shasum": "" }, "require": { @@ -439,7 +439,7 @@ "tar", "zip" ], - "time": "2016-01-07 06:02:26" + "time": "2016-05-18 21:28:06" }, { "name": "barryvdh/laravel-debugbar", @@ -501,12 +501,12 @@ "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "35ebf3a2ba9443e11fbdb9066cc363ec7b2245e4" + "reference": "d734ecabcc398b53650dd86d318a5f7f0fc13379" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/35ebf3a2ba9443e11fbdb9066cc363ec7b2245e4", - "reference": "35ebf3a2ba9443e11fbdb9066cc363ec7b2245e4", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/d734ecabcc398b53650dd86d318a5f7f0fc13379", + "reference": "d734ecabcc398b53650dd86d318a5f7f0fc13379", "shasum": "" }, "require": { @@ -556,20 +556,20 @@ "phpstorm", "sublime" ], - "time": "2016-05-12 05:32:54" + "time": "2016-05-25 09:51:22" }, { "name": "braintree/braintree_php", - "version": "3.12.0", + "version": "3.13.0", "source": { "type": "git", "url": "https://github.com/braintree/braintree_php.git", - "reference": "5e16bbf8924a6da51356393fbf9381a333a401eb" + "reference": "cbee7c8c998aff5d5df682cc0b2cf3f403dbba76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/braintree/braintree_php/zipball/5e16bbf8924a6da51356393fbf9381a333a401eb", - "reference": "5e16bbf8924a6da51356393fbf9381a333a401eb", + "url": "https://api.github.com/repos/braintree/braintree_php/zipball/cbee7c8c998aff5d5df682cc0b2cf3f403dbba76", + "reference": "cbee7c8c998aff5d5df682cc0b2cf3f403dbba76", "shasum": "" }, "require": { @@ -603,7 +603,7 @@ } ], "description": "Braintree PHP Client Library", - "time": "2016-05-13 18:44:46" + "time": "2016-05-23 18:22:21" }, { "name": "cardgate/omnipay-cardgate", @@ -704,7 +704,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chumper/Datatable/zipball/546e8768d7987b0d9a8501e67432309349ef5504", + "url": "https://api.github.com/repos/Chumper/Datatable/zipball/04ef2bf", "reference": "04ef2bf", "shasum": "" }, @@ -977,12 +977,12 @@ "source": { "type": "git", "url": "https://github.com/sometechie/omnipay-wepay.git", - "reference": "fb0e6c9824d15ba74cd6f75421b318e87a9e1822" + "reference": "a341b9997d71803d0f774d86908cb49a8bc4c405" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sometechie/omnipay-wepay/zipball/fb0e6c9824d15ba74cd6f75421b318e87a9e1822", - "reference": "fb0e6c9824d15ba74cd6f75421b318e87a9e1822", + "url": "https://api.github.com/repos/sometechie/omnipay-wepay/zipball/a341b9997d71803d0f774d86908cb49a8bc4c405", + "reference": "a341b9997d71803d0f774d86908cb49a8bc4c405", "shasum": "" }, "require": { @@ -1014,7 +1014,7 @@ "support": { "source": "https://github.com/sometechie/omnipay-wepay/tree/additional-calls" }, - "time": "2016-05-23 15:01:20" + "time": "2016-05-25 19:18:42" }, { "name": "container-interop/container-interop", @@ -2070,7 +2070,7 @@ "reference": "origin/master" }, "type": "library", - "time": "2016-05-18 12:00:45" + "time": "2016-06-03 12:00:26" }, { "name": "google/apiclient", @@ -2968,16 +2968,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.32", + "version": "v5.2.36", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f688217113f70b01d0e127da9035195415812bef" + "reference": "236d7c0c5b67a2348ac7831391031d93000de3ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f688217113f70b01d0e127da9035195415812bef", - "reference": "f688217113f70b01d0e127da9035195415812bef", + "url": "https://api.github.com/repos/laravel/framework/zipball/236d7c0c5b67a2348ac7831391031d93000de3ab", + "reference": "236d7c0c5b67a2348ac7831391031d93000de3ab", "shasum": "" }, "require": { @@ -3093,20 +3093,20 @@ "framework", "laravel" ], - "time": "2016-05-17 13:24:40" + "time": "2016-06-06 15:18:48" }, { "name": "laravel/socialite", - "version": "v2.0.15", + "version": "v2.0.17", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "edd00ab96933e3ef053533cce81e958fb26921af" + "reference": "81d39cde2226f7548d8d1aa99405278c87e50737" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/edd00ab96933e3ef053533cce81e958fb26921af", - "reference": "edd00ab96933e3ef053533cce81e958fb26921af", + "url": "https://api.github.com/repos/laravel/socialite/zipball/81d39cde2226f7548d8d1aa99405278c87e50737", + "reference": "81d39cde2226f7548d8d1aa99405278c87e50737", "shasum": "" }, "require": { @@ -3147,7 +3147,7 @@ "laravel", "oauth" ], - "time": "2016-03-21 14:30:30" + "time": "2016-05-27 12:42:05" }, { "name": "laravelcollective/bus", @@ -3250,16 +3250,16 @@ }, { "name": "league/flysystem", - "version": "1.0.22", + "version": "1.0.24", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "bd73a91703969a2d20ab4bfbf971d6c2cbe36612" + "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/bd73a91703969a2d20ab4bfbf971d6c2cbe36612", - "reference": "bd73a91703969a2d20ab4bfbf971d6c2cbe36612", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9aca859a303fdca30370f42b8c611d9cf0dedf4b", + "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b", "shasum": "" }, "require": { @@ -3329,20 +3329,20 @@ "sftp", "storage" ], - "time": "2016-04-28 06:53:12" + "time": "2016-06-03 19:11:39" }, { "name": "league/flysystem-aws-s3-v3", - "version": "1.0.11", + "version": "1.0.12", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "1f7ae4e3cc178686c49a9d23cab43ed1e955368c" + "reference": "d9c27edda5b4b2840c3f602d4ce6fbfeaab10e5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/1f7ae4e3cc178686c49a9d23cab43ed1e955368c", - "reference": "1f7ae4e3cc178686c49a9d23cab43ed1e955368c", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/d9c27edda5b4b2840c3f602d4ce6fbfeaab10e5a", + "reference": "d9c27edda5b4b2840c3f602d4ce6fbfeaab10e5a", "shasum": "" }, "require": { @@ -3376,7 +3376,7 @@ } ], "description": "Flysystem adapter for the AWS S3 SDK v3.x", - "time": "2016-05-03 19:35:35" + "time": "2016-06-06 11:18:47" }, { "name": "league/flysystem-rackspace", @@ -3603,6 +3603,7 @@ "php", "url" ], + "abandoned": "league/uri", "time": "2015-07-15 08:24:12" }, { @@ -4266,7 +4267,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-2checkout/zipball/b27d2823d052f5c227eeb29324bb564cfdb8f9af", + "url": "https://api.github.com/repos/thephpleague/omnipay-2checkout/zipball/e9c079c2dde0d7ba461903b3b7bd5caf6dee1248", "reference": "e9c079c2dde0d7ba461903b3b7bd5caf6dee1248", "shasum": "" }, @@ -5138,7 +5139,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-mollie/zipball/efd491fdac7d1243e2dd1da5a964514e3aab2a5a", + "url": "https://api.github.com/repos/thephpleague/omnipay-mollie/zipball/22956c1a62a9662afa5f5d119723b413770ac525", "reference": "22956c1a62a9662afa5f5d119723b413770ac525", "shasum": "" }, @@ -5883,12 +5884,12 @@ "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-stripe.git", - "reference": "88badbda83f1c16e2d94c41a869be37d9d9fef5a" + "reference": "cb2d26a95db2105b7a054bd7e84d26c4051cd68f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/88badbda83f1c16e2d94c41a869be37d9d9fef5a", - "reference": "88badbda83f1c16e2d94c41a869be37d9d9fef5a", + "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/cb2d26a95db2105b7a054bd7e84d26c4051cd68f", + "reference": "cb2d26a95db2105b7a054bd7e84d26c4051cd68f", "shasum": "" }, "require": { @@ -5932,7 +5933,7 @@ "payment", "stripe" ], - "time": "2016-05-16 07:49:56" + "time": "2016-06-01 03:31:03" }, { "name": "omnipay/targetpay", @@ -6479,16 +6480,16 @@ }, { "name": "samvaughton/omnipay-barclays-epdq", - "version": "2.2.0", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/samvaughton/omnipay-barclays-epdq.git", - "reference": "b7f9263afa73b8e6c3c5e8bb2bf04a82548a41da" + "reference": "1ee30d300294a6e0ba7795e677d2fb258ed68a66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/samvaughton/omnipay-barclays-epdq/zipball/b7f9263afa73b8e6c3c5e8bb2bf04a82548a41da", - "reference": "b7f9263afa73b8e6c3c5e8bb2bf04a82548a41da", + "url": "https://api.github.com/repos/samvaughton/omnipay-barclays-epdq/zipball/1ee30d300294a6e0ba7795e677d2fb258ed68a66", + "reference": "1ee30d300294a6e0ba7795e677d2fb258ed68a66", "shasum": "" }, "require": { @@ -6517,13 +6518,13 @@ "name": "Adrian Macneil", "email": "adrian@adrianmacneil.com" }, - { - "name": "Omnipay Contributors", - "homepage": "https://github.com/barclays-epdq/contributors" - }, { "name": "Sam Vaughton", "email": "samvaughton@gmail.com" + }, + { + "name": "Omnipay Contributors", + "homepage": "https://github.com/samvaughton/omnipay-barclays-epdq/graphs/contributors" } ], "description": "Barclays ePDQ driver for the Omnipay payment processing library.", @@ -6537,7 +6538,7 @@ "pay", "payment" ], - "time": "2016-03-03 14:40:27" + "time": "2016-06-06 16:45:13" }, { "name": "simshaun/recurr", @@ -6595,37 +6596,35 @@ }, { "name": "sly/notification-pusher", - "version": "v2.2.12", + "version": "v2.2.2", "source": { "type": "git", "url": "https://github.com/Ph3nol/NotificationPusher.git", - "reference": "f9a99edb4e26254baf1f7fb1354aa5a3f2c3b0ae" + "reference": "6112841c4b679bc4f6cf01f6cf655e24794bc670" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ph3nol/NotificationPusher/zipball/f9a99edb4e26254baf1f7fb1354aa5a3f2c3b0ae", - "reference": "f9a99edb4e26254baf1f7fb1354aa5a3f2c3b0ae", + "url": "https://api.github.com/repos/Ph3nol/NotificationPusher/zipball/6112841c4b679bc4f6cf01f6cf655e24794bc670", + "reference": "6112841c4b679bc4f6cf01f6cf655e24794bc670", "shasum": "" }, "require": { - "doctrine/inflector": "~1.0", - "php": ">=5.5", - "symfony/console": "~2.3", - "symfony/options-resolver": "~2.3", - "symfony/process": "~2.3", - "zendframework/zendservice-apple-apns": "^1.1.0", + "php": ">=5.3.2", + "symfony/console": ">=2.3", + "symfony/options-resolver": ">=2.3", + "symfony/process": ">=2.3", + "zendframework/zendservice-apple-apns": "1.*", "zendframework/zendservice-google-gcm": "1.*" }, "require-dev": { "atoum/atoum": "dev-master" }, - "bin": [ - "np" - ], "type": "standalone", "autoload": { "psr-0": { - "Sly": "src/" + "Sly": [ + "src/" + ] } }, "notification-url": "https://packagist.org/downloads/", @@ -6655,7 +6654,7 @@ "push", "pusher" ], - "time": "2015-10-01 07:56:41" + "time": "2013-12-08 20:35:03" }, { "name": "softcommerce/omnipay-paytrace", @@ -6711,20 +6710,20 @@ }, { "name": "superbalist/flysystem-google-storage", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/Superbalist/flysystem-google-storage.git", - "reference": "441a8529680986a2d2063a268ee2918f51db1b79" + "reference": "8ae35803a102ed6ce58aa87bf7534d4396513765" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Superbalist/flysystem-google-storage/zipball/441a8529680986a2d2063a268ee2918f51db1b79", - "reference": "441a8529680986a2d2063a268ee2918f51db1b79", + "url": "https://api.github.com/repos/Superbalist/flysystem-google-storage/zipball/8ae35803a102ed6ce58aa87bf7534d4396513765", + "reference": "8ae35803a102ed6ce58aa87bf7534d4396513765", "shasum": "" }, "require": { - "google/apiclient": "~1.1|^2.0.0@RC", + "google/apiclient": "~1.1", "league/flysystem": "~1.0", "php": ">=5.4.0" }, @@ -6754,7 +6753,7 @@ } ], "description": "Flysystem adapter for Google Cloud Storage", - "time": "2016-04-12 14:56:22" + "time": "2016-05-19 14:33:03" }, { "name": "swiftmailer/swiftmailer", @@ -6811,16 +6810,16 @@ }, { "name": "symfony/class-loader", - "version": "v3.0.6", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "cbb7e6a9c0213a0cffa5d9065ee8214ca4e83877" + "reference": "6ebc60f69a6df4b3cf5ad6f260ba4edf5957ea05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/cbb7e6a9c0213a0cffa5d9065ee8214ca4e83877", - "reference": "cbb7e6a9c0213a0cffa5d9065ee8214ca4e83877", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/6ebc60f69a6df4b3cf5ad6f260ba4edf5957ea05", + "reference": "6ebc60f69a6df4b3cf5ad6f260ba4edf5957ea05", "shasum": "" }, "require": { @@ -6836,7 +6835,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -6863,30 +6862,30 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2016-03-30 10:41:14" + "time": "2016-03-30 10:41:47" }, { "name": "symfony/console", - "version": "v2.8.6", + "version": "v3.0.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "48221d3de4dc22d2cd57c97e8b9361821da86609" + "reference": "382fc9ed852edabd6133e34f8549d7a7d99db115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/48221d3de4dc22d2cd57c97e8b9361821da86609", - "reference": "48221d3de4dc22d2cd57c97e8b9361821da86609", + "url": "https://api.github.com/repos/symfony/console/zipball/382fc9ed852edabd6133e34f8549d7a7d99db115", + "reference": "382fc9ed852edabd6133e34f8549d7a7d99db115", "shasum": "" }, "require": { - "php": ">=5.3.9", + "php": ">=5.5.9", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1|~3.0.0", - "symfony/process": "~2.1|~3.0.0" + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" }, "suggest": { "psr/log": "For using the console logger", @@ -6896,7 +6895,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6923,20 +6922,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-04-26 12:00:47" + "time": "2016-06-06 15:08:35" }, { "name": "symfony/css-selector", - "version": "v3.0.6", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0" + "reference": "e17f386efef7258ac671c24e727673abd086b0cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/65e764f404685f2dc20c057e889b3ad04b2e2db0", - "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/e17f386efef7258ac671c24e727673abd086b0cf", + "reference": "e17f386efef7258ac671c24e727673abd086b0cf", "shasum": "" }, "require": { @@ -6945,7 +6944,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -6976,20 +6975,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2016-03-04 07:55:57" + "time": "2016-03-04 07:56:56" }, { "name": "symfony/debug", - "version": "v3.0.6", + "version": "v3.0.7", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "a06d10888a45afd97534506afb058ec38d9ba35b" + "reference": "e67e1552dd7313df1cf6535cb606751899e0e727" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/a06d10888a45afd97534506afb058ec38d9ba35b", - "reference": "a06d10888a45afd97534506afb058ec38d9ba35b", + "url": "https://api.github.com/repos/symfony/debug/zipball/e67e1552dd7313df1cf6535cb606751899e0e727", + "reference": "e67e1552dd7313df1cf6535cb606751899e0e727", "shasum": "" }, "require": { @@ -7033,20 +7032,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-03-30 10:41:14" + "time": "2016-06-06 15:08:35" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.6", + "version": "v2.8.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a158f13992a3147d466af7a23b564ac719a4ddd8" + "reference": "2a6b8713f8bdb582058cfda463527f195b066110" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a158f13992a3147d466af7a23b564ac719a4ddd8", - "reference": "a158f13992a3147d466af7a23b564ac719a4ddd8", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2a6b8713f8bdb582058cfda463527f195b066110", + "reference": "2a6b8713f8bdb582058cfda463527f195b066110", "shasum": "" }, "require": { @@ -7093,20 +7092,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-05-03 18:59:18" + "time": "2016-06-06 11:11:27" }, { "name": "symfony/finder", - "version": "v3.0.6", + "version": "v3.0.7", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52" + "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/c54e407b35bc098916704e9fd090da21da4c4f52", - "reference": "c54e407b35bc098916704e9fd090da21da4c4f52", + "url": "https://api.github.com/repos/symfony/finder/zipball/39e5f3d533d07b5416b9d7aad53a27f939d4f811", + "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811", "shasum": "" }, "require": { @@ -7142,20 +7141,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-03-10 11:13:05" + "time": "2016-05-13 18:03:36" }, { "name": "symfony/http-foundation", - "version": "v2.8.6", + "version": "v2.8.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "ed9357bf86f041bd69a197742ee22c97989467d7" + "reference": "744dae663ffcfa21d8a111fb63541954199acbb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ed9357bf86f041bd69a197742ee22c97989467d7", - "reference": "ed9357bf86f041bd69a197742ee22c97989467d7", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/744dae663ffcfa21d8a111fb63541954199acbb2", + "reference": "744dae663ffcfa21d8a111fb63541954199acbb2", "shasum": "" }, "require": { @@ -7197,20 +7196,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-04-05 16:36:54" + "time": "2016-06-06 11:11:27" }, { "name": "symfony/http-kernel", - "version": "v3.0.6", + "version": "v3.0.7", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6a5010978edf0a9646342232531e53bfc7abbcd3" + "reference": "97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6a5010978edf0a9646342232531e53bfc7abbcd3", - "reference": "6a5010978edf0a9646342232531e53bfc7abbcd3", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4", + "reference": "97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4", "shasum": "" }, "require": { @@ -7279,29 +7278,29 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2016-05-09 22:13:13" + "time": "2016-06-06 16:52:35" }, { "name": "symfony/options-resolver", - "version": "v2.8.6", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "5e4a8ee6e823428257f2002f6daf52de854d8384" + "reference": "30605874d99af0cde6c41fd39e18546330c38100" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/5e4a8ee6e823428257f2002f6daf52de854d8384", - "reference": "5e4a8ee6e823428257f2002f6daf52de854d8384", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/30605874d99af0cde6c41fd39e18546330c38100", + "reference": "30605874d99af0cde6c41fd39e18546330c38100", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -7333,7 +7332,7 @@ "configuration", "options" ], - "time": "2016-05-09 18:12:35" + "time": "2016-05-12 15:59:27" }, { "name": "symfony/polyfill-mbstring", @@ -7618,25 +7617,25 @@ }, { "name": "symfony/process", - "version": "v2.8.6", + "version": "v3.0.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "1276bd9be89be039748cf753a2137f4ef149cd74" + "reference": "bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/1276bd9be89be039748cf753a2137f4ef149cd74", - "reference": "1276bd9be89be039748cf753a2137f4ef149cd74", + "url": "https://api.github.com/repos/symfony/process/zipball/bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd", + "reference": "bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -7663,20 +7662,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-04-14 15:22:22" + "time": "2016-06-06 11:33:26" }, { "name": "symfony/routing", - "version": "v3.0.6", + "version": "v3.0.7", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "a6cd168310066176599442aa21f5da86c3f8e0b3" + "reference": "c780454838a1131adc756d737a4b4cc1d18f8c64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/a6cd168310066176599442aa21f5da86c3f8e0b3", - "reference": "a6cd168310066176599442aa21f5da86c3f8e0b3", + "url": "https://api.github.com/repos/symfony/routing/zipball/c780454838a1131adc756d737a4b4cc1d18f8c64", + "reference": "c780454838a1131adc756d737a4b4cc1d18f8c64", "shasum": "" }, "require": { @@ -7738,20 +7737,20 @@ "uri", "url" ], - "time": "2016-05-03 12:23:49" + "time": "2016-05-30 06:58:27" }, { "name": "symfony/translation", - "version": "v3.0.6", + "version": "v3.0.7", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2" + "reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/f7a07af51ea067745a521dab1e3152044a2fb1f2", - "reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2", + "url": "https://api.github.com/repos/symfony/translation/zipball/2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7", + "reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7", "shasum": "" }, "require": { @@ -7802,20 +7801,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2016-03-25 01:41:20" + "time": "2016-06-06 11:33:26" }, { "name": "symfony/var-dumper", - "version": "v3.0.6", + "version": "v3.0.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0e918c269093ba4c77fca14e9424fa74ed16f1a6" + "reference": "d8bb851da153d97abe7c2b71a65dee19f324bcf7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e918c269093ba4c77fca14e9424fa74ed16f1a6", - "reference": "0e918c269093ba4c77fca14e9424fa74ed16f1a6", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d8bb851da153d97abe7c2b71a65dee19f324bcf7", + "reference": "d8bb851da153d97abe7c2b71a65dee19f324bcf7", "shasum": "" }, "require": { @@ -7865,7 +7864,7 @@ "debug", "dump" ], - "time": "2016-04-25 11:17:47" + "time": "2016-05-24 10:03:10" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -7916,16 +7915,16 @@ }, { "name": "true/punycode", - "version": "v2.0.2", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/true/php-punycode.git", - "reference": "74fa01d4de396c40e239794123b3874cb594a30c" + "reference": "6853ce218b6115ec749607e14ac51338920c9d81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/true/php-punycode/zipball/74fa01d4de396c40e239794123b3874cb594a30c", - "reference": "74fa01d4de396c40e239794123b3874cb594a30c", + "url": "https://api.github.com/repos/true/php-punycode/zipball/6853ce218b6115ec749607e14ac51338920c9d81", + "reference": "6853ce218b6115ec749607e14ac51338920c9d81", "shasum": "" }, "require": { @@ -7958,7 +7957,7 @@ "idna", "punycode" ], - "time": "2016-01-07 17:12:58" + "time": "2016-05-23 08:20:50" }, { "name": "turbo124/laravel-push-notification", @@ -8812,16 +8811,16 @@ }, { "name": "zircote/swagger-php", - "version": "2.0.6", + "version": "2.0.7", "source": { "type": "git", "url": "https://github.com/zircote/swagger-php.git", - "reference": "0dfc289d53bad4a2bd193adc8d4bd058029ab417" + "reference": "299df0b51f641225ed50ba5199b21e8cfc34e4f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zircote/swagger-php/zipball/0dfc289d53bad4a2bd193adc8d4bd058029ab417", - "reference": "0dfc289d53bad4a2bd193adc8d4bd058029ab417", + "url": "https://api.github.com/repos/zircote/swagger-php/zipball/299df0b51f641225ed50ba5199b21e8cfc34e4f4", + "reference": "299df0b51f641225ed50ba5199b21e8cfc34e4f4", "shasum": "" }, "require": { @@ -8831,7 +8830,7 @@ }, "require-dev": { "squizlabs/php_codesniffer": "2.*", - "zendframework/zend-form": "*" + "zendframework/zend-form": "<2.8" }, "bin": [ "bin/swagger" @@ -8869,10 +8868,68 @@ "rest", "service discovery" ], - "time": "2016-02-13 15:39:11" + "time": "2016-05-27 09:35:51" } ], "packages-dev": [ + { + "name": "behat/gherkin", + "version": "v4.4.1", + "source": { + "type": "git", + "url": "https://github.com/Behat/Gherkin.git", + "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/1576b485c0f92ef6d27da9c4bbfc57ee30cf6911", + "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "symfony/yaml": "~2.1" + }, + "suggest": { + "symfony/yaml": "If you want to parse features, represented in YAML files" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Gherkin": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Gherkin DSL parser for PHP 5.3", + "homepage": "http://behat.org/", + "keywords": [ + "BDD", + "Behat", + "Cucumber", + "DSL", + "gherkin", + "parser" + ], + "time": "2015-12-30 14:47:00" + }, { "name": "codeception/c3", "version": "2.0.6", @@ -8925,19 +8982,20 @@ }, { "name": "codeception/codeception", - "version": "2.1.8", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "f3daa61f0f11c531b33eb3623ab0daa599d88a79" + "reference": "f137636f0c185e7d4a495b9cea70c1afae27dfc7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/f3daa61f0f11c531b33eb3623ab0daa599d88a79", - "reference": "f3daa61f0f11c531b33eb3623ab0daa599d88a79", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/f137636f0c185e7d4a495b9cea70c1afae27dfc7", + "reference": "f137636f0c185e7d4a495b9cea70c1afae27dfc7", "shasum": "" }, "require": { + "behat/gherkin": "~4.4.0", "ext-json": "*", "ext-mbstring": "*", "facebook/webdriver": ">=1.0.1 <2.0", @@ -8945,29 +9003,36 @@ "guzzlehttp/psr7": "~1.0", "php": ">=5.4.0 <8.0", "phpunit/php-code-coverage": ">=2.1.3", - "phpunit/phpunit": ">4.8.20 <6.0", - "symfony/browser-kit": ">=2.5 <3.1", - "symfony/console": ">=2.5 <3.1", - "symfony/css-selector": ">=2.5 <3.1", - "symfony/dom-crawler": ">=2.5 <3.1", - "symfony/event-dispatcher": ">=2.5 <3.1", - "symfony/finder": ">=2.5 <3.1", - "symfony/yaml": ">=2.5 <3.1" + "phpunit/phpunit": ">4.8.20 <5.5", + "symfony/browser-kit": ">=2.7 <4.0", + "symfony/console": ">=2.7 <4.0", + "symfony/css-selector": ">=2.7 <4.0", + "symfony/dom-crawler": ">=2.7 <4.0", + "symfony/event-dispatcher": ">=2.7 <4.0", + "symfony/finder": ">=2.7 <4.0", + "symfony/yaml": ">=2.7 <4.0" }, "require-dev": { "codeception/specify": "~0.3", "facebook/php-sdk-v4": "~5.0", "flow/jsonpath": "~0.2", + "league/factory-muffin": "^3.0", + "league/factory-muffin-faker": "^1.0", + "mongodb/mongodb": "^1.0", "monolog/monolog": "~1.8", - "pda/pheanstalk": "~2.0", - "php-amqplib/php-amqplib": "~2.4" + "pda/pheanstalk": "~3.0", + "php-amqplib/php-amqplib": "~2.4", + "predis/predis": "^1.0", + "squizlabs/php_codesniffer": "~2.0" }, "suggest": { - "codeception/phpbuiltinserver": "Extension to start and stop PHP built-in web server for your tests", "codeception/specify": "BDD-style code blocks", "codeception/verify": "BDD-style assertions", - "monolog/monolog": "Log test steps", - "phpseclib/phpseclib": "Extension required to use the SFTP option in the FTP Module." + "flow/jsonpath": "For using JSONPath in REST module", + "league/factory-muffin": "For DataFactory module", + "league/factory-muffin-faker": "For Faker support in DataFactory module", + "phpseclib/phpseclib": "for SFTP option in FTP Module", + "symfony/phpunit-bridge": "For phpunit-bridge support" }, "bin": [ "codecept" @@ -9002,7 +9067,7 @@ "functional testing", "unit testing" ], - "time": "2016-04-15 02:56:43" + "time": "2016-06-03 12:44:06" }, { "name": "doctrine/instantiator", @@ -9215,32 +9280,32 @@ }, { "name": "phpspec/prophecy", - "version": "v1.6.0", + "version": "v1.6.1", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972" + "reference": "58a8137754bc24b25740d4281399a4a3596058e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972", - "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0", + "reference": "58a8137754bc24b25740d4281399a4a3596058e0", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "~2.0", - "sebastian/comparator": "~1.1", - "sebastian/recursion-context": "~1.0" + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "sebastian/comparator": "^1.1", + "sebastian/recursion-context": "^1.0" }, "require-dev": { - "phpspec/phpspec": "~2.0" + "phpspec/phpspec": "^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -9273,7 +9338,7 @@ "spy", "stub" ], - "time": "2016-02-15 07:46:21" + "time": "2016-06-07 08:13:47" }, { "name": "phpunit/php-code-coverage", @@ -10019,16 +10084,16 @@ }, { "name": "symfony/browser-kit", - "version": "v3.0.6", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "e07127ac31230b30887c2dddf3708d883d239b14" + "reference": "b645a9b23d6c0eeba5ac823fa87bf010db9aff22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e07127ac31230b30887c2dddf3708d883d239b14", - "reference": "e07127ac31230b30887c2dddf3708d883d239b14", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b645a9b23d6c0eeba5ac823fa87bf010db9aff22", + "reference": "b645a9b23d6c0eeba5ac823fa87bf010db9aff22", "shasum": "" }, "require": { @@ -10045,7 +10110,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -10072,20 +10137,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2016-03-04 07:55:57" + "time": "2016-03-04 07:56:56" }, { "name": "symfony/dom-crawler", - "version": "v3.0.6", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "49b588841225b205700e5122fa01911cabada857" + "reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/49b588841225b205700e5122fa01911cabada857", - "reference": "49b588841225b205700e5122fa01911cabada857", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/12aa63fd41b060d2bee9a34623d29eda70bc8fe3", + "reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3", "shasum": "" }, "require": { @@ -10101,7 +10166,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -10128,20 +10193,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2016-04-12 18:09:53" + "time": "2016-05-13 15:49:09" }, { "name": "symfony/yaml", - "version": "v3.0.6", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "0047c8366744a16de7516622c5b7355336afae96" + "reference": "eca51b7b65eb9be6af88ad7cc91685f1556f5c9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/0047c8366744a16de7516622c5b7355336afae96", - "reference": "0047c8366744a16de7516622c5b7355336afae96", + "url": "https://api.github.com/repos/symfony/yaml/zipball/eca51b7b65eb9be6af88ad7cc91685f1556f5c9a", + "reference": "eca51b7b65eb9be6af88ad7cc91685f1556f5c9a", "shasum": "" }, "require": { @@ -10150,7 +10215,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -10177,7 +10242,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-03-04 07:55:57" + "time": "2016-05-26 21:46:24" } ], "aliases": [],