fix/openapi/general (#678)

Author: SMillerDev

build/phar-manifest.php

@@ -4,7 +4,7 @@
 
 $tag = @exec('git describe --tags 2>&1');
 
-if (strpos($tag, '-') === false && strpos($tag, 'No names found') === false) {
+if (!str_contains($tag, '-') && !str_contains($tag, 'No names found')) {
     print $tag;
 } else {
     $branch = @exec('git rev-parse --abbrev-ref HEAD');

src/PHPDraft/Model/Category.php

@@ -50,7 +50,7 @@ public function parse(object $object): self
                     $struct->deps = $deps;
                     $struct->parse($item->content, $deps);
 
-                    if (isset($item->content->content) && is_array($item->content->content) && isset($item->content->content[0]->meta->id)) {
+                    if (isset($item->content->content[0]->meta->id)) {
                         $this->structures[$item->content->content[0]->meta->id] = $struct;
                     } elseif (isset($item->content->meta->id->content)) {
                         $this->structures[$item->content->meta->id->content] = $struct;

src/PHPDraft/Model/Elements/ObjectStructureElement.php

@@ -215,6 +215,6 @@ protected function construct_string_return(string $value): string
         }
 
         $status_string = join(', ', $this->status);
-        return "<tr><td><span>{$this->key->value}</span>{$variable}</td><td>{$type}</td><td> <span class=\"status\">{$status_string}</span></td><td>{$desc}</td><td>{$value}</td></tr>";
+        return "<tr><td><span>{$this->key->value}</span>$variable</td><td>$type</td><td> <span class=\"status\">$status_string</span></td><td>$desc</td><td>$value</td></tr>";
     }
 }

src/PHPDraft/Model/HTTPResponse.php

@@ -190,6 +190,6 @@ public function is_equal_to(object $b): bool
      */
     public function __toString(): string
     {
-        return "{$this->statuscode}_{$this->description}";
+        return "{$this->statuscode}_$this->description";
     }
 }

src/PHPDraft/Model/HierarchyElement.php

@@ -50,16 +50,16 @@ abstract class HierarchyElement
      *
      * @param object $object an object to parse
      *
-     * @return void
+     * @return self
      */
-    public function parse(object $object)
+    public function parse(object $object): self
     {
-        if (isset($object->meta) && isset($object->meta->title)) {
+        if (isset($object->meta->title)) {
             $this->title = $object->meta->title->content ?? $object->meta->title;
         }
 
         if (!isset($object->content) || !is_array($object->content)) {
-            return;
+            return $this;
         }
 
         foreach ($object->content as $key => $item) {
@@ -72,6 +72,8 @@ public function parse(object $object)
         if ($object->content !== null && $object->content !== []) {
             $object->content = array_slice($object->content, 0);
         }
+
+        return $this;
     }
 
     /**

src/PHPDraft/Out/OpenAPI/OpenApiRenderer.php

@@ -456,25 +456,24 @@ private function getSchemaProperty(BasicStructureElement|ElementStructureElement
 
         if ($value->type === 'enum') {
             $propery_data['type'] = in_array('nullable', $value->status, true) ? [ $value->type, 'null' ] : $value->type;
-            $options = [];
+            $options              = [];
+            if (!is_iterable($value->value->value)) {
+                return $propery_data;
+            }
             foreach ($value->value->value as $option) {
                 if ($option instanceof ElementStructureElement) {
-                    $options[] = ['const' => $option->value, 'title' => $option->value];
+                    $options[] = [ 'const' => $option->value, 'title' => $option->value ];
                 }
             }
             $propery_data['oneOf'] = $options;
 
             return $propery_data;
-        }
-
-        if ($value->type === 'array') {
+        } elseif ($value->type === 'array') {
             $propery_data['type'] = array_unique(array_map(fn($item) => $item->type, $value->value->value));
             $propery_data['example'] = array_merge(array_filter(array_map(fn($item) => $item->value, $value->value->value)));
 
             return $propery_data;
-        }
-
-        if ($value->type === 'object') {
+        } elseif ($value->type === 'object') {
             $propery_data['type'] = $value->type;
             $propery_data['properties'] = $this->getComponent($value->value)['properties'];