Merge remote-tracking branch 'origin/master'

This commit is contained in:
Taylor Otwell 2015-06-20 14:56:33 -05:00
commit 69076cb13f
6 changed files with 10 additions and 6 deletions

View File

@ -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
* @var array * @var array
*/ */
protected $dontReport = [ protected $dontReport = [
\Symfony\Component\HttpKernel\Exception\HttpException::class, HttpException::class,
]; ];
/** /**

View File

@ -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": [

View File

@ -13,7 +13,7 @@
| |
*/ */
'debug' => env('APP_DEBUG'), 'debug' => env('APP_DEBUG', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -70,6 +70,7 @@
'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.',

View File

@ -14,7 +14,7 @@
// 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;
} }