Merge branch 'master' into staabm-patch-1

thecodingmachine · Dec 3, 2024 · 8805376 · 8805376
2 parents 0d9e469 + c046795
commit 8805376
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/generated/stream.php b/generated/stream.php
@@ -20,14 +20,13 @@
  * @throws StreamException
  *
  */
-function stream_context_set_options($context, array $options): true
+function stream_context_set_options($context, array $options): void
 {
     error_clear_last();
     $safeResult = \stream_context_set_options($context, $options);
     if ($safeResult === false) {
         throw StreamException::createFromPhpError();
     }
-    return $safeResult;
 }
 
 

diff --git a/generator/src/PhpStanFunctions/PhpStanType.php b/generator/src/PhpStanFunctions/PhpStanType.php
@@ -148,6 +148,8 @@ public function getSignatureType(?int $errorType = null): string
                 $type = ''; // resource cant be typehinted
             } elseif (\strpos($type, 'null') !== false) {
                 $type = ''; // null is a real typehint
+            } elseif (\strpos($type, 'true') !== false) {
+                $type = 'bool'; // php8.1 doesn't support "true" as a typehint
             }
         }