Merge pull request #46 from laminas/renovate/vimeo-psalm-5.x

Update dependency vimeo/psalm to v5
laminas · Dec 5, 2022 · 1e125ac · 1e125ac
2 parents d2873eb + d3d1045
commit 1e125ac
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 90 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "laminas/laminas-cache-storage-adapter-test": "^2.0",
         "laminas/laminas-coding-standard": "~2.4.0",
         "psalm/plugin-phpunit": "^0.18.0",
-        "vimeo/psalm": "^4.29.0"
+        "vimeo/psalm": "^5.0.0"
     },
     "config": {
         "sort-packages": true,

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="4.10.0@916b098b008f6de4543892b1e0651c1c3b92cbfa">
+<files psalm-version="5.0.0@4e177bf0c9f03c17d2fbfd83b7cc9c47605274d8">
   <file src="src/Apcu.php">
     <LessSpecificReturnStatement occurrences="1">
       <code>parent::setOptions($options)</code>
@@ -58,12 +58,14 @@
       <code>$normalizedKey</code>
       <code>$smaInfo['num_seg']</code>
     </MixedOperand>
-    <MixedReturnStatement occurrences="3">
+    <MixedReturnStatement occurrences="4">
       <code>$smaInfo['avail_mem']</code>
       <code>$this-&gt;options</code>
       <code>$this-&gt;totalSpace</code>
+      <code>$this-&gt;totalSpace</code>
     </MixedReturnStatement>
-    <MoreSpecificImplementedParamType occurrences="1">
+    <MoreSpecificImplementedParamType occurrences="2">
+      <code>$options</code>
       <code>$options</code>
     </MoreSpecificImplementedParamType>
     <MoreSpecificReturnType occurrences="1">
@@ -82,6 +84,9 @@
       <code>$key</code>
     </UnusedVariable>
   </file>
+  <file src="src/Apcu/AdapterPluginManagerDelegatorFactory.php">
+    <InvalidArgument occurrences="1"/>
+  </file>
   <file src="src/ApcuIterator.php">
     <RedundantCastGivenDocblockType occurrences="1">
       <code>(int) $mode</code>

diff --git a/src/Apcu.php b/src/Apcu.php
@@ -755,8 +755,7 @@ protected function internalGetCapabilities()
      */
     protected function normalizeMetadata(array &$metadata)
     {
-        $apcMetadata = $metadata;
-        $metadata    = [
+        $metadata = [
             'internal_key' => $metadata['key'],
             'atime'        => $metadata['access_time'],
             'ctime'        => $metadata['creation_time'],

diff --git a/test/unit/ApcuTest.php b/test/unit/ApcuTest.php
@@ -11,6 +11,7 @@
 use function ini_get;
 use function ini_set;
 
+/** @template-extends AbstractCommonAdapterTest<Apcu, ApcuOptions> */
 final class ApcuTest extends AbstractCommonAdapterTest
 {
     /**