Support for PHP8.4: null type annotations

.github/workflows/ci.yml

@@ -12,15 +12,15 @@ jobs:
       fail-fast: false
       matrix:
         php-versions:
-          - '5.5'
-          - '5.6'
-          - '7.0'
           - '7.1'
           - '7.2'
           - '7.3'
           - '7.4'
           - '8.0'
           - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
         os: [ubuntu-latest]
 
     steps:
@@ -64,7 +64,8 @@ jobs:
 
           # Remove dependencies we don't need for unit tests that break platform requirements
           composer remove --dev \
-            bamarni/composer-bin-plugin
+            friendsofphp/php-cs-fixer \
+            kubawerlos/php-cs-fixer-custom-fixers
 
           composer install
 

.github/workflows/linting.yml

@@ -12,10 +12,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up PHP 8.2
+      - name: Set up PHP 8.3
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: mbstring
 
       - name: Get Composer Cache Directory
@@ -26,8 +26,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
+          key: ${{ runner.os }}-composer-lint-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-lint-
 
       - name: Install dependencies
         run: composer install
@@ -45,10 +45,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up PHP 8.2
+      - name: Set up PHP 8.3
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: mbstring
 
       - name: Get Composer Cache Directory
@@ -59,8 +59,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
+          key: ${{ runner.os }}-composer-lint-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-lint-
 
       - name: Install dependencies
         run: composer install

.php-cs-fixer.dist.php

@@ -12,9 +12,8 @@
     ->setRules([
         '@PSR1' => true,
         '@PSR2' => true,
+        'php_unit_data_provider_name' => true,
         PhpCsFixerCustomFixers\Fixer\CommentSurroundedBySpacesFixer::name() => true,
-        PhpCsFixerCustomFixers\Fixer\DataProviderNameFixer::name() => true,
-        PhpCsFixerCustomFixers\Fixer\DataProviderStaticFixer::name() => true,
         PhpCsFixerCustomFixers\Fixer\NoDuplicatedImportsFixer::name() => true,
         PhpCsFixerCustomFixers\Fixer\NoPhpStormGeneratedCommentFixer::name() => true,
         PhpCsFixerCustomFixers\Fixer\NoUselessParenthesisFixer::name() => true,

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## v0.2.4 (dev-master)
+## v0.2.5 (dev-master)
+
+**TBD — [Diff](https://github.com/maciejczyzewski/bottomline/compare/0.2.4...0.2.5) — [Docs](https://maciejczyzewski.github.io/bottomline/)**
+
+* Support for PHP8.4 (fix annotation deprecations), changes which makes PHP7.1+ required
+
+## v0.2.4
 
 **TBD — [Diff](https://github.com/maciejczyzewski/bottomline/compare/0.2.3...0.2.4) — [Docs](https://maciejczyzewski.github.io/bottomline/)**
 

CONTRIBUTING.md

@@ -34,7 +34,7 @@ Also useful:
 - Always add tests for the code that you write, including edge cases ;
 - Place the new functions where they belong (collections, arrays, utilities, etc.) ;
 - Add `README.md` doc entry for the functions ;
-- Execute `php composer.phar run doc` script to automatically build an updated `load.php` ;
+- Execute `composer run doc` script to automatically build an updated `load.php` ;
 - Update the benchmark `bench.php`, this helps us to validate the performance of the library ;
 - Update `CHANGELOG.md` with your changes.
 

composer.json

@@ -11,18 +11,19 @@
         }
     ],
     "require": {
-        "php": ">=5.5.0",
+        "php": ">=7.1",
         "ext-mbstring": "*"
     },
     "require-dev": {
         "php": ">=8.1",
         "ext-json": "*",
-        "bamarni/composer-bin-plugin": "^1.8",
         "doctrine/instantiator": "^1.0||^1.1||^1.4",
         "erusev/parsedown": "^1.7",
+        "friendsofphp/php-cs-fixer": "^3.68",
         "nikic/php-parser": "^3.1||^4.13",
         "phpdocumentor/reflection-docblock": "^3.0||^4.3||^5.2",
-        "phpunit/phpunit": "^4.8||^6.5||^9.5"
+        "phpunit/phpunit": "^4.8||^6.5||^9.5",
+        "kubawerlos/php-cs-fixer-custom-fixers": "^3.14"
     },
     "autoload": {
         "classmap": ["bottomline.php"],