Merge branch '7.4' into 8.0

* 7.4:
  [Security][TwigBridge] Add access_decision() and access_decision_for_user()
  [DependencyInjection] Optimize `AutowireRequiredMethodsPass`
  [Config] Fix `ReflectionClassResource` hash validation
  [Cache] Fix internal representation of non-static values
  [Cache] Make `TagAwareAdapter` registrable as a service
  [Validator] Add the Video constraint for validating video files
  refactor: Unify & more humane translation message
  [DependencyInjection] Allow multiple `#[AsDecorator]` attributes
  fix Resources translations validators.pt.xlf
  [Security] Pass attributes to nested `ChainUserProviders`
  [Runtime] Expose the runtime class in `$_SERVER['APP_RUNTIME']`
  [Validator] Update translation for the Video constraint
  [Messenger] Firebird Database - incompatibility with expected lowercase columns
  SQLSRV: Change column type from TEXT to STRING
  [DependencyInjection] Parse attributes found on abstract classes for resource definitions
  Fix exception catch when deleting temporary table in the sameDatabaseChecker
  [JsonStreamer] Fix encoding iterable lists
  [Console] Harden array type for test-related user inputs
  [Serializer] Fix serializer crash due to asymmetric visibility on `protected(set)` properties
  [DependencyInjection] Respect original service class when a proxy is defined

Author: nicolas-grekas

DependencyInjection/StreamablePass.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
 /**
  * Sets the streamable metadata to the services that need them.
@@ -31,16 +32,20 @@ public function process(ContainerBuilder $container): void
 
         // retrieve concrete services tagged with "json_streamer.streamable" tag
         foreach ($container->getDefinitions() as $id => $definition) {
-            if (!$tag = ($definition->getTag('json_streamer.streamable')[0] ?? null)) {
+            if (!$tag = $definition->getTag('json_streamer.streamable')[0] ?? null) {
                 continue;
             }
-
-            if (($className = $container->getDefinition($id)->getClass()) && !$container->getDefinition($id)->isAbstract()) {
-                $streamable[$className] = [
-                    'object' => $tag['object'],
-                    'list' => $tag['list'],
-                ];
+            if (!$definition->hasTag('container.excluded')) {
+                throw new InvalidArgumentException(\sprintf('The resource "%s" tagged "json_streamer.streamable" is missing the "container.excluded" tag.', $id));
+            }
+            $class = $container->getParameterBag()->resolveValue($definition->getClass());
+            if (!$class || $definition->isAbstract()) {
+                throw new InvalidArgumentException(\sprintf('The resource "%s" tagged "json_streamer.streamable" must have a class and not be abstract.', $id));
             }
+            $streamable[$class] = [
+                'object' => $tag['object'],
+                'list' => $tag['list'],
+            ];
 
             $container->removeDefinition($id);
         }

Tests/DependencyInjection/StreamablePassTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\JsonStreamer\DependencyInjection\StreamablePass;
 
 class StreamablePassTest extends TestCase
@@ -24,8 +25,7 @@ public function testSetStreamable()
         $container->register('json_streamer.stream_writer');
         $container->register('.json_streamer.cache_warmer.streamer')->setArguments([null]);
 
-        $container->register('streamable')->setClass('Foo')->addTag('json_streamer.streamable', ['object' => true, 'list' => true]);
-        $container->register('abstractStreamable')->setClass('Bar')->addTag('json_streamer.streamable', ['object' => true, 'list' => true])->setAbstract(true);
+        $container->register('streamable')->setClass('Foo')->addTag('json_streamer.streamable', ['object' => true, 'list' => true])->addTag('container.excluded');
         $container->register('notStreamable')->setClass('Baz');
 
         $pass = new StreamablePass();
@@ -34,5 +34,9 @@ public function testSetStreamable()
         $streamerCacheWarmer = $container->getDefinition('.json_streamer.cache_warmer.streamer');
 
         $this->assertSame(['Foo' => ['object' => true, 'list' => true]], $streamerCacheWarmer->getArgument(0));
+
+        $container->register('abstractStreamable')->setClass('Bar')->addTag('json_streamer.streamable', ['object' => true, 'list' => true])->addTag('container.excluded')->setAbstract(true);
+        $this->expectException(InvalidArgumentException::class);
+        $pass->process($container);
     }
 }

Tests/JsonStreamWriterTest.php

@@ -107,7 +107,7 @@ public function testWriteCollection()
         );
 
         $this->assertWritten(
-            '{"0":{"id":1,"name":"dummy"},"1":{"id":1,"name":"dummy"}}',
+            '[{"id":1,"name":"dummy"},{"id":1,"name":"dummy"}]',
             new \ArrayObject([new ClassicDummy(), new ClassicDummy()]),
             Type::iterable(Type::object(ClassicDummy::class), Type::int()),
         );

Write/PhpGenerator.php

@@ -191,7 +191,9 @@ private function generateYields(DataModelNodeInterface $dataModelNode, array $op
         if ($dataModelNode instanceof CollectionNode) {
             ++$context['depth'];
 
-            if ($dataModelNode->getType()->isList()) {
+            $collectionKeyType = $dataModelNode->getType()->getCollectionKeyType();
+
+            if ($collectionKeyType instanceof BuiltinType && TypeIdentifier::INT === $collectionKeyType->getTypeIdentifier()) {
                 $php = $this->yieldInterpolatedString('[', $context)
                     .$this->flushYieldBuffer($context)
                     .$this->line('$prefix'.$context['depth'].' = \'\';', $context)