Implement additional hint to fix tests

This fixes #112

Author: GenieTim

lib/Common/DefaultGridSampler.php

@@ -81,7 +81,7 @@ public function sampleGrid_(
 		PerspectiveTransform $transform
 	): BitMatrix {
 		if ($dimensionX <= 0 || $dimensionY <= 0) {
-			throw NotFoundException::getNotFoundInstance("X or Y dimensions smaller than zero");
+			throw new NotFoundException("X or Y dimensions smaller than zero");
 		}
 		$bits = new BitMatrix($dimensionX, $dimensionY);
 		$points = fill_array(0, 2 * $dimensionX, 0.0);
@@ -111,7 +111,7 @@ public function sampleGrid_(
 				// This results in an ugly runtime exception despite our clever checks above -- can't have
 				// that. We could check each point's coordinates but that feels duplicative. We settle for
 				// catching and wrapping ArrayIndexOutOfBoundsException.
-				throw NotFoundException::getNotFoundInstance("ArrayIndexOutOfBoundsException");
+				throw new NotFoundException("ArrayIndexOutOfBoundsException");
 			}
 		}
 

lib/Common/Detector/MonochromeRectangleDetector.php

@@ -177,7 +177,7 @@ private function findCornerFromCenter(
 			}
 			if ($range == null) {
 				if ($lastRange == null) {
-					throw NotFoundException::getNotFoundInstance("No corner from center found");
+					throw new NotFoundException("No corner from center found");
 				}
 				// lastRange was found
 				if ($deltaX == 0) {
@@ -207,7 +207,7 @@ private function findCornerFromCenter(
 			}
 			$lastRange = $range;
 		}
-		throw NotFoundException::getNotFoundInstance("No corner from center found");
+		throw new NotFoundException("No corner from center found");
 	}
 
 

lib/Common/GlobalHistogramBinarizer.php

@@ -145,7 +145,7 @@ private static function estimateBlackPoint(array $buckets): int
 		// If there is too little contrast in the image to pick a meaningful black point, throw rather
 		// than waste time trying to decode the image, and risk false positives.
 		if ($secondPeak - $firstPeak <= $numBuckets / 16) {
-			throw NotFoundException::getNotFoundInstance("too little contrast in the image to pick a meaningful black point");
+			throw new NotFoundException("too little contrast in the image to pick a meaningful black point");
 		}
 
 		// Find a valley between them that is low and closer to the white peak.

lib/Common/GridSampler.php

