Support symfony 8 (#1839)

Orest-Divintari · web-flow · commit 4b42c979966a · 2026-01-15T22:01:45.000+11:00
* Support symfony 8

* Fix psalm and stan errors

* Add Psalm suppressions for Symfony 8 compatibility

In Symfony 8, the NodeParentInterface was changed to an empty interface,
removing method declarations that existed in Symfony 5-7. The fluent
builder methods (end(), scalarNode(), etc.) still exist on concrete
classes but are no longer part of the interface signature.

Additionally, Symfony 8 removed template parameters from node definition
classes, causing TooManyTemplateParams errors for our internal
NodeDefinition classes that extend Symfony's base classes.

* Revert InstrumentationConfigurationRegistry
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "psr/http-message": "^1.0.1|^2.0",
         "psr/log": "^1.1|^2.0|^3.0",
         "ramsey/uuid": "^3.0 || ^4.0",
-        "symfony/config": "^5.4 || ^6.4 || ^7.0",
+        "symfony/config": "^5.4 || ^6.4 || ^7.0 || ^8.0",
         "symfony/polyfill-mbstring": "^1.23",
         "symfony/polyfill-php82": "^1.26",
         "symfony/polyfill-php83": "^1.32",
@@ -108,9 +108,9 @@
         "phpstan/phpstan-phpunit": "^1.3",
         "phpunit/phpunit": "^10 || ^11",
         "sebastian/exporter": "<= 6.0.1 || >= 6.1.3",
-        "symfony/http-client": "^5.2",
-        "symfony/var-exporter": "^5.4 || ^6.4 || ^7.0",
-        "symfony/yaml": "^5.4 || ^6.4 || ^7.0"
+        "symfony/http-client": "^5.2 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/var-exporter": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+        "symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0"
     },
     "conflict": {
         "mockery/mockery": "1.6.12"
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"/>
@@ -69,6 +63,23 @@
                 <directory name="tests"/>
             </errorLevel>
         </MoreSpecificImplementedParamType>
+        <UndefinedInterfaceMethod>
+            <errorLevel type="suppress">
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::end"/>
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::scalarNode"/>
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::integerNode"/>
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::booleanNode"/>
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::arrayNode"/>
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::variableNode"/>
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::enumNode"/>
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::floatNode"/>
+            </errorLevel>
+        </UndefinedInterfaceMethod>
+        <TooManyTemplateParams>
+            <errorLevel type="suppress">
+                <directory name="src/Config/SDK/Configuration/Internal/NodeDefinition"/>
+            </errorLevel>
+        </TooManyTemplateParams>
         <UndefinedMagicMethod>
             <errorLevel type="suppress">
                 <referencedMethod name="Prophecy\Prophecy\ObjectProphecy::accepts"/>
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/src/Config/SDK/composer.json b/src/Config/SDK/composer.json
@@ -21,7 +21,7 @@
         "open-telemetry/api": "^1.8",
         "open-telemetry/context": "^1.4",
         "open-telemetry/sdk": "^1.8",
-        "symfony/config": "^5.4 || ^6.4 || ^7.0",
+        "symfony/config": "^5.4 || ^6.4 || ^7.0 || ^8.0",
         "tbachert/spi": "^1.0.5"
     },
     "autoload": {
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;`