Skip to content

Commit

Permalink
Merge pull request #929 from ergebnis/feature/php74
Browse files Browse the repository at this point in the history
Enhancement: Add support for PHP 7.4
  • Loading branch information
localheinz authored Jun 17, 2024
2 parents e44afce + be2587e commit b928c57
Show file tree
Hide file tree
Showing 28 changed files with 741 additions and 308 deletions.
15 changes: 8 additions & 7 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.0"
- "7.4"

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

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

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

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

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

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

dependencies:
- "locked"
Expand Down Expand Up @@ -417,6 +417,7 @@ jobs:
fail-fast: false
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
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.0"
- "7.4"

dependencies:
- "locked"
Expand Down
2 changes: 1 addition & 1 deletion .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="composer-require-checker" version="~4.4.0" installed="4.4.0" location="./.phive/composer-require-checker" copy="false"/>
<phar name="composer-require-checker" version="^3.8.0" installed="3.8.0" location="./.phive/composer-require-checker" 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\Php80::create()->withHeader($license->header());
$ruleSet = PhpCsFixer\Config\RuleSet\Php74::create()->withHeader($license->header());

$config = PhpCsFixer\Config\Factory::fromRuleSet($ruleSet);

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ For a full diff see [`1.6.0...main`][1.6.0...main].
### Added

- Added support for PHP 8.0 ([#926]), by [@localheinz]
- Added support for PHP 7.4 ([#929]), by [@localheinz]

## [`1.6.0`][1.6.0]

Expand Down Expand Up @@ -185,6 +186,7 @@ For a full diff see [`0.4.0...0.5.0`][0.4.0...0.5.0].
[#702]: https://github.com/ergebnis/classy/pull/702
[#795]: https://github.com/ergebnis/classy/pull/795
[#926]: https://github.com/ergebnis/classy/pull/926
[#929]: https://github.com/ergebnis/classy/pull/929

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
8 changes: 7 additions & 1 deletion composer-require-checker.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"symbol-whitelist": [
"T_ENUM"
"array",
"int",
"self",
"string",
"T_ENUM",
"T_NAME_QUALIFIED",
"true"
]
}
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"source": "https://github.com/ergebnis/classy"
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"ext-tokenizer": "*"
},
"require-dev": {
Expand All @@ -33,7 +33,7 @@
"ergebnis/php-cs-fixer-config": "^6.31.0",
"ergebnis/phpunit-slow-test-detector": "^2.15.0",
"fakerphp/faker": "^1.23.1",
"infection/infection": "~0.26.16",
"infection/infection": "~0.26.6",
"phpunit/phpunit": "^9.6.19",
"psalm/plugin-phpunit": "~0.19.0",
"rector/rector": "^1.1.0",
Expand Down Expand Up @@ -62,7 +62,7 @@
"abandoned": "report"
},
"platform": {
"php": "8.0.30"
"php": "7.4.33"
},
"preferred-install": "dist",
"sort-packages": true
Expand Down
Loading

0 comments on commit b928c57

Please sign in to comment.