Version 5.0.0 beta 1

system/Helpers/Form/Enum.php

@@ -11,16 +11,21 @@
 namespace IPS\Helpers\Form;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+
+use OutOfRangeException;
+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;
 }
 
 /**
  * Enumeration class for Form Builder
  */
-class _Enum extends FormAbstract
+class Enum extends FormAbstract
 {
 	/**
 	 * @brief	Default Options
@@ -30,46 +35,45 @@ class _Enum extends FormAbstract
 	 )
 	 @encode
 	 */
-	protected $defaultOptions = array(
+	protected array $defaultOptions = array(
 		'threshold'		=> 25
 	);
 	
 	/**
 	 * @brief	Form Class
 	 */
-	protected $class;
+	protected mixed $class = NULL;
 	
 	/**
 	 * @brief	Threshold
 	 */
-	protected $threshold;
-	
+	protected mixed $threshold = NULL;
+
 	/**
 	 * Constructor
 	 *
-	 * @param	string			$name					Name
-	 * @param	mixed			$defaultValue			Default value
-	 * @param	bool|NULL		$required				Required? (NULL for not required, but appears to be so)
-	 * @param	array			$options				Type-specific options
-	 * @param	callback		$customValidationCode	Custom validation code
-	 * @param	string			$prefix					HTML to show before input field
-	 * @param	string			$suffix					HTML to show after input field
-	 * @param	string			$id						The ID to add to the row
-	 * @return	void
+	 * @param string $name Name
+	 * @param mixed $defaultValue Default value
+	 * @param bool|null $required Required? (NULL for not required, but appears to be so)
+	 * @param array $options Type-specific options
+	 * @param callable|null $customValidationCode Custom validation code
+	 * @param string|null $prefix HTML to show before input field
+	 * @param string|null $suffix HTML to show after input field
+	 * @param string|null $id The ID to add to the row
 	 */
-	public function __construct( $name, $defaultValue=NULL, $required=FALSE, $options=array(), $customValidationCode=NULL, $prefix=NULL, $suffix=NULL, $id=NULL )
+	public function __construct( string $name, mixed $defaultValue=NULL, ?bool $required=FALSE, array $options=array(), callable $customValidationCode=NULL, string $prefix=NULL, string $suffix=NULL, string $id=NULL )
 	{
 		$options['multiple'] = TRUE;
 		
 		$this->threshold = $options['threshold'] ?? $this->defaultOptions['threshold'];
 		
-		if ( \count( $options['options'] ) >= $this->threshold )
+		if ( count( $options['options'] ) >= $this->threshold )
 		{
-			$this->class = new \IPS\Helpers\Form\Select( $name, $defaultValue, $required, $options, $customValidationCode, $prefix, $suffix, $id );
+			$this->class = new Select( $name, $defaultValue, $required, $options, $customValidationCode, $prefix, $suffix, $id );
 		}
 		else
 		{
-			$this->class = new \IPS\Helpers\Form\CheckboxSet( $name, $defaultValue, $required, $options, $customValidationCode, $prefix, $suffix, $id );
+			$this->class = new CheckboxSet( $name, $defaultValue, $required, $options, $customValidationCode, $prefix, $suffix, $id );
 		}
 		
 		parent::__construct( $name, $defaultValue, $required, $options, $customValidationCode, $prefix, $suffix, $id );
@@ -80,7 +84,7 @@ class _Enum extends FormAbstract
 	 *
 	 * @return	string
 	 */
-	public function html()
+	public function html(): string
 	{
 		return $this->class->html();
 	}
@@ -90,7 +94,7 @@ class _Enum extends FormAbstract
 	 *
 	 * @return	array
 	 */
-	public function getValue()
+	public function getValue(): mixed
 	{
 		return $this->class->getValue();
 	}
@@ -98,10 +102,10 @@ class _Enum extends FormAbstract
 	/**
 	 * Validate
 	 *
-	 * @throws	\OutOfRangeException
+	 * @throws	OutOfRangeException
 	 * @return	bool
 	 */
-	public function validate()
+	public function validate(): bool
 	{
 		return $this->class->validate();
 	}