Skip to content

Commit

Permalink
Merge pull request #375 from ergebnis/feature/php8.0
Browse files Browse the repository at this point in the history
Enhancement: Add support for PHP 8.0
  • Loading branch information
localheinz authored Dec 1, 2023
2 parents f475e8b + 62dd0b4 commit c1aa63d
Show file tree
Hide file tree
Showing 23 changed files with 711 additions and 554 deletions.
15 changes: 9 additions & 6 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ branches:
required_approving_review_count: 1
required_status_checks:
checks:
- context: "Code Coverage (8.1, 9.6.0, locked)"
- context: "Coding Standards (8.1, locked)"
- context: "Code Coverage (8.0, 9.6.0, locked)"
- context: "Coding Standards (8.0, locked)"
- context: "Compile Phar (8.1, locked)"
- context: "Dependency Analysis (8.1, locked)"
- context: "Refactoring (8.1, locked)"
- context: "Security Analysis (8.1, locked)"
- context: "Static Code Analysis (8.1, locked)"
- context: "Dependency Analysis (8.0, locked)"
- context: "Refactoring (8.0, locked)"
- context: "Security Analysis (8.0, locked)"
- context: "Static Code Analysis (8.0, locked)"
- context: "Tests (8.0, 9.6.0, highest)"
- context: "Tests (8.0, 9.6.0, locked)"
- context: "Tests (8.0, 9.6.0, lowest)"
- context: "Tests (8.1, 10.4.0, highest)"
- context: "Tests (8.1, 10.4.0, locked)"
- context: "Tests (8.1, 10.4.0, lowest)"
Expand Down
28 changes: 22 additions & 6 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.0"

phpunit-version:
- "9.6.0"
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.0"

dependencies:
- "locked"
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.0"

dependencies:
- "locked"
Expand Down Expand Up @@ -286,7 +286,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.0"

dependencies:
- "locked"
Expand Down Expand Up @@ -348,7 +348,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.0"

dependencies:
- "locked"
Expand Down Expand Up @@ -398,7 +398,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.0"

dependencies:
- "locked"
Expand Down Expand Up @@ -464,6 +464,19 @@ jobs:
- "locked"
- "highest"

include:
- php-version: "8.0"
phpunit-version: "9.6.0"
dependencies: "lowest"

- php-version: "8.0"
phpunit-version: "9.6.0"
dependencies: "locked"

- php-version: "8.0"
phpunit-version: "9.6.0"
dependencies: "highest"

steps:
- name: "Checkout"
uses: "actions/checkout@v4.1.1"
Expand Down Expand Up @@ -494,6 +507,9 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-phpunit-${{ matrix.phpunit-version }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-phpunit-${{ matrix.phpunit-version }}-"

- name: "Remove incompatible dependencies with composer"
run: "composer remove ergebnis/composer-normalize --ansi --dev --no-interaction --no-progress"

- name: "Require phpunit/phpunit:^${{ matrix.phpunit-version }}"
run: "composer require phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --no-interaction --no-progress --update-with-all-dependencies"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.0"

dependencies:
- "locked"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.0"

dependencies:
- "locked"
Expand Down
2 changes: 1 addition & 1 deletion .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="humbug/box" version="^4.4.0" installed="4.4.0" location="./.phive/box" copy="false"/>
<phar name="composer-require-checker" version="^4.7.1" installed="4.7.1" location="./.phive/composer-require-checker" copy="false"/>
<phar name="composer-require-checker" version="~4.4.0" installed="4.4.0" location="./.phive/composer-require-checker" copy="false"/>
<phar name="phpunit" version="^10.4.1" installed="10.4.1" location="./.phive/phpunit" copy="false"/>
</phive>
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

$license->save();

$ruleSet = PhpCsFixer\Config\RuleSet\Php81::create()
$ruleSet = PhpCsFixer\Config\RuleSet\Php80::create()
->withHeader($license->header())
->withRules(PhpCsFixer\Config\Rules::fromArray([
'mb_str_functions' => false,
Expand Down
15 changes: 12 additions & 3 deletions composer-require-checker.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
{
"symbol-whitelist": [
"PHPUnit\\Runner\\AfterLastTestHook",
"PHPUnit\\Runner\\AfterSuccessfulTestHook",
"PHPUnit\\Runner\\BeforeFirstTestHook"
"PHPUnit\\Event\\Code\\Test",
"PHPUnit\\Event\\Test\\Passed",
"PHPUnit\\Event\\Test\\PassedSubscriber",
"PHPUnit\\Event\\Test\\Prepared",
"PHPUnit\\Event\\Test\\PreparedSubscriber",
"PHPUnit\\Event\\TestRunner\\ExecutionFinished",
"PHPUnit\\Event\\TestRunner\\ExecutionFinishedSubscriber",
"PHPUnit\\Metadata\\Annotation\\Parser\\Registry",
"PHPUnit\\Runner\\Extension\\Extension",
"PHPUnit\\Runner\\Extension\\Facade",
"PHPUnit\\Runner\\Extension\\ParameterCollection",
"PHPUnit\\TextUI\\Configuration\\Configuration"
]
}
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"security": "https://github.com/ergebnis/phpunit-slow-test-detector/blob/main/.github/SECURITY.md"
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"phpunit/phpunit": "^9.6.0 || ^10.4.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.39.0",
"ergebnis/composer-normalize": "^2.31.0",
"ergebnis/data-provider": "^3.2.0",
"ergebnis/license": "^2.4.0",
"ergebnis/php-cs-fixer-config": "^6.13.0",
Expand Down
Loading

0 comments on commit c1aa63d

Please sign in to comment.