Some cleaning

Author: sdebacker

src/Composers/SidebarViewComposer.php

@@ -2,8 +2,8 @@
 
 namespace TypiCMS\Modules\Blocks\Composers;
 
-use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\View\View;
 use Maatwebsite\Sidebar\SidebarGroup;
 use Maatwebsite\Sidebar\SidebarItem;
 

src/Providers/ModuleServiceProvider.php

@@ -4,21 +4,19 @@
 
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
 use TypiCMS\Modules\Blocks\Composers\SidebarViewComposer;
 use TypiCMS\Modules\Blocks\Facades\Blocks;
 use TypiCMS\Modules\Blocks\Models\Block;
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    public function boot()
+    public function boot(): void
     {
         $this->mergeConfigFrom(__DIR__.'/../config/config.php', 'typicms.blocks');
         $this->mergeConfigFrom(__DIR__.'/../config/permissions.php', 'typicms.permissions');
 
-        $modules = $this->app['config']['typicms']['modules'];
-        $this->app['config']->set('typicms.modules', array_merge(['blocks' => []], $modules));
-
         $this->loadViewsFrom(__DIR__.'/../../resources/views/', 'blocks');
 
         $this->publishes([
@@ -35,21 +33,13 @@ public function boot()
             return "<?php echo Blocks::render({$name}) ?>";
         });
 
-        /*
-         * Sidebar view composer
-         */
-        $this->app->view->composer('core::admin._sidebar', SidebarViewComposer::class);
+        View::composer('core::admin._sidebar', SidebarViewComposer::class);
     }
 
-    public function register()
+    public function register(): void
     {
-        $app = $this->app;
-
-        /*
-         * Register route service provider
-         */
-        $app->register(RouteServiceProvider::class);
+        $this->app->register(RouteServiceProvider::class);
 
-        $app->bind('Blocks', Block::class);
+        $this->app->bind('Blocks', Block::class);
     }
 }

src/Providers/RouteServiceProvider.php

@@ -10,7 +10,7 @@
 
 class RouteServiceProvider extends ServiceProvider
 {
-    public function map()
+    public function map(): void
     {
         /*
          * Admin routes