Fix psalm and stan errors

Orest-Divintari · Orest-Divintari · commit 6e6a910527a3 · 2025-12-19T01:47:46.000+02:00
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -34,11 +34,6 @@ parameters:
             message: "#Call to an undefined method .*:expects.*#"
             paths:
                 - tests
-        -
-            message: "#Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface::.*#"
-            paths:
-                - src/Config/SDK
-                - tests/Integration/Config
         -
             message: "#Cannot call method .* on null#"
             paths:
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -45,12 +45,6 @@
                 <directory name="src/Config/SDK/Configuration/Internal"/>
             </errorLevel>
         </InvalidArgument>
-        <UndefinedInterfaceMethod>
-            <errorLevel type="suppress">
-                <directory name="src/Config/SDK/ComponentProvider"/>
-                <directory name="tests/Integration/Config/ComponentProvider"/>
-            </errorLevel>
-        </UndefinedInterfaceMethod>
         <PossiblyInvalidArgument>
             <errorLevel type="suppress">
                 <directory name="src/Config/SDK/Configuration"/>
diff --git a/src/Config/SDK/ComponentProvider/InstrumentationConfigurationRegistry.php b/src/Config/SDK/ComponentProvider/InstrumentationConfigurationRegistry.php
@@ -49,16 +49,14 @@ public function createPlugin(array $properties, Context $context): Configuration
     public function getConfig(ComponentProviderRegistry $registry, NodeBuilder $builder): ArrayNodeDefinition
     {
         $root = $builder->arrayNode('open_telemetry');
-        $root
+        $root->ignoreExtraKeys();
+
+        $children = $root->children();
+        $instrumentation = $children->arrayNode('instrumentation/development');
+        $instrumentation
             ->ignoreExtraKeys()
-            ->children()
-                ->arrayNode('instrumentation/development')
-                    ->ignoreExtraKeys()
-                    ->append($registry->componentMap('php', InstrumentationConfiguration::class))
-                    ->append($registry->componentMap('general', GeneralInstrumentationConfiguration::class))
-                ->end()
-            ->end()
-        ;
+            ->append($registry->componentMap('php', InstrumentationConfiguration::class))
+            ->append($registry->componentMap('general', GeneralInstrumentationConfiguration::class));
 
         return $root;
     }
diff --git a/src/Config/SDK/Configuration/Internal/NodeDefinition/ArrayNodeDefinition.php b/src/Config/SDK/Configuration/Internal/NodeDefinition/ArrayNodeDefinition.php
@@ -9,6 +9,9 @@
 use Symfony\Component\Config\Definition\Builder\NodeParentInterface;
 use Symfony\Component\Config\Definition\NodeInterface;
 
