From 9c73c0cb369a5b9772b3d5d97de4355f11873c49 Mon Sep 17 00:00:00 2001 From: Charles Sprayberry Date: Fri, 8 Jan 2016 21:20:49 -0500 Subject: [PATCH] update to use whoops 2.0 --- composer.json | 2 +- composer.lock | 33 ++++++++++++++------------------- src/_functions.php | 4 ++-- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index b7bcd5b..da350f8 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "rdlowrey/auryn": "~1.1", "league/event": "~2.1", "morrisonlevi/ardent": "~0.14", - "filp/whoops": "dev-master" + "filp/whoops": "~2.0.0" }, "require-dev": { "phpunit/phpunit": "5.1.3", diff --git a/composer.lock b/composer.lock index 8d29ddf..9aaca1f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "bad987d471ca3c1132d625747b0ef17b", - "content-hash": "8f49dbf9b27ba592bdcd80bab811f605", + "hash": "0c21c0ed2a1072f6889211847edfc070", + "content-hash": "87f6b72f2db47ed18a926bc8d057e473", "packages": [ { "name": "filp/whoops", - "version": "dev-master", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "eb1ce6439db161a9f00cd57f33a9cfa1355229ec" + "reference": "a327942c50cbd62b25c6fbe08f173031ce25fbff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/eb1ce6439db161a9f00cd57f33a9cfa1355229ec", - "reference": "eb1ce6439db161a9f00cd57f33a9cfa1355229ec", + "url": "https://api.github.com/repos/filp/whoops/zipball/a327942c50cbd62b25c6fbe08f173031ce25fbff", + "reference": "a327942c50cbd62b25c6fbe08f173031ce25fbff", "shasum": "" }, "require": { @@ -41,10 +41,7 @@ "autoload": { "psr-4": { "Whoops\\": "src/Whoops/" - }, - "files": [ - "src/Whoops/functions.php" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -67,7 +64,7 @@ "whoops", "zf2" ], - "time": "2015-12-15 12:27:17" + "time": "2016-01-06 17:51:21" }, { "name": "league/event", @@ -1262,16 +1259,16 @@ }, { "name": "symfony/yaml", - "version": "v3.0.0", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002" + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", - "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691", + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691", "shasum": "" }, "require": { @@ -1307,14 +1304,12 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-11-30 12:36:17" + "time": "2015-12-26 13:39:53" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "filp/whoops": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/src/_functions.php b/src/_functions.php index b450e24..7ffe161 100644 --- a/src/_functions.php +++ b/src/_functions.php @@ -12,10 +12,10 @@ use Auryn\Injector; use Whoops\Run; -function bootstrap(EnvironmentIntegrationConfig $config = null) : Injector { +function bootstrap() : Injector { $run = (new Run())->register(); - $injector = (new Services($config))->createInjector(); + $injector = (new Services())->createInjector(); $injector->share($run); $engine = $injector->make(Engine::class);