diff options
author | Fyorl <gaelreth@gmail.com> | 2012-07-16 17:33:05 +0100 |
---|---|---|
committer | Fyorl <gaelreth@gmail.com> | 2012-07-16 17:52:03 +0100 |
commit | 797ee16eaf2e8dc562185cd940351bcfd311cf53 (patch) | |
tree | 2b1802004926689b92f6372300bb3efd26d44951 | |
parent | Merge branch 'prep-release-3.0.11' into develop-olympus (diff) | |
download | phpbb-797ee16eaf2e8dc562185cd940351bcfd311cf53.tar.gz phpbb-797ee16eaf2e8dc562185cd940351bcfd311cf53.tar.bz2 phpbb-797ee16eaf2e8dc562185cd940351bcfd311cf53.zip |
[ticket/10981] Added goutte via composer
composer.phar added and autoloaded before tests
PHPBB3-10981
-rwxr-xr-x | composer.phar | bin | 0 -> 533673 bytes | |||
-rw-r--r-- | phpBB/composer.json | 6 | ||||
-rw-r--r-- | phpBB/composer.lock | 55 | ||||
-rw-r--r-- | tests/bootstrap.php | 15 | ||||
-rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 2 | ||||
-rw-r--r-- | vendor/goutte.phar | bin | 267414 -> 0 bytes |
6 files changed, 76 insertions, 2 deletions
diff --git a/composer.phar b/composer.phar Binary files differnew file mode 100755 index 0000000000..8b6eddbf21 --- /dev/null +++ b/composer.phar 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 + } +} diff --git a/tests/bootstrap.php b/tests/bootstrap.php index d6c5d25bc8..d687db622a 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -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'; } diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 76fed76fae..2b6a6aaf29 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -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() diff --git a/vendor/goutte.phar b/vendor/goutte.phar Binary files differdeleted file mode 100644 index 20b7166a67..0000000000 --- a/vendor/goutte.phar +++ /dev/null |