+/**
+ * @extends \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition<NodeParentInterface|null>
+ */
 class ArrayNodeDefinition extends \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition
 {
     use NodeDefinitionTrait;
diff --git a/src/Config/SDK/Configuration/Internal/NodeDefinition/BooleanNodeDefinition.php b/src/Config/SDK/Configuration/Internal/NodeDefinition/BooleanNodeDefinition.php
@@ -5,9 +5,11 @@
 namespace OpenTelemetry\Config\SDK\Configuration\Internal\NodeDefinition;
 
 use OpenTelemetry\Config\SDK\Configuration\Internal\Node\BooleanNode;
+use Symfony\Component\Config\Definition\Builder\NodeParentInterface;
 
 /**
  * @internal
+ * @extends \Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition<NodeParentInterface|null>
  */
 final class BooleanNodeDefinition extends \Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition
 {
diff --git a/src/Config/SDK/Configuration/Internal/NodeDefinition/EnumNodeDefinition.php b/src/Config/SDK/Configuration/Internal/NodeDefinition/EnumNodeDefinition.php
@@ -5,9 +5,11 @@
 namespace OpenTelemetry\Config\SDK\Configuration\Internal\NodeDefinition;
 
 use OpenTelemetry\Config\SDK\Configuration\Internal\Node\EnumNode;
+use Symfony\Component\Config\Definition\Builder\NodeParentInterface;
 
 /**
  * @internal
+ * @extends \Symfony\Component\Config\Definition\Builder\EnumNodeDefinition<NodeParentInterface|null>
  */
 final class EnumNodeDefinition extends \Symfony\Component\Config\Definition\Builder\EnumNodeDefinition
 {
diff --git a/src/Config/SDK/Configuration/Internal/NodeDefinition/FloatNodeDefinition.php b/src/Config/SDK/Configuration/Internal/NodeDefinition/FloatNodeDefinition.php
@@ -5,9 +5,11 @@
 namespace OpenTelemetry\Config\SDK\Configuration\Internal\NodeDefinition;
 
 use OpenTelemetry\Config\SDK\Configuration\Internal\Node\FloatNode;
+use Symfony\Component\Config\Definition\Builder\NodeParentInterface;
 
 /**
  * @internal
+ * @extends \Symfony\Component\Config\Definition\Builder\FloatNodeDefinition<NodeParentInterface|null>
  */
 final class FloatNodeDefinition extends \Symfony\Component\Config\Definition\Builder\FloatNodeDefinition
 {
diff --git a/src/Config/SDK/Configuration/Internal/NodeDefinition/IntegerNodeDefinition.php b/src/Config/SDK/Configuration/Internal/NodeDefinition/IntegerNodeDefinition.php
@@ -5,9 +5,11 @@
 namespace OpenTelemetry\Config\SDK\Configuration\Internal\NodeDefinition;
 
 use OpenTelemetry\Config\SDK\Configuration\Internal\Node\IntegerNode;
+use Symfony\Component\Config\Definition\Builder\NodeParentInterface;
 
 /**
  * @internal
+ * @extends \Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition<NodeParentInterface|null>
  */
 final class IntegerNodeDefinition extends \Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition
 {
diff --git a/src/Config/SDK/Configuration/Internal/NodeDefinition/ScalarNodeDefinition.php b/src/Config/SDK/Configuration/Internal/NodeDefinition/ScalarNodeDefinition.php
@@ -5,9 +5,11 @@
 namespace OpenTelemetry\Config\SDK\Configuration\Internal\NodeDefinition;
 
 use OpenTelemetry\Config\SDK\Configuration\Internal\Node\ScalarNode;
+use Symfony\Component\Config\Definition\Builder\NodeParentInterface;
 
 /**
  * @internal
+ * @extends \Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition<NodeParentInterface|null>
  */
 final class ScalarNodeDefinition extends \Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition
 {
diff --git a/src/Config/SDK/Configuration/Internal/NodeDefinition/StringNodeDefinition.php b/src/Config/SDK/Configuration/Internal/NodeDefinition/StringNodeDefinition.php
@@ -5,10 +5,12 @@
 namespace OpenTelemetry\Config\SDK\Configuration\Internal\NodeDefinition;
 
 use OpenTelemetry\Config\SDK\Configuration\Internal\Node\StringNode;
+use Symfony\Component\Config\Definition\Builder\NodeParentInterface;
 use Symfony\Component\Config\Definition\ScalarNode;
 
 /**
  * @internal
+ * @extends \Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition<NodeParentInterface|null>
  */
 final class StringNodeDefinition extends \Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition
 {
diff --git a/src/Config/SDK/Configuration/Internal/NodeDefinition/VariableNodeDefinition.php b/src/Config/SDK/Configuration/Internal/NodeDefinition/VariableNodeDefinition.php
@@ -5,9 +5,11 @@
 namespace OpenTelemetry\Config\SDK\Configuration\Internal\NodeDefinition;
 
 use OpenTelemetry\Config\SDK\Configuration\Internal\Node\VariableNode;
+use Symfony\Component\Config\Definition\Builder\NodeParentInterface;
 
 /**
  * @internal
+ * @extends \Symfony\Component\Config\Definition\Builder\VariableNodeDefinition<NodeParentInterface|null>
  */
 final class VariableNodeDefinition extends \Symfony\Component\Config\Definition\Builder\VariableNodeDefinition
 {
diff --git a/tests/Unit/Config/SDK/Configuration/ConfigurationFactoryTest.php b/tests/Unit/Config/SDK/Configuration/ConfigurationFactoryTest.php
@@ -64,7 +64,6 @@ public function createPlugin(array $properties, Context $context): mixed
                 public function getConfig(ComponentProviderRegistry $registry, NodeBuilder $builder): ArrayNodeDefinition
                 {
                     $node = new ArrayNodeDefinition('env_substitution');
-                    /** @phpstan-ignore-next-line */
                     $node
                         ->children()
                             ->scalarNode('string_key')->end()

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`	`use Symfony\Component\Config\Definition\Builder\NodeParentInterface;`
`10`	`10`	`use Symfony\Component\Config\Definition\NodeInterface;`
`11`	`11`
	`12`	`+/**`
	`13`	`+ * @extends \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition<NodeParentInterface\|null>`
	`14`	`+ */`
`12`	`15`	`class ArrayNodeDefinition extends \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition`
`13`	`16`	`{`
`14`	`17`	`use NodeDefinitionTrait;`