add option to provide type namespace

apioo · Oct 11, 2024 · b39a3a1 · b39a3a1
1 parent 43249ab
commit b39a3a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Parser/Documentor.php b/src/Parser/Documentor.php
@@ -21,6 +21,8 @@
 namespace PSX\Schema\Parser;
 
 use phpDocumentor\Reflection\TypeResolver;
+use phpDocumentor\Reflection\Types\Context;
+use phpDocumentor\Reflection\Types\ContextFactory;
 use PSX\Schema\Definitions;
 use PSX\Schema\Exception\ParserException;
 use PSX\Schema\Exception\TypeNotFoundException;
@@ -41,13 +43,15 @@
  */
 class Documentor extends Popo
 {
+    private ContextFactory $contextFactory;
     private TypeResolver $typeResolver;
     private Popo\Resolver\Documentor $documentor;
 
     public function __construct()
     {
         parent::__construct();
 
+        $this->contextFactory = new ContextFactory();
         $this->typeResolver = new TypeResolver();
         $this->documentor = new Popo\Resolver\Documentor();
     }
@@ -62,7 +66,12 @@ public function parse(string $schema, ?ContextInterface $context = null): Schema
         try {
             $typeName = 'InlineType' . substr(md5($schema), 0, 8);
 
-            $result = $this->documentor->buildPropertyType($this->typeResolver->resolve($schema));
+            $parts = explode('@', $schema, 2);
+            $type = $parts[0] ?? null;
+            $namespace = $parts[1] ?? null;
+
+            $typeContext = !empty($namespace) ? new Context($namespace) : null;
+            $result = $this->documentor->buildPropertyType($this->typeResolver->resolve($type, $typeContext));
 
             if ($result instanceof MapPropertyType) {
                 $schema = $result->getSchema();

diff --git a/src/SchemaSource.php b/src/SchemaSource.php
@@ -91,9 +91,9 @@ public static function fromClass(string $class): self
     /**
      * A PHP doc type i.e. array<string>
      */
-    public static function fromType(string $type): self
+    public static function fromType(string $type, ?string $namespace = null): self
     {
-        return new self('php+doc', $type);
+        return new self('php+doc', $type . (!empty($namespace) ? '@' . $namespace : ''));
     }
 
     public static function fromTypeHub(string $user, string $document, string $version): self