From 0462ab432ba34563798ac810bc0178da4d5b3295 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 4 Jul 2013 20:58:20 +0000 Subject: [PATCH] Renamed endElement() to finishElement(), see the final implementation in BaseXmlTemplateEngine for the reason (naming convention) --- .../decorator/template/class_XmlRewriterTemplateDecorator.php | 4 ++-- inc/classes/main/parser/xml/class_XmlParser.php | 2 +- inc/classes/main/template/image/class_ImageTemplateEngine.php | 2 +- inc/classes/main/template/mail/class_MailTemplateEngine.php | 2 +- inc/classes/main/template/menu/class_MenuTemplateEngine.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php index 46fb179f..fe3a437c 100644 --- a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php +++ b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php @@ -413,9 +413,9 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT * @return void * @throws XmlNodeMismatchException If current main node mismatches the closing one */ - public function endElement ($resource, $nodeName) { + public function finishElement ($resource, $nodeName) { // Call the inner class' method - $this->getTemplateInstance()->endElement($resource, $nodeName); + $this->getTemplateInstance()->finishElement($resource, $nodeName); } /** diff --git a/inc/classes/main/parser/xml/class_XmlParser.php b/inc/classes/main/parser/xml/class_XmlParser.php index d8cf17a6..85b6ab73 100644 --- a/inc/classes/main/parser/xml/class_XmlParser.php +++ b/inc/classes/main/parser/xml/class_XmlParser.php @@ -96,7 +96,7 @@ class XmlParser extends BaseParser implements Parseable { xml_set_object($xmlParser, $templateInstance); // Set handler call-backs - xml_set_element_handler($xmlParser, 'startElement', 'endElement'); + xml_set_element_handler($xmlParser, 'startElement', 'finishElement'); xml_set_character_data_handler($xmlParser, 'characterHandler'); // Now parse the XML tree diff --git a/inc/classes/main/template/image/class_ImageTemplateEngine.php b/inc/classes/main/template/image/class_ImageTemplateEngine.php index d3e26e47..22262c09 100644 --- a/inc/classes/main/template/image/class_ImageTemplateEngine.php +++ b/inc/classes/main/template/image/class_ImageTemplateEngine.php @@ -185,7 +185,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @return void * @throws XmlNodeMismatchException If current main node mismatches the closing one */ - public function endElement ($resource, $nodeName) { + public function finishElement ($resource, $nodeName) { // Make all lower-case $nodeName = strtolower($nodeName); diff --git a/inc/classes/main/template/mail/class_MailTemplateEngine.php b/inc/classes/main/template/mail/class_MailTemplateEngine.php index 0e5ce760..308b2667 100644 --- a/inc/classes/main/template/mail/class_MailTemplateEngine.php +++ b/inc/classes/main/template/mail/class_MailTemplateEngine.php @@ -179,7 +179,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla * @return void * @throws XmlNodeMismatchException If current main node mismatches the closing one */ - protected function endElement ($resource, $nodeName) { + protected function finishElement ($resource, $nodeName) { // Make all lower-case $nodeName = strtolower($nodeName); diff --git a/inc/classes/main/template/menu/class_MenuTemplateEngine.php b/inc/classes/main/template/menu/class_MenuTemplateEngine.php index 91e204b9..9adf01e6 100644 --- a/inc/classes/main/template/menu/class_MenuTemplateEngine.php +++ b/inc/classes/main/template/menu/class_MenuTemplateEngine.php @@ -239,7 +239,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla * @return void * @throws XmlNodeMismatchException If current main node mismatches the closing one */ - public function endElement ($resource, $nodeName) { + public function finishElement ($resource, $nodeName) { // Make all lower-case $nodeName = strtolower($nodeName); -- 2.30.2