Skip to content

Commit 2de3c97

Browse files
committed
Reslove blade compilation error for laravel 5.8
1 parent 37ad12d commit 2de3c97

File tree

6 files changed

+57
-55
lines changed

6 files changed

+57
-55
lines changed

app/Providers/BladeServiceProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ class BladeServiceProvider extends ServiceProvider
2020
/**
2121
* Register any misc. blade extensions.
2222
*/
23-
public function register()
23+
public function boot()
2424
{
2525
/*
2626
* The block of code inside this directive indicates
2727
* the chosen language requests RTL support.
2828
*/
29-
Blade::directive('langRTL', function () {
30-
return "<?php if (session()->has('lang-rtl')): ?>";
29+
Blade::if('langrtl', function ($session_identifier = 'lang-rtl') {
30+
return session()->has($session_identifier);
3131
});
3232
}
3333
}

composer.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/app.php

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
App\Providers\AccessServiceProvider::class,
192192
App\Providers\AppServiceProvider::class,
193193
App\Providers\AuthServiceProvider::class,
194-
//App\Providers\BladeServiceProvider::class,
194+
App\Providers\BladeServiceProvider::class,
195195
//App\Providers\BroadcastServiceProvider::class,
196196
App\Providers\ComposerServiceProvider::class,
197197
App\Providers\EventServiceProvider::class,
@@ -214,51 +214,51 @@
214214
*/
215215

216216
'aliases' => [
217-
'App' => Illuminate\Support\Facades\App::class,
218-
'Artisan' => Illuminate\Support\Facades\Artisan::class,
219-
'Auth' => Illuminate\Support\Facades\Auth::class,
220-
'Blade' => Illuminate\Support\Facades\Blade::class,
221-
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
222-
'Bus' => Illuminate\Support\Facades\Bus::class,
223-
'Cache' => Illuminate\Support\Facades\Cache::class,
224-
'Config' => Illuminate\Support\Facades\Config::class,
225-
'Cookie' => Illuminate\Support\Facades\Cookie::class,
226-
'Crypt' => Illuminate\Support\Facades\Crypt::class,
227-
'DB' => Illuminate\Support\Facades\DB::class,
228-
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
229-
'Event' => Illuminate\Support\Facades\Event::class,
230-
'File' => Illuminate\Support\Facades\File::class,
231-
'Gate' => Illuminate\Support\Facades\Gate::class,
232-
'Hash' => Illuminate\Support\Facades\Hash::class,
233-
'Lang' => Illuminate\Support\Facades\Lang::class,
234-
'Log' => Illuminate\Support\Facades\Log::class,
235-
'Mail' => Illuminate\Support\Facades\Mail::class,
217+
'App' => Illuminate\Support\Facades\App::class,
218+
'Artisan' => Illuminate\Support\Facades\Artisan::class,
219+
'Auth' => Illuminate\Support\Facades\Auth::class,
220+
'Blade' => Illuminate\Support\Facades\Blade::class,
221+
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
222+
'Bus' => Illuminate\Support\Facades\Bus::class,
223+
'Cache' => Illuminate\Support\Facades\Cache::class,
224+
'Config' => Illuminate\Support\Facades\Config::class,
225+
'Cookie' => Illuminate\Support\Facades\Cookie::class,
226+
'Crypt' => Illuminate\Support\Facades\Crypt::class,
227+
'DB' => Illuminate\Support\Facades\DB::class,
228+
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
229+
'Event' => Illuminate\Support\Facades\Event::class,
230+
'File' => Illuminate\Support\Facades\File::class,
231+
'Gate' => Illuminate\Support\Facades\Gate::class,
232+
'Hash' => Illuminate\Support\Facades\Hash::class,
233+
'Lang' => Illuminate\Support\Facades\Lang::class,
234+
'Log' => Illuminate\Support\Facades\Log::class,
235+
'Mail' => Illuminate\Support\Facades\Mail::class,
236236
'Notification' => Illuminate\Support\Facades\Notification::class,
237-
'Password' => Illuminate\Support\Facades\Password::class,
238-
'Queue' => Illuminate\Support\Facades\Queue::class,
239-
'Redirect' => Illuminate\Support\Facades\Redirect::class,
240-
'Redis' => Illuminate\Support\Facades\Redis::class,
241-
'Request' => Illuminate\Support\Facades\Request::class,
242-
'Response' => Illuminate\Support\Facades\Response::class,
243-
'Route' => Illuminate\Support\Facades\Route::class,
244-
'Schema' => Illuminate\Support\Facades\Schema::class,
245-
'Session' => Illuminate\Support\Facades\Session::class,
246-
'Storage' => Illuminate\Support\Facades\Storage::class,
247-
'URL' => Illuminate\Support\Facades\URL::class,
248-
'Validator' => Illuminate\Support\Facades\Validator::class,
249-
'View' => Illuminate\Support\Facades\View::class,
237+
'Password' => Illuminate\Support\Facades\Password::class,
238+
'Queue' => Illuminate\Support\Facades\Queue::class,
239+
'Redirect' => Illuminate\Support\Facades\Redirect::class,
240+
'Redis' => Illuminate\Support\Facades\Redis::class,
241+
'Request' => Illuminate\Support\Facades\Request::class,
242+
'Response' => Illuminate\Support\Facades\Response::class,
243+
'Route' => Illuminate\Support\Facades\Route::class,
244+
'Schema' => Illuminate\Support\Facades\Schema::class,
245+
'Session' => Illuminate\Support\Facades\Session::class,
246+
'Storage' => Illuminate\Support\Facades\Storage::class,
247+
'URL' => Illuminate\Support\Facades\URL::class,
248+
'Validator' => Illuminate\Support\Facades\Validator::class,
249+
'View' => Illuminate\Support\Facades\View::class,
250250

251251
/*
252252
* Third Party Aliases
253253
*/
254-
'Active' => HieuLe\Active\Facades\Active::class,
254+
'Active' => HieuLe\Active\Facades\Active::class,
255255
'Breadcrumbs' => DaveJamesMiller\Breadcrumbs\Facade::class,
256-
'Captcha' => Arcanedev\NoCaptcha\Facades\NoCaptcha::class,
257-
'Form' => Collective\Html\FormFacade::class,
258-
'Gravatar' => Creativeorange\Gravatar\Facades\Gravatar::class,
259-
'Html' => Collective\Html\HtmlFacade::class,
260-
'Socialite' => Laravel\Socialite\Facades\Socialite::class,
261-
'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class,
256+
'Captcha' => Arcanedev\NoCaptcha\Facades\NoCaptcha::class,
257+
'Form' => Collective\Html\FormFacade::class,
258+
'Gravatar' => Creativeorange\Gravatar\Facades\Gravatar::class,
259+
'Html' => Collective\Html\HtmlFacade::class,
260+
'Socialite' => Laravel\Socialite\Facades\Socialite::class,
261+
'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class,
262262
//'Datatables' => Yajra\DataTables\Facades\DataTables::class
263263
],
264264
];

