Fix inline model namespace

src/Generator/ClassTransformer.php

@@ -151,6 +151,8 @@ public function transform(
                 }
 
                 if ($type === Types::Object) {
+                    $property = $this->applyNamespaceToSchema($schema, $property);
+
                     $inlineObject = $this->transformInlineObject(
                         $configuration,
                         $openApi,
@@ -511,6 +513,8 @@ private function resolveArrayType(
         }
 
         if ($arrayType === Types::Object) {
+            $itemsSchema = $this->applyNamespaceToSchema($schema, $itemsSchema);
+
             $inlineObject = $this->transformInlineObject(
                 $configuration,
                 $openApi,
@@ -790,4 +794,17 @@ private function resolveNamespace(
 
         return $this->namespaceResolver->resolveNamespace($openApiType, $schema);
     }
+
+    private function applyNamespaceToSchema(Schema $baseSchema, Schema $schema): Schema
+    {
+        // @phpstan-ignore-next-line
+        $xPhpNamespace = $baseSchema->{'x-php-namespace'} ?? null;
+
+        if (is_string($xPhpNamespace)) {
+            // @phpstan-ignore-next-line
+            $schema->{'x-php-namespace'} = $xPhpNamespace;
+        }
+
+        return $schema;
+    }
 }

test/Acceptance/AcceptanceTest.php

@@ -5,6 +5,9 @@
 namespace Reinfi\OpenApiModels\Test\Acceptance;
 
 use PHPUnit\Framework\TestCase;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use SplFileInfo;
 
 class AcceptanceTest extends TestCase
 {
@@ -19,12 +22,19 @@ public function testApplicationRuns(): void
         self::assertNotNull($output);
         self::assertNotFalse($output);
 
-        $expectedFiles = glob(__DIR__ . '/ExpectedClasses/**/*.php');
-        self::assertNotFalse($expectedFiles);
+        $baseDirectoryPath = __DIR__ . '/ExpectedClasses';
+        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($baseDirectoryPath));
+        $expectedFiles = [];
+        foreach ($iterator as $file) {
+            if ($file instanceof SplFileInfo && $file->isFile() && $file->getExtension() === 'php') {
+                $expectedFiles[] = $file->getPathname();
+            }
+        }
 
         foreach ($expectedFiles as $file) {
-            $fileName = basename($file);
-            $fileDirectory = basename(dirname($file));
+            $fileWithoutBaseDirectory = str_replace($baseDirectoryPath, '', $file);
+            $fileName = basename($fileWithoutBaseDirectory);
+            $fileDirectory = ltrim(dirname($fileWithoutBaseDirectory));
 
             self::assertFileEquals($file, sprintf(__DIR__ . '/../output/%s/%s', $fileDirectory, $fileName));
         }

test/Acceptance/ExpectedClasses/Schema/Test/Test23InlineObjectArrayNamespace.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Api\Schema\Test;
+
+use ArrayAccess;
+use ArrayIterator;
+use BadMethodCallException;
+use Countable;
+use IteratorAggregate;
+use JsonSerializable;
+use Traversable;
+
+/**
+ * @implements \ArrayAccess<int, Test23InlineObjectArrayNamespaceItems>
+ * @implements \IteratorAggregate<Test23InlineObjectArrayNamespaceItems>
+ */
+readonly class Test23InlineObjectArrayNamespace implements IteratorAggregate, Countable, ArrayAccess, JsonSerializable
+{
+    /** @var array<Test23InlineObjectArrayNamespaceItems> $items */
+    private array $items;
+
+    public function __construct(Test23InlineObjectArrayNamespaceItems ...$items)
+    {
+        $this->items = $items;
+    }
+
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->items);
+    }
+
+    public function count(): int
+    {
+        return count($this->items);
+    }
+
+    public function offsetExists(mixed $offset): bool
+    {
+        return isset($this->items[$offset]);
+    }
+
+    public function offsetGet(mixed $offset): ?Test23InlineObjectArrayNamespaceItems
+    {
+        return $this->items[$offset] ?? null;
+    }
+
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+        throw new BadMethodCallException('Object is readOnly');
+    }
+
+    public function offsetUnset(mixed $offset): void
+    {
+        throw new BadMethodCallException('Object is readOnly');
+    }
+
+    /**
+     * @return array<Test23InlineObjectArrayNamespaceItems>
+     */
+    public function jsonSerialize(): array
+    {
+        return $this->items;
+    }
+}

