@@ -43,7 +43,7 @@ |
||
| 43 | 43 | if (!\is_subclass_of($enumeration, Enum::class)) { |
| 44 | 44 | throw new InvalidArgumentException(\sprintf( |
| 45 | 45 | '%s can handle subclasses of %s only', |
| 46 | - __CLASS__, |
|
| 46 | + __CLASS__, |
|
| 47 | 47 | Enum::class |
| 48 | 48 | )); |
| 49 | 49 | } |
@@ -804,14 +804,30 @@ discard block |
||
| 804 | 804 | } |
| 805 | 805 | |
| 806 | 806 | $ord = \ord($bitset[$bytePos]); |
| 807 | - if ($ord & 0b00000001) ++$count; |
|
| 808 | - if ($ord & 0b00000010) ++$count; |
|
| 809 | - if ($ord & 0b00000100) ++$count; |
|
| 810 | - if ($ord & 0b00001000) ++$count; |
|
| 811 | - if ($ord & 0b00010000) ++$count; |
|
| 812 | - if ($ord & 0b00100000) ++$count; |
|
| 813 | - if ($ord & 0b01000000) ++$count; |
|
| 814 | - if ($ord & 0b10000000) ++$count; |
|
| 807 | + if ($ord & 0b00000001) { |
|
| 808 | + ++$count; |
|
| 809 | + } |
|
| 810 | + if ($ord & 0b00000010) { |
|
| 811 | + ++$count; |
|
| 812 | + } |
|
| 813 | + if ($ord & 0b00000100) { |
|
| 814 | + ++$count; |
|
| 815 | + } |
|
| 816 | + if ($ord & 0b00001000) { |
|
| 817 | + ++$count; |
|
| 818 | + } |
|
| 819 | + if ($ord & 0b00010000) { |
|
| 820 | + ++$count; |
|
| 821 | + } |
|
| 822 | + if ($ord & 0b00100000) { |
|
| 823 | + ++$count; |
|
| 824 | + } |
|
| 825 | + if ($ord & 0b01000000) { |
|
| 826 | + ++$count; |
|
| 827 | + } |
|
| 828 | + if ($ord & 0b10000000) { |
|
| 829 | + ++$count; |
|
| 830 | + } |
|
| 815 | 831 | } |
| 816 | 832 | return $count; |
| 817 | 833 | } |
@@ -843,14 +859,30 @@ discard block |
||
| 843 | 859 | $byte = $bitset & $bitChk; |
| 844 | 860 | if ($byte) { |
| 845 | 861 | $byte = $byte >> $bitPos; |
| 846 | - if ($byte & 0b00000001) ++$count; |
|
| 847 | - if ($byte & 0b00000010) ++$count; |
|
| 848 | - if ($byte & 0b00000100) ++$count; |
|
| 849 | - if ($byte & 0b00001000) ++$count; |
|
| 850 | - if ($byte & 0b00010000) ++$count; |
|
| 851 | - if ($byte & 0b00100000) ++$count; |
|
| 852 | - if ($byte & 0b01000000) ++$count; |
|
| 853 | - if ($byte & 0b10000000) ++$count; |
|
| 862 | + if ($byte & 0b00000001) { |
|
| 863 | + ++$count; |
|
| 864 | + } |
|
| 865 | + if ($byte & 0b00000010) { |
|
| 866 | + ++$count; |
|
| 867 | + } |
|
| 868 | + if ($byte & 0b00000100) { |
|
| 869 | + ++$count; |
|
| 870 | + } |
|
| 871 | + if ($byte & 0b00001000) { |
|
| 872 | + ++$count; |
|
| 873 | + } |
|
| 874 | + if ($byte & 0b00010000) { |
|
| 875 | + ++$count; |
|
| 876 | + } |
|
| 877 | + if ($byte & 0b00100000) { |
|
| 878 | + ++$count; |
|
| 879 | + } |
|
| 880 | + if ($byte & 0b01000000) { |
|
| 881 | + ++$count; |
|
| 882 | + } |
|
| 883 | + if ($byte & 0b10000000) { |
|
| 884 | + ++$count; |
|
| 885 | + } |
|
| 854 | 886 | } |
| 855 | 887 | |
| 856 | 888 | if ($bitset <= $bitChk) { |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | // we will switch this into a binary bitset |
| 87 | 87 | if ($this->enumerationCount > \PHP_INT_SIZE * 8) { |
| 88 | 88 | // init binary bitset with zeros |
| 89 | - $this->bitset = $this->emptyBitset = \str_repeat("\0", (int)\ceil($this->enumerationCount / 8)); |
|
| 89 | + $this->bitset = $this->emptyBitset = \str_repeat("\0", (int) \ceil($this->enumerationCount / 8)); |
|
| 90 | 90 | |
| 91 | 91 | // switch internal binary bitset functions |
| 92 | 92 | $this->fnDoGetIterator = 'doGetIteratorBin'; |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | throw new InvalidArgumentException('out-of-range bits detected'); |
| 333 | 333 | } |
| 334 | 334 | |
| 335 | - $this->bitset = \substr($bitset, 0, -1) . $lastByteExpected; |
|
| 335 | + $this->bitset = \substr($bitset, 0, -1).$lastByteExpected; |
|
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | $this->bitset = $bitset; |
@@ -1054,7 +1054,7 @@ discard block |
||
| 1054 | 1054 | private function doGetBinaryBitsetLeInt() |
| 1055 | 1055 | { |
| 1056 | 1056 | $bin = \pack(\PHP_INT_SIZE === 8 ? 'P' : 'V', $this->bitset); |
| 1057 | - return \substr($bin, 0, (int)\ceil($this->enumerationCount / 8)); |
|
| 1057 | + return \substr($bin, 0, (int) \ceil($this->enumerationCount / 8)); |
|
| 1058 | 1058 | } |
| 1059 | 1059 | |
| 1060 | 1060 | /** |
@@ -1112,6 +1112,6 @@ discard block |
||
| 1112 | 1112 | */ |
| 1113 | 1113 | private function doGetBitInt($ordinal) |
| 1114 | 1114 | { |
| 1115 | - return (bool)($this->bitset & (1 << $ordinal)); |
|
| 1115 | + return (bool) ($this->bitset & (1 << $ordinal)); |
|
| 1116 | 1116 | } |
| 1117 | 1117 | } |
@@ -53,14 +53,14 @@ |
||
| 53 | 53 | $name = \array_search($value, $constants, true); |
| 54 | 54 | if ($name === false) { |
| 55 | 55 | $message = \is_scalar($value) |
| 56 | - ? 'Unknown value ' . \var_export($value, true) |
|
| 57 | - : 'Invalid value of type ' . (\is_object($value) ? \get_class($value) : \gettype($value)); |
|
| 56 | + ? 'Unknown value '.\var_export($value, true) |
|
| 57 | + : 'Invalid value of type '.(\is_object($value) ? \get_class($value) : \gettype($value)); |
|
| 58 | 58 | throw new RuntimeException($message); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | $class = static::class; |
| 62 | 62 | $enumerator = $this; |
| 63 | - $closure = function () use ($class, $name, $value, $enumerator) { |
|
| 63 | + $closure = function() use ($class, $name, $value, $enumerator) { |
|
| 64 | 64 | if ($value !== null && $this->value !== null) { |
| 65 | 65 | throw new LogicException('Do not call this directly - please use unserialize($enum) instead'); |
| 66 | 66 | } |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | 'Unknown value %s for enumeration %s', |
| 199 | 199 | \is_scalar($value) |
| 200 | 200 | ? \var_export($value, true) |
| 201 | - : 'of type ' . (\is_object($value) ? \get_class($value) : \gettype($value)), |
|
| 201 | + : 'of type '.(\is_object($value) ? \get_class($value) : \gettype($value)), |
|
| 202 | 202 | static::class |
| 203 | 203 | )); |
| 204 | 204 | } |
@@ -221,14 +221,14 @@ discard block |
||
| 221 | 221 | return self::$instances[static::class][$name]; |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | - $const = static::class . "::{$name}"; |
|
| 224 | + $const = static::class."::{$name}"; |
|
| 225 | 225 | if (!\defined($const)) { |
| 226 | 226 | throw new InvalidArgumentException("{$const} not defined"); |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | assert( |
| 230 | 230 | self::noAmbiguousValues(static::getConstants()), |
| 231 | - 'Ambiguous enumerator values detected for ' . static::class |
|
| 231 | + 'Ambiguous enumerator values detected for '.static::class |
|
| 232 | 232 | ); |
| 233 | 233 | |
| 234 | 234 | return self::$instances[static::class][$name] = new static(\constant($const)); |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | // Enumerators must be defined as public class constants |
| 327 | 327 | foreach ($reflection->getReflectionConstants() as $reflConstant) { |
| 328 | 328 | if ($reflConstant->isPublic()) { |
| 329 | - $scopeConstants[ $reflConstant->getName() ] = $reflConstant->getValue(); |
|
| 329 | + $scopeConstants[$reflConstant->getName()] = $reflConstant->getValue(); |
|
| 330 | 330 | } |
| 331 | 331 | } |
| 332 | 332 | |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | |
| 336 | 336 | assert( |
| 337 | 337 | self::noAmbiguousValues($constants), |
| 338 | - 'Ambiguous enumerator values detected for ' . static::class |
|
| 338 | + 'Ambiguous enumerator values detected for '.static::class |
|
| 339 | 339 | ); |
| 340 | 340 | |
| 341 | 341 | self::$names[static::class] = \array_keys($constants); |