fix: enum types (#466)

Author: SMillerDev

phpdraft

@@ -92,7 +92,7 @@ try
 
     $html          = ParserFactory::getJson()->init($data);
     $name          = 'PHPD_SORT_' . strtoupper($args->getOpt('sort', ''));
-    $html->sorting = Sorting::${$name} ?? -1;
+    $html->sorting = Sorting::${$name} ?? Sorting::PHPD_SORT_NONE->value;
 
     $color1        = getenv('COLOR_PRIMARY') === FALSE ? NULL : getenv('COLOR_PRIMARY');
     $color2        = getenv('COLOR_SECONDARY') === FALSE ? NULL : getenv('COLOR_SECONDARY');

src/PHPDraft/Model/Elements/ArrayStructureElement.php

@@ -80,7 +80,7 @@ public function __toString(): string
      *
      * @return self
      */
-    protected function new_instance(): StructureElement
+    protected function new_instance(): self
     {
         return new self();
     }

src/PHPDraft/Model/Elements/BasicStructureElement.php

@@ -89,7 +89,7 @@ abstract public function __toString(): string;
      *
      * @return self
      */
-    abstract protected function new_instance(): StructureElement;
+    abstract protected function new_instance(): self;
 
     /**
      * Parse common fields to give context.

src/PHPDraft/Model/Elements/EnumStructureElement.php

@@ -99,7 +99,7 @@ public function __toString(): string
      *
      * @return self
      */
-    protected function new_instance(): StructureElement
+    protected function new_instance(): self
     {
         return new self();
     }

src/PHPDraft/Model/Elements/ObjectStructureElement.php

@@ -109,7 +109,7 @@ protected function parse_value_structure(object $object, array &$dependencies)
      *
      * @return ObjectStructureElement
      */
-    protected function new_instance(): StructureElement
+    protected function new_instance(): self
     {
         return new self();
     }

src/PHPDraft/Model/Elements/RequestBodyElement.php

@@ -63,7 +63,7 @@ public function print_request(?string $type = 'application/x-www-form-urlencoded
      *
      * @return RequestBodyElement
      */
-    protected function new_instance(): StructureElement
+    protected function new_instance(): self
     {
         return new self();
     }

src/PHPDraft/Out/Sorting.php

@@ -15,35 +15,27 @@
 /**
  * Sorting constants.
  */
-class Sorting
+enum Sorting: int
 {
     /**
      * Sets sorting to all parts.
-     *
-     * @var int
      */
-    public const PHPD_SORT_ALL = 3;
+    case PHPD_SORT_ALL = 3;
 
     /**
      * Sets sorting to all webservices.
-     *
-     * @var int
      */
-    public const PHPD_SORT_WEBSERVICES = 2;
+    case PHPD_SORT_WEBSERVICES = 2;
 
     /**
      * Sets sorting to all data structures.
-     *
-     * @var int
      */
-    public const PHPD_SORT_STRUCTURES = 1;
+    case PHPD_SORT_STRUCTURES = 1;
 
     /**
      * Sets sorting to no data structures.
-     *
-     * @var int
      */
-    public const PHPD_SORT_NONE = -1;
+    case PHPD_SORT_NONE = -1;
 
     /**
      * Check if structures should be sorted.
@@ -54,7 +46,7 @@ class Sorting
      */
     public static function sortStructures(int $sort): bool
     {
-        return $sort === self::PHPD_SORT_ALL || $sort === self::PHPD_SORT_STRUCTURES;
+        return $sort === Sorting::PHPD_SORT_ALL->value || $sort === Sorting::PHPD_SORT_STRUCTURES->value;
     }
 
     /**
@@ -66,6 +58,6 @@ public static function sortStructures(int $sort): bool
      */
     public static function sortServices(int $sort): bool
     {
-        return $sort === self::PHPD_SORT_ALL || $sort === self::PHPD_SORT_WEBSERVICES;
+        return $sort === Sorting::PHPD_SORT_ALL->value || $sort === Sorting::PHPD_SORT_WEBSERVICES->value;
     }
 }

src/PHPDraft/Out/TemplateRenderer.php

@@ -43,7 +43,7 @@ public function __construct(string $template, ?string $image)
         $this->base_data['COLOR_1'] = $template_parts[1] ?? 'green';
         $this->base_data['COLOR_2'] = $template_parts[2] ?? 'light_green';
         $this->image                = $image;
-        $this->sorting              = Sorting::PHPD_SORT_NONE;
+        $this->sorting              = Sorting::PHPD_SORT_NONE->value;
     }
 
     /**

src/PHPDraft/Parse/BaseHtmlGenerator.php

@@ -14,8 +14,9 @@
 
 use PHPDraft\Out\BaseTemplateRenderer;
 use stdClass;
+use \Stringable;
 
-abstract class BaseHtmlGenerator
+abstract class BaseHtmlGenerator implements Stringable
 {
     /**
      * Type of sorting to do.
@@ -72,5 +73,5 @@ abstract public function build_html(string $template = 'default', ?string $image
      *
      * @return string
      */
-    abstract public function __toString();
+    abstract public function __toString(): string;
 }

src/PHPDraft/Parse/HtmlGenerator.php

@@ -56,7 +56,7 @@ public function build_html(string $template = 'default', ?string $image = null,
      *
      * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->html;
     }