Merge branch '3.4' into 4.3

* 3.4:
  #30432 fix an error message
  fix paths to detect code owners
  [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4
  Remove unused local variables in tests
  Make sure to collect child forms created on *_SET_DATA events
  do not render errors for checkboxes twice

Author: nicolas-grekas

Dumper/PhpDumper.php

@@ -256,7 +256,7 @@ public function dump(array $options = [])
                 foreach ($ids as $id) {
                     $c .= '    '.$this->doExport($id)." => true,\n";
                 }
-                $files['removed-ids.php'] = $c .= "];\n";
+                $files['removed-ids.php'] = $c."];\n";
             }
 
             foreach ($this->generateServiceFiles($services) as $file => $c) {

Tests/Compiler/AnalyzeServiceReferencesPassTest.php

@@ -24,28 +24,28 @@ public function testProcess()
     {
         $container = new ContainerBuilder();
 
-        $a = $container
+        $container
             ->register('a')
             ->addArgument($ref1 = new Reference('b'))
         ;
 
-        $b = $container
+        $container
             ->register('b')
             ->addMethodCall('setA', [$ref2 = new Reference('a')])
         ;
 
-        $c = $container
+        $container
             ->register('c')
             ->addArgument($ref3 = new Reference('a'))
             ->addArgument($ref4 = new Reference('b'))
         ;
 
-        $d = $container
+        $container
             ->register('d')
             ->setProperty('foo', $ref5 = new Reference('b'))
         ;
 
-        $e = $container
+        $container
             ->register('e')
             ->setConfigurator([$ref6 = new Reference('b'), 'methodName'])
         ;

Tests/Compiler/IntegrationTest.php

@@ -50,7 +50,7 @@ public function testProcessRemovesAndInlinesRecursively()
             ->setPublic(true)
         ;
 
-        $b = $container
+        $container
             ->register('b', '\stdClass')
             ->addArgument(new Reference('c'))
             ->setPublic(false)

Tests/Compiler/ResolveChildDefinitionsPassTest.php

@@ -363,7 +363,7 @@ public function testBindings()
             ->setBindings(['a' => '1', 'b' => '2'])
         ;
 
-        $child = $container->setDefinition('child', new ChildDefinition('parent'))
+        $container->setDefinition('child', new ChildDefinition('parent'))
             ->setBindings(['b' => 'B', 'c' => 'C'])
         ;
 

Tests/Compiler/ResolveClassPassTest.php

@@ -87,8 +87,8 @@ public function testAmbiguousChildDefinition()
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
         $this->expectExceptionMessage('Service definition "App\Foo\Child" has a parent but no class, and its name looks like a FQCN. Either the class is missing or you want to inherit it from the parent service. To resolve this ambiguity, please rename this service to a non-FQCN (e.g. using dots), or create the missing class.');
         $container = new ContainerBuilder();
-        $parent = $container->register('App\Foo', null);
-        $child = $container->setDefinition('App\Foo\Child', new ChildDefinition('App\Foo'));
+        $container->register('App\Foo', null);
+        $container->setDefinition('App\Foo\Child', new ChildDefinition('App\Foo'));
 
         (new ResolveClassPass())->process($container);
     }

Tests/ContainerBuilderTest.php

@@ -1272,7 +1272,7 @@ public function testNoClassFromGlobalNamespaceClassId()
         $this->expectExceptionMessage('The definition for "DateTime" has no class attribute, and appears to reference a class or interface in the global namespace.');
         $container = new ContainerBuilder();
 
-        $definition = $container->register(\DateTime::class);
+        $container->register(\DateTime::class);
         $container->compile();
     }
 
@@ -1302,7 +1302,7 @@ public function testNoClassFromNonClassId()
         $this->expectExceptionMessage('The definition for "123_abc" has no class.');
         $container = new ContainerBuilder();
 
-        $definition = $container->register('123_abc');
+        $container->register('123_abc');
         $container->compile();
     }
 
@@ -1312,7 +1312,7 @@ public function testNoClassFromNsSeparatorId()
         $this->expectExceptionMessage('The definition for "\foo" has no class.');
         $container = new ContainerBuilder();
 
-        $definition = $container->register('\\foo');
+        $container->register('\\foo');
         $container->compile();
     }
 

Tests/Dumper/PhpDumperTest.php

@@ -1036,7 +1036,7 @@ public function testInlineSelfRef()
             ->setPublic(true)
             ->addArgument($baz);
 
-        $passConfig = $container->getCompiler()->getPassConfig();
+        $container->getCompiler()->getPassConfig();
         $container->compile();
 
         $dumper = new PhpDumper($container);
@@ -1128,7 +1128,6 @@ public function testAdawsonContainer()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        $dump = $dumper->dump();
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_adawson.php', $dumper->dump());
     }
 

Tests/Loader/XmlFileLoaderTest.php

@@ -882,7 +882,6 @@ public function testTsantosContainer()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        $dump = $dumper->dump();
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_tsantos.php', $dumper->dump());
     }