qa: bump vimeo/psalm to v5.20.0

Signed-off-by: Maximilian Bösing <[email protected]>
laminas · Jan 19, 2024 · 7691b4e · 7691b4e
1 parent 2db8ef0
commit 7691b4e
Show file tree

Hide file tree

Showing 11 changed files with 198 additions and 157 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4">
   <file src="src/Command/DeprecatedStorageFactoryConfigurationCheckCommand.php">
     <MixedArgument>
       <code>$cacheConfiguration</code>
@@ -64,9 +64,6 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="src/Pattern/CaptureCache.php">
-    <DocblockTypeContradiction>
-      <code>$perm !== false</code>
-    </DocblockTypeContradiction>
     <MissingClosureParamType>
       <code>$content</code>
     </MissingClosureParamType>
@@ -76,8 +73,6 @@
     </MissingReturnType>
     <MixedArgument>
       <code>$content</code>
-      <code>$perm</code>
-      <code>$perm</code>
     </MixedArgument>
     <PossiblyInvalidMethodCall>
       <code>isFile</code>
@@ -228,11 +223,66 @@
       <code>StoragePluginFactory</code>
     </PossiblyUnusedReturnValue>
   </file>
+  <file src="src/Storage/AbstractMetadataCapableAdapter.php">
+    <InvalidArgument>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+    </InvalidArgument>
+  </file>
   <file src="src/Storage/Adapter/AbstractAdapter.php">
     <ArgumentTypeCoercion>
       <code>$plugin</code>
     </ArgumentTypeCoercion>
     <InvalidArgument>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
+      <code>$args</code>
       <code><![CDATA[$args['success']]]></code>
       <code><![CDATA[$args['success']]]></code>
       <code><![CDATA['casToken']]></code>
@@ -363,6 +413,9 @@
     <DocblockTypeContradiction>
       <code>is_array($options)</code>
     </DocblockTypeContradiction>
+    <InvalidArgument>
+      <code><![CDATA[new ArrayObject([$optionName => $optionValue])]]></code>
+    </InvalidArgument>
     <InvalidReturnStatement>
       <code>$array</code>
     </InvalidReturnStatement>
@@ -839,12 +892,6 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="test/Storage/Adapter/AdapterOptionsTest.php">
-    <MixedArgument>
-      <code>$calledArgs</code>
-    </MixedArgument>
-    <MixedArrayAccess>
-      <code>$calledArgs[0]</code>
-    </MixedArrayAccess>
     <PossiblyNullReference>
       <code>getKeyPattern</code>
       <code>getTtl</code>

diff --git a/src/Pattern/CaptureCache.php b/src/Pattern/CaptureCache.php
@@ -269,7 +269,7 @@ protected function putFileContent($file, $data)
 
         $umask = $umask !== false ? umask($umask) : false;
         $rs    = file_put_contents($file, $data, $locking ? LOCK_EX : 0);
-        if ($umask) {
+        if ($umask !== false) {
             umask($umask);
         }
 
@@ -325,12 +325,6 @@ protected function createDirectoryStructure($pathname)
                 $err = ErrorHandler::stop();
                 throw new Exception\RuntimeException("mkdir('{$pathname}', 0{$oct}, true) failed", 0, $err);
             }
-
-            if ($perm !== false && ! chmod($pathname, $perm)) {
-                $oct = decoct($perm);
-                $err = ErrorHandler::stop();
-                throw new Exception\RuntimeException("chmod('{$pathname}', 0{$oct}) failed", 0, $err);
-            }
         } else {
             // built-in mkdir function sets permission together with current umask
             // which doesn't work well on multo threaded webservers

diff --git a/src/Pattern/PatternOptions.php b/src/Pattern/PatternOptions.php
@@ -269,7 +269,7 @@ public function setUmask($umask)
             }
 
             // validate
-            if ($umask & 0700) {
+            if (($umask & 0700) !== 0) {
                 throw new Exception\InvalidArgumentException(
                     'Invalid umask: need permission to execute, read and write by owner'
                 );
@@ -351,7 +351,7 @@ public function setFilePermission($filePermission)
                 );
             }
 
