Fix psalm issues

cycle · Jan 7, 2025 · 0c470fb · 0c470fb
1 parent 67a8359
commit 0c470fb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -229,8 +229,8 @@
   </file>
   <file src="src/Config/RelationConfig.php">
     <TooManyArguments>
-      <code><![CDATA[new Autowire($this->config[$type][self::LOADER])]]></code>
-      <code><![CDATA[new Autowire($this->config[$type][self::RELATION])]]></code>
+      <code>new Autowire($loader)</code>
+      <code>new Autowire($relation)</code>
     </TooManyArguments>
   </file>
   <file src="src/EntityManager.php">
@@ -297,9 +297,6 @@
             ],
         )]]></code>
     </LessSpecificReturnStatement>
-    <MethodSignatureMismatch>
-      <code>$alias</code>
-    </MethodSignatureMismatch>
     <MixedArgument>
       <code>$class</code>
       <code>$class</code>

diff --git a/src/Config/RelationConfig.php b/src/Config/RelationConfig.php
@@ -61,19 +61,21 @@ public static function getDefault(): self
 
     public function getLoader(int|string $type): Autowire
     {
-        if (!isset($this->config[$type][self::LOADER])) {
-            throw new ConfigException("Unable to get relation loader `{$type}`.");
-        }
+        $loader = $this->config[$type][self::LOADER] ?? throw new ConfigException(
+            "Unable to get relation loader `{$type}`.",
+        );
 
-        return new Autowire($this->config[$type][self::LOADER]);
+        \assert(\is_string($loader) && $loader !== '');
+        return new Autowire($loader);
     }
 
     public function getRelation(int|string $type): Autowire
     {
-        if (!isset($this->config[$type][self::RELATION])) {
-            throw new ConfigException("Unable to get relation `{$type}`.");
-        }
+        $relation = $this->config[$type][self::RELATION] ?? throw new ConfigException(
+            "Unable to get relation `{$type}`.",
+        );
 
-        return new Autowire($this->config[$type][self::RELATION]);
+        \assert(\is_string($relation) && $relation !== '');
+        return new Autowire($relation);
     }
 }