From 37d4b9faad55dd376cbc6ea68f0e540f99d7ca11 Mon Sep 17 00:00:00 2001 From: codemasher Date: Sat, 16 Jan 2021 19:52:12 +0100 Subject: [PATCH] :octocat: move BitBuffer to Common --- src/{Helpers => Common}/BitBuffer.php | 4 ++-- src/Common/ReedSolomonEncoder.php | 1 - src/Data/AlphaNum.php | 3 +-- src/Data/Byte.php | 3 +-- src/Data/ECI.php | 3 +-- src/Data/Kanji.php | 3 +-- src/Data/Number.php | 3 +-- src/Data/QRData.php | 3 +-- src/Data/QRDataModeInterface.php | 2 +- tests/{Helpers => Common}/BitBufferTest.php | 7 +++---- 10 files changed, 12 insertions(+), 20 deletions(-) rename src/{Helpers => Common}/BitBuffer.php (94%) rename tests/{Helpers => Common}/BitBufferTest.php (86%) diff --git a/src/Helpers/BitBuffer.php b/src/Common/BitBuffer.php similarity index 94% rename from src/Helpers/BitBuffer.php rename to src/Common/BitBuffer.php index de47f20f4..3f8ff7163 100644 --- a/src/Helpers/BitBuffer.php +++ b/src/Common/BitBuffer.php @@ -4,13 +4,13 @@ * * @filesource BitBuffer.php * @created 25.11.2015 - * @package chillerlan\QRCode\Helpers + * @package chillerlan\QRCode\Common * @author Smiley * @copyright 2015 Smiley * @license MIT */ -namespace chillerlan\QRCode\Helpers; +namespace chillerlan\QRCode\Common; use function count, floor; diff --git a/src/Common/ReedSolomonEncoder.php b/src/Common/ReedSolomonEncoder.php index e82e2355b..46a16eef6 100644 --- a/src/Common/ReedSolomonEncoder.php +++ b/src/Common/ReedSolomonEncoder.php @@ -12,7 +12,6 @@ namespace chillerlan\QRCode\Common; -use chillerlan\QRCode\Helpers\BitBuffer; use SplFixedArray; use function array_fill, array_merge, count, max; diff --git a/src/Data/AlphaNum.php b/src/Data/AlphaNum.php index 797713ebd..9852a54e3 100644 --- a/src/Data/AlphaNum.php +++ b/src/Data/AlphaNum.php @@ -12,8 +12,7 @@ namespace chillerlan\QRCode\Data; -use chillerlan\QRCode\Helpers\BitBuffer; -use chillerlan\QRCode\Common\Mode; +use chillerlan\QRCode\Common\{BitBuffer, Mode}; use function ceil, ord, sprintf, str_split; diff --git a/src/Data/Byte.php b/src/Data/Byte.php index 57e4ca64e..50a172bff 100644 --- a/src/Data/Byte.php +++ b/src/Data/Byte.php @@ -12,8 +12,7 @@ namespace chillerlan\QRCode\Data; -use chillerlan\QRCode\Helpers\BitBuffer; -use chillerlan\QRCode\Common\Mode; +use chillerlan\QRCode\Common\{BitBuffer, Mode}; use function ord; diff --git a/src/Data/ECI.php b/src/Data/ECI.php index 8997dfe3c..daeba6981 100644 --- a/src/Data/ECI.php +++ b/src/Data/ECI.php @@ -12,8 +12,7 @@ namespace chillerlan\QRCode\Data; -use chillerlan\QRCode\Helpers\BitBuffer; -use chillerlan\QRCode\Common\Mode; +use chillerlan\QRCode\Common\{BitBuffer, Mode}; /** * Adds an ECI Designator diff --git a/src/Data/Kanji.php b/src/Data/Kanji.php index 27ae28615..69972592a 100644 --- a/src/Data/Kanji.php +++ b/src/Data/Kanji.php @@ -12,8 +12,7 @@ namespace chillerlan\QRCode\Data; -use chillerlan\QRCode\Helpers\BitBuffer; -use chillerlan\QRCode\Common\Mode; +use chillerlan\QRCode\Common\{BitBuffer, Mode}; use function mb_convert_encoding, mb_detect_encoding, mb_strlen, ord, sprintf, strlen; diff --git a/src/Data/Number.php b/src/Data/Number.php index 8505614fd..b627dbded 100644 --- a/src/Data/Number.php +++ b/src/Data/Number.php @@ -12,8 +12,7 @@ namespace chillerlan\QRCode\Data; -use chillerlan\QRCode\Helpers\BitBuffer; -use chillerlan\QRCode\Common\Mode; +use chillerlan\QRCode\Common\{BitBuffer, Mode}; use function ceil, ord, sprintf, str_split, substr; diff --git a/src/Data/QRData.php b/src/Data/QRData.php index 9d9795164..a07f1be99 100644 --- a/src/Data/QRData.php +++ b/src/Data/QRData.php @@ -12,9 +12,8 @@ namespace chillerlan\QRCode\Data; -use chillerlan\QRCode\Common\{EccLevel, Mode, ReedSolomonEncoder, Version}; +use chillerlan\QRCode\Common\{BitBuffer, EccLevel, Mode, ReedSolomonEncoder, Version}; use chillerlan\QRCode\QRCode; -use chillerlan\QRCode\Helpers\BitBuffer; use chillerlan\Settings\SettingsContainerInterface; use function range, sprintf; diff --git a/src/Data/QRDataModeInterface.php b/src/Data/QRDataModeInterface.php index a53b633ce..cb791c7ef 100644 --- a/src/Data/QRDataModeInterface.php +++ b/src/Data/QRDataModeInterface.php @@ -12,7 +12,7 @@ namespace chillerlan\QRCode\Data; -use chillerlan\QRCode\Helpers\BitBuffer; +use chillerlan\QRCode\Common\BitBuffer; /** * Specifies the methods reqired for the data modules (Number, Alphanum, Byte and Kanji) diff --git a/tests/Helpers/BitBufferTest.php b/tests/Common/BitBufferTest.php similarity index 86% rename from tests/Helpers/BitBufferTest.php rename to tests/Common/BitBufferTest.php index 886ffbb1c..e863c8443 100644 --- a/tests/Helpers/BitBufferTest.php +++ b/tests/Common/BitBufferTest.php @@ -4,16 +4,15 @@ * * @filesource BitBufferTest.php * @created 08.02.2016 - * @package chillerlan\QRCodeTest\Helpers + * @package chillerlan\QRCodeTest\Common * @author Smiley * @copyright 2015 Smiley * @license MIT */ -namespace chillerlan\QRCodeTest\Helpers; +namespace chillerlan\QRCodeTest\Common; -use chillerlan\QRCode\Helpers\BitBuffer; -use chillerlan\QRCode\Common\Mode; +use chillerlan\QRCode\Common\{BitBuffer, Mode}; use PHPUnit\Framework\TestCase; /**