Updated to Laravel 5.7

FaZeRs · Sep 5, 2018 · ead3e58 · ead3e58
1 parent eef2a70
commit ead3e58
Show file tree

Hide file tree

Showing 9 changed files with 237 additions and 232 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,5 +12,4 @@ insert_final_newline = true
 trim_trailing_whitespace = false
 
 [*.{vue,js,json,html,scss,blade.php,yml}]
-indent_style = space
 indent_size = 2
diff --git a/composer.json b/composer.json
@@ -8,9 +8,9 @@
         "php": "^7.1.3",
         "bugsnag/bugsnag-laravel": "^2.14",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "5.7.*",
         "laravel/horizon": "^1.3",
-        "laravel/passport": "^6.0.6",
+        "laravel/passport": "^7.0",
         "predis/predis": "^1.1"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/config/app.php b/config/app.php
@@ -21,7 +21,7 @@
     |
     | This value determines the "environment" your application is currently
     | running in. This may determine how you prefer to configure various
-    | services your application utilizes. Set this in your ".env" file.
+    | services the application utilizes. Set this in your ".env" file.
     |
     */
     'env' => env('APP_ENV', 'production'),

diff --git a/config/hashing.php b/config/hashing.php
@@ -11,7 +11,7 @@
     | passwords for your application. By default, the bcrypt algorithm is
     | used; however, you remain free to modify this option if you wish.
     |
-    | Supported: "bcrypt", "argon"
+    | Supported: "bcrypt", "argon", "argon2id"
     |
     */
 

diff --git a/config/queue.php b/config/queue.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'default' => env('QUEUE_DRIVER', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'sync'),
 
     /*
     |--------------------------------------------------------------------------

diff --git a/config/session.php b/config/session.php
@@ -70,7 +70,7 @@
     |
     */
 
-    'connection' => null,
+    'connection' => env('SESSION_CONNECTION', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -96,7 +96,7 @@
     |
     */
 
-    'store' => null,
+    'store' => env('SESSION_STORE', null),
 
     /*
     |--------------------------------------------------------------------------

diff --git a/phpunit.xml b/phpunit.xml
@@ -29,7 +29,7 @@
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="MAIL_DRIVER" value="array"/>
     </php>
-</phpunit>
+</phpunit>
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
@@ -11,7 +11,6 @@
 <html lang="{{ app()->getLocale() }}">
 <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="env" content="{{ app()->environment() }}">
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
         |
         */
-        'default' => env('QUEUE_DRIVER', 'sync'),
+        'default' => env('QUEUE_CONNECTION', 'sync'),
         /*
         |--------------------------------------------------------------------------
@@ Expand Down @@