Merge branch 'PHP-7.2' into PHP-7.3

This commit is contained in:
Nikita Popov 2019-06-13 12:38:57 +02:00
commit ee137a7033
5 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,22 @@
--TEST--
Bug #78106: PHP Fatal error: Uncaught Error: Class 'Phpfastcache\Config\Config' not found
--XFAIL--
Not fixed yet
--FILE--
<?php
include __DIR__ . "/php_cli_server.inc";
php_cli_server_start(getenv('TEST_PHP_EXTRA_ARGS'));
echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/bug78106_test1.php" );
echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/bug78106_test2.php" );
echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/bug78106_test1.php" );
?>
--EXPECT--
included
done
included
done
included
done

View File

@ -0,0 +1,3 @@
<?php
echo "included\n";

View File

@ -0,0 +1,6 @@
<?php
ini_set('opcache.enable', 0);
require_once 'bug78106_include.inc';
echo "done\n";

View File

@ -0,0 +1,5 @@
<?php
require_once 'bug78106_include.inc';
echo "done\n";

View File

@ -818,7 +818,7 @@ HELP;
if (substr(PHP_OS, 0, 3) == "WIN") {
$pass_options .= " -c " . escapeshellarg($conf_passed);
} else {
$pass_options .= " -c '$conf_passed'";
$pass_options .= " -c '" . realpath($conf_passed) . "'";
}
}
@ -1600,6 +1600,8 @@ TEST $file
settings2params($ini_settings);
$env['TEST_PHP_EXTRA_ARGS'] = $pass_options . ' ' . $ini_settings;
// Check if test should be skipped.
$info = '';
$warn = false;