tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-06-14 16:51:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge 3.1 into 3.2

Browse Source 
# Conflicts:
#	composer.json
This commit is contained in:
Damian Mooyman 2016-05-11 13:55:23 +12:00
commit 4ba8fda822
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -10,7 +10,8 @@
"silverstripe-themes/simple": "3.1.*"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7"
"ext-tidy": "*",
"phpunit/PHPUnit": "~3.7@stable"
},
"config": {
"process-timeout": 600

3
phpunit.xml.dist
View File

@ -22,6 +22,7 @@
<directory>mysite/tests</directory>
<directory>cms/tests</directory>
<directory>framework/tests</directory>
<directory>framework/admin/tests</directory>
</testsuite>
<listeners>
@ -33,4 +34,4 @@
<group>sanitychecks</group>
</exclude>
</groups>
</phpunit>
</phpunit>