-            if ($filePermission & 0111) {
+            if (($filePermission & 0111) !== 0) {
                 throw new Exception\InvalidArgumentException(
                     "Invalid file permission: Files shouldn't be executable"
                 );

diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
@@ -78,7 +78,7 @@ abstract class AbstractAdapter implements StorageInterface, PluginAwareInterface
      */
     public function __construct($options = null)
     {
-        if ($options) {
+        if ($options !== null) {
             $this->setOptions($options);
         }
     }

diff --git a/src/Storage/Plugin/ExceptionHandler.php b/src/Storage/Plugin/ExceptionHandler.php
@@ -64,7 +64,7 @@ public function onException(ExceptionEvent $event)
     {
         $options  = $this->getOptions();
         $callback = $options->getExceptionCallback();
-        if ($callback) {
+        if ($callback !== null) {
             call_user_func($callback, $event->getException());
         }
 

diff --git a/test/Pattern/CaptureCacheTest.php b/test/Pattern/CaptureCacheTest.php
@@ -41,7 +41,7 @@ public function setUp(): void
         $this->umask                     = umask();
 
         $this->tmpCacheDir = @tempnam(sys_get_temp_dir(), 'laminas_cache_test_');
-        if (! $this->tmpCacheDir) {
+        if ($this->tmpCacheDir === false) {
             $err = error_get_last();
             self::fail("Can't create temporary cache directory-file: {$err['message']}");
         } elseif (! @unlink($this->tmpCacheDir)) {

diff --git a/test/Psr/CacheItemPool/CacheItemTest.php b/test/Psr/CacheItemPool/CacheItemTest.php
@@ -18,6 +18,7 @@
 
 class CacheItemTest extends TestCase
 {
+    /** @var non-empty-string */
     private string $tz;
 
     protected function setUp(): void

diff --git a/test/Psr/SimpleCache/SimpleCacheDecoratorTest.php b/test/Psr/SimpleCache/SimpleCacheDecoratorTest.php
@@ -86,7 +86,7 @@ private function getMockCapabilities(
         int $minTtl = 60,
         int $maxKeyLength = -1
     ): Capabilities {
-        $supportedDataTypes = $supportedDataTypes ?: $this->requiredTypes;
+        $supportedDataTypes = $supportedDataTypes ?? $this->requiredTypes;
         $capabilities       = $this->createMock(Capabilities::class);
         $capabilities
             ->method('getSupportedDatatypes')

diff --git a/test/Storage/Adapter/AbstractMetadataCapableAdapterTest.php b/test/Storage/Adapter/AbstractMetadataCapableAdapterTest.php
@@ -18,10 +18,8 @@
 use function array_map;
 use function array_merge;
 use function array_unique;
-use function assert;
 use function call_user_func_array;
 use function count;
-use function is_array;
 use function ucfirst;
 
 final class AbstractMetadataCapableAdapterTest extends TestCase
@@ -94,7 +92,6 @@ public function testEventHandlingSimple(
 
         $eventList    = [];
         $eventHandler = static function (Event $event) use (&$eventList): void {
-            assert(is_array($eventList));
             $eventList[] = $event->getName();
         };
         $eventManager = $storage->getEventManager();
@@ -132,7 +129,6 @@ public function testEventHandlingCatchException(
 
         $eventList    = [];
         $eventHandler = static function (Event $event) use (&$eventList): void {
-            assert(is_array($eventList));
             $eventList[] = $event->getName();
             if ($event instanceof Cache\Storage\ExceptionEvent) {
                 $event->setThrowException(false);
@@ -173,7 +169,6 @@ public function testEventHandlingStopInPre(
 
         $eventList    = [];
         $eventHandler = static function (Event $event) use (&$eventList): void {
-            assert(is_array($eventList));
             $eventList[] = $event->getName();
         };
         $eventManager = $storage->getEventManager();

diff --git a/test/Storage/Adapter/AdapterOptionsTest.php b/test/Storage/Adapter/AdapterOptionsTest.php
@@ -126,7 +126,7 @@ public function testTriggerOptionEvent(): void
         // trigger by changing an option
         $this->options->setWritable(false);
 
-        // assert (hopefully) called listener and arguments
+        self::assertIsArray($calledArgs);
         self::assertCount(1, $calledArgs, '"option" event was not triggered or got a wrong number of arguments');
         /** @var Event|null $event */
         $event = $calledArgs[0] ?? null;