eventespresso / event-espresso-core

core/services/form/meta/InputOptions.php

Indentation +106 added lines, -106 removed lines

@@ -15,110 +15,110 @@
 class InputOptions
 {
 
-    /**
-     * @var JsonDataHandler
-     */
-    private $json_data_handler;
-
-    /**
-     * Options for ENUM type inputs like checkboxes, radio buttons, select inputs, etc
-     *
-     * @var array
-     */
-    private $options;
-
-
-    /**
-     * HelpText constructor.
-     *
-     * @param JsonDataHandler $json_data_handler
-     * @param array           $options
-     */
-    public function __construct(JsonDataHandler $json_data_handler, array $options)
-    {
-        $this->json_data_handler = $json_data_handler;
-        $this->setOptions($options);
-    }
-
-
-    /**
-     * @param string $json
-     * @return InputOptions
-     */
-    public static function fromJson(string $json): InputOptions
-    {
-        $json_data_handler = new JsonDataHandler();
-        $json_data_handler->configure(JsonDataHandler::DATA_TYPE_ARRAY);
-        $data    = $json_data_handler->decodeJson($json);
-        $options = $data['options'] ?? [];
-        return new InputOptions($json_data_handler, $options);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return ['options' => $this->options];
-    }
-
-
-    /**
-     * @return string
-     */
-    public function toJson(): string
-    {
-        return $this->json_data_handler->encodeData($this->toArray());
-    }
-
-
-    /**
-     * an array where keys are option values and values are option labels
-     *
-     * @return array
-     */
-    public function options(): array
-    {
-        return $this->options;
-    }
-
-
-    /**
-     * @param int|float|string $option_value
-     * @param int|float|string $display_text
-     */
-    public function addOption($option_value, $display_text): void
-    {
-        $option_value = sanitize_key($option_value);
-        if (! isset($this->options[ $option_value ])) {
-            $this->options[ $option_value ] = sanitize_text_field($display_text);
-        }
-    }
-
-
-    /**
-     * @param int|float|string $option_value
-     */
-    public function removeOption($option_value): void
-    {
-        $option_value = sanitize_key($option_value);
-        unset($this->options[ $option_value ]);
-    }
-
-
-    /**
-     * @param array $options an array where keys are option values and values are option labels
-     */
-    public function setOptions(array $options): void
-    {
-        // grab all of the keys and sanitize those for use as option values
-        $keys = array_keys($options);
-        $keys = array_map('sanitize_key', $keys);
-        // grab all of the array values and sanitize those for use as option display text
-        $values = array_values($options);
-        $values = array_map('sanitize_text_field', $values);
-        // recombine sanitized values
-        $this->options = array_combine($keys, $values);
-    }
+	/**
+	 * @var JsonDataHandler
+	 */
+	private $json_data_handler;
+
+	/**
+	 * Options for ENUM type inputs like checkboxes, radio buttons, select inputs, etc
+	 *
+	 * @var array
+	 */
+	private $options;
+
+
+	/**
+	 * HelpText constructor.
+	 *
+	 * @param JsonDataHandler $json_data_handler
+	 * @param array           $options
+	 */
+	public function __construct(JsonDataHandler $json_data_handler, array $options)
+	{
+		$this->json_data_handler = $json_data_handler;
+		$this->setOptions($options);
+	}
+
+
+	/**
+	 * @param string $json
+	 * @return InputOptions
+	 */
+	public static function fromJson(string $json): InputOptions
+	{
+		$json_data_handler = new JsonDataHandler();
+		$json_data_handler->configure(JsonDataHandler::DATA_TYPE_ARRAY);
+		$data    = $json_data_handler->decodeJson($json);
+		$options = $data['options'] ?? [];
+		return new InputOptions($json_data_handler, $options);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return ['options' => $this->options];
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function toJson(): string
+	{
+		return $this->json_data_handler->encodeData($this->toArray());
+	}
+
+
+	/**
+	 * an array where keys are option values and values are option labels
+	 *
+	 * @return array
+	 */
+	public function options(): array
+	{
+		return $this->options;
+	}
+
+
+	/**
+	 * @param int|float|string $option_value
+	 * @param int|float|string $display_text
+	 */
+	public function addOption($option_value, $display_text): void
+	{
+		$option_value = sanitize_key($option_value);
+		if (! isset($this->options[ $option_value ])) {
+			$this->options[ $option_value ] = sanitize_text_field($display_text);
+		}
+	}
+
+
+	/**
+	 * @param int|float|string $option_value
+	 */
+	public function removeOption($option_value): void
+	{
+		$option_value = sanitize_key($option_value);
+		unset($this->options[ $option_value ]);
+	}
+
+
+	/**
+	 * @param array $options an array where keys are option values and values are option labels
+	 */
+	public function setOptions(array $options): void
+	{
+		// grab all of the keys and sanitize those for use as option values
+		$keys = array_keys($options);
+		$keys = array_map('sanitize_key', $keys);
+		// grab all of the array values and sanitize those for use as option display text
+		$values = array_values($options);
+		$values = array_map('sanitize_text_field', $values);
+		// recombine sanitized values
+		$this->options = array_combine($keys, $values);
+	}
 }

core/services/form/meta/HelpText.php

Indentation +137 added lines, -137 removed lines

@@ -15,141 +15,141 @@
 class HelpText
 {
 
-    /**
-     * @var JsonDataHandler
-     */
-    private $json_data_handler;
-
-    /**
-     * Additional text displayed alongside a form input to assist users with completing the form.
-     *
-     * @var string
-     */
-    private $helpText;
-
-    /**
-     * Custom HTML classes to be applied to this form input's help text.
-     *
-     * @var array
-     */
-    private $htmlClasses;
-
-
-    /**
-     * HelpText constructor.
-     *
-     * @param JsonDataHandler $json_data_handler
-     * @param array           $htmlClass
-     * @param string          $helpText
-     */
-    public function __construct(
-        JsonDataHandler $json_data_handler,
-        array $htmlClass,
-        string $helpText
-    ) {
-        $this->json_data_handler = $json_data_handler;
-        $this->setHtmlClasses($htmlClass);
-        $this->setHelpText($helpText);
-    }
-
-
-    /**
-     * @param string $json
-     * @return HelpText
-     */
-    public static function fromJson(string $json): HelpText
-    {
-        $json_data_handler = new JsonDataHandler();
-        $json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
-        $data      = $json_data_handler->decodeJson($json);
-        $htmlClass = (array) $data->htmlClass ?? [];
-        $helpText  = $data->helpText ?? '';
-        return new HelpText($json_data_handler, $htmlClass, $helpText);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return [
-            'helpText'  => $this->helpText,
-            'htmlClass' => $this->htmlClasses(),
-        ];
-    }
-
-
-    /**
-     * @return string
-     */
-    public function toJson(): string
-    {
-        return $this->json_data_handler->encodeData($this->toArray());
-    }
-
-
-    /**
-     * Input label displayed on public forms, ie: the actual question text.
-     *
-     * @return string
-     */
-    public function helpText(): string
-    {
-        return $this->helpText;
-    }
-
-
-    /**
-     * @param string $helpText
-     */
-    public function setHelpText(string $helpText): void
-    {
-        $this->helpText = sanitize_text_field($helpText);
-    }
-
-
-    /**
-     * Custom HTML classes to be applied to this form input's help text.
-     * returns a concatenated string unless $as_array is set to true
-     *
-     * @return array|string
-     */
-    public function htmlClasses($as_array = false)
-    {
-        return $as_array
-            ? $this->htmlClasses
-            : implode(' ', $this->htmlClasses);
-    }
-
-
-    /**
-     * @param string $htmlClass
-     */
-    public function addHtmlClass(string $htmlClass): void
-    {
-        $htmlClass = sanitize_key($htmlClass);
-        if (! in_array($htmlClass, $this->htmlClasses, true)) {
-            $this->htmlClasses[] = $htmlClass;
-        }
-    }
-
-
-    /**
-     * @param string $htmlClass
-     */
-    public function removeHtmlClass(string $htmlClass): void
-    {
-        $htmlClass = sanitize_key($htmlClass);
-        unset($this->htmlClasses[ $htmlClass ]);
-    }
-
-
-    /**
-     * @param array $htmlClasses
-     */
-    public function setHtmlClasses(array $htmlClasses): void
-    {
-        $this->htmlClasses = array_map('sanitize_key', $htmlClasses);
-    }
+	/**
+	 * @var JsonDataHandler
+	 */
+	private $json_data_handler;
+
+	/**
+	 * Additional text displayed alongside a form input to assist users with completing the form.
+	 *
+	 * @var string
+	 */
+	private $helpText;
+
+	/**
+	 * Custom HTML classes to be applied to this form input's help text.
+	 *
+	 * @var array
+	 */
+	private $htmlClasses;
+
+
+	/**
+	 * HelpText constructor.
+	 *
+	 * @param JsonDataHandler $json_data_handler
+	 * @param array           $htmlClass
+	 * @param string          $helpText
+	 */
+	public function __construct(
+		JsonDataHandler $json_data_handler,
+		array $htmlClass,
+		string $helpText
+	) {
+		$this->json_data_handler = $json_data_handler;
+		$this->setHtmlClasses($htmlClass);
+		$this->setHelpText($helpText);
+	}
+
+
+	/**
+	 * @param string $json
+	 * @return HelpText
+	 */
+	public static function fromJson(string $json): HelpText
+	{
+		$json_data_handler = new JsonDataHandler();
+		$json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
+		$data      = $json_data_handler->decodeJson($json);
+		$htmlClass = (array) $data->htmlClass ?? [];
+		$helpText  = $data->helpText ?? '';
+		return new HelpText($json_data_handler, $htmlClass, $helpText);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return [
+			'helpText'  => $this->helpText,
+			'htmlClass' => $this->htmlClasses(),
+		];
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function toJson(): string
+	{
+		return $this->json_data_handler->encodeData($this->toArray());
+	}
+
+
+	/**
+	 * Input label displayed on public forms, ie: the actual question text.
+	 *
+	 * @return string
+	 */
+	public function helpText(): string
+	{
+		return $this->helpText;
+	}
+
+
+	/**
+	 * @param string $helpText
+	 */
+	public function setHelpText(string $helpText): void
+	{
+		$this->helpText = sanitize_text_field($helpText);
+	}
+
+
+	/**
+	 * Custom HTML classes to be applied to this form input's help text.
+	 * returns a concatenated string unless $as_array is set to true
+	 *
+	 * @return array|string
+	 */
+	public function htmlClasses($as_array = false)
+	{
+		return $as_array
+			? $this->htmlClasses
+			: implode(' ', $this->htmlClasses);
+	}
+
+
+	/**
+	 * @param string $htmlClass
+	 */
+	public function addHtmlClass(string $htmlClass): void
+	{
+		$htmlClass = sanitize_key($htmlClass);
+		if (! in_array($htmlClass, $this->htmlClasses, true)) {
+			$this->htmlClasses[] = $htmlClass;
+		}
+	}
+
+
+	/**
+	 * @param string $htmlClass
+	 */
+	public function removeHtmlClass(string $htmlClass): void
+	{
+		$htmlClass = sanitize_key($htmlClass);
+		unset($this->htmlClasses[ $htmlClass ]);
+	}
+
+
+	/**
+	 * @param array $htmlClasses
+	 */
+	public function setHtmlClasses(array $htmlClasses): void
+	{
+		$this->htmlClasses = array_map('sanitize_key', $htmlClasses);
+	}
 }

core/services/form/meta/Required.php

Indentation +106 added lines, -106 removed lines

@@ -15,110 +15,110 @@
 class Required
 {
 
-    /**
-     * @var JsonDataHandler
-     */
-    private $json_data_handler;
-
-    /** Whether or not the input must be supplied with a value in order to complete the form.
-     *
-     * @var bool
-     */
-    private $required;
-
-    /**
-     * Custom validation text displayed alongside a required form input to assist users with completing the form.
-     *
-     * @var string
-     */
-    private $validationText;
-
-
-    /**
-     * Required constructor.
-     *
-     * @param JsonDataHandler $json_data_handler
-     * @param bool            $required
-     * @param string          $validationText
-     */
-    public function __construct(JsonDataHandler $json_data_handler, bool $required, string $validationText)
-    {
-        $this->json_data_handler = $json_data_handler;
-        $this->setRequired($required);
-        $this->setValidationText($validationText);
-    }
-
-
-    /**
-     * @param string $json
-     * @return Required
-     */
-    public static function fromJson(string $json): Required
-    {
-        $json_data_handler = new JsonDataHandler();
-        $json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
-        $data           = $json_data_handler->decodeJson($json);
-        $required       = $data->required ?? false;
-        $validationText = $data->validationText ?? '';
-        return new Required($json_data_handler, $required, $validationText);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return [
-            'required'       => $this->required,
-            'validationText' => $this->validationText,
-        ];
-    }
-
-
-    /**
-     * @return string
-     */
-    public function toJson(): string
-    {
-        return $this->json_data_handler->encodeData($this->toArray());
-    }
-
-
-    /**
-     *
-     *
-     * @return bool
-     */
-    public function isRequired(): ?bool
-    {
-        return $this->required;
-    }
-
-
-    /**
-     * @param bool|int|string $required
-     */
-    public function setRequired($required = true)
-    {
-        $this->required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function validationText(): ?string
-    {
-        return $this->validationText;
-    }
-
-
-    /**
-     * @param string $validationText
-     */
-    public function setValidationText(string $validationText)
-    {
-        $this->validationText = sanitize_text_field($validationText);
-    }
+	/**
+	 * @var JsonDataHandler
+	 */
+	private $json_data_handler;
+
+	/** Whether or not the input must be supplied with a value in order to complete the form.
+	 *
+	 * @var bool
+	 */
+	private $required;
+
+	/**
+	 * Custom validation text displayed alongside a required form input to assist users with completing the form.
+	 *
+	 * @var string
+	 */
+	private $validationText;
+
+
+	/**
+	 * Required constructor.
+	 *
+	 * @param JsonDataHandler $json_data_handler
+	 * @param bool            $required
+	 * @param string          $validationText
+	 */
+	public function __construct(JsonDataHandler $json_data_handler, bool $required, string $validationText)
+	{
+		$this->json_data_handler = $json_data_handler;
+		$this->setRequired($required);
+		$this->setValidationText($validationText);
+	}
+
+
+	/**
+	 * @param string $json
+	 * @return Required
+	 */
+	public static function fromJson(string $json): Required
+	{
+		$json_data_handler = new JsonDataHandler();
+		$json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
+		$data           = $json_data_handler->decodeJson($json);
+		$required       = $data->required ?? false;
+		$validationText = $data->validationText ?? '';
+		return new Required($json_data_handler, $required, $validationText);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return [
+			'required'       => $this->required,
+			'validationText' => $this->validationText,
+		];
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function toJson(): string
+	{
+		return $this->json_data_handler->encodeData($this->toArray());
+	}
+
+
+	/**
+	 *
+	 *
+	 * @return bool
+	 */
+	public function isRequired(): ?bool
+	{
+		return $this->required;
+	}
+
+
+	/**
+	 * @param bool|int|string $required
+	 */
+	public function setRequired($required = true)
+	{
+		$this->required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function validationText(): ?string
+	{
+		return $this->validationText;
+	}
+
+
+	/**
+	 * @param string $validationText
+	 */
+	public function setValidationText(string $validationText)
+	{
+		$this->validationText = sanitize_text_field($validationText);
+	}
 }

core/services/form/meta/Attributes.php

Indentation +178 added lines, -178 removed lines

@@ -17,182 +17,182 @@
 class Attributes
 {
 
-    /**
-     * @var JsonDataHandler
-     */
-    private $json_data_handler;
-
-    /**
-     * @var InputTypes
-     */
-    private $input_types;
-
-    /**
-     * @var array
-     */
-    private $attributes = [];
-
-    /**
-     * @var array
-     */
-    private $attribute_types = [
-        'accept'          => 'string',
-        'accesskey'       => 'string',
-        'alt'             => 'string',
-        'autocomplete'    => 'bool',
-        'autofocus'       => 'bool',
-        'checked'         => 'bool',
-        // Custom HTML classes to be applied to the form input's container
-        'class'           => 'string',
-        'contenteditable' => 'bool',
-        'dir'             => 'string',
-        'disabled'        => 'bool',
-        'height'          => 'string',
-        'hidden'          => 'bool',
-        'id'              => 'string',
-        'list'            => 'string',
-        // Maximum numeric value allowed for form input answer.
-        'max'             => 'int',
-        // Maximum characters allowed for form input answer.
-        'maxlength'       => 'int',
-        // Minimum numeric value allowed for form input answer.
-        'min'             => 'int',
-        'multiple'        => 'bool',
-        'name'            => 'string',
-        'pattern'         => 'string',
-        // Example text displayed within an input to assist users with completing the form.
-        'placeholder'     => 'string',
-        'readonly'        => 'bool',
-        'size'            => 'int',
-        'spellcheck'      => 'bool',
-        'step'            => 'float',
-        'style'           => 'string',
-        'tabindex'        => 'int',
-        'title'           => 'string',
-        'translate'       => 'bool',
-        // Form input type. Values correspond to the Input::TYPE_* constants.
-        'type'            => 'string',
-        'value'           => 'string',
-        'width'           => 'string',
-    ];
-
-
-    /**
-     * Attributes constructor.
-     *
-     * @param JsonDataHandler $json_data_handler
-     * @param InputTypes      $input_types
-     * @param array           $attributes
-     */
-    public function __construct(JsonDataHandler $json_data_handler, array $attributes, InputTypes $input_types)
-    {
-        $this->json_data_handler = $json_data_handler;
-        $this->input_types = $input_types;
-        $this->setAttributes($attributes);
-    }
-
-
-    /**
-     * @param string $json
-     * @return Attributes
-     */
-    public static function fromJson(string $json): Attributes
-    {
-        $json_data_handler = new JsonDataHandler();
-        $json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
-        $attributes = $json_data_handler->decodeJson($json);
-        return LoaderFactory::getNew(Attributes::class, [ $json_data_handler, $attributes ]);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return $this->attributes();
-    }
-
-
-    /**
-     * @return string
-     */
-    public function toJson(): string
-    {
-        return $this->json_data_handler->encodeData($this->attributes());
-    }
-
-
-    /**
-     * @param string                $attribute
-     * @param bool|float|int|string $value
-     * @return bool|float|int|string
-     */
-    private function sanitize(string $attribute, $value)
-    {
-        if ($attribute === 'type') {
-            $valid_types = $this->input_types->validTypeOptions();
-            return in_array($value, $valid_types, true) ?: Text::TYPE_TEXT;
-        }
-        $type = $this->attribute_types[ $attribute ] ?? 'string';
-        switch ($type) {
-            case 'bool':
-                return filter_var($value, FILTER_VALIDATE_BOOLEAN);
-            case 'int':
-                return filter_var($value, FILTER_SANITIZE_NUMBER_INT);
-            case 'float':
-                return filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-            case 'string':
-            default:
-                return filter_var(
-                    $value,
-                    FILTER_SANITIZE_STRING,
-                    FILTER_FLAG_ENCODE_LOW | FILTER_FLAG_ENCODE_HIGH | FILTER_FLAG_ENCODE_AMP
-                );
-        }
-    }
-
-
-    /**
-     * Custom HTML classes to be applied to this form input's help text.
-     * returns a concatenated string unless $as_array is set to true
-     *
-     * @return array
-     */
-    public function attributes(): array
-    {
-        return $this->attributes;
-    }
-
-
-    /**
-     * @param string                $attribute
-     * @param bool|float|int|string $value
-     */
-    public function addAttribute(string $attribute, $value): void
-    {
-        if (array_key_exists($attribute, $this->attributes)) {
-            $this->attributes[ $attribute ] = $this->sanitize($attribute, $value);
-        }
-    }
-
-
-    /**
-     * @param string $attribute
-     */
-    public function removeAttribute(string $attribute): void
-    {
-        unset($this->attributes[ $attribute ]);
-    }
-
-
-    /**
-     * @param array $attributes array where keys are the attribute name and values are the attribute's value
-     */
-    public function setAttributes(array $attributes): void
-    {
-        foreach ($attributes as $attribute => $value) {
-            $this->addAttribute($attribute, $value);
-        }
-    }
+	/**
+	 * @var JsonDataHandler
+	 */
+	private $json_data_handler;
+
+	/**
+	 * @var InputTypes
+	 */
+	private $input_types;
+
+	/**
+	 * @var array
+	 */
+	private $attributes = [];
+
+	/**
+	 * @var array
+	 */
+	private $attribute_types = [
+		'accept'          => 'string',
+		'accesskey'       => 'string',
+		'alt'             => 'string',
+		'autocomplete'    => 'bool',
+		'autofocus'       => 'bool',
+		'checked'         => 'bool',
+		// Custom HTML classes to be applied to the form input's container
+		'class'           => 'string',
+		'contenteditable' => 'bool',
+		'dir'             => 'string',
+		'disabled'        => 'bool',
+		'height'          => 'string',
+		'hidden'          => 'bool',
+		'id'              => 'string',
+		'list'            => 'string',
+		// Maximum numeric value allowed for form input answer.
+		'max'             => 'int',
+		// Maximum characters allowed for form input answer.
+		'maxlength'       => 'int',
+		// Minimum numeric value allowed for form input answer.
+		'min'             => 'int',
+		'multiple'        => 'bool',
+		'name'            => 'string',
+		'pattern'         => 'string',
+		// Example text displayed within an input to assist users with completing the form.
+		'placeholder'     => 'string',
+		'readonly'        => 'bool',
+		'size'            => 'int',
+		'spellcheck'      => 'bool',
+		'step'            => 'float',
+		'style'           => 'string',
+		'tabindex'        => 'int',
+		'title'           => 'string',
+		'translate'       => 'bool',
+		// Form input type. Values correspond to the Input::TYPE_* constants.
+		'type'            => 'string',
+		'value'           => 'string',
+		'width'           => 'string',
+	];
+
+
+	/**
+	 * Attributes constructor.
+	 *
+	 * @param JsonDataHandler $json_data_handler
+	 * @param InputTypes      $input_types
+	 * @param array           $attributes
+	 */
+	public function __construct(JsonDataHandler $json_data_handler, array $attributes, InputTypes $input_types)
+	{
+		$this->json_data_handler = $json_data_handler;
+		$this->input_types = $input_types;
+		$this->setAttributes($attributes);
+	}
+
+
+	/**
+	 * @param string $json
+	 * @return Attributes
+	 */
+	public static function fromJson(string $json): Attributes
+	{
+		$json_data_handler = new JsonDataHandler();
+		$json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
+		$attributes = $json_data_handler->decodeJson($json);
+		return LoaderFactory::getNew(Attributes::class, [ $json_data_handler, $attributes ]);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return $this->attributes();
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function toJson(): string
+	{
+		return $this->json_data_handler->encodeData($this->attributes());
+	}
+
+
+	/**
+	 * @param string                $attribute
+	 * @param bool|float|int|string $value
+	 * @return bool|float|int|string
+	 */
+	private function sanitize(string $attribute, $value)
+	{
+		if ($attribute === 'type') {
+			$valid_types = $this->input_types->validTypeOptions();
+			return in_array($value, $valid_types, true) ?: Text::TYPE_TEXT;
+		}
+		$type = $this->attribute_types[ $attribute ] ?? 'string';
+		switch ($type) {
+			case 'bool':
+				return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+			case 'int':
+				return filter_var($value, FILTER_SANITIZE_NUMBER_INT);
+			case 'float':
+				return filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			case 'string':
+			default:
+				return filter_var(
+					$value,
+					FILTER_SANITIZE_STRING,
+					FILTER_FLAG_ENCODE_LOW | FILTER_FLAG_ENCODE_HIGH | FILTER_FLAG_ENCODE_AMP
+				);
+		}
+	}
+
+
+	/**
+	 * Custom HTML classes to be applied to this form input's help text.
+	 * returns a concatenated string unless $as_array is set to true
+	 *
+	 * @return array
+	 */
+	public function attributes(): array
+	{
+		return $this->attributes;
+	}
+
+
+	/**
+	 * @param string                $attribute
+	 * @param bool|float|int|string $value
+	 */
+	public function addAttribute(string $attribute, $value): void
+	{
+		if (array_key_exists($attribute, $this->attributes)) {
+			$this->attributes[ $attribute ] = $this->sanitize($attribute, $value);
+		}
+	}
+
+
+	/**
+	 * @param string $attribute
+	 */
+	public function removeAttribute(string $attribute): void
+	{
+		unset($this->attributes[ $attribute ]);
+	}
+
+
+	/**
+	 * @param array $attributes array where keys are the attribute name and values are the attribute's value
+	 */
+	public function setAttributes(array $attributes): void
+	{
+		foreach ($attributes as $attribute => $value) {
+			$this->addAttribute($attribute, $value);
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -101,7 +101,7 @@ 
         $json_data_handler = new JsonDataHandler();
         $json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
         $attributes = $json_data_handler->decodeJson($json);
-        return LoaderFactory::getNew(Attributes::class, [ $json_data_handler, $attributes ]);
+        return LoaderFactory::getNew(Attributes::class, [$json_data_handler, $attributes]);
     }
 
 
@@ -134,7 +134,7 @@ 
             $valid_types = $this->input_types->validTypeOptions();
             return in_array($value, $valid_types, true) ?: Text::TYPE_TEXT;
         }
-        $type = $this->attribute_types[ $attribute ] ?? 'string';
+        $type = $this->attribute_types[$attribute] ?? 'string';
         switch ($type) {
             case 'bool':
                 return filter_var($value, FILTER_VALIDATE_BOOLEAN);
@@ -172,7 +172,7 @@ 
     public function addAttribute(string $attribute, $value): void
     {
         if (array_key_exists($attribute, $this->attributes)) {
-            $this->attributes[ $attribute ] = $this->sanitize($attribute, $value);
+            $this->attributes[$attribute] = $this->sanitize($attribute, $value);
         }
     }
 
@@ -182,7 +182,7 @@ 
      */
     public function removeAttribute(string $attribute): void
     {
-        unset($this->attributes[ $attribute ]);
+        unset($this->attributes[$attribute]);
     }
 
 

core/services/form/meta/FormLabel.php

Indentation +140 added lines, -140 removed lines

@@ -15,144 +15,144 @@
 class FormLabel
 {
 
-    /**
-     * @var JsonDataHandler
-     */
-    private $json_data_handler;
-
-    /**
-     * Input label displayed in the admin to help differentiate input from others
-     *
-     * @var string
-     */
-    private $adminLabel;
-
-    /**
-     * Input label displayed on public forms, ie: the actual question text.
-     *
-     * @var string
-     */
-    private $publicLabel;
-
-    /**
-     * @var bool
-     */
-    private $showLabel;
-
-
-    /**
-     * FormLabel constructor.
-     *
-     * @param JsonDataHandler $json_data_handler
-     * @param string          $adminLabel
-     * @param string          $publicLabel
-     * @param bool            $showLabel
-     */
-    public function __construct(
-        JsonDataHandler $json_data_handler,
-        string $adminLabel,
-        string $publicLabel,
-        bool $showLabel
-    ) {
-        $this->json_data_handler = $json_data_handler;
-        $this->setAdminLabel($adminLabel);
-        $this->setPublicLabel($publicLabel);
-        $this->setShowLabel($showLabel);
-    }
-
-
-    /**
-     * @param string $json
-     * @return FormLabel
-     */
-    public static function fromJson(string $json): FormLabel
-    {
-        $json_data_handler = new JsonDataHandler();
-        $json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
-        $data        = $json_data_handler->decodeJson($json);
-        $adminLabel  = $data->adminLabel ?? '';
-        $publicLabel = $data->publicLabel ?? '';
-        $showLabel   = $data->showLabel ?? false;
-        return new FormLabel($json_data_handler, $adminLabel, $publicLabel, $showLabel);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return [
-            'adminLabel'  => $this->adminLabel,
-            'publicLabel' => $this->publicLabel,
-            'showLabel'   => $this->showLabel,
-        ];
-    }
-
-
-    /**
-     * @return string
-     */
-    public function toJson(): string
-    {
-        return $this->json_data_handler->encodeData($this->toArray());
-    }
-
-
-    /**
-     * Input label displayed in the admin to help differentiate input from others
-     *
-     * @return string
-     */
-    public function adminLabel(): string
-    {
-        return $this->adminLabel;
-    }
-
-
-    /**
-     * @param string $adminLabel
-     */
-    public function setAdminLabel(string $adminLabel): void
-    {
-        $this->adminLabel = sanitize_text_field($adminLabel);
-    }
-
-
-    /**
-     * Input label displayed on public forms, ie: the actual question text.
-     *
-     * @return string
-     */
-    public function publicLabel(): string
-    {
-        return $this->publicLabel;
-    }
-
-
-    /**
-     * @param string $publicLabel
-     */
-    public function setPublicLabel(string $publicLabel): void
-    {
-        $this->publicLabel = sanitize_text_field($publicLabel);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function showLabel(): bool
-    {
-        return $this->showLabel;
-    }
-
-
-    /**
-     * @param bool|int|string $showLabel
-     */
-    public function setShowLabel($showLabel): void
-    {
-        $this->showLabel = filter_var($showLabel, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * @var JsonDataHandler
+	 */
+	private $json_data_handler;
+
+	/**
+	 * Input label displayed in the admin to help differentiate input from others
+	 *
+	 * @var string
+	 */
+	private $adminLabel;
+
+	/**
+	 * Input label displayed on public forms, ie: the actual question text.
+	 *
+	 * @var string
+	 */
+	private $publicLabel;
+
+	/**
+	 * @var bool
+	 */
+	private $showLabel;
+
+
+	/**
+	 * FormLabel constructor.
+	 *
+	 * @param JsonDataHandler $json_data_handler
+	 * @param string          $adminLabel
+	 * @param string          $publicLabel
+	 * @param bool            $showLabel
+	 */
+	public function __construct(
+		JsonDataHandler $json_data_handler,
+		string $adminLabel,
+		string $publicLabel,
+		bool $showLabel
+	) {
+		$this->json_data_handler = $json_data_handler;
+		$this->setAdminLabel($adminLabel);
+		$this->setPublicLabel($publicLabel);
+		$this->setShowLabel($showLabel);
+	}
+
+
+	/**
+	 * @param string $json
+	 * @return FormLabel
+	 */
+	public static function fromJson(string $json): FormLabel
+	{
+		$json_data_handler = new JsonDataHandler();
+		$json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
+		$data        = $json_data_handler->decodeJson($json);
+		$adminLabel  = $data->adminLabel ?? '';
+		$publicLabel = $data->publicLabel ?? '';
+		$showLabel   = $data->showLabel ?? false;
+		return new FormLabel($json_data_handler, $adminLabel, $publicLabel, $showLabel);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return [
+			'adminLabel'  => $this->adminLabel,
+			'publicLabel' => $this->publicLabel,
+			'showLabel'   => $this->showLabel,
+		];
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function toJson(): string
+	{
+		return $this->json_data_handler->encodeData($this->toArray());
+	}
+
+
+	/**
+	 * Input label displayed in the admin to help differentiate input from others
+	 *
+	 * @return string
+	 */
+	public function adminLabel(): string
+	{
+		return $this->adminLabel;
+	}
+
+
+	/**
+	 * @param string $adminLabel
+	 */
+	public function setAdminLabel(string $adminLabel): void
+	{
+		$this->adminLabel = sanitize_text_field($adminLabel);
+	}
+
+
+	/**
+	 * Input label displayed on public forms, ie: the actual question text.
+	 *
+	 * @return string
+	 */
+	public function publicLabel(): string
+	{
+		return $this->publicLabel;
+	}
+
+
+	/**
+	 * @param string $publicLabel
+	 */
+	public function setPublicLabel(string $publicLabel): void
+	{
+		$this->publicLabel = sanitize_text_field($publicLabel);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function showLabel(): bool
+	{
+		return $this->showLabel;
+	}
+
+
+	/**
+	 * @param bool|int|string $showLabel
+	 */
+	public function setShowLabel($showLabel): void
+	{
+		$this->showLabel = filter_var($showLabel, FILTER_VALIDATE_BOOLEAN);
+	}
 }