Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

[bookstack] / app / Providers / CustomFacadeProvider.php

diff --git a/app/Providers/CustomFacadeProvider.php b/app/Providers/CustomFacadeProvider.php
index 9b290039ceb34abee8b551c0144824ae3a9c37e7..b2c7acf5e303cb391347ffa3b54d5e59c1164c8c 100644 (file)
--- a/app/Providers/CustomFacadeProvider.php
+++ b/app/Providers/CustomFacadeProvider.php
@@ -2,11 +2,18 @@
 
 namespace BookStack\Providers;
 
 
 namespace BookStack\Providers;
 

+use BookStack\Activity;

 use BookStack\Services\ImageService;
 use BookStack\Services\ImageService;

+use BookStack\Services\PermissionService;

 use BookStack\Services\ViewService;
 use BookStack\Services\ViewService;

+use BookStack\Setting;
+use BookStack\View;
+use Illuminate\Contracts\Cache\Repository;
+use Illuminate\Contracts\Filesystem\Factory;

 use Illuminate\Support\ServiceProvider;
 use BookStack\Services\ActivityService;
 use BookStack\Services\SettingService;
 use Illuminate\Support\ServiceProvider;
 use BookStack\Services\ActivityService;
 use BookStack\Services\SettingService;

+use Intervention\Image\ImageManager;

 
 class CustomFacadeProvider extends ServiceProvider
 {
 
 class CustomFacadeProvider extends ServiceProvider
 {


@@ -29,30 +36,30 @@ class CustomFacadeProvider extends ServiceProvider
     {
         $this->app->bind('activity', function() {
             return new ActivityService(
     {
         $this->app->bind('activity', function() {
             return new ActivityService(

-                $this->app->make('BookStack\Activity'),
-                $this->app->make('BookStack\Services\RestrictionService')
+                $this->app->make(Activity::class),
+                $this->app->make(PermissionService::class)

             );
         });
 
         $this->app->bind('views', function() {
             return new ViewService(
             );
         });
 
         $this->app->bind('views', function() {
             return new ViewService(

-                $this->app->make('BookStack\View'),
-                $this->app->make('BookStack\Services\RestrictionService')
+                $this->app->make(View::class),
+                $this->app->make(PermissionService::class)

             );
         });
 
         $this->app->bind('setting', function() {
             return new SettingService(
             );
         });
 
         $this->app->bind('setting', function() {
             return new SettingService(

-                $this->app->make('BookStack\Setting'),
-                $this->app->make('Illuminate\Contracts\Cache\Repository')
+                $this->app->make(Setting::class),
+                $this->app->make(Repository::class)

             );
         });
 
         $this->app->bind('images', function() {
             return new ImageService(
             );
         });
 
         $this->app->bind('images', function() {
             return new ImageService(

-                $this->app->make('Intervention\Image\ImageManager'),
-                $this->app->make('Illuminate\Contracts\Filesystem\Factory'),
-                $this->app->make('Illuminate\Contracts\Cache\Repository')
+                $this->app->make(ImageManager::class),
+                $this->app->make(Factory::class),
+                $this->app->make(Repository::class)

             );
         });
     }
             );
         });
     }