mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-22 17:05:33 +02:00
Merge 3.3 into 3
This commit is contained in:
commit
4920218155
@ -10,7 +10,8 @@
|
|||||||
"silverstripe-themes/simple": "3.1.*"
|
"silverstripe-themes/simple": "3.1.*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/PHPUnit": "~3.7"
|
"ext-tidy": "*",
|
||||||
|
"phpunit/PHPUnit": "~3.7@stable"
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
<directory>mysite/tests</directory>
|
<directory>mysite/tests</directory>
|
||||||
<directory>cms/tests</directory>
|
<directory>cms/tests</directory>
|
||||||
<directory>framework/tests</directory>
|
<directory>framework/tests</directory>
|
||||||
|
<directory>framework/admin/tests</directory>
|
||||||
</testsuite>
|
</testsuite>
|
||||||
|
|
||||||
<listeners>
|
<listeners>
|
||||||
@ -33,4 +34,4 @@
|
|||||||
<group>sanitychecks</group>
|
<group>sanitychecks</group>
|
||||||
</exclude>
|
</exclude>
|
||||||
</groups>
|
</groups>
|
||||||
</phpunit>
|
</phpunit>
|
||||||
|
Loading…
Reference in New Issue
Block a user