dependency update & phpstan happy

Author: codemasher

.idea/inspectionProfiles/Project_Default.xml

@@ -58,11 +58,11 @@
 		"phpbench/phpbench": "^1.4",
 		"phpunit/phpunit": "^11.5",
 		"phpmd/phpmd": "^2.15",
-		"phpstan/phpstan": "^2.1.13",
+		"phpstan/phpstan": "^2.1.17",
 		"phpstan/phpstan-deprecation-rules": "^2.0",
 		"setasign/fpdf": "^1.8.6",
-		"slevomat/coding-standard": "^8.15",
-		"squizlabs/php_codesniffer": "^3.12"
+		"slevomat/coding-standard": "^8.19",
+		"squizlabs/php_codesniffer": "^3.13"
 	},
 	"suggest": {
 		"chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.",

composer.json

@@ -143,8 +143,6 @@
 	<rule ref="Generic.ControlStructures.InlineControlStructure"/>
 	<rule ref="Generic.Formatting.DisallowMultipleStatements"/>
 	<!--<rule ref="Generic.Formatting.MultipleStatementAlignment"/>-->
-	<rule ref="Generic.Formatting.NoSpaceAfterCast"/>
-	<rule ref="Generic.Functions.CallTimePassByReference"/>
 	<rule ref="Generic.NamingConventions.InterfaceNameSuffix"/>
 	<rule ref="Generic.NamingConventions.TraitNameSuffix"/>
 	<rule ref="Generic.PHP.BacktickOperator"/>
@@ -179,7 +177,6 @@
 
 
 	<rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
-	<rule ref="Squiz.Classes.DuplicateProperty"/>
 	<rule ref="Squiz.Classes.LowercaseClassKeywords"/>
 	<rule ref="Squiz.Classes.SelfMemberReference"/>
 	<rule ref="Squiz.Commenting.DocCommentAlignment"/>
@@ -237,6 +234,12 @@
 		<exclude-pattern>examples</exclude-pattern>
 	</rule>
 
+	<rule ref="Generic.Formatting.SpaceAfterCast">
+		<properties>
+			<property name="spacing" value="0"/>
+		</properties>
+	</rule>
+
 	<rule ref="Generic.Formatting.SpaceAfterNot">
 		<properties>
 			<property name="spacing" value="0" />

phpcs.xml.dist

@@ -240,12 +240,36 @@ parameters:
 			count: 1
 			path: tests/Data/DataInterfaceTestAbstract.php
 
+		-
+			message: '#^Parameter \#1 \$data of class chillerlan\\QRCode\\Data\\Byte constructor expects string, string\|false given\.$#'
+			identifier: argument.type
+			count: 1
+			path: tests/Data/ECITest.php
+
 		-
 			message: '#^Parameter \#2 \$to_encoding of function mb_convert_encoding expects string, string\|null given\.$#'
 			identifier: argument.type
 			count: 1
 			path: tests/Data/ECITest.php
 
+		-
+			message: '#^Parameter \#1 \$string of function bin2hex expects string, string\|false given\.$#'
+			identifier: argument.type
+			count: 1
+			path: tests/Data/HanziTest.php
+
+		-
+			message: '#^Anonymous function should return string but returns string\|false\.$#'
+			identifier: return.type
+			count: 1
+			path: tests/Data/KanjiTest.php
+
+		-
+			message: '#^Parameter \#1 \$string of function bin2hex expects string, string\|false given\.$#'
+			identifier: argument.type
+			count: 1
+			path: tests/Data/KanjiTest.php
+
 		-
 			message: '#^Parameter \#1 \$blob of method chillerlan\\QRCode\\QRCode\:\:readFromBlob\(\) expects string, GdImage\|string given\.$#'
 			identifier: argument.type

phpstan-baseline.neon

@@ -151,7 +151,13 @@ public static function decodeSegment(BitBuffer $bitBuffer, int $versionNumber):s
 			}
 		}
 
-		return mb_convert_encoding($data, mb_internal_encoding(), $encoding);
+		$encoded = mb_convert_encoding($data, mb_internal_encoding(), $encoding);
+
+		if($encoded === false){
+			throw new QRCodeDataException('mb_convert_encoding() error'); // @codeCoverageIgnore
+		}
+
+		return $encoded;
 	}
 
 }

src/Data/ECI.php

@@ -188,7 +188,13 @@ public static function decodeSegment(BitBuffer $bitBuffer, int $versionNumber):s
 			$length--;
 		}
 
-		return mb_convert_encoding(implode('', $buffer), mb_internal_encoding(), self::ENCODING);
+		$encoded = mb_convert_encoding(implode('', $buffer), mb_internal_encoding(), self::ENCODING);
+
+		if($encoded === false){
+			throw new QRCodeDataException('mb_convert_encoding() error'); // @codeCoverageIgnore
+		}
+
+		return $encoded;
 	}
 
 }

src/Data/Hanzi.php

@@ -174,7 +174,13 @@ public static function decodeSegment(BitBuffer $bitBuffer, int $versionNumber):s
 			$length--;
 		}
 
-		return mb_convert_encoding(implode('', $buffer), mb_internal_encoding(), self::ENCODING);
+		$encoded = mb_convert_encoding(implode('', $buffer), mb_internal_encoding(), self::ENCODING);
+
+		if($encoded === false){
+			throw new QRCodeDataException('mb_convert_encoding() error'); // @codeCoverageIgnore
+		}
+
+		return $encoded;
 	}
 
 }

src/Data/Kanji.php

@@ -33,6 +33,12 @@ final class Decoder{
 	private EccLevel|null                          $eccLevel    = null;
 	private MaskPattern|null                       $maskPattern = null;
 	private BitBuffer                              $bitBuffer;
+	/** @noinspection PhpPropertyOnlyWrittenInspection (currently unused) */
+	private SettingsContainerInterface|QROptions $options;
+	private Version|null                         $version     = null;
+	private EccLevel|null                        $eccLevel    = null;
+	private MaskPattern|null                     $maskPattern = null;
+	private BitBuffer                            $bitBuffer;
 
 	public function __construct(SettingsContainerInterface|QROptions $options = new QROptions){
 		$this->options = $options;

src/Decoder/Decoder.php

@@ -262,6 +262,10 @@ public function addEciSegment(int $encoding, string $data):static{
 		if($eciCharsetName !== null){
 			$data = mb_convert_encoding($data, $eciCharsetName, mb_internal_encoding());
 
+			if($data === false){
+				throw new QRCodeException('mb_convert_encoding() error'); // @codeCoverageIgnore
+			}
+
 			return $this
 				->addEciDesignator($eciCharset->getID())
 				->addByteSegment($data)