enable strict_types in generator

(Continuing with pulling the changes from shish/safe into tcm/safe in small hopefully easy-to-review chunks)
thecodingmachine · Dec 2, 2024 · 0aa85c6 · 0aa85c6
1 parent d43727a
commit 0aa85c6
Show file tree

Hide file tree

Showing 31 changed files with 88 additions and 54 deletions.
diff --git a/generator/src/ComposerJsonEditor.php b/generator/src/ComposerJsonEditor.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 

diff --git a/generator/src/DeprecateCommand.php b/generator/src/DeprecateCommand.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 
@@ -23,7 +24,7 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         /** @var string $moduleName */
         $moduleName = $input->getArgument('module');

diff --git a/generator/src/DocPage.php b/generator/src/DocPage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Safe;
 
 use function explode;

diff --git a/generator/src/EmptyTypeException.php b/generator/src/EmptyTypeException.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 

diff --git a/generator/src/FileCreator.php b/generator/src/FileCreator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Safe;
 
 use Rector\Config\RectorConfig;

diff --git a/generator/src/GenerateCommand.php b/generator/src/GenerateCommand.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 
@@ -18,7 +19,7 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
 
         $this->rmGenerated();

diff --git a/generator/src/Method.php b/generator/src/Method.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Safe;
 
 use Safe\PhpStanFunctions\PhpStanFunction;
