General: add types

Author: SMillerDev

src/PHPDraft/In/ApibFileParser.php

@@ -11,11 +11,12 @@
 namespace PHPDraft\In;
 
 use PHPDraft\Parse\ExecutionException;
+use Stringable;
 
 /**
  * Class ApibFileParser.
  */
-class ApibFileParser
+class ApibFileParser implements Stringable
 {
     /**
      * Complete API Blueprint.
@@ -56,7 +57,7 @@ public function __construct(string $filename = 'index.apib')
      *
      * @throws ExecutionException
      *
-     * @return $this self reference.
+     * @return self self reference.
      */
     public function parse(): self
     {

src/PHPDraft/Model/Elements/BasicStructureElement.php

@@ -8,6 +8,8 @@
 
 namespace PHPDraft\Model\Elements;
 
+use Stringable;
+
 abstract class BasicStructureElement implements StructureElement
 {
     /**
@@ -39,7 +41,7 @@ abstract class BasicStructureElement implements StructureElement
      *
      * @var mixed
      */
-    public $value = null;
+    public mixed $value = null;
     /**
      * Object status (required|optional).
      *
@@ -71,7 +73,7 @@ abstract class BasicStructureElement implements StructureElement
      * @param object|null $object       An object to parse
      * @param string[]    $dependencies Dependencies of this object
      *
-     * @return StructureElement self reference
+     * @return self self reference
      */
     abstract public function parse(?object $object, array &$dependencies): StructureElement;
 
@@ -181,6 +183,7 @@ public function string_value(bool $flat = false)
         if (is_subclass_of($this->value, BasicStructureElement::class) && $flat === true) {
             return is_array($this->value->value) ? array_keys($this->value->value)[0] : $this->value->value;
         }
+
         return $this->value;
     }
 
@@ -193,19 +196,10 @@ public function string_value(bool $flat = false)
      */
     public function get_class(string $element): BasicStructureElement
     {
-        switch ($element) {
-            default:
-            case 'object':
-                $struct = $this->new_instance();
-                break;
-            case 'array':
-                $struct = new ArrayStructureElement();
-                break;
-            case 'enum':
-                $struct = new EnumStructureElement();
-                break;
-        }
-
-        return $struct;
+        return match ($element) {
+            default => $this->new_instance(),
+            'array' => new ArrayStructureElement(),
+            'enum' => new EnumStructureElement(),
+        };
     }
 }

src/PHPDraft/Model/Elements/ElementStructureElement.php

@@ -2,6 +2,8 @@
 
 namespace PHPDraft\Model\Elements;
 
+use Stringable;
+
 class ElementStructureElement implements StructureElement
 {
     /**
@@ -23,7 +25,7 @@ class ElementStructureElement implements StructureElement
      *
      * @var mixed
      */
-    public $value = null;
+    public mixed $value = null;
 
     /**
      * Parse a JSON object to a structure.

src/PHPDraft/Model/Elements/EnumStructureElement.php

@@ -22,7 +22,7 @@ class EnumStructureElement extends BasicStructureElement
      * @param object|null $object       APIB Item to parse
      * @param string[]    $dependencies List of dependencies build
      *
-     * @return $this
+     * @return self
      */
     public function parse(?object $object, array &$dependencies): StructureElement
     {

src/PHPDraft/Model/Elements/RequestBodyElement.php

@@ -35,14 +35,10 @@ public function print_request(?string $type = 'application/x-www-form-urlencoded
                 }
             }
 
-            switch ($type) {
-                case 'application/x-www-form-urlencoded':
-                    $return .= join('&', $list);
-                    break;
-                default:
-                    $return .= join(PHP_EOL, $list);
-                    break;
-            }
+            $return .= match ($type) {
+                'application/x-www-form-urlencoded' => join('&', $list),
+                default => join(PHP_EOL, $list),
+            };
 
             $return .= '</code>';
 

src/PHPDraft/Model/Elements/StructureElement.php

@@ -12,7 +12,9 @@
 
 namespace PHPDraft\Model\Elements;
 
-interface StructureElement
+use Stringable;
+
+interface StructureElement extends Stringable
 {
     /**
      * Default data types.
@@ -31,13 +33,6 @@ interface StructureElement
      */
     public function parse(?object $object, array &$dependencies): self;
 
-    /**
-     * Print a string representation.
-     *
-     * @return string
-     */
-    public function __toString(): string;
-
 
     /**
      * Get a string representation of the value.

src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php

@@ -54,7 +54,7 @@ public function testSetupCorrectly(): void
      * @param mixed  $value        Value to set to the class
      * @param mixed $string_value Expected string representation
      */
-    public function testStringValue($value, $string_value): void
+    public function testStringValue(mixed $value, mixed $string_value): void
     {
         $this->set_reflection_property_value('value', $value);
 
@@ -65,6 +65,11 @@ public function testStringValue($value, $string_value): void
         $this->assertSame($string_value, $return);
     }
 
+    /**
+     * Provide string values
+     *
+     * @return array
+     */
     public function stringValueProvider(): array
     {
         $return = [];

src/PHPDraft/Model/HTTPRequest.php

@@ -58,7 +58,7 @@ class HTTPRequest implements Comparable
      *
      * @var mixed
      */
-    public $body = null;
+    public mixed $body = null;
 
     /**
      * Schema of the body of the request.
@@ -71,7 +71,7 @@ class HTTPRequest implements Comparable
      *
      * @var RequestBodyElement[]|RequestBodyElement
      */
-    public $struct = [];
+    public mixed $struct = [];
     /**
      * Identifier for the request.
      *
@@ -95,7 +95,7 @@ public function __construct(Transition &$parent)
      *
      * @param object $object JSON object
      *
-     * @return $this self-reference
+     * @return self self-reference
      */
     public function parse(object $object): self
     {
@@ -190,11 +190,9 @@ public function get_curl_command(string $base_url, array $additional = []): stri
         $type = $this->headers['Content-Type'] ?? null;
 
         $options[] = '-X' . $this->method;
-        if (is_null($this->body) || $this->body === []) {
-            //NO-OP
-        } elseif (is_string($this->body)) {
+        if (is_string($this->body)) {
             $options[] = '--data-binary ' . escapeshellarg($this->body);
-        } elseif (is_array($this->body)) {
+        } elseif (is_array($this->body) && $this->body !== []) {
             $options[] = '--data-binary ' . escapeshellarg(join('', $this->body));
         } elseif (is_subclass_of($this->struct, StructureElement::class)) {
             foreach ($this->struct->value as $body) {

src/PHPDraft/Model/HTTPResponse.php

@@ -76,7 +76,7 @@ public function __construct(Transition $parent)
      *
      * @param object $object JSON object
      *
-     * @return $this self-reference
+     * @return self self-reference
      */
     public function parse(object $object): self
     {

src/PHPDraft/Model/Resource.php

@@ -45,7 +45,7 @@ public function __construct(Category &$parent)
      *
      * @param object $object JSON object
      *
-     * @return $this self-reference
+     * @return self self-reference
      */
     public function parse(object $object): self
     {