Normalize namespace, starts always with / and ends without / - #12

Author: sandrokeil

src/Shorthand/Shorthand.php

@@ -131,8 +131,8 @@ private static function convertShorthandStringToJsonSchema(string $shorthandStr,
         $namespace = $customData['voNamespace'] ?? '';
         $typeNamespaceDetected = false !== \strpos($type, '/');
 
-        if ($namespace !== '') {
-            $namespace = \rtrim($namespace, '/');
+        if ($namespace !== '' && $namespace !== '/') {
+            $namespace = '/' . \trim($namespace, '/');
         }
 
         // it's an array, the collection / list class is created implicitly
@@ -154,7 +154,10 @@ private static function convertShorthandStringToJsonSchema(string $shorthandStr,
 
         if ($typeNamespaceDetected) {
             $namespace = self::extractNamespace($type);
-            $namespace = $namespace === '' ? '/' : $namespace;
+
+            if ($namespace !== '' && $namespace !== '/') {
+                $namespace = '/' . \trim($namespace, '/');
+            }
 
             $type = self::extractType($type);
         }
@@ -194,7 +197,7 @@ private static function convertShorthandStringToJsonSchema(string $shorthandStr,
 
                 if ($namespace) {
                     $schema['namespace'] = $namespace;
-                    $schema['$ref'] = '#/definitions/' . \ltrim($namespace, '/') . '/' . $type;
+                    $schema['$ref'] = '#/definitions' . \rtrim($namespace, '/') . '/' . $type;
                 }
 
                 return $schema;
@@ -265,6 +268,6 @@ private static function extractType(string $type): string
 
     private static function extractNamespace(string $type): string
     {
-        return \substr($type, 0, \strrpos($type, '/'));
+        return \substr($type, 0, \strrpos($type, '/') + 1);
     }
 }

tests/Type/ObjectTypeTest.php

@@ -186,7 +186,7 @@ public function it_supports_definition_of_objects_shorthand_type_ns(): void
         /** @var ReferenceType $billingAddress */
         $billingAddress = $properties['billing_address']->first();
         $this->assertInstanceOf(ReferenceType::class, $billingAddress);
-        $this->assertSame(['namespace' => 'Order'], $billingAddress->custom());
+        $this->assertSame(['namespace' => '/Order'], $billingAddress->custom());
 
         /** @var ArrayType $shippingAddress */
         $shippingAddress = $properties['shipping_address']->first();
@@ -196,7 +196,8 @@ public function it_supports_definition_of_objects_shorthand_type_ns(): void
         /** @var ReferenceType $address */
         $address = $shippingAddress->items()[0]->first();
         $this->assertInstanceOf(ReferenceType::class, $address);
-        $this->assertSame(['namespace' => 'Order'], $address->custom());
+        $this->assertSame(['namespace' => '/Order'], $address->custom());
+        $this->assertSame('#/definitions/Order/Address', $address->ref());
     }
 
     /**
@@ -383,12 +384,12 @@ public function it_supports_definition_of_objects_shorthand_nested_ns(): void
         $paymentAddress = $subProperties['payment_address']->first();
         $this->assertInstanceOf(StringType::class, $paymentAddress);
         // value object defines it's own namespace
-        $this->assertSame(['namespace' => 'Payment'], $paymentAddress->custom());
+        $this->assertSame(['namespace' => '/Payment'], $paymentAddress->custom());
 
         /** @var ReferenceType $billingAddress */
         $billingAddress = $subProperties['billing_address']->first();
         $this->assertInstanceOf(ReferenceType::class, $billingAddress);
-        // reference value object use defined voNamespace because of missing namespace definition
+        // reference value object uses defined voNamespace because of missing namespace definition
         $this->assertSame(['namespace' => '/Shipping'], $billingAddress->custom());
         $this->assertSame('#/definitions/Shipping/Address', $billingAddress->ref());