From 7e5633f28f2f62bde4d48c7739bc4f277ca90238 Mon Sep 17 00:00:00 2001 From: Ondrej Mirtes Date: Mon, 30 Sep 2024 17:09:04 +0200 Subject: [PATCH] [BCB] Remove legacy config options with `_` in their name --- extension.neon | 6 ------ src/Symfony/Configuration.php | 6 +++--- tests/Symfony/config.neon | 3 --- tests/Type/Symfony/extension-test.neon | 4 ++-- 4 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 tests/Symfony/config.neon diff --git a/extension.neon b/extension.neon index 512f9908..0d74d8b3 100644 --- a/extension.neon +++ b/extension.neon @@ -5,11 +5,8 @@ parameters: uncheckedExceptionClasses: - 'Symfony\Component\Console\Exception\InvalidArgumentException' symfony: - container_xml_path: null containerXmlPath: null - constant_hassers: true constantHassers: true - console_application_loader: null consoleApplicationLoader: null featureToggles: skipCheckGenericClasses: @@ -109,11 +106,8 @@ parameters: parametersSchema: symfony: structure([ - container_xml_path: schema(string(), nullable()) containerXmlPath: schema(string(), nullable()) - constant_hassers: bool() constantHassers: bool() - console_application_loader: schema(string(), nullable()) consoleApplicationLoader: schema(string(), nullable()) ]) diff --git a/src/Symfony/Configuration.php b/src/Symfony/Configuration.php index e603b333..acdd8508 100644 --- a/src/Symfony/Configuration.php +++ b/src/Symfony/Configuration.php @@ -18,17 +18,17 @@ public function __construct(array $parameters) public function getContainerXmlPath(): ?string { - return $this->parameters['containerXmlPath'] ?? $this->parameters['container_xml_path'] ?? null; + return $this->parameters['containerXmlPath']; } public function hasConstantHassers(): bool { - return $this->parameters['constantHassers'] ?? $this->parameters['constant_hassers'] ?? true; + return $this->parameters['constantHassers']; } public function getConsoleApplicationLoader(): ?string { - return $this->parameters['consoleApplicationLoader'] ?? $this->parameters['console_application_loader'] ?? null; + return $this->parameters['consoleApplicationLoader']; } } diff --git a/tests/Symfony/config.neon b/tests/Symfony/config.neon deleted file mode 100644 index e4f42c64..00000000 --- a/tests/Symfony/config.neon +++ /dev/null @@ -1,3 +0,0 @@ -parameters: - symfony: - container_xml_path: container.xml diff --git a/tests/Type/Symfony/extension-test.neon b/tests/Type/Symfony/extension-test.neon index f7dc1353..0f1d9522 100644 --- a/tests/Type/Symfony/extension-test.neon +++ b/tests/Type/Symfony/extension-test.neon @@ -1,4 +1,4 @@ parameters: symfony: - console_application_loader: console_application_loader.php - container_xml_path: container.xml + consoleApplicationLoader: console_application_loader.php + containerXmlPath: container.xml