Refactor entire code base to use PHP 8.1 features

And set license to GPL-3.0-or-later

Author: grebaldi

LICENSE

@@ -0,0 +1,37 @@
+from ./Button.afx import Button;
+
+export meta @styleguide {
+    title: "Card"
+    props: {
+        type: CardType.DEFAULT
+        content: "Hello World"
+        button: <Button>Click here!</Button>
+    }
+}
+
+export enum CardType {
+    DEFAULT,
+    DECORATIVE
+}
+
+export interface Card {
+    type: CardType
+    content: Slot
+    button: Button
+    items: Button[]
+}
+
+export component rendering Card {
+    <div 
+        class={match (type) {
+            CardType.DEFAULT => "card--default",
+            CardType.DECORATIVE => "card--decorative",
+        }}
+    >
+        {content}
+        {button}
+        <ul>
+            {items.map((item) => <li>{item}</li>)}
+        </ul>
+    </div>
+}

alt.afx

@@ -1,7 +1,7 @@
 {
     "name": "packagefactory/componentengine",
     "type": "library",
-    "license": "MIT",
+    "license": "GPL-3.0-or-later",
     "authors": [
         {
             "name": "Wilhelm Behncke",

composer.json

@@ -1,4 +1,25 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * PackageFactory.ComponentEngine - Universal View Components for PHP
+ *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
 namespace PackageFactory\ComponentEngine\Debug\Cli;
 
 use PackageFactory\ComponentEngine\Parser\Lexer\LineIterator;
@@ -7,98 +28,49 @@
 
 final class SourcePrinter
 {
-    /**
-     * @var Source
-     */
-    private $source;
-
-    /**
-     * @var null|Token
-     */
-    private $token;
-
-    /**
-     * @var null|int
-     */
-    private $fromRow;
-
-    /**
-     * @var null|int
-     */
-    private $toRow;
-
-    /**
-     * @param Source $source
-     * @param null|Token $token
-     * @param integer $fromRow
-     * @param integer $toRow
-     */
     private function __construct(
-        Source $source,
-        ?Token $token,
-        ?int $fromRow,
-        ?int $toRow
+        private readonly Source $source,
+        private readonly ?Token $token,
+        private readonly ?int $fromRow,
+        private readonly ?int $toRow
     ) {
-        $this->source = $source;
-        $this->token = $token;
-        $this->fromRow = $fromRow;
-        $this->toRow = $toRow;
     }
 
-    /**
-     * @param Source $source
-     * @return self
-     */
     public static function fromSource(Source $source): self
     {
         return new self($source, null, null, null);
     }
 
-    /**
-     * @param Token $token
-     * @return self
-     */
     public static function fromToken(Token $token): self
     {
         return new self(
-            $token->getSource(), 
-            $token, 
-            $token->getStart()->getRowIndex() - 2,
-            $token->getStart()->getRowIndex() + 2
+            source: $token->source,
+            token: $token,
+            fromRow: $token->start->rowIndex - 2,
+            toRow: $token->start->rowIndex + 2
         );
     }
 
-    /**
-     * @param int $fromRow
-     * @return self
-     */
     public function withFromRow(int $fromRow): self
     {
         return new self(
-            $this->source, 
-            $this->token, 
-            $fromRow,
-            $this->toRow
+            source: $this->source,
+            token: $this->token,
+            fromRow: $fromRow,
+            toRow: $this->toRow
         );
     }
 
-    /**
-     * @param int $toRow
-     * @return self
-     */
     public function withToRow(int $toRow): self
     {
         return new self(
-            $this->source, 
-            $this->token, 
-            $this->fromRow,
-            $toRow
+            source: $this->source,
+            token: $this->token,
+            fromRow: $this->fromRow,
+            toRow: $toRow
         );
     }
 
-    /**
-     * @return void
-     */
     public function print(): void
     {
         foreach (LineIterator::fromSource($this->source) as $line) {
@@ -110,14 +82,14 @@ public function print(): void
 
                 foreach ($line as $token) {
                     if ($this->token !== null && $this->token->equals($token)) {
-                        print("\033[91m" . $token->getValue() . "\033[0m");
+                        print("\033[91m" . $token->value . "\033[0m");
                     } else {
-                        print($token->getValue());
+                        print($token->value);
                     }
                 }
 
                 print(PHP_EOL);
             }
         }
     }
-}
+}

src/Debug/Cli/SourcePrinter.php

@@ -1,4 +1,25 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * PackageFactory.ComponentEngine - Universal View Components for PHP
+ *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
 namespace PackageFactory\ComponentEngine\Exception;
 
 use PackageFactory\ComponentEngine\Parser\Ast\Term;
@@ -8,28 +29,10 @@
 
 final class ParserFailed extends \Exception
 {
-    /**
-     * @var null|Token
-     */
-    private $token;
 
-    /**
-     * @param null|Token $token
-     * @param string $message
-     */
-    private function __construct(?Token $token, string $message)
+    private function __construct(public readonly ?Token $token, string $message)
     {
         parent::__construct('Parser failed: ' . $message);
-
-        $this->token = $token;
-    }
-
-    /**
-     * @return null|Token
-     */
-    public function getToken(): ?Token
-    {
-        return $this->token;
     }
 
     /**
@@ -38,13 +41,13 @@ public function getToken(): ?Token
      * @return self
      */
     public static function becauseOfUnexpectedToken(
-        Token $token, 
+        Token $token,
         array $expectedTypes = []
     ): self {
         $message = sprintf(
             'Encountered unexpected token "%s" of type %s.',
-            $token->getValue(),
-            $token->getType()
+            $token->value,
+            $token->type->name
         );
 
         if ($count = count($expectedTypes)) {
@@ -53,13 +56,13 @@ public static function becauseOfUnexpectedToken(
 
                 $message .= sprintf(
                     ' Expected one of %s or %s.',
-                    join(', ', $expectedTypes),
-                    $last
+                    join(', ', array_map(fn (TokenType $type) => $type->name, $expectedTypes)),
+                    $last->name
                 );
             } else {
                 $message .= sprintf(
                     ' Expected %s.',
-                    $expectedTypes[0]
+                    $expectedTypes[0]->name
                 );
             }
         }
@@ -93,7 +96,7 @@ public static function becauseOfUnexpectedTerm(
                         function (string $type) {
                             /** @var class-string $type */
                             return (new \ReflectionClass($type))->getShortName();
-                        }, 
+                        },
                         $expectedTypes
                     )),
                     $last
@@ -122,11 +125,22 @@ public static function becauseOfUnexpectedEndOfFile(TokenStream $stream): self
     public static function becauseOfUnknownOperator(Token $token): self
     {
         return new self(
-            $token, 
+            $token,
             sprintf(
                 'Encountered unknown operator "%s".',
-                $token->getValue()
+                $token->value
+            )
+        );
+    }
+
+    public static function becauseOfUnknownComparator(Token $token): self
+    {
+        return new self(
+            $token,
+            sprintf(
+                'Encountered unknown comparator "%s".',
+                $token->value
             )
         );
     }
-}
+}