8000 minor #29776 remove no longer needed PHP version checks (xabbuh) · symfony/symfony@3ee1adb · GitHub
[go: up one dir, main page]

Skip to content

Commit 3ee1adb

Browse files
committed
minor #29776 remove no longer needed PHP version checks (xabbuh)
This PR was merged into the 3.4 branch. Discussion ---------- remove no longer needed PHP version checks | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 99448c6 remove no longer needed PHP version checks
2 parents b645c07 + 99448c6 commit 3ee1adb

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/build-packages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
$mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
1717

1818
$packages = array();
19-
$flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0;
19+
$flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
2020

2121
foreach ($dirs as $k => $dir) {
2222
if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {

src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,8 @@ public function testFlushNothingWhenDataDumperIsProvided()
125125
$collector->dump($data);
126126
$line = __LINE__ - 1;
127127
$output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean());
128-
if (\PHP_VERSION_ID >= 50400) {
129-
$this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output);
130-
} else {
131-
$this->assertSame("\"DumpDataCollectorTest.php on line {$line}:\"\n456\n", $output);
132-
}
128+
129+
$this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output);
133130

134131
ob_start();
135132
$collector->__destruct();

0 commit comments

Comments
 (0)
0