Schemas fix

Author: RobertGroot

src/Data/OpenApi.php

@@ -13,6 +13,9 @@ class OpenApi extends Data
     /** @var array<string,class-string<Data>> */
     protected static array $schemas = [];
 
+    /** @var array<string,class-string<Data>> */
+    protected static array $temp_schemas = [];
+
     public function __construct(
         public string $openapi,
         public Info $info,
@@ -26,7 +29,7 @@ public function __construct(
      */
     public static function addClassSchema(string $name, $schema): void
     {
-        static::$schemas[$name] = $schema;
+        static::$temp_schemas[$name] = $schema;
     }
 
     /** @return array<string,class-string<Data>> */
@@ -35,6 +38,12 @@ public static function getSchemas(): array
         return static::$schemas;
     }
 
+    /** @return array<string,class-string<Data>> */
+    public static function getTempSchemas(): array
+    {
+        return static::$temp_schemas;
+    }
+
     /**
      * @param array<string,array<string,Route>> $routes
      */
@@ -46,7 +55,11 @@ public static function fromRoutes(array $routes, Command $command): self
         foreach ($routes as $uri => $uri_routes) {
             foreach ($uri_routes as $method => $route) {
                 try {
+                    self::$temp_schemas = [];
+
                     $paths[$uri][$method] = Operation::fromRoute($route);
+
+                    self::addTempSchemas();
                 } catch (\Throwable $th) {
                     $command->error("Failed to generate Operation from route {$method} {$route->getName()} {$uri}: {$th->getMessage()}");
 
@@ -93,6 +106,14 @@ public function toArray(): array
         );
     }
 
+    protected static function addTempSchemas(): void
+    {
+        static::$schemas = array_merge(
+            static::$schemas,
+            static::$temp_schemas,
+        );
+    }
+
     /**
      * @return array<string,mixed>
      */

tests/Unit/PropertyTest.php

@@ -75,11 +75,13 @@
                 ],
             ],
             [
-                'type' => 'string',
+                'type'   => 'string',
+                'format' => 'date-time',
             ],
             [
                 'type'     => 'string',
                 'nullable' => true,
+                'format'   => 'date-time',
             ],
         ]);
 });

tests/Unit/RequestBodyTest.php

@@ -51,7 +51,7 @@
                 ],
             ]);
 
-        expect(OpenApi::getSchemas())->toMatchArray(
+        expect(OpenApi::getTempSchemas())->toMatchArray(
             ['RequestData' => 'Xolvio\\OpenApiGenerator\\Test\\RequestData']
         );
     }

tests/Unit/ResponseTest.php

@@ -23,7 +23,7 @@
             ]);
     }
 
-    expect(OpenApi::getSchemas())->toMatchArray(
+    expect(OpenApi::getTempSchemas())->toMatchArray(
         ['ReturnData' => 'Xolvio\\OpenApiGenerator\\Test\\ReturnData']
     );
 });
@@ -49,7 +49,7 @@
             ]);
     }
 
-    expect(OpenApi::getSchemas())->toMatchArray(
+    expect(OpenApi::getTempSchemas())->toMatchArray(
         ['ReturnData' => 'Xolvio\\OpenApiGenerator\\Test\\ReturnData']
     );
 });

tests/Unit/SchemaTest.php

@@ -54,7 +54,7 @@
                 '$ref' => '#/components/schemas/' . class_basename($class),
             ]);
 
-        expect(OpenApi::getSchemas())->toMatchArray(
+        expect(OpenApi::getTempSchemas())->toMatchArray(
             [class_basename($class) => $class]
         );
     }