Version 5.0.0 beta 1

system/Xml/XMLReader.php

@@ -11,42 +11,37 @@
 namespace IPS\Xml;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use XMLReader as PHPXMLReader;
+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 XMLReader objects
  */
-class _XMLReader extends \XMLReader
+class XMLReader extends PHPXMLReader
 {
 	/**
 	 * Open a file or URL with XMLReader to read it
 	 *
-	 * @param	string	$uri		The URI/path to open
-	 * @param	string	$encoding	The encoding to use, or NULL
-	 * @param	int		$options	Bitmask of LIBXML_* constants
-	 * @return	bool
+	 * @param string $uri		The URI/path to open
+	 * @param string|null $encoding	The encoding to use, or NULL
+	 * @param int $options	Bitmask of LIBXML_* constants
+	 * @return    PHPXMLReader|bool
 	 * @note	We are disabling network access while loading the content to prevent XXE
 	 */
-	public static function safeOpen( $uri, $encoding=NULL, $options=0 )
+	public static function safeOpen( string $uri, string $encoding=NULL, int $options=0 ): PHPXMLReader|bool
 	{
 		if( $options === 0 )
 		{
 			$options = LIBXML_NONET;
 		}
 
-		if( version_compare( PHP_VERSION, '8.0.0' ) >= 0 )
-		{
-			return parent::open( $uri, $encoding, $options );
-		}
-		else
-		{
-			$xml = new static;
-			$xml->open( $uri, $encoding, $options );
-			return $xml;
-		}
+		return parent::open( $uri, $encoding, $options );
 	}
 }