diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-19 16:40:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-19 16:40:33 +0200 |
| commit | 3bbb882fe8b9c894e9ad6cf9b4c42b590b8b3fe2 (patch) | |
| tree | 427377489c148b339fc179f9461b9f19ec23199c /phpBB | |
| parent | eeef82ecc585caab1298f3559ccb8f615a89e706 (diff) | |
| parent | aa2f7bcc2c56fdd82cb07e9794d6114d4b2c359c (diff) | |
| download | forums-3bbb882fe8b9c894e9ad6cf9b4c42b590b8b3fe2.tar forums-3bbb882fe8b9c894e9ad6cf9b4c42b590b8b3fe2.tar.gz forums-3bbb882fe8b9c894e9ad6cf9b4c42b590b8b3fe2.tar.bz2 forums-3bbb882fe8b9c894e9ad6cf9b4c42b590b8b3fe2.tar.xz forums-3bbb882fe8b9c894e9ad6cf9b4c42b590b8b3fe2.zip | |
Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympus
* Fyorl/ticket/10981:
[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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.json | 6 | ||||
| -rw-r--r-- | phpBB/composer.lock | 55 |
2 files changed, 61 insertions, 0 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json new file mode 100644 index 0000000000..c2811ad1d7 --- /dev/null +++ b/phpBB/composer.json @@ -0,0 +1,6 @@ +{ + "minimum-stability": "beta", + "require-dev": { + "fabpot/goutte": "1.0.x-dev" + } +} diff --git a/phpBB/composer.lock b/phpBB/composer.lock new file mode 100644 index 0000000000..9f2195e70a --- /dev/null +++ b/phpBB/composer.lock @@ -0,0 +1,55 @@ +{ + "hash": "a5d02c59e3a91c84c1a96aca0f1ae81a", + "packages": [ + + ], + "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/event-dispatcher", + "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 + } +} |