Merge remote-tracking branch 'origin/0.5.x-merge-up-into-0.6.x_gTYrRklu' into 0.6.x

# Conflicts:
#	CHANGELOG.md

Author: sandrokeil

CHANGELOG.md

@@ -24,6 +24,44 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 0.5.4 - 2021-07-27
+
+
+-----
+
+### Release Notes for [0.5.4](https://github.com/open-code-modeling/json-schema-to-php-ast/milestone/15)
+
+0.5.x bugfix release (patch)
+
+### 0.5.4
+
+- Total issues resolved: **1**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### bug
+
+- [28: ArrayFactory toArray() calls wrong method](https://github.com/open-code-modeling/json-schema-to-php-ast/issues/28) thanks to @sandrokeil
+
+## 0.5.3 - 2021-02-18
+
+
+-----
+
+### Release Notes for [0.5.3](https://github.com/open-code-modeling/json-schema-to-php-ast/milestone/14)
+
+0.5.x bugfix release (patch)
+
+### 0.5.3
+
+- Total issues resolved: **1**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### enhancement
+
+- [26: Add namespace shortcut](https://github.com/open-code-modeling/json-schema-to-php-ast/issues/26) thanks to @sandrokeil
+
 ## 0.5.2 - 2021-02-16
 
 

src/ValueObject/ArrayFactory.php

@@ -139,7 +139,7 @@
  *  public function toArray() : array
  *  {
  *      return \array_map(static function (ReasonType $reasonType) {
- *          return $reasonType->toArray();
+ *          return $reasonType->toString();
  *      }, $this->items);
  *  }
  *
@@ -523,7 +523,7 @@ public function methodToArray(
     ): MethodGenerator {
         $body = <<<'PHP'
         return \array_map(static function (%s $%s) {
-            return $%s->toArray();
+            return $%s->toString();
         }, $this->%s);
 PHP;
 

src/ValueObjectFactory.php

@@ -376,6 +376,10 @@ private function extractNamespace(string $classNamespacePath, TypeDefinition $ty
         }
         $namespace = $typeDefinition->custom()['namespace'] ?? '';
 
+        if ($namespace === '') {
+            $namespace = $typeDefinition->custom()['ns'] ?? '';
+        }
+
         return \trim($classNamespacePath . '\\' . $namespace, '\\');
     }
 

tests/ValueObject/ArrayFactoryTest.php

@@ -223,7 +223,7 @@ public function items() : array
     public function toArray() : array
     {
         return \array_map(static function (ReasonType $reasonType) {
-            return $reasonType->toArray();
+            return $reasonType->toString();
         }, $this->items);
     }
     /**

tests/ValueObjectFactoryTest.php

@@ -524,7 +524,7 @@ public function items() : array
     public function toArray() : array
     {
         return \array_map(static function (Address $address) {
-            return $address->toArray();
+            return $address->toString();
         }, $this->shippingAddresses);
     }
     /**

tests/_files/schema_shorthand_namespace.json

@@ -1,4 +1,4 @@
 {
     "billing_address": "Address|namespace:Billing",
-    "address?": "ShippingAddresses|namespace:Payment"
+    "address?": "ShippingAddresses|ns:Payment"
 }