symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Lines changed: 11 additions & 3 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Lines changed: 11 additions & 3 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
Lines changed: 32 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
Lines changed: 32 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
Lines changed: 11 additions & 0 deletions
@@ -23,6 +23,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\TypedReference;
@@ -279,9 +280,16 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
             if ($checkAttributes) {
                 foreach ($parameter->getAttributes() as $attribute) {
                     if (\in_array($attribute->getName(), [TaggedIterator::class, TaggedLocator::class, Autowire::class, MapDecorated::class], true)) {
-                        $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
-
-                        continue 2;
+                        try {
+                            $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
+                            continue 2;
+                        } catch (ParameterNotFoundException $e) {
+                            if (!$parameter->isDefaultValueAvailable()) {
+                                throw new AutowiringFailedException($this->currentId, $e->getMessage(), 0, $e);
+                            }
+                            $arguments[$index] = clone $this->defaultArgument;
+                            $arguments[$index]->value = $parameter->getDefaultValue();
+                        }
                     }
                 }
             }
 
@@ -1217,6 +1217,38 @@ public function testAutowireAttribute()
         $this->assertNull($service->invalid);
     }
 
+    public function testAutowireAttributeNullFallbackTestRequired()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', AutowireAttributeNullFallback::class)
+            ->setAutowired(true)
+            ->setPublic(true)
+        ;
+
+        $this->expectException(AutowiringFailedException::class);
+        $this->expectExceptionMessage('You have requested a non-existent parameter "required.parameter".');
+        (new AutowirePass())->process($container);
+    }
+
+    public function testAutowireAttributeNullFallbackTestOptional()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', AutowireAttributeNullFallback::class)
+            ->setAutowired(true)
+            ->setPublic(true)
+        ;
+
+        $container->setParameter('required.parameter', 'foo');
+
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('foo');
+
+        $this->assertSame(['foo'], $definition->getArguments());
+    }
+
     public function testAsDecoratorAttribute()
     {
         $container = new ContainerBuilder();
 
@@ -56,6 +56,17 @@ public function __construct(
     }
 }
 
+class AutowireAttributeNullFallback
+{
+    public function __construct(
+        #[Autowire('%required.parameter%')]
+        public string $required,
+        #[Autowire('%optional.parameter%')]
+        public ?string $optional = null,
+    ) {
+    }
+}
+
 interface AsDecoratorInterface
 {
 }
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,17 @@ public function __construct(`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
	`59`	`+class AutowireAttributeNullFallback`
	`60`	`+{`
	`61`	`+ public function __construct(`
	`62`	`+ #[Autowire('%required.parameter%')]`
	`63`	`+ public string $required,`
	`64`	`+ #[Autowire('%optional.parameter%')]`
	`65`	`+ public ?string $optional = null,`
	`66`	`+ ) {`
	`67`	`+ }`
	`68`	`+}`
	`69`	`+`
`59`	`70`	`interface AsDecoratorInterface`
`60`	`71`	`{`
`61`	`72`	`}`