Update supported versions

Author: endroid

.github/workflows/CI.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.4', '8.5']
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
@@ -54,7 +54,7 @@ jobs:
         run: |
           composer update --prefer-lowest
           vendor/bin/unit-test
-          vendor/bin/functional-test 5.4
+          vendor/bin/functional-test 6.4
 
       - name: Archive logs
         if: ${{ failure() }}
@@ -64,7 +64,7 @@ jobs:
           path: vendor/endroid/quality/application/var/log
 
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: coverage-php-${{ matrix.php-versions }}
           path: tests/coverage

composer.json

@@ -12,13 +12,13 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.4",
         "bacon/bacon-qr-code": "^3.0"
     },
     "require-dev": {
         "ext-gd": "*",
         "endroid/quality": "dev-main",
-        "khanamiryan/qrcode-detector-decoder": "^2.0.2",
+        "khanamiryan/qrcode-detector-decoder": "^2.0.3",
         "setasign/fpdf": "^1.8.2"
     },
     "suggest": {

src/Bacon/MatrixFactory.php

@@ -23,7 +23,7 @@ public function create(QrCodeInterface $qrCode): MatrixInterface
         for ($rowIndex = 0; $rowIndex < $rowCount; ++$rowIndex) {
             $blockValues[$rowIndex] = [];
             for ($columnIndex = 0; $columnIndex < $columnCount; ++$columnIndex) {
-                $blockValues[$rowIndex][$columnIndex] = $baconMatrix->get($columnIndex, $rowIndex);
+                $blockValues[$rowIndex][$columnIndex] = 1 === $baconMatrix->get($columnIndex, $rowIndex) ? 1 : 0;
             }
         }
 

src/Color/Color.php

@@ -7,9 +7,13 @@
 final readonly class Color implements ColorInterface
 {
     public function __construct(
+        /** @var int<0, 255> */
         private int $red,
+        /** @var int<0, 255> */
         private int $green,
+        /** @var int<0, 255> */
         private int $blue,
+        /** @var int<0, 127> */
         private int $alpha = 0,
     ) {
     }

src/Color/ColorInterface.php

@@ -6,12 +6,16 @@
 
 interface ColorInterface
 {
+    /** @return int<0, 255> */
     public function getRed(): int;
 
+    /** @return int<0, 255> */
     public function getGreen(): int;
 
+    /** @return int<0, 255> */
     public function getBlue(): int;
 
+    /** @return int<0, 127> */
     public function getAlpha(): int;
 
     public function getOpacity(): float;

src/ImageData/LogoImageData.php

@@ -63,12 +63,12 @@ public static function createForLogo(LogoInterface $logo): self
         }
 
         // Only target width specified: calculate height
-        if (null !== $width && null === $height) {
+        if (null !== $width) {
             return new self($data, $image, $mimeType, $width, intval(imagesy($image) * $width / imagesx($image)), $logo->getPunchoutBackground());
         }
 
         // Only target height specified: calculate width
-        if (null === $width && null !== $height) {
+        if (null !== $height) {
             return new self($data, $image, $mimeType, intval(imagesx($image) * $height / imagesy($image)), $height, $logo->getPunchoutBackground());
         }
 

src/Matrix/Matrix.php

@@ -15,7 +15,7 @@
     private int $marginLeft;
     private int $marginRight;
 
-    /** @param array<array<int>> $blockValues */
+    /** @param array<array<int<0, 1>>> $blockValues */
     public function __construct(
         private array $blockValues,
         int $size,

src/Writer/AbstractGdWriter.php

@@ -36,13 +36,14 @@ public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?Lab
         $matrix = $this->getMatrix($qrCode);
 
         $baseBlockSize = RoundBlockSizeMode::None === $qrCode->getRoundBlockSizeMode() ? 10 : intval($matrix->getBlockSize());
-        $baseImage = imagecreatetruecolor($matrix->getBlockCount() * $baseBlockSize, $matrix->getBlockCount() * $baseBlockSize);
+        /** @var int<1, max> $baseImageSize */
+        $baseImageSize = $matrix->getBlockCount() * $baseBlockSize;
+        $baseImage = imagecreatetruecolor($baseImageSize, $baseImageSize);
 
         if (!$baseImage) {
             throw new \Exception('Unable to generate image: please check if the GD extension is enabled and configured correctly');
         }
 
-        /** @var int $foregroundColor */
         $foregroundColor = imagecolorallocatealpha(
             $baseImage,
             $qrCode->getForegroundColor()->getRed(),
@@ -51,9 +52,16 @@ public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?Lab
             $qrCode->getForegroundColor()->getAlpha()
         );
 
-        /** @var int $transparentColor */
+        if (false === $foregroundColor) {
+            throw new \Exception('Unable to generate image: please check if the GD extension is enabled and configured correctly');
+        }
+
         $transparentColor = imagecolorallocatealpha($baseImage, 255, 255, 255, 127);
 
+        if (false === $transparentColor) {
+            throw new \Exception('Unable to generate image: please check if the GD extension is enabled and configured correctly');
+        }
+
         imagefill($baseImage, 0, 0, $transparentColor);
 
         for ($rowIndex = 0; $rowIndex < $matrix->getBlockCount(); ++$rowIndex) {
@@ -71,21 +79,23 @@ public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?Lab
             }
         }
 
+        /** @var int<1, max> $targetWidth */
         $targetWidth = $matrix->getOuterSize();
+        /** @var int<1, max> $targetHeight */
         $targetHeight = $matrix->getOuterSize();
 
         if ($label instanceof LabelInterface) {
             $labelImageData = LabelImageData::createForLabel($label);
             $targetHeight += $labelImageData->getHeight() + $label->getMargin()->getTop() + $label->getMargin()->getBottom();
         }
 
+        /** @var int<1, max> $targetHeight */
         $targetImage = imagecreatetruecolor($targetWidth, $targetHeight);
 
         if (!$targetImage) {
             throw new \Exception('Unable to generate image: please check if the GD extension is enabled and configured correctly');
         }
 
-        /** @var int $backgroundColor */
         $backgroundColor = imagecolorallocatealpha(
             $targetImage,
             $qrCode->getBackgroundColor()->getRed(),
@@ -94,6 +104,10 @@ public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?Lab
             $qrCode->getBackgroundColor()->getAlpha()
         );
 
+        if (false === $backgroundColor) {
+            throw new \Exception('Unable to generate image: please check if the GD extension is enabled and configured correctly');
+        }
+
         imagefill($targetImage, 0, 0, $backgroundColor);
 
         imagecopyresampled(
@@ -138,8 +152,12 @@ private function addLogo(LogoInterface $logo, GdResult $result): GdResult
         $matrix = $result->getMatrix();
 
         if ($logoImageData->getPunchoutBackground()) {
-            /** @var int $transparent */
             $transparent = imagecolorallocatealpha($targetImage, 255, 255, 255, 127);
+
+            if (false === $transparent) {
+                throw new \Exception('Unable to allocate color: please check if the GD extension is enabled and configured correctly');
+            }
+
             imagealphablending($targetImage, false);
             $xOffsetStart = intval($matrix->getOuterSize() / 2 - $logoImageData->getWidth() / 2);
             $yOffsetStart = intval($matrix->getOuterSize() / 2 - $logoImageData->getHeight() / 2);
@@ -172,7 +190,6 @@ private function addLabel(LabelInterface $label, GdResult $result): GdResult
 
         $labelImageData = LabelImageData::createForLabel($label);
 
-        /** @var int $textColor */
         $textColor = imagecolorallocatealpha(
             $targetImage,
             $label->getTextColor()->getRed(),
@@ -181,6 +198,10 @@ private function addLabel(LabelInterface $label, GdResult $result): GdResult
             $label->getTextColor()->getAlpha()
         );
 
+        if (false === $textColor) {
+            throw new \Exception('Unable to allocate color: please check if the GD extension is enabled and configured correctly');
+        }
+
         $x = intval(imagesx($targetImage) / 2 - $labelImageData->getWidth() / 2);
         $y = imagesy($targetImage) - $label->getMargin()->getBottom();