From a334ae5205d8d59435cc3ef72372ac11a8ee1503 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 26 Jan 2025 18:43:50 +0100 Subject: [PATCH] Continued: - string and NULL wasn't a good idea --- .../xml/template/class_XmlRewriterTemplateDecorator.php | 2 +- .../main/classes/template/xml/class_BaseXmlTemplateEngine.php | 4 ++-- .../interfaces/template/xml/class_CompileableXmlTemplate.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/main/classes/decorator/xml/template/class_XmlRewriterTemplateDecorator.php b/framework/main/classes/decorator/xml/template/class_XmlRewriterTemplateDecorator.php index 80ef846e..50ff116e 100644 --- a/framework/main/classes/decorator/xml/template/class_XmlRewriterTemplateDecorator.php +++ b/framework/main/classes/decorator/xml/template/class_XmlRewriterTemplateDecorator.php @@ -334,7 +334,7 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableX * @return void * @throws XmlParserException If an XML error was found */ - public function renderXmlContent (string $content = NULL) { + public function renderXmlContent (string $content = '') { // Call the inner class' method $this->getTemplateInstance()->renderXmlContent($content); } diff --git a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php index bc53481c..7d344ac7 100644 --- a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php +++ b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php @@ -450,10 +450,10 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi * @return void * @throws InvalidArgumentException If a parameter has an invalid value */ - public function renderXmlContent (string $content = NULL) { + public function renderXmlContent (string $content = '') { // Is the content set? /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('BASE-XML-TEMPLATE-ENGINE: content[%s]()=%d - CALLED!', gettype($content), strlen($content))); - if (is_null($content)) { + if (empty($content)) { // Get current content $content = $this->getRawTemplateData(); } elseif (empty($content)) { diff --git a/framework/main/interfaces/template/xml/class_CompileableXmlTemplate.php b/framework/main/interfaces/template/xml/class_CompileableXmlTemplate.php index 9e9dbb18..fc05362b 100644 --- a/framework/main/interfaces/template/xml/class_CompileableXmlTemplate.php +++ b/framework/main/interfaces/template/xml/class_CompileableXmlTemplate.php @@ -36,7 +36,7 @@ interface CompileableXmlTemplate extends CompileableTemplate { * @return void * @throws XmlParserException If an XML error was found */ - function renderXmlContent (string $content = NULL); + function renderXmlContent (string $content = ''); /** * Enables or disables XML compacting -- 2.39.5