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

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer

Conflicts:
	.travis.yml
	composer.phar
	phpBB/composer.json
	phpBB/composer.lock
	tests/bootstrap.php
This commit is contained in:
Andreas Fischer
2012-07-19 16:59:45 +02:00
parent 8b230f59db 3bbb882fe8
commit db7b879b82
6 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/composer.json
View File

@@ -1,5 +1,9 @@
{
"require": {
"symfony/event-dispatcher": "2.0.*"
}
"minimum-stability": "beta",
"require": {
"symfony/event-dispatcher": "2.1.*"
},
"require-dev": {
"fabpot/goutte": "1.0.x-dev"
}
}