Last cleanups before beta

Author: nicolas-grekas

ServiceLocator.php

@@ -67,7 +67,7 @@ public function __invoke(string $id)
      *
      * @return static
      */
-    public function withContext(string $externalId, Container $container)
+    public function withContext(string $externalId, Container $container): self
     {
         $locator = clone $this;
         $locator->externalId = $externalId;

Tests/Compiler/ValidateEnvPlaceholdersPassTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Config\Definition\Builder\ParentNodeDefinitionInterface;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\DependencyInjection\Compiler\MergeExtensionConfigurationPass;
@@ -221,10 +220,6 @@ public function testEmptyEnvWhichCannotBeEmptyForScalarNodeWithValidation(): voi
         $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
         $this->expectExceptionMessage('The path "env_extension.scalar_node_not_empty_validated" cannot contain an environment variable when empty values are not allowed by definition and are validated.');
 
-        if (!method_exists(ParentNodeDefinitionInterface::class, 'getChildNodeDefinitions')) {
-            $this->markTestSkipped('symfony/config >=5.0 is required.');
-        }
-
         $container = new ContainerBuilder();
         $container->registerExtension($ext = new EnvExtension());
         $container->prependExtensionConfig('env_extension', $expected = [

Tests/Fixtures/includes/autowiring_classes.php

@@ -279,7 +279,7 @@ public function setFoo(Foo $foo)
      * @required
      * @return static
      */
-    public function withFoo1(Foo $foo): object
+    public function withFoo1(Foo $foo): self
     {
         return $this->withFoo2($foo);
     }
@@ -288,7 +288,7 @@ public function withFoo1(Foo $foo): object
      * @required
      * @return static
      */
-    public function withFoo2(Foo $foo): object
+    public function withFoo2(Foo $foo): self
     {
         $new = clone $this;
         $new->foo = $foo;