[ticket/10981] Added goutte via composer

composer.phar added and autoloaded before tests

PHPBB3-10981
This commit is contained in:
Fyorl 2012-07-16 17:33:05 +01:00
parent 8f5182bf84
commit 797ee16eaf
6 changed files with 76 additions and 2 deletions

BIN
composer.phar Executable file

Binary file not shown.

6
phpBB/composer.json Normal file
View file

@ -0,0 +1,6 @@
{
"minimum-stability": "beta",
"require-dev": {
"fabpot/goutte": "1.0.x-dev"
}
}

55
phpBB/composer.lock generated Normal file
View file

@ -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
}
}

View file

@ -22,5 +22,20 @@ require_once 'test_framework/phpbb_database_test_connection_manager.php';
if (version_compare(PHP_VERSION, '5.3.0-dev', '>='))
{
if (getenv('PHPBB_NO_COMPOSER_AUTOLOAD'))
{
if (getenv('PHPBB_AUTOLOAD'))
{
require(getenv('PHPBB_AUTOLOAD'));
}
}
else
{
if (!file_exists($phpbb_root_path . 'vendor/autoload.php'))
{
trigger_error('You have not set up composer dependencies. See http://getcomposer.org/.', E_USER_ERROR);
}
require($phpbb_root_path . 'vendor/autoload.php');
}
require_once 'test_framework/phpbb_functional_test_case.php';
}

View file

@ -36,8 +36,6 @@ class phpbb_functional_test_case extends phpbb_test_case
{
self::markTestSkipped('phar extension is not loaded');
}
require_once 'phar://' . __DIR__ . '/../../vendor/goutte.phar';
}
public function setUp()

BIN
vendor/goutte.phar vendored

Binary file not shown.