Merge branch '6.4' into 7.2

* 6.4:
  -
  CS fixes

Author: nicolas-grekas

Argument/LazyClosure.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Argument;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;

Compiler/CheckCircularReferencesPass.php

@@ -62,7 +62,7 @@ private function checkOutEdges(array $edges): void
                 continue;
             }
 
-            $isLeaf = !!$node->getValue();
+            $isLeaf = (bool) $node->getValue();
             $isConcrete = !$edge->isLazy() && !$edge->isWeak();
 
             // Skip already checked lazy services if they are still lazy. Will not gain any new information.

Compiler/ResolveBindingsPass.php

@@ -228,7 +228,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
 
             foreach ($names as $key => $name) {
                 if (\array_key_exists($name, $arguments) && (0 === $key || \array_key_exists($key - 1, $arguments))) {
-                    if (!array_key_exists($key, $arguments)) {
+                    if (!\array_key_exists($key, $arguments)) {
                         $arguments[$key] = $arguments[$name];
                     }
                     unset($arguments[$name]);

Tests/Argument/LazyClosureTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Argument;
 
-use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\LazyClosure;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -23,7 +22,7 @@ public function testMagicGetThrows()
     {
         $closure = new LazyClosure(fn () => null);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Cannot read property "foo" from a lazy closure.');
 
         $closure->foo;
@@ -34,7 +33,7 @@ public function testThrowsWhenNotUsingInterface()
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('Cannot create adapter for service "foo" because "Symfony\Component\DependencyInjection\Tests\Argument\LazyClosureTest" is not an interface.');
 
-        LazyClosure::getCode('foo', [new \stdClass(), 'bar'], LazyClosureTest::class, new ContainerBuilder(), 'foo');
+        LazyClosure::getCode('foo', [new \stdClass(), 'bar'], self::class, new ContainerBuilder(), 'foo');
     }
 
     public function testThrowsOnNonFunctionalInterface()
@@ -62,5 +61,6 @@ public function foo();
 interface NonFunctionalInterface
 {
     public function foo();
+
     public function bar();
 }

Tests/Loader/XmlFileLoaderTest.php

@@ -1280,7 +1280,7 @@ public function testStaticConstructor()
     public function testStaticConstructorWithFactoryThrows()
     {
         $container = new ContainerBuilder();
-        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath . '/xml'));
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
 
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('The "static_constructor" service cannot declare a factory as well as a constructor.');
@@ -1341,7 +1341,7 @@ public function testUnknownConstantAsKey()
     public function testDeprecatedTagged()
     {
         $container = new ContainerBuilder();
-        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath . '/xml'));
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
 
         $this->expectUserDeprecationMessage(\sprintf('Since symfony/dependency-injection 7.2: Type "tagged" is deprecated for tag <argument>, use "tagged_iterator" instead in "%s/xml%sservices_with_deprecated_tagged.xml".', self::$fixturesPath, \DIRECTORY_SEPARATOR));