Allow shorthand string - Close #10

Author: sandrokeil

src/Shorthand/Shorthand.php

@@ -15,26 +15,33 @@
 
 final class Shorthand
 {
+    private const STRING_NAME = '__this_is_my_temporary_property__';
+
     /**
-     * @param array<string, mixed> $shorthand
-     * @param string|null $namespace
+     * @param string|array<string, mixed> $shorthand
+     * @param array<string, mixed> $customData
      * @return array<string, mixed>
      */
-    public static function convertToJsonSchema(array $shorthand, ?string $namespace = null): array
+    public static function convertToJsonSchema($shorthand, array $customData = []): array
     {
-        $schema = [
-            'type' => 'object',
-            'properties' => [
-
-            ],
-            'required' => [],
-            'additionalProperties' => false,
-        ];
+        $isString = \is_string($shorthand);
 
-        if ($namespace !== null) {
-            $schema['namespace'] = $namespace;
+        if ($isString === true) {
+            $shorthand = [self::STRING_NAME => $shorthand];
         }
 
+        $schema = \array_merge(
+            $customData,
+            [
+                'type' => 'object',
+                'properties' => [
+
+                ],
+                'required' => [],
+                'additionalProperties' => false,
+            ]
+        );
+
         foreach ($shorthand as $property => $shorthandDefinition) {
             if (! \is_string($property) || empty($property)) {
                 throw InvalidShorthand::emptyString($shorthand);
@@ -90,6 +97,10 @@ public static function convertToJsonSchema(array $shorthand, ?string $namespace
             }
         }
 
+        if ($isString === true) {
+            return \array_merge($customData, $schema['properties'][self::STRING_NAME]);
+        }
+
         return $schema;
     }
 

src/Type/ReferenceType.php

@@ -84,6 +84,17 @@ public function setRef(string $ref): self
         return $this;
     }
 
+    public function extractNameFromReference(): ?string
+    {
+        if ($this->ref === null) {
+            return null;
+        }
+
+        $referencePath = \explode('/', $this->ref);
+
+        return \array_pop($referencePath);
+    }
+
     public static function type(): string
     {
         return self::TYPE_REF;

tests/Shorthand/ShorthandTest.php

@@ -17,6 +17,16 @@ final class ShorthandTest extends TestCase
 {
     private const SHORTHAND_TYPES = ['string', 'integer', 'number', 'boolean'];
 
+    /**
+     * @test
+     */
+    public function it_converts_shorthand_from_string(): void
+    {
+        $schema = Shorthand::convertToJsonSchema('string|format:uuid|namespace:MyService');
+
+        $this->assertEquals(['type' => 'string', 'format' => 'uuid', 'namespace' => 'MyService'], $schema);
+    }
+
     /**
      * @test
      */