From 2aac4c7e86fed5314e49ad3d0aaf3d01fa82832d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Tue, 10 Oct 2023 21:59:10 +0200
Subject: [PATCH] qa: normalize psalm config to get rid of warnings when
 running psalm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
---
 psalm-baseline.xml        | 53 ++++++++++++++++++++++++++++++++++++---
 psalm.xml.dist            |  2 +-
 src/ServiceManager.php    |  4 +--
 src/Tool/ConfigDumper.php |  2 +-
 4 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 85229872..bb99df15 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.10.0@a5effd2d2dddd1a7ea7a0f6a051ce63ff979e356">
+<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
   <file src="src/AbstractFactory/ConfigAbstractFactory.php">
     <InvalidStringClass>
       <code>new $requestedName(...$arguments)</code>
@@ -24,6 +24,11 @@
       <code>new $requestedName(...$parameters)</code>
     </MixedMethodCall>
   </file>
+  <file src="src/AbstractPluginManager.php">
+    <PossiblyUnusedMethod>
+      <code>mapLazyService</code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="src/Exception/CyclicAliasException.php">
     <InvalidArgument>
       <code>self::deDuplicateDetectedCycles($detectedCycles)</code>
@@ -38,6 +43,16 @@
       <code>new $requestedName()</code>
     </InvalidStringClass>
   </file>
+  <file src="src/Module.php">
+    <UnusedClass>
+      <code>Module</code>
+    </UnusedClass>
+  </file>
+  <file src="src/PluginManagerInterface.php">
+    <PossiblyUnusedMethod>
+      <code>validate</code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="src/Proxy/LazyServiceFactory.php">
     <MissingClosureParamType>
       <code>$wrappedInstance</code>
@@ -50,6 +65,9 @@
     <InvalidArrayOffset>
       <code><![CDATA[$this->services[$service]]]></code>
     </InvalidArrayOffset>
+    <InvalidCast>
+      <code>$service</code>
+    </InvalidCast>
     <MissingClosureReturnType>
       <code>function () use ($name, $options) {</code>
     </MissingClosureReturnType>
@@ -76,7 +94,6 @@
       <code>$abstractFactories</code>
       <code>$abstractFactory</code>
       <code><![CDATA[$config['aliases']]]></code>
-      <code>$key</code>
       <code><![CDATA[$this->aliases]]></code>
       <code><![CDATA[$this->factories]]></code>
       <code><![CDATA[$this->shared]]></code>
@@ -88,6 +105,13 @@
       <code><![CDATA[$config['factories']]]></code>
       <code><![CDATA[$config['shared']]]></code>
     </MixedOperand>
+    <UnusedForeachValue>
+      <code>$service</code>
+      <code>$target</code>
+    </UnusedForeachValue>
+    <UnusedReturnValue>
+      <code>DelegatorsConfiguration</code>
+    </UnusedReturnValue>
   </file>
   <file src="src/Test/CommonPluginManagerTrait.php">
     <ArgumentTypeCoercion>
@@ -112,7 +136,6 @@
       <code>$config[ConfigAbstractFactory::class][$className]</code>
     </MixedArrayAssignment>
     <MixedAssignment>
-      <code>$dependency</code>
       <code>$key</code>
       <code>$value</code>
     </MixedAssignment>
@@ -131,6 +154,11 @@
       <code>$instance</code>
     </MixedPropertyAssignment>
   </file>
+  <file src="test/Command/ConfigDumperCommandTest.php">
+    <PossiblyUnusedMethod>
+      <code>ignoreUnresolvedArguments</code>
+    </PossiblyUnusedMethod>
+  </file>
   <file src="test/CommonServiceLocatorBehaviorsTrait.php">
     <MissingClosureParamType>
       <code>$callback</code>
@@ -159,6 +187,14 @@
     <MixedPropertyAssignment>
       <code>$instance</code>
     </MixedPropertyAssignment>
+    <PossiblyUndefinedArrayOffset>
+      <code><![CDATA[$object['get'][0]]]></code>
+    </PossiblyUndefinedArrayOffset>
+    <UnusedClosureParam>
+      <code>$container</code>
+      <code>$options</code>
+      <code>$requestedName</code>
+    </UnusedClosureParam>
   </file>
   <file src="test/LazyServiceIntegrationTest.php">
     <InvalidReturnStatement>
@@ -186,6 +222,9 @@
     <MixedFunctionCall>
       <code>$initializer($wrappedInstance, $proxy)</code>
     </MixedFunctionCall>
+    <UnusedVariable>
+      <code>$wrappedInstance</code>
+    </UnusedVariable>
   </file>
   <file src="test/ServiceManagerTest.php">
     <MixedAssignment>
@@ -205,6 +244,14 @@
     <MixedOperand>
       <code>$inc</code>
     </MixedOperand>
+    <PossiblyUnusedMethod>
+      <code>sampleFactory</code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="test/StaticAnalysis/ServiceManagerConfiguration.php">
+    <UnusedClass>
+      <code>ServiceManagerConfiguration</code>
+    </UnusedClass>
   </file>
   <file src="test/Tool/ConfigDumperTest.php">
     <MixedAssignment>
diff --git a/psalm.xml.dist b/psalm.xml.dist
index eec24b01..a17d69e3 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -6,7 +6,7 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorBaseline="psalm-baseline.xml"
     findUnusedPsalmSuppress="true"
-    findUnusedCode="false"
+    findUnusedCode="true"
     findUnusedBaselineEntry="true"
 >
     <projectFiles>
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
index 55340db2..26051496 100644
--- a/src/ServiceManager.php
+++ b/src/ServiceManager.php
@@ -264,7 +264,7 @@ public function build(string $name, ?array $options = null): mixed
     /**
      * {@inheritDoc}
      *
-     * @param string|class-string $name
+     * @param string|class-string $id
      * @return bool
      */
     public function has(string $id): bool
@@ -350,7 +350,7 @@ public function configure(array $config): static
         if (isset($config['abstract_factories'])) {
             $abstractFactories = $config['abstract_factories'];
             // $key not needed, but foreach is faster than foreach + array_values.
-            foreach ($abstractFactories as $key => $abstractFactory) {
+            foreach ($abstractFactories as $abstractFactory) {
                 $this->resolveAbstractFactoryInstance($abstractFactory);
             }
         }
diff --git a/src/Tool/ConfigDumper.php b/src/Tool/ConfigDumper.php
index d115a0a4..ee4e9359 100644
--- a/src/Tool/ConfigDumper.php
+++ b/src/Tool/ConfigDumper.php
@@ -131,7 +131,7 @@ public function createFactoryMappingsFromConfig(array $config): array
             );
         }
 
-        foreach ($config[ConfigAbstractFactory::class] as $className => $dependency) {
+        foreach (array_keys($config[ConfigAbstractFactory::class]) as $className) {
             $config = $this->createFactoryMappings($config, $className);
         }
         return $config;