use phpstan 2.X

thecodingmachine · Feb 9, 2025 · 94d8125 · 94d8125
1 parent 6214ed0
commit 94d8125
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 20 deletions.
diff --git a/generated/8.1/mbstring.php b/generated/8.1/mbstring.php
diff --git a/generated/8.2/mbstring.php b/generated/8.2/mbstring.php
diff --git a/generated/8.3/mbstring.php b/generated/8.3/mbstring.php
diff --git a/generated/8.4/mbstring.php b/generated/8.4/mbstring.php
diff --git a/generated/8.5/mbstring.php b/generated/8.5/mbstring.php
diff --git a/generator/composer.json b/generator/composer.json
@@ -11,7 +11,7 @@
     "php": "^8.3",
     "ext-simplexml": "*",
     "ext-json": "*",
-    "phpstan/phpstan": "^1",
+    "phpstan/phpstan": "^2",
     "symfony/console": "^7",
     "symfony/process": "^7",
     "symfony/finder": "^7"

diff --git a/generator/composer.lock b/generator/composer.lock
diff --git a/generator/src/PhpStanFunctions/PhpStanType.php b/generator/src/PhpStanFunctions/PhpStanType.php
@@ -73,6 +73,7 @@ public function __construct(string|\SimpleXMLElement $data, bool $writeOnly = fa
             $returnType = '';
         }
         foreach ($returnTypes as &$returnType) {
+            $returnType = \trim($returnType);
             if (str_contains($returnType, '?')) {
                 $nullable = true;
                 $returnType = \str_replace('?', '', $returnType);
@@ -87,19 +88,20 @@ public function __construct(string|\SimpleXMLElement $data, bool $writeOnly = fa
                 $returnType = 'string';
             }
 
-            if ($returnType === 'positive-int') {
-                $returnType = 'int';
-            } elseif (is_numeric($returnType)) {
+            if ($returnType === 'positive-int' ||
+                str_contains($returnType, 'int<') ||
+                str_contains($returnType, 'int-mask<') ||
+                is_numeric($returnType) ||
+                # constants like FTP_ASCII, FTP_BINARY
+                (defined($returnType) && is_numeric(constant($returnType)))
+            ) {
                 $returnType = 'int';
             }
+
             if (str_contains($returnType, 'list<')) {
                 $returnType = \str_replace('list', 'array', $returnType);
             }
 
-            if (str_contains($returnType, 'int<')) {
-                $returnType = 'int';
-            }
-
             $returnType = Type::toRootNamespace($returnType);
         }
         sort($returnTypes);