Version 5.0.0 beta 1

system/Member/Setup.php

@@ -11,28 +11,32 @@
 namespace IPS\Member;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Lang;
+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;
 }
 
 /**
  * Dummy Member Model used by installer
  */
-class _Setup
+class Setup
 {
 	/**
 	 * @brief	Instance
 	 */
-	protected static $instance = NULL;
+	protected static ?self $instance = NULL;
 	
 	/**
 	 * Get instance
 	 *
-	 * @return	\IPS\Member\Setup
+	 * @return    Setup
 	 */
-	public static function i()
+	public static function i() : static
 	{
 		if ( static::$instance === NULL )
 		{
@@ -44,14 +48,14 @@ class _Setup
 	/**
 	 * @brief	Language data
 	 */
-	protected $language = NULL;
+	protected ?Lang $language = NULL;
 	
 	/**
 	 * Is user an admin
 	 *
 	 * @return	boolean
 	 */
-	public function isAdmin()
+	public function isAdmin(): bool
 	{
 		return FALSE;
 	}
@@ -59,9 +63,9 @@ class _Setup
 	/**
 	 * Is the user logged in?
 	 *
-	 * @return boolean
+	 * @return static
 	 */
-	public function loggedIn()
+	public function loggedIn(): static
 	{
 		return $this;
 	}
@@ -71,14 +75,14 @@ class _Setup
 	/**
 	 * Get language
 	 *
-	 * @return	\IPS\Lang
+	 * @return	Lang|null
 	 */
-	public function language()
+	public function language(): ?Lang
 	{
 		if ( $this->language === NULL )
 		{
-			$this->language = \IPS\Lang::constructFromData( array() );
-			require( \IPS\ROOT_PATH . '/' . \IPS\CP_DIRECTORY . '/install/lang.php' );
+			$this->language = Lang::constructFromData( array() );
+			require( \IPS\ROOT_PATH . '/admin/install/lang.php' );
 			$this->language->words = $lang;
 		}
 		return $this->language;