forgot about these... 💄

Author: codemasher

src/Data/AlphaNum.php

@@ -19,15 +19,6 @@
  */
 class AlphaNum extends QRDataAbstract{
 
-	public const CHAR_MAP = [
-		'0', '1', '2', '3', '4', '5', '6', '7',
-		'8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
-		'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-		'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
-		'W', 'X', 'Y', 'Z', ' ', '$', '%', '*',
-		'+', '-', '.', '/', ':',
-	];
-
 	/**
 	 * @inheritdoc
 	 */
@@ -60,7 +51,7 @@ protected function write(string $data):void{
 	 * @throws \chillerlan\QRCode\Data\QRCodeDataException
 	 */
 	protected function getCharCode(string $chr):int{
-		$i = array_search($chr, $this::CHAR_MAP);
+		$i = array_search($chr, $this::ALPHANUM_CHAR_MAP);
 
 		if($i !== false){
 			return $i;

src/Data/Number.php

@@ -19,8 +19,6 @@
  */
 class Number extends QRDataAbstract{
 
-	public const CHAR_MAP = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-
 	/**
 	 * @inheritdoc
 	 */
@@ -70,7 +68,7 @@ protected function parseInt(string $string):int{
 		for($i = 0; $i < $len; $i++){
 			$c = ord($string[$i]);
 
-			if(!in_array($string[$i], $this::CHAR_MAP, true)){
+			if(!in_array($string[$i], $this::NUMBER_CHAR_MAP, true)){
 				throw new QRCodeDataException('illegal char: "'.$string[$i].'" ['.$c.']');
 			}
 

src/Data/QRDataInterface.php

@@ -17,6 +17,17 @@
  */
 interface QRDataInterface{
 
+	const NUMBER_CHAR_MAP = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+
+	const ALPHANUM_CHAR_MAP = [
+		'0', '1', '2', '3', '4', '5', '6', '7',
+		'8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+		'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+		'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+		'W', 'X', 'Y', 'Z', ' ', '$', '%', '*',
+		'+', '-', '.', '/', ':',
+	];
+
 	/**
 	 * @link http://www.qrcode.com/en/about/version.html
 	 */

src/QRCode.php

@@ -230,7 +230,7 @@ protected function initOutputInterface(string $data):QROutputInterface{
 	 * @return bool
 	 */
 	public function isNumber(string $string):bool{
-		return $this->checkString($string, Number::CHAR_MAP);
+		return $this->checkString($string, QRDataInterface::NUMBER_CHAR_MAP);
 	}
 
 	/**
@@ -241,7 +241,7 @@ public function isNumber(string $string):bool{
 	 * @return bool
 	 */
 	public function isAlphaNum(string $string):bool{
-		return $this->checkString($string, AlphaNum::CHAR_MAP);
+		return $this->checkString($string, QRDataInterface::ALPHANUM_CHAR_MAP);
 	}
 
 	/**