Run rector (& do some minor manual adjustments) to improve PHP 8.1 compatibility

Author: GenieTim

lib/Binarizer.php

@@ -30,12 +30,9 @@
  */
 abstract class Binarizer
 {
-	private $source;
-
-	protected function __construct($source)
-	{
-		$this->source = $source;
-	}
+	protected function __construct(private $source)
+ {
+ }
 
 	/**
 	 * @return LuminanceSource

lib/BinaryBitmap.php

@@ -27,8 +27,8 @@
  */
 final class BinaryBitmap
 {
-	private $binarizer;
-	private $matrix;
+	private readonly \Zxing\Binarizer $binarizer;
+	private ?\Zxing\Common\BitMatrix $matrix = null;
 
 	public function __construct(Binarizer $binarizer)
 	{
@@ -90,7 +90,7 @@ public function isCropSupported()
 	 *
 	 * @return BinaryBitmap A cropped version of this object.
 	 */
-	public function crop($left, $top, $width, $height)
+	public function crop($left, $top, $width, $height): \Zxing\BinaryBitmap
 	{
 		$newSource = $this->binarizer->getLuminanceSource()->crop($left, $top, $width, $height);
 
@@ -111,7 +111,7 @@ public function isRotateSupported()
 	 *
 	 * @return BinaryBitmap A rotated version of this object.
 	 */
-	public function rotateCounterClockwise()
+	public function rotateCounterClockwise(): \Zxing\BinaryBitmap
 	{
 		$newSource = $this->binarizer->getLuminanceSource()->rotateCounterClockwise();
 
@@ -124,7 +124,7 @@ public function rotateCounterClockwise()
 	 *
 	 * @return BinaryBitmap A rotated version of this object.
 	 */
-	public function rotateCounterClockwise45()
+	public function rotateCounterClockwise45(): \Zxing\BinaryBitmap
 	{
 		$newSource = $this->binarizer->getLuminanceSource()->rotateCounterClockwise45();
 
@@ -135,7 +135,7 @@ public function toString()
 	{
 		try {
 			return $this->getBlackMatrix()->toString();
-		} catch (NotFoundException $e) {
+		} catch (NotFoundException) {
 		}
 
 		return '';

lib/ChecksumException.php

@@ -25,7 +25,7 @@
  */
 final class ChecksumException extends ReaderException
 {
-	private static $instance;
+	private static ?\Zxing\ChecksumException $instance = null;
 
 	public static function getChecksumInstance($cause = null)
 	{

lib/Common/AbstractEnum.php

@@ -7,7 +7,7 @@
 /**
  * A general enum implementation until we got SplEnum.
  */
-final class AbstractEnum
+final class AbstractEnum implements \Stringable
 {
 	/**
 	 * Default value.
@@ -20,27 +20,20 @@ final class AbstractEnum
 	 */
 	private $value;
 	/**
-	 * Cache of constants.
-	 *
-	 * @var array
-	 */
-	private $constants;
-	/**
-	 * Whether to handle values strict or not.
-	 *
-	 * @var boolean
-	 */
-	private $strict;
+  * Cache of constants.
+  *
+  * @var array<string, mixed>|null
+  */
+ private ?array $constants = null;
 
 	/**
 	 * Creates a new enum.
 	 *
 	 * @param mixed   $initialValue
 	 * @param boolean $strict
 	 */
-	public function __construct($initialValue = null, $strict = false)
+	public function __construct($initialValue = null, private $strict = false)
 	{
-		$this->strict = $strict;
 		$this->change($initialValue);
 	}
 
@@ -54,7 +47,7 @@ public function __construct($initialValue = null, $strict = false)
 	public function change($value)
 	{
 		if (!in_array($value, $this->getConstList(), $this->strict)) {
-			throw new \UnexpectedValueException('Value not a const in enum ' . get_class($this));
+			throw new \UnexpectedValueException('Value not a const in enum ' . $this::class);
 		}
 		$this->value = $value;
 	}
@@ -96,7 +89,7 @@ public function get()
 	 *
 	 * @return string
 	 */
-	public function __toString()
+	public function __toString(): string
 	{
 		return (string)array_search($this->value, $this->getConstList());
 	}

lib/Common/BitArray.php

@@ -32,8 +32,14 @@
 
 final class BitArray
 {
-	private $bits;
-	private $size;
+	/**
+  * @var mixed[]|mixed|int[]|null
+  */
+ private $bits;
+	/**
+  * @var mixed|null
+  */
+ private $size;
 
 
 	public function __construct($bits = [], $size = 0)
@@ -43,7 +49,7 @@ public function __construct($bits = [], $size = 0)
 			$this->bits = [];
 		} elseif ($bits && !$size) {
 			$this->size = $bits;
-			$this->bits = $this->makeArray($bits);
+			$this->bits = self::makeArray($bits);
 		} else {
 			$this->bits = $bits;
 			$this->size = $size;
@@ -70,7 +76,7 @@ public function getSizeInBytes()
 	 *
 	 * @param bit $i to set
 	 */
-	public function set($i)
+	public function set($i): void
 	{
 		$this->bits[(int)($i / 32)] |= 1 << ($i & 0x1F);
 		$this->bits[(int)($i / 32)] = ($this->bits[(int)($i / 32)]);
@@ -81,7 +87,7 @@ public function set($i)
 	 *
 	 * @param bit $i to set
 	 */
-	public function flip($i)
+	public function flip($i): void
 	{
 		$this->bits[(int)($i / 32)] ^= 1 << ($i & 0x1F);
 		$this->bits[(int)($i / 32)] = ($this->bits[(int)($i / 32)]);
@@ -104,7 +110,7 @@ public function getNextSet($from)
 		// mask off lesser bits first
 		$currentBits &= ~((1 << ($from & 0x1F)) - 1);
 		while ($currentBits == 0) {
-			if (++$bitsOffset == count($this->bits)) {
+			if (++$bitsOffset == (is_countable($this->bits) ? count($this->bits) : 0)) {
 				return $this->size;
 			}
 			$currentBits = $this->bits[$bitsOffset];
@@ -130,7 +136,7 @@ public function getNextUnset($from)
 		// mask off lesser bits first
 		$currentBits &= ~((1 << ($from & 0x1F)) - 1);
 		while ($currentBits == 0) {
-			if (++$bitsOffset == count($this->bits)) {
+			if (++$bitsOffset == (is_countable($this->bits) ? count($this->bits) : 0)) {
 				return $this->size;
 			}
 			$currentBits = (~$this->bits[$bitsOffset]);
@@ -147,7 +153,7 @@ public function getNextUnset($from)
 	 * @param the $newBits new value of the next 32 bits. Note again that the least-significant bit
 	 *                corresponds to bit i, the next-least-significant to i+1, and so on.
 	 */
-	public function setBulk($i, $newBits)
+	public function setBulk($i, $newBits): void
 	{
 		$this->bits[(int)($i / 32)] = $newBits;
 	}
@@ -188,9 +194,9 @@ public function setRange($start, $end)
 	/**
 	 * Clears all bits (sets to false).
 	 */
-	public function clear()
+	public function clear(): void
 	{
-		$max = count($this->bits);
+		$max = is_countable($this->bits) ? count($this->bits) : 0;
 		for ($i = 0; $i < $max; $i++) {
 			$this->bits[$i] = 0;
 		}
@@ -259,16 +265,16 @@ public function appendBits($value, $numBits)
 		}
 	}
 
-	private function ensureCapacity($size)
+	private function ensureCapacity($size): void
 	{
-		if ($size > count($this->bits) * 32) {
-			$newBits = $this->makeArray($size);
-			$newBits = arraycopy($this->bits, 0, $newBits, 0, count($this->bits));
+		if ($size > (is_countable($this->bits) ? count($this->bits) : 0) * 32) {
+			$newBits = self::makeArray($size);
+			$newBits = arraycopy($this->bits, 0, $newBits, 0, is_countable($this->bits) ? count($this->bits) : 0);
 			$this->bits = $newBits;
 		}
 	}
 
-	public function appendBit($bit)
+	public function appendBit($bit): void
 	{
 		$this->ensureCapacity($this->size + 1);
 		if ($bit) {
@@ -277,7 +283,7 @@ public function appendBit($bit)
 		$this->size++;
 	}
 
-	public function appendBitArray($other)
+	public function appendBitArray($other): void
 	{
 		$otherSize = $other->size;
 		$this->ensureCapacity($this->size + $otherSize);
@@ -288,10 +294,10 @@ public function appendBitArray($other)
 
 	public function _xor($other)
 	{
-		if (count($this->bits) !== count($other->bits)) {
+		if ((is_countable($this->bits) ? count($this->bits) : 0) !== (is_countable($other->bits) ? count($other->bits) : 0)) {
 			throw new \InvalidArgumentException("Sizes don't match");
 		}
-		$count = count($this->bits);
+		$count = is_countable($this->bits) ? count($this->bits) : 0;
 		for ($i = 0; $i < $count; $i++) {
 			// The last byte could be incomplete (i.e. not have 8 bits in
 			// it) but there is no problem since 0 XOR 0 == 0.
@@ -307,7 +313,7 @@ public function _xor($other)
 	 * @param position    $offset in array to start writing
 	 * @param how  $numBytes many bytes to write
 	 */
-	public function toBytes($bitOffset, &$array, $offset, $numBytes)
+	public function toBytes($bitOffset, &$array, $offset, $numBytes): void
 	{
 		for ($i = 0; $i < $numBytes; $i++) {
 			$theByte = 0;
@@ -345,7 +351,7 @@ public function getBitArray()
 	/**
 	 * Reverses all bits in the array.
 	 */
-	public function reverse()
+	public function reverse(): void
 	{
 		$newBits = [];
 		// reverse all int's first
@@ -412,7 +418,7 @@ public function toString()
 		return (string)$result;
 	}
 
-	public function _clone()
+	public function _clone(): \Zxing\Common\BitArray
 	{
 		return new BitArray($this->bits, $this->size);
 	}