Skip to content

Commit

Permalink
Merge pull request #658 from Ocramius/feature/#628-allow-php-8.0
Browse files Browse the repository at this point in the history
Allow (and test) PHP 8.0 type compatibility
  • Loading branch information
Ocramius authored Dec 30, 2020
2 parents 9a52e83 + 9bad027 commit 7552edc
Show file tree
Hide file tree
Showing 32 changed files with 292 additions and 498 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/demo-scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mutation-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ jobs:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"
include:
- php-version: "8.0"
dependencies: "highest"
operating-system: "ubuntu-latest"

steps:
- name: "Checkout"
Expand All @@ -44,15 +49,15 @@ jobs:

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

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

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

- name: "Tests"
run: "vendor/bin/phpunit"
2 changes: 1 addition & 1 deletion .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/xulieta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
dependencies:
- "locked"
php-version:
- "7.4"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand Down
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@
}
],
"require": {
"php": "~7.4.1",
"laminas/laminas-code": "^3.4.1",
"php": "~7.4.1 || ~8.0.0",
"laminas/laminas-code": "^4.0.0",
"composer-runtime-api": "^2.0.0",
"webimpress/safe-writer": "^2.0.1"
},
"conflict": {
"zendframework/zend-stdlib": "<3.2.1",
"laminas/laminas-stdlib": "<3.2.1",
"doctrine/annotations": "<1.6.1"
"doctrine/annotations": "<1.6.1",
"thecodingmachine/safe": "<1.3.3"
},
"require-dev": {
"ext-phar": "*",
Expand All @@ -36,7 +37,7 @@
"slevomat/coding-standard": "^6.3.10",
"doctrine/coding-standard": "^8.1.0",
"nikic/php-parser": "^4.6.0",
"phpbench/phpbench": "^0.17.1",
"phpbench/phpbench": "^0.17.1 || 1.0.0-alpha2",
"infection/infection": "^0.20.2",
"vimeo/psalm": "^4.3.2",
"codelicia/xulieta": "^0.1.5"
Expand Down
Loading

0 comments on commit 7552edc

Please sign in to comment.