Merge branch '6.4' into 7.0

* 6.4: (32 commits)
  [Validator] Add missing validator translations in Polish language
  [FrameworkBundle][Workflow] Add metadata dumping support for GraphvizDumper
  [HttpClient] Fix encoding some characters in query strings
  [HttpKernel] make RequestPayloadValueResolver:resolve() throw on variadic argument
  Fix typos
  Added redlink notifier
  [SecurityBundle] Remove last usages of tag `security.remember_me_aware`
  [VarDumper] Dumping DateTime throws error if getTimezone is false
  [DependencyInjection] Deprecate `ContainerAwareInterface`, `ContainerAwareTrait` and `ContainerAwareLoader`
  Only update autoload_runtime.php when it changed
  [Routing] Fix version in CHANGELOG
  [Console] Aligned multiline text in vertical table
  Fix README
  [Notifier] add Ntfy bridge
  [FrameworkBundle] Fix secrets:list not displaying local vars
  [Intl] Update the ICU data to 73.2
  [DoctrineBridge] add missing UPGRADE notes for #50689
  [HttpClient] Force int conversion for floated multiplier for GenericRetryStrategy
  [Security] Fix log message in OidcTokenHandler
  [Notifier] Add Novu bridge
  ...

Author: nicolas-grekas

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.4
+---
+
+ * Deprecate `ContainerAwareInterface` and `ContainerAwareTrait`, use dependency injection instead
+
 6.3
 ---
 

ContainerAwareInterface.php

@@ -15,6 +15,8 @@
  * ContainerAwareInterface should be implemented by classes that depends on a Container.
  *
  * @author Fabien Potencier <[email protected]>
+ *
+ * @deprecated since Symfony 6.4, use dependency injection instead
  */
 interface ContainerAwareInterface
 {

ContainerAwareTrait.php

@@ -11,10 +11,14 @@
 
 namespace Symfony\Component\DependencyInjection;
 
+trigger_deprecation('symfony/dependency-injection', '6.4', '"%s" is deprecated, use dependency injection instead.', ContainerAwareTrait::class);
+
 /**
  * ContainerAware trait.
  *
  * @author Fabien Potencier <[email protected]>
+ *
+ * @deprecated since Symfony 6.4, use dependency injection instead
  */
 trait ContainerAwareTrait
 {

EnvVarProcessor.php

@@ -146,7 +146,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
         if (false !== $i || 'string' !== $prefix) {
             $env = $getEnv($name);
         } elseif ('' === ($env = $_ENV[$name] ?? (str_starts_with($name, 'HTTP_') ? null : ($_SERVER[$name] ?? null)))
-            || false === ($env = $env ?? getenv($name) ?? false) // null is a possible value because of thread safety issues
+            || (false !== $env && false === ($env = $env ?? getenv($name) ?? false)) // null is a possible value because of thread safety issues
         ) {
             foreach ($this->loadedVars as $vars) {
                 if (false !== ($env = ($vars[$name] ?? $env)) && '' !== $env) {

Tests/ContainerAwareTraitTest.php

@@ -13,17 +13,16 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\ContainerAwareDummy;
 
+/**
+ * @group legacy
+ */
 class ContainerAwareTraitTest extends TestCase
 {
     use ExpectDeprecationTrait;
 
-    /**
-     * @group legacy
-     */
     public function testSetContainerLegacy()
     {
         $container = $this->createMock(ContainerInterface::class);
@@ -33,7 +32,7 @@ public function testSetContainerLegacy()
 
         self::assertSame($container, $dummy->getContainer());
 
-        $this->expectDeprecation('Since symfony/dependency-injection 6.2: Calling "Symfony\Component\DependencyInjection\Tests\ContainerAwareDummy::setContainer()" without any arguments is deprecated, pass null explicitly instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.2: Calling "Symfony\Component\DependencyInjection\Tests\Fixtures\ContainerAwareDummy::setContainer()" without any arguments is deprecated, pass null explicitly instead.');
 
         $dummy->setContainer();
         self::assertNull($dummy->getContainer());
@@ -52,13 +51,3 @@ public function testSetContainer()
         self::assertNull($dummy->getContainer());
     }
 }
-
-class ContainerAwareDummy implements ContainerAwareInterface
-{
-    use ContainerAwareTrait;
-
-    public function getContainer(): ?ContainerInterface
-    {
-        return $this->container;
-    }
-}

Tests/EnvVarProcessorTest.php

@@ -59,6 +59,67 @@ public static function validStrings()
         ];
     }
 
+    /**
+     * @dataProvider validRealEnvValues
+     */
+    public function testGetEnvRealEnv($value, $processed)
+    {
+        $_ENV['FOO'] = $value;
+
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('string', 'FOO', function () {
+            $this->fail('Should not be called');
+        });
+
+        $this->assertSame($processed, $result);
+
+        unset($_ENV['FOO']);
+    }
+
+    public static function validRealEnvValues()
+    {
+        return [
+            ['hello', 'hello'],
+            [true, '1'],
+            [false, ''],
+            [1, '1'],
+            [0, '0'],
+            [1.1, '1.1'],
+            [10, '10'],
+        ];
+    }
+
+    public function testGetEnvRealEnvInvalid()
+    {
+        $_ENV['FOO'] = null;
+        $this->expectException(EnvNotFoundException::class);
+        $this->expectExceptionMessage('Environment variable not found: "FOO".');
+
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('string', 'FOO', function () {
+            $this->fail('Should not be called');
+        });
+
+        unset($_ENV['FOO']);
+    }
+
+    public function testGetEnvRealEnvNonScalar()
+    {
+        $_ENV['FOO'] = [];
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Non-scalar env var "FOO" cannot be cast to "string".');
+
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('string', 'FOO', function () {
+            $this->fail('Should not be called');
+        });
+
+        unset($_ENV['FOO']);
+    }
+
     /**
      * @dataProvider validBools
      */
@@ -97,6 +158,7 @@ public static function validBools()
             ['true', true],
             ['false', false],
             ['null', false],
+            ['', false],
             ['1', true],
             ['0', false],
             ['1.1', true],

Tests/Fixtures/ContainerAwareDummy.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * @deprecated since Symfony 6.4, to be removed in 7.0
+ */
+class ContainerAwareDummy implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function getContainer(): ?ContainerInterface
+    {
+        return $this->container;
+    }
+}
+