Fix static analysis

tattersoftware · Jul 31, 2022 · cb8a5b8 · cb8a5b8
1 parent bb643a9
commit cb8a5b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/psalm_autoload.php b/psalm_autoload.php
@@ -7,6 +7,9 @@
 $helperDirs = [
     'src/Helpers',
     'vendor/codeigniter4/framework/system/Helpers',
+    'vendor/tatter/alerts/src/Helpers',
+    'vendor/tatter/imposter/src/Helpers',
+    'vendor/tatter/preferences/src/Helpers',
 ];
 
 foreach ($helperDirs as $dir) {

diff --git a/src/Config/Routes.php b/src/Config/Routes.php
@@ -5,6 +5,9 @@
 if (empty(config('Files')->routeFiles)) {
     return;
 }
+
+$routes ??= service('routes');
+
 $options = [
     'filter'    => 'assets:\Tatter\Files\Bundles\FilesBundle',
     'namespace' => '\Tatter\Files\Controllers',

diff --git a/src/Controllers/Files.php b/src/Controllers/Files.php
@@ -58,7 +58,7 @@ class Files extends Controller
     public function __construct(?FilesConfig $config = null, ?FileModel $model = null)
     {
         $this->config = $config ?? config('Files');
-        $this->model  = $model ?? model(FileModel::class); // @phpstan-ignore-line
+        $this->model  = $model ?? model(FileModel::class);
     }
 
     //--------------------------------------------------------------------

diff --git a/tests/_support/TestCase.php b/tests/_support/TestCase.php
@@ -67,7 +67,7 @@ protected function setUp(): void
         }
 
         // Set up the model
-        $this->model = model(FileModel::class); // @phpstan-ignore-line
+        $this->model = model(FileModel::class);
     }
 
     protected function tearDown(): void