test/Acceptance/ExpectedClasses/Schema/Test/Test23InlineObjectArrayNamespaceItems.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Api\Schema\Test;
+
+readonly class Test23InlineObjectArrayNamespaceItems
+{
+    public function __construct(
+        public string $id,
+    ) {
+    }
+}

test/Acceptance/ExpectedClasses/Schema/Test/Test23InlineObjectNamespace.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Api\Schema\Test;
+
+readonly class Test23InlineObjectNamespace
+{
+    public function __construct(
+        public Test23InlineObjectNamespaceUser $user,
+    ) {
+    }
+}

test/Acceptance/ExpectedClasses/Schema/Test/Test23InlineObjectNamespaceUser.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Api\Schema\Test;
+
+readonly class Test23InlineObjectNamespaceUser
+{
+    public function __construct(
+        public string $id,
+    ) {
+    }
+}

test/Acceptance/ExpectedClasses/Schema/Test23InlineObjectArray.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Api\Schema;
+
+use ArrayAccess;
+use ArrayIterator;
+use BadMethodCallException;
+use Countable;
+use IteratorAggregate;
+use JsonSerializable;
+use Traversable;
+
+/**
+ * @implements \ArrayAccess<int, Test23InlineObjectArrayItems>
+ * @implements \IteratorAggregate<Test23InlineObjectArrayItems>
+ */
+readonly class Test23InlineObjectArray implements IteratorAggregate, Countable, ArrayAccess, JsonSerializable
+{
+    /** @var array<Test23InlineObjectArrayItems> $items */
+    private array $items;
+
+    public function __construct(Test23InlineObjectArrayItems ...$items)
+    {
+        $this->items = $items;
+    }
+
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->items);
+    }
+
+    public function count(): int
+    {
+        return count($this->items);
+    }
+
+    public function offsetExists(mixed $offset): bool
+    {
+        return isset($this->items[$offset]);
+    }
+
+    public function offsetGet(mixed $offset): ?Test23InlineObjectArrayItems
+    {
+        return $this->items[$offset] ?? null;
+    }
+
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+        throw new BadMethodCallException('Object is readOnly');
+    }
+
+    public function offsetUnset(mixed $offset): void
+    {
+        throw new BadMethodCallException('Object is readOnly');
+    }
+
+    /**
+     * @return array<Test23InlineObjectArrayItems>
+     */
+    public function jsonSerialize(): array
+    {
+        return $this->items;
+    }
+}

test/Acceptance/ExpectedClasses/Schema/Test23InlineObjectArrayItems.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Api\Schema;
+
+readonly class Test23InlineObjectArrayItems
+{
+    public function __construct(
+        public string $id,
+    ) {
+    }
+}

test/spec/acceptance.yml

@@ -4,7 +4,7 @@ info:
   title: Acceptance Test
   version: 0.0.1
 
-paths: {}
+paths: { }
 
 components:
   schemas:
@@ -451,6 +451,41 @@ components:
     Test22:
       $ref: './models/TestObject22.yaml'
 
+    Test23InlineObjectArray:
+      type: array
+      items:
+        type: object
+        properties:
+          id:
+            type: string
+        required:
+          - id
+
+    Test23InlineObjectArrayNamespace:
+      x-php-namespace: Test
+      type: array
+      items:
+        type: object
+        properties:
+          id:
+            type: string
+        required:
+          - id
+          -
+    Test23InlineObjectNamespace:
+      x-php-namespace: Test
+      type: object
+      properties:
+        user:
+          type: object
+          properties:
+            id:
+              type: string
+          required:
+            - id
+      required:
+        - user
+
   requestBodies:
     RequestBody1:
       content: