Merge branch '7.4' into 8.0

* 7.4:
  [TypeInfo] Add space after glue comma
  Remove obsolete code for solved Psalm issue in workflow
  [HttpKernel] #[MapUploadedFile] throws http exception on empty files array if argument not nullable nor has default value
  [Mailer] Add compatibility for Mailtrap's sandbox
  [Serializer] Replace Japan timezone with Asia/Tokyo
  [Config] Reduce the size of serialized resource checkers

Author: nicolas-grekas

Tests/Type/CollectionTypeTest.php

@@ -86,7 +86,7 @@ public function testToString()
         $this->assertEquals('array<bool>', (string) $type);
 
         $type = new CollectionType(new GenericType(Type::builtin(TypeIdentifier::ARRAY), Type::string(), Type::bool()));
-        $this->assertEquals('array<string,bool>', (string) $type);
+        $this->assertEquals('array<string, bool>', (string) $type);
 
         $type = new CollectionType(Type::generic(Type::builtin(TypeIdentifier::ARRAY), Type::bool()), isList: true);
         $this->assertEquals('list<bool>', (string) $type);

Tests/Type/GenericTypeTest.php

@@ -31,10 +31,10 @@ public function testToString()
         $this->assertEquals('array<bool>', (string) $type);
 
         $type = new GenericType(Type::builtin(TypeIdentifier::ARRAY), Type::string(), Type::bool());
-        $this->assertEquals('array<string,bool>', (string) $type);
+        $this->assertEquals('array<string, bool>', (string) $type);
 
         $type = new GenericType(Type::object(self::class), Type::union(Type::bool(), Type::string()), Type::int(), Type::float());
-        $this->assertEquals(\sprintf('%s<bool|string,int,float>', self::class), (string) $type);
+        $this->assertEquals(\sprintf('%s<bool|string, int, float>', self::class), (string) $type);
     }
 
     public function testWrappedTypeIsSatisfiedBy()

Type/GenericType.php

@@ -72,7 +72,7 @@ public function __toString(): string
         $glue = '';
         foreach ($this->variableTypes as $t) {
             $variableTypesString .= $glue.$t;
-            $glue = ',';
+            $glue = ', ';
         }
 
         return $typeString.'<'.$variableTypesString.'>';

TypeFactoryTrait.php

@@ -236,7 +236,7 @@ public static function object(?string $className = null): BuiltinType|ObjectType
      * @param T      $className
      * @param U|null $backingType
      *
-     * @return ($className is class-string<\BackedEnum> ? ($backingType is U ? BackedEnumType<T,U> : BackedEnumType<T,BuiltinType<TypeIdentifier::INT>|BuiltinType<TypeIdentifier::STRING>>) : EnumType<T>))
+     * @return ($className is class-string<\BackedEnum> ? ($backingType is U ? BackedEnumType<T, U> : BackedEnumType<T, BuiltinType<TypeIdentifier::INT>|BuiltinType<TypeIdentifier::STRING>>) : EnumType<T>))
      */
     public static function enum(string $className, ?BuiltinType $backingType = null): EnumType
     {