remove no longer needed PHP version checks
This commit is contained in:
parent
05efd1243f
commit
99448c6e78
2
.github/build-packages.php
vendored
2
.github/build-packages.php
vendored
@ -16,7 +16,7 @@ array_shift($dirs);
|
|||||||
$mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
|
$mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
|
||||||
|
|
||||||
$packages = array();
|
$packages = array();
|
||||||
$flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0;
|
$flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
|
||||||
|
|
||||||
foreach ($dirs as $k => $dir) {
|
foreach ($dirs as $k => $dir) {
|
||||||
if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {
|
if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {
|
||||||
|
@ -125,11 +125,8 @@ EOTXT;
|
|||||||
$collector->dump($data);
|
$collector->dump($data);
|
||||||
$line = __LINE__ - 1;
|
$line = __LINE__ - 1;
|
||||||
$output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean());
|
$output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean());
|
||||||
if (\PHP_VERSION_ID >= 50400) {
|
|
||||||
$this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output);
|
$this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output);
|
||||||
} else {
|
|
||||||
$this->assertSame("\"DumpDataCollectorTest.php on line {$line}:\"\n456\n", $output);
|
|
||||||
}
|
|
||||||
|
|
||||||
ob_start();
|
ob_start();
|
||||||
$collector->__destruct();
|
$collector->__destruct();
|
||||||
|
Reference in New Issue
Block a user