Merge branch '7.1' into 7.2

* 7.1:
  Undeprecate DoctrineExtractor::getTypes()
  clarify deprecations around annotated classes

Author: derrabus

UPGRADE-7.1.md

@@ -92,7 +92,10 @@ Mailer
 HttpKernel
 ----------
 
- * Deprecate `Extension::addAnnotatedClassesToCompile()` and related code infrastructure
+ * The `Extension` class is marked as internal, extend the `Extension` class from the DependencyInjection component instead
+ * Deprecate `Extension::addAnnotatedClassesToCompile()`
+ * Deprecate `AddAnnotatedClassesToCachePass`
+ * Deprecate the `setAnnotatedClassCache()` and `getAnnotatedClassesToCompile()` methods of the `Kernel` class
 
 SecurityBundle
 --------------

src/Symfony/Bridge/Doctrine/CHANGELOG.md

@@ -4,7 +4,6 @@ CHANGELOG
 7.1
 ---
 
- * Deprecate the `DoctrineExtractor::getTypes()` method, use `DoctrineExtractor::getType()` instead
  * Allow `EntityValueResolver` to return a list of entities
  * Add support for auto-closing idle connections
  * Allow validating every class against `UniqueEntity` constraint

src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php

@@ -161,13 +161,8 @@ public function getType(string $class, string $property, array $context = []): ?
         };
     }
 
-    /**
-     * @deprecated since Symfony 7.1, use "getType" instead
-     */
     public function getTypes(string $class, string $property, array $context = []): ?array
     {
-        trigger_deprecation('symfony/property-info', '7.1', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);
-
         if (null === $metadata = $this->getMetadata($class)) {
             return null;
         }

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -108,18 +108,13 @@ public function testTestGetPropertiesWithEmbedded()
     }
 
     /**
-     * @group legacy
-     *
      * @dataProvider legacyTypesProvider
      */
     public function testExtractLegacy(string $property, ?array $type = null)
     {
         $this->assertEquals($type, $this->createExtractor()->getTypes(DoctrineDummy::class, $property, []));
     }
 
-    /**
-     * @group legacy
-     */
     public function testExtractWithEmbeddedLegacy()
     {
         $expectedTypes = [new LegacyType(
@@ -137,9 +132,6 @@ public function testExtractWithEmbeddedLegacy()
         $this->assertEquals($expectedTypes, $actualTypes);
     }
 
-    /**
-     * @group legacy
-     */
     public function testExtractEnumLegacy()
     {
         $this->assertEquals([new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, false, EnumString::class)], $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumString', []));
@@ -149,9 +141,6 @@ public function testExtractEnumLegacy()
         $this->assertNull($this->createExtractor()->getTypes(DoctrineEnum::class, 'enumCustom', []));
     }
 
-    /**
-     * @group legacy
-     */
     public static function legacyTypesProvider(): array
     {
         // DBAL 4 has a special fallback strategy for BINGINT (int -> string)
@@ -251,9 +240,6 @@ public function testGetPropertiesCatchException()
         $this->assertNull($this->createExtractor()->getProperties('Not\Exist'));
     }
 
-    /**
-     * @group legacy
-     */
     public function testGetTypesCatchExceptionLegacy()
     {
         $this->assertNull($this->createExtractor()->getTypes('Not\Exist', 'baz'));

src/Symfony/Component/HttpKernel/CHANGELOG.md

@@ -9,7 +9,10 @@ CHANGELOG
  * Add `$validationFailedStatusCode` argument to `#[MapQueryParameter]` that allows setting a custom HTTP status code when validation fails
  * Add `NearMissValueResolverException` to let value resolvers report when an argument could be under their watch but failed to be resolved
  * Add `$type` argument to `#[MapRequestPayload]` that allows mapping a list of items
- * Deprecate `Extension::addAnnotatedClassesToCompile()` and related code infrastructure
+ * The `Extension` class is marked as internal, extend the `Extension` class from the DependencyInjection component instead
+ * Deprecate `Extension::addAnnotatedClassesToCompile()`
+ * Deprecate `AddAnnotatedClassesToCachePass`
+ * Deprecate the `setAnnotatedClassCache()` and `getAnnotatedClassesToCompile()` methods of the `Kernel` class
  * Add `#[MapUploadedFile]` attribute to fetch, validate, and inject uploaded files into controller arguments
 
 7.0