add phpstan, fix errors

Author: arrilot

.gitignore

@@ -2,5 +2,7 @@
 composer.phar
 composer.lock
 .DS_Store
+build
+phpstan.neon
 .phpunit.result.cache
 /.idea

composer.json

@@ -17,10 +17,12 @@
         "illuminate/view": ">=8",
         "illuminate/container": ">=8",
         "illuminate/console": ">=8",
-        "illuminate/cache": ">=8"
+        "illuminate/cache": ">=8",
+        "illuminate/routing": ">=8"
     },
     "require-dev": {
-        "phpunit/phpunit": "~8.0"
+        "phpunit/phpunit": "~8.0",
+        "nunomaduro/larastan": "^2.6"
     },
     "autoload": {
         "psr-4": {
@@ -44,6 +46,7 @@
         }
     },
     "scripts": {
+        "analyse": "vendor/bin/phpstan analyse",
         "test": "phpunit"
     }
 }

phpstan-baseline.neon

@@ -0,0 +1,9 @@
+includes:
+    - phpstan-baseline.neon
+
+parameters:
+    level: 4
+    paths:
+        - src
+    tmpDir: build/phpstan
+    checkMissingIterableValueType: false

phpstan.neon.dist

@@ -30,37 +30,15 @@ class WidgetMakeCommand extends GeneratorCommand
      */
     protected $type = 'Widget';
 
-    /**
-     * Execute the console command for Laravel >= 5.5.
-     *
-     * @return void
-     */
     public function handle()
     {
-        // hack for Laravel < 5.5
-        if (is_callable('parent::handle')) {
-            parent::handle();
-        } else {
-            parent::fire();
-        }
+        parent::handle();
 
         if (!$this->option('plain')) {
             $this->createView();
         }
-    }
 
-    /**
-     * Execute the console command for Laravel < 5.5.
-     *
-     * @return void
-     */
-    public function fire()
-    {
-        parent::fire();
-
-        if (!$this->option('plain')) {
-            $this->createView();
-        }
+        return null;
     }
 
     /**
@@ -160,7 +138,7 @@ protected function replaceView($stub)
      */
     protected function getDefaultNamespace($rootNamespace)
     {
-        $namespace = config('laravel-widgets.default_namespace', $rootNamespace.'\Widgets');
+        $namespace = $this->laravel->make('config')->get('laravel-widgets.default_namespace', $rootNamespace.'\Widgets');
 
         if (!Str::startsWith($namespace, $rootNamespace)) {
             throw new RuntimeException("You can not use the generator if the default namespace ($namespace) does not start with application namespace ($rootNamespace)");
@@ -208,7 +186,7 @@ protected function createView()
      */
     protected function getViewPath()
     {
-        return base_path('resources/views').'/widgets/'.$this->makeViewName().'.blade.php';
+        return $this->laravel->basePath('resources/views').'/widgets/'.$this->makeViewName().'.blade.php';
     }
 
     /**

src/Console/WidgetMakeCommand.php

@@ -12,7 +12,7 @@ interface ApplicationWrapperContract
      * @param $key
      * @param $minutes
      * @param $tags
-     * @param callable $callback
+     * @param Closure $callback
      *
      * @return mixed
      */

src/Contracts/ApplicationWrapperContract.php

@@ -3,12 +3,20 @@
 namespace Arrilot\Widgets\Controllers;
 
 use Arrilot\Widgets\Factories\AbstractWidgetFactory;
+use Arrilot\Widgets\Factories\WidgetFactory;
 use Arrilot\Widgets\WidgetId;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
 
 class WidgetController extends BaseController
 {
+    private WidgetFactory $factory;
+
+    public function __construct(WidgetFactory $factory)
+    {
+        $this->factory = $factory;
+    }
+
     /**
      * The action to show widget output via ajax.
      *
@@ -20,19 +28,18 @@ public function showWidget(Request $request)
     {
         $this->prepareGlobals($request);
 
-        $factory = app()->make('arrilot.widget');
         $widgetName = $request->input('name', '');
 
         $widgetParams = $request->input('skip_encryption', '')
             ? $request->input('params', '')
-            : $factory->decryptWidgetParams($request->input('params', ''));
+            : $this->factory->decryptWidgetParams($request->input('params', ''));
 
         $decodedParams = json_decode($widgetParams, true);
 
         $params = $decodedParams ?: [];
         array_unshift($params, $widgetName);
 
-        return call_user_func_array([$factory, 'run'], $params);
+        return call_user_func_array([$this->factory, 'run'], $params);
     }
 
     /**

src/Controllers/WidgetController.php

@@ -18,6 +18,6 @@ protected static function getFacadeAccessor()
      */
     public static function group($name)
     {
-        return app('arrilot.widget-group-collection')->group($name);
+        return static::$app->make('arrilot.widget-group-collection')->group($name);
     }
 }

src/Facade.php

@@ -17,7 +17,7 @@ abstract class AbstractWidgetFactory
     /**
      * Widget object to work with.
      *
-     * @var AbstractWidget
+     * @var AbstractWidget|null
      */
     protected $widget;
 

src/Factories/AbstractWidgetFactory.php

@@ -27,7 +27,7 @@ public function __construct()
      * @param $key
      * @param $minutes
      * @param $tags
-     * @param callable $callback
+     * @param Closure $callback
      *
      * @return mixed
      */