Skip to content

Commit 1f17b07

Browse files
authored
Merge pull request #390 from alcaeus/php-8-support
[3.0] Add support for PHP 8
2 parents 4a22949 + b31e69f commit 1f17b07

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
include:
3131
- deps: "low"
3232
php-version: "7.2"
33+
- deps: "dev"
34+
php-version: "8.0"
3335

3436
steps:
3537
- name: "Checkout"
@@ -51,14 +53,13 @@ jobs:
5153
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
5254
restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
5355

54-
# to be removed when doctrine/orm adds support for PHP 8
55-
- name: "Pretend this is PHP 7.4"
56-
run: "composer config platform.php 7.4.99"
57-
if: "${{ matrix.php-version == '8.0' }}"
56+
- name: "Allow installing dev dependencies"
57+
run: "composer config minimum-stability dev"
58+
if: "${{ matrix.deps == 'dev' }}"
5859

5960
- name: "Install dependencies with composer"
6061
run: "composer update --no-interaction --prefer-dist"
61-
if: "${{ matrix.deps == 'normal' }}"
62+
if: "${{ matrix.deps != 'low' }}"
6263

6364
- name: "Install lowest possible dependencies with composer"
6465
run: "composer update --no-interaction --prefer-dist --prefer-lowest"

composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
],
2222
"require": {
23-
"php": "^7.2",
23+
"php": "^7.2|^8.0",
2424
"symfony/framework-bundle": "~3.4|~4.0|~5.0",
2525
"doctrine/doctrine-bundle": "~1.0|~2.0",
2626
"doctrine/migrations": "~3.0"
@@ -43,11 +43,6 @@
4343
"autoload-dev": {
4444
"psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\Tests\\": "Tests" }
4545
},
46-
"config": {
47-
"platform": {
48-
"php": "7.2.5"
49-
}
50-
},
5146
"extra": {
5247
"branch-alias": {
5348
"dev-master": "3.0.x-dev"

0 commit comments

Comments
 (0)