diff options
| -rw-r--r-- | bootstrap/app.php | 27 | ||||
| -rw-r--r-- | composer.json | 4 |
2 files changed, 17 insertions, 14 deletions
diff --git a/bootstrap/app.php b/bootstrap/app.php index 1c06a3f..eae5bcf 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -2,7 +2,10 @@ require_once __DIR__.'/../vendor/autoload.php'; -Dotenv::load(__DIR__.'/../'); +try { + (new Dotenv\Dotenv(__DIR__.'/../'))->load(); +} catch (Dotenv\Exception\InvalidPathException $e) { +} /* |-------------------------------------------------------------------------- @@ -16,7 +19,7 @@ Dotenv::load(__DIR__.'/../'); */ $app = new Laravel\Lumen\Application( - realpath(__DIR__.'/../') + realpath(__DIR__.'/../') ); $app->withFacades(); @@ -35,13 +38,13 @@ $app->withEloquent(); */ $app->singleton( - Illuminate\Contracts\Debug\ExceptionHandler::class, - App\Exceptions\Handler::class + Illuminate\Contracts\Debug\ExceptionHandler::class, + App\Exceptions\Handler::class ); $app->singleton( - Illuminate\Contracts\Console\Kernel::class, - App\Console\Kernel::class + Illuminate\Contracts\Console\Kernel::class, + App\Console\Kernel::class ); /* @@ -56,11 +59,11 @@ $app->singleton( */ // $app->middleware([ -// // Illuminate\Cookie\Middleware\EncryptCookies::class, -// // Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, -// // Illuminate\Session\Middleware\StartSession::class, -// // Illuminate\View\Middleware\ShareErrorsFromSession::class, -// // Laravel\Lumen\Http\Middleware\VerifyCsrfToken::class, +// // Illuminate\Cookie\Middleware\EncryptCookies::class, +// // Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, +// // Illuminate\Session\Middleware\StartSession::class, +// // Illuminate\View\Middleware\ShareErrorsFromSession::class, +// // Laravel\Lumen\Http\Middleware\VerifyCsrfToken::class, // ]); // $app->routeMiddleware([ @@ -93,7 +96,7 @@ $app->singleton( */ $app->group(['namespace' => 'App\Http\Controllers'], function ($app) { - require __DIR__.'/../app/Http/routes.php'; + require __DIR__.'/../app/Http/routes.php'; }); return $app; diff --git a/composer.json b/composer.json index 59758e5..ba85f9d 100644 --- a/composer.json +++ b/composer.json @@ -6,8 +6,8 @@ "type": "project", "require": { "php": ">=5.5.9", - "laravel/lumen-framework": "5.1.*", - "vlucas/phpdotenv": "~1.0", + "laravel/lumen-framework": "5.2.*", + "vlucas/phpdotenv": "~2.2", "twbs/bootstrap": "^3.3", "components/jquery": "^2.1" }, |