Version 5.0.0 beta 1

system/Text/HtmlPurifierSrcsetDef.php

@@ -11,27 +11,34 @@
 namespace IPS\Text;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use HTMLPurifier_AttrDef_URI;
+use HTMLPurifier_Config;
+use HTMLPurifier_Context;
+use function count;
+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;
 }
 
 /**
  * A HTMLPurifier Attribute Definition used for attributes which must be internal URLs
  */
-class _HtmlPurifierSrcsetDef extends \HTMLPurifier_AttrDef_URI
+class HtmlPurifierSrcsetDef extends HTMLPurifier_AttrDef_URI
 {
 	/**
 	 * Validate
 	 * 
      * @param	string					$srcset
-     * @param	\HTMLPurifier_Config	$config
-     * @param	\HTMLPurifier_Context	$context
+     * @param	HTMLPurifier_Config	$config
+     * @param	HTMLPurifier_Context	$context
      * @return	bool|string
      */
-    public function validate($srcset, $config, $context)
-    {
+    public function validate($srcset, $config, $context): bool|string
+	{
 	    $return = array();
 	    	    
 	    foreach ( explode( ',', $srcset ) as $src )
@@ -47,7 +54,7 @@ class _HtmlPurifierSrcsetDef extends \HTMLPurifier_AttrDef_URI
 		    }
 	    }
 	    	    
-	    if ( \count( $return ) )
+	    if ( count( $return ) )
 	    {
 		    return implode( ', ', $return );
 	    }