Update psalm (#172)

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
yiisoft · Jun 20, 2023 · 80937be · 80937be
1 parent 4442055
commit 80937be
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -28,4 +28,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.0', '8.1', '8.2']
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "rector/rector": "^0.17.0",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.18",
+        "vimeo/psalm": "^4.30|^5.4",
         "yiisoft/test-support": "^1.3"
     },
     "autoload": {

diff --git a/psalm.xml b/psalm.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
-    resolveFromConfigFile="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     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"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="src"/>
         <ignoreFiles>
-            <directory name="vendor" />
+            <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
     <issueHandlers>
+        <MixedAssignment errorLevel="suppress"/>
         <InvalidCatch>
             <errorLevel type="suppress">
-                <referencedClass name="Psr\Container\NotFoundExceptionInterface" />
+                <referencedClass name="Psr\Container\NotFoundExceptionInterface"/>
             </errorLevel>
         </InvalidCatch>
     </issueHandlers>

diff --git a/src/Factory.php b/src/Factory.php
@@ -63,7 +63,6 @@ public function withDefinitions(array $definitions): self
     private function validateDefinitions(array $definitions): void
     {
         if ($this->validate) {
-            /** @var mixed $definition */
             foreach ($definitions as $id => $definition) {
                 DefinitionValidator::validate($definition, $id);
             }

diff --git a/src/FactoryInternalContainer.php b/src/FactoryInternalContainer.php
@@ -88,7 +88,6 @@ public function create(DefinitionInterface $definition): mixed
         }
 
         try {
-            /** @var mixed $result */
             $result = $definition->resolve($this);
             return is_object($result) ? clone $result : $result;
         } finally {