use a proper constant for data mode

Author: codemasher

src/Data/AlphaNum.php

@@ -39,7 +39,7 @@ final class AlphaNum extends QRDataModeAbstract{
 	/**
 	 * @inheritDoc
 	 */
-	protected static int $datamode = Mode::ALPHANUM;
+	public const DATAMODE = Mode::ALPHANUM;
 
 	/**
 	 * @inheritDoc
@@ -73,7 +73,7 @@ public function write(BitBuffer $bitBuffer, int $versionNumber):QRDataModeInterf
 		$len = $this->getCharCount();
 
 		$bitBuffer
-			->put($this::$datamode, 4)
+			->put(self::DATAMODE, 4)
 			->put($len, $this::getLengthBits($versionNumber))
 		;
 

src/Data/Byte.php

@@ -25,7 +25,7 @@ final class Byte extends QRDataModeAbstract{
 	/**
 	 * @inheritDoc
 	 */
-	protected static int $datamode = Mode::BYTE;
+	public const DATAMODE = Mode::BYTE;
 
 	/**
 	 * @inheritDoc
@@ -48,7 +48,7 @@ public function write(BitBuffer $bitBuffer, int $versionNumber):QRDataModeInterf
 		$len = $this->getCharCount();
 
 		$bitBuffer
-			->put($this::$datamode, 4)
+			->put(self::DATAMODE, 4)
 			->put($len, $this::getLengthBits($versionNumber))
 		;
 

src/Data/ECI.php

@@ -25,7 +25,7 @@ final class ECI extends QRDataModeAbstract{
 	/**
 	 * @inheritDoc
 	 */
-	protected static int $datamode = Mode::ECI;
+	public const DATAMODE = Mode::ECI;
 
 	/**
 	 * The current ECI encoding id
@@ -67,7 +67,7 @@ public function getLengthInBits():int{
 	 * @inheritDoc
 	 */
 	public function write(BitBuffer $bitBuffer, int $versionNumber):QRDataModeInterface{
-		$bitBuffer->put($this::$datamode, 4);
+		$bitBuffer->put(self::DATAMODE, 4);
 
 		if($this->encoding < 128){
 			$bitBuffer->put($this->encoding, 8);

src/Data/Hanzi.php

@@ -30,14 +30,24 @@
  */
 final class Hanzi extends QRDataModeAbstract{
 
-	// GB2312, GB18030
-	public const ENCODING      = 'GB18030';
-	public const GB2312_SUBSET = 0b0001; // other subsets???
+	/**
+	 * possible values: GB2312, GB18030
+	 *
+	 * @var string
+	 */
+	public const ENCODING = 'GB18030';
+
+	/**
+	 * @todo: other subsets???
+	 *
+	 * @var int
+	 */
+	public const GB2312_SUBSET = 0b0001;
 
 	/**
 	 * @inheritDoc
 	 */
-	protected static int $datamode = Mode::HANZI;
+	public const DATAMODE = Mode::HANZI;
 
 	/**
 	 * @inheritDoc
@@ -123,7 +133,7 @@ public static function validateString(string $string):bool{
 	public function write(BitBuffer $bitBuffer, int $versionNumber):QRDataModeInterface{
 
 		$bitBuffer
-			->put($this::$datamode, 4)
+			->put(self::DATAMODE, 4)
 			->put($this::GB2312_SUBSET, 4)
 			->put($this->getCharCount(), $this::getLengthBits($versionNumber))
 		;

src/Data/Kanji.php

@@ -28,14 +28,19 @@
  */
 final class Kanji extends QRDataModeAbstract{
 
-	// SJIS, SJIS-2004
-	// SJIS-2004 may produce errors in PHP < 8
+	/**
+	 * possible values: SJIS, SJIS-2004
+	 *
+	 * SJIS-2004 may produce errors in PHP < 8
+	 *
+	 * @var string
+	 */
 	public const ENCODING = 'SJIS';
 
 	/**
 	 * @inheritDoc
 	 */
-	protected static int $datamode = Mode::KANJI;
+	public const DATAMODE = Mode::KANJI;
 
 	/**
 	 * @inheritDoc
@@ -121,7 +126,7 @@ public static function validateString(string $string):bool{
 	public function write(BitBuffer $bitBuffer, int $versionNumber):QRDataModeInterface{
 
 		$bitBuffer
-			->put($this::$datamode, 4)
+			->put(self::DATAMODE, 4)
 			->put($this->getCharCount(), $this::getLengthBits($versionNumber))
 		;
 

src/Data/Number.php

@@ -32,7 +32,7 @@ final class Number extends QRDataModeAbstract{
 	/**
 	 * @inheritDoc
 	 */
-	protected static int $datamode = Mode::NUMBER;
+	public const DATAMODE = Mode::NUMBER;
 
 	/**
 	 * @inheritDoc
@@ -66,7 +66,7 @@ public function write(BitBuffer $bitBuffer, int $versionNumber):QRDataModeInterf
 		$len = $this->getCharCount();
 
 		$bitBuffer
-			->put($this::$datamode, 4)
+			->put(self::DATAMODE, 4)
 			->put($len, $this::getLengthBits($versionNumber))
 		;
 

src/Data/QRData.php

@@ -140,7 +140,7 @@ private function estimateTotalBitLength():int{
 
 		foreach($this->dataSegments as $segment){
 			// data length in bits of the current segment +4 bits for each mode descriptor
-			$length += ($segment->getLengthInBits() + Mode::getLengthBitsForVersion($segment->getDataMode(), 1) + 4);
+			$length += ($segment->getLengthInBits() + Mode::getLengthBitsForVersion($segment::DATAMODE, 1) + 4);
 
 			if(!$segment instanceof ECI){
 				// mode length bits margin to the next breakpoint

src/Data/QRDataModeAbstract.php

@@ -17,11 +17,6 @@
  */
 abstract class QRDataModeAbstract implements QRDataModeInterface{
 
-	/**
-	 * the current data mode: Num, Alphanum, Kanji, Hanzi, Byte
-	 */
-	protected static int $datamode;
-
 	/**
 	 * The data to write
 	 */
@@ -49,13 +44,6 @@ protected function getCharCount():int{
 		return strlen($this->data);
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getDataMode():int{
-		return $this::$datamode;
-	}
-
 	/**
 	 * @inheritDoc
 	 */
@@ -67,7 +55,7 @@ public static function convertEncoding(string $string):string{
 	 * shortcut
 	 */
 	protected static function getLengthBits(int $versionNumber):int{
-		return Mode::getLengthBitsForVersion(static::$datamode, $versionNumber);
+		return Mode::getLengthBitsForVersion(static::DATAMODE, $versionNumber);
 	}
 
 }

src/Data/QRDataModeInterface.php

@@ -18,9 +18,11 @@
 interface QRDataModeInterface{
 
 	/**
-	 * returns the current data mode constant
+	 * the current data mode: Number, Alphanum, Kanji, Hanzi, Byte, ECI
+	 *
+	 * @var int
 	 */
-	public function getDataMode():int;
+	public const DATAMODE = -1;
 
 	/**
 	 * retruns the length in bits of the data string

tests/Data/DataInterfaceTestAbstract.php

@@ -132,7 +132,7 @@ public function testDecodeSegment(int $version):void{
 		// get the filled bitbuffer
 		$bitBuffer = $this->QRData->getBitBuffer();
 		// read the first 4 bits
-		$this::assertSame($datamodeInterface->getDataMode(), $bitBuffer->read(4));
+		$this::assertSame($datamodeInterface::DATAMODE, $bitBuffer->read(4));
 		// decode the data
 		/** @noinspection PhpUndefinedMethodInspection */
 		$this::assertSame($this->testdata, $this->FQN::decodeSegment($bitBuffer, $options->version));