Modernise package for PHP 8.2+

.gitattributes

@@ -1,7 +1,7 @@
 /.gitattributes export-ignore
 /.github/ export-ignore
 /.gitignore export-ignore
+/demo/ export-ignore
 /phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
 /tests/ export-ignore
-/demo/ export-ignore

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['5.3.3', '5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['8.2', '8.3', '8.4', '8.5']
 
     name: PHP ${{ matrix.php }}
 
@@ -31,15 +31,13 @@ jobs:
 
       - name: Execute PHPCS
         run: |
-          composer require "squizlabs/php_codesniffer=3.13.2"
           ./vendor/bin/phpcs --standard=PSR12 src/ tests/
-        if: ${{ matrix.php == '8.4' }}
+        if: ${{ matrix.php == '8.5' }}
 
       - name: Execute PHPStan
         run: |
-          composer require phpstan/phpstan:2.1.17 phpstan/phpstan-phpunit:2.0.6
           ./vendor/bin/phpstan analyse
-        if: ${{ matrix.php == '8.4' }}
+        if: ${{ matrix.php == '8.5' }}
 
       - name: Execute tests
         run: ./vendor/bin/phpunit

.gitignore

@@ -1,5 +1,7 @@
-.idea/
-demo/*.jpg
-demo/*.pgm
-demo/temp/
-vendor/
+/.idea/
+/.phpunit.result.cache
+/composer.lock
+/demo/*.jpg
+/demo/*.pgm
+/demo/temp/
+/vendor/

README.md

@@ -92,7 +92,7 @@ You can use these functions :
 * **inline($quality = 80)**, returns the jpeg code directly in the HTML page
 * **setBackgroundColor($r, $g, $b)**, sets the background color to force it (this will disable many effects and is not recommended)
 * **setBackgroundAlpha($alpha)**, sets the background transparency 0 is fully opaque, 127 is fully transparent
-* **setBackgroundImages(array($imagepath1, $imagePath2))**, Sets custom background images to be used as captcha background. It is recommended to disable image effects when passing custom images for background (ignore_all_effects). A random image is selected from the list passed, the full paths to the image files must be passed.
+* **setBackgroundImages([$imagepath1, $imagePath2])**, Sets custom background images to be used as captcha background. It is recommended to disable image effects when passing custom images for background (ignore_all_effects). A random image is selected from the list passed, the full paths to the image files must be passed.
 * **setInterpolation($interpolate)**, enable or disable the interpolation (enabled by default), disabling it will be quicker but the images will look uglier
 * **setIgnoreAllEffects($ignoreAllEffects)**, disable all effects on the captcha image. Recommended to use when passing custom background images for the captcha.
 * **testPhrase($phrase)**, returns true if the given phrase is good
@@ -101,7 +101,7 @@ You can use these functions :
 * **setImageType($type)**, sets the image output type to "jpeg", "png" or "gif"
 * **setScatterEffect($bool)**, enable or disable scatter effect (fuzzyness)
 
-If you want to change the number of character, you can call the phrase builder directly using
+If you want to change the number of characters, you can call the phrase builder directly using
 extra parameters:
 
 ```php
@@ -135,13 +135,13 @@ render a captcha and check it after the submission
 Symfony Bundle
 ================
 
-You can have a look at the following repository to enjoy the Symfony 2 bundle packaging this captcha generator :
+You can have a look at the following repository to enjoy the Symfony 2 bundle packaging this captcha generator:
 https://github.com/Gregwar/CaptchaBundle
 
 Yii2 Extension
 ===============
 
-You can use the following extension for integrating with Yii2 Framework :
+You can use the following extension for integrating with Yii2 Framework:
 https://github.com/juliardi/yii2-captcha
 
 License

composer.json

@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": "^8.2",
         "ext-gd": "*",
         "ext-mbstring": "*",
         "ext-fileinfo": "*",
@@ -29,6 +29,9 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6.4 || ^7.0 || ^8.0 || ^9.0"
+        "phpunit/phpunit": "^9.6",
+        "phpstan/phpstan": "2.1.17",
+        "squizlabs/php_codesniffer": "4.0.1",
+        "phpstan/phpstan-phpunit": "2.0.6"
     }
 }

phpstan.neon.dist

@@ -1,9 +1,7 @@
-includes:
-    - ./vendor/phpstan/phpstan-phpunit/extension.neon
-
 parameters:
-    level: 5
-    paths:
-        - src/
-        - tests/
-    treatPhpDocTypesAsCertain: false
+  level: 8
+  reportUnmatchedIgnoredErrors: false
+  paths:
+    - src/
+    - tests/
+  treatPhpDocTypesAsCertain: false

phpunit.xml.dist

@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit colors="true" bootstrap="vendor/autoload.php">
-    <testsuites>
-        <testsuite name="KnpMenu Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>