Flatten the schema namespace

README.md

@@ -121,7 +121,7 @@ The library models OpenAPI tags as tags. It does not assign SDK service or platf
 
 ### Schemas
 
-Schemas are represented by typed classes under `Utopia\OpenAPI\Model\Schema`:
+Schemas are represented by typed classes under `Utopia\OpenAPI\Model`, with `Schema` as their common base:
 
 - `AnySchema` and `NeverSchema`
 - `StringSchema`
@@ -147,7 +147,7 @@ The model preserves:
 Schema references remain references rather than being recursively expanded:
 
 ```php
-use Utopia\OpenAPI\Model\Schema\ReferenceSchema;
+use Utopia\OpenAPI\Model\ReferenceSchema;
 
 $schema = $specification->schemas['Pet'];
 

src/Model/Schema/AnySchema.php → src/Model/AnySchema.php

@@ -2,6 +2,6 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class AnySchema extends Schema {}

src/Model/Schema/ArraySchema.php → src/Model/ArraySchema.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class ArraySchema extends Schema
 {

src/Model/Schema/BooleanSchema.php → src/Model/BooleanSchema.php

@@ -2,6 +2,6 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class BooleanSchema extends Schema {}

src/Model/Schema/CompositeSchema.php → src/Model/CompositeSchema.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class CompositeSchema extends Schema
 {

src/Model/Schema/Composition.php → src/Model/Composition.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 enum Composition: string
 {

src/Model/Schema/Discriminator.php → src/Model/Discriminator.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class Discriminator
 {

src/Model/Header.php

@@ -4,8 +4,6 @@
 
 namespace Utopia\OpenAPI\Model;
 
-use Utopia\OpenAPI\Model\Schema\Schema;
-
 final readonly class Header
 {
     /**

src/Model/Schema/IntegerSchema.php → src/Model/IntegerSchema.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class IntegerSchema extends Schema
 {

src/Model/MediaType.php

@@ -4,8 +4,6 @@
 
 namespace Utopia\OpenAPI\Model;
 
-use Utopia\OpenAPI\Model\Schema\Schema;
-
 final readonly class MediaType
 {
     /**

src/Model/Schema/NeverSchema.php → src/Model/NeverSchema.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 /** A JSON Schema boolean false schema. */
 final readonly class NeverSchema extends Schema {}

src/Model/Schema/NumberSchema.php → src/Model/NumberSchema.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class NumberSchema extends Schema
 {

src/Model/Schema/ObjectSchema.php → src/Model/ObjectSchema.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class ObjectSchema extends Schema
 {

src/Model/Parameter.php

@@ -4,8 +4,6 @@
 
 namespace Utopia\OpenAPI\Model;
 
-use Utopia\OpenAPI\Model\Schema\Schema;
-
 final readonly class Parameter
 {
     /**

src/Model/Schema/ReferenceSchema.php → src/Model/ReferenceSchema.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class ReferenceSchema extends Schema
 {

src/Model/Schema/Schema.php → src/Model/Schema.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 abstract readonly class Schema
 {

src/Model/Schema/StringSchema.php → src/Model/StringSchema.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Utopia\OpenAPI\Model\Schema;
+namespace Utopia\OpenAPI\Model;
 
 final readonly class StringSchema extends Schema
 {

src/Parser/OpenAPI2.php

@@ -9,13 +9,13 @@
 use Utopia\OpenAPI\Model\Example;
 use Utopia\OpenAPI\Model\HttpMethod;
 use Utopia\OpenAPI\Model\MediaType;
+use Utopia\OpenAPI\Model\ObjectSchema;
 use Utopia\OpenAPI\Model\Operation;
 use Utopia\OpenAPI\Model\Parameter;
 use Utopia\OpenAPI\Model\ParameterLocation;
 use Utopia\OpenAPI\Model\PathItem;
 use Utopia\OpenAPI\Model\RequestBody;
 use Utopia\OpenAPI\Model\Response;
-use Utopia\OpenAPI\Model\Schema\ObjectSchema;
 use Utopia\OpenAPI\Model\Server;
 use Utopia\OpenAPI\Specification;
 

src/Parser/Schema/Reader.php

@@ -5,19 +5,19 @@
 namespace Utopia\OpenAPI\Parser\Schema;
 
 use Utopia\OpenAPI\Exception\InvalidSpecification;
-use Utopia\OpenAPI\Model\Schema\AnySchema;
-use Utopia\OpenAPI\Model\Schema\ArraySchema;
-use Utopia\OpenAPI\Model\Schema\BooleanSchema;
-use Utopia\OpenAPI\Model\Schema\CompositeSchema;
-use Utopia\OpenAPI\Model\Schema\Composition;
-use Utopia\OpenAPI\Model\Schema\Discriminator;
-use Utopia\OpenAPI\Model\Schema\IntegerSchema;
-use Utopia\OpenAPI\Model\Schema\NeverSchema;
-use Utopia\OpenAPI\Model\Schema\NumberSchema;
-use Utopia\OpenAPI\Model\Schema\ObjectSchema;
-use Utopia\OpenAPI\Model\Schema\ReferenceSchema;
-use Utopia\OpenAPI\Model\Schema\Schema;
-use Utopia\OpenAPI\Model\Schema\StringSchema;
+use Utopia\OpenAPI\Model\AnySchema;
+use Utopia\OpenAPI\Model\ArraySchema;
+use Utopia\OpenAPI\Model\BooleanSchema;
+use Utopia\OpenAPI\Model\CompositeSchema;
+use Utopia\OpenAPI\Model\Composition;
+use Utopia\OpenAPI\Model\Discriminator;
+use Utopia\OpenAPI\Model\IntegerSchema;
+use Utopia\OpenAPI\Model\NeverSchema;
+use Utopia\OpenAPI\Model\NumberSchema;
+use Utopia\OpenAPI\Model\ObjectSchema;
+use Utopia\OpenAPI\Model\ReferenceSchema;
+use Utopia\OpenAPI\Model\Schema;
+use Utopia\OpenAPI\Model\StringSchema;
 use Utopia\OpenAPI\Parser\Value;
 
 /**

src/Specification.php

@@ -8,7 +8,7 @@
 use Utopia\OpenAPI\Model\Info;
 use Utopia\OpenAPI\Model\Operation;
 use Utopia\OpenAPI\Model\PathItem;
-use Utopia\OpenAPI\Model\Schema\Schema;
+use Utopia\OpenAPI\Model\Schema;
 use Utopia\OpenAPI\Model\SecurityRequirement;
 use Utopia\OpenAPI\Model\SecurityScheme;
 use Utopia\OpenAPI\Model\Server;

tests/CrossVersionFixtureTest.php

@@ -7,16 +7,16 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Utopia\OpenAPI\Model\HttpMethod;
+use Utopia\OpenAPI\Model\IntegerSchema;
+use Utopia\OpenAPI\Model\ObjectSchema;
 use Utopia\OpenAPI\Model\Operation;
 use Utopia\OpenAPI\Model\ParameterLocation;
-use Utopia\OpenAPI\Model\Schema\IntegerSchema;
-use Utopia\OpenAPI\Model\Schema\ObjectSchema;
-use Utopia\OpenAPI\Model\Schema\ReferenceSchema;
-use Utopia\OpenAPI\Model\Schema\StringSchema;
+use Utopia\OpenAPI\Model\ReferenceSchema;
 use Utopia\OpenAPI\Model\SecurityRequirement;
 use Utopia\OpenAPI\Model\SecurityScheme;
 use Utopia\OpenAPI\Model\SecuritySchemeType;
 use Utopia\OpenAPI\Model\Server;
+use Utopia\OpenAPI\Model\StringSchema;
 use Utopia\OpenAPI\Parser;
 use Utopia\OpenAPI\Specification;
 use Utopia\OpenAPI\Version;

tests/ParserTest.php

@@ -8,11 +8,11 @@
 use Utopia\OpenAPI\Exception\CircularReference;
 use Utopia\OpenAPI\Exception\InvalidSpecification;
 use Utopia\OpenAPI\Exception\ParseException;
+use Utopia\OpenAPI\Model\CompositeSchema;
 use Utopia\OpenAPI\Model\HttpMethod;
-use Utopia\OpenAPI\Model\Schema\CompositeSchema;
-use Utopia\OpenAPI\Model\Schema\ObjectSchema;
-use Utopia\OpenAPI\Model\Schema\ReferenceSchema;
-use Utopia\OpenAPI\Model\Schema\StringSchema;
+use Utopia\OpenAPI\Model\ObjectSchema;
+use Utopia\OpenAPI\Model\ReferenceSchema;
+use Utopia\OpenAPI\Model\StringSchema;
 use Utopia\OpenAPI\Parser;
 use Utopia\OpenAPI\Reference\LocalResolver;
 use Utopia\OpenAPI\Version;

tests/Schema/ReaderTest.php

@@ -6,15 +6,15 @@
 
 use PHPUnit\Framework\TestCase;
 use Utopia\OpenAPI\Exception\InvalidSpecification;
-use Utopia\OpenAPI\Model\Schema\AnySchema;
-use Utopia\OpenAPI\Model\Schema\ArraySchema;
-use Utopia\OpenAPI\Model\Schema\CompositeSchema;
-use Utopia\OpenAPI\Model\Schema\Composition;
-use Utopia\OpenAPI\Model\Schema\IntegerSchema;
-use Utopia\OpenAPI\Model\Schema\NeverSchema;
-use Utopia\OpenAPI\Model\Schema\ObjectSchema;
-use Utopia\OpenAPI\Model\Schema\ReferenceSchema;
-use Utopia\OpenAPI\Model\Schema\StringSchema;
+use Utopia\OpenAPI\Model\AnySchema;
+use Utopia\OpenAPI\Model\ArraySchema;
+use Utopia\OpenAPI\Model\CompositeSchema;
+use Utopia\OpenAPI\Model\Composition;
+use Utopia\OpenAPI\Model\IntegerSchema;
+use Utopia\OpenAPI\Model\NeverSchema;
+use Utopia\OpenAPI\Model\ObjectSchema;
+use Utopia\OpenAPI\Model\ReferenceSchema;
+use Utopia\OpenAPI\Model\StringSchema;
 use Utopia\OpenAPI\Parser\Schema\Dialect;
 use Utopia\OpenAPI\Parser\Schema\Reader;
 use Utopia\OpenAPI\Version;