Permalink
Browse files

Merged pull request #369

  • Loading branch information...
derickr committed Oct 17, 2017
2 parents eca4bfd + 6f90bb1 commit d0dc4c415522e000d595cb047085d665e257ba5f
Showing with 3 additions and 1 deletion.
  1. +1 −0 tests/bug00886-php5.phpt
  2. +1 −0 tests/bug00886-php7.phpt
  3. +1 −1 tests/dbgp/dbgpclient.php
View
@@ -2,6 +2,7 @@
Test for bug #886: Use the same file system protocol for file located inside PHAR in both directions (< PHP 7.0)
--SKIPIF--
<?php if (getenv("SKIP_DBGP_TESTS")) { exit("skip Excluding DBGp tests"); } ?>
<?php if (getenv("SKIP_SLOW_TESTS")) { exit("skip Excluding slow tests"); } ?>
<?php if (!version_compare(phpversion(), "7.0", '<')) echo "skip < PHP 7.0 needed\n"; ?>
--INI--
xdebug.auto_trace=0
View
@@ -2,6 +2,7 @@
Test for bug #886: Use the same file system protocol for file located inside PHAR in both directions (>= PHP 7.0)
--SKIPIF--
<?php if (getenv("SKIP_DBGP_TESTS")) { exit("skip Excluding DBGp tests"); } ?>
<?php if (getenv("SKIP_SLOW_TESTS")) { exit("skip Excluding slow tests"); } ?>
<?php if (!version_compare(phpversion(), "7.0", '>=')) echo "skip >= PHP 7.0 needed\n"; ?>
--INI--
xdebug.auto_trace=0
@@ -70,7 +70,7 @@ private function launchPhp( &$pipes, array $ini_options = null )
$ini_options = array();
}
$options = '';
$options = (getenv('TEST_PHP_ARGS') ?: '');
$ini_options = array_merge( $default_options, $ini_options );
foreach ( $ini_options as $key => $value )
{

0 comments on commit d0dc4c4

Please sign in to comment.