@@ -225,8 +227,6 @@ public function getModuleName(): string
 
     /**
      * The function is overloaded if at least one parameter is optional with no default value and this parameter is not by reference.
-     *
-     * @return bool
      */
     public function isOverloaded(): bool
     {

diff --git a/generator/src/Parameter.php b/generator/src/Parameter.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace Safe;
 
 use Safe\PhpStanFunctions\PhpStanFunction;
@@ -58,8 +61,6 @@ public function isByReference(): bool
     /**
      * Some parameters can be optional with no default value. In this case, the function is "overloaded" (which is not
      * possible in user-land but possible in core...)
-     *
-     * @return bool
      */
     public function isOptionalWithNoDefault(): bool
     {

diff --git a/generator/src/PhpStanFunctions/PhpStanFunction.php b/generator/src/PhpStanFunctions/PhpStanFunction.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe\PhpStanFunctions;
 
@@ -13,7 +14,7 @@ class PhpStanFunction
     /**
      * @var PhpStanParameter[]
      */
-    private $parameters = [];
+    private array $parameters = [];
 
     /**
      * @param string[] $signature

diff --git a/generator/src/PhpStanFunctions/PhpStanFunctionMapReader.php b/generator/src/PhpStanFunctions/PhpStanFunctionMapReader.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe\PhpStanFunctions;
 

diff --git a/generator/src/PhpStanFunctions/PhpStanParameter.php b/generator/src/PhpStanFunctions/PhpStanParameter.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe\PhpStanFunctions;
 
@@ -29,9 +30,6 @@ public function __construct(string $name, string $type)
         $this->type = new PhpStanType($type, $writeOnly);
     }
 
-    /**
-     * @return string
-     */
     public function getName(): string
     {
         return $this->name;

diff --git a/generator/src/PhpStanFunctions/PhpStanType.php b/generator/src/PhpStanFunctions/PhpStanType.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe\PhpStanFunctions;
 
@@ -17,18 +18,15 @@ class PhpStanType
         '\OCI-Lob',
         '\OCI-Collection',
     ];
-    /**
-     * @var bool
-     */
-    private $nullable;
-    /**
-     * @var bool
-     */
-    private $falsable;
+
+    private bool $nullable;
+
+    private bool $falsable;
+
     /**
      * @var string[]
      */
-    private $types;
+    private array $types;
 
     public function __construct(string $data, bool $writeOnly = false)
     {

diff --git a/generator/src/ScanObjectsCommand.php b/generator/src/ScanObjectsCommand.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 
@@ -17,7 +18,7 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $scanner = new Scanner(__DIR__ . '/../doc/doc-en/en/reference/');
 

diff --git a/generator/src/Scanner.php b/generator/src/Scanner.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Safe;
 
 use function array_merge;
@@ -18,7 +20,7 @@ class Scanner
     /**
      * @var string[]
      */
-    private $ignoredFunctions;
+    private ?array $ignoredFunctions = null;
 
     /**
      * @var string[]

diff --git a/generator/src/ScannerResponse.php b/generator/src/ScannerResponse.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Safe;
 
 class ScannerResponse

diff --git a/generator/src/Type.php b/generator/src/Type.php
@@ -1,15 +1,13 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 
 class Type
 {
     /**
      * Returns true if the type passed in parameter is a class, false if it is scalar or resource
-     *
-     * @param string $type
-     * @return bool
      */
     private static function isClass(string $type): bool
     {

diff --git a/generator/src/WritePhpFunction.php b/generator/src/WritePhpFunction.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Safe;
 
 class WritePhpFunction
@@ -134,7 +136,6 @@ private function generateExceptionCode(string $moduleName, Method $method) : str
 
     /**
      * @param Parameter[] $params
-     * @return string
      */
     private function displayParamsWithType(array $params): string
     {

diff --git a/generator/tests/ComposerJsonEditorTest.php b/generator/tests/ComposerJsonEditorTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 
@@ -8,7 +9,7 @@
 
 class ComposerJsonEditorTest extends TestCase
 {
-    public function testFileListEditionForGeneration()
+    public function testFileListEditionForGeneration(): void
     {
         $oldList = [
             "deprecated/apc.php",
@@ -31,7 +32,7 @@ public function testFileListEditionForGeneration()
     }
 
 
-    public function testFileListEditionForDeprecation()
+    public function testFileListEditionForDeprecation(): void
     {
         $oldList = [
             "generated/apache.php",

diff --git a/generator/tests/DateTimeImmutableTest.php b/generator/tests/DateTimeImmutableTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 
@@ -132,7 +133,7 @@ public function testSub(): void
         $this->assertEquals($datetime->getTimestamp(), $safeDatime->getTimestamp());
     }
 
-    public function testSerialize()
+    public function testSerialize(): void
     {
         $timezone = new \DateTimeZone('Pacific/Chatham');
         $safeDatetime = DateTimeImmutable::createFromFormat('d-m-Y', '20-03-2006', $timezone);

diff --git a/generator/tests/DateTimeTest.php b/generator/tests/DateTimeTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 

diff --git a/generator/tests/DeprecateCommandTest.php b/generator/tests/DeprecateCommandTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Safe;
 
@@ -8,7 +9,7 @@
 
 class DeprecateCommandTest extends TestCase
 {
-    public function testExceptionName()
+    public function testExceptionName(): void
     {
         $this->assertEquals('Exceptions/ApcException.php', DeprecateCommand::getExceptionFilePath('apc'));
     }

diff --git a/generator/tests/DocPageTest.php b/generator/tests/DocPageTest.php
@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Safe;
 
 use PHPUnit\Framework\TestCase;
 
 class DocPageTest extends TestCase
 {
-    public function testDetectFalsyFunction()
+    public function testDetectFalsyFunction(): void
     {
         $pregMatch = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/pcre/functions/preg-match.xml');
         $implode = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/strings/functions/implode.xml');
@@ -35,14 +37,14 @@ public function testDetectFalsyFunction()
         $this->assertTrue($fopen->detectFalsyFunction());
     }
 
-    public function testDetectNullsyFunction()
+    public function testDetectNullsyFunction(): void
     {
         $implode = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/strings/functions/implode.xml');
 
         $this->assertFalse($implode->detectNullsyFunction());
     }
 
-    public function testDetectEmptyFunction()
+    public function testDetectEmptyFunction(): void
     {
         $pgHost = new DocPage(__DIR__ . '/../doc/doc-en/en/reference/pgsql/functions/pg-host.xml');