fix: add missing PHPDoc types for params and properties (PHPStan baseline)

system/CLI/CLI.php

@@ -737,7 +737,7 @@ public static function getWidth(int $default = 80): int
             static::generateDimensions();
         }
 
-        return static::$width ?: $default;
+        return static::$width ? static::$width : $default;
     }
 
     /**
@@ -749,7 +749,7 @@ public static function getHeight(int $default = 32): int
             static::generateDimensions();
         }
 
-        return static::$height ?: $default;
+        return static::$height ? static::$height : $default;
     }
 
     /**

system/Database/BasePreparedQuery.php

@@ -110,6 +110,8 @@ abstract public function _prepare(string $sql, array $options = []);
      * Takes a new set of data and runs it against the currently
      * prepared query. Upon success, will return a Results object.
      *
+     * @param mixed ...$data
+     *
      * @return bool|ResultInterface<TConnection, TResult>
      *
      * @throws DatabaseException

system/Database/OCI8/Connection.php

@@ -53,6 +53,9 @@ class Connection extends BaseConnection
         'rownum',
     ];
 
+    /**
+     * @var list<string>
+     */
     protected $validDSNs = [
         // TNS
         'tns' => '/^\(DESCRIPTION=(\(.+\)){2,}\)$/',
@@ -80,6 +83,9 @@ class Connection extends BaseConnection
      * Used by storedProcedure() to prevent execute() from
      * re-setting the statement ID.
      */
+    /**
+     * @var bool
+     */
     protected $resetStmtId = true;
 
     /**

system/Database/Postgre/Connection.php

@@ -51,9 +51,24 @@ class Connection extends BaseConnection
      */
     public $escapeChar = '"';
 
+    /**
+     * @var int
+     */
     protected $connect_timeout;
+
+    /**
+     * @var string
+     */
     protected $options;
+
+    /**
+     * @var string
+     */
     protected $sslmode;
+
+    /**
+     * @var string
+     */
     protected $service;
 
     /**

system/Database/PreparedQueryInterface.php

@@ -28,6 +28,9 @@ interface PreparedQueryInterface
      *
      * @return bool|ResultInterface<TConnection, TResult>
      */
+    /**
+     * @param mixed ...$data
+     */
     public function execute(...$data);
 
     /**

system/HTTP/Files/UploadedFile.php

@@ -65,10 +65,8 @@ class UploadedFile extends File implements UploadedFileInterface
     /**
      * The error constant of the upload
      * (one of PHP's UPLOADERRXXX constants)
-     *
-     * @var int
      */
-    protected $error;
+    protected ?int $error = null;
 
     /**
      * Whether the file has been moved already or not.

system/HTTP/Message.php

@@ -27,7 +27,7 @@ class Message implements MessageInterface
     /**
      * Protocol version
      *
-     * @var string
+     * @var string|null
      */
     protected $protocolVersion;
 

system/HTTP/URI.php

@@ -106,10 +106,8 @@ class URI implements Stringable
 
     /**
      * The name of any fragment.
-     *
-     * @var string
      */
-    protected $fragment = '';
+    protected ?string $fragment = null;
 
     /**
      * The query string.

system/Pager/Pager.php

@@ -216,7 +216,7 @@ public function getCurrentPage(string $group = 'default'): int
     {
         $this->ensureGroup($group);
 
-        return $this->groups[$group]['currentPage'] ?: 1;
+        return $this->groups[$group]['currentPage'] ? $this->groups[$group]['currentPage'] : 1;
     }
 
     /**

system/Router/AutoRouter.php

@@ -86,7 +86,8 @@ public function getRoute(string $uri, string $httpVerb): array
         // If it doesn't, no biggie - the default method name
         // has already been set.
         if ($segments !== []) {
-            $this->method = array_shift($segments) ?: $this->method;
+            $method       = array_shift($segments);
+            $this->method = $method ?: $this->method;
         }
 
         // Prevent access to initController method

system/Test/FilterTestTrait.php

@@ -44,14 +44,14 @@ trait FilterTestTrait
     /**
      * The active IncomingRequest or CLIRequest
      *
-     * @var RequestInterface
+     * @var RequestInterface|null
      */
     protected $request;
 
     /**
      * The active Response instance
      *
-     * @var ResponseInterface
+     * @var ResponseInterface|null
      */
     protected $response;
 

system/Throttle/Throttler.php

@@ -54,10 +54,8 @@ class Throttler implements ThrottlerInterface
 
     /**
      * Timestamp to use (during testing)
-     *
-     * @var int
      */
-    protected $testTime;
+    protected ?int $testTime = null;
 
     /**
      * Constructor.

system/Validation/Validation.php

@@ -985,7 +985,8 @@ protected function splitRules(string $rules): array
             ) {
                 // the pipe is inside the brackets causing the closing bracket to
                 // not be included. so, we adjust the rule to include that portion.
-                $pos  = strpos($string, '|', $cursor + strlen($rule) + 1) ?: $length;
+                $pos  = strpos($string, '|', $cursor + strlen($rule) + 1);
+                $pos  = ($pos === false) ? $length : $pos;
                 $rule = substr($string, $cursor, $pos - $cursor);
             }
 

system/View/View.php

@@ -239,7 +239,9 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
             ob_start();
             include $this->renderVars['file'];
 
-            return ob_get_clean() ?: '';
+            $result = ob_get_clean();
+
+            return $result ? $result : '';
         })();
 
         // Get back current vars
@@ -331,7 +333,9 @@ public function renderString(string $view, ?array $options = null, ?bool $saveDa
             ob_start();
             eval('?>' . $view);
 
-            return ob_get_clean() ?: '';
+            $result = ob_get_clean();
+
+            return $result ? $result : '';
         })($view);
 
         $this->logPerformance($start, microtime(true), $this->excerpt($view));

tests/system/Commands/Generators/CellGeneratorTest.php

@@ -45,7 +45,9 @@ protected function getFileContents(string $filepath): string
             return '';
         }
 
-        return file_get_contents($filepath) ?: '';
+        $contents = file_get_contents($filepath);
+
+        return $contents ? $contents : '';
     }
 
     public function testGenerateCell(): void

tests/system/Commands/Generators/CommandGeneratorTest.php

@@ -51,7 +51,9 @@ protected function getFileContents(string $filepath): string
             return '';
         }
 
-        return file_get_contents($filepath) ?: '';
+        $contents = file_get_contents($filepath);
+
+        return $contents ? $contents : '';
     }
 
     public function testGenerateCommand(): void

tests/system/Commands/Generators/ControllerGeneratorTest.php

@@ -40,7 +40,9 @@ protected function getFileContents(string $filepath): string
             return '';
         }
 
-        return file_get_contents($filepath) ?: '';
+        $contents = file_get_contents($filepath);
+
+        return $contents ? $contents : '';
     }
 
     public function testGenerateController(): void

tests/system/Commands/Generators/ModelGeneratorTest.php

@@ -43,7 +43,9 @@ private function getFileContent(string $filepath): string
             return '';
         }
 
-        return file_get_contents($filepath) ?: '';
+        $contents = file_get_contents($filepath);
+
+        return $contents ? $contents : '';
     }
 
     public function testGenerateModel(): void

tests/system/Commands/Generators/ScaffoldGeneratorTest.php

@@ -73,7 +73,9 @@ protected function getFileContents(string $filepath): string
             return '';
         }
 
-        return file_get_contents($filepath) ?: '';
+        $contents = file_get_contents($filepath);
+
+        return $contents ? $contents : '';
     }
 
     public function testCreateComponentProducesManyFiles(): void

tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/Dash_folder/Dash_controller.php

@@ -17,11 +17,18 @@
 
 class Dash_controller extends Controller
 {
+    /**
+     * @param string $p1
+     */
     public function getSomemethod($p1 = ''): void
     {
     }
 
-    public function getDash_method($p1, $p2 = ''): void
+    /**
+     * @param string|null $p1
+     * @param string|null $p2
+     */
+    public function getDash_method($p1, $p2 = null)
     {
     }
 }

tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/SubDir/BlogController.php

@@ -21,7 +21,10 @@ public function getIndex(): void
     {
     }
 
-    public function getSomeMethod($first = ''): void
+    /**
+     * @param string|null $first
+     */
+    public function getSomeMethod($first = null)
     {
     }
 }

tests/system/Config/FactoriesTest.php

@@ -41,6 +41,9 @@ protected function setUp(): void
         Factories::reset();
     }
 
+    /**
+     * @param scalar ...$params
+     */
     protected function getFactoriesStaticProperty(...$params): mixed
     {
         // First parameter is the actual property
@@ -87,6 +90,9 @@ public function testUsesConfigOptions(): void
     {
         // Simulate having a $widgets property in App\Config\Factory
         $config = new class () extends Factory {
+            /**
+             * @var array<string, string>
+             */
             public $widgets = ['bar' => 'bam'];
         };
         Factories::injectMock('config', Factory::class, $config);

tests/system/Config/fixtures/RegistrarConfig.php

@@ -15,7 +15,14 @@
 
 class RegistrarConfig extends BaseConfig
 {
+    /**
+     * @var string
+     */
     public $foo = 'bar';
+
+    /**
+     * @var array
+     */
     public $bar = [
         'baz',
     ];

tests/system/Config/fixtures/SimpleConfig.php

@@ -17,11 +17,21 @@ class SimpleConfig extends BaseConfig
 {
     public $QZERO;
     public $QZEROSTR;
+
+    /**
+     * @var string
+     */
     public $QEMPTYSTR;
+
     public $QFALSE;
     public $first  = 'foo';
     public $second = 'bar';
+
+    /**
+     * @var string
+     */
     public $FOO;
+
     public $onedeep;
     public $default = [
         'name' => null,

tests/system/Database/Live/ConnectTest.php

@@ -28,8 +28,19 @@ final class ConnectTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
+    /**
+     * @var array<string, mixed>
+     */
     private $group1;
+
+    /**
+     * @var array<string, mixed>
+     */
     private $group2;
+
+    /**
+     * @var array<string, mixed>
+     */
     private $tests;
 
     protected function setUp(): void

tests/system/Database/Live/GetTest.php

@@ -254,12 +254,39 @@ public function testGetRowWithReturnType(): void
     public function testGetRowWithCustomReturnType(): void
     {
         $testClass = new class () {
+            /**
+             * @var int|null
+             */
             public $id;
+
+            /**
+             * @var string|null
+             */
             public $name;
+
+            /**
+             * @var string|null
+             */
             public $email;
+
+            /**
+             * @var string|null
+             */
             public $country;
+
+            /**
+             * @var string|null
+             */
             public $created_at;
+
+            /**
+             * @var string|null
+             */
             public $updated_at;
+
+            /**
+             * @var string|null
+             */
             public $deleted_at;
         };