mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
# By Igor Wiedler (1) and others
* develop-olympus:
  [ticket/11671] Update composer.lock
  [ticket/11671] Add phing as a dependency and upgrade deps
  [ticket/11668] Move lint test to the end for travis

Conflicts:
	phpBB/composer.lock
This commit is contained in:
Nathaniel Guse
2013-07-13 10:28:02 -05:00
parent 1584fdd26d b1b37ddde2
commit fd10d97cb1
4 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
travis/phpunit-postgres-travis.xml
View File

@@ -15,6 +15,10 @@
<testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory>
<exclude>tests/functional</exclude>
<exclude>tests/lint_test.php</exclude>
</testsuite>
<testsuite name="phpBB Lint Test">
<file>tests/lint_test.php</file>
</testsuite>
<testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>