Skip to content

Commit 4dd368f

Browse files
jrfnlsirbrillig
authored andcommitted
Composer: make the PHPUnit requirements more flexible (#114)
... and the same across configs. Composer will sort out which version will actually be installed.
1 parent 1ff7831 commit 4dd368f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

composer.circleci.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"php" : ">=5.6.0"
3636
},
3737
"require-dev": {
38-
"phpunit/phpunit": "^5.0",
38+
"phpunit/phpunit": "^5.0 || ^6.5",
3939
"squizlabs/php_codesniffer": "^3.1"
4040
}
4141
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"require-dev": {
4141
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4 || ^0.5",
42-
"phpunit/phpunit": "^6.5",
42+
"phpunit/phpunit": "^5.0 || ^6.5",
4343
"sirbrillig/phpcs-import-detection": "^1.1",
4444
"limedeck/phpunit-detailed-printer": "^3.1",
4545
"phpstan/phpstan": "^0.11.8"

0 commit comments

Comments
 (0)