Version 5.0.0 beta 1

applications/core/sources/MemberACPProfile/Block.php

@@ -11,29 +11,35 @@
 namespace IPS\core\MemberACPProfile;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use IPS\Member;
+use IPS\Output;
+use function defined;
+use function get_called_class;
+
+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;
 }
 
 /**
  * @brief	ACP Member Profile: Block
  */
-abstract class _Block
+abstract class Block
 {
 	/**
 	 * @brief	Member
 	 */
-	protected $member;
+	protected ?Member $member = null;
 	
 	/**
 	 * Constructor
 	 *
-	 * @param	\IPS\Member	$member	Member
+	 * @param	Member	$member	Member
 	 * @return	void
 	 */
-	public function __construct( \IPS\Member $member )
+	public function __construct( Member $member )
 	{
 		$this->member = $member;
 	}
@@ -43,11 +49,11 @@ abstract class _Block
 	 *
 	 * @return	string
 	 */
-	public static function title()
+	public static function title() : string
 	{
-		$class = \get_called_class();
+		$class = get_called_class();
 		$exploded = explode( '\\', $class );
-		return \IPS\Member::loggedIn()->language()->addToStack( 'memberACPProfileTitle_' . $exploded[1] . '_' . $exploded[5] );
+		return Member::loggedIn()->language()->addToStack( 'memberACPProfileTitle_' . $exploded[1] . '_' . $exploded[5] );
 	}
 	
 	/**
@@ -55,15 +61,15 @@ abstract class _Block
 	 *
 	 * @return	string
 	 */
-	abstract public function output();
+	abstract public function output() : string;
 	
 	/**
 	 * Edit Window
 	 *
-	 * @return	string
+	 * @return	string|null
 	 */
-	public function edit()
+	public function edit()  : ?string
 	{
-		\IPS\Output::i()->error( 'node_error', '2C114/T', 404, '' );
+		Output::i()->error( 'node_error', '2C114/T', 404, '' );
 	}
 }