Undeprecate DoctrineExtractor::getTypes()

derrabus · derrabus · commit eb319a2cbfdc · 2024-05-21T19:05:54.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/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
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/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;
         }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/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'));

Original file line number	Diff line number	Diff line change
`@@ -161,13 +161,8 @@ public function getType(string $class, string $property, array $context = []): ?`
`161`	`161`	`};`
`162`	`162`	`}`
`163`	`163`
`164`		`- /**`
`165`		`- * @deprecated since Symfony 7.1, use "getType" instead`
`166`		`- */`
`167`	`164`	`public function getTypes(string $class, string $property, array $context = []): ?array`
`168`	`165`	`{`
`169`		`- trigger_deprecation('symfony/property-info', '7.1', 'The "%s()" method is deprecated, use "%s::getType()" instead.', __METHOD__, self::class);`
`170`		`-`
`171`	`166`	`if (null === $metadata = $this->getMetadata($class)) {`
`172`	`167`	`return null;`
`173`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,18 +108,13 @@ public function testTestGetPropertiesWithEmbedded()`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/**`
`111`		`- * @group legacy`
`112`		`- *`
`113`	`111`	`* @dataProvider legacyTypesProvider`
`114`	`112`	`*/`
`115`	`113`	`public function testExtractLegacy(string $property, ?array $type = null)`
`116`	`114`	`{`
`117`	`115`	`$this->assertEquals($type, $this->createExtractor()->getTypes(DoctrineDummy::class, $property, []));`
`118`	`116`	`}`
`119`	`117`
`120`		`- /**`
`121`		`- * @group legacy`
`122`		`- */`
`123`	`118`	`public function testExtractWithEmbeddedLegacy()`
`124`	`119`	`{`
`125`	`120`	`$expectedTypes = [new LegacyType(`
`@@ -137,9 +132,6 @@ public function testExtractWithEmbeddedLegacy()`
`137`	`132`	`$this->assertEquals($expectedTypes, $actualTypes);`
`138`	`133`	`}`
`139`	`134`
`140`		`- /**`
`141`		`- * @group legacy`
`142`		`- */`
`143`	`135`	`public function testExtractEnumLegacy()`
`144`	`136`	`{`
`145`	`137`	`$this->assertEquals([new LegacyType(LegacyType::BUILTIN_TYPE_OBJECT, false, EnumString::class)], $this->createExtractor()->getTypes(DoctrineEnum::class, 'enumString', []));`
`@@ -149,9 +141,6 @@ public function testExtractEnumLegacy()`
`149`	`141`	`$this->assertNull($this->createExtractor()->getTypes(DoctrineEnum::class, 'enumCustom', []));`
`150`	`142`	`}`
`151`	`143`
`152`		`- /**`
`153`		`- * @group legacy`
`154`		`- */`
`155`	`144`	`public static function legacyTypesProvider(): array`
`156`	`145`	`{`
`157`	`146`	`// DBAL 4 has a special fallback strategy for BINGINT (int -> string)`
`@@ -251,9 +240,6 @@ public function testGetPropertiesCatchException()`
`251`	`240`	`$this->assertNull($this->createExtractor()->getProperties('Not\Exist'));`
`252`	`241`	`}`
`253`	`242`
`254`		`- /**`
`255`		`- * @group legacy`
`256`		`- */`
`257`	`243`	`public function testGetTypesCatchExceptionLegacy()`
`258`	`244`	`{`
`259`	`245`	`$this->assertNull($this->createExtractor()->getTypes('Not\Exist', 'baz'));`