Version 5.0.0 beta 1

system/Output/Plugin/Lang.php

@@ -11,21 +11,28 @@
 namespace IPS\Output\Plugin;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Theme;
+use function count;
+use function defined;
+use function strpos;
+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 - Lang
  */
-class _Lang
+class Lang
 {
 	/**
 	 * @brief	Can be used when compiling CSS
 	 */
-	public static $canBeUsedInCss = FALSE;
+	public static bool $canBeUsedInCss = FALSE;
 	
 	/**
 	 * Run the plug-in
@@ -34,17 +41,17 @@ class _Lang
 	 * @param	array		$options    Array of options
 	 * @return	array		array( 'pre' => Code to eval before 'return', 'return' => Code to eval to return desired value )
 	 */
-	public static function runPlugin( $data, $options )
+	public static function runPlugin( string $data, array $options ): array
 	{		
 		$return = array();
 		$return['pre'] = null;
 		$params = array();
 		
-		$data = \IPS\Theme::expandShortcuts( $data );
+		$data = Theme::expandShortcuts( $data );
 	
-		if( \substr( $data, 0, 1 ) !== '\\' and \strpos( $data, '$' ) !== FALSE )
+		if( substr( $data, 0, 1 ) !== '\\' and strpos( $data, '$' ) !== FALSE )
 		{
-			if ( \strpos( $data, '$' ) === 0 )
+			if ( strpos( $data, '$' ) === 0 )
 			{
 			
 				$data = '{' . $data . '}';
@@ -109,7 +116,7 @@ class _Lang
 
 		$vle	= 'TRUE';
 
-		if( \count( $params ) )
+		if( count( $params ) )
 		{
 			$vle	= 'FALSE';
 		}