🚿

Author: codemasher

src/Common/LuminanceSourceAbstract.php

@@ -16,7 +16,7 @@
 use chillerlan\QRCode\QROptions;
 use chillerlan\QRCode\Decoder\QRCodeDecoderException;
 use chillerlan\Settings\SettingsContainerInterface;
-use function array_slice, array_splice, file_exists, is_file, is_readable, realpath;
+use function array_slice, file_exists, is_file, is_readable, realpath;
 
 /**
  * The purpose of this class hierarchy is to abstract different bitmap implementations across
@@ -28,16 +28,14 @@ abstract class LuminanceSourceAbstract implements LuminanceSourceInterface{
 
 	protected SettingsContainerInterface|QROptions $options;
 	/** @var int[] */
-	protected array $luminances;
+	protected array $luminances = [];
 	protected int   $width;
 	protected int   $height;
 
 	public function __construct(int $width, int $height, SettingsContainerInterface|QROptions $options = new QROptions){
 		$this->width   = $width;
 		$this->height  = $height;
 		$this->options = $options;
-
-		$this->luminances = [];
 	}
 
 	public function getLuminances():array{
@@ -54,15 +52,11 @@ public function getHeight():int{
 
 	public function getRow(int $y):array{
 
-		if($y < 0 || $y >= $this->getHeight()){
+		if($y < 0 || $y >= $this->height){
 			throw new QRCodeDecoderException('Requested row is outside the image: '.$y);
 		}
 
-		$arr = [];
-
-		array_splice($arr, 0, $this->width, array_slice($this->luminances, ($y * $this->width), $this->width));
-
-		return $arr;
+		return array_slice($this->luminances, ($y * $this->width), $this->width);
 	}
 
 	protected function setLuminancePixel(int $r, int $g, int $b):void{