refactor

src/Decorator.php

@@ -186,8 +186,6 @@ private static function contains($haystack, $needle)
 
     private function getParameterNames($reflection): array
     {
-        return array_map(function ($param) {
-            return $param->name;
-        }, $reflection->getParameters());
+        return array_map(fn ($param) => $param->name, $reflection->getParameters());
     }
 }

src/DecoratorServiceProvider.php

@@ -7,17 +7,10 @@
 
 class DecoratorServiceProvider extends ServiceProvider
 {
-    protected $defer = true;
-
     public function register()
     {
         $this->app->singleton(DecoratorFactory::class);
         $this->app->singleton(Decorator::class);
         $this->app->singleton('decorator', Decorator::class);
     }
-
-    public function provides()
-    {
-        return [Decorator::class, 'decorator', DecoratorFactory::class];
-    }
 }

src/Decorators/DecoratorFactory.php

@@ -2,6 +2,9 @@
 
 namespace Imanghafoori\Decorator\Decorators;
 
+use Closure;
+use Illuminate\Container\Container;
+
 class DecoratorFactory
 {
     public static function cache($key, $minutes = 1)
@@ -20,7 +23,7 @@ public static function variadicParam()
             return function (...$param) use ($callable) {
                 $param = is_array($param[0]) ? $param[0] : $param;
 
-                return app()->call($callable, $param);
+                return Container::getInstance()->call($callable, $param);
             };
         };
     }
@@ -31,21 +34,17 @@ public static function variadicParam()
      * @param  $remember
      * @return \Closure
      */
-    private static function getDecoratorFactory($key, $remember, $minutes = null): \Closure
+    private static function getDecoratorFactory($key, $remember, $minutes = null): Closure
     {
         return function ($callable) use ($key, $minutes, $remember) {
             return function (...$params) use ($callable, $key, $minutes, $remember) {
-                $cb = function () use ($callable, $params) {
-                    return \App::call($callable, $params);
-                };
+                $cb = fn () => Container::getInstance()->call($callable, $params);
 
                 if (is_callable($key)) {
                     $key = $key(...$params);
                 }
 
-                return cache()->$remember(...array_filter([$key, $minutes, $cb], function ($el) {
-                    return ! is_null($el);
-                }));
+                return Container::getInstance()->make('cache')->$remember(...array_filter([$key, $minutes, $cb], fn ($el) => ! is_null($el)));
             };
         };
     }

src/IamDecoratable.php

@@ -2,6 +2,8 @@
 
 namespace Imanghafoori\Decorator;
 
+use Illuminate\Container\Container;
+
 trait IamDecoratable
 {
     /**
@@ -63,7 +65,7 @@ public static function __callStatic($method, $args)
         };
 
         $decorators = self::getDecorations($method) + static::$classDecorations;
-        $callback = app(Decorator::class)->decorateWith($callback, $decorators);
+        $callback = Container::getInstance()->make(Decorator::class)->decorateWith($callback, $decorators);
 
         return $callback(...$args);
     }