marc-mabe / php-enum

src/EnumSet.php

Braces +48 added lines, -16 removed lines

@@ -804,14 +804,30 @@ 
             }
 
             $ord = \ord($bitset[$bytePos]);
-            if ($ord & 0b00000001) ++$count;
-            if ($ord & 0b00000010) ++$count;
-            if ($ord & 0b00000100) ++$count;
-            if ($ord & 0b00001000) ++$count;
-            if ($ord & 0b00010000) ++$count;
-            if ($ord & 0b00100000) ++$count;
-            if ($ord & 0b01000000) ++$count;
-            if ($ord & 0b10000000) ++$count;
+            if ($ord & 0b00000001) {
+                ++$count;
+            }
+            if ($ord & 0b00000010) {
+                ++$count;
+            }
+            if ($ord & 0b00000100) {
+                ++$count;
+            }
+            if ($ord & 0b00001000) {
+                ++$count;
+            }
+            if ($ord & 0b00010000) {
+                ++$count;
+            }
+            if ($ord & 0b00100000) {
+                ++$count;
+            }
+            if ($ord & 0b01000000) {
+                ++$count;
+            }
+            if ($ord & 0b10000000) {
+                ++$count;
+            }
         }
         return $count;
     }
@@ -843,14 +859,30 @@ 
             $byte = $bitset & $bitChk;
             if ($byte) {
                 $byte = $byte >> $bitPos;
-                if ($byte & 0b00000001) ++$count;
-                if ($byte & 0b00000010) ++$count;
-                if ($byte & 0b00000100) ++$count;
-                if ($byte & 0b00001000) ++$count;
-                if ($byte & 0b00010000) ++$count;
-                if ($byte & 0b00100000) ++$count;
-                if ($byte & 0b01000000) ++$count;
-                if ($byte & 0b10000000) ++$count;
+                if ($byte & 0b00000001) {
+                    ++$count;
+                }
+                if ($byte & 0b00000010) {
+                    ++$count;
+                }
+                if ($byte & 0b00000100) {
+                    ++$count;
+                }
+                if ($byte & 0b00001000) {
+                    ++$count;
+                }
+                if ($byte & 0b00010000) {
+                    ++$count;
+                }
+                if ($byte & 0b00100000) {
+                    ++$count;
+                }
+                if ($byte & 0b01000000) {
+                    ++$count;
+                }
+                if ($byte & 0b10000000) {
+                    ++$count;
+                }
             }
 
             if ($bitset <= $bitChk) {

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
         // we will switch this into a binary bitset
         if ($this->ordinalMax > \PHP_INT_SIZE * 8) {
             // init binary bitset with zeros
-            $this->bitset = \str_repeat("\0", (int)\ceil($this->ordinalMax / 8));
+            $this->bitset = \str_repeat("\0", (int) \ceil($this->ordinalMax / 8));
 
             // switch internal binary bitset functions
             $this->fnDoRewind            = 'doRewindBin';
@@ -598,7 +598,7 @@ 
     private function doGetBinaryBitsetLeInt()
     {
         $bin = \pack(\PHP_INT_SIZE === 8 ? 'P' : 'V', $this->bitset);
-        return \substr($bin, 0, (int)\ceil($this->ordinalMax / 8));
+        return \substr($bin, 0, (int) \ceil($this->ordinalMax / 8));
     }
 
     /**
@@ -660,7 +660,7 @@ 
                 throw new InvalidArgumentException('out-of-range bits detected');
             }
 
-            $this->bitset = \substr($bitset, 0, -1) . $lastByteExpected;
+            $this->bitset = \substr($bitset, 0, -1).$lastByteExpected;
         }
 
         $this->bitset = $bitset;
@@ -771,7 +771,7 @@ 
      */
     private function doGetBitInt($ordinal)
     {
-        return (bool)($this->bitset & (1 << $ordinal));
+        return (bool) ($this->bitset & (1 << $ordinal));
     }
 
     /**

src/EnumSerializableTrait.php

Spacing +3 added lines, -3 removed lines

@@ -53,14 +53,14 @@
         $name      = \array_search($value, $constants, true);
         if ($name === false) {
             $message = \is_scalar($value)
-                ? 'Unknown value ' . \var_export($value, true)
-                : 'Invalid value of type ' . (\is_object($value) ? \get_class($value) : \gettype($value));
+                ? 'Unknown value '.\var_export($value, true)
+                : 'Invalid value of type '.(\is_object($value) ? \get_class($value) : \gettype($value));
             throw new RuntimeException($message);
         }
 
         $class      = static::class;
         $enumerator = $this;
-        $closure    = function () use ($class, $name, $value, $enumerator) {
+        $closure    = function() use ($class, $name, $value, $enumerator) {
             if ($value !== null && $this->value !== null) {
                 throw new LogicException('Do not call this directly - please use unserialize($enum) instead');
             }

src/Enum.php

Spacing +5 added lines, -5 removed lines

@@ -198,7 +198,7 @@ 
                 'Unknown value %s for enumeration %s',
                 \is_scalar($value)
                     ? \var_export($value, true)
-                    : 'of type ' . (\is_object($value) ? \get_class($value) : \gettype($value)),
+                    : 'of type '.(\is_object($value) ? \get_class($value) : \gettype($value)),
                 static::class
             ));
         }
@@ -225,9 +225,9 @@ 
             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));
@@ -370,7 +370,7 @@ 
     {
         if (!isset(self::$constants[$class])) {
             $reflection = new ReflectionClass($class);
-            $publicConstants  = [];
+            $publicConstants = [];
 
             do {
                 $scopeConstants = [];
@@ -381,7 +381,7 @@ 
                     //       It allows the visibility keyword but ignores it.
                     foreach ($reflection->getReflectionConstants() as $reflConstant) {
                         if ($reflConstant->isPublic()) {
-                            $scopeConstants[ $reflConstant->getName() ] = $reflConstant->getValue();
+                            $scopeConstants[$reflConstant->getName()] = $reflConstant->getValue();
                         }
                     }
                 } else {

src/EnumMap.php

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
     {
         try {
             $enumeration = $this->enumeration;
-            $ord  = $enumeration::get($enumerator)->getOrdinal();
+            $ord = $enumeration::get($enumerator)->getOrdinal();
             return array_key_exists($ord, $this->map);
         } catch (InvalidArgumentException $e) {
             // An invalid enumerator can't be contained in this map
@@ -130,7 +130,7 @@ 
     {
         try {
             $enumeration = $this->enumeration;
-            $ord  = $enumeration::get($enumerator)->getOrdinal();
+            $ord = $enumeration::get($enumerator)->getOrdinal();
             return isset($this->map[$ord]);
         } catch (InvalidArgumentException $e) {
             // An invalid enumerator can't be an offset of this map
@@ -204,7 +204,7 @@ 
      */
     public function seek($pos)
     {
-        $pos = (int)$pos;
+        $pos = (int) $pos;
         if (!isset($this->ordinals[$pos])) {
             throw new OutOfBoundsException("Position {$pos} not found");
         }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
     {
         $pos = (int)$pos;
         if (!isset($this->ordinals[$pos])) {
-            throw new OutOfBoundsException("Position {$pos} not found");
+            throw new OutOfBoundsException("position {$pos} not found");
         }
 
         $this->pos = $pos;