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 'ticket/12429' into ticket/12429-develop

Browse Source 
* ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
This commit is contained in:
Andreas Fischer
2014-05-02 20:28:58 +02:00
parent ab1c181620 30dc3afb69
commit 0cee35aeef
2 changed files with 374 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/composer.json
View File

@@ -16,8 +16,8 @@
},
"require-dev": {
"fabpot/goutte": "1.0.*",
"phpunit/dbunit": "1.2.*",
"phpunit/phpunit": "3.7.*",
"phpunit/dbunit": "1.3.*",
"phpunit/phpunit": "4.1.*",
"phing/phing": "2.4.*",
"squizlabs/php_codesniffer": "1.*"
}