From 6b1929932ac465d0892a32a28047bf1bfce4002b Mon Sep 17 00:00:00 2001 From: andyexeter Date: Thu, 23 May 2024 15:49:23 +0100 Subject: [PATCH 1/2] Add DefinitionConfigurator stub for rootNode ArrayNodeDefinition return type --- extension.neon | 1 + .../Configurator/DefinitionConfigurator.stub | 11 +++++++++++ tests/Type/Symfony/ExtensionTest.php | 6 ++++++ .../Symfony/data/definition_configurator.php | 19 +++++++++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 stubs/Symfony/Component/Config/Definition/Configurator/DefinitionConfigurator.stub create mode 100644 tests/Type/Symfony/data/definition_configurator.php diff --git a/extension.neon b/extension.neon index 09837d28..e4cfbc32 100644 --- a/extension.neon +++ b/extension.neon @@ -32,6 +32,7 @@ parameters: - stubs/Symfony/Bundle/FrameworkBundle/Test/TestContainer.stub - stubs/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.stub - stubs/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FirewallListenerFactoryInterface.stub + - stubs/Symfony/Component/Config/Definition/Configurator/DefinitionConfigurator.stub - stubs/Symfony/Component/Console/Command.stub - stubs/Symfony/Component/Console/Exception/ExceptionInterface.stub - stubs/Symfony/Component/Console/Exception/InvalidArgumentException.stub diff --git a/stubs/Symfony/Component/Config/Definition/Configurator/DefinitionConfigurator.stub b/stubs/Symfony/Component/Config/Definition/Configurator/DefinitionConfigurator.stub new file mode 100644 index 00000000..19ee7220 --- /dev/null +++ b/stubs/Symfony/Component/Config/Definition/Configurator/DefinitionConfigurator.stub @@ -0,0 +1,11 @@ +gatherAssertTypes(__DIR__ . '/data/extension/with-configuration-with-constructor/WithConfigurationWithConstructorExtension.php'); yield from $this->gatherAssertTypes(__DIR__ . '/data/extension/with-configuration-with-constructor-optional-params/WithConfigurationWithConstructorOptionalParamsExtension.php'); yield from $this->gatherAssertTypes(__DIR__ . '/data/extension/with-configuration-with-constructor-required-params/WithConfigurationWithConstructorRequiredParamsExtension.php'); + + if (!class_exists('Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator')) { + return; + } + + yield from $this->gatherAssertTypes(__DIR__ . '/data/definition_configurator.php'); } /** diff --git a/tests/Type/Symfony/data/definition_configurator.php b/tests/Type/Symfony/data/definition_configurator.php new file mode 100644 index 00000000..f7df5f9d --- /dev/null +++ b/tests/Type/Symfony/data/definition_configurator.php @@ -0,0 +1,19 @@ +rootNode(); +assertType('Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition', $rootNode); From d192fa3d88def036a6d4bc07fd529b5c9ee3ba7f Mon Sep 17 00:00:00 2001 From: andyexeter Date: Thu, 23 May 2024 16:56:22 +0100 Subject: [PATCH 2/2] Add ArrayNodeDefinition stub --- extension.neon | 1 + .../Config/Definition/Builder/ArrayNodeDefinition.stub | 8 ++++++++ .../Definition/Configurator/DefinitionConfigurator.stub | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 stubs/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.stub diff --git a/extension.neon b/extension.neon index e4cfbc32..0613d1e7 100644 --- a/extension.neon +++ b/extension.neon @@ -32,6 +32,7 @@ parameters: - stubs/Symfony/Bundle/FrameworkBundle/Test/TestContainer.stub - stubs/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.stub - stubs/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FirewallListenerFactoryInterface.stub + - stubs/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.stub - stubs/Symfony/Component/Config/Definition/Configurator/DefinitionConfigurator.stub - stubs/Symfony/Component/Console/Command.stub - stubs/Symfony/Component/Console/Exception/ExceptionInterface.stub diff --git a/stubs/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.stub b/stubs/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.stub new file mode 100644 index 00000000..23f818e2 --- /dev/null +++ b/stubs/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.stub @@ -0,0 +1,8 @@ +