Fix psalm

revoltphp · Nov 16, 2023 · a8b99c0 · a8b99c0
1 parent ffb30e2
commit a8b99c0
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "ext-json": "*",
         "phpunit/phpunit": "^9",
         "jetbrains/phpstorm-stubs": "^2019.3",
-        "psalm/phar": "^4.7"
+        "psalm/phar": "^5"
     },
     "autoload": {
         "psr-4": {

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+  <file src="src/EventLoop/Driver/EvDriver.php">
+    <UnsupportedPropertyReferenceUsage>
+      <code><![CDATA[self::$activeSignals = &$this->signals]]></code>
+      <code><![CDATA[self::$activeSignals = &$this->signals]]></code>
+    </UnsupportedPropertyReferenceUsage>
+  </file>
+  <file src="src/EventLoop/Driver/EventDriver.php">
+    <UnsupportedPropertyReferenceUsage>
+      <code><![CDATA[self::$activeSignals = &$this->signals]]></code>
+      <code><![CDATA[self::$activeSignals = &$this->signals]]></code>
+    </UnsupportedPropertyReferenceUsage>
+  </file>
+  <file src="src/EventLoop/Driver/StreamSelectDriver.php">
+    <RedundantCast>
+      <code>(int) ($timeout * 1_000_000)</code>
+    </RedundantCast>
+  </file>
+  <file src="src/EventLoop/Driver/TracingDriver.php">
+    <InvalidArgument>
+      <code>\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS)</code>
+      <code>\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS)</code>
+      <code>\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS)</code>
+      <code>\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS)</code>
+      <code>\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS)</code>
+      <code>\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS)</code>
+      <code>\debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS)</code>
+    </InvalidArgument>
+  </file>
+  <file src="src/EventLoop/Driver/UvDriver.php">
+    <UndefinedFunction>
+      <code><![CDATA[\uv_poll_init_socket($this->handle, $callback->stream)]]></code>
+      <code><![CDATA[\uv_signal_init($this->handle)]]></code>
+      <code><![CDATA[\uv_signal_start($event, $this->signalCallback, $callback->signal)]]></code>
+    </UndefinedFunction>
+  </file>
+  <file src="src/EventLoop/Internal/AbstractDriver.php">
+    <RedundantCondition>
+      <code><![CDATA[!$this->stopped]]></code>
+    </RedundantCondition>
+  </file>
+</files>
diff --git a/psalm.xml b/psalm.xml
@@ -5,6 +5,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="https://getpsalm.org/schema/config"
         xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+        errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="examples"/>

diff --git a/src/EventLoop.php b/src/EventLoop.php
@@ -346,7 +346,7 @@ public static function getType(string $callbackId): CallbackType
      *
      * @param string $callbackId The callback identifier.
      *
-     * @return bool {@code true} if the callback is currently enabled, otherwise {@code false}.
+     * @return bool `true` if the callback is currently enabled, otherwise `false`.
      */
     public static function isEnabled(string $callbackId): bool
     {
@@ -358,7 +358,7 @@ public static function isEnabled(string $callbackId): bool
      *
      * @param string $callbackId The callback identifier.
      *
-     * @return bool {@code true} if the callback is currently referenced, otherwise {@code false}.
+     * @return bool `true` if the callback is currently referenced, otherwise `false`.
      */
     public static function isReferenced(string $callbackId): bool
     {

diff --git a/src/EventLoop/Driver.php b/src/EventLoop/Driver.php
@@ -294,7 +294,7 @@ public function getType(string $callbackId): CallbackType;
      *
      * @param string $callbackId The callback identifier.
      *
-     * @return bool {@code true} if the callback is currently enabled, otherwise {@code false}.
+     * @return bool `true` if the callback is currently enabled, otherwise `false`.
      */
     public function isEnabled(string $callbackId): bool;
 
@@ -303,7 +303,7 @@ public function isEnabled(string $callbackId): bool;
      *
      * @param string $callbackId The callback identifier.
      *
-     * @return bool {@code true} if the callback is currently referenced, otherwise {@code false}.
+     * @return bool `true` if the callback is currently referenced, otherwise `false`.
      */
     public function isReferenced(string $callbackId): bool;
 

diff --git a/src/EventLoop/Internal/DriverSuspension.php b/src/EventLoop/Internal/DriverSuspension.php
@@ -71,6 +71,7 @@ public function suspend(): mixed
     {
         // Throw exception when trying to use old dead {main} suspension
         if ($this->deadMain) {
+            \assert($this->error !== null);
             throw $this->error;
         }
         if ($this->pending) {