diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-19 16:59:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-19 16:59:45 +0200 |
| commit | db7b879b8221fc1d1989e00645cb08f2866d9c10 (patch) | |
| tree | 01f09b1b7e37bd3bf79ce663a13d6c515c2ada3c /phpBB | |
| parent | 8b230f59db87190f9209ff965c01eb72466f45d2 (diff) | |
| parent | 3bbb882fe8b9c894e9ad6cf9b4c42b590b8b3fe2 (diff) | |
| download | forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.tar forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.tar.gz forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.tar.bz2 forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.tar.xz forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.zip | |
Merge branch 'develop-olympus' into develop
* 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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.json | 10 | ||||
| -rw-r--r-- | phpBB/composer.lock | 50 |
2 files changed, 54 insertions, 6 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index 1059b97f84..5340fb85f2 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -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" + } } diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 062ad4b3aa..99e19554ab 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -1,10 +1,54 @@ { - "hash": "9bada3748ec2933fe0864dcfafbcd671", + "hash": "b2daff7465c71d924e915e72454ac266", "packages": [ { "package": "symfony/event-dispatcher", - "version": "v2.0.10" + "version": "v2.1.0-BETA3" } ], - "aliases": [] + "packages-dev": [ + { + "package": "fabpot/goutte", + "version": "dev-master", + "alias-pretty-version": "1.0.x-dev", + "alias-version": "1.0.9999999.9999999-dev" + }, + { + "package": "fabpot/goutte", + "version": "dev-master", + "source-reference": "c2ea8d9a6682d14482e57ede2371001b8a5238d2", + "commit-date": "1340264258" + }, + { + "package": "guzzle/guzzle", + "version": "v2.6.6" + }, + { + "package": "symfony/browser-kit", + "version": "v2.1.0-BETA3" + }, + { + "package": "symfony/css-selector", + "version": "v2.1.0-BETA3" + }, + { + "package": "symfony/dom-crawler", + "version": "v2.1.0-BETA3" + }, + { + "package": "symfony/finder", + "version": "v2.1.0-BETA3" + }, + { + "package": "symfony/process", + "version": "v2.1.0-BETA3" + } + ], + "aliases": [ + + ], + "minimum-stability": "beta", + "stability-flags": { + "fabpot/goutte": 20 + } } |