Skip to content

Commit 7552edc

Browse files
authored
Merge pull request #658 from Ocramius/feature/#628-allow-php-8.0
Allow (and test) PHP 8.0 type compatibility
2 parents 9a52e83 + 9bad027 commit 7552edc

32 files changed

+292
-498
lines changed

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
dependencies:
1616
- "locked"
1717
php-version:
18-
- "7.4"
18+
- "8.0"
1919
operating-system:
2020
- "ubuntu-latest"
2121

.github/workflows/demo-scripts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
- "locked"
1717
php-version:
1818
- "7.4"
19+
- "8.0"
1920
operating-system:
2021
- "ubuntu-latest"
2122

.github/workflows/mutation-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
dependencies:
1616
- "locked"
1717
php-version:
18-
- "7.4"
18+
- "8.0"
1919
operating-system:
2020
- "ubuntu-latest"
2121

.github/workflows/phpunit.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ jobs:
1818
- "locked"
1919
php-version:
2020
- "7.4"
21+
- "8.0"
2122
operating-system:
2223
- "ubuntu-latest"
24+
include:
25+
- php-version: "8.0"
26+
dependencies: "highest"
27+
operating-system: "ubuntu-latest"
2328

2429
steps:
2530
- name: "Checkout"
@@ -44,15 +49,15 @@ jobs:
4449

4550
- name: "Install lowest dependencies"
4651
if: ${{ matrix.dependencies == 'lowest' }}
47-
run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
52+
run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest --ignore-platform-req=php"
4853

4954
- name: "Install highest dependencies"
5055
if: ${{ matrix.dependencies == 'highest' }}
51-
run: "composer update --no-interaction --no-progress --no-suggest"
56+
run: "composer update --no-interaction --no-progress --no-suggest --ignore-platform-req=php"
5257

5358
- name: "Install locked dependencies"
5459
if: ${{ matrix.dependencies == 'locked' }}
55-
run: "composer install --no-interaction --no-progress --no-suggest"
60+
run: "composer install --no-interaction --no-progress --no-suggest --ignore-platform-req=php"
5661

5762
- name: "Tests"
5863
run: "vendor/bin/phpunit"

.github/workflows/psalm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
dependencies:
1616
- "locked"
1717
php-version:
18-
- "7.4"
18+
- "8.0"
1919
operating-system:
2020
- "ubuntu-latest"
2121

.github/workflows/xulieta.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
dependencies:
1616
- "locked"
1717
php-version:
18-
- "7.4"
18+
- "8.0"
1919
operating-system:
2020
- "ubuntu-latest"
2121

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@
1919
}
2020
],
2121
"require": {
22-
"php": "~7.4.1",
23-
"laminas/laminas-code": "^3.4.1",
22+
"php": "~7.4.1 || ~8.0.0",
23+
"laminas/laminas-code": "^4.0.0",
2424
"composer-runtime-api": "^2.0.0",
2525
"webimpress/safe-writer": "^2.0.1"
2626
},
2727
"conflict": {
2828
"zendframework/zend-stdlib": "<3.2.1",
2929
"laminas/laminas-stdlib": "<3.2.1",
30-
"doctrine/annotations": "<1.6.1"
30+
"doctrine/annotations": "<1.6.1",
31+
"thecodingmachine/safe": "<1.3.3"
3132
},
3233
"require-dev": {
3334
"ext-phar": "*",
@@ -36,7 +37,7 @@
3637
"slevomat/coding-standard": "^6.3.10",
3738
"doctrine/coding-standard": "^8.1.0",
3839
"nikic/php-parser": "^4.6.0",
39-
"phpbench/phpbench": "^0.17.1",
40+
"phpbench/phpbench": "^0.17.1 || 1.0.0-alpha2",
4041
"infection/infection": "^0.20.2",
4142
"vimeo/psalm": "^4.3.2",
4243
"codelicia/xulieta": "^0.1.5"

0 commit comments

Comments
 (0)