mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-22 17:41:24 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3336 from nickvergessen/ticket/13543

Browse Source 
Ticket/13543
This commit is contained in:
Marc Alexander
2015-01-24 21:52:56 +01:00
parent 9cdbb69f9e b2674cf1f6
commit a2fbde44c0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@@ -16,6 +16,8 @@ matrix:
env: DB=postgres env: DB=postgres
- php: 5.4 - php: 5.4
env: DB=sqlite3 env: DB=sqlite3
- php: 5.4
env: DB=mysqli;SLOWTESTS=1
- php: 5.5 - php: 5.5
env: DB=mysqli env: DB=mysqli
- php: 5.6 - php: 5.6
@@ -41,6 +43,7 @@ script:
- travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION
- travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION
- travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./ - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./
- phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml - sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
- sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"

4
tests/functions/get_remote_file_test.php
View File

@@ -21,6 +21,10 @@ class phpbb_functions_get_remote_file extends phpbb_test_case
{ {
public function test_version_phpbb_com() public function test_version_phpbb_com()
{ {
global $phpbb_container;
$phpbb_container = new phpbb_mock_container_builder();
$phpbb_container->set('file_downloader', new \phpbb\file_downloader());
$hostname = 'version.phpbb.com'; $hostname = 'version.phpbb.com';
if (!phpbb_checkdnsrr($hostname, 'A')) if (!phpbb_checkdnsrr($hostname, 'A'))