Skip to content

Commit

Permalink
Merge pull request #3 from creative-commoners/pulls/2/carets
Browse files Browse the repository at this point in the history
DEP Use carets instead of dev requirements and use phpunit 9
  • Loading branch information
Maxime Rainville authored Nov 23, 2021
2 parents e0ed8d4 + 6110f07 commit 91d2a3c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import:

env:
global:
- REQUIRE_EXTRA="silverstripe/versioned:1.x-dev"
- REQUIRE_EXTRA="silverstripe/versioned:^1"
- PHPUNIT_SUITE="recipe-ccl"
14 changes: 8 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@
"homepage": "https://silverstripe.org",
"license": "BSD-3-Clause",
"require": {
"php": "^7.3 || ^8.0",
"silverstripe/recipe-plugin": "^1",
"silverstripe/recipe-core": "4.x-dev",
"cwp/cwp-core": "2.x-dev",
"silverstripe/auditor": "2.x-dev",
"silverstripe/environmentcheck": "2.x-dev",
"silverstripe/hybridsessions": "2.x-dev"
"silverstripe/recipe-core": "^4",
"cwp/cwp-core": "^2",
"silverstripe/auditor": "^2",
"silverstripe/environmentcheck": "^2",
"silverstripe/hybridsessions": "^2"
},
"require-dev": {
"sminnee/phpunit": "^5.7"
"phpunit/phpunit": "^9.5",
"silverstripe/framework": "^4.10"
},
"extra": {
"project-files": [
Expand Down
16 changes: 9 additions & 7 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
<testsuite name="recipe-ccl">
<directory>vendor/cwp/cwp-core/tests</directory>
<directory>vendor/silverstripe/auditor/tests</directory>
<directory>vendor/silverstripe/environmentcheck/tests</directory>
<directory>vendor/silverstripe/hybridsessions/tests</directory>
<directory>vendor/silverstripe/mimevalidator/tests</directory>
</testsuite>
<testsuites>
<testsuite name="recipe-ccl">
<directory>vendor/cwp/cwp-core/tests</directory>
<directory>vendor/silverstripe/auditor/tests</directory>
<directory>vendor/silverstripe/environmentcheck/tests</directory>
<directory>vendor/silverstripe/hybridsessions/tests</directory>
<directory>vendor/silverstripe/mimevalidator/tests</directory>
</testsuite>
</testsuites>
</phpunit>

0 comments on commit 91d2a3c

Please sign in to comment.