Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Enhancement: Add support for PHP 7.3
Browse files Browse the repository at this point in the history
localheinz committed Feb 24, 2024
1 parent 20a77fb commit 25a9230
Showing 20 changed files with 494 additions and 120 deletions.
6 changes: 6 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -21,8 +21,12 @@ branches:
- context: "Refactoring (7.4, locked)"
- context: "Security Analysis (7.4, locked)"
- context: "Static Code Analysis (7.4, locked)"
- context: "Tests (7.5.0, 7.3, highest)"
- context: "Tests (7.5.0, 7.3, lowest)"
- context: "Tests (7.5.0, 7.4, highest)"
- context: "Tests (7.5.0, 7.4, lowest)"
- context: "Tests (8.5.19, 7.3, highest)"
- context: "Tests (8.5.19, 7.3, lowest)"
- context: "Tests (8.5.19, 7.4, highest)"
- context: "Tests (8.5.19, 7.4, lowest)"
- context: "Tests (8.5.19, 8.0, highest)"
@@ -33,6 +37,8 @@ branches:
- context: "Tests (8.5.19, 8.2, lowest)"
- context: "Tests (8.5.19, 8.3, highest)"
- context: "Tests (8.5.19, 8.3, lowest)"
- context: "Tests (9.0.0, 7.3, highest)"
- context: "Tests (9.0.0, 7.3, lowest)"
- context: "Tests (9.0.0, 7.4, highest)"
- context: "Tests (9.0.0, 7.4, lowest)"
- context: "Tests (9.0.0, 8.0, highest)"
11 changes: 10 additions & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
@@ -461,6 +461,7 @@ jobs:
- "9.0.0"

php-version:
- "7.3"
- "7.4"
- "8.0"
- "8.1"
@@ -472,6 +473,14 @@ jobs:
- "highest"

include:
- phpunit-version: "7.5.0"
php-version: "7.3"
dependencies: "lowest"

- phpunit-version: "7.5.0"
php-version: "7.3"
dependencies: "highest"

- phpunit-version: "7.5.0"
php-version: "7.4"
dependencies: "lowest"
@@ -555,7 +564,7 @@ jobs:

- name: "Remove incompatible dependencies with composer"
if: "matrix.dependencies != 'locked'"
run: "composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress"
run: "composer remove ergebnis/composer-normalize ergebnis/license ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress"

- name: "Remove platform configuration with composer"
if: "matrix.dependencies != 'locked'"
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@

$license->save();

$ruleSet = PhpCsFixer\Config\RuleSet\Php74::create()
$ruleSet = PhpCsFixer\Config\RuleSet\Php73::create()
->withHeader($license->header())
->withRules(PhpCsFixer\Config\Rules::fromArray([
'mb_str_functions' => false,
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

For a full diff see [`2.10.0...main`][2.10.0...main].

### Changed

- Added support for PHP 7.3 ([#476]), by [@localheinz]

## [`2.10.0`][2.10.0]

For a full diff see [`2.9.0...2.10.0`][2.9.0...2.10.0].
@@ -276,6 +280,7 @@ For a full diff see [`7afa59c...1.0.0`][7afa59c...1.0.0].
[#396]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/396
[#447]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/447
[#448]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/448
[#476]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/476
[#485]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/485
[#491]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/491
[#494]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/494
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -24,16 +24,16 @@
"security": "https://github.com/ergebnis/phpunit-slow-test-detector/blob/main/.github/SECURITY.md"
},
"require": {
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"phpunit/phpunit": "^7.5.0 || ^8.5.19 || ^9.0.0 || ^10.0.0 || ^11.0.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.42.0",
"ergebnis/data-provider": "^3.2.0",
"ergebnis/license": "^2.4.0",
"ergebnis/php-cs-fixer-config": "^6.22.0",
"fakerphp/faker": "^1.23.1",
"fakerphp/faker": "^1.20.0",
"psalm/plugin-phpunit": "~0.18.4",
"psr/container": "~1.1.1",
"rector/rector": "^1.0.1",
"vimeo/psalm": "^5.22.2"
},
106 changes: 21 additions & 85 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -60,6 +60,42 @@
<code><![CDATA[$reporter]]></code>
</UnusedParam>
</file>
<file src="test/DataProvider/AbstractProvider.php">
<MixedAssignment>
<code><![CDATA[$value]]></code>
</MixedAssignment>
</file>
<file src="test/DataProvider/IntProvider.php">
<MixedReturnTypeCoercion>
<code><![CDATA[\Generator<string, array{0: int}>]]></code>
<code><![CDATA[\Generator<string, array{0: int}>]]></code>
<code><![CDATA[\Generator<string, array{0: int}>]]></code>
<code><![CDATA[\Generator<string, array{0: int}>]]></code>
<code><![CDATA[\Generator<string, array{0: int}>]]></code>
<code><![CDATA[\Generator<string, array{0: int}>]]></code>
<code><![CDATA[\Generator<string, array{0: int}>]]></code>
</MixedReturnTypeCoercion>
<PossiblyUnusedMethod>
<code><![CDATA[arbitrary]]></code>
<code><![CDATA[lessThanOne]]></code>
<code><![CDATA[one]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/DataProvider/StringProvider.php">
<MixedReturnTypeCoercion>
<code><![CDATA[\Generator<string, array{0: string}>]]></code>
<code><![CDATA[\Generator<string, array{0: string}>]]></code>
<code><![CDATA[\Generator<string, array{0: string}>]]></code>
<code><![CDATA[\Generator<string, array{0: string}>]]></code>
<code><![CDATA[\Generator<string, array{0: string}>]]></code>
<code><![CDATA[\Generator<string, array{0: string}>]]></code>
</MixedReturnTypeCoercion>
<PossiblyUnusedMethod>
<code><![CDATA[trimmed]]></code>
<code><![CDATA[untrimmed]]></code>
<code><![CDATA[withWhitespace]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/EndToEnd/Version07/TestCase/Combination/SleeperTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[sleepWithAfterAnnotation]]></code>
4 changes: 1 addition & 3 deletions rector.php
Original file line number Diff line number Diff line change
@@ -18,12 +18,10 @@
return static function (Config\RectorConfig $rectorConfig): void {
$rectorConfig->cacheDirectory(__DIR__ . '/.build/rector/');

$rectorConfig->import(__DIR__ . '/vendor/fakerphp/faker/rector-migrate.php');

$rectorConfig->paths([
__DIR__ . '/src/',
__DIR__ . '/test/',
]);

$rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_74);
$rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_73);
};
Loading

0 comments on commit 25a9230

Please sign in to comment.