From a6bb44bf8851b9718169653bf08a4113594b6012 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 6 Aug 2020 14:54:32 +0900 Subject: [PATCH] Convert PHP_EOL to \n for consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit adf067e 보완 - classes 내에서 사용하는 PHP_EOL을 \n으로 교체 - common/framework/debug.php, common/scripts 내의 스크립트들은 OS에 맞춰야 하므로 수정하지 않음 --- classes/context/Context.class.php | 6 +++--- classes/display/DisplayHandler.class.php | 6 +++--- classes/display/VirtualXMLDisplayHandler.php | 2 +- classes/extravar/Extravar.class.php | 2 +- classes/template/TemplateHandler.class.php | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index d290fa42a..caed1ae11 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -2459,7 +2459,7 @@ class Context */ public static function addHtmlHeader($header) { - self::$_instance->html_header .= (self::$_instance->html_header ? PHP_EOL : '') . $header; + self::$_instance->html_header .= (self::$_instance->html_header ? "\n" : '') . $header; } public static function clearHtmlHeader() @@ -2506,7 +2506,7 @@ class Context */ public static function addBodyHeader($header) { - self::$_instance->body_header .= (self::$_instance->body_header ? PHP_EOL : '') . $header; + self::$_instance->body_header .= (self::$_instance->body_header ? "\n" : '') . $header; } /** @@ -2526,7 +2526,7 @@ class Context */ public static function addHtmlFooter($footer) { - self::$_instance->html_footer .= (self::$_instance->html_footer ? PHP_EOL : '') . $footer; + self::$_instance->html_footer .= (self::$_instance->html_footer ? "\n" : '') . $footer; } /** diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index d4fc3445e..3da0e07b8 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -274,7 +274,7 @@ class DisplayHandler extends Handler $data = Rhymix\Framework\Debug::getDebugData(); $display_content = array_fill_keys(config('debug.display_content'), true); include RX_BASEDIR . 'common/tpl/debug_comment.html'; - $content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . PHP_EOL; + $content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . "\n"; if ($display_type === 'file') { $log_filename = config('debug.log_filename') ?: 'files/debug/YYYYMMDD.php'; @@ -293,12 +293,12 @@ class DisplayHandler extends Handler { $phpheader = ''; } - FileHandler::writeFile($log_filename, $phpheader . $content . PHP_EOL, 'a'); + FileHandler::writeFile($log_filename, $phpheader . $content . "\n", 'a'); $debug_output .= ''; } else { - $debug_output .= '' . PHP_EOL; + $debug_output .= '' . "\n"; } } } diff --git a/classes/display/VirtualXMLDisplayHandler.php b/classes/display/VirtualXMLDisplayHandler.php index 124818aaa..92095cbb0 100644 --- a/classes/display/VirtualXMLDisplayHandler.php +++ b/classes/display/VirtualXMLDisplayHandler.php @@ -61,7 +61,7 @@ class VirtualXMLDisplayHandler $html[] = ''; $html[] = ''; - return join(PHP_EOL, $html); + return join("\n", $html); } } diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php index d5268b388..a852cf342 100644 --- a/classes/extravar/Extravar.class.php +++ b/classes/extravar/Extravar.class.php @@ -488,7 +488,7 @@ class ExtraItem $buff[] = '

' . escape($this->desc, false) . '

'; } - return join(PHP_EOL, $buff); + return join("\n", $buff); } } diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 0ca8531e5..4616fa8b1 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -367,7 +367,7 @@ class TemplateHandler // Insert template path comment tag. if(Rhymix\Framework\Debug::isEnabledForCurrentUser() && Context::getResponseMethod() === 'HTML' && !starts_with('web_path . $this->filename . ' -->' . PHP_EOL; + $sign = "\n" . '' . "\n"; $contents = sprintf($sign, 'start') . $contents . sprintf($sign, 'end'); }