remove 80 / 81 suffix classes

nelmio · Oct 24, 2024 · 3f833b3 · 3f833b3
1 parent e5081d6
commit 3f833b3
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 96 deletions.
diff --git a/tests/Functional/Configs/AlternativeNamesPHP80Entities.yaml b/tests/Functional/Configs/AlternativeNamesPHP80Entities.yaml
diff --git a/tests/Functional/Configs/AlternativeNamesPHP81Entities.yaml b/tests/Functional/Configs/AlternativeNamesPHP81Entities.yaml
diff --git a/tests/Functional/Controller/ApiController.php b/tests/Functional/Controller/ApiController.php
@@ -22,7 +22,7 @@
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\ArticleInterface;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\CompoundEntity;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\EntityThroughNameConverter;
-use Nelmio\ApiDocBundle\Tests\Functional\Entity\EntityWithAlternateType81;
+use Nelmio\ApiDocBundle\Tests\Functional\Entity\EntityWithAlternateType;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\EntityWithFalsyDefaults;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\EntityWithNullableSchemaSet;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\EntityWithObjectType;
@@ -306,7 +306,7 @@ public function symfonyConstraintsWithGroupsAction()
         response: 200,
         description: 'success',
         content: new OA\JsonContent(
-            ref: new Model(type: EntityWithAlternateType81::class),
+            ref: new Model(type: EntityWithAlternateType::class),
         ),
     )]
     public function alternateEntityType()

diff --git a/tests/Functional/Controller/PromotedPropertiesController81.php b/tests/Functional/Controller/PromotedPropertiesController81.php
@@ -14,7 +14,7 @@
 namespace Nelmio\ApiDocBundle\Tests\Functional\Controller;
 
 use Nelmio\ApiDocBundle\Annotation\Model;
-use Nelmio\ApiDocBundle\Tests\Functional\Entity\EntityWithPromotedPropertiesWithDefaults81;
+use Nelmio\ApiDocBundle\Tests\Functional\Entity\EntityWithPromotedPropertiesWithDefaults;
 use OpenApi\Attributes as OA;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -29,7 +29,7 @@ class PromotedPropertiesController81
         description: 'Operation automatically detected',
     )]
     #[OA\RequestBody(
-        content: new Model(type: EntityWithPromotedPropertiesWithDefaults81::class),
+        content: new Model(type: EntityWithPromotedPropertiesWithDefaults::class),
     )]
     public function entityWithPromotedPropertiesWithDefaults()
     {

diff --git a/tests/Functional/ControllerTest.php b/tests/Functional/ControllerTest.php
@@ -88,7 +88,7 @@ public static function provideAttributeTestCases(): \Generator
             ],
             'PromotedPropertiesDefaults',
             [],
-            [__DIR__.'/Configs/AlternativeNamesPHP81Entities.yaml', ...self::cleanUnusedComponentsConfig()],
+            [...self::cleanUnusedComponentsConfig()],
         ];
 
         yield 'JMS model opt out' => [

diff --git a/...onal/Entity/EntityWithAlternateType81.php → ...tional/Entity/EntityWithAlternateType.php b/...onal/Entity/EntityWithAlternateType81.php → ...tional/Entity/EntityWithAlternateType.php
@@ -14,7 +14,7 @@
 use OpenApi\Attributes as OA;
 
 #[OA\Schema(type: 'array', items: new OA\Items(type: 'string'))]
-class EntityWithAlternateType81 implements \IteratorAggregate
+class EntityWithAlternateType implements \IteratorAggregate
 {
     /**
      * @var string

diff --git a/tests/Functional/Entity/EntityWithAlternateType80.php b/tests/Functional/Entity/EntityWithAlternateType80.php
diff --git a/...yWithPromotedPropertiesWithDefaults81.php → ...ityWithPromotedPropertiesWithDefaults.php b/...yWithPromotedPropertiesWithDefaults81.php → ...ityWithPromotedPropertiesWithDefaults.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Validator\Constraints as Assert;
 
-class EntityWithPromotedPropertiesWithDefaults81
+class EntityWithPromotedPropertiesWithDefaults
 {
     #[Assert\NotBlank]
     public readonly string $nonNullableNonPromotedPropertyWithDefault;

diff --git a/tests/Functional/Entity/EntityWithPromotedPropertiesWithDefaults80.php b/tests/Functional/Entity/EntityWithPromotedPropertiesWithDefaults80.php
diff --git a/tests/Functional/FunctionalTest.php b/tests/Functional/FunctionalTest.php
@@ -863,11 +863,7 @@ public function testEnumSupport(): void
 
     public function testEntitiesWithOverriddenSchemaTypeDoNotReadOtherProperties(): void
     {
-        if (TestKernel::isAttributesAvailable()) {
-            $model = $this->getModel('EntityWithAlternateType81');
-        } else {
-            $model = $this->getModel('EntityWithAlternateType80');
-        }
+        $model = $this->getModel('EntityWithAlternateType');
 
         self::assertSame('array', $model->type);
         self::assertSame('string', $model->items->type);