Commit 69076cb1 authored by Taylor Otwell's avatar Taylor Otwell

Merge remote-tracking branch 'origin/master'

parents 7a8800c6 3b0d0392
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace App\Exceptions; namespace App\Exceptions;
use Exception; use Exception;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
...@@ -13,7 +14,7 @@ class Handler extends ExceptionHandler ...@@ -13,7 +14,7 @@ class Handler extends ExceptionHandler
* @var array * @var array
*/ */
protected $dontReport = [ protected $dontReport = [
\Symfony\Component\HttpKernel\Exception\HttpException::class, HttpException::class,
]; ];
/** /**
......
...@@ -32,8 +32,10 @@ ...@@ -32,8 +32,10 @@
"php artisan clear-compiled", "php artisan clear-compiled",
"php artisan optimize" "php artisan optimize"
], ],
"pre-update-cmd": [
"php artisan clear-compiled"
],
"post-update-cmd": [ "post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize" "php artisan optimize"
], ],
"post-root-package-install": [ "post-root-package-install": [
......
...@@ -13,7 +13,7 @@ return [ ...@@ -13,7 +13,7 @@ return [
| |
*/ */
'debug' => env('APP_DEBUG'), 'debug' => env('APP_DEBUG', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
...@@ -24,14 +24,14 @@ return [ ...@@ -24,14 +24,14 @@ return [
], ],
'ses' => [ 'ses' => [
'key' => '', 'key' => '',
'secret' => '', 'secret' => '',
'region' => 'us-east-1', 'region' => 'us-east-1',
], ],
'stripe' => [ 'stripe' => [
'model' => App\User::class, 'model' => App\User::class,
'key' => '', 'key' => '',
'secret' => '', 'secret' => '',
], ],
......
...@@ -70,6 +70,7 @@ return [ ...@@ -70,6 +70,7 @@ return [
'string' => 'The :attribute must be :size characters.', 'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.', 'array' => 'The :attribute must contain :size items.',
], ],
'string' => 'The :attribute must be a string.',
'timezone' => 'The :attribute must be a valid zone.', 'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.', 'unique' => 'The :attribute has already been taken.',
'url' => 'The :attribute format is invalid.', 'url' => 'The :attribute format is invalid.',
......
...@@ -14,7 +14,7 @@ $uri = urldecode( ...@@ -14,7 +14,7 @@ $uri = urldecode(
// This file allows us to emulate Apache's "mod_rewrite" functionality from the // 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 // built-in PHP web server. This provides a convenient way to test a Laravel
// application without having installed a "real" web server software here. // 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; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment