PHP8 compatibility

README.md

@@ -73,8 +73,7 @@ final class Fruit extends Enum {
 }
 ```
 
-(The constant values (0s) are meaningless, but required by PHP. In versions before 7.1, that only support public    
-constant members, it is recommended to not abuse them.)
+(The constant values (0s) are meaningless, but required by PHP.)
 
 This will expose the labels as magic static methods `Fruit::APPLE()` and `Fruit::BANANA()`.
 They serve as the constructors of the corresponding labels.

composer.json

@@ -17,11 +17,12 @@
   },
 
   "require": {
-    "php": "^7.2",
+    "php": "^7.4|^8.0",
     "ext-json": "*"
   },
 
   "require-dev": {
-    "phpunit/phpunit": ">=8.5.8"
+    "phpunit/phpunit": "^9.5",
+    "phpstan/phpstan": "^0.12.63"
   }
 }

src/Enum.php

@@ -19,17 +19,17 @@ abstract class Enum implements JsonSerializable
     /**
      * @var string[][]
      */
-    private static $constantsArray = array();
+    private static $constantsArray = [];
 
     /**
      * @var static[][]
      */
-    private static $instancesArray = array();
+    private static $instancesArray = [];
 
     /**
      * @var bool[]
      */
-    private static $parentIsEnumArray = array();
+    private static $parentIsEnumArray = [];
 
     /**
      * @param string $name
@@ -217,7 +217,7 @@ final public static function getEnumBaseClass()
      *
      * @return string
      */
-    final public static function getClass()
+    final public static function getClass(): string
     {
         return get_called_class();
     }
@@ -323,7 +323,7 @@ final public function when(Enum $a, $b): Enum\Matcher
      *
      * @return Enum\Matcher
      */
-    final public function whenDo(Enum $a, callable $b)
+    final public function whenDo(Enum $a, callable $b): Enum\Matcher
     {
         $map = new Enum\Matcher($this);
 
@@ -351,7 +351,7 @@ final public function whenDo(Enum $a, callable $b)
      * @return bool
      * @throws InvalidArgumentException If $b is not of the same type as this Enum.
      */
-    final public function equals(Enum $b)
+    final public function equals(Enum $b): bool
     {
         $aClass = get_class($this);
         $bClass = get_class($b);
@@ -443,7 +443,7 @@ final public static function __callStatic($name, array $arguments)
      * @return string
      * @internal
      */
-    public function __toString()
+    public function __toString(): string
     {
         return static::getClass() . '::' . $this->constName . '()';
     }

src/Enum/Matcher.php

@@ -4,7 +4,6 @@
 
 use InvalidArgumentException;
 use Vcn\Lib\Enum;
-use Vcn\Lib\Enum\Matcher\Match;
 
 /**
  * @template TEnum of Enum
@@ -16,22 +15,18 @@ final class Matcher
 {
     /**
      * @phpstan-var TEnum
-     *
-     * @var Enum
      */
-    private $subject;
+    private Enum $subject;
 
     /**
-     * @phpstan-var array<Match<TResult>>
+     * @phpstan-var array<callable(): TResult>
      *
-     * @var Match[] Map String Match
+     * @var callable[] Map String Match
      */
-    private $matches = array();
+    private array $callables = [];
 
     /**
-     * @phpstan-var Match<TResult>
-     *
-     * @var Match
+     * @phpstan-var callable(): TResult
      */
     private $surrogate;
 
@@ -40,34 +35,27 @@ final class Matcher
      *
      * @phpstan-param TEnum $subject
      *
-     * @param Enum $subject
-     *
      * @see Enum::when()
      *
      * @internal
      */
     public function __construct(Enum $subject)
     {
         $this->subject   = $subject;
-        $this->surrogate = new Match\Callback(
-            function () use ($subject) {
-                throw new Matcher\Exception\MatchExhausted($subject);
-            }
-        );
+        $this->surrogate = function () use ($subject) {
+            throw new Matcher\Exception\MatchExhausted($subject);
+        };
     }
 
     /**
      * @phpstan-param TEnum $enum
-     * @phpstan-param Match<TResult> $match
+     * @phpstan-param callable(): TResult $callable
      *
      * @phpstan-return Matcher<TEnum, TResult>
      *
-     * @param Enum  $enum
-     * @param Match $match
-     *
      * @return Matcher
      */
-    private function whenMatch(Enum $enum, Match $match): Matcher
+    private function whenMatch(Enum $enum, callable $callable): Matcher
     {
         if (!$enum instanceof $this->subject) {
             $classSubject  = get_class($this->subject);
@@ -79,14 +67,13 @@ private function whenMatch(Enum $enum, Match $match): Matcher
             );
         }
 
-        if (array_key_exists($enum->getName(), $this->matches)) {
+        if (array_key_exists($enum->getName(), $this->callables)) {
             throw new InvalidArgumentException(
                 "This map has already mapped instance {$enum} to a value."
             );
         }
 
-        /** @noinspection PhpInternalEntityUsedInspection */
-        $this->matches[$enum->getName()] = $match;
+        $this->callables[$enum->getName()] = $callable;
 
         return $this;
     }
@@ -137,8 +124,7 @@ private function whenMatch(Enum $enum, Match $match): Matcher
      */
     public function when(Enum $enum, $value): Matcher
     {
-        /** @noinspection PhpInternalEntityUsedInspection */
-        return $this->whenMatch($enum, new Match\Value($value));
+        return $this->whenMatch($enum, fn () => $value);
     }
 
     /**
@@ -189,29 +175,22 @@ public function when(Enum $enum, $value): Matcher
      *
      * @phpstan-return Matcher<TEnum, TResult>
      *
-     * @param Enum     $enum
-     * @param callable $callable
-     *
      * @return Matcher
      */
     public function whenDo(Enum $enum, callable $callable): Matcher
     {
-        return $this->whenMatch($enum, new Match\Callback($callable));
+        return $this->whenMatch($enum, $callable);
     }
 
     /**
-     * @phpstan-param Match<TResult> $match
+     * @phpstan-param callable(): TResult $callable
      * @phpstan-return TResult
      *
-     * @param Match $match
-     *
      * @return mixed
      */
-    private function orElseMatch(Match $match)
+    private function orElseMatch(callable $callable)
     {
-        return array_key_exists($this->subject->getName(), $this->matches)
-            ? $this->matches[$this->subject->getName()]->get()
-            : $match->get();
+        return ($this->callables[$this->subject->getName()] ?? $callable)();
     }
 
     /**
@@ -256,7 +235,7 @@ private function orElseMatch(Match $match)
      */
     public function orElse($value)
     {
-        return $this->orElseMatch(new Match\Value($value));
+        return $this->orElseMatch(fn () => $value);
     }
 
     /**
@@ -300,7 +279,7 @@ public function orElse($value)
      * It is <strong>discouraged</strong> to throw checked exceptions since PHPStorm can't infer the corresponding
      * throws clause on this method.
      *
-     * @phpstan-param callable(): TResult
+     * @phpstan-param callable(): TResult $callable
      * @phpstan-return TResult
      *
      * @param callable $callable
@@ -309,7 +288,7 @@ public function orElse($value)
      */
     public function orElseDo(callable $callable)
     {
-        return $this->orElseMatch(new Match\Callback($callable));
+        return $this->orElseMatch($callable);
     }
 
     /**
@@ -368,8 +347,6 @@ function () {
      */
     public function get()
     {
-        return array_key_exists($this->subject->getName(), $this->matches)
-            ? $this->matches[$this->subject->getName()]->get()
-            : $this->surrogate->get();
+        return $this->orElseDo($this->surrogate);
     }
 }