Laravel 5.7

Author: ilestis

composer.json

@@ -21,7 +21,7 @@
         "ilestis/kanka-dnd5e-monster": "^1.0",
         "intervention/image": "^2.4",
         "kalnoy/nestedset": "^4.3",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "5.7.*",
         "laravel/passport": "^7.0",
         "laravel/socialite": "^3.0",
         "laravel/tinker": "~1.0",

composer.lock

@@ -13,7 +13,7 @@
             <label for="email" class="col-md-4 control-label">{{ trans('auth.reset.fields.email') }}</label>
 
             <div class="col-md-6">
-                <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus>
+                <input id="email" type="email" class="form-control" name="email" value="{{ $email ?? old('email') }}" required autofocus>
 
                 @if ($errors->has('email'))
                     <span class="help-block">

public/svg/403.svg

@@ -13,7 +13,7 @@ function gtag(){dataLayer.push(arguments);}
 
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>{{ $title or "" }} - {{ config('app.name') }}</title>
+    <title>{{ $title ?? "" }} - {{ config('app.name') }}</title>
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
@@ -52,8 +52,8 @@ function gtag(){dataLayer.push(arguments);}
                 <div class="row">
                     <div class="col-md-12 content-header">
                         <h1>
-                            {{ $title or "Page Title" }}
-                            <small>{{ $description or null }}</small>
+                            {{ $title ?? "Page Title" }}
+                            <small>{{ $description ?? null }}</small>
                             @if (!empty($headerExtra))
                                 {!! $headerExtra !!}
                             @endif

public/svg/404.svg

@@ -14,11 +14,11 @@ function gtag(){dataLayer.push(arguments);}
 
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>{{ $title or '' }} - {{ config('app.name', 'Kanka') }}</title>
+    <title>{{ $title ?? '' }} - {{ config('app.name', 'Kanka') }}</title>
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-    <meta property="og:title" content="{{ $title or '' }} - {{ config('app.name') }}" />
+    <meta property="og:title" content="{{ $title ?? '' }} - {{ config('app.name') }}" />
     <meta property="og:site_name" content="{{ config('app.site_name') }}" />
 @yield('og')
     <!-- Font Awesome Icons -->
@@ -88,8 +88,8 @@ function gtag(){dataLayer.push(arguments);}
                 </ol>
                 @endif
                 <h1 class="hidden-xs">
-                    {{ $title or "Page Title" }}
-                    <small>{{ $description or null }}</small>
+                    {{ $title ?? "Page Title" }}
+                    <small>{{ $description ?? null }}</small>
                     @if (!empty($headerExtra))
                         {!! $headerExtra !!}
                     @endif

public/svg/500.svg

@@ -16,7 +16,7 @@ function gtag(){dataLayer.push(arguments);}
     <meta name="description" content="{{ trans('front.meta.description') }}">
     <meta name="author" content="{{ config('app.name') }}">
 
-    <meta property="og:title" content="{{ $title or __('front.meta.title') }} - {{ config('app.name') }}" />
+    <meta property="og:title" content="{{ $title ?? __('front.meta.title') }} - {{ config('app.name') }}" />
     <meta property="og:site_name" content="{{ config('app.site_name') }}" />
 
     <title>{{ $error }} - {{ config('app.name', 'Kanka') }}</title>

public/svg/503.svg

@@ -16,10 +16,10 @@ function gtag(){dataLayer.push(arguments);}
     <meta name="description" content="{{ trans('front.meta.description') }}">
     <meta name="author" content="{{ config('app.name') }}">
 
-    <meta property="og:title" content="{{ $title or __('front.meta.title') }} - {{ config('app.name') }}" />
+    <meta property="og:title" content="{{ $title ?? __('front.meta.title') }} - {{ config('app.name') }}" />
     <meta property="og:site_name" content="{{ config('app.site_name') }}" />
 @yield('og')
-    <title>{{ $title or trans('front.meta.title') }} - {{ config('app.name', 'Kanka') }}</title>
+    <title>{{ $title ?? trans('front.meta.title') }} - {{ config('app.name', 'Kanka') }}</title>
 
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">

resources/views/auth/passwords/reset.blade.php

@@ -13,7 +13,7 @@ function gtag(){dataLayer.push(arguments);}
 
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>{{ $title or trans('default.page_title') }} - {{ config('app.name', 'Laravel') }}</title>
+    <title>{{ $title ?? trans('default.page_title') }} - {{ config('app.name', 'Laravel') }}</title>
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>

resources/views/layouts/admin.blade.php

@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>{{ $title or trans('default.page_title') }} - {{ config('app.name') }}</title>
+    <title>{{ $title ?? trans('default.page_title') }} - {{ config('app.name') }}</title>
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-    <meta property="og:title" content="{{ $title or __('default.page_title') }} - {{ config('app.name') }}" />
+    <meta property="og:title" content="{{ $title ?? __('default.page_title') }} - {{ config('app.name') }}" />
     <meta property="og:site_name" content="{{ config('app.site_name') }}" />
 @yield('og')
     <!-- Font Awesome Icons -->
@@ -34,8 +34,8 @@
         <!-- Content Header (Page header) -->
         <section class="content-header">
             <h1>
-                {{ $title or "Page Title" }}
-                <small>{{ $description or null }}</small>
+                {{ $title ?? "Page Title" }}
+                <small>{{ $description ?? null }}</small>
             </h1>
         </section>
 

resources/views/layouts/app.blade.php

@@ -1,2 +1,3 @@
 *
+!data/
 !.gitignore