Upgrade to PHP 8.3+ and implement typed constants and Override attrib…

.github/workflows/CI.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.3', '8.4', '8.5']
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

composer.json

@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "bacon/bacon-qr-code": "^3.0"
     },
     "require-dev": {

src/Writer/AbstractGdWriter.php

@@ -27,6 +27,7 @@ protected function getMatrix(QrCodeInterface $qrCode): MatrixInterface
         return $matrixFactory->create($qrCode);
     }
 
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, array $options = []): ResultInterface
     {
         if (!extension_loaded('gd')) {
@@ -195,6 +196,7 @@ private function addLabel(LabelInterface $label, GdResult $result): GdResult
         return new GdResult($result->getMatrix(), $targetImage);
     }
 
+    #[\Override]
     public function validateResult(ResultInterface $result, string $expectedData): void
     {
         $string = $result->getString();

src/Writer/BinaryWriter.php

@@ -13,6 +13,7 @@
 
 final readonly class BinaryWriter implements WriterInterface
 {
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, array $options = []): ResultInterface
     {
         $matrixFactory = new MatrixFactory();

src/Writer/ConsoleWriter.php

@@ -13,6 +13,7 @@
 
 final readonly class ConsoleWriter implements WriterInterface
 {
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, $options = []): ResultInterface
     {
         $matrixFactory = new MatrixFactory();

src/Writer/DebugWriter.php

@@ -13,6 +13,7 @@
 
 final readonly class DebugWriter implements WriterInterface, ValidatingWriterInterface
 {
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, array $options = []): ResultInterface
     {
         $matrixFactory = new MatrixFactory();
@@ -21,6 +22,7 @@ public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?Lab
         return new DebugResult($matrix, $qrCode, $logo, $label, $options);
     }
 
+    #[\Override]
     public function validateResult(ResultInterface $result, string $expectedData): void
     {
         if (!$result instanceof DebugResult) {

src/Writer/EpsWriter.php

@@ -13,8 +13,9 @@
 
 final readonly class EpsWriter implements WriterInterface
 {
-    public const DECIMAL_PRECISION = 10;
+    public const int DECIMAL_PRECISION = 10;
 
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, array $options = []): ResultInterface
     {
         $matrixFactory = new MatrixFactory();

src/Writer/GifWriter.php

@@ -13,6 +13,7 @@
 
 final readonly class GifWriter extends AbstractGdWriter
 {
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, array $options = []): ResultInterface
     {
         /** @var GdResult $gdResult */

src/Writer/PdfWriter.php

@@ -13,12 +13,13 @@
 
 final readonly class PdfWriter implements WriterInterface
 {
-    public const WRITER_OPTION_UNIT = 'unit';
-    public const WRITER_OPTION_PDF = 'fpdf';
-    public const WRITER_OPTION_X = 'x';
-    public const WRITER_OPTION_Y = 'y';
-    public const WRITER_OPTION_LINK = 'link';
+    public const string WRITER_OPTION_UNIT = 'unit';
+    public const string WRITER_OPTION_PDF = 'fpdf';
+    public const string WRITER_OPTION_X = 'x';
+    public const string WRITER_OPTION_Y = 'y';
+    public const string WRITER_OPTION_LINK = 'link';
 
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, array $options = []): ResultInterface
     {
         $matrixFactory = new MatrixFactory();

src/Writer/PngWriter.php

@@ -13,9 +13,10 @@
 
 final readonly class PngWriter extends AbstractGdWriter
 {
-    public const WRITER_OPTION_COMPRESSION_LEVEL = 'compression_level';
-    public const WRITER_OPTION_NUMBER_OF_COLORS = 'number_of_colors';
+    public const string WRITER_OPTION_COMPRESSION_LEVEL = 'compression_level';
+    public const string WRITER_OPTION_NUMBER_OF_COLORS = 'number_of_colors';
 
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, array $options = []): ResultInterface
     {
         if (!isset($options[self::WRITER_OPTION_COMPRESSION_LEVEL])) {

src/Writer/Result/BinaryResult.php

@@ -13,6 +13,7 @@ public function __construct(MatrixInterface $matrix)
         parent::__construct($matrix);
     }
 
+    #[\Override]
     public function getString(): string
     {
         $matrix = $this->getMatrix();
@@ -28,6 +29,7 @@ public function getString(): string
         return $binaryString;
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         return 'text/plain';

src/Writer/Result/ConsoleResult.php

@@ -9,7 +9,7 @@
 
 final class ConsoleResult extends AbstractResult
 {
-    private const TWO_BLOCKS = [
+    private const array TWO_BLOCKS = [
         0 => ' ',
         1 => "\xe2\x96\x80",
         2 => "\xe2\x96\x84",
@@ -36,11 +36,13 @@ public function __construct(
         );
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         return 'text/plain';
     }
 
+    #[\Override]
     public function getString(): string
     {
         $matrix = $this->getMatrix();

src/Writer/Result/DebugResult.php

@@ -29,6 +29,7 @@ public function setValidateResult(bool $validateResult): void
         $this->validateResult = $validateResult;
     }
 
+    #[\Override]
     public function getString(): string
     {
         $debugLines = [];
@@ -67,6 +68,7 @@ public function getString(): string
         return implode("\n", $debugLines);
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         return 'text/plain';

src/Writer/Result/EpsResult.php

@@ -16,11 +16,13 @@ public function __construct(
         parent::__construct($matrix);
     }
 
+    #[\Override]
     public function getString(): string
     {
         return implode("\n", $this->lines);
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         return 'image/eps';

src/Writer/Result/GdResult.php

@@ -20,11 +20,13 @@ public function getImage(): \GdImage
         return $this->image;
     }
 
+    #[\Override]
     public function getString(): string
     {
         throw new \Exception('You can only use this method in a concrete implementation');
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         throw new \Exception('You can only use this method in a concrete implementation');

src/Writer/Result/GifResult.php

@@ -6,6 +6,7 @@
 
 final class GifResult extends GdResult
 {
+    #[\Override]
     public function getString(): string
     {
         ob_start();
@@ -14,6 +15,7 @@ public function getString(): string
         return strval(ob_get_clean());
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         return 'image/gif';

src/Writer/Result/PdfResult.php

@@ -20,11 +20,13 @@ public function getPdf(): \FPDF
         return $this->fpdf;
     }
 
+    #[\Override]
     public function getString(): string
     {
         return $this->fpdf->Output('S');
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         return 'application/pdf';

src/Writer/Result/PngResult.php

@@ -17,6 +17,7 @@ public function __construct(
         parent::__construct($matrix, $image);
     }
 
+    #[\Override]
     public function getString(): string
     {
         ob_start();
@@ -28,6 +29,7 @@ public function getString(): string
         return strval(ob_get_clean());
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         return 'image/png';

src/Writer/Result/SvgResult.php

@@ -21,6 +21,7 @@ public function getXml(): \SimpleXMLElement
         return $this->xml;
     }
 
+    #[\Override]
     public function getString(): string
     {
         $string = $this->xml->asXML();
@@ -36,6 +37,7 @@ public function getString(): string
         return $string;
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         return 'image/svg+xml';

src/Writer/Result/WebPResult.php

@@ -16,6 +16,7 @@ public function __construct(
         parent::__construct($matrix, $image);
     }
 
+    #[\Override]
     public function getString(): string
     {
         if (!function_exists('imagewebp')) {
@@ -28,6 +29,7 @@ public function getString(): string
         return strval(ob_get_clean());
     }
 
+    #[\Override]
     public function getMimeType(): string
     {
         return 'image/webp';

src/Writer/SvgWriter.php

@@ -15,13 +15,14 @@
 
 final readonly class SvgWriter implements WriterInterface
 {
-    public const DECIMAL_PRECISION = 2;
-    public const WRITER_OPTION_COMPACT = 'compact';
-    public const WRITER_OPTION_BLOCK_ID = 'block_id';
-    public const WRITER_OPTION_EXCLUDE_XML_DECLARATION = 'exclude_xml_declaration';
-    public const WRITER_OPTION_EXCLUDE_SVG_WIDTH_AND_HEIGHT = 'exclude_svg_width_and_height';
-    public const WRITER_OPTION_FORCE_XLINK_HREF = 'force_xlink_href';
-
+    public const int DECIMAL_PRECISION = 2;
+    public const string WRITER_OPTION_COMPACT = 'compact';
+    public const string WRITER_OPTION_BLOCK_ID = 'block_id';
+    public const string WRITER_OPTION_EXCLUDE_XML_DECLARATION = 'exclude_xml_declaration';
+    public const string WRITER_OPTION_EXCLUDE_SVG_WIDTH_AND_HEIGHT = 'exclude_svg_width_and_height';
+    public const string WRITER_OPTION_FORCE_XLINK_HREF = 'force_xlink_href';
+
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, array $options = []): ResultInterface
     {
         if (!isset($options[self::WRITER_OPTION_COMPACT])) {

src/Writer/WebPWriter.php

@@ -13,8 +13,9 @@
 
 final readonly class WebPWriter extends AbstractGdWriter
 {
-    public const WRITER_OPTION_QUALITY = 'quality';
+    public const string WRITER_OPTION_QUALITY = 'quality';
 
+    #[\Override]
     public function write(QrCodeInterface $qrCode, ?LogoInterface $logo = null, ?LabelInterface $label = null, array $options = []): ResultInterface
     {
         if (!isset($options[self::WRITER_OPTION_QUALITY])) {