reduced code paths

Author: marc-mabe

src/Enum.php

@@ -306,7 +306,7 @@ final public static function getNames(): array
     final public static function getOrdinals(): array
     {
         $count = \count(self::detectConstants(static::class));
-        return $count === 0 ? [] : \range(0, $count - 1);
+        return $count ? \range(0, $count - 1) : [];
     }
 
     /**
@@ -328,11 +328,8 @@ final public static function getConstants(): array
      */
     final public static function has($enumerator): bool
     {
-        if ($enumerator instanceof static && \get_class($enumerator) === static::class) {
-            return true;
-        }
-
-        return static::hasValue($enumerator);
+        return ($enumerator instanceof static && \get_class($enumerator) === static::class)
+            || static::hasValue($enumerator);
     }
 
     /**

src/EnumMap.php

@@ -112,7 +112,7 @@ public function search($value, bool $strict = false): ?Enum
     public function contains($enumerator): bool
     {
         try {
-            $ord  = ($this->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

src/EnumSet.php

@@ -348,11 +348,8 @@ public function isEqual(EnumSet $other): bool
      */
     public function isSubset(EnumSet $other): bool
     {
-        if ($this->enumeration !== $other->enumeration) {
-            return false;
-        }
-
-        return ($this->bitset & $other->bitset) === $this->bitset;
+        return $this->enumeration === $other->enumeration
+            && ($this->bitset & $other->bitset) === $this->bitset;
     }
 
     /**
@@ -362,11 +359,8 @@ public function isSubset(EnumSet $other): bool
      */
     public function isSuperset(EnumSet $other): bool
     {
-        if ($this->enumeration !== $other->enumeration) {
-            return false;
-        }
-
-        return ($this->bitset | $other->bitset) === $this->bitset;
+        return $this->enumeration === $other->enumeration
+            && ($this->bitset | $other->bitset) === $this->bitset;
     }
 
     /**