[DependencyInjection] Fix query_string env processor for URLs without query string

yoeunes · yoeunes · commit 6ac5f4fe862b · 2025-11-25T03:51:09.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -325,7 +325,15 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
         }
 
         if ('query_string' === $prefix) {
-            $queryString = parse_url($env, \PHP_URL_QUERY) ?: $env;
+            $queryString = parse_url($env, \PHP_URL_QUERY);
+
+            if (null === $queryString) {
+                if (null !== parse_url($env, \PHP_URL_SCHEME)) {
+                    return [];
+                }
+                $queryString = $env;
+            }
+
             parse_str($queryString, $result);
 
             return $result;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -982,4 +982,27 @@ public static function provideGetEnvDefined(): iterable
         yield 'Null' => [false, fn () => null];
         yield 'Env var not defined' => [false, fn () => throw new EnvNotFoundException()];
     }
+
+    /**
+     * @dataProvider provideQueryStringScenarios
+     */
+    public function testQueryStringEnvVarProcessor($envValue, $expectedResult)
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('query_string', 'MY_VAR', fn () => $envValue);
+
+        $this->assertSame($expectedResult, $result);
+    }
+
+    public static function provideQueryStringScenarios(): iterable
+    {
+        yield 'url_without_query' => ['https://example.com', []];
+
+        yield 'url_with_empty_query' => ['https://example.com?', []];
+
+        yield 'url_with_query' => ['https://example.com?foo=bar&baz=123', ['foo' => 'bar', 'baz' => '123']];
+
+        yield 'raw_query_string' => ['foo=bar&test=1', ['foo' => 'bar', 'test' => '1']];
+    }
 }
