Refactor bootstrappers.

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Mar 3, 2019 · 8e88331 · 8e88331
1 parent 0f3aac9
commit 8e88331
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/src/Bootstrap/LoadExpresso.php b/src/Bootstrap/LoadExpresso.php
@@ -29,10 +29,10 @@ public function bootstrap(Application $app)
      */
     protected function addBladeExtensions(Application $app)
     {
-        $blade = $app->make('view')->getEngineResolver()->resolve('blade')->getCompiler();
+        $blade = $app->make('blade.compiler');
 
         $blade->directive('decorator', function ($expression) {
-            return "<?php echo app('orchestra.decorator')->render({$expression}); ?>";
+            return "<?php echo \app('orchestra.decorator')->render({$expression}); ?>";
         });
 
         $blade->directive('placeholder', function ($expression) {
@@ -43,15 +43,15 @@ protected function addBladeExtensions(Application $app)
         });
 
         $blade->directive('get_meta', function ($expression) {
-            return "<?php echo get_meta({$expression}); ?>";
+            return "<?php echo \get_meta({$expression}); ?>";
         });
 
         $blade->directive('set_meta', function ($expression) {
-            return "<?php set_meta({$expression}); ?>";
+            return "<?php \set_meta({$expression}); ?>";
         });
 
         $blade->directive('title', function ($expression) {
-            return "<?php echo app('html')->title({$expression}); ?>";
+            return "<?php echo \app('html')->title({$expression}); ?>";
         });
 
         $blade->extend(function ($view) {

diff --git a/src/Bootstrap/LoadUserMetaData.php b/src/Bootstrap/LoadUserMetaData.php
@@ -18,9 +18,9 @@ class LoadUserMetaData
     public function bootstrap(Application $app)
     {
         $app->make('orchestra.memory')->extend('user', function ($app, $name) {
-            $handler = new UserRepository($name, [], $app);
-
-            return new UserProvider($handler);
+            return new UserProvider(
+                new UserRepository($name, [], $app)
+            );
         });
     }
 }
diff --git a/src/Bootstrap/NotifyIfSafeMode.php b/src/Bootstrap/NotifyIfSafeMode.php
@@ -2,6 +2,7 @@
 
 namespace Orchestra\Foundation\Bootstrap;
 
+use Orchestra\Support\Facades\Messages;
 use Orchestra\Contracts\Messages\MessageBag;
 use Illuminate\Contracts\Foundation\Application;
 
@@ -17,7 +18,7 @@ class NotifyIfSafeMode
     public function bootstrap(Application $app)
     {
         if ($app->make('orchestra.extension.status')->is('safe')) {
-            $app->make('orchestra.messages')->extend(function (MessageBag $messages) {
+            Messages::extend(function (MessageBag $messages) {
                 $messages->add('info', \trans('orchestra/foundation::response.safe-mode'));
             });
         }

diff --git a/src/Bootstrap/UserAccessPolicy.php b/src/Bootstrap/UserAccessPolicy.php
@@ -50,6 +50,6 @@ protected function attachAccessPolicyEvents(Application $app)
 
         // Orchestra Platform should be able to determine admin and member roles
         // dynamically.
-        Role::setDefaultRoles($app->make('config')->get('orchestra/foundation::roles'));
+        Role::setDefaultRoles(\config('orchestra/foundation::roles'));
     }
 }
diff --git a/tests/Feature/Bootstrap/LoadExpressoTest.php b/tests/Feature/Bootstrap/LoadExpressoTest.php
@@ -15,7 +15,7 @@ public function it_can_register_decorator()
         $compiler = $this->app['view']->getEngineResolver()->resolve('blade')->getCompiler();
 
         $this->assertEquals(
-            '<?php echo app(\'orchestra.decorator\')->render("foo"); ?>', $compiler->compileString('@decorator("foo")')
+            '<?php echo \app(\'orchestra.decorator\')->render("foo"); ?>', $compiler->compileString('@decorator("foo")')
         );
     }