Out: add types

Author: SMillerDev

src/PHPDraft/Out/BaseTemplateRenderer.php

@@ -22,47 +22,47 @@ abstract class BaseTemplateRenderer
      *
      * @var int
      */
-    public $sorting;
+    public int $sorting;
     /**
      * CSS Files to load.
      *
      * @var string[]
      */
-    public $css = [];
+    public array $css = [];
     /**
      * JS Files to load.
      *
      * @var string[]
      */
-    public $js = [];
+    public array $js = [];
     /**
      * JSON object of the API blueprint.
      *
-     * @var mixed
+     * @var array<object>
      */
-    protected $categories = [];
+    protected array $categories = [];
     /**
      * The template file to load.
      *
      * @var string
      */
-    protected $template;
+    protected string $template;
     /**
      * The image to use as a logo.
      *
      * @var string|null
      */
-    protected $image = null;
+    protected ?string $image = null;
     /**
      * The base data of the API.
      *
-     * @var array<mixed>
+     * @var array<string, mixed>
      */
-    protected $base_data;
+    protected array $base_data;
     /**
      * Structures used in all data.
      *
      * @var ObjectStructureElement[]
      */
-    protected $base_structures = [];
+    protected array $base_structures = [];
 }

src/PHPDraft/Out/TemplateRenderer.php

@@ -49,7 +49,7 @@ public function __construct(string $template, ?string $image)
     /**
      * Pre-parse objects needed and print HTML.
      *
-     * @param mixed $object JSON to parse from
+     * @param object $object JSON to parse from
      *
      * @return string
      *
@@ -59,7 +59,7 @@ public function __construct(string $template, ?string $image)
      * @throws \Twig\Error\RuntimeError
      * @throws \Twig\Error\SyntaxError
      */
-    public function get($object): string
+    public function get(object $object): string
     {
         $include = $this->find_include_file($this->template, 'twig', false);
         if ($include === null) {
@@ -86,9 +86,11 @@ public function get($object): string
         $twig     = TwigFactory::get($loader);
         $template = $twig->load('main.twig');
 
-        $extras = array_filter($this->base_data, function ($value) {
-            return !in_array($value, ['HOST', 'TITLE', 'ALT_HOST', 'FORMAT', 'DESC', 'COLOR_1', 'COLOR_2']);
-        }, ARRAY_FILTER_USE_KEY);
+        $extras = array_filter(
+            $this->base_data,
+            fn($value) => !in_array($value, ['HOST', 'TITLE', 'ALT_HOST', 'FORMAT', 'DESC', 'COLOR_1', 'COLOR_2']),
+            ARRAY_FILTER_USE_KEY
+        );
         $extras['host'] = $this->base_data['HOST'] ?? null;
 
         return $template->render([

src/PHPDraft/Out/TwigFactory.php

@@ -25,55 +25,34 @@ public static function get(LoaderInterface $loader): Environment
     {
         $twig = new Environment($loader);
 
-        $twig->addFilter(new TwigFilter('minify_css', function ($string) {
+        $twig->addFilter(new TwigFilter('method_icon', fn(string $string) => TemplateRenderer::get_method_icon($string)));
+        $twig->addFilter(new TwigFilter('strip_link_spaces', fn(string $string) => TemplateRenderer::strip_link_spaces($string)));
+        $twig->addFilter(new TwigFilter('response_status', fn(string $string) => TemplateRenderer::get_response_status((int) $string)));
+        $twig->addFilter(new TwigFilter('status_reason', fn(string $string) => (new Httpstatus())->getReasonPhrase($string)));
+        $twig->addFilter(new TwigFilter('minify_css', function (string $string) {
             $minify =  new Css();
             $minify->add($string);
             return $minify->minify();
         }));
-        $twig->addFilter(new TwigFilter('minify_js', function ($string) {
+        $twig->addFilter(new TwigFilter('minify_js', function (string $string) {
             $minify =  new JS();
             $minify->add($string);
             return $minify->minify();
         }));
-        $twig->addFilter(new TwigFilter('method_icon', function ($string) {
-            return TemplateRenderer::get_method_icon($string);
-        }));
-        $twig->addFilter(new TwigFilter('strip_link_spaces', function ($string) {
-            return TemplateRenderer::strip_link_spaces($string);
-        }));
-        $twig->addFilter(new TwigFilter('response_status', function ($string) {
-            return TemplateRenderer::get_response_status($string);
-        }));
-        $twig->addFilter(new TwigFilter('status_reason', function ($string) {
-            return (new Httpstatus())->getReasonPhrase($string);
-            ;
-        }));
-        $twig->addTest(new TwigTest('enum_type', function ($object) {
-            return $object instanceof EnumStructureElement;
-        }));
-        $twig->addTest(new TwigTest('object_type', function ($object) {
-            return $object instanceof ObjectStructureElement;
-        }));
-        $twig->addTest(new TwigTest('array_type', function ($object) {
-            return $object instanceof ArrayStructureElement;
-        }));
-        $twig->addTest(new TwigTest('bool', function ($object) {
-            return is_bool($object);
-        }));
-        $twig->addTest(new TwigTest('string', function ($object) {
-            return is_string($object);
-        }));
 
-        $twig->addTest(new TwigTest('inheriting', function (BasicStructureElement $object) {
+        $twig->addTest(new TwigTest('enum_type', fn(object $object) => $object instanceof EnumStructureElement));
+        $twig->addTest(new TwigTest('object_type', fn(object $object) => $object instanceof ObjectStructureElement));
+        $twig->addTest(new TwigTest('array_type', fn(object $object) => $object instanceof ArrayStructureElement));
+        $twig->addTest(new TwigTest('bool', fn($object) => is_bool($object)));
+        $twig->addTest(new TwigTest('string', fn($object) => is_string($object)));
+        $twig->addTest(new TwigTest('variable_type', fn(BasicStructureElement $object) => $object->is_variable));
+        $twig->addTest(new TwigTest('inheriting', function (BasicStructureElement $object): bool {
             $options = array_merge(StructureElement::DEFAULTS, ['member', 'select', 'option', 'ref', 'T', 'hrefVariables']);
             return !(is_null($object->element) || in_array($object->element, $options));
         }));
-        $twig->addTest(new TwigTest('variable_type', function (BasicStructureElement $object) {
-            return $object->is_variable;
-        }));
 
         $twig->addRuntimeLoader(new class implements RuntimeLoaderInterface {
-            public function load(string $class)
+            public function load(string $class): ?object
             {
                 if (MarkdownRuntime::class === $class) {
                     return new MarkdownRuntime(new DefaultMarkdown());