Skip to content

Commit

Permalink
Merge pull request #760 from ergebnis/feature/php71
Browse files Browse the repository at this point in the history
Enhancement: Add support for PHP 7.1
  • Loading branch information
localheinz committed Feb 18, 2024
2 parents d304318 + bd3be17 commit 2801c93
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .github/settings.yml
Expand Up @@ -21,6 +21,8 @@ branches:
- context: "Refactoring (7.4, locked)"
- context: "Security Analysis (7.4, locked)"
- context: "Static Code Analysis (7.4, locked)"
- context: "Tests (7.1, highest)"
- context: "Tests (7.1, locked)"
- context: "Tests (7.2, highest)"
- context: "Tests (7.2, locked)"
- context: "Tests (7.3, highest)"
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/integrate.yaml
Expand Up @@ -429,6 +429,12 @@ jobs:
- "highest"

include:
- php-version: "7.1"
dependencies: "lowest"

- php-version: "7.1"
dependencies: "highest"

- php-version: "7.2"
dependencies: "lowest"

Expand Down Expand Up @@ -477,11 +483,11 @@ jobs:

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

- name: "Require phpunit/phpunit"
if: "matrix.dependencies != 'locked'"
run: "composer require phpunit/phpunit:\"^8.5.19 || ^9.6.16\" --ansi --dev --no-interaction --no-progress"
run: "composer require phpunit/phpunit:\"^7.5.20 || ^8.5.19 || ^9.6.16\" --ansi --dev --no-interaction --no-progress"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "ergebnis/.github/actions/composer/install@1.9.0"
Expand Down
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
Expand Up @@ -26,7 +26,7 @@

$license->save();

$ruleSet = PhpCsFixer\Config\RuleSet\Php72::create()->withHeader($license->header());
$ruleSet = PhpCsFixer\Config\RuleSet\Php71::create()->withHeader($license->header());

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

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -14,6 +14,7 @@ For a full diff see [`2.7.0...main`][2.7.0...main].
- Added support for PHP 7.4 ([#757]), by [@localheinz]
- Added support for PHP 7.3 ([#758]), by [@localheinz]
- Added support for PHP 7.2 ([#759]), by [@localheinz]
- Added support for PHP 7.1 ([#760]), by [@localheinz]

## [`2.7.0`][2.7.0]

Expand Down Expand Up @@ -174,6 +175,7 @@ For a full diff see [`36912f6...1.0.0`][36912f6...1.0.0].
[#757]: https://github.com/ergebnis/clock/pull/757
[#758]: https://github.com/ergebnis/clock/pull/758
[#759]: https://github.com/ergebnis/clock/pull/759
[#760]: https://github.com/ergebnis/clock/pull/760

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
4 changes: 2 additions & 2 deletions composer.json
Expand Up @@ -21,15 +21,15 @@
"source": "https://github.com/ergebnis/clock"
},
"require": {
"php": "~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"psr/clock": "^1.0.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.42.0",
"ergebnis/license": "^2.4.0",
"ergebnis/php-cs-fixer-config": "^6.22.0",
"infection/infection": "~0.26.6",
"phpunit/phpunit": "^8.5.19 || ^9.6.16",
"phpunit/phpunit": "^7.5.20 || ^8.5.19 || ^9.6.16",
"psalm/plugin-phpunit": "~0.18.4",
"rector/rector": "^1.0.1",
"vimeo/psalm": "^5.22.1"
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

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

4 changes: 2 additions & 2 deletions rector.php
Expand Up @@ -23,9 +23,9 @@
__DIR__ . '/test/',
]);

$rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_72);
$rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_71);

$rectorConfig->sets([
PHPUnit\Set\PHPUnitSetList::PHPUNIT_80,
PHPUnit\Set\PHPUnitSetList::PHPUNIT_70,
]);
};

0 comments on commit 2801c93

Please sign in to comment.