Merge branch '7.4' into 8.0

* 7.4:
  [Console] Support enum in invokable commands
  fix missing newline
  [Console] Simplify using invokable commands when the component is used standalone
  [Console] Fix setting aliases & hidden via name
  remove no longer needed conflict rule on symfony/event-dispatcher
  [JsonStreamer] Add PHPDoc to generated code
  [SecurityBundle] register alias for argument for password hasher

Author: chalasr

Read/PhpGenerator.php

@@ -51,6 +51,9 @@ public function generate(DataModelNodeInterface $dataModel, bool $decodeFromStre
         if ($decodeFromStream) {
             return $this->line('<?php', $context)
                 .$this->line('', $context)
+                .$this->line('/**', $context)
+                .$this->line(' * @return '.$dataModel->getType(), $context)
+                .$this->line(' */', $context)
                 .$this->line('return static function (mixed $stream, \\'.ContainerInterface::class.' $valueTransformers, \\'.LazyInstantiator::class.' $instantiator, array $options): mixed {', $context)
                 .$providers
                 .($this->canBeDecodedWithJsonDecode($dataModel, $decodeFromStream)
@@ -61,6 +64,9 @@ public function generate(DataModelNodeInterface $dataModel, bool $decodeFromStre
 
         return $this->line('<?php', $context)
             .$this->line('', $context)
+            .$this->line('/**', $context)
+            .$this->line(' * @return '.$dataModel->getType(), $context)
+            .$this->line(' */', $context)
             .$this->line('return static function (string|\\Stringable $string, \\'.ContainerInterface::class.' $valueTransformers, \\'.Instantiator::class.' $instantiator, array $options): mixed {', $context)
             .$providers
             .($this->canBeDecodedWithJsonDecode($dataModel, $decodeFromStream)

Tests/Fixtures/stream_reader/backed_enum.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum
+ */
 return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
     $providers['Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum'] = static function ($data) {
         return \Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum::from($data);

Tests/Fixtures/stream_reader/backed_enum.stream.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum
+ */
 return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
     $providers['Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum'] = static function ($stream, $offset, $length) {
         return \Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum::from(\Symfony\Component\JsonStreamer\Read\Decoder::decodeStream($stream, $offset, $length));

Tests/Fixtures/stream_reader/dict.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return array<string,mixed>
+ */
 return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
     return \Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string);
 };

Tests/Fixtures/stream_reader/dict.stream.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return array<string,mixed>
+ */
 return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
     $providers['array<string,mixed>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
         $data = \Symfony\Component\JsonStreamer\Read\Splitter::splitDict($stream, $offset, $length);

Tests/Fixtures/stream_reader/iterable.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return iterable
+ */
 return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
     return \Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string);
 };

Tests/Fixtures/stream_reader/iterable.stream.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return iterable
+ */
 return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
     $providers['iterable'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
         $data = \Symfony\Component\JsonStreamer\Read\Splitter::splitDict($stream, $offset, $length);

Tests/Fixtures/stream_reader/list.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return array<int,mixed>
+ */
 return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
     return \Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string);
 };

Tests/Fixtures/stream_reader/list.stream.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return array<int,mixed>
+ */
 return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
     $providers['array<int,mixed>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
         $data = \Symfony\Component\JsonStreamer\Read\Splitter::splitList($stream, $offset, $length);

Tests/Fixtures/stream_reader/mixed.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return mixed
+ */
 return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
     return \Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string);
 };