fix non-existing uuid 7 & 8 in Symfony 5.4

nelmio · Jan 18, 2025 · 3851753 · 3851753
1 parent 5589601
commit 3851753
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 15 deletions.
diff --git a/tests/Functional/ModelDescriber/Fixtures/UuidClass.json b/tests/Functional/ModelDescriber/Fixtures/UuidClass.json
@@ -6,9 +6,7 @@
         "uuidV3",
         "uuidV4",
         "uuidV5",
-        "uuidV6",
-        "uuidV7",
-        "uuidV8"
+        "uuidV6"
     ],
     "properties": {
         "uuid": {
@@ -39,14 +37,6 @@
             "type": "string",
             "format": "uuid"
         },
-        "uuidV7": {
-            "type": "string",
-            "format": "uuid"
-        },
-        "uuidV8": {
-            "type": "string",
-            "format": "uuid"
-        },
         "nullableUuid": {
             "type": "string",
             "format": "uuid",

diff --git a/tests/Functional/ModelDescriber/Fixtures/UuidClass.php b/tests/Functional/ModelDescriber/Fixtures/UuidClass.php
@@ -18,8 +18,6 @@
 use Symfony\Component\Uid\UuidV4;
 use Symfony\Component\Uid\UuidV5;
 use Symfony\Component\Uid\UuidV6;
-use Symfony\Component\Uid\UuidV7;
-use Symfony\Component\Uid\UuidV8;
 
 class UuidClass
 {
@@ -30,8 +28,6 @@ class UuidClass
     public UuidV4 $uuidV4;
     public UuidV5 $uuidV5;
     public UuidV6 $uuidV6;
-    public UuidV7 $uuidV7;
-    public UuidV8 $uuidV8;
 
     public ?Uuid $nullableUuid;
 }
diff --git a/tests/Functional/ModelDescriber/Fixtures/UuidClass7And8.json b/tests/Functional/ModelDescriber/Fixtures/UuidClass7And8.json
@@ -0,0 +1,57 @@
+{
+    "required": [
+        "uuid",
+        "ulid",
+        "uuidV1",
+        "uuidV3",
+        "uuidV4",
+        "uuidV5",
+        "uuidV6",
+        "uuidV7",
+        "uuidV8"
+    ],
+    "properties": {
+        "uuid": {
+            "type": "string",
+            "format": "uuid"
+        },
+        "ulid": {
+            "type": "string",
+            "format": "uuid"
+        },
+        "uuidV1": {
+            "type": "string",
+            "format": "uuid"
+        },
+        "uuidV3": {
+            "type": "string",
+            "format": "uuid"
+        },
+        "uuidV4": {
+            "type": "string",
+            "format": "uuid"
+        },
+        "uuidV5": {
+            "type": "string",
+            "format": "uuid"
+        },
+        "uuidV6": {
+            "type": "string",
+            "format": "uuid"
+        },
+        "uuidV7": {
+            "type": "string",
+            "format": "uuid"
+        },
+        "uuidV8": {
+            "type": "string",
+            "format": "uuid"
+        },
+        "nullableUuid": {
+            "type": "string",
+            "format": "uuid",
+            "nullable": true
+        }
+    },
+    "type": "object"
+}
diff --git a/tests/Functional/ModelDescriber/Fixtures/UuidClass7And8.php b/tests/Functional/ModelDescriber/Fixtures/UuidClass7And8.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the NelmioApiDocBundle package.
+ *
+ * (c) Nelmio
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nelmio\ApiDocBundle\Tests\Functional\ModelDescriber\Fixtures;
+
+use Symfony\Component\Uid\Ulid;
+use Symfony\Component\Uid\Uuid;
+use Symfony\Component\Uid\UuidV1;
+use Symfony\Component\Uid\UuidV3;
+use Symfony\Component\Uid\UuidV4;
+use Symfony\Component\Uid\UuidV5;
+use Symfony\Component\Uid\UuidV6;
+use Symfony\Component\Uid\UuidV7;
+use Symfony\Component\Uid\UuidV8;
+
+class UuidClass7And8
+{
+    public Uuid $uuid;
+    public Ulid $ulid;
+    public UuidV1 $uuidV1;
+    public UuidV3 $uuidV3;
+    public UuidV4 $uuidV4;
+    public UuidV5 $uuidV5;
+    public UuidV6 $uuidV6;
+    public UuidV7 $uuidV7;
+    public UuidV8 $uuidV8;
+
+    public ?Uuid $nullableUuid;
+}
diff --git a/tests/Functional/ModelDescriber/ObjectModelDescriberTest.php b/tests/Functional/ModelDescriber/ObjectModelDescriberTest.php
@@ -18,6 +18,7 @@
 use Nelmio\ApiDocBundle\Tests\Functional\WebTestCase;
 use OpenApi\Annotations as OA;
 use OpenApi\Annotations\OpenApi;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 
 class ObjectModelDescriberTest extends WebTestCase
@@ -105,6 +106,12 @@ public static function provideFixtures(): \Generator
             Fixtures\UuidClass::class
         ];
 
+        if (version_compare(Kernel::VERSION, '6.4.0', '>=')) {
+            yield [
+                Fixtures\UuidClass7And8::class
+            ];
+        }
+
         yield [
             Fixtures\Refs::class
         ];