Merge branch '5-add-support-for-php-8-4' into 'master'

Resolve "Add support for PHP 8.4" Closes #5 See merge request tjvb/githash!12
TJVB · Nov 20, 2024 · 9b5895f · 9b5895f
2 parents a3c91d1 + f2050fe
commit 9b5895f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -87,6 +87,7 @@ infection:
   image: registry.gitlab.com/tjvb/phpimages:php83
   script:
     - composer update
+    - vendor/bin/phpunit --migrate-configuration || true
     - composer infection
   dependencies:
     - prepare_cache
@@ -126,11 +127,13 @@ test:
           - 81
           - 82
           - 83
+          - 84
   image: registry.gitlab.com/tjvb/phpimages:php$PHP
   <<: *set_exclude_group
   script:
-    - composer install
-    - vendor/bin/phpunit --coverage-text --colors=never --coverage-cobertura=phpunitresult/cobertura-coverage.xml --log-junit=phpunitresult/junit.xml $EXCLUDE_GROUP
+    - composer update
+    - vendor/bin/phpunit --migrate-configuration || true
+    - XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --colors=never --coverage-cobertura=phpunitresult/cobertura-coverage.xml --log-junit=phpunitresult/junit.xml $EXCLUDE_GROUP
     - sed -i 's~ filename="~ filename="src/~' phpunitresult/cobertura-coverage.xml
   coverage:  '/^\s*Lines:\s*\d+.\d+\%/'
   artifacts:
@@ -158,4 +161,4 @@ combine_docs:
   dependencies:
     - test_lowest
   needs:
-    - test_lowest
+    - test_lowest
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- Added PHP 8.4 support
+
 ## 1.3.0 - 2023-11-24
 - Added PHP 8.3 support
 

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Latest Stable Version](https://poser.pugx.org/tjvb/githash/v)](https://packagist.org/packages/tjvb/githash)
 [![Pipeline status](https://gitlab.com/tjvb/githash/badges/master/pipeline.svg)](https://gitlab.com/tjvb/githash/-/pipelines?page=1&scope=all&ref=master)
 [![Coverage report](https://gitlab.com/tjvb/githash/badges/master/coverage.svg)](https://gitlab.com/tjvb/githash/-/pipelines?page=1&scope=all&ref=master)
-[![Tested on PHP 8.0 to 8.2](https://img.shields.io/badge/Tested%20on-PHP%208.0%20|%208.1%20|%208.2%20|%208.3-brightgreen.svg?maxAge=2419200)](https://gitlab.com/tjvb/githash/-/pipelines?page=1&scope=all&ref=master)
+[![Tested on PHP 8.0 to 8.4](https://img.shields.io/badge/Tested%20on-PHP%208.0%20|%208.1%20|%208.2%20|%208.3%20|%208.4-brightgreen.svg?maxAge=2419200)](https://gitlab.com/tjvb/githash/-/pipelines?page=1&scope=all&ref=master)
 [![Latest Unstable Version](https://poser.pugx.org/tjvb/githash/v/unstable)](https://packagist.org/packages/tjvb/githash)
 
 

diff --git a/composer.json b/composer.json
@@ -34,15 +34,15 @@
         }
     ],
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.15",
-        "infection/infection": "^0.26.10 || ^0.27.0",
+        "infection/infection": "^0.26.10 || ^0.27.0|| ^0.28.0 || ^0.29.0",
         "mikey179/vfsstream": "^1.6.7",
         "phpmd/phpmd": "^2.10",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.5 || ^10.0 || ^11.0",
         "slevomat/coding-standard": "^8.14",
         "squizlabs/php_codesniffer": "^3.7",
         "symplify/easy-coding-standard": "^12.0",

diff --git a/tests/Retrievers/RetrieverTest.php b/tests/Retrievers/RetrieverTest.php
@@ -214,7 +214,7 @@ public function weGetTheRetrieverWithTheFactoryIfWeInstantiateWithIt(): void
         $this->assertEquals($factory, $retriever->getFinderFactory());
     }
 
-    public function hashMethodsProvider(): array
+    public static function hashMethodsProvider(): array
     {
         return [
             'with failures' => ['getHash'],