resources/views/backend/layouts/app.blade.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919

2020
<!-- Check if the language is set to RTL, so apply the RTL layouts -->
2121
<!-- Otherwise apply the normal LTR layouts -->
22-
@langRTL
22+
@langrtl
2323
{{ Html::style(getRtlCss(mix('css/backend.css'))) }}
2424
@else
2525
{{ Html::style(mix('css/backend.css')) }}
26-
@endif
26+
@endlangrtl
27+
2728
{{ Html::style(mix('css/backend-custom.css')) }}
2829
@yield('after-styles')
2930

resources/views/frontend/layouts/app.blade.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020

2121
<!-- Check if the language is set to RTL, so apply the RTL layouts -->
2222
<!-- Otherwise apply the normal LTR layouts -->
23-
@langRTL
23+
@langrtl
2424
{{ Html::style(getRtlCss(mix('css/frontend.css'))) }}
2525
@else
2626
{{ Html::style(mix('css/frontend.css')) }}
27-
@endif
28-
{!! Html::style('js/select2/select2.min.css') !!}
27+
@endlangrtl
28+
29+
{!! Html::style('js/select2/select2.min.css') !!}
2930
@yield('after-styles')
3031

3132
<!-- Scripts -->

resources/views/vendor/log-viewer/_template/master.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
<!-- Check if the language is set to RTL, so apply the RTL layouts -->
1515
<!-- Otherwise apply the normal LTR layouts -->
16-
@langRTL
16+
@langrtl
1717
{{ Html::style(getRtlCss(mix('css/backend.css'))) }}
1818
@else
1919
{{ Html::style(mix('css/backend.css')) }}
20-
@endif
20+
@endlangrtl
2121
{!! Html::style('css/custom-style.css') !!}
2222
@yield('after-styles-end')
2323

0 commit comments

Comments
 (0)