From 7e303014b6ab627e18dcdc5ee976e7fe545a3092 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 15 Jun 2015 22:22:23 +0100 Subject: [PATCH 1/2] Sync with 5.0 --- app/Exceptions/Handler.php | 3 ++- composer.json | 4 +++- config/app.php | 2 +- config/services.php | 4 ++-- resources/lang/en/validation.php | 1 + server.php | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 7c9b365a..2cc435b7 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -3,6 +3,7 @@ namespace App\Exceptions; use Exception; +use Symfony\Component\HttpKernel\Exception\HttpException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; class Handler extends ExceptionHandler @@ -13,7 +14,7 @@ class Handler extends ExceptionHandler * @var array */ protected $dontReport = [ - \Symfony\Component\HttpKernel\Exception\HttpException::class, + HttpException::class, ]; /** diff --git a/composer.json b/composer.json index 0bd256f1..a6ced5e2 100644 --- a/composer.json +++ b/composer.json @@ -32,8 +32,10 @@ "php artisan clear-compiled", "php artisan optimize" ], + "pre-update-cmd": [ + "php artisan clear-compiled" + ], "post-update-cmd": [ - "php artisan clear-compiled", "php artisan optimize" ], "post-root-package-install": [ diff --git a/config/app.php b/config/app.php index 3f5dc57c..15c75aa5 100644 --- a/config/app.php +++ b/config/app.php @@ -13,7 +13,7 @@ | */ - 'debug' => env('APP_DEBUG'), + 'debug' => env('APP_DEBUG', false), /* |-------------------------------------------------------------------------- diff --git a/config/services.php b/config/services.php index 588c3c74..51abbbd1 100644 --- a/config/services.php +++ b/config/services.php @@ -24,14 +24,14 @@ ], 'ses' => [ - 'key' => '', + 'key' => '', 'secret' => '', 'region' => 'us-east-1', ], 'stripe' => [ 'model' => App\User::class, - 'key' => '', + 'key' => '', 'secret' => '', ], diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index c0d0d7cb..358b4eee 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -71,6 +71,7 @@ 'array' => 'The :attribute must contain :size items.', ], 'timezone' => 'The :attribute must be a valid zone.', + 'string' => 'The :attribute must be a string.', 'unique' => 'The :attribute has already been taken.', 'url' => 'The :attribute format is invalid.', diff --git a/server.php b/server.php index fdbc49e2..f65c7c44 100644 --- a/server.php +++ b/server.php @@ -14,7 +14,7 @@ // This file allows us to emulate Apache's "mod_rewrite" functionality from the // built-in PHP web server. This provides a convenient way to test a Laravel // application without having installed a "real" web server software here. -if ($uri !== '/' and file_exists(__DIR__.'/public'.$uri)) { +if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) { return false; } From d64b5a52af6b7d6eb338b12510611e4c043b1afb Mon Sep 17 00:00:00 2001 From: Andy Date: Tue, 16 Jun 2015 08:46:07 -0500 Subject: [PATCH 2/2] Maintain alphabetical order --- resources/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 358b4eee..20acc9a6 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -70,8 +70,8 @@ 'string' => 'The :attribute must be :size characters.', 'array' => 'The :attribute must contain :size items.', ], - 'timezone' => 'The :attribute must be a valid zone.', 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid zone.', 'unique' => 'The :attribute has already been taken.', 'url' => 'The :attribute format is invalid.',