@@ -96,7 +96,7 @@ protected static function checkAndNudgePoints(
 			$x = (int)$points[$offset];
 			$y = (int)$points[$offset + 1];
 			if ($x < -1 || $x > $width || $y < -1 || $y > $height) {
-				throw NotFoundException::getNotFoundInstance("Endpoint lies outside the image boundaries");
+				throw new NotFoundException("Endpoint ($x, $y) lies outside the image boundaries ($width, $height)");
 			}
 			$nudged = false;
 			if ($x == -1) {
@@ -120,7 +120,7 @@ protected static function checkAndNudgePoints(
 			$x = (int)$points[$offset];
 			$y = (int)$points[$offset + 1];
 			if ($x < -1 || $x > $width || $y < -1 || $y > $height) {
-				throw NotFoundException::getNotFoundInstance("Endpoint lies outside the image boundaries");
+				throw new NotFoundException("Endpoint ($x, $y) lies outside the image boundaries ($width, $height)");
 			}
 			$nudged = false;
 			if ($x == -1) {

lib/IMagickLuminanceSource.php

@@ -56,6 +56,32 @@ public function rotateCounterClockwise45(): void
 		throw new \RuntimeException("This LuminanceSource does not support rotateCounterClockwise45");
 	}
 
+	/**
+	 * TODO: move to some utility class or something
+	 * Converts shorthand memory notation value to bytes
+	 * From http://php.net/manual/en/function.ini-get.php
+	 *
+	 * @param int $val Memory size shorthand notation string
+	 */
+	protected static function kmgStringToBytes(string $val)
+	{
+		$val = trim($val);
+		$last = strtolower($val[strlen($val) - 1]);
+		$val = substr($val, 0, -1);
+		switch ($last) {
+				// The 'G' modifier is available since PHP 5.1.0
+			case 'g':
+				$val *= 1024;
+				// no break
+			case 'm':
+				$val *= 1024;
+				// no break
+			case 'k':
+				$val *= 1024;
+		}
+		return $val;
+	}
+
 	public function _IMagickLuminanceSource(\Imagick $image, $width, $height): void
 	{
 		parent::__construct($width, $height);
@@ -66,38 +92,13 @@ public function _IMagickLuminanceSource(\Imagick $image, $width, $height): void
 		$this->top = 0;
 		$this->image = $image;
 
-		/**
-		 * Converts shorthand memory notation value to bytes
-		 * From http://php.net/manual/en/function.ini-get.php
-		 *
-		 * @param int $val Memory size shorthand notation string
-		 */
-		function kmgStringToBytes(string $val)
-		{
-			$val = trim($val);
-			$last = strtolower($val[strlen($val) - 1]);
-			$val = substr($val, 0, -1);
-			switch ($last) {
-					// The 'G' modifier is available since PHP 5.1.0
-				case 'g':
-					$val *= 1024;
-					// no break
-				case 'm':
-					$val *= 1024;
-					// no break
-				case 'k':
-					$val *= 1024;
-			}
-			return $val;
-		}
-
 		// In order to measure pure decoding speed, we convert the entire image to a greyscale array
 		// up front, which is the same as the Y channel of the YUVLuminanceSource in the real app.
 		$this->luminances = [];
 
 		$image->setImageColorspace(\Imagick::COLORSPACE_GRAY);
 		// Check that we actually have enough space to do it
-		if ($width * $height * 16 * 3 > kmgStringToBytes(ini_get('memory_limit'))) {
+		if ($width * $height * 16 * 3 > $this->kmgStringToBytes(ini_get('memory_limit'))) {
 			throw new \RuntimeException("PHP Memory Limit does not allow pixel export.");
 		}
 		$pixels = $image->exportImagePixels(1, 1, $width, $height, "RGB", \Imagick::PIXEL_CHAR);

lib/Qrcode/Decoder/BitMatrixParser.php

@@ -221,7 +221,7 @@ public function readVersion()
 
 			return $theParsedVersion;
 		}
-		throw FormatException::getFormatInstance();
+		throw FormatException::getFormatInstance("both version information locations cannot be parsed as the valid encoding of version information");
 	}
 
 	/**

lib/Qrcode/Decoder/DecodedBitStreamParser.php

@@ -17,6 +17,7 @@
 
 namespace Zxing\Qrcode\Decoder;
 
+use ValueError;
 use Zxing\Common\BitSource;
 use Zxing\Common\CharacterSetECI;
 use Zxing\Common\DecoderResult;
@@ -53,7 +54,7 @@ public static function decode(
 		array|null $hints
 	): \Zxing\Common\DecoderResult {
 		$bits = new BitSource($bytes);
-		$result = '';//new StringBuilder(50);
+		$result = ''; //new StringBuilder(50);
 		$byteSegments = [];
 		$symbolSequence = -1;
 		$parityData = -1;
@@ -76,7 +77,7 @@ public static function decode(
 						$fc1InEffect = true;
 					} elseif ($mode == Mode::$STRUCTURED_APPEND) {
 						if ($bits->available() < 16) {
-							throw FormatException::getFormatInstance();
+							throw FormatException::getFormatInstance("Bits available < 16");
 						}
 						// sequence number and parity is added later to the result metadata
 						// Read next 8 bits (symbol sequence #) and 8 bits (parity data), then continue
@@ -87,7 +88,7 @@ public static function decode(
 						$value = self::parseECIValue($bits);
 						$currentCharacterSetECI = CharacterSetECI::getCharacterSetECIByValue($value);
 						if ($currentCharacterSetECI == null) {
-							throw FormatException::getFormatInstance();
+							throw FormatException::getFormatInstance("Current character set ECI is null");
 						}
 					} else {
 						// First handle Hanzi mode which does not start with character count
@@ -111,22 +112,22 @@ public static function decode(
 							} elseif ($mode == Mode::$KANJI) {
 								self::decodeKanjiSegment($bits, $result, $count);
 							} else {
-								throw FormatException::getFormatInstance();
+								throw FormatException::getFormatInstance("Unknown mode $mode to decode");
 							}
 						}
 					}
 				}
 			} while ($mode != Mode::$TERMINATOR);
-		} catch (\InvalidArgumentException) {
+		} catch (\InvalidArgumentException $e) {
 			// from readBits() calls
-			throw FormatException::getFormatInstance();
+			throw FormatException::getFormatInstance("Invalid argument exception when formatting: " . $e->getMessage());
 		}
 
 		return new DecoderResult(
 			$bytes,
 			$result,
 			empty($byteSegments) ? null : $byteSegments,
-			$ecLevel == null ? null : 'L',//ErrorCorrectionLevel::toString($ecLevel),
+			$ecLevel == null ? null : 'L', //ErrorCorrectionLevel::toString($ecLevel),
 			$symbolSequence,
 			$parityData
 		);
@@ -151,7 +152,7 @@ private static function parseECIValue(BitSource $bits): int
 
 			return (($firstByte & 0x1F) << 16) | $secondThirdBytes;
 		}
-		throw FormatException::getFormatInstance();
+		throw FormatException::getFormatInstance("ECI Value parsing failed.");
 	}
 
 	/**
@@ -166,7 +167,7 @@ private static function decodeHanziSegment(
 	): void {
 		// Don't crash trying to read more bits than we have available.
 		if ($count * 13 > $bits->available()) {
-			throw FormatException::getFormatInstance();
+			throw FormatException::getFormatInstance("Trying to read more bits than we have available");
 		}
 
 		// Each character will require 2 bytes. Read the characters as 2-byte pairs
@@ -184,8 +185,8 @@ private static function decodeHanziSegment(
 				// In the 0xB0A1 to 0xFAFE range
 				$assembledTwoBytes += 0x0A6A1;
 			}
-			$buffer[$offset] = (($assembledTwoBytes >> 8) & 0xFF);//(byte)
-			$buffer[$offset + 1] = ($assembledTwoBytes & 0xFF);//(byte)
+			$buffer[$offset] = (($assembledTwoBytes >> 8) & 0xFF); //(byte)
+			$buffer[$offset + 1] = ($assembledTwoBytes & 0xFF); //(byte)
 			$offset += 2;
 			$count--;
 		}
@@ -201,11 +202,11 @@ private static function decodeNumericSegment(
 		while ($count >= 3) {
 			// Each 10 bits encodes three digits
 			if ($bits->available() < 10) {
-				throw FormatException::getFormatInstance();
+				throw FormatException::getFormatInstance("Not enough bits available");
 			}
 			$threeDigitsBits = $bits->readBits(10);
 			if ($threeDigitsBits >= 1000) {
-				throw FormatException::getFormatInstance();
+				throw FormatException::getFormatInstance("Too many three digit bits");
 			}
 			$result .= (self::toAlphaNumericChar($threeDigitsBits / 100));
 			$result .= (self::toAlphaNumericChar(($threeDigitsBits / 10) % 10));
@@ -215,22 +216,22 @@ private static function decodeNumericSegment(
 		if ($count == 2) {
 			// Two digits left over to read, encoded in 7 bits
 			if ($bits->available() < 7) {
-				throw FormatException::getFormatInstance();
+				throw FormatException::getFormatInstance("Two digits left over to read, encoded in 7 bits, but only " . $bits->available() . ' bits available');
 			}
 			$twoDigitsBits = $bits->readBits(7);
 			if ($twoDigitsBits >= 100) {
-				throw FormatException::getFormatInstance();
+				throw FormatException::getFormatInstance("Too many bits: $twoDigitsBits expected < 100");
 			}
 			$result .= (self::toAlphaNumericChar($twoDigitsBits / 10));
 			$result .= (self::toAlphaNumericChar($twoDigitsBits % 10));
 		} elseif ($count == 1) {
 			// One digit left over to read
 			if ($bits->available() < 4) {
-				throw FormatException::getFormatInstance();
+				throw FormatException::getFormatInstance("One digit left to read, but < 4 bits available");
 			}
 			$digitBits = $bits->readBits(4);
 			if ($digitBits >= 10) {
-				throw FormatException::getFormatInstance();
+				throw FormatException::getFormatInstance("Too many bits: $digitBits expected < 10");
 			}
 			$result .= (self::toAlphaNumericChar($digitBits));
 		}
@@ -242,7 +243,7 @@ private static function decodeNumericSegment(
 	private static function toAlphaNumericChar(int|float $value)
 	{
 		if ($value >= count(self::$ALPHANUMERIC_CHARS)) {
-			throw FormatException::getFormatInstance();
+			throw FormatException::getFormatInstance("$value has too many alphanumeric chars");
 		}
 
 		return self::$ALPHANUMERIC_CHARS[$value];
@@ -258,7 +259,7 @@ private static function decodeAlphanumericSegment(
 		$start = strlen((string) $result);
 		while ($count > 1) {
 			if ($bits->available() < 11) {
-				throw FormatException::getFormatInstance();
+				throw FormatException::getFormatInstance("Not enough bits available to read two expected characters");
 			}
 			$nextTwoCharsBits = $bits->readBits(11);
 			$result .= (self::toAlphaNumericChar($nextTwoCharsBits / 45));
@@ -268,7 +269,7 @@ private static function decodeAlphanumericSegment(
 		if ($count == 1) {
 			// special case: one character left
 			if ($bits->available() < 6) {
-				throw FormatException::getFormatInstance();
+				throw FormatException::getFormatInstance("Not enough bits available to read one expected character");
 			}
 			$result .= self::toAlphaNumericChar($bits->readBits(6));
 		}
@@ -279,7 +280,7 @@ private static function decodeAlphanumericSegment(
 				if ($result[$i] == '%') {
 					if ($i < strlen((string) $result) - 1 && $result[$i + 1] == '%') {
 						// %% is rendered as %
-						$result = substr_replace($result, '', $i + 1, 1);//deleteCharAt(i + 1);
+						$result = substr_replace($result, '', $i + 1, 1); //deleteCharAt(i + 1);
 					} else {
 						// In alpha mode, % should be converted to FNC1 separator 0x1D
 						$result[$i] = chr(0x1D);
@@ -299,12 +300,12 @@ private static function decodeByteSegment(
 	): void {
 		// Don't crash trying to read more bits than we have available.
 		if (8 * $count > $bits->available()) {
-			throw FormatException::getFormatInstance();
+			throw FormatException::getFormatInstance("Trying to read more bits than we have available");
 		}
 
 		$readBytes = fill_array(0, $count, 0);
 		for ($i = 0; $i < $count; $i++) {
-			$readBytes[$i] = $bits->readBits(8);//(byte)
+			$readBytes[$i] = $bits->readBits(8); //(byte)
 		}
 		$text = implode(array_map('chr', $readBytes));
 		$encoding = '';
@@ -315,12 +316,16 @@ private static function decodeByteSegment(
 			// Shift_JIS -- without anything like an ECI designator to
 			// give a hint.
 
-			$encoding = mb_detect_encoding($text, $hints);
+			try {
+				$encoding = mb_detect_encoding($text, $hints);
+			} catch (ValueError $e) {
+				$encoding = mb_detect_encoding($text, mb_detect_order(), false);
+			}
 		} else {
 			$encoding = $currentCharacterSetECI->name();
 		}
-		//  $result.= mb_convert_encoding($text ,$encoding);//(new String(readBytes, encoding));
-		$result .= $text;//(new String(readBytes, encoding));
+		$result .= mb_convert_encoding($text, $encoding); //(new String(readBytes, encoding));
+		// $result .= $text; //(new String(readBytes, encoding));
 
 		$byteSegments = array_merge($byteSegments, $readBytes);
 	}
@@ -332,7 +337,7 @@ private static function decodeKanjiSegment(
 	): void {
 		// Don't crash trying to read more bits than we have available.
 		if ($count * 13 > $bits->available()) {
-			throw FormatException::getFormatInstance();
+			throw FormatException::getFormatInstance("Trying to read more bits than we have available");
 		}
 
 		// Each character will require 2 bytes. Read the characters as 2-byte pairs
@@ -350,7 +355,7 @@ private static function decodeKanjiSegment(
 				// In the 0xE040 to 0xEBBF range
 				$assembledTwoBytes += 0x0C140;
 			}
-			$buffer[$offset] = ($assembledTwoBytes >> 8);//(byte)
+			$buffer[$offset] = ($assembledTwoBytes >> 8); //(byte)
 			$buffer[$offset + 1] = $assembledTwoBytes; //(byte)
 			$offset += 2;
 			$count--;

lib/Qrcode/Detector/AlignmentPatternFinder.php

@@ -126,7 +126,7 @@ public function find()
 			return $this->possibleCenters[0];
 		}
 
-		throw  NotFoundException::getNotFoundInstance("Bottom right alignment pattern not found");
+		throw  new NotFoundException("Bottom right alignment pattern not found");
 	}
 
 	/**