From c06e3f1cd6b7757c424087f6043e800460cbc1b4 Mon Sep 17 00:00:00 2001 From: codemasher Date: Sat, 23 Jan 2021 01:26:11 +0100 Subject: [PATCH] :octocat: make datamode field static --- src/Data/AlphaNum.php | 6 +++--- src/Data/Byte.php | 6 +++--- src/Data/ECI.php | 4 ++-- src/Data/Kanji.php | 6 +++--- src/Data/Number.php | 6 +++--- src/Data/QRDataModeAbstract.php | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Data/AlphaNum.php b/src/Data/AlphaNum.php index 9852a54e3..71ace3291 100644 --- a/src/Data/AlphaNum.php +++ b/src/Data/AlphaNum.php @@ -38,7 +38,7 @@ final class AlphaNum extends QRDataModeAbstract{ '+' => 40, '-' => 41, '.' => 42, '/' => 43, ':' => 44, ]; - protected int $datamode = Mode::DATA_ALPHANUM; + protected static int $datamode = Mode::DATA_ALPHANUM; /** * @inheritdoc @@ -68,8 +68,8 @@ final class AlphaNum extends QRDataModeAbstract{ $len = $this->getCharCount(); $bitBuffer - ->put($this->datamode, 4) - ->put($len, Mode::getLengthBitsForVersion($this->datamode, $versionNumber)) + ->put($this::$datamode, 4) + ->put($len, Mode::getLengthBitsForVersion($this::$datamode, $versionNumber)) ; // encode 2 characters in 11 bits diff --git a/src/Data/Byte.php b/src/Data/Byte.php index 50a172bff..3043b1713 100644 --- a/src/Data/Byte.php +++ b/src/Data/Byte.php @@ -24,7 +24,7 @@ use function ord; */ final class Byte extends QRDataModeAbstract{ - protected int $datamode = Mode::DATA_BYTE; + protected static int $datamode = Mode::DATA_BYTE; /** * @inheritdoc @@ -47,8 +47,8 @@ final class Byte extends QRDataModeAbstract{ $len = $this->getCharCount(); $bitBuffer - ->put($this->datamode, 4) - ->put($len, Mode::getLengthBitsForVersion($this->datamode, $versionNumber)) + ->put($this::$datamode, 4) + ->put($len, Mode::getLengthBitsForVersion($this::$datamode, $versionNumber)) ; $i = 0; diff --git a/src/Data/ECI.php b/src/Data/ECI.php index 20af7aecd..9271aba38 100644 --- a/src/Data/ECI.php +++ b/src/Data/ECI.php @@ -21,7 +21,7 @@ use chillerlan\QRCode\Common\{BitBuffer, Mode}; */ final class ECI extends QRDataModeAbstract{ - protected int $datamode = Mode::DATA_ECI; + protected static int $datamode = Mode::DATA_ECI; /** * The current ECI encoding id @@ -58,7 +58,7 @@ final class ECI extends QRDataModeAbstract{ */ public function write(BitBuffer $bitBuffer, int $versionNumber):void{ $bitBuffer - ->put($this->datamode, 4) + ->put($this::$datamode, 4) ->put($this->encoding, 8) ; } diff --git a/src/Data/Kanji.php b/src/Data/Kanji.php index 69972592a..191d98535 100644 --- a/src/Data/Kanji.php +++ b/src/Data/Kanji.php @@ -24,7 +24,7 @@ use function mb_convert_encoding, mb_detect_encoding, mb_strlen, ord, sprintf, s */ final class Kanji extends QRDataModeAbstract{ - protected int $datamode = Mode::DATA_KANJI; + protected static int $datamode = Mode::DATA_KANJI; public function __construct(string $data){ parent::__construct($data); @@ -75,8 +75,8 @@ final class Kanji extends QRDataModeAbstract{ public function write(BitBuffer $bitBuffer, int $versionNumber):void{ $bitBuffer - ->put($this->datamode, 4) - ->put($this->getCharCount(), Mode::getLengthBitsForVersion($this->datamode, $versionNumber)) + ->put($this::$datamode, 4) + ->put($this->getCharCount(), Mode::getLengthBitsForVersion($this::$datamode, $versionNumber)) ; $len = strlen($this->data); diff --git a/src/Data/Number.php b/src/Data/Number.php index b627dbded..7260e4bcf 100644 --- a/src/Data/Number.php +++ b/src/Data/Number.php @@ -31,7 +31,7 @@ final class Number extends QRDataModeAbstract{ '0' => 0, '1' => 1, '2' => 2, '3' => 3, '4' => 4, '5' => 5, '6' => 6, '7' => 7, '8' => 8, '9' => 9, ]; - protected int $datamode = Mode::DATA_NUMBER; + protected static int $datamode = Mode::DATA_NUMBER; /** * @inheritdoc @@ -61,8 +61,8 @@ final class Number extends QRDataModeAbstract{ $len = $this->getCharCount(); $bitBuffer - ->put($this->datamode, 4) - ->put($len, Mode::getLengthBitsForVersion($this->datamode, $versionNumber)) + ->put($this::$datamode, 4) + ->put($len, Mode::getLengthBitsForVersion($this::$datamode, $versionNumber)) ; $i = 0; diff --git a/src/Data/QRDataModeAbstract.php b/src/Data/QRDataModeAbstract.php index 062707d7d..7dc4eb6c3 100644 --- a/src/Data/QRDataModeAbstract.php +++ b/src/Data/QRDataModeAbstract.php @@ -19,7 +19,7 @@ abstract class QRDataModeAbstract implements QRDataModeInterface{ /** * the current data mode: Num, Alphanum, Kanji, Byte */ - protected int $datamode; + protected static int $datamode; /** * The data to write @@ -44,7 +44,7 @@ abstract class QRDataModeAbstract implements QRDataModeInterface{ * @inheritDoc */ public function getDataMode():int{ - return $this->datamode; + return $this::$datamode; } }