Merge pull request #6582 from ddevsr/fix-inconsistent-newline

Author: MGatner

system/Helpers/date_helper.php

@@ -54,13 +54,13 @@ function timezone_select(string $class = '', string $default = '', int $what = D
     {
         $timezones = DateTimeZone::listIdentifiers($what, $country);
 
-        $buffer = "<select name='timezone' class='{$class}'>" . PHP_EOL;
+        $buffer = "<select name='timezone' class='{$class}'>\n";
 
         foreach ($timezones as $timezone) {
             $selected = ($timezone === $default) ? 'selected' : '';
-            $buffer .= "<option value='{$timezone}' {$selected}>{$timezone}</option>" . PHP_EOL;
+            $buffer .= "<option value='{$timezone}' {$selected}>{$timezone}</option>\n";
         }
 
-        return $buffer . ('</select>' . PHP_EOL);
+        return $buffer . ("</select>\n");
     }
 }

tests/system/Helpers/DateHelperTest.php

@@ -40,14 +40,14 @@ public function testTimezoneSelectDefault()
     {
         $timezones = DateTimeZone::listIdentifiers(DateTimeZone::ALL, null);
 
-        $expected = "<select name='timezone' class='custom-select'>" . PHP_EOL;
+        $expected = "<select name='timezone' class='custom-select'>\n";
 
         foreach ($timezones as $timezone) {
             $selected = ($timezone === 'Asia/Jakarta') ? 'selected' : '';
-            $expected .= "<option value='{$timezone}' {$selected}>{$timezone}</option>" . PHP_EOL;
+            $expected .= "<option value='{$timezone}' {$selected}>{$timezone}</option>\n";
         }
 
-        $expected .= ('</select>' . PHP_EOL);
+        $expected .= ("</select>\n");
 
         $this->assertSame($expected, timezone_select('custom-select', 'Asia/Jakarta'));
     }
@@ -57,14 +57,14 @@ public function testTimezoneSelectSpecific()
         $spesificRegion = DateTimeZone::ASIA;
         $timezones      = DateTimeZone::listIdentifiers($spesificRegion, null);
 
-        $expected = "<select name='timezone' class='custom-select'>" . PHP_EOL;
+        $expected = "<select name='timezone' class='custom-select'>\n";
 
         foreach ($timezones as $timezone) {
             $selected = ($timezone === 'Asia/Jakarta') ? 'selected' : '';
-            $expected .= "<option value='{$timezone}' {$selected}>{$timezone}</option>" . PHP_EOL;
+            $expected .= "<option value='{$timezone}' {$selected}>{$timezone}</option>\n";
         }
 
-        $expected .= ('</select>' . PHP_EOL);
+        $expected .= ("</select>\n");
 
         $this->assertSame($expected, timezone_select('custom-select', 'Asia/Jakarta', $spesificRegion));
     }
@@ -75,14 +75,14 @@ public function testTimezoneSelectSingle()
         $country        = 'ID';
         $timezones      = DateTimeZone::listIdentifiers($spesificRegion, $country);
 
-        $expected = "<select name='timezone' class='custom-select'>" . PHP_EOL;
+        $expected = "<select name='timezone' class='custom-select'>\n";
 
         foreach ($timezones as $timezone) {
             $selected = ($timezone === 'Asia/Jakarta') ? 'selected' : '';
-            $expected .= "<option value='{$timezone}' {$selected}>{$timezone}</option>" . PHP_EOL;
+            $expected .= "<option value='{$timezone}' {$selected}>{$timezone}</option>\n";
         }
 
-        $expected .= ('</select>' . PHP_EOL);
+        $expected .= ("</select>\n");
 
         $this->assertSame($expected, timezone_select('custom-select', 'Asia/Jakarta', $spesificRegion, $country));
     }