Merge pull request #2203 from elcreator/fix-phpstan-findings

[FIX] phpstan findings

Author: Seiger

core/includes/aliases.inc.php

@@ -38,4 +38,5 @@ class Helper extends \EvolutionCMS\Facades\HelperProcessor {}
 class UserManager extends \EvolutionCMS\UserManager\Facades\UserManager {}
 class DocumentManager extends \EvolutionCMS\DocumentManager\Facades\DocumentManager {}
 class Tailwind extends \EvolutionCMS\Facades\Tailwind {}
+class DLTemplate extends \EvolutionCMS\Parser {}
 }

core/src/AbstractLaravel.php

@@ -14,6 +14,7 @@
 use Symfony\Component\Finder\Finder;
 use Illuminate\Log\LogServiceProvider;
 
+/** @phpstan-consistent-constructor */
 abstract class AbstractLaravel extends Container implements ApplicationContract
 {
     /**

core/src/AliasLoader.php

@@ -30,10 +30,10 @@ class AliasLoader
     /**
      * Create a new AliasLoader instance.
      *
-     * @param  array  $aliases
+     * @param array $aliases
      * @return void
      */
-    private function __construct($aliases)
+    final private function __construct(array $aliases)
     {
         $this->aliases = $aliases;
     }

core/src/Console/Packages/RunPackageConsoleCommand.php

@@ -26,6 +26,13 @@ class RunPackageConsoleCommand extends Command
      */
     protected $composer = EVO_CORE_PATH . 'custom/composer.json';
 
+    /**
+     * The path to the package directory
+     *
+     * @var string
+     */
+    protected $packagePath;
+
     /**
      * Execute the console command.
      *

core/src/Core.php

@@ -185,7 +185,9 @@ public function setDebug($flag)
     {
         parent::setDebug($flag);
         $driver = $this->getDriver();
+        /* @phpstan-ignore-next-line class.notFound deprecated */
         if ($driver instanceof Drivers\IlluminateDriver) {
+            /* @phpstan-ignore-next-line method.notFound deprecated */
             if ($this->isDebug()) {
                 $driver->getConnect()->enableQueryLog();
             } else {

core/src/Database.php

@@ -35,8 +35,8 @@ public function phpThumb($input = '', $options = '', $webp = true)
         $newFolderAccessMode = empty($new) ? 0777 : octdec($newFolderAccessMode);
 
         $defaultCacheFolder = 'assets/cache/';
-        $cacheFolder = isset($cacheFolder) ? $cacheFolder : $defaultCacheFolder . 'images';
-        $phpThumbNoImagePath = isset($phpThumbNoImagePath) ? $phpThumbNoImagePath : 'assets/images/';
+        $cacheFolder = $defaultCacheFolder . 'images';
+        $phpThumbNoImagePath = 'assets/images/';
 
         /**
          * @see: https://github.com/kalessil/phpinspectionsea/blob/master/docs/probable-bugs.md#mkdir-race-condition
@@ -51,7 +51,7 @@ public function phpThumb($input = '', $options = '', $webp = true)
         }
 
         if (empty($input) || !file_exists(MODX_BASE_PATH . $input)) {
-            $input = isset($noImage) ? $noImage : $phpThumbNoImagePath . 'noimage.png';
+            $input = $phpThumbNoImagePath . 'noimage.png';
         }
 
         /**

core/src/HelperProcessor.php

@@ -170,6 +170,10 @@ class SiteContent extends Eloquent\Model
         'alias_visible' => 'int',
     ];
 
+    /*
+     * @phpstan-consistent-constructor
+     * @param  array<string, mixed>  $attributes
+     */
     public function __construct(array $attributes = [])
     {
         $position = $this->getPositionColumn();

core/src/Models/SiteContent.php

@@ -3,6 +3,10 @@
 use EvolutionCMS\ServiceProvider;
 use Helpers\FS;
 
+/**
+ * @deprecated
+ * @TODO: remove in 3.7
+ */
 class FsServiceProvider extends ServiceProvider
 {
     /**
@@ -13,6 +17,7 @@ class FsServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->bind('FS', function ($modx) {
+            /* @phpstan-ignore-next-line class.notFound */
             return FS::getInstance();
         });
 

core/src/Providers/FsServiceProvider.php

@@ -3,6 +3,10 @@
 use EvolutionCMS\ServiceProvider;
 use modResource;
 
+/**
+ * @deprecated
+ * @TODO: remove in 3.7
+ */
 class ModResourceServiceProvider extends ServiceProvider
 {
     /**
@@ -13,6 +17,7 @@ class ModResourceServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->bind('modResource', function ($modx) {
+            /* @phpstan-ignore-next-line class.notFound */
             return new modResource($modx);
         });