Sync with 5.0

Author: Graham Campbell

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,
     ];
 
     /**

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

config/app.php

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

config/services.php

@@ -24,14 +24,14 @@
     ],
 
     'ses' => [
-        'key' => '',
+        'key'    => '',
         'secret' => '',
         'region' => 'us-east-1',
     ],
 
     'stripe' => [
         'model'  => App\User::class,
-        'key' => '',
+        'key'    => '',
         'secret' => '',
     ],
 

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.',
 

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;
 }