Version 5.0.0 beta 1

system/Xml/DOMDocument.php

@@ -11,25 +11,29 @@
 namespace IPS\Xml;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use DOMDocument as PHPDOMDocument;
+use function defined;
+
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
-	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	header( ($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0') . ' 403 Forbidden' );
 	exit;
 }
 
 /**
  * Wrapper class for managing DOMDocument objects
  */
-class _DOMDocument extends \DOMDocument
+class DOMDocument extends PHPDOMDocument
 {
 	/**
 	 * Load XML from a file
 	 *
 	 * @param	string	$filename	The filename
-	 * @param	int		$options	Bitmask of LIBXML_* constants
+	 * @param	int|null		$options	Bitmask of LIBXML_* constants
 	 * @return	bool
 	 */
-	public function load( $filename, $options=0 )
+	public function load( string $filename, ?int $options=0 ): bool
 	{
 		return static::loadXML( file_get_contents( $filename ), $options );
 	}
@@ -38,11 +42,11 @@ class _DOMDocument extends \DOMDocument
 	 * Load HTML from a string 
 	 *
 	 * @param	string	$source		The HTML to open
-	 * @param	int		$options	Bitmask of LIBXML_* constants
+	 * @param	int|null		$options	Bitmask of LIBXML_* constants
 	 * @return	bool
 	 * @note	We are disabling the entity loader after opening the content to prevent XXE
 	 */
-	public function loadHTML( $source, $options=0 )
+	public function loadHTML( string $source, ?int $options=0 ): bool
 	{
 		libxml_use_internal_errors( TRUE );
 
@@ -51,16 +55,18 @@ class _DOMDocument extends \DOMDocument
 		{
 			return parent::loadHTML( $source, $options );
 		}
-		
+
+		/* Commented out because this is deprecated */
 		/* Turn off external entity loader to prevent XXE */
-		$entityLoaderValue = libxml_disable_entity_loader( TRUE );
+		//$entityLoaderValue = libxml_disable_entity_loader( TRUE );
 		
 		/* Load it */
 		$opened = parent::loadHTML( $source, $options );
-		
+
+		/* Commented out because this is deprecated */
 		/* Turn external entity loader back to what it was before so we're not messing with other
 			PHP scripts on this server */
-		libxml_disable_entity_loader( $entityLoaderValue );
+		//libxml_disable_entity_loader( $entityLoaderValue );
 		
 		/* Return */
 		return $opened;
@@ -70,11 +76,11 @@ class _DOMDocument extends \DOMDocument
 	 * Load HTML from a file
 	 *
 	 * @param	string	$filename	The filename
-	 * @param	int		$options	Bitmask of LIBXML_* constants
+	 * @param	int|null		$options	Bitmask of LIBXML_* constants
 	 * @return	bool
 	 * @note	We are disabling the entity loader after opening the content to prevent XXE
 	 */
-	public function loadHTMLFile( $filename, $options=0 )
+	public function loadHTMLFile( string $filename, ?int $options=0 ): bool
 	{		
 		return static::loadHTML( file_get_contents( $filename ), $options );
 	}
@@ -83,10 +89,10 @@ class _DOMDocument extends \DOMDocument
 	 * Load XML from a string 
 	 *
 	 * @param	string	$source		The HTML to open
-	 * @param	int		$options	Bitmask of LIBXML_* constants
+	 * @param	int|null		$options	Bitmask of LIBXML_* constants
 	 * @return	bool
 	 */
-	public function loadXML( $source, $options=0 )
+	public function loadXML( string $source, ?int $options=0 ): bool
 	{
 		libxml_use_internal_errors( TRUE );
 
@@ -95,16 +101,18 @@ class _DOMDocument extends \DOMDocument
 		{
 			return parent::loadXML( $source, $options );
 		}
-		
+
+		/* Commented out because this is deprecated */
 		/* Turn off external entity loader to prevent XXE */
-		$entityLoaderValue = libxml_disable_entity_loader( TRUE );
+		//$entityLoaderValue = libxml_disable_entity_loader( TRUE );
 		
 		/* Load it */
 		$opened = parent::loadXML( $source, $options );
-		
+
+		/* Commented out because this is deprecated */
 		/* Turn external entity loader back to what it was before so we're not messing with other
 			PHP scripts on this server */
-		libxml_disable_entity_loader( $entityLoaderValue );
+		//libxml_disable_entity_loader( $entityLoaderValue );
 
 		/* Return */
 		return $opened;
@@ -113,10 +121,10 @@ class _DOMDocument extends \DOMDocument
 	/**
 	 * Prefix HTML content with certain HTML to force DOMDocument to treat the content as UTF-8-encoded HTML
 	 *
-	 * @param	string	$content	HTML content to prefix
+	 * @param string $content	HTML content to prefix
 	 * @return	string
 	 */
-	static public function wrapHtml( $content )
+	static public function wrapHtml( string $content ): string
 	{
 		return "<!DOCTYPE html><html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8'/></head><body>" . $content. "</body></html>";
 	}