Merge pull request #157 from Chris53897/feature/drop-support-for-php-8

feat: drop support for php 8
Bacon · Mar 18, 2024 · a8b22f3 · a8b22f3
2 parents 71decd8 + 9e26f05
commit a8b22f3
Show file tree

Hide file tree

Showing 57 changed files with 229 additions and 755 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.4', '8.0', '8.1', '8.2']
+        php-versions: ['8.1', '8.2', '8.3']
     runs-on: ${{ matrix.operating-system }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /composer.lock
 /vendor
 /.phpunit.result.cache
+/.phpunit.cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.0.0 - 2022-03-14
+
+### Changed
+
+- Add strong php Types
+- Fix spelling of DEFAULT_BYTE_MODE_ENCODING => DEFAULT_BYTE_MODE_ENCODING
+- Constructor names of BlockPair
+- Drop support for PHP < 8.1
+
 ## 2.0.7 - 2022-03-14
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "license" : "BSD-2-Clause",
     "homepage": "https://github.com/Bacon/BaconQrCode",
     "require": {
-        "php": "^7.1 || ^8.0",
+        "php": "^8.1",
         "ext-iconv": "*",
         "dasprid/enum": "^1.0.3"
     },
@@ -24,15 +24,21 @@
             "BaconQrCode\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "BaconQrCodeTest\\": "test/"
+        }
+    },
     "require-dev": {
-        "phpunit/phpunit": "^7 | ^8 | ^9",
-        "spatie/phpunit-snapshot-assertions": "^4.2.9",
-        "squizlabs/php_codesniffer": "^3.4",
-        "phly/keep-a-changelog": "^2.1"
+        "phpunit/phpunit": "^10.5.11 || 11.0.4",
+        "spatie/phpunit-snapshot-assertions": "^5.1.5",
+        "squizlabs/php_codesniffer": "^3.9",
+        "phly/keep-a-changelog": "^2.12"
     },
     "config": {
         "allow-plugins": {
-            "ocramius/package-versions": true
+            "ocramius/package-versions": true,
+            "php-http/discovery": true
         }
     },
     "archive": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+>
   <testsuites>
     <testsuite name="BaconQrCode Tests">
       <directory>./test</directory>
     </testsuite>
   </testsuites>
+
+  <source>
+    <include>
+      <directory>src</directory>
+    </include>
+  </source>
+
 </phpunit>
diff --git a/src/Common/BitArray.php b/src/Common/BitArray.php
@@ -16,21 +16,13 @@ final class BitArray
      *
      * @var SplFixedArray<int>
      */
-    private $bits;
-
-    /**
-     * Size of the bit array in bits.
-     *
-     * @var int
-     */
-    private $size;
+    private SplFixedArray $bits;
 
     /**
      * Creates a new bit array with a given size.
      */
-    public function __construct(int $size = 0)
+    public function __construct(private int $size = 0)
     {
-        $this->size = $size;
         $this->bits = SplFixedArray::fromArray(array_fill(0, ($this->size + 31) >> 3, 0));
     }
 
@@ -107,7 +99,7 @@ public function getNextSet(int $from) : int
         }
 
         $result = ($bitsOffset << 5) + BitUtils::numberOfTrailingZeros($currentBits);
-        return $result > $this->size ? $this->size : $result;
+        return min($result, $this->size);
     }
 
     /**
@@ -133,7 +125,7 @@ public function getNextUnset(int $from) : int
         }
 
         $result = ($bitsOffset << 5) + BitUtils::numberOfTrailingZeros($currentBits);
-        return $result > $this->size ? $this->size : $result;
+        return min($result, $this->size);
     }
 
     /**

diff --git a/src/Common/BitMatrix.php b/src/Common/BitMatrix.php
@@ -17,31 +17,25 @@ class BitMatrix
 {
     /**
      * Width of the bit matrix.
-     *
-     * @var int
      */
-    private $width;
+    private int $width;
 
     /**
      * Height of the bit matrix.
-     *
-     * @var int
      */
-    private $height;
+    private ?int $height;
 
     /**
      * Size in bits of each individual row.
-     *
-     * @var int
      */
-    private $rowSize;
+    private int $rowSize;
 
     /**
      * Bits representation.
      *
      * @var SplFixedArray<int>
      */
-    private $bits;
+    private SplFixedArray $bits;
 
     /**
      * @throws InvalidArgumentException if a dimension is smaller than zero

diff --git a/src/Common/CharacterSetEci.php b/src/Common/CharacterSetEci.php
@@ -69,32 +69,26 @@ final class CharacterSetEci extends AbstractEnum
     protected const GB18030 = [[29], 'GB2312', 'EUC_CN', 'GBK'];
     protected const EUC_KR = [[30], 'EUC-KR'];
 
-    /**
-     * @var int[]
-     */
-    private $values;
-
     /**
      * @var string[]
      */
-    private $otherEncodingNames;
+    private array $otherEncodingNames;
 
     /**
      * @var array<int, self>|null
      */
-    private static $valueToEci;
+    private static ?array $valueToEci;
 
     /**
      * @var array<string, self>|null
      */
-    private static $nameToEci;
+    private static ?array $nameToEci = null;
 
     /**
      * @param int[] $values
      */
-    public function __construct(array $values, string ...$otherEncodingNames)
+    public function __construct(private readonly array $values, string ...$otherEncodingNames)
     {
-        $this->values = $values;
         $this->otherEncodingNames = $otherEncodingNames;
     }
 

diff --git a/src/Common/EcBlock.php b/src/Common/EcBlock.php
@@ -11,24 +11,8 @@
  */
 final class EcBlock
 {
-    /**
-     * How many times the block is used.
-     *
-     * @var int
-     */
-    private $count;
-
-    /**
-     * Number of data codewords.
-     *
-     * @var int
-     */
-    private $dataCodewords;
-
-    public function __construct(int $count, int $dataCodewords)
+    public function __construct(private readonly int $count, private readonly int $dataCodewords)
     {
-        $this->count = $count;
-        $this->dataCodewords = $dataCodewords;
     }
 
     /**

diff --git a/src/Common/EcBlocks.php b/src/Common/EcBlocks.php
@@ -12,23 +12,15 @@
  */
 final class EcBlocks
 {
-    /**
-     * Number of EC codewords per block.
-     *
-     * @var int
-     */
-    private $ecCodewordsPerBlock;
-
     /**
      * List of EC blocks.
      *
      * @var EcBlock[]
      */
-    private $ecBlocks;
+    private array $ecBlocks;
 
-    public function __construct(int $ecCodewordsPerBlock, EcBlock ...$ecBlocks)
+    public function __construct(private readonly int $ecCodewordsPerBlock, EcBlock ...$ecBlocks)
     {
-        $this->ecCodewordsPerBlock = $ecCodewordsPerBlock;
         $this->ecBlocks = $ecBlocks;
     }
 

diff --git a/src/Common/ErrorCorrectionLevel.php b/src/Common/ErrorCorrectionLevel.php
@@ -21,14 +21,8 @@ final class ErrorCorrectionLevel extends AbstractEnum
     protected const Q = [0x03];
     protected const H = [0x02];
 
-    /**
-     * @var int
-     */
-    private $bits;
-
-    protected function __construct(int $bits)
+    protected function __construct(private readonly int $bits)
     {
-        $this->bits = $bits;
     }
 
     /**

diff --git a/src/Common/FormatInformation.php b/src/Common/FormatInformation.php
@@ -68,17 +68,10 @@ class FormatInformation
 
     /**
      * Error correction level.
-     *
-     * @var ErrorCorrectionLevel
      */
-    private $ecLevel;
+    private ErrorCorrectionLevel $ecLevel;
 
-    /**
-     * Data mask.
-     *
-     * @var int
-     */
-    private $dataMask;
+    private int $dataMask;
 
     protected function __construct(int $formatInfo)
     {

diff --git a/src/Common/Mode.php b/src/Common/Mode.php
@@ -32,23 +32,13 @@ final class Mode extends AbstractEnum
     protected const FNC1_SECOND_POSITION = [[0, 0, 0], 0x09];
     protected const HANZI = [[8, 10, 12], 0x0d];
 
-    /**
-     * @var int[]
-     */
-    private $characterCountBitsForVersions;
-
-    /**
-     * @var int
-     */
-    private $bits;
-
     /**
      * @param int[] $characterCountBitsForVersions
      */
-    protected function __construct(array $characterCountBitsForVersions, int $bits)
-    {
-        $this->characterCountBitsForVersions = $characterCountBitsForVersions;
-        $this->bits = $bits;
+    protected function __construct(
+        private readonly array $characterCountBitsForVersions,
+        private readonly int   $bits
+    ) {
     }
 
     /**