reduced local variables

Author: marc-mabe

src/Enum.php

@@ -119,8 +119,7 @@ final public function getValue()
      */
     final public function getName(): string
     {
-        $ordinal = $this->ordinal !== null ? $this->ordinal : $this->getOrdinal();
-        return self::$names[static::class][$ordinal];
+        return self::$names[static::class][$this->ordinal ?: $this->getOrdinal()];
     }
 
     /**
@@ -226,9 +225,9 @@ final public static function byName(string $name): self
             return self::$instances[static::class][$name];
         }
 
-        $const = static::class . '::' . $name;
+        $const = static::class . "::{$name}";
         if (!\defined($const)) {
-            throw new InvalidArgumentException($const . ' not defined');
+            throw new InvalidArgumentException("{$const} not defined");
         }
 
         return self::$instances[static::class][$name] = new static(\constant($const));
@@ -356,7 +355,7 @@ final public static function hasValue($value): bool
      */
     final public static function hasName(string $name): bool
     {
-        return \defined("static::$name");
+        return \defined("static::{$name}");
     }
 
     /**

src/EnumMap.php

@@ -97,8 +97,7 @@ public function search($value, bool $strict = false): ?Enum
     {
         $ord = \array_search($value, $this->map, $strict);
         if ($ord !== false) {
-            $enumeration = $this->enumeration;
-            return $enumeration::byOrdinal($ord);
+            return ($this->enumeration)::byOrdinal($ord);
         }
 
         return null;
@@ -113,8 +112,7 @@ public function search($value, bool $strict = false): ?Enum
     public function contains($enumerator): bool
     {
         try {
-            $enumeration = $this->enumeration;
-            $ord  = $enumeration::get($enumerator)->getOrdinal();
+            $ord  = ($this->enumeration)::get($enumerator)->getOrdinal();
             return array_key_exists($ord, $this->map);
         } catch (InvalidArgumentException $e) {
             // An invalid enumerator can't be contained in this map
@@ -131,9 +129,7 @@ public function contains($enumerator): bool
     public function offsetExists($enumerator): bool
     {
         try {
-            $enumeration = $this->enumeration;
-            $ord  = $enumeration::get($enumerator)->getOrdinal();
-            return isset($this->map[$ord]);
+            return isset($this->map[($this->enumeration)::get($enumerator)->getOrdinal()]);
         } catch (InvalidArgumentException $e) {
             // An invalid enumerator can't be an offset of this map
             return false;
@@ -149,8 +145,7 @@ public function offsetExists($enumerator): bool
      */
     public function offsetGet($enumerator)
     {
-        $enumeration = $this->enumeration;
-        $enumerator  = $enumeration::get($enumerator);
+        $enumerator = ($this->enumeration)::get($enumerator);
         $ord = $enumerator->getOrdinal();
         if (!isset($this->map[$ord]) && !array_key_exists($ord, $this->map)) {
             throw new UnexpectedValueException(sprintf(
@@ -172,8 +167,7 @@ public function offsetGet($enumerator)
      */
     public function offsetSet($enumerator, $value = null): void
     {
-        $enumeration = $this->enumeration;
-        $ord = $enumeration::get($enumerator)->getOrdinal();
+        $ord = ($this->enumeration)::get($enumerator)->getOrdinal();
 
         if (!array_key_exists($ord, $this->map)) {
             $this->ordinals[] = $ord;
@@ -190,8 +184,7 @@ public function offsetSet($enumerator, $value = null): void
      */
     public function offsetUnset($enumerator): void
     {
-        $enumeration = $this->enumeration;
-        $ord = $enumeration::get($enumerator)->getOrdinal();
+        $ord = ($this->enumeration)::get($enumerator)->getOrdinal();
 
         if (($idx = \array_search($ord, $this->ordinals, true)) !== false) {
             unset($this->map[$ord], $this->ordinals[$idx]);
@@ -237,8 +230,7 @@ public function key(): ?Enum
             return null;
         }
 
-        $enumeration = $this->enumeration;
-        return $enumeration::byOrdinal($this->ordinals[$this->pos]);
+        return ($this->enumeration)::byOrdinal($this->ordinals[$this->pos]);
     }
 
     /**

src/EnumSet.php

@@ -114,8 +114,7 @@ public function getEnumeration(): string
      */
     public function attach($enumerator): void
     {
-        $enumeration = $this->enumeration;
-        $this->{$this->fnDoSetBit}($enumeration::get($enumerator)->getOrdinal());
+        $this->{$this->fnDoSetBit}(($this->enumeration)::get($enumerator)->getOrdinal());
     }
 
     /**
@@ -126,8 +125,7 @@ public function attach($enumerator): void
      */
     public function detach($enumerator): void
     {
-        $enumeration = $this->enumeration;
-        $this->{$this->fnDoUnsetBit}($enumeration::get($enumerator)->getOrdinal());
+        $this->{$this->fnDoUnsetBit}(($this->enumeration)::get($enumerator)->getOrdinal());
     }
 
     /**
@@ -137,8 +135,7 @@ public function detach($enumerator): void
      */
     public function contains($enumerator): bool
     {
-        $enumeration = $this->enumeration;
-        return $this->{$this->fnDoGetBit}($enumeration::get($enumerator)->getOrdinal());
+        return $this->{$this->fnDoGetBit}(($this->enumeration)::get($enumerator)->getOrdinal());
     }
 
     /* Iterator */
@@ -150,8 +147,7 @@ public function contains($enumerator): bool
     public function current(): ?Enum
     {
         if ($this->valid()) {
-            $enumeration = $this->enumeration;
-            return $enumeration::byOrdinal($this->ordinal);
+            return ($this->enumeration)::byOrdinal($this->ordinal);
         }
 
         return null;