refactor

Author: Maxcastel

tests/Functional/OpenApiTest.php

@@ -668,6 +668,19 @@ public function testOpenApiPolymorphicBookSchema(): void
         $this->assertArrayHasKey('Book', $schemas, 'Book parent schema should exist');
         $bookSchema = $schemas['Book'];
 
+        $this->assertArrayHasKey('type', $bookSchema);
+        $this->assertArrayHasKey('properties', $bookSchema);
+
+        $bookSchemaProperties = $bookSchema['properties'];
+        $this->assertIsArray($bookSchemaProperties);
+        $this->assertCount(5, $bookSchemaProperties);
+
+        $this->assertArrayHasKey('id', $bookSchemaProperties);
+        $this->assertArrayHasKey('title', $bookSchemaProperties);
+        $this->assertArrayHasKey('author', $bookSchemaProperties);
+        $this->assertArrayHasKey('isbn', $bookSchemaProperties);
+        $this->assertArrayHasKey('bookType', $bookSchemaProperties);
+
         $this->assertArrayHasKey('discriminator', $bookSchema);
         $discriminator = $bookSchema['discriminator'];
 
@@ -697,48 +710,42 @@ public function testOpenApiPolymorphicBookSchema(): void
         $this->assertArrayHasKey('FictionBook', $schemas, 'FictionBook schema should exist');
         $fictionBookSchema = $schemas['FictionBook'];
 
-        $this->assertIsArray($fictionBookSchema['allOf']);
+        $this->assertArrayHasKey('allOf', $fictionBookSchema);
+        $fictionBookSchemaAllOf = $fictionBookSchema['allOf'];
+        $this->assertIsArray($fictionBookSchemaAllOf);
+        $this->assertCount(2, $fictionBookSchemaAllOf);
 
-        $fictionProperties = null;
-        foreach ($fictionBookSchema['allOf'] as $part) {
-            if (isset($part['properties'])) {
-                $fictionProperties = $part['properties'];
-                break;
-            }
-        }
-        $this->assertNotNull($fictionProperties, 'FictionBook should have properties in allOf');
-        $this->assertArrayHasKey('genre', $fictionProperties);
-        $this->assertArrayHasKey('pageCount', $fictionProperties);
+        $this->assertArrayHasKey('$ref', $fictionBookSchemaAllOf[0]);
+        $this->assertSame('#/components/schemas/Book', $fictionBookSchemaAllOf[0]['$ref']);
+        $this->assertArrayHasKey('type', $fictionBookSchemaAllOf[1]);
+        $this->assertArrayHasKey('properties', $fictionBookSchemaAllOf[1]);
+
+        $fictionBookSchemaAllOfProperties = $fictionBookSchemaAllOf[1]['properties'];
+        $this->assertIsArray($fictionBookSchemaAllOfProperties);
+        $this->assertCount(2, $fictionBookSchemaAllOfProperties);
+
+        $this->assertArrayHasKey('genre', $fictionBookSchemaAllOfProperties);
+        $this->assertArrayHasKey('pageCount', $fictionBookSchemaAllOfProperties);
 
         $this->assertArrayHasKey('TechnicalBook', $schemas, 'TechnicalBook schema should exist');
         $technicalBookSchema = $schemas['TechnicalBook'];
 
-        if (isset($technicalBookSchema['allOf'])) {
-            $this->assertIsArray($technicalBookSchema['allOf']);
-            $technicalProperties = null;
-            foreach ($technicalBookSchema['allOf'] as $part) {
-                if (isset($part['properties'])) {
-                    $technicalProperties = $part['properties'];
-                    break;
-                }
-            }
-            $this->assertNotNull($technicalProperties, 'TechnicalBook should have properties in allOf');
-            $this->assertArrayHasKey('programmingLanguage', $technicalProperties);
-            $this->assertArrayHasKey('difficultyLevel', $technicalProperties);
-            $this->assertArrayHasKey('topic', $technicalProperties);
-        } else {
-            $this->assertArrayHasKey('properties', $technicalBookSchema);
-            $this->assertArrayHasKey('programmingLanguage', $technicalBookSchema['properties']);
-            $this->assertArrayHasKey('difficultyLevel', $technicalBookSchema['properties']);
-            $this->assertArrayHasKey('topic', $technicalBookSchema['properties']);
-        }
+        $this->assertArrayHasKey('allOf', $technicalBookSchema);
+        $technicalBookSchemaAllOf = $technicalBookSchema['allOf'];
+        $this->assertIsArray($technicalBookSchemaAllOf);
+        $this->assertCount(2, $technicalBookSchemaAllOf);
 
-        if (isset($bookSchema['mapping'])) {
-            $this->assertArrayHasKey('fiction', $bookSchema['mapping']);
-            $this->assertArrayHasKey('technical', $bookSchema['mapping']);
-        } elseif (isset($bookSchema['discriminator']['mapping'])) {
-            $this->assertArrayHasKey('fiction', $bookSchema['discriminator']['mapping']);
-            $this->assertArrayHasKey('technical', $bookSchema['discriminator']['mapping']);
-        }
+        $this->assertArrayHasKey('$ref', $technicalBookSchemaAllOf[0]);
+        $this->assertSame('#/components/schemas/Book', $technicalBookSchemaAllOf[0]['$ref']);
+        $this->assertArrayHasKey('type', $technicalBookSchemaAllOf[1]);
+        $this->assertArrayHasKey('properties', $technicalBookSchemaAllOf[1]);
+
+        $technicalBookSchemaAllOfProperties = $technicalBookSchemaAllOf[1]['properties'];
+        $this->assertIsArray($technicalBookSchemaAllOfProperties);
+        $this->assertCount(3, $technicalBookSchemaAllOfProperties);
+
+        $this->assertArrayHasKey('programmingLanguage', $technicalBookSchemaAllOfProperties);
+        $this->assertArrayHasKey('difficultyLevel', $technicalBookSchemaAllOfProperties);
+        $this->assertArrayHasKey('topic', $technicalBookSchemaAllOfProperties);
     }
 }