Fix broken generation

thecodingmachine · Mar 17, 2024 · 8e292e7 · 8e292e7
1 parent 3a6e43b
commit 8e292e7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/generator/composer.json b/generator/composer.json
@@ -19,7 +19,7 @@
     "thecodingmachine/phpstan-strict-rules": "^1.0",
     "squizlabs/php_codesniffer": "^3.2",
     "php-coveralls/php-coveralls": "^2.1",
-    "phpstan/phpstan": "^1.5"
+    "phpstan/phpstan": "^1.10.40"
   },
   "scripts": {
     "test": "vendor/bin/phpunit",

diff --git a/generator/composer.lock b/generator/composer.lock
diff --git a/generator/src/PhpStanFunctions/PhpStanFunction.php b/generator/src/PhpStanFunctions/PhpStanFunction.php
@@ -23,7 +23,7 @@ public function __construct(array $signature)
         if (count($signature) < 1) {
             throw new \RuntimeException('Invalid signoatures');
         }
-        $this->returnType = new PhpStanType(\array_shift($signature));
+        $this->returnType = new PhpStanType(\array_shift($signature), false, true);
         foreach ($signature as $name => $type) {
             $param = new PhpStanParameter($name, $type);
             $this->parameters[$param->getName()] = $param;

diff --git a/generator/src/PhpStanFunctions/PhpStanParameter.php b/generator/src/PhpStanFunctions/PhpStanParameter.php
@@ -26,7 +26,7 @@ public function __construct(string $name, string $type)
         $name = trim($name, '=.&');
 
         $this->name = $name;
-        $this->type = new PhpStanType($type, $writeOnly);
+        $this->type = new PhpStanType($type, $writeOnly, false);
     }
 
     /**

diff --git a/generator/src/PhpStanFunctions/PhpStanType.php b/generator/src/PhpStanFunctions/PhpStanType.php
@@ -30,7 +30,7 @@ class PhpStanType
      */
     private $types;
 
-    public function __construct(string $data, bool $writeOnly = false)
+    public function __construct(string $data, bool $writeOnly = false, bool $isReturnType = false)
     {
         //weird case: null|false => null
         if ($data === 'null|false') {
@@ -57,6 +57,9 @@ public function __construct(string $data, bool $writeOnly = false)
         if (($falsablePosition = \array_search('false', $returnTypes)) !== false) {
             $falsable = true;
             \array_splice($returnTypes, (int) $falsablePosition, 1);
+            if ($isReturnType === false) {
+                $returnTypes[] = 'bool';
+            }
         }
         /** @var int $count */
         $count = \count($returnTypes);
@@ -76,10 +79,14 @@ public function __construct(string $data, bool $writeOnly = false)
             //here we deal with some weird phpstan typings
             if ($returnType === 'non-empty-string') {
                 $returnType = 'string';
+            } elseif ($returnType === 'non-falsy-string') {
+                $returnType = 'string';
             } elseif ($returnType === 'positive-int') {
                 $returnType = 'int';
             } elseif (is_numeric($returnType)) {
                 $returnType = 'int';
+            } elseif (\strpos($returnType, 'int<') !== false) {
+                $returnType = 'int';
             }
             if (\strpos($returnType, 'list<') !== false) {
                 $returnType = \str_replace('list', 'array', $returnType);