Merge branch 'main' into rethrow-from-suspension

# Conflicts:
#	composer.json

composer.json

@@ -36,7 +36,7 @@
         "ext-json": "*",
         "phpunit/phpunit": "^9",
         "jetbrains/phpstorm-stubs": "^2019.3",
-        "psalm/phar": "^5"
+        "psalm/phar": "^5.15"
     },
     "autoload": {
         "psr-4": {

psalm.xml

@@ -60,6 +60,12 @@
                 <file name="src/EventLoop/Driver/UvDriver.php"/>
             </errorLevel>
         </PossiblyInvalidArgument>
+
+        <UnsupportedPropertyReferenceUsage>
+            <errorLevel type="suppress">
+                <directory name="src"/>
+            </errorLevel>
+        </UnsupportedPropertyReferenceUsage>
     </issueHandlers>
 
     <stubs>

src/EventLoop/Driver/StreamSelectDriver.php

@@ -304,7 +304,7 @@ private function selectStreams(array $read, array $write, float $timeout): void
         }
 
         if ($timeout > 0) { // Sleep until next timer expires.
-            /** @psalm-var positive-int $timeout */
+            /** @psalm-suppress ArgumentTypeCoercion $timeout is positive here. */
             \usleep((int) ($timeout * 1_000_000));
         }
     }

src/EventLoop/Driver/TracingDriver.php

@@ -249,8 +249,15 @@ private function getCancelTrace(string $callbackId): string
     /**
      * Formats a stacktrace obtained via `debug_backtrace()`.
      *
-     * @param array<array{file?: string, line: int, type?: string, class?: class-string, function: string}> $trace
-     *     Output of `debug_backtrace()`.
+     * @param list<array{
+     *     args?: list<mixed>,
+     *     class?: class-string,
+     *     file?: string,
+     *     function: string,
+     *     line?: int,
+     *     object?: object,
+     *     type?: string
+     * }> $trace Output of `debug_backtrace()`.
      *
      * @return string Formatted stacktrace.
      */
@@ -259,7 +266,7 @@ private function formatStacktrace(array $trace): string
         return \implode("\n", \array_map(static function ($e, $i) {
             $line = "#{$i} ";
 
-            if (isset($e["file"])) {
+            if (isset($e["file"], $e['line'])) {
                 $line .= "{$e['file']}:{$e['line']} ";
             }
 

src/EventLoop/Internal/AbstractDriver.php

@@ -534,6 +534,7 @@ private function createLoopFiber(): void
             // Invoke microtasks if we have some
             $this->invokeCallbacks();
 
+            /** @psalm-suppress RedundantCondition $this->stopped may be changed by $this->invokeCallbacks(). */
             while (!$this->stopped) {
                 if ($this->interrupt) {
                     $this->invokeInterrupt();