Skip to content

Commit c3f4497

Browse files
authored
Merge pull request #71 from tezhm/php-8-support
Adding PHP 8 support
2 parents 631967a + 24b5a87 commit c3f4497

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ jobs:
66
name: PHP ${{ matrix.php }} - doctrine/orm ${{ matrix.orm }}
77
strategy:
88
matrix:
9-
php: ['7.2', '7.3', '7.4']
10-
orm: ['2.6.0', '2.7.0']
9+
php: ['7.2', '7.3', '7.4', '8.0']
10+
orm: ['2.6.0', '2.7.0', '2.8.0']
11+
exclude:
12+
- php: '8.0'
13+
orm: '2.6.0'
14+
- php: '8.0'
15+
orm: '2.7.0'
1116
steps:
1217
- uses: actions/checkout@v2
1318
- name: Setup PHP

.scrutinizer.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ tools:
33
timeout: 600
44
runs: 4
55
build:
6+
environment:
7+
variables:
8+
XDEBUG_MODE: 'coverage'
69
tests:
710
override:
811
-
9-
command: 'phpunit --coverage-clover=phpunit-coverage.xml'
12+
command: 'vendor/bin/phpunit --coverage-clover=phpunit-coverage.xml'
1013
coverage:
1114
file: 'phpunit-coverage.xml'
1215
format: 'php-clover'

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
}
2424
],
2525
"require": {
26-
"php": ">=7",
27-
"doctrine/orm": "~2.6.0|~2.7.0",
26+
"php": "^7.2|^8.0",
27+
"doctrine/orm": "~2.6.0|~2.7.0|~2.8.0",
2828
"doctrine/inflector": "^1.1",
2929
"doctrine/persistence": "^1.3.5|^2.0"
3030
},

0 commit comments

Comments
 (0)