Merge branch '3.4' into 4.4

* 3.4:
  Make PHP 8 green on Travis

Author: nicolas-grekas

Tests/Compiler/AutowirePassTest.php

@@ -26,6 +26,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\MultipleArgumentsOptionalScalarNotReallyOptional;
 use Symfony\Component\DependencyInjection\TypedReference;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
@@ -452,6 +453,9 @@ public function testNoTypeArgsCannotBeAutowired()
         }
     }
 
+    /**
+     * @requires PHP < 8
+     */
     public function testOptionalScalarNotReallyOptionalUsesDefaultValue()
     {
         $container = new ContainerBuilder();

Tests/Fixtures/includes/MultipleArgumentsOptionalScalarNotReallyOptional.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes;
+
+use Symfony\Component\DependencyInjection\Tests\Compiler\A;
+use Symfony\Component\DependencyInjection\Tests\Compiler\Lille;
+
+class MultipleArgumentsOptionalScalarNotReallyOptional
+{
+    public function __construct(A $a, $foo = 'default_val', Lille $lille)
+    {
+    }
+}
+

Tests/Fixtures/includes/autowiring_classes.php

@@ -186,12 +186,6 @@ public function __construct(A $a, Lille $lille, $foo = 'some_val')
     {
     }
 }
-class MultipleArgumentsOptionalScalarNotReallyOptional
-{
-    public function __construct(A $a, $foo = 'default_val', Lille $lille)
-    {
-    }
-}
 
 /*
  * Classes used for testing createResourceForClass