mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-03 05:12:37 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock
This commit is contained in:
Nils Adermann
2013-05-09 19:42:13 +02:00
parent dbb4a87b79 3fb536d7b7
commit 3327739290
6 changed files with 435 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/composer.json
View File

@@ -9,6 +9,8 @@
"symfony/yaml": "2.1.*"
},
"require-dev": {
"fabpot/goutte": "v0.1.0"
"fabpot/goutte": "v0.1.0",
"phpunit/dbunit": "1.2.*",
"phpunit/phpunit": "3.7.*"
}
}