declare strict types

chillerlan · Jul 21, 2024 · 7b1d961 · 7b1d961
1 parent f32696c
commit 7b1d961
Show file tree

Hide file tree

Showing 137 changed files with 144 additions and 2 deletions.
diff --git a/examples/authenticator.php b/examples/authenticator.php
@@ -7,6 +7,7 @@
  * @copyright    2023 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\Authenticator\{Authenticator, AuthenticatorOptionsTrait};
 use chillerlan\Authenticator\Authenticators\AuthenticatorInterface;

diff --git a/examples/custom_output.php b/examples/custom_output.php
@@ -9,6 +9,7 @@
  *
  * @noinspection PhpIllegalPsrClassPathInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Output\QROutputAbstract;

diff --git a/examples/eps.php b/examples/eps.php
@@ -7,6 +7,7 @@
  * @copyright    2022 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/fpdf.php b/examples/fpdf.php
@@ -6,6 +6,7 @@
  * @author       Maximilian Kresse
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/html.php b/examples/html.php
@@ -7,6 +7,7 @@
  * @copyright    2017 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/image.php b/examples/image.php
@@ -7,6 +7,7 @@
  * @copyright    2017 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/imageWithLogo.php b/examples/imageWithLogo.php
@@ -9,6 +9,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection, PhpIllegalPsrClassPathInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/imageWithRoundedShapes.php b/examples/imageWithRoundedShapes.php
@@ -12,6 +12,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/imageWithText.php b/examples/imageWithText.php
@@ -11,6 +11,7 @@
  *
  * @noinspection PhpIllegalPsrClassPathInspection, PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Output\QRGdImagePNG;

diff --git a/examples/imagick.php b/examples/imagick.php
@@ -7,6 +7,7 @@
  * @copyright    2017 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/imagickConvertSVGtoPNG.php b/examples/imagickConvertSVGtoPNG.php
@@ -17,6 +17,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/imagickImageAsBackground.php b/examples/imagickImageAsBackground.php
@@ -7,6 +7,7 @@
  * @copyright    2023 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QRCodeException, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/imagickWithLogo.php b/examples/imagickWithLogo.php
@@ -9,6 +9,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QRCodeException, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/intervention-image.php b/examples/intervention-image.php
@@ -7,6 +7,7 @@
  * @copyright    2024 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\Data\QRMatrix;
 use chillerlan\QRCode\Output\QRInterventionImage;

diff --git a/examples/multimode.php b/examples/multimode.php
@@ -7,6 +7,7 @@
  * @copyright    2023 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 

diff --git a/examples/qrcode-interactive.php b/examples/qrcode-interactive.php
@@ -7,6 +7,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/reader.php b/examples/reader.php
@@ -7,6 +7,7 @@
  * @copyright    2022 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 

diff --git a/examples/reflectance.php b/examples/reflectance.php
@@ -7,6 +7,7 @@
  * @copyright    2023 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/svg.php b/examples/svg.php
@@ -9,6 +9,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/svgConvertViaCanvas.php b/examples/svgConvertViaCanvas.php
@@ -7,6 +7,7 @@
  * @copyright    2023 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/svgMeltedModules.php b/examples/svgMeltedModules.php
@@ -9,6 +9,7 @@
  * @see https://github.com/chillerlan/php-qrcode/issues/127
  * @see ./shapes.svg
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/svgRandomColoredDots.php b/examples/svgRandomColoredDots.php
@@ -11,6 +11,7 @@
  *
  * @noinspection PhpIllegalPsrClassPathInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/svgRoundQuietzone.php b/examples/svgRoundQuietzone.php
@@ -11,6 +11,7 @@
  *
  * @noinspection PhpIllegalPsrClassPathInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QRCodeException, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/svgWithLogo.php b/examples/svgWithLogo.php
@@ -9,6 +9,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QRCodeException, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/svgWithLogoAndCustomShapes.php b/examples/svgWithLogoAndCustomShapes.php
@@ -11,6 +11,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QRCodeException, QROptions};
 use chillerlan\QRCode\Common\EccLevel;

diff --git a/examples/text.php b/examples/text.php
@@ -7,6 +7,7 @@
  * @copyright    2017 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;

diff --git a/examples/xml.php b/examples/xml.php
@@ -7,6 +7,7 @@
  * @copyright    2024 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 use chillerlan\QRCode\Data\QRMatrix;
 use chillerlan\QRCode\{QRCode, QROptions};

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -74,7 +74,6 @@
 
 	<rule ref="SlevomatCodingStandard.Strings.DisallowVariableParsing"/>
 
-	<!--<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/>-->
 	<!--<rule ref="SlevomatCodingStandard.TypeHints.DisallowMixedTypeHint"/>-->
 	<rule ref="SlevomatCodingStandard.TypeHints.LongTypeHints"/>
 	<rule ref="SlevomatCodingStandard.TypeHints.NullTypeHintOnLastPosition"/>
@@ -87,6 +86,13 @@
 	<rule ref="SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable"/>
 	<rule ref="SlevomatCodingStandard.Variables.UselessVariable"/>
 
+	<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
+		<properties>
+			<property name="linesCountBeforeDeclare" value="0"/>
+			<property name="linesCountAfterDeclare" value="1"/>
+			<property name="spacesCountAroundEqualsSign" value="0"/>
+		</properties>
+	</rule>
 
 	<rule ref="SlevomatCodingStandard.Functions.RequireMultiLineCall">
 		<properties>
@@ -147,7 +153,7 @@
 	<rule ref="Generic.PHP.LowerCaseKeyword"/>
 	<rule ref="Generic.PHP.LowerCaseType"/>
 	<rule ref="Generic.PHP.NoSilencedErrors"/>
-	<!--<rule ref="Generic.PHP.RequireStrictTypes"/>-->
+	<rule ref="Generic.PHP.RequireStrictTypes"/>
 	<rule ref="Generic.PHP.SAPIUsage"/>
 	<rule ref="Generic.PHP.Syntax"/>
 	<rule ref="Generic.Strings.UnnecessaryStringConcat"/>

diff --git a/src/Common/BitBuffer.php b/src/Common/BitBuffer.php
@@ -7,6 +7,7 @@
  * @copyright    2015 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/ECICharset.php b/src/Common/ECICharset.php
@@ -8,6 +8,7 @@
  * @copyright    2021 smiley
  * @license      Apache-2.0
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/EccLevel.php b/src/Common/EccLevel.php
@@ -7,6 +7,7 @@
  * @copyright    2020 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/GDLuminanceSource.php b/src/Common/GDLuminanceSource.php
@@ -10,6 +10,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/GF256.php b/src/Common/GF256.php
@@ -8,6 +8,7 @@
  * @copyright    2021 Smiley
  * @license      Apache-2.0
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/GenericGFPoly.php b/src/Common/GenericGFPoly.php
@@ -8,6 +8,7 @@
  * @copyright    2021 Smiley
  * @license      Apache-2.0
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/IMagickLuminanceSource.php b/src/Common/IMagickLuminanceSource.php
@@ -10,6 +10,7 @@
  *
  * @noinspection PhpComposerExtensionStubsInspection
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/LuminanceSourceAbstract.php b/src/Common/LuminanceSourceAbstract.php
@@ -9,6 +9,7 @@
  * @copyright    2021 Smiley
  * @license      Apache-2.0
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/LuminanceSourceInterface.php b/src/Common/LuminanceSourceInterface.php
@@ -7,6 +7,7 @@
  * @copyright    2021 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/MaskPattern.php b/src/Common/MaskPattern.php
@@ -8,6 +8,7 @@
  * @copyright    2021 Smiley
  * @license      Apache-2.0
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/Mode.php b/src/Common/Mode.php
@@ -7,6 +7,7 @@
  * @copyright    2020 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Common/Version.php b/src/Common/Version.php
@@ -7,6 +7,7 @@
  * @copyright    2020 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Common;
 

diff --git a/src/Data/AlphaNum.php b/src/Data/AlphaNum.php
@@ -7,6 +7,7 @@
  * @copyright    2015 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Data;
 

diff --git a/src/Data/Byte.php b/src/Data/Byte.php
@@ -7,6 +7,7 @@
  * @copyright    2015 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Data;
 

diff --git a/src/Data/ECI.php b/src/Data/ECI.php
@@ -7,6 +7,7 @@
  * @copyright    2020 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Data;
 

diff --git a/src/Data/Hanzi.php b/src/Data/Hanzi.php
@@ -7,6 +7,7 @@
  * @copyright    2020 smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Data;
 

diff --git a/src/Data/Kanji.php b/src/Data/Kanji.php
@@ -7,6 +7,7 @@
  * @copyright    2015 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Data;
 

diff --git a/src/Data/Number.php b/src/Data/Number.php
@@ -7,6 +7,7 @@
  * @copyright    2015 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Data;
 

diff --git a/src/Data/QRCodeDataException.php b/src/Data/QRCodeDataException.php
@@ -7,6 +7,7 @@
  * @copyright    2015 Smiley
  * @license      MIT
  */
+declare(strict_types=1);
 
 namespace chillerlan\QRCode\Data;
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
      *
      * @noinspection PhpComposerExtensionStubsInspection
      */
+    declare(strict_types=1);
     namespace chillerlan\QRCode\Common;
@@ Expand Down @@