From 0bd6d55879a437dd003e86dc227dacf7dfaf06b4 Mon Sep 17 00:00:00 2001 From: insanesvk Date: Fri, 14 Aug 2015 17:59:17 +0200 Subject: [PATCH] Added support for Guzzle v6, psr-2 format, added gitignore --- .gitignore | 1 + composer.lock | 563 ++++++++++++++++-------- src/Context/App.php | 4 +- src/Context/DatabaseTransactions.php | 5 +- src/Context/KernelAwareContext.php | 5 +- src/Context/KernelAwareInitializer.php | 6 +- src/Context/Migrator.php | 2 - src/Context/Services/MailTrap.php | 30 +- src/Driver/KernelDriver.php | 3 +- src/ServiceContainer/BehatExtension.php | 7 +- src/ServiceContainer/LaravelBooter.php | 10 +- src/ServiceContainer/LaravelFactory.php | 7 +- 12 files changed, 400 insertions(+), 243 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5657f6e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vendor \ No newline at end of file diff --git a/composer.lock b/composer.lock index fc78222..9d123b3 100644 --- a/composer.lock +++ b/composer.lock @@ -1,23 +1,23 @@ { "_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": "d5a029ad2f9f5013889c6cb2c3105583", + "hash": "22656a672067126aaa3c179f12b20581", "packages": [ { "name": "behat/behat", - "version": "v3.0.14", + "version": "v3.0.15", "source": { "type": "git", "url": "https://github.com/Behat/Behat.git", - "reference": "3f097cd577feed73e681fa56cd4e4e1dda9c115d" + "reference": "b35ae3d45332d80c532af69cc36f780a9397a996" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Behat/zipball/3f097cd577feed73e681fa56cd4e4e1dda9c115d", - "reference": "3f097cd577feed73e681fa56cd4e4e1dda9c115d", + "url": "https://api.github.com/repos/Behat/Behat/zipball/b35ae3d45332d80c532af69cc36f780a9397a996", + "reference": "b35ae3d45332d80c532af69cc36f780a9397a996", "shasum": "" }, "require": { @@ -30,12 +30,12 @@ "symfony/console": "~2.1", "symfony/dependency-injection": "~2.1", "symfony/event-dispatcher": "~2.1", - "symfony/translation": "~2.1", + "symfony/translation": "~2.3", "symfony/yaml": "~2.1" }, "require-dev": { "phpspec/prophecy-phpunit": "~1.0", - "phpunit/phpunit": "~4.0.7", + "phpunit/phpunit": "~4.0", "symfony/process": "~2.1" }, "suggest": { @@ -85,7 +85,7 @@ "symfony", "testing" ], - "time": "2014-09-23 10:47:14" + "time": "2015-02-22 14:10:33" }, { "name": "behat/gherkin", @@ -147,16 +147,16 @@ }, { "name": "behat/mink", - "version": "v1.6.0", + "version": "v1.6.1", "source": { "type": "git", "url": "https://github.com/minkphp/Mink.git", - "reference": "090900a0049c441f1e072bbd837db4079b2250c5" + "reference": "8b68523a339ec991bcd638b39dc8f04f808da88a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/090900a0049c441f1e072bbd837db4079b2250c5", - "reference": "090900a0049c441f1e072bbd837db4079b2250c5", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/8b68523a339ec991bcd638b39dc8f04f808da88a", + "reference": "8b68523a339ec991bcd638b39dc8f04f808da88a", "shasum": "" }, "require": { @@ -176,8 +176,8 @@ } }, "autoload": { - "psr-0": { - "Behat\\Mink": "src/" + "psr-4": { + "Behat\\Mink\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -191,14 +191,14 @@ "homepage": "http://everzet.com" } ], - "description": "Web acceptance testing framework for PHP 5.3", + "description": "Browser controller/emulator abstraction for PHP", "homepage": "http://mink.behat.org/", "keywords": [ "browser", "testing", "web" ], - "time": "2014-09-26 09:25:05" + "time": "2015-02-04 17:02:06" }, { "name": "behat/mink-browserkit-driver", @@ -255,65 +255,6 @@ ], "time": "2014-09-26 11:35:19" }, - { - "name": "behat/mink-extension", - "version": "v2.0.1", - "source": { - "type": "git", - "url": "https://github.com/Behat/MinkExtension.git", - "reference": "06a4cb56614b047d8d15ea5cd392d19fd3d856e8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/06a4cb56614b047d8d15ea5cd392d19fd3d856e8", - "reference": "06a4cb56614b047d8d15ea5cd392d19fd3d856e8", - "shasum": "" - }, - "require": { - "behat/behat": "~3.0,>=3.0.5", - "behat/mink": "~1.5", - "php": ">=5.3.2", - "symfony/config": "~2.2" - }, - "require-dev": { - "behat/mink-goutte-driver": "~1.0", - "phpspec/phpspec": "~2.0" - }, - "type": "behat-extension", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Behat\\MinkExtension": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Christophe Coevoet", - "email": "stof@notk.org" - }, - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com" - } - ], - "description": "Mink extension for Behat", - "homepage": "http://extensions.behat.org/mink", - "keywords": [ - "browser", - "gui", - "test", - "web" - ], - "time": "2014-09-23 10:59:27" - }, { "name": "behat/transliterator", "version": "v1.0.1", @@ -356,16 +297,16 @@ }, { "name": "doctrine/annotations", - "version": "v1.2.3", + "version": "v1.2.6", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4" + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/eeda578cbe24a170331a1cfdf78be723412df7a4", - "reference": "eeda578cbe24a170331a1cfdf78be723412df7a4", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4", + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4", "shasum": "" }, "require": { @@ -420,20 +361,20 @@ "docblock", "parser" ], - "time": "2014-12-20 20:49:38" + "time": "2015-06-17 12:21:22" }, { "name": "doctrine/cache", - "version": "v1.3.1", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "cf483685798a72c93bf4206e3dd6358ea07d64e7" + "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/cf483685798a72c93bf4206e3dd6358ea07d64e7", - "reference": "cf483685798a72c93bf4206e3dd6358ea07d64e7", + "url": "https://api.github.com/repos/doctrine/cache/zipball/c9eadeb743ac6199f7eec423cb9426bc518b7b03", + "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03", "shasum": "" }, "require": { @@ -444,12 +385,13 @@ }, "require-dev": { "phpunit/phpunit": ">=3.7", + "predis/predis": "~1.0", "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -489,25 +431,28 @@ "cache", "caching" ], - "time": "2014-09-17 14:24:04" + "time": "2015-04-15 00:11:59" }, { "name": "doctrine/collections", - "version": "v1.2", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2" + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/b99c5c46c87126201899afe88ec490a25eedd6a2", - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2", + "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a", + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, "type": "library", "extra": { "branch-alias": { @@ -524,17 +469,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -543,11 +477,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Collections Abstraction library", @@ -557,20 +497,20 @@ "collections", "iterator" ], - "time": "2014-02-03 23:07:43" + "time": "2015-04-14 22:21:58" }, { "name": "doctrine/common", - "version": "v2.4.2", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b" + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/5db6ab40e4c531f14dad4ca96a394dfce5d4255b", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b", + "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3", + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3", "shasum": "" }, "require": { @@ -587,7 +527,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { @@ -600,17 +540,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -619,11 +548,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Common Library for Doctrine projects", @@ -635,7 +570,7 @@ "persistence", "spl" ], - "time": "2014-05-21 19:28:51" + "time": "2015-04-02 19:55:44" }, { "name": "doctrine/inflector", @@ -798,25 +733,26 @@ }, { "name": "symfony/symfony", - "version": "v2.6.3", + "version": "v2.7.3", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "c34ef418015793a4653f2670afb69dd167ebf578" + "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/c34ef418015793a4653f2670afb69dd167ebf578", - "reference": "c34ef418015793a4653f2670afb69dd167ebf578", + "url": "https://api.github.com/repos/symfony/symfony/zipball/a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486", + "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486", "shasum": "" }, "require": { "doctrine/common": "~2.3", - "php": ">=5.3.3", + "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.12,>=1.12.3" + "twig/twig": "~1.18" }, "replace": { + "symfony/asset": "self.version", "symfony/browser-kit": "self.version", "symfony/class-loader": "self.version", "symfony/config": "self.version", @@ -840,7 +776,6 @@ "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", - "symfony/propel1-bridge": "self.version", "symfony/property-access": "self.version", "symfony/proxy-manager-bridge": "self.version", "symfony/routing": "self.version", @@ -871,17 +806,23 @@ "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0", - "propel/propel1": "~1.6" + "symfony/phpunit-bridge": "self.version" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { - "Symfony\\": "src/" + "psr-4": { + "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", + "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/", + "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/", + "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", + "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", + "Symfony\\Bundle\\": "src/Symfony/Bundle/", + "Symfony\\Component\\": "src/Symfony/Component/" }, "classmap": [ "src/Symfony/Component/HttpFoundation/Resources/stubs", @@ -896,43 +837,43 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "The Symfony PHP framework", - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "keywords": [ "framework" ], - "time": "2015-01-07 14:47:29" + "time": "2015-07-31 13:24:45" }, { "name": "twig/twig", - "version": "v1.16.3", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "6dc11a1e8ecfc30e2c68aaeb218148409d8e68af" + "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/6dc11a1e8ecfc30e2c68aaeb218148409d8e68af", - "reference": "6dc11a1e8ecfc30e2c68aaeb218148409d8e68af", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844", + "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": ">=5.2.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.16-dev" + "dev-master": "1.20-dev" } }, "autoload": { @@ -967,22 +908,81 @@ "keywords": [ "templating" ], - "time": "2014-12-25 19:58:19" + "time": "2015-08-12 15:56:39" } ], "packages-dev": [ + { + "name": "behat/mink-extension", + "version": "v2.0.1", + "source": { + "type": "git", + "url": "https://github.com/Behat/MinkExtension.git", + "reference": "06a4cb56614b047d8d15ea5cd392d19fd3d856e8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/06a4cb56614b047d8d15ea5cd392d19fd3d856e8", + "reference": "06a4cb56614b047d8d15ea5cd392d19fd3d856e8", + "shasum": "" + }, + "require": { + "behat/behat": "~3.0,>=3.0.5", + "behat/mink": "~1.5", + "php": ">=5.3.2", + "symfony/config": "~2.2" + }, + "require-dev": { + "behat/mink-goutte-driver": "~1.0", + "phpspec/phpspec": "~2.0" + }, + "type": "behat-extension", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\MinkExtension": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christophe Coevoet", + "email": "stof@notk.org" + }, + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com" + } + ], + "description": "Mink extension for Behat", + "homepage": "http://extensions.behat.org/mink", + "keywords": [ + "browser", + "gui", + "test", + "web" + ], + "time": "2014-09-23 10:59:27" + }, { "name": "doctrine/instantiator", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119" + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { @@ -993,7 +993,7 @@ "ext-pdo": "*", "ext-phar": "*", "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "2.0.*@ALPHA" + "squizlabs/php_codesniffer": "~2.0" }, "type": "library", "extra": { @@ -1002,8 +1002,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Instantiator\\": "src" + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1023,31 +1023,31 @@ "constructor", "instantiate" ], - "time": "2014-10-13 12:58:55" + "time": "2015-06-14 21:17:01" }, { "name": "phpdocumentor/reflection-docblock", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "38743b677965c48a637097b2746a281264ae2347" + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/38743b677965c48a637097b2746a281264ae2347", - "reference": "38743b677965c48a637097b2746a281264ae2347", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "3.7.*@stable" + "phpunit/phpunit": "~4.0" }, "suggest": { - "dflydev/markdown": "1.0.*", - "erusev/parsedown": "~0.7" + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" }, "type": "library", "extra": { @@ -1072,7 +1072,7 @@ "email": "mike.vanriel@naenius.com" } ], - "time": "2014-08-09 10:27:07" + "time": "2015-02-03 12:10:50" }, { "name": "phpspec/php-diff", @@ -1110,23 +1110,23 @@ }, { "name": "phpspec/phpspec", - "version": "2.1.1", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/phpspec/phpspec.git", - "reference": "66a1df93099282b1514e9e001fcf6e9393f7783d" + "reference": "e9a40577323e67f1de2e214abf32976a0352d8f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/phpspec/zipball/66a1df93099282b1514e9e001fcf6e9393f7783d", - "reference": "66a1df93099282b1514e9e001fcf6e9393f7783d", + "url": "https://api.github.com/repos/phpspec/phpspec/zipball/e9a40577323e67f1de2e214abf32976a0352d8f8", + "reference": "e9a40577323e67f1de2e214abf32976a0352d8f8", "shasum": "" }, "require": { - "doctrine/instantiator": "~1.0,>=1.0.1", + "doctrine/instantiator": "^1.0.1", "php": ">=5.3.3", "phpspec/php-diff": "~1.0.0", - "phpspec/prophecy": "~1.1", + "phpspec/prophecy": "~1.4", "sebastian/exporter": "~1.0", "symfony/console": "~2.3", "symfony/event-dispatcher": "~2.1", @@ -1135,9 +1135,11 @@ "symfony/yaml": "~2.1" }, "require-dev": { - "behat/behat": "~3.0,>=3.0.11", + "behat/behat": "^3.0.11", "bossa/phpspec2-expect": "~1.0", - "symfony/filesystem": "~2.1" + "phpunit/phpunit": "~4.4", + "symfony/filesystem": "~2.1", + "symfony/process": "~2.1" }, "suggest": { "phpspec/nyan-formatters": "~1.0 – Adds Nyan formatters" @@ -1148,7 +1150,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { @@ -1182,25 +1184,26 @@ "testing", "tests" ], - "time": "2015-01-09 13:21:45" + "time": "2015-05-30 15:21:40" }, { "name": "phpspec/prophecy", - "version": "v1.3.1", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9" + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/9ca52329bcdd1500de24427542577ebf3fc2f1c9", - "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7", "shasum": "" }, "require": { - "doctrine/instantiator": "~1.0,>=1.0.2", - "phpdocumentor/reflection-docblock": "~2.0" + "doctrine/instantiator": "^1.0.2", + "phpdocumentor/reflection-docblock": "~2.0", + "sebastian/comparator": "~1.1" }, "require-dev": { "phpspec/phpspec": "~2.0" @@ -1208,7 +1211,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -1232,7 +1235,7 @@ } ], "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "http://phpspec.org", + "homepage": "https://github.com/phpspec/prophecy", "keywords": [ "Double", "Dummy", @@ -1241,32 +1244,149 @@ "spy", "stub" ], - "time": "2014-11-17 16:23:49" + "time": "2015-08-13 10:07:40" + }, + { + "name": "sebastian/comparator", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2015-07-26 15:48:44" + }, + { + "name": "sebastian/diff", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3", + "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "http://www.github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2015-02-22 15:13:53" }, { "name": "sebastian/exporter", - "version": "1.0.2", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0" + "reference": "7ae5513327cb536431847bcc0c10edba2701064e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", - "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", + "reference": "7ae5513327cb536431847bcc0c10edba2701064e", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1306,7 +1426,60 @@ "export", "exporter" ], - "time": "2014-09-10 00:51:36" + "time": "2015-06-21 07:55:53" + }, + { + "name": "sebastian/recursion-context", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "994d4a811bafe801fb06dccbee797863ba2792ba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba", + "reference": "994d4a811bafe801fb06dccbee797863ba2792ba", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2015-06-21 08:04:50" } ], "aliases": [], @@ -1314,6 +1487,8 @@ "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": ">=5.4" + }, "platform-dev": [] } diff --git a/src/Context/App.php b/src/Context/App.php index 9004e1d..07f6075 100644 --- a/src/Context/App.php +++ b/src/Context/App.php @@ -6,7 +6,6 @@ trait App { - /** * The Laravel application. * @@ -33,5 +32,4 @@ public function app() { return $this->app; } - -} \ No newline at end of file +} diff --git a/src/Context/DatabaseTransactions.php b/src/Context/DatabaseTransactions.php index a47a890..133290a 100644 --- a/src/Context/DatabaseTransactions.php +++ b/src/Context/DatabaseTransactions.php @@ -6,7 +6,6 @@ trait DatabaseTransactions { - /** * Begin a database transaction. * @@ -18,7 +17,6 @@ public static function beginTransaction() } /** - * * Roll it back after the scenario. * * @AfterScenario @@ -27,5 +25,4 @@ public static function rollback() { DB::rollback(); } - -} \ No newline at end of file +} diff --git a/src/Context/KernelAwareContext.php b/src/Context/KernelAwareContext.php index 29ff1f3..0afe2f0 100644 --- a/src/Context/KernelAwareContext.php +++ b/src/Context/KernelAwareContext.php @@ -7,13 +7,12 @@ interface KernelAwareContext extends Context { - /** * Set the kernel instance on the context. * * @param HttpKernelInterface $kernel + * * @return mixed */ public function setApp(HttpKernelInterface $kernel); - -} \ No newline at end of file +} diff --git a/src/Context/KernelAwareInitializer.php b/src/Context/KernelAwareInitializer.php index e842c44..f1ba0d1 100644 --- a/src/Context/KernelAwareInitializer.php +++ b/src/Context/KernelAwareInitializer.php @@ -11,7 +11,6 @@ class KernelAwareInitializer implements EventSubscriberInterface, ContextInitializer { - /** * The app kernel. * @@ -42,7 +41,7 @@ public function __construct(HttpKernelInterface $kernel) public static function getSubscribedEvents() { return [ - ScenarioTested::AFTER => ['rebootKernel', -15] + ScenarioTested::AFTER => ['rebootKernel', -15], ]; } @@ -79,5 +78,4 @@ public function rebootKernel() $this->setAppOnContext(); } - -} \ No newline at end of file +} diff --git a/src/Context/Migrator.php b/src/Context/Migrator.php index 9119bd4..12b81f2 100644 --- a/src/Context/Migrator.php +++ b/src/Context/Migrator.php @@ -6,7 +6,6 @@ trait Migrator { - /** * Migrate the database before each scenario. * @@ -16,5 +15,4 @@ public function migrate() { Artisan::call('migrate'); } - } diff --git a/src/Context/Services/MailTrap.php b/src/Context/Services/MailTrap.php index d893ee8..036db92 100644 --- a/src/Context/Services/MailTrap.php +++ b/src/Context/Services/MailTrap.php @@ -8,11 +8,10 @@ trait MailTrap { - /** * The MailTrap configuration. * - * @var integer + * @var int */ protected $mailTrapInboxId; @@ -33,7 +32,8 @@ trait MailTrap /** * Get the configuration for MailTrap. * - * @param integer|null $inboxId + * @param int|null $inboxId + * * @throws Exception */ protected function applyMailTrapConfiguration($inboxId = null) @@ -51,22 +51,23 @@ protected function applyMailTrapConfiguration($inboxId = null) /** * Fetch a MailTrap inbox. * - * @param integer|null $inboxId + * @param int|null $inboxId + * * @return mixed */ protected function fetchInbox($inboxId = null) { - if ( ! $this->alreadyConfigured()) { + if (!$this->alreadyConfigured()) { $this->applyMailTrapConfiguration($inboxId); } - return $this->requestClient() - ->get($this->getMailTrapMessagesUrl()) - ->json(); + $response = $this->requestClient() + ->get($this->getMailTrapMessagesUrl()); + + return json_decode($response->getBody(true)); } /** - * * Empty the MailTrap inbox. * * @AfterScenario @mail @@ -99,7 +100,7 @@ protected function getMailTrapCleanUrl() /** * Determine if MailTrap config has been retrieved yet. * - * @return boolean + * @return bool */ protected function alreadyConfigured() { @@ -113,16 +114,13 @@ protected function alreadyConfigured() */ protected function requestClient() { - if ( ! $this->client) { + if (!$this->client) { $this->client = new Client([ - 'base_url' => 'https://mailtrap.io', - 'defaults' => [ - 'headers' => ['Api-Token' => $this->mailTrapApiKey] - ] + 'base_uri' => 'https://mailtrap.io', + 'headers' => ['Api-Token' => $this->mailTrapApiKey], ]); } return $this->client; } - } diff --git a/src/Driver/KernelDriver.php b/src/Driver/KernelDriver.php index 93b1672..c541ec3 100644 --- a/src/Driver/KernelDriver.php +++ b/src/Driver/KernelDriver.php @@ -8,7 +8,6 @@ class KernelDriver extends BrowserKitDriver { - /** * Create a new KernelDriver. * @@ -24,11 +23,11 @@ public function __construct(HttpKernelInterface $app, $baseUrl = null) * Refresh the driver. * * @param HttpKernelInterface $app + * * @return KernelDriver */ public function reboot($app) { return $this->__construct($app); } - } diff --git a/src/ServiceContainer/BehatExtension.php b/src/ServiceContainer/BehatExtension.php index ab9501b..7f7932e 100644 --- a/src/ServiceContainer/BehatExtension.php +++ b/src/ServiceContainer/BehatExtension.php @@ -12,7 +12,6 @@ class BehatExtension implements Extension { - /** * {@inheritdoc} */ @@ -27,7 +26,7 @@ public function getConfigKey() public function initialize(ExtensionManager $extensionManager) { if (null !== $minkExtension = $extensionManager->getExtension('mink')) { - $minkExtension->registerDriverFactory(new LaravelFactory); + $minkExtension->registerDriverFactory(new LaravelFactory()); } } @@ -68,6 +67,7 @@ public function load(ContainerBuilder $container, array $config) * * @param ContainerBuilder $container * @param array $config + * * @return mixed */ private function loadLaravel(ContainerBuilder $container, array $config) @@ -94,5 +94,4 @@ private function loadInitializer(ContainerBuilder $container, $app) $container->setDefinition('laravel.initializer', $definition); } - -} \ No newline at end of file +} diff --git a/src/ServiceContainer/LaravelBooter.php b/src/ServiceContainer/LaravelBooter.php index e66217d..15ab3a7 100644 --- a/src/ServiceContainer/LaravelBooter.php +++ b/src/ServiceContainer/LaravelBooter.php @@ -6,7 +6,6 @@ class LaravelBooter { - /** * The base path for the application. * @@ -53,7 +52,6 @@ public function environmentFile() return $this->environmentFile; } - /** * Boot the app. * @@ -61,7 +59,7 @@ public function environmentFile() */ public function boot() { - $bootstrapPath = $this->basePath() . '/bootstrap/app.php'; + $bootstrapPath = $this->basePath().'/bootstrap/app.php'; $this->assertBootstrapFileExists($bootstrapPath); @@ -80,13 +78,13 @@ public function boot() * Ensure that the provided Laravel bootstrap path exists. * * @param string $bootstrapPath + * * @throws RuntimeException */ private function assertBootstrapFileExists($bootstrapPath) { - if ( ! file_exists($bootstrapPath)) { + if (!file_exists($bootstrapPath)) { throw new RuntimeException('Could not locate the path to the Laravel bootstrap file.'); } } - -} \ No newline at end of file +} diff --git a/src/ServiceContainer/LaravelFactory.php b/src/ServiceContainer/LaravelFactory.php index b0e6dfd..a82f31c 100644 --- a/src/ServiceContainer/LaravelFactory.php +++ b/src/ServiceContainer/LaravelFactory.php @@ -9,7 +9,6 @@ class LaravelFactory implements DriverFactory { - /** * {@inheritdoc} */ @@ -43,7 +42,7 @@ public function buildDriver(array $config) return new Definition('Laracasts\Behat\Driver\KernelDriver', [ new Reference('laravel.app'), - '%mink.base_url%' + '%mink.base_url%', ]); } @@ -54,12 +53,10 @@ public function buildDriver(array $config) */ private function assertBrowserkitIsAvailable() { - if ( ! class_exists('Behat\Mink\Driver\BrowserKitDriver')) { + if (!class_exists('Behat\Mink\Driver\BrowserKitDriver')) { throw new RuntimeException( 'Install MinkBrowserKitDriver in order to use the laravel driver.' ); } } - } -