Version 5.0.0 beta 1

system/Output/Plugin/Url.php

@@ -11,21 +11,27 @@
 namespace IPS\Output\Plugin;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Http\Url as HttpUrl;
+use function defined;
+use function in_array;
+use function substr;
+
+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;
 }
 
 /**
  * Template Plugin - URL
  */
-class _Url
+class Url
 {
 	/**
 	 * @brief	Can be used when compiling CSS
 	 */
-	public static $canBeUsedInCss = TRUE;
+	public static bool $canBeUsedInCss = TRUE;
 	
 	/**
 	 * Run the plug-in
@@ -34,7 +40,7 @@ class _Url
 	 * @param	array		$options    Array of options
 	 * @return	string		Code to eval
 	 */
-	public static function runPlugin( $data, $options )
+	public static function runPlugin( string $data, array $options ): string
 	{
 		$csrf = '';
 		
@@ -43,7 +49,7 @@ class _Url
 			$csrf = ' . "&csrfKey=" . \IPS\Session::i()->csrfKey';
 		}
 		
-		$location = ( \in_array( 'base', array_keys( $options ) ) ) ? '"' . $options['base'] . '"' : 'null';
+		$location = ( in_array( 'base', array_keys( $options ) ) ) ? '"' . $options['base'] . '"' : 'null';
 		
 		if ( !isset( $options['seoTemplate'] ) )
 		{
@@ -60,7 +66,7 @@ class _Url
 		
 		if ( !isset( $options['protocol'] ) )
 		{
-			$options['protocol'] = \IPS\Http\Url::PROTOCOL_AUTOMATIC;
+			$options['protocol'] = HttpUrl::PROTOCOL_AUTOMATIC;
 		}
 		
 		$fragment = "";
@@ -74,7 +80,7 @@ class _Url
 		if ( isset( $options['ref'] ) )
 		{
 			/* Is this a variable or other dynamic thing? */
-			if ( \in_array( \substr( $options['ref'], 0, 1 ), array( '(', '$', '\\' ) ) )
+			if ( in_array( substr( $options['ref'], 0, 1 ), array( '(', '$', '\\' ) ) )
 			{
 				$ref = "->addRef(";
 				$ref .= $options['ref'];