Merge branch '7.4' into 8.0

* 7.4:
  [DependencyInjection] Fix PriorityTaggedServiceTrait when tag attributes are not a list
  [Serializer][Validator] Attribute metadata no longer requires `container.excluded` tags
  Bump Symfony version to 7.4.2
  Update VERSION for 7.4.1
  Update CHANGELOG for 7.4.1
  Bump Symfony version to 7.3.9
  Update VERSION for 7.3.8
  Update CHANGELOG for 7.3.8
  Bump Symfony version to 6.4.31
  Update VERSION for 6.4.30
  Update CONTRIBUTORS for 6.4.30
  Update CHANGELOG for 6.4.30

Author: nicolas-grekas

DependencyInjection/AttributeMetadataPass.php

@@ -13,7 +13,6 @@
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\Validator\Exception\MappingException;
 
 /**
@@ -33,9 +32,6 @@ public function process(ContainerBuilder $container): void
             if (!$definition->hasTag('validator.attribute_metadata')) {
                 continue;
             }
-            if (!$definition->hasTag('container.excluded')) {
-                throw new InvalidArgumentException(\sprintf('The resource "%s" tagged "validator.attribute_metadata" is missing the "container.excluded" tag.', $id));
-            }
             $class = $resolve($definition->getClass());
             foreach ($definition->getTag('validator.attribute_metadata') as $attributes) {
                 if ($class !== $for = $attributes['for'] ?? $class) {

Tests/DependencyInjection/AttributeMetadataPassTest.php

@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\Validator\DependencyInjection\AttributeMetadataPass;
 use Symfony\Component\Validator\Exception\MappingException;
 
@@ -49,18 +48,14 @@ public function testProcessWithTaggedServices()
             ->addMethodCall('addAttributeMappings', [[]]);
 
         $container->register('service1', '%user_entity.class%')
-            ->addTag('validator.attribute_metadata')
-            ->addTag('container.excluded');
+            ->addTag('validator.attribute_metadata');
         $container->register('service2', 'App\Entity\Product')
-            ->addTag('validator.attribute_metadata')
-            ->addTag('container.excluded');
+            ->addTag('validator.attribute_metadata');
         $container->register('service3', 'App\Entity\Order')
-            ->addTag('validator.attribute_metadata')
-            ->addTag('container.excluded');
+            ->addTag('validator.attribute_metadata');
         // Classes should be deduplicated
         $container->register('service4', 'App\Entity\Order')
-            ->addTag('validator.attribute_metadata')
-            ->addTag('container.excluded');
+            ->addTag('validator.attribute_metadata');
 
         (new AttributeMetadataPass())->process($container);
 
@@ -77,18 +72,6 @@ public function testProcessWithTaggedServices()
         $this->assertEquals([$expectedClasses], $methodCalls[1][1]);
     }
 
-    public function testThrowsWhenMissingExcludedTag()
-    {
-        $container = new ContainerBuilder();
-        $container->register('validator.builder');
-
-        $container->register('service_without_excluded', 'App\\Entity\\User')
-            ->addTag('validator.attribute_metadata');
-
-        $this->expectException(InvalidArgumentException::class);
-        (new AttributeMetadataPass())->process($container);
-    }
-
     public function testProcessWithForOptionAndMatchingMembers()
     {
         $sourceClass = _AttrMeta_Source::class;
@@ -98,8 +81,7 @@ public function testProcessWithForOptionAndMatchingMembers()
         $container->register('validator.builder');
 
         $container->register('service.source', $sourceClass)
-            ->addTag('validator.attribute_metadata', ['for' => $targetClass])
-            ->addTag('container.excluded');
+            ->addTag('validator.attribute_metadata', ['for' => $targetClass]);
 
         (new AttributeMetadataPass())->process($container);
 
@@ -118,8 +100,7 @@ public function testProcessWithForOptionAndMissingMemberThrows()
         $container->register('validator.builder');
 
         $container->register('service.source', $sourceClass)
-            ->addTag('validator.attribute_metadata', ['for' => $targetClass])
-            ->addTag('container.excluded');
+            ->addTag('validator.attribute_metadata', ['for' => $targetClass]);
 
         $this->expectException(MappingException::class);
         (new AttributeMetadataPass())->process($container);