File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
src/Symfony/Component/Process/Tests Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ services: mongodb
32
32
33
33
before_install :
34
34
- if [[ ! $deps && ! $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} && $TRAVIS_PHP_VERSION != hhvm && $TRAVIS_PULL_REQUEST != false ]]; then deps=skip; fi;
35
- - if [[ ! $deps && ! -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;
35
+ - if [[ ! $deps && $TRAVIS_PHP_VERSION = ${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;
36
36
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then INI_FILE=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; else INI_FILE=/etc/hhvm/php.ini; fi;
37
37
- echo memory_limit = -1 >> $INI_FILE
38
38
- echo session.gc_probability = 0 >> $INI_FILE
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ public function testFindWithOpenBaseDir()
99
99
$ this ->markTestSkipped ('Cannot test when open_basedir is set ' );
100
100
}
101
101
102
- $ this ->iniSet ('open_basedir ' , dirname (PHP_BINARY ).(!defined ('HHVM_VERSION ' ) ? PATH_SEPARATOR .'/ ' : '' ));
102
+ $ this ->iniSet ('open_basedir ' , dirname (PHP_BINARY ).(!defined ('HHVM_VERSION ' ) || HHVM_VERSION_ID >= 30800 ? PATH_SEPARATOR .'/ ' : '' ));
103
103
104
104
$ finder = new ExecutableFinder ();
105
105
$ result = $ finder ->find ($ this ->getPhpBinaryName ());
@@ -120,7 +120,7 @@ public function testFindProcessInOpenBasedir()
120
120
}
121
121
122
122
$ this ->setPath ('' );
123
- $ this ->iniSet ('open_basedir ' , PHP_BINARY .(!defined ('HHVM_VERSION ' ) ? PATH_SEPARATOR .'/ ' : '' ));
123
+ $ this ->iniSet ('open_basedir ' , PHP_BINARY .(!defined ('HHVM_VERSION ' ) || HHVM_VERSION_ID >= 30800 ? PATH_SEPARATOR .'/ ' : '' ));
124
124
125
125
$ finder = new ExecutableFinder ();
126
126
$ result = $ finder ->find ($ this ->getPhpBinaryName (), false );
You can’t perform that action at this time.
0 commit comments