From ecfda6de155638a712a2526aba60075a6377433b Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Mon, 12 Feb 2018 09:02:05 -0600 Subject: [PATCH] Add collision for test listeners and remove one old dep --- .travis/phpunit.travis.xml | 3 + composer.json | 7 +- composer.lock | 270 ++++++++++++++------------ config/version.yml | 2 +- phpunit.xml | 3 + resources/stubs/installer/config.stub | 2 +- 6 files changed, 161 insertions(+), 126 deletions(-) diff --git a/.travis/phpunit.travis.xml b/.travis/phpunit.travis.xml index 84ce5631..bc5e4e70 100644 --- a/.travis/phpunit.travis.xml +++ b/.travis/phpunit.travis.xml @@ -18,6 +18,9 @@ ./app + + + diff --git a/composer.json b/composer.json index 4bbb5188..d9e9abf4 100755 --- a/composer.json +++ b/composer.json @@ -38,14 +38,15 @@ "php-units-of-measure/php-units-of-measure": "2.1.x" }, "require-dev": { - "phpunit/phpunit": "6.4.0", + "phpunit/phpunit": "6.4.x", "barryvdh/laravel-ide-helper": "2.4.x", "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", "filp/whoops": "~2.0", "bpocallaghan/generators": "5.0.1", - "scriptfusion/phpunit-immediate-exception-printer": "1.3.0", - "zircote/swagger-php": "2.0.13" + + "zircote/swagger-php": "2.0.13", + "nunomaduro/collision": "^1.1" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index a612a571..122a8a9c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "c678f57dcf9193fd06b7334ee2cbfaac", + "content-hash": "163ccf004f317103c6ff45dab303dfd3", "packages": [ { "name": "arrilot/laravel-widgets", @@ -48,7 +48,7 @@ "Arrilot\\Widgets\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -160,7 +160,7 @@ "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -366,7 +366,7 @@ "Egulias\\EmailValidator\\": "EmailValidator" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -412,7 +412,7 @@ "Parsedown": "" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -457,7 +457,7 @@ "Firebase\\JWT\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -525,7 +525,7 @@ "src/Google/Service/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "Apache-2.0" ], @@ -538,16 +538,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.45", + "version": "v0.46", "source": { "type": "git", "url": "https://github.com/google/google-api-php-client-services.git", - "reference": "35909fbc909bf9f9e0d36dd05b62f4b1d5ffe3ae" + "reference": "a4d2cd5f7289bbfa1ab4c60a1a5601faf4572b20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/35909fbc909bf9f9e0d36dd05b62f4b1d5ffe3ae", - "reference": "35909fbc909bf9f9e0d36dd05b62f4b1d5ffe3ae", + "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/a4d2cd5f7289bbfa1ab4c60a1a5601faf4572b20", + "reference": "a4d2cd5f7289bbfa1ab4c60a1a5601faf4572b20", "shasum": "" }, "require": { @@ -562,7 +562,7 @@ "Google_Service_": "src" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "Apache-2.0" ], @@ -571,7 +571,7 @@ "keywords": [ "google" ], - "time": "2018-02-03T00:23:12+00:00" + "time": "2018-02-10T00:22:58+00:00" }, { "name": "google/auth", @@ -607,7 +607,7 @@ "Google\\Auth\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "Apache-2.0" ], @@ -661,7 +661,7 @@ "GuzzleHttp\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -719,7 +719,7 @@ "src/functions_include.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -774,7 +774,7 @@ "src/functions_include.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -836,7 +836,7 @@ "Hashids\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -953,7 +953,7 @@ "Irazasyed\\LaravelGAMP\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1000,7 +1000,7 @@ "Jackiedo\\Timezonelist\\": "src/Jackiedo/Timezonelist" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1053,7 +1053,7 @@ "stubs/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1104,7 +1104,7 @@ "Joshbrw\\LaravelModuleInstaller\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1137,7 +1137,7 @@ "Traitor\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1196,7 +1196,7 @@ "src/Laracasts/Flash/functions.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1325,7 +1325,7 @@ "Illuminate\\": "src/Illuminate/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1460,7 +1460,7 @@ "League\\Flysystem\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1598,7 +1598,7 @@ "League\\ISO3166\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1724,7 +1724,7 @@ "Cron\\": "src/Cron/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1770,7 +1770,7 @@ "VaCentral\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -1864,7 +1864,7 @@ "PhpParser\\": "lib/PhpParser" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -2133,7 +2133,7 @@ "PhpUnitsOfMeasure\\": "source/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -2192,7 +2192,7 @@ "phpseclib\\": "phpseclib/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -2288,7 +2288,7 @@ "PragmaRX\\Version\\Tests\\": "tests/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -2348,7 +2348,7 @@ "PragmaRX\\Yaml\\Tests\\": "tests/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -2409,7 +2409,7 @@ "Prettus\\Repository\\": "src/Prettus/Repository/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -2498,7 +2498,7 @@ "Psr\\Cache\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -2762,7 +2762,7 @@ "Ramsey\\Uuid\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -2922,7 +2922,7 @@ "Laratrust\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3045,7 +3045,7 @@ "Spatie\\Pjax\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3172,7 +3172,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3221,7 +3221,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3281,7 +3281,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3337,7 +3337,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3400,7 +3400,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3449,7 +3449,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3503,7 +3503,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3591,7 +3591,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3640,7 +3640,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3700,7 +3700,7 @@ "bootstrap.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3760,7 +3760,7 @@ "Resources/stubs" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3815,7 +3815,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3872,7 +3872,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -3955,7 +3955,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4039,7 +4039,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4107,7 +4107,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4172,7 +4172,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4234,7 +4234,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4280,7 +4280,7 @@ "TheIconic\\Tracking\\GoogleAnalytics\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4325,7 +4325,7 @@ "TijsVerkoyen\\CssToInlineStyles\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -4366,7 +4366,7 @@ "Tivie\\OS\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "APACHE 2.0" ], @@ -4484,7 +4484,7 @@ "src/vierbergenlars/SemVer/internal.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4589,7 +4589,7 @@ "Webpatser\\Uuid": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4705,7 +4705,7 @@ "Zend\\Diactoros\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "BSD-2-Clause" ], @@ -4769,7 +4769,7 @@ "Barryvdh\\LaravelIdeHelper\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4926,7 +4926,7 @@ "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -4996,7 +4996,7 @@ "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -5053,7 +5053,7 @@ "Whoops\\": "src/Whoops/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -5267,7 +5267,7 @@ "src/DeepCopy/deep_copy.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -5281,6 +5281,67 @@ ], "time": "2017-10-19T19:58:43+00:00" }, + { + "name": "nunomaduro/collision", + "version": "v1.1.22", + "source": { + "type": "git", + "url": "https://github.com/nunomaduro/collision.git", + "reference": "236609bd5a067587f600bc55c5d683b840798b22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/236609bd5a067587f600bc55c5d683b840798b22", + "reference": "236609bd5a067587f600bc55c5d683b840798b22", + "shasum": "" + }, + "require": { + "filp/whoops": "^2.1.4", + "php": "^7.1", + "symfony/console": "~2.8|~3.3|~4.0" + }, + "require-dev": { + "laravel/framework": "5.5.*", + "phpunit/phpunit": "~6.5" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "NunoMaduro\\Collision\\": "src/" + } + }, + "notification-url": "http://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "Cli error handling for console/command-line PHP applications.", + "keywords": [ + "artisan", + "cli", + "command-line", + "console", + "error", + "handling", + "laravel", + "laravel-zero", + "php", + "symfony" + ], + "time": "2018-02-07T10:42:20+00:00" + }, { "name": "phar-io/manifest", "version": "1.0.1", @@ -5475,7 +5536,7 @@ ] } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -5537,16 +5598,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.7.3", + "version": "1.7.4", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" + "reference": "9f901e29c93dae4aa77c0bb161df4276f9c9a1be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/9f901e29c93dae4aa77c0bb161df4276f9c9a1be", + "reference": "9f901e29c93dae4aa77c0bb161df4276f9c9a1be", "shasum": "" }, "require": { @@ -5558,7 +5619,7 @@ }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" }, "type": "library", "extra": { @@ -5571,7 +5632,7 @@ "Prophecy\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -5596,7 +5657,7 @@ "spy", "stub" ], - "time": "2017-11-24T13:59:53+00:00" + "time": "2018-02-11T18:49:29+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5689,7 +5750,7 @@ "src/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -5830,7 +5891,7 @@ "src/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -5849,16 +5910,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.4.0", + "version": "6.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a1bcaca096998de32c29535fdd2dea0c475e8f61" + "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1bcaca096998de32c29535fdd2dea0c475e8f61", - "reference": "a1bcaca096998de32c29535fdd2dea0c475e8f61", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/562f7dc75d46510a4ed5d16189ae57fbe45a9932", + "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932", "shasum": "" }, "require": { @@ -5911,7 +5972,7 @@ "src/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -5929,7 +5990,7 @@ "testing", "xunit" ], - "time": "2017-10-06T03:14:57+00:00" + "time": "2017-11-08T11:26:09+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -5990,39 +6051,6 @@ ], "time": "2017-08-03T14:08:16+00:00" }, - { - "name": "scriptfusion/phpunit-immediate-exception-printer", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/ScriptFUSION/PHPUnit-Immediate-Exception-Printer.git", - "reference": "eecb20334dd09defe8fa6c15fce253357d7cf84e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ScriptFUSION/PHPUnit-Immediate-Exception-Printer/zipball/eecb20334dd09defe8fa6c15fce253357d7cf84e", - "reference": "eecb20334dd09defe8fa6c15fce253357d7cf84e", - "shasum": "" - }, - "require": { - "phpunit/phpunit": "^5.5|^6" - }, - "type": "library", - "autoload": { - "psr-4": { - "ScriptFUSION\\PHPUnitImmediateExceptionPrinter\\": "src" - } - }, - "notification-url": "http://packagist.org/downloads/", - "authors": [ - { - "name": "Bilge", - "email": "bilge@scriptfusion.com" - } - ], - "description": "Immediately prints exception and assertion failures during testing.", - "time": "2017-07-29T19:55:53+00:00" - }, { "name": "sebastian/code-unit-reverse-lookup", "version": "1.0.1", @@ -6101,7 +6129,7 @@ "src/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -6620,7 +6648,7 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -6710,7 +6738,7 @@ "Webmozart\\Assert\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "MIT" ], @@ -6764,7 +6792,7 @@ "src/functions.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "notification-url": "http://packagist.org/downloads/", "license": [ "Apache2" ], diff --git a/config/version.yml b/config/version.yml index 2682c1a4..a1f549c2 100644 --- a/config/version.yml +++ b/config/version.yml @@ -9,7 +9,7 @@ build: mode: number length: 6 increment_by: 1 - number: 180211-3aa01a + number: 180212-2f8a69 git_absorb: git-local git: git-local: 'git rev-parse --verify HEAD' diff --git a/phpunit.xml b/phpunit.xml index f3922227..32acf6c7 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -13,6 +13,9 @@ ./tests + + + ./app diff --git a/resources/stubs/installer/config.stub b/resources/stubs/installer/config.stub index 50b1c7b6..d262e6a3 100644 --- a/resources/stubs/installer/config.stub +++ b/resources/stubs/installer/config.stub @@ -31,7 +31,7 @@ return [ # overrides database.php 'database' => [ - 'default' => '$DB_CONN$', + 'default' => env('DB_CONNECTION', '$DB_CONN$'), 'connections' => [ 'mysql' => [ 'host' => '$DB_HOST$',