diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Pull Request 3134] Improved code based on comments

Browse Source
This commit is contained in:
Manuel Reinhard 2012-01-17 11:25:25 +01:00
parent 90abc0f454
commit 7f3464386b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
View File

@ -304,21 +304,18 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
return $appendNode; return $appendNode;
} }
/** /**
* Checks if a value contains any characters which would require CDATA padding. * Checks if a value contains any characters which would require CDATA wrapping.
* *
* @param string $val * @param string $val
* *
* @return Boolean * @return Boolean
*/ */
private function needsCdataPadding($val) private function needsCdataWrapping($val)
{ {
return preg_match('/[<>&]/', $val); return preg_match('/[<>&]/', $val);
} }
/** /**
* Tests the value being passed and decide what sort of element to create * Tests the value being passed and decide what sort of element to create
* *
@ -340,7 +337,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
return $this->buildXml($node, $this->serializer->normalize($val, $this->format)); return $this->buildXml($node, $this->serializer->normalize($val, $this->format));
} elseif (is_numeric($val)) { } elseif (is_numeric($val)) {
return $this->appendText($node, (string) $val); return $this->appendText($node, (string) $val);
} elseif (is_string($val) && $this->needsCdataPadding($val)) { } elseif (is_string($val) && $this->needsCdataWrapping($val)) {
return $this->appendCData($node, $val); return $this->appendCData($node, $val);
} elseif (is_string($val)) { } elseif (is_string($val)) {
return $this->appendText($node, $val); return $this->appendText($node, $val);