8000 [PhpUnitBrige] Fix current failures · symfony/symfony@aa3228e · GitHub
[go: up one dir, main page]
Skip to content

Commit aa3228e

Browse files
nicolas-grekasnicolas-grekas
committed
[PhpUnitBrige] Fix current failures
1 parent c2a0bcf commit aa3228e

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

‎.travis.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ env:
2020
matrix:
2121
include:
2222
# Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
23-
- php: hhvm-3.15
24-
sudo: required
25-
dist: trusty
26-
group: edge
23+
#- php: hhvm-3.15
24+
# sudo: required
25+
# dist: trusty
26+
# group: edge
2727
- php: 5.5
28-
- php: 5.6
29-
- php: 7.0
30-
env: deps=high
31-
- php: 7.1
32-
env: deps=low
28+
#- php: 5.6
29+
#- php: 7.0
30+
# env: deps=high
31+
#- php: 7.1
32+
# env: deps=low
3333
fast_finish: true
3434

3535
cache:
3636
directories:
37-
- .phpunit
37+
#- .phpunit
3838
- php-$MIN_PHP
3939

4040
services:
@@ -49,7 +49,7 @@ before_install:
4949
# Matrix lines for intermediate PHP versions are skipped for pull requests
5050
- if [[ ! $deps && ! $PHP = ${MIN_PHP%.*} && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then deps=skip; skip=1; fi
5151
# A sigchild-enabled-PHP is used to test the Process component on the lowest PHP matrix line
52-
- if [[ ! $deps && $PHP = ${MIN_PHP%.*} && ! -d php-$MIN_PHP/sapi ]]; then wget http://museum.php.net/php5/php-$MIN_PHP.tar.bz2 -O - | tar -xj; (cd php-$MIN_PHP; ./configure --enable-sigchild --enable-pcntl; make -j2); fi
52+
# - if [[ ! $deps && $PHP = ${MIN_PHP%.*} && ! -d php-$MIN_PHP/sapi ]]; then wget http://museum.php.net/php5/php-$MIN_PHP.tar.bz2 -O - | tar -xj; (cd php-$MIN_PHP; ./configure --enable-sigchild --enable-pcntl; make -j2); fi
5353
- if [[ ! $PHP = hhvm* ]]; then INI_FILE=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; else INI_FILE=/etc/hhvm/php.ini; fi
5454
- if [[ ! $skip ]]; then echo date.timezone = Europe/Paris >> $INI_FILE; fi
5555
- if [[ ! $skip ]]; then echo memory_limit = -1 >> $INI_FILE; fi
@@ -86,6 +86,8 @@ install:
8686
- if [[ ! $skip && $deps ]]; then export SYMFONY_DEPRECATIONS_HELPER=weak; fi
8787
- if [[ ! $skip && $deps ]]; then mv composer.json.phpunit composer.json; fi
8888
- if [[ ! $skip ]]; then composer update; fi
89+
- if [[ ! $skip ]]; then cp src/Symfony/Bridge/PhpUnit/bin/simple-phpunit vendor/symfony/phpunit-bridge/bin/simple-phpunit; fi
90+
- if [[ -e .phpunit ]]; then rm -Rf .phpunit; fi
8991
- if [[ ! $skip ]]; then ./phpunit install; fi
9092
- if [[ ! $skip && ! $PHP = hhvm* ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi
9193

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
3434

3535
@mkdir($PHPUNIT_DIR);
3636
chdir($PHPUNIT_DIR);
37+
echo getcwd(), "\n";
3738
if (file_exists("phpunit-$PHPUNIT_VERSION")) {
3839
passthru(sprintf('\\' === DIRECTORY_SEPARATOR ? '(del /S /F /Q %s & rmdir %1$s) >nul': 'rm -rf %s', "phpunit-$PHPUNIT_VERSION"));
3940
}
@@ -48,14 +49,14 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
4849
$zip->extractTo(getcwd());
4950
$zip->close();
5051
chdir("phpunit-$PHPUNIT_VERSION");
51-
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
52-
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");
53-
proc_close(proc_open("$COMPOSER remove --no-update ".(getenv('SYMFONY_PHPUNIT_REMOVE') ?: 'phpspec/prophecy symfony/yaml'), array(), $p));
52+
passthru("pwd && $COMPOSER remove --no-update ".(getenv('SYMFONY_PHPUNIT_REMOVE') ?: 'phpspec/prophecy symfony/yaml'));
5453
if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
5554
passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
5655
}
57-
proc_close(proc_open("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.2@dev\"", array(), $p));
58-
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p));
56+
passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.2@dev\"");
57+
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
58+
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");
59+
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, null, null, array('bypass_shell' => true)));
5960
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
6061
if ($exit) {
6162
exit($exit);

0 commit comments

Comments
 (0)
0