Fix psalm issues

Signed-off-by: Aleksei Khudiakov <aleksey@xerkus.pro>

Author: Xerkus

composer.json

@@ -57,7 +57,7 @@
         "phpunit/phpunit": "^10.5",
         "psalm/plugin-phpunit": "^0.18.4",
         "swoole/ide-helper": "^5.0.3",
-        "vimeo/psalm": "^5.12"
+        "vimeo/psalm": "^5.19"
     },
     "suggest": {
         "ext-inotify": "To use inotify based file watcher. Required for hot code reloading.",

composer.lock

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176">
+<files psalm-version="5.19.0@06b71be009a6bd6d81b9811855d6629b9fe90e1b">
   <file src="src/AbstractStaticResourceHandlerFactory.php">
     <MixedArrayOffset>
       <code>$cacheControlDirectives[$regex]</code>
@@ -26,14 +26,6 @@
       <code>InvalidConfigException</code>
     </UnusedClass>
   </file>
-  <file src="src/HotCodeReload/FileWatcher/InotifyFileWatcher.php">
-    <LessSpecificReturnStatement>
-      <code>$paths</code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code><![CDATA[list<non-empty-string>]]></code>
-    </MoreSpecificReturnType>
-  </file>
   <file src="src/HttpServerFactory.php">
     <InvalidConstantAssignmentValue>
       <code>PROTOCOLS = [
@@ -90,11 +82,17 @@
     </MixedPropertyTypeCoercion>
   </file>
   <file src="src/StaticResourceHandler/CacheControlMiddleware.php">
+    <ArgumentTypeCoercion>
+      <code>$regexp</code>
+    </ArgumentTypeCoercion>
     <MixedPropertyTypeCoercion>
       <code>$cacheControlDirectives</code>
     </MixedPropertyTypeCoercion>
   </file>
   <file src="src/StaticResourceHandler/ETagMiddleware.php">
+    <ArgumentTypeCoercion>
+      <code>$regexp</code>
+    </ArgumentTypeCoercion>
     <MixedPropertyTypeCoercion>
       <code>$etagDirectives</code>
     </MixedPropertyTypeCoercion>
@@ -118,6 +116,16 @@
       <code>stream_filter_append</code>
     </UnusedFunctionCall>
   </file>
+  <file src="src/StaticResourceHandler/LastModifiedMiddleware.php">
+    <ArgumentTypeCoercion>
+      <code>$regexp</code>
+    </ArgumentTypeCoercion>
+  </file>
+  <file src="src/StaticResourceHandler/ValidateRegexTrait.php">
+    <ArgumentTypeCoercion>
+      <code>$regex</code>
+    </ArgumentTypeCoercion>
+  </file>
   <file src="src/SwooleEmitter.php">
     <PossiblyNullReference>
       <code>asString</code>

psalm-baseline.xml

@@ -20,7 +20,6 @@
 use Swoole\Process;
 use Swoole\Runtime as SwooleRuntime;
 use Throwable;
-use Webmozart\Assert\Assert;
 
 use function array_merge;
 use function defined;
@@ -341,13 +340,11 @@ public function testFactoryCanEnableCoroutines(): void
 
         $i = 0;
         go(static function () use (&$i): void {
-            Assert::integer($i);
             usleep(1000);
             ++$i;
             SwooleEvent::exit();
         });
         go(function () use (&$i): void {
-            Assert::integer($i);
             ++$i;
             $this->assertEquals(1, $i);
         });

test/HttpServerFactoryTest.php

@@ -161,7 +161,6 @@ public function testResponseContentCallbackEmitsExpectedHeadersAndCompressesCont
                 string|array $value,
                 bool $format = true
             ) use (&$actualHeaderCalls): bool {
-                /** @psalm-var array $actualHeaderCalls */
                 $actualHeaderCalls[] = [$key, $value, $format];
                 return true;
             });

test/StaticResourceHandler/GzipMiddlewareTest.php

@@ -35,7 +35,6 @@ public function testSendSwooleResponsePopulatesStatusAndHeadersAndCallsContentCa
                 string|array $value,
                 bool $format = true
             ) use (&$actualHeaderCalls): bool {
-                /** @psalm-var array $actualHeaderCalls */
                 $actualHeaderCalls[] = [$key, $value, $format];
                 return true;
             });
@@ -78,7 +77,6 @@ public function testSendSwooleResponseSkipsSendingContentWhenContentDisabled():
                 string|array $value,
                 bool $format = true
             ) use (&$actualHeaderCalls): bool {
-                /** @psalm-var array $actualHeaderCalls */
                 $actualHeaderCalls[] = [$key, $value, $format];
                 return true;
             });

test/StaticResourceHandler/StaticResourceResponseTest.php

@@ -86,7 +86,6 @@ public function testMultipleHeaders(): void
                 string $key,
                 string|array $value
             ) use (&$actualHeaderCalls): bool {
-                /** @psalm-var array $actualHeaderCalls */
                 $actualHeaderCalls[] = [$key, $value];
                 return true;
             });
@@ -152,7 +151,6 @@ public function testMultipleSetCookieHeaders(): void
                 bool $httponly = false,
                 string $samesite = ''
             ) use (&$actualCookieCalls): bool {
-                /** @psalm-var array $actualCookieCalls */
                 $actualCookieCalls[] = [$name, $value, $expires, $path, $domain, $secure, $httponly, $samesite];
                 return true;
             });