Merge pull request #13 from benlumley/master

Fix for unterminated entity references
Sibyx · Aug 20, 2017 · 71e92e7 · 71e92e7
2 parents bc6e257 + 552da44
commit 71e92e7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/phpGPX/Parsers/MetadataParser.php b/src/phpGPX/Parsers/MetadataParser.php
@@ -134,7 +134,9 @@ public static function toXML(Metadata $metadata, \DOMDocument &$document)
 						$child = ExtensionParser::toXML($metadata->extensions, $document);
 						break;
 					default:
-						$child = $document->createElement($key, $metadata->{$attribute['name']});
+						$child = $document->createElement($key);
+						$elementText = $document->createTextNode((string) $metadata->{$attribute['name']});
+						$child->appendChild($elementText);
 						break;
 				}
 
@@ -155,4 +157,4 @@ public static function toXML(Metadata $metadata, \DOMDocument &$document)
 		return $node;
 	}
 
-}
+}
diff --git a/src/phpGPX/Parsers/PointParser.php b/src/phpGPX/Parsers/PointParser.php
@@ -165,7 +165,10 @@ public static function toXML(Point $point, \DOMDocument &$document)
 						$child = ExtensionParser::toXML($point->extensions, $document);
 						break;
 					default:
-						$child = $document->createElement($key, $point->{$attribute['name']});
+						$child = $document->createElement($key);
+						$elementText = $document->createTextNode((string) $point->{$attribute['name']});
+						$child->appendChild($elementText);
+						break;
 						break;
 				}
 
@@ -203,4 +206,4 @@ public static function toXMLArray(array $points, \DOMDocument &$document)
 		return $result;
 	}
 
-}
+}
diff --git a/src/phpGPX/Parsers/RouteParser.php b/src/phpGPX/Parsers/RouteParser.php
@@ -132,7 +132,9 @@ public static function toXML(Route $route, \DOMDocument &$document)
 						$child = PointParser::toXMLArray($route->points, $document);
 						break;
 					default:
-						$child = $document->createElement($key, $route->{$attribute['name']});
+						$child = $document->createElement($key);
+						$elementText = $document->createTextNode((string) $route->{$attribute['name']});
+						$child->appendChild($elementText);
 						break;
 				}
 
@@ -169,4 +171,4 @@ public static function toXMLArray(array $routes, \DOMDocument &$document)
 
 		return $result;
 	}
-}
+}
diff --git a/src/phpGPX/Parsers/TrackParser.php b/src/phpGPX/Parsers/TrackParser.php
@@ -133,7 +133,9 @@ public static function toXML(Track $track, \DOMDocument &$document)
 						$child = SegmentParser::toXMLArray($track->segments, $document);
 						break;
 					default:
-						$child = $document->createElement($key, $track->{$attribute['name']});
+						$child = $document->createElement($key);
+						$elementText = $document->createTextNode((string) $track->{$attribute['name']});
+						$child->appendChild($elementText);
 						break;
 				}
 
@@ -170,4 +172,4 @@ public static function toXMLArray(array $tracks, \DOMDocument &$document)
 
 		return $result;
 	}
-}
+}