Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit f5811516367d · 2023-11-14T10:46:33.000+01:00
* 6.4:
  [AssetMapper] Fixing js sourceMappingURL extraction when sourceMappingURL used in code
  [VarExporter] Deprecate per-property lazy-initializers
  [Routing] Extend old Annotations from new Attributes
  [Mailer] Update default Mailjet port
  Bump Symfony version to 6.4.0
  Update VERSION for 6.4.0-BETA3
  Update CHANGELOG for 6.4.0-BETA3
diff --git a/CHANGELOG-6.4.md b/CHANGELOG-6.4.md
@@ -7,6 +7,44 @@ in 6.4 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.4.0...v6.4.1
 
+* 6.4.0-BETA3 (2023-11-10)
+
+ * bug #51666 [RateLimiter] CompoundLimiter was accepting requests even when some limiters already consumed all tokens (10n)
+ * bug #52524 [AssetMapper] Only download a CSS file if it is explicitly advertised (weaverryan)
+ * bug #52523 [AssetMapper] avoid caching MappedAsset inside JavaScript Import (weaverryan)
+ * bug #52519 [AssetMapper] If assets are served from a subdirectory or CDN, also adjust importmap keys (weaverryan)
+ * bug #52508 [AssetMapper] Fix jsdelivr import parsing with no imported value (weaverryan)
+ * security #cve-2023-46734 [TwigBridge] Ensure CodeExtension's filters properly escape their input (nicolas-grekas, GromNaN)
+ * security #cve-2023-46735 [Webhook] Remove user-submitted type from HTTP response (nicolas-grekas)
+ * security #cve-2023-46733 [Security] Fix possible session fixation when only the *token* changes (RobertMe)
+ * bug #52514 [FrameworkBundle] Don't reference SYMFONY_IDE env var in non-debug mode (nicolas-grekas)
+ * bug #52506 [SecurityBundle] wire the secret for Symfony 6.4 compatibility (xabbuh)
+ * bug #52496 [VarDumper] Accept mixed key on `DsPairStub` (marc-mabe)
+ * bug #52502 [Config] Prefixing `FileExistenceResource::__toString()` to avoid conflict with `FileResource` (weaverryan)
+ * bug #52491 [String] Method toByteString conversion using iconv is unreachable (Vincentv92)
+ * bug #52488 [HttpKernel] Fix PHP deprecation (nicolas-grekas)
+ * bug #52469 Check whether secrets are empty and mark them all as sensitive (nicolas-grekas)
+ * feature #52471 [HttpKernel] Add `ControllerResolver::allowControllers()` to define which callables are legit controllers when the `_check_controller_is_allowed` request attribute is set (nicolas-grekas)
+ * bug #52476 [Messenger] fix compatibility with Doctrine DBAL 4 (xabbuh)
+ * bug #52434 [Console][FrameworkBundle] Fix missing `profile` option for console commands (keulinho)
+ * bug #52474 [HttpFoundation] ensure string type with mbstring func overloading enabled (xabbuh)
+ * bug #52472 [HttpClient][WebProfilerBundle] Do not generate cURL command when files are uploaded (MatTheCat)
+ * bug #52457 [Cache][HttpFoundation][Lock] Fix empty username/password for PDO PostgreSQL (HypeMC)
+ * bug #52443 [Yaml] Fix uid binary parsing (mRoca)
+ * feature #52449 [TwigBridge] Mark CodeExtension as `@internal` (fabpot)
+ * bug #52429 [HttpClient] Replace `escapeshellarg` to prevent overpassing `ARG_MAX` (alexandre-daubois)
+ * bug #52442 Disable the "Copy as cURL" button when the debug info are disabled (stof)
+ * bug #52444 Remove full DSNs from exception messages (nicolas-grekas)
+ * feature #52336 [HttpFoundation][Lock] Makes MongoDB adapters usable with `ext-mongodb` only (GromNaN)
+ * bug #52428 [HttpKernel] Preventing error 500 when function putenv is disabled (ShaiMagal)
+ * bug #52427 [Console][Process] do not let context classes extend the message classes (xabbuh)
+ * bug #52408 [Yaml] Fix block scalar array parsing (NickSdot)
+ * bug #52132 [Console] Fix horizontal table top border is incorrectly rendered (OskarStark)
+ * bug #52368 [AssetMapper] Fixing bug where JSCompiler used non-absolute importmap entry path (weaverryan)
+ * bug #52367 [Uid] Fix UuidV7 collisions within the same ms (nicolas-grekas)
+ * bug #52287 [FrameworkBundle] Fix deprecation layer for "enable_annotations" in validation and serializer configuration (lyrixx)
+ * bug #52222 [MonologBridge] Fix support for monolog 3.0 (louismariegaborit)
+
 * 6.4.0-BETA2 (2023-10-29)
 
  * bug #52329 [HttpClient] Psr18Client: parse HTTP Reason Phrase for Response (Hanmac)
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
@@ -248,7 +248,10 @@ private function makeImportsBare(string $content, array &$dependencies): string
         }, $content);
 
         // source maps are not also downloaded - so remove the sourceMappingURL
-        $content = preg_replace('{//# sourceMappingURL=.*$}m', '', $content);
+        // remove the final one only (in case sourceMappingURL is used in the code)
+        if (false !== $lastPos = strrpos($content, '//# sourceMappingURL=')) {
+            $content = substr($content, 0, $lastPos).preg_replace('{//# sourceMappingURL=.*$}m', '', substr($content, $lastPos));
+        }
 
         return preg_replace('{/\*# sourceMappingURL=[^ ]*+ \*/}', '', $content);
     }
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php
@@ -430,7 +430,30 @@ public static function provideDownloadPackagesTests()
             ],
         ];
 
-        yield 'css file removes importmap' => [
+        yield 'js sourcemap is correctly removed when sourceMapping appears in the JS' => [
+            [
+                'es-module-shims' => self::createRemoteEntry('es-module-shims', version: '1.8.2'),
+            ],
+            [
+                [
+                    'url' => '/es-module-shims@1.8.2/+esm',
+                    'body' => <<<'EOF'
+const je="\n//# sourceURL=",Ue="\n//# sourceMappingURL=",Me=/^(text|application)\/(x-)?javascript(;|$)/,_e=/^(application)\/wasm(;|$)/,Ie=/^(text|application)\/json(;|$)/,Re=/^(text|application)\/css(;|$)/,Te=/url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g;export{t as default};
+//# sourceMappingURL=/sm/ef3916de598f421a779ba0e69af94655b2043095cde2410cc01893452d893338.map
+EOF
+                ],
+            ],
+            [
+                'es-module-shims' => [
+                    'content' => <<<'EOF'
+const je="\n//# sourceURL=",Ue="\n//# sourceMappingURL=",Me=/^(text|application)\/(x-)?javascript(;|$)/,_e=/^(application)\/wasm(;|$)/,Ie=/^(text|application)\/json(;|$)/,Re=/^(text|application)\/css(;|$)/,Te=/url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g;export{t as default};
+EOF,
+                    'dependencies' => [],
+                ],
+            ],
+        ];
+
+        yield 'css file removes sourcemap' => [
             ['lodash' => self::createRemoteEntry('bootstrap/dist/bootstrap.css', version: '5.0.6', type: ImportMapType::CSS)],
             [
                 [
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetSmtpTransport.php
@@ -19,7 +19,7 @@ class MailjetSmtpTransport extends EsmtpTransport
 {
     public function __construct(string $username, #[\SensitiveParameter] string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        parent::__construct('in-v3.mailjet.com', 465, true, $dispatcher, $logger);
+        parent::__construct('in-v3.mailjet.com', 587, true, $dispatcher, $logger);
 
         $this->setUsername($username);
         $this->setPassword($password);
diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
 ---
 
  * Add DSN parameter `peer_fingerprint` to verify TLS certificate fingerprint
+ * Change the default port for the `mailjet+smtp` transport from 465 to 587
 
 6.3
 ---
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -17,7 +17,7 @@ class_exists(\Symfony\Component\Routing\Attribute\Route::class);
 
 if (false) {
     #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
-    class Route
+    class Route extends \Symfony\Component\Routing\Attribute\Route
     {
     }
 }
diff --git a/src/Symfony/Component/Routing/Attribute/Route.php b/src/Symfony/Component/Routing/Attribute/Route.php
@@ -14,6 +14,8 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Alexander M. Turek <me@derrabus.de>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
 class Route
diff --git a/src/Symfony/Component/Serializer/Annotation/Context.php b/src/Symfony/Component/Serializer/Annotation/Context.php
@@ -17,7 +17,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\Context::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-    class Context
+    class Context extends \Symfony\Component\Serializer\Attribute\Context
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php b/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\DiscriminatorMap::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_CLASS)]
-    class DiscriminatorMap
+    class DiscriminatorMap extends \Symfony\Component\Serializer\Attribute\DiscriminatorMap
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/Groups.php b/src/Symfony/Component/Serializer/Annotation/Groups.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\Groups::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS)]
-    class Groups
+    class Groups extends \Symfony\Component\Serializer\Attribute\Groups
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/Ignore.php b/src/Symfony/Component/Serializer/Annotation/Ignore.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\Ignore::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-    final class Ignore
+    class Ignore extends \Symfony\Component\Serializer\Attribute\Ignore
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\MaxDepth::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-    class MaxDepth
+    class MaxDepth extends \Symfony\Component\Serializer\Attribute\MaxDepth
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/SerializedName.php b/src/Symfony/Component/Serializer/Annotation/SerializedName.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\SerializedName::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-    final class SerializedName
+    class SerializedName extends \Symfony\Component\Serializer\Attribute\SerializedName
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/SerializedPath.php b/src/Symfony/Component/Serializer/Annotation/SerializedPath.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\SerializedPath::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-    final class SerializedPath
+    class SerializedPath extends \Symfony\Component\Serializer\Attribute\SerializedPath
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Attribute/Context.php b/src/Symfony/Component/Serializer/Attribute/Context.php
@@ -15,6 +15,8 @@
 
 /**
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Context
diff --git a/src/Symfony/Component/Serializer/Attribute/DiscriminatorMap.php b/src/Symfony/Component/Serializer/Attribute/DiscriminatorMap.php
@@ -15,6 +15,8 @@
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class DiscriminatorMap
diff --git a/src/Symfony/Component/Serializer/Attribute/Groups.php b/src/Symfony/Component/Serializer/Attribute/Groups.php
@@ -15,6 +15,8 @@
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS)]
 class Groups
diff --git a/src/Symfony/Component/Serializer/Attribute/Ignore.php b/src/Symfony/Component/Serializer/Attribute/Ignore.php
@@ -13,9 +13,11 @@
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-final class Ignore
+class Ignore
 {
 }
 
diff --git a/src/Symfony/Component/Serializer/Attribute/MaxDepth.php b/src/Symfony/Component/Serializer/Attribute/MaxDepth.php
@@ -15,6 +15,8 @@
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
 class MaxDepth
diff --git a/src/Symfony/Component/Serializer/Attribute/SerializedName.php b/src/Symfony/Component/Serializer/Attribute/SerializedName.php
@@ -15,9 +15,11 @@
 
 /**
  * @author Fabien Bourigault <bourigaultfabien@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-final class SerializedName
+class SerializedName
 {
     public function __construct(private readonly string $serializedName)
     {
diff --git a/src/Symfony/Component/Serializer/Attribute/SerializedPath.php b/src/Symfony/Component/Serializer/Attribute/SerializedPath.php
@@ -17,9 +17,11 @@
 
 /**
  * @author Tobias Bönner <tobi@boenner.family>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-final class SerializedPath
+class SerializedPath
 {
     private PropertyPath $serializedPath;
 
diff --git a/src/Symfony/Component/VarExporter/CHANGELOG.md b/src/Symfony/Component/VarExporter/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.4
+---
+
+ * Deprecate per-property lazy-initializers
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/VarExporter/LazyGhostTrait.php b/src/Symfony/Component/VarExporter/LazyGhostTrait.php
@@ -23,29 +23,20 @@ trait LazyGhostTrait
     /**
      * Creates a lazy-loading ghost instance.
      *
-     * When the initializer is a closure, it should initialize all properties at
-     * once and is given the instance to initialize as argument.
-     *
-     * When the initializer is an array of closures, it should be indexed by
-     * properties and closures should accept 4 arguments: the instance to
-     * initialize, the property to initialize, its write-scope, and its default
-     * value. Each closure should return the value of the corresponding property.
-     * The special "\0" key can be used to define a closure that returns all
-     * properties at once when full-initialization is needed; it takes the
-     * instance and its default properties as arguments.
-     *
-     * Properties should be indexed by their array-cast name, see
+     * Skipped properties should be indexed by their array-cast identifier, see
      * https://php.net/manual/language.types.array#language.types.array.casting
      *
-     * @param (\Closure(static):void
-     *        |array<string, \Closure(static, string, ?string, mixed):mixed>
-     *        |array{"\0": \Closure(static, array<string, mixed>):array<string, mixed>}) $initializer
-     * @param array<string, true>|null $skippedProperties An array indexed by the properties to skip, aka the ones
-     *                                                    that the initializer doesn't set when its a closure
+     * @param (\Closure(static):void   $initializer       The closure should initialize the object it receives as argument
+     * @param array<string, true>|null $skippedProperties An array indexed by the properties to skip, a.k.a. the ones
+     *                                                    that the initializer doesn't initialize, if any
      * @param static|null              $instance
      */
     public static function createLazyGhost(\Closure|array $initializer, array $skippedProperties = null, object $instance = null): static
     {
+        if (\is_array($initializer)) {
+            trigger_deprecation('symfony/var-exporter', '6.4', 'Per-property lazy-initializers are deprecated and won\'t be supported anymore in 7.0, use an object initializer instead.');
+        }
+
         $onlyProperties = null === $skippedProperties && \is_array($initializer) ? $initializer : null;
 
         if (self::class !== $class = $instance ? $instance::class : static::class) {
diff --git a/src/Symfony/Component/VarExporter/README.md b/src/Symfony/Component/VarExporter/README.md
@@ -105,18 +105,6 @@ $foo = FooLazyGhost::createLazyGhost(initializer: function (Foo $instance): void
 // be called only when and if a *property* is accessed.
 ```
 
-You can also partially initialize the objects on a property-by-property basis by
-adding two arguments to the initializer:
-
-```php
-$initializer = function (Foo $instance, string $propertyName, ?string $propertyScope): mixed {
-    if (Foo::class === $propertyScope && 'bar' === $propertyName) {
-        return 123;
-    }
-    // [...] Add more logic for the other properties
-};
-```
-
 ### `LazyProxyTrait`
 
 Alternatively, `LazyProxyTrait` can be used to create virtual proxies:
diff --git a/src/Symfony/Component/VarExporter/Tests/LazyGhostTraitTest.php b/src/Symfony/Component/VarExporter/Tests/LazyGhostTraitTest.php
@@ -186,6 +186,9 @@ public function testFullInitialization()
         $this->assertSame(1, $counter);
     }
 
+    /**
+     * @group legacy
+     */
     public function testPartialInitialization()
     {
         $counter = 0;
@@ -243,6 +246,9 @@ public function testPartialInitialization()
         $this->assertSame([123, 345, 456, 567, 234, 678], array_values($properties));
     }
 
+    /**
+     * @group legacy
+     */
     public function testPartialInitializationWithReset()
     {
         $initializer = static fn (ChildTestClass $instance, string $property, ?string $scope, mixed $default) => 234;
@@ -275,6 +281,9 @@ public function testPartialInitializationWithReset()
         $this->assertSame(234, $instance->public);
     }
 
+    /**
+     * @group legacy
+     */
     public function testPartialInitializationWithNastyPassByRef()
     {
         $instance = ChildTestClass::createLazyGhost(['public' => fn (ChildTestClass $instance, string &$property, ?string &$scope, mixed $default) => $property = $scope = 123]);
@@ -307,6 +316,9 @@ public function testReflectionPropertyGetValue()
         $this->assertSame(-3, $r->getValue($obj));
     }
 
+    /**
+     * @group legacy
+     */
     public function testFullPartialInitialization()
     {
         $counter = 0;
@@ -335,6 +347,9 @@ public function testFullPartialInitialization()
         $this->assertSame(1000, $counter);
     }
 
+    /**
+     * @group legacy
+     */
     public function testPartialInitializationFallback()
     {
         $counter = 0;
@@ -357,6 +372,9 @@ public function testPartialInitializationFallback()
         $this->assertSame(1000, $counter);
     }
 
+    /**
+     * @group legacy
+     */
     public function testFullInitializationAfterPartialInitialization()
     {
         $counter = 0;
diff --git a/src/Symfony/Component/VarExporter/composer.json b/src/Symfony/Component/VarExporter/composer.json

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class MailjetSmtpTransport extends EsmtpTransport`
`19`	`19`	`{`
`20`	`20`	`public function __construct(string $username, #[\SensitiveParameter] string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`21`	`21`	`{`
`22`		`- parent::__construct('in-v3.mailjet.com', 465, true, $dispatcher, $logger);`
	`22`	`+ parent::__construct('in-v3.mailjet.com', 587, true, $dispatcher, $logger);`
`23`	`23`
`24`	`24`	`$this->setUsername($username);`
`25`	`25`	`$this->setPassword($password);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class_exists(\Symfony\Component\Routing\Attribute\Route::class);`
`17`	`17`
`18`	`18`	`if (false) {`
`19`	`19`	`#[\Attribute(\Attribute::IS_REPEATABLE \| \Attribute::TARGET_CLASS \| \Attribute::TARGET_METHOD)]`
`20`		`- class Route`
	`20`	`+ class Route extends \Symfony\Component\Routing\Attribute\Route`
`21`	`21`	`{`
`22`	`22`	`}`
`23`	`23`	`}`
-Original file line number
+Diff line change
 /**
  * @author Fabien Potencier <[email protected]>
  * @author Alexander M. Turek <[email protected]>
 + *
 + * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
 class Route
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\DiscriminatorMap::class);`
`15`	`15`
`16`	`16`	`if (false) {`
`17`	`17`	`#[\Attribute(\Attribute::TARGET_CLASS)]`
`18`		`- class DiscriminatorMap`
	`18`	`+ class DiscriminatorMap extends \Symfony\Component\Serializer\Attribute\DiscriminatorMap`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`	`}`