fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

Prevent undefined property errors in XEXMLParser use cases

Browse source
This commit is contained in:
Kijin Sung 2025-05-17 13:02:29 +09:00
parent bfa8ea5ddc
commit e0ba5aa5b6
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
common/framework/parsers/XEXMLParser.php
View file

@ -12,9 +12,9 @@ class XEXMLParser
* *
* @param string $filename * @param string $filename
* @param string $lang * @param string $lang
* @return ?object * @return ?self
*/ */
public static function loadXMLFile(string $filename, string $lang = ''): ?object public static function loadXMLFile(string $filename, string $lang = ''): ?self
{ {
$content = file_get_contents($filename); $content = file_get_contents($filename);
return self::loadXMLString($content, $lang); return self::loadXMLString($content, $lang);
@ -25,9 +25,9 @@ class XEXMLParser
* *
* @param string $filename * @param string $filename
* @param string $lang * @param string $lang
* @return ?object * @return ?self
*/ */
public static function loadXMLString(string $content, string $lang = ''): ?object public static function loadXMLString(string $content, string $lang = ''): ?self
{ {
// Apply transformations identical to XE's XML parser. // Apply transformations identical to XE's XML parser.
$content = str_replace([chr(1), chr(2)], ['', ''], $content); $content = str_replace([chr(1), chr(2)], ['', ''], $content);
@ -41,7 +41,7 @@ class XEXMLParser
$lang = $lang ?: (\Context::getLangType() ?: 'en'); $lang = $lang ?: (\Context::getLangType() ?: 'en');
// Create the result object. // Create the result object.
$result = new \stdClass; $result = new self;
$root_name = $xml->getName(); $root_name = $xml->getName();
$result->$root_name = self::_recursiveConvert($xml, $lang); $result->$root_name = self::_recursiveConvert($xml, $lang);
return $result; return $result;
@ -52,14 +52,14 @@ class XEXMLParser
* *
* @param \SimpleXMLElement $element * @param \SimpleXMLElement $element
* @param string $lang * @param string $lang
* @return object * @return self
*/ */
protected static function _recursiveConvert(\SimpleXMLElement $element, string $lang): \stdClass protected static function _recursiveConvert(\SimpleXMLElement $element, string $lang): self
{ {
// Create the basic structure of the node. // Create the basic structure of the node.
$node = new \stdClass; $node = new self;
$node->node_name = $element->getName(); $node->node_name = $element->getName();
$node->attrs = new \stdClass; $node->attrs = new self;
$node->body = trim($element->__toString()); $node->body = trim($element->__toString());
// Add attributes. // Add attributes.
@ -102,4 +102,14 @@ class XEXMLParser
return $node; return $node;
} }
/**
* Hack to prevent undefined property errors.
*
* @param string $name
*/
public function __get($name)
{
return isset($this->$name) ? $this->$name : null;
}
} }

3
tests/unit/framework/parsers/XeXmlParserTest.php
View file

@ -23,5 +23,8 @@ class XeXmlParserTest extends \Codeception\Test\Unit
$this->assertEquals('라이믹스', $output->layout->author->name->body); $this->assertEquals('라이믹스', $output->layout->author->name->body);
$this->assertEquals('웹 폰트', $output->layout->extra_vars->var[1]->title->body); $this->assertEquals('웹 폰트', $output->layout->extra_vars->var[1]->title->body);
$this->assertEquals('Noto Sans', $output->layout->extra_vars->var[1]->options[0]->attrs->value); $this->assertEquals('Noto Sans', $output->layout->extra_vars->var[1]->options[0]->attrs->value);
$this->assertInstanceOf(\Rhymix\Framework\Parsers\XEXMLParser::class, $output);
$this->assertNull($output->layout->attrs->foo);
} }
} }