Update to psalm 6

Author: kelunik

composer.json

@@ -41,7 +41,7 @@
         "phpunit/phpunit": "^9",
         "amphp/phpunit-util": "^3",
         "amphp/php-cs-fixer-config": "^2",
-        "psalm/phar": "^5.18"
+        "psalm/phar": "6.16.1"
     },
     "autoload": {
         "psr-4": {

examples/shared-memory-parcel.php

@@ -14,7 +14,13 @@
 // Create a parcel that then can be accessed in any number of child processes or threads.
 $parcel = SharedMemoryParcel::create($mutex, 1);
 
-printf("Parent %d created semaphore %s and parcel: %s\n", getmypid(), $semaphore->getKey(), $parcel->getKey());
+$pid = getmypid();
+if ($pid === false) {
+    print "Unable to determine PID";
+    exit(1);
+}
+
+printf("Parent %d created semaphore %s and parcel: %s\n", $pid, $semaphore->getKey(), $parcel->getKey());
 
 // Send semaphore and parcel key to child process as command argument.
 $context = contextFactory()->start([

examples/worker/FetchTask.php

@@ -20,6 +20,11 @@ public function __construct(string $url)
 
     public function run(Channel $channel, Cancellation $cancellation): mixed
     {
-        return \file_get_contents($this->url);
+        $contents = \file_get_contents($this->url);
+        if ($contents === false) {
+            throw new \RuntimeException("Unable to read from {$this->url}");
+        }
+
+        return $contents;
     }
 }

examples/worker/parent.php

@@ -22,4 +22,4 @@
 print strlen($bodies[1]) . PHP_EOL;
 
 print PHP_EOL;
-print 'Took ' . (microtime(true) - $start) . ' seconds' . PHP_EOL;
+print 'Took ' . number_format(microtime(true) - $start, 2) . ' seconds' . PHP_EOL;

psalm.xml

@@ -23,29 +23,51 @@
             </errorLevel>
         </StringIncrement>
 
-        <MissingClosureReturnType>
+        <ClassMustBeFinal>
             <errorLevel type="suppress">
-                <directory name="src"/>
+                <file name="src/Worker/WorkerException.php"/>
+                <file name="src/Context/ContextException.php"/>
+                <file name="src/Context/StatusError.php"/>
             </errorLevel>
-        </MissingClosureReturnType>
+        </ClassMustBeFinal>
 
         <DocblockTypeContradiction>
             <errorLevel type="suppress">
                 <directory name="src"/>
             </errorLevel>
         </DocblockTypeContradiction>
 
-        <UndefinedClass>
+        <MissingOverrideAttribute>
             <errorLevel type="suppress">
+                <directory name="examples"/>
                 <directory name="src"/>
             </errorLevel>
-        </UndefinedClass>
+        </MissingOverrideAttribute>
+
+        <UnusedClass>
+            <errorLevel type="suppress">
+                <directory name="src"/>
+            </errorLevel>
+        </UnusedClass>
+
+        <PossiblyUnusedMethod>
+            <errorLevel type="suppress">
+                <directory name="src"/>
+            </errorLevel>
+        </PossiblyUnusedMethod>
+
+        <UnusedVariable>
+            <errorLevel type="suppress">
+                <directory name="examples"/>
+                <directory name="src"/>
+            </errorLevel>
+        </UnusedVariable>
 
-        <UndefinedFunction>
+        <UndefinedClass>
             <errorLevel type="suppress">
-                <referencedFunction name="str_increment"/>
+                <directory name="src"/>
             </errorLevel>
-        </UndefinedFunction>
+        </UndefinedClass>
 
         <UnsupportedPropertyReferenceUsage>
             <errorLevel type="suppress">

src/Context/ProcessContext.php

@@ -112,6 +112,10 @@ public static function start(
                 }
 
                 $contents = \file_get_contents(self::SCRIPT_PATH);
+                if ($contents === false) {
+                    throw new ContextException("Unable to read script '" . self::SCRIPT_PATH . "'");
+                }
+
                 $contents = \str_replace("__DIR__", \var_export($path, true), $contents);
                 $suffix = \bin2hex(\random_bytes(10));
                 self::$pharScriptPath = $scriptPath = \sys_get_temp_dir() . "/amp-process-runner-" . $suffix . ".php";

src/Context/ThreadContext.php

@@ -136,6 +136,9 @@ public static function start(
 
     private bool $exited = false;
 
+    /**
+     * @throws ContextException
+     */
     private function __construct(
         private readonly int $id,
         private readonly Runtime $runtime,
@@ -151,7 +154,12 @@ private function __construct(
             $exited = true;
         });
 
-        $this->oid = \getmypid();
+        $pid = \getmypid();
+        if ($pid === false) {
+            throw new ContextException("Failed to determine PID");
+        }
+
+        $this->oid = $pid;
     }
 
     public function receive(?Cancellation $cancellation = null): mixed

test/Context/FlattenArgumentTest.php

@@ -1,15 +1,14 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Amp\Parallel\Test\Context;
 
 use PHPUnit\Framework\TestCase;
 use function Amp\Parallel\Context\flattenArgument;
-use function sqrt;
 
 class FlattenArgumentTest extends TestCase
 {
     public function testNan()
     {
         self::assertSame('NAN', flattenArgument(\sqrt(-1)));
     }
-}
+}