Skip to content

Commit

Permalink
Merge pull request #619 from ergebnis/fix/php7.4
Browse files Browse the repository at this point in the history
Fix: Drop support for PHP 7.4
  • Loading branch information
localheinz committed Nov 28, 2022
2 parents f6be7c4 + 2c2044b commit 689cb80
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 31 deletions.
13 changes: 5 additions & 8 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,11 @@ branches:
required_approving_review_count: 1
required_status_checks:
contexts:
- "Code Coverage (7.4, locked)"
- "Coding Standards (7.4, locked)"
- "Dependency Analysis (7.4, locked)"
- "Mutation Tests (7.4, locked)"
- "Static Code Analysis (7.4, locked)"
- "Tests (7.4, highest)"
- "Tests (7.4, locked)"
- "Tests (7.4, lowest)"
- "Code Coverage (8.0, locked)"
- "Coding Standards (8.0, locked)"
- "Dependency Analysis (8.0, locked)"
- "Mutation Tests (8.0, locked)"
- "Static Code Analysis (8.0, locked)"
- "Tests (8.0, highest)"
- "Tests (8.0, locked)"
- "Tests (8.0, lowest)"
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"

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

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

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

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

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

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

dependencies:
- "locked"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

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

### Changed

- Dropped support for PHP 7.4 ([#619]), by [@localheinz]

## [`1.3.0`][1.3.0]

For a full diff see [`1.2.0...1.3.0`][1.2.0...1.3.0].
Expand Down Expand Up @@ -147,6 +151,7 @@ For a full diff see [`0.4.0...0.5.0`][0.4.0...0.5.0].
[#478]: https://github.com/ergebnis/classy/pull/478
[#481]: https://github.com/ergebnis/classy/pull/481
[#486]: https://github.com/ergebnis/classy/pull/486
[#619]: https://github.com/ergebnis/classy/pull/619

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"source": "https://github.com/ergebnis/classy"
},
"require": {
"php": "^7.4 || ^8.0",
"php": "^8.0",
"ext-tokenizer": "*"
},
"require-dev": {
Expand Down Expand Up @@ -56,7 +56,7 @@
"infection/extension-installer": true
},
"platform": {
"php": "7.4.26"
"php": "8.0.25"
},
"preferred-install": "dist",
"sort-packages": true
Expand Down
6 changes: 3 additions & 3 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 infection.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"logs": {
"text": ".build/infection/infection-log.txt"
},
"minCoveredMsi": 85,
"minMsi": 78,
"minCoveredMsi": 88,
"minMsi": 82,
"phpUnit": {
"configDir": "test\/Unit"
},
Expand Down
10 changes: 1 addition & 9 deletions src/Constructs.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,9 @@ public static function fromSource(string $source): array

$namespaceSegmentOrNamespaceTokens = [
\T_STRING,
\T_NAME_QUALIFIED,
];

// https://wiki.php.net/rfc/namespaced_names_as_token
if (\PHP_VERSION_ID >= 80000 && \defined('T_NAME_QUALIFIED')) {
/** @var array<int> $namespaceSegmentOrNamespaceTokens */
$namespaceSegmentOrNamespaceTokens = [
\T_STRING,
\T_NAME_QUALIFIED,
];
}

$classyTokens = [
\T_CLASS,
\T_INTERFACE,
Expand Down

0 comments on commit 689cb80

Please sign in to comment.