eventespresso / event-espresso-core

core/libraries/form_sections/strategies/layout/EE_Table_Row_Layout.strategy.php

Indentation +83 added lines, -83 removed lines

@@ -13,98 +13,98 @@
 class EE_Table_Row_Layout extends EE_Form_Section_Layout_Base
 {
 
-    private bool $add_ids_and_classes;
+	private bool $add_ids_and_classes;
 
-    public function __construct(bool $add_ids_and_classes = true)
-    {
-        $this->add_ids_and_classes = $add_ids_and_classes;
-        parent::__construct();
-    }
+	public function __construct(bool $add_ids_and_classes = true)
+	{
+		$this->add_ids_and_classes = $add_ids_and_classes;
+		parent::__construct();
+	}
 
 
-    /**
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_begin($additional_args = [])
-    {
-        return $this->add_ids_and_classes
-            ? EEH_HTML::tr(
-                '',
-                $additional_args['id'] ?? '',
-                $additional_args['class'] ?? '',
-                $additional_args['style'] ?? '',
-                $additional_args['other'] ?? ''
-            )
-            : EEH_HTML::tr();
-    }
+	/**
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_begin($additional_args = [])
+	{
+		return $this->add_ids_and_classes
+			? EEH_HTML::tr(
+				'',
+				$additional_args['id'] ?? '',
+				$additional_args['class'] ?? '',
+				$additional_args['style'] ?? '',
+				$additional_args['other'] ?? ''
+			)
+			: EEH_HTML::tr();
+	}
 
 
-    /**
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_end($additional_args = [])
-    {
-        return $this->add_ids_and_classes
-            ? EEH_HTML::trx(
-                $additional_args['id'] ?? '',
-                $additional_args['class'] ?? ''
-            )
-            : EEH_HTML::trx();
-    }
+	/**
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_end($additional_args = [])
+	{
+		return $this->add_ids_and_classes
+			? EEH_HTML::trx(
+				$additional_args['id'] ?? '',
+				$additional_args['class'] ?? ''
+			)
+			: EEH_HTML::trx();
+	}
 
 
-    /**
-     * Lays out the input, including label and errors
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     * @throws EE_Error
-     */
-    public function layout_input($input)
-    {
-        if ($input instanceof EE_Hidden_Input) {
-            return $input->get_html_for_input();
-        }
+	/**
+	 * Lays out the input, including label and errors
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function layout_input($input)
+	{
+		if ($input instanceof EE_Hidden_Input) {
+			return $input->get_html_for_input();
+		}
 
-        $html = $input->get_html_for_input();
-        $html .= $input->get_html_for_errors() != ''
-            ? EEH_HTML::nl() . $input->get_html_for_errors()
-            : '';
-        $html .= $input->get_html_for_help() != ''
-            ? EEH_HTML::nl() . $input->get_html_for_help()
-            : '';
+		$html = $input->get_html_for_input();
+		$html .= $input->get_html_for_errors() != ''
+			? EEH_HTML::nl() . $input->get_html_for_errors()
+			: '';
+		$html .= $input->get_html_for_help() != ''
+			? EEH_HTML::nl() . $input->get_html_for_help()
+			: '';
 
-        return $this->add_ids_and_classes
-            ? EEH_HTML::td(
-                $html,
-                $input->html_id(),
-                $input->html_class(),
-                $input->html_style(),
-                $input->other_html_attributes()
-            )
-            : EEH_HTML::td($html);
-    }
+		return $this->add_ids_and_classes
+			? EEH_HTML::td(
+				$html,
+				$input->html_id(),
+				$input->html_class(),
+				$input->html_style(),
+				$input->other_html_attributes()
+			)
+			: EEH_HTML::td($html);
+	}
 
 
-    /**
-     * Lays out a table cell for the subsection.
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     * @throws EE_Error
-     */
-    public function layout_subsection($form_section)
-    {
-        return $this->add_ids_and_classes
-            ? EEH_HTML::td(
-                $form_section->get_html(),
-                $form_section->html_id(),
-                $form_section->html_class(),
-                $form_section->html_style(),
-                $form_section->other_html_attributes()
-            )
-            : EEH_HTML::td($form_section->get_html());
-    }
+	/**
+	 * Lays out a table cell for the subsection.
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function layout_subsection($form_section)
+	{
+		return $this->add_ids_and_classes
+			? EEH_HTML::td(
+				$form_section->get_html(),
+				$form_section->html_id(),
+				$form_section->html_class(),
+				$form_section->html_style(),
+				$form_section->other_html_attributes()
+			)
+			: EEH_HTML::td($form_section->get_html());
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -70,10 +70,10 @@
 
         $html = $input->get_html_for_input();
         $html .= $input->get_html_for_errors() != ''
-            ? EEH_HTML::nl() . $input->get_html_for_errors()
+            ? EEH_HTML::nl().$input->get_html_for_errors()
             : '';
         $html .= $input->get_html_for_help() != ''
-            ? EEH_HTML::nl() . $input->get_html_for_help()
+            ? EEH_HTML::nl().$input->get_html_for_help()
             : '';
 
         return $this->add_ids_and_classes

core/libraries/form_sections/strategies/normalization/EE_Text_Normalization.strategy.php

Indentation +35 added lines, -35 removed lines

@@ -10,42 +10,42 @@
  */
 class EE_Text_Normalization extends EE_Normalization_Strategy_Base
 {
-    /**
-     * @param string $value_to_normalize
-     * @return array|mixed|string
-     */
-    public function normalize($value_to_normalize)
-    {
-        if (is_array($value_to_normalize)) {
-            return (string) array_shift($value_to_normalize);
-        }
-        // consider `"null"` values to be equivalent to null.
-        if ($value_to_normalize === '' || $value_to_normalize === null) {
-            return null;
-        }
-        return (string) $value_to_normalize;
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return array|mixed|string
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if (is_array($value_to_normalize)) {
+			return (string) array_shift($value_to_normalize);
+		}
+		// consider `"null"` values to be equivalent to null.
+		if ($value_to_normalize === '' || $value_to_normalize === null) {
+			return null;
+		}
+		return (string) $value_to_normalize;
+	}
 
 
 
-    /**
-     * IF it's a string in PHP, it will be a string in the HTML form. easy
-     *
-     * @param string $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        // form generation can sometimes result in values being arrays, so we'll just grab the first value
-        if (is_array($normalized_value)) {
-            $normalized_value = array_shift($normalized_value);
-        }
-        // account for default "select here" option values
-        if ($normalized_value === null) {
-            return '';
-        }
-        // double-check it's a string. It's possible this value was a question option that happened to be a numeric
-        // string, in which case PHP has automatically converted it to an integer!
-        return (string) $normalized_value;
-    }
+	/**
+	 * IF it's a string in PHP, it will be a string in the HTML form. easy
+	 *
+	 * @param string $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		// form generation can sometimes result in values being arrays, so we'll just grab the first value
+		if (is_array($normalized_value)) {
+			$normalized_value = array_shift($normalized_value);
+		}
+		// account for default "select here" option values
+		if ($normalized_value === null) {
+			return '';
+		}
+		// double-check it's a string. It's possible this value was a question option that happened to be a numeric
+		// string, in which case PHP has automatically converted it to an integer!
+		return (string) $normalized_value;
+	}
 }

core/libraries/form_sections/strategies/normalization/EE_Int_Normalization.strategy.php

Indentation +72 added lines, -72 removed lines

@@ -10,86 +10,86 @@
  */
 class EE_Int_Normalization extends EE_Normalization_Strategy_Base
 {
-    /*
+	/*
      * regex pattern that matches for the following:
      *      * optional negative sign
      *      * one or more digits
      */
-    const REGEX = '/^(-?)(\d+)(?:\.0+)?$/';
+	const REGEX = '/^(-?)(\d+)(?:\.0+)?$/';
 
 
 
-    /**
-     * @param string $value_to_normalize
-     * @return int|null
-     * @throws EE_Validation_Error
-     */
-    public function normalize($value_to_normalize)
-    {
-        if ($value_to_normalize === null) {
-            return null;
-        }
-        if (is_int($value_to_normalize) || is_float($value_to_normalize)) {
-            return (int) $value_to_normalize;
-        }
-        if (! is_string($value_to_normalize)) {
-            throw new EE_Validation_Error(
-                sprintf(
-                    esc_html__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
-                    print_r($value_to_normalize, true),
-                    gettype($value_to_normalize)
-                )
-            );
-        }
-        $value_to_normalize = filter_var(
-            $value_to_normalize,
-            FILTER_SANITIZE_NUMBER_FLOAT,
-            FILTER_FLAG_ALLOW_FRACTION
-        );
-        if ($value_to_normalize === '') {
-            return null;
-        }
-        $matches = array();
-        if (preg_match(EE_Int_Normalization::REGEX, $value_to_normalize, $matches)) {
-            if (count($matches) === 3) {
-                // if first match is the negative sign,
-                // then the number needs to be multiplied by -1 to remain negative
-                return $matches[1] === '-' ? (int) $matches[2] * -1 : (int) $matches[2];
-            }
-        }
-        // find if this input has a int validation strategy
-        // in which case, use its message
-        $validation_error_message = null;
-        foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
-            if ($validation_strategy instanceof EE_Int_Validation_Strategy) {
-                $validation_error_message = $validation_strategy->get_validation_error_message();
-            }
-        }
-        // this really shouldn't ever happen because fields with a int normalization strategy
-        // should also have a int validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
-            $default_validation_strategy = new EE_Int_Validation_Strategy();
-            $validation_error_message = $default_validation_strategy->get_validation_error_message();
-        }
-        throw new EE_Validation_Error($validation_error_message, 'numeric_only');
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return int|null
+	 * @throws EE_Validation_Error
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if ($value_to_normalize === null) {
+			return null;
+		}
+		if (is_int($value_to_normalize) || is_float($value_to_normalize)) {
+			return (int) $value_to_normalize;
+		}
+		if (! is_string($value_to_normalize)) {
+			throw new EE_Validation_Error(
+				sprintf(
+					esc_html__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
+					print_r($value_to_normalize, true),
+					gettype($value_to_normalize)
+				)
+			);
+		}
+		$value_to_normalize = filter_var(
+			$value_to_normalize,
+			FILTER_SANITIZE_NUMBER_FLOAT,
+			FILTER_FLAG_ALLOW_FRACTION
+		);
+		if ($value_to_normalize === '') {
+			return null;
+		}
+		$matches = array();
+		if (preg_match(EE_Int_Normalization::REGEX, $value_to_normalize, $matches)) {
+			if (count($matches) === 3) {
+				// if first match is the negative sign,
+				// then the number needs to be multiplied by -1 to remain negative
+				return $matches[1] === '-' ? (int) $matches[2] * -1 : (int) $matches[2];
+			}
+		}
+		// find if this input has a int validation strategy
+		// in which case, use its message
+		$validation_error_message = null;
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Int_Validation_Strategy) {
+				$validation_error_message = $validation_strategy->get_validation_error_message();
+			}
+		}
+		// this really shouldn't ever happen because fields with a int normalization strategy
+		// should also have a int validation strategy, but in case it doesn't use the default
+		if (! $validation_error_message) {
+			$default_validation_strategy = new EE_Int_Validation_Strategy();
+			$validation_error_message = $default_validation_strategy->get_validation_error_message();
+		}
+		throw new EE_Validation_Error($validation_error_message, 'numeric_only');
+	}
 
 
 
-    /**
-     * Converts the int into a string for use in teh html form
-     *
-     * @param int $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        if ($normalized_value === null || $normalized_value === '') {
-            return '';
-        }
-        if (empty($normalized_value)) {
-            return '0';
-        }
-        return "$normalized_value";
-    }
+	/**
+	 * Converts the int into a string for use in teh html form
+	 *
+	 * @param int $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		if ($normalized_value === null || $normalized_value === '') {
+			return '';
+		}
+		if (empty($normalized_value)) {
+			return '0';
+		}
+		return "$normalized_value";
+	}
 }

core/libraries/form_sections/strategies/display/EE_Select_Multiple_Display_Strategy.strategy.php

Indentation +59 added lines, -59 removed lines

@@ -9,68 +9,68 @@
  */
 class EE_Select_Multiple_Display_Strategy extends EE_Select_Display_Strategy
 {
-    /**
-     * @return string of html to display the field
-     * @throws EE_Error
-     */
-    public function display(): string
-    {
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
-            throw new EE_Error(
-                esc_html__(
-                    'Cannot use Select Multiple Display Strategy with an input that doesn\'t have options',
-                    "event_espresso"
-                )
-            );
-        }
+	/**
+	 * @return string of html to display the field
+	 * @throws EE_Error
+	 */
+	public function display(): string
+	{
+		if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+			throw new EE_Error(
+				esc_html__(
+					'Cannot use Select Multiple Display Strategy with an input that doesn\'t have options',
+					"event_espresso"
+				)
+			);
+		}
 
-        $html = EEH_HTML::nl(0, 'select');
-        $html .= '<select multiple';
-        $html .= ' id="' . $this->_input->html_id() . '"';
-        $html .= ' name="' . $this->_input->html_name() . '[]"';
-        $class = $this->_input->required()
-            ? $this->_input->required_css_class() . ' ' . $this->_input->html_class()
-            : $this->_input->html_class();
-        $html .= $class ? ' class="' . $class . '"' : '';
-        if ($this->_input->hasLabel()) {
-            $html .= ' aria-labelledby="' . $this->_input->html_label_id() . '"';
-        }
-        // add html5 required
-        $html .= $this->_input->required() ? ' required' : '';
-        $html .= $this->_input->html_style() ? ' style="' . $this->_input->html_style() . '"' : '';
-        $html .= $this->_input->other_html_attributes();
-        $html .= $this->dataAttributesString($this->_input->dataAttributes());
-        $html .= '>';
+		$html = EEH_HTML::nl(0, 'select');
+		$html .= '<select multiple';
+		$html .= ' id="' . $this->_input->html_id() . '"';
+		$html .= ' name="' . $this->_input->html_name() . '[]"';
+		$class = $this->_input->required()
+			? $this->_input->required_css_class() . ' ' . $this->_input->html_class()
+			: $this->_input->html_class();
+		$html .= $class ? ' class="' . $class . '"' : '';
+		if ($this->_input->hasLabel()) {
+			$html .= ' aria-labelledby="' . $this->_input->html_label_id() . '"';
+		}
+		// add html5 required
+		$html .= $this->_input->required() ? ' required' : '';
+		$html .= $this->_input->html_style() ? ' style="' . $this->_input->html_style() . '"' : '';
+		$html .= $this->_input->other_html_attributes();
+		$html .= $this->dataAttributesString($this->_input->dataAttributes());
+		$html .= '>';
 
-        EEH_HTML::indent(1, 'select');
-        if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
-            throw new EE_Error(
-                esc_html__(
-                    "Select multiple display strategy does not allow for nested arrays of options.",
-                    "event_espresso"
-                )
-            );
-        } else {
-            $html .= $this->_display_options($this->_input->options());
-        }
+		EEH_HTML::indent(1, 'select');
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
+			throw new EE_Error(
+				esc_html__(
+					"Select multiple display strategy does not allow for nested arrays of options.",
+					"event_espresso"
+				)
+			);
+		} else {
+			$html .= $this->_display_options($this->_input->options());
+		}
 
-        $html .= EEH_HTML::nl(-1, 'select') . "</select>";
-        return $html;
-    }
+		$html .= EEH_HTML::nl(-1, 'select') . "</select>";
+		return $html;
+	}
 
 
-    /**
-     * Checks if that $value is one of the selected ones
-     *
-     * @param string|int $value unnormalized value option (string)
-     * @return bool
-     */
-    protected function _check_if_option_selected($value): bool
-    {
-        $selected_options = $this->_input->raw_value();
-        if (empty($selected_options)) {
-            return false;
-        }
-        return in_array($value, $selected_options);
-    }
+	/**
+	 * Checks if that $value is one of the selected ones
+	 *
+	 * @param string|int $value unnormalized value option (string)
+	 * @return bool
+	 */
+	protected function _check_if_option_selected($value): bool
+	{
+		$selected_options = $this->_input->raw_value();
+		if (empty($selected_options)) {
+			return false;
+		}
+		return in_array($value, $selected_options);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
      */
     public function display(): string
     {
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+        if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
             throw new EE_Error(
                 esc_html__(
                     'Cannot use Select Multiple Display Strategy with an input that doesn\'t have options',
@@ -26,18 +26,18 @@ 
 
         $html = EEH_HTML::nl(0, 'select');
         $html .= '<select multiple';
-        $html .= ' id="' . $this->_input->html_id() . '"';
-        $html .= ' name="' . $this->_input->html_name() . '[]"';
+        $html .= ' id="'.$this->_input->html_id().'"';
+        $html .= ' name="'.$this->_input->html_name().'[]"';
         $class = $this->_input->required()
-            ? $this->_input->required_css_class() . ' ' . $this->_input->html_class()
+            ? $this->_input->required_css_class().' '.$this->_input->html_class()
             : $this->_input->html_class();
-        $html .= $class ? ' class="' . $class . '"' : '';
+        $html .= $class ? ' class="'.$class.'"' : '';
         if ($this->_input->hasLabel()) {
-            $html .= ' aria-labelledby="' . $this->_input->html_label_id() . '"';
+            $html .= ' aria-labelledby="'.$this->_input->html_label_id().'"';
         }
         // add html5 required
         $html .= $this->_input->required() ? ' required' : '';
-        $html .= $this->_input->html_style() ? ' style="' . $this->_input->html_style() . '"' : '';
+        $html .= $this->_input->html_style() ? ' style="'.$this->_input->html_style().'"' : '';
         $html .= $this->_input->other_html_attributes();
         $html .= $this->dataAttributesString($this->_input->dataAttributes());
         $html .= '>';
@@ -54,7 +54,7 @@ 
             $html .= $this->_display_options($this->_input->options());
         }
 
-        $html .= EEH_HTML::nl(-1, 'select') . "</select>";
+        $html .= EEH_HTML::nl(-1, 'select')."</select>";
         return $html;
     }
 

core/libraries/form_sections/strategies/display/EE_Checkbox_Display_Strategy.strategy.php

Indentation +55 added lines, -55 removed lines

@@ -11,66 +11,66 @@
  */
 class EE_Checkbox_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
-    /**
-     * @return string of html to display the field
-     * @throws EE_Error
-     */
-    public function display(): string
-    {
-        $input = $this->get_input();
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        $html             = '';
-        if ($input->hasMultipleSelections() && ! is_array($input->raw_value()) && $input->raw_value() !== null) {
-            EE_Error::doing_it_wrong(
-                'EE_Checkbox_Display_Strategy::display()',
-                sprintf(
-                    esc_html_x(
-                        'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
-                        'Input values for checkboxes should be an array of values, but the value for input "form-input-id" is "form-input-value". Please verify that the input name is exactly "form_input_name[]"',
-                        'event_espresso'
-                    ),
-                    $input->html_id(),
-                    var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
-                ),
-                '4.8.1'
-            );
-        }
-        $input_raw_value = (array) $input->raw_value();
-        foreach ($input->options() as $value => $display_text) {
-            $value   = $input->get_normalization_strategy()->unnormalize_one($value);
+	/**
+	 * @return string of html to display the field
+	 * @throws EE_Error
+	 */
+	public function display(): string
+	{
+		$input = $this->get_input();
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		$html             = '';
+		if ($input->hasMultipleSelections() && ! is_array($input->raw_value()) && $input->raw_value() !== null) {
+			EE_Error::doing_it_wrong(
+				'EE_Checkbox_Display_Strategy::display()',
+				sprintf(
+					esc_html_x(
+						'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
+						'Input values for checkboxes should be an array of values, but the value for input "form-input-id" is "form-input-value". Please verify that the input name is exactly "form_input_name[]"',
+						'event_espresso'
+					),
+					$input->html_id(),
+					var_export($input->raw_value(), true),
+					$input->html_name() . '[]'
+				),
+				'4.8.1'
+			);
+		}
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$value   = $input->get_normalization_strategy()->unnormalize_one($value);
 
-            $html_id = $this->get_sub_input_id($value);
+			$html_id = $this->get_sub_input_id($value);
 
-            $html_name = $input->html_name();
-            $html_name .= $input->hasMultipleSelections() ? '[]' : '';
+			$html_name = $input->html_name();
+			$html_name .= $input->hasMultipleSelections() ? '[]' : '';
 
-            $html    .= EEH_HTML::nl(0, 'checkbox');
-            $html    .= "
+			$html    .= EEH_HTML::nl(0, 'checkbox');
+			$html    .= "
                 <label for=\"$html_id\"
                        id=\"$html_id-lbl\"
                        class=\"ee-checkbox-label-after$label_size_class\"
                 >";
-            $html    .= EEH_HTML::nl(1, 'checkbox');
-            $html    .= '<input type="checkbox"';
-            $html    .= ' name="' . $html_name . '"';
-            $html    .= $html_id ? ' id="' . $html_id . '"' : '';
-            $html    .= $input->html_class() ? $input->html_class() ? ' class="' . $input->html_class() . '"' : '' : '';
-            $html    .= $input->html_style() ? $input->html_style() ? ' style="' . $input->html_style() . '"' : '' : '';
-            if ($input->hasLabel()) {
-                $html .= ' aria-labelledby="' . $html_id . '-lbl"';
-            }
-            $html    .= ' value="' . esc_attr($value) . '"';
-            $html    .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
-                ? ' checked'
-                : '';
-            $html    .= ' ' . $this->_input->other_html_attributes();
-            $html    .= ' data-question_label="' . $html_id . '-lbl"';
-            $html    .= '>&nbsp;';
-            $html    .= $display_text;
-            $html    .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
-        }
-        return $html;
-    }
+			$html    .= EEH_HTML::nl(1, 'checkbox');
+			$html    .= '<input type="checkbox"';
+			$html    .= ' name="' . $html_name . '"';
+			$html    .= $html_id ? ' id="' . $html_id . '"' : '';
+			$html    .= $input->html_class() ? $input->html_class() ? ' class="' . $input->html_class() . '"' : '' : '';
+			$html    .= $input->html_style() ? $input->html_style() ? ' style="' . $input->html_style() . '"' : '' : '';
+			if ($input->hasLabel()) {
+				$html .= ' aria-labelledby="' . $html_id . '-lbl"';
+			}
+			$html    .= ' value="' . esc_attr($value) . '"';
+			$html    .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
+				? ' checked'
+				: '';
+			$html    .= ' ' . $this->_input->other_html_attributes();
+			$html    .= ' data-question_label="' . $html_id . '-lbl"';
+			$html    .= '>&nbsp;';
+			$html    .= $display_text;
+			$html    .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+		}
+		return $html;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
                     ),
                     $input->html_id(),
                     var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
+                    $input->html_name().'[]'
                 ),
                 '4.8.1'
             );
@@ -54,22 +54,22 @@ 
                 >";
             $html    .= EEH_HTML::nl(1, 'checkbox');
             $html    .= '<input type="checkbox"';
-            $html    .= ' name="' . $html_name . '"';
-            $html    .= $html_id ? ' id="' . $html_id . '"' : '';
-            $html    .= $input->html_class() ? $input->html_class() ? ' class="' . $input->html_class() . '"' : '' : '';
-            $html    .= $input->html_style() ? $input->html_style() ? ' style="' . $input->html_style() . '"' : '' : '';
+            $html    .= ' name="'.$html_name.'"';
+            $html    .= $html_id ? ' id="'.$html_id.'"' : '';
+            $html    .= $input->html_class() ? $input->html_class() ? ' class="'.$input->html_class().'"' : '' : '';
+            $html    .= $input->html_style() ? $input->html_style() ? ' style="'.$input->html_style().'"' : '' : '';
             if ($input->hasLabel()) {
-                $html .= ' aria-labelledby="' . $html_id . '-lbl"';
+                $html .= ' aria-labelledby="'.$html_id.'-lbl"';
             }
-            $html    .= ' value="' . esc_attr($value) . '"';
+            $html    .= ' value="'.esc_attr($value).'"';
             $html    .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
                 ? ' checked'
                 : '';
-            $html    .= ' ' . $this->_input->other_html_attributes();
-            $html    .= ' data-question_label="' . $html_id . '-lbl"';
+            $html    .= ' '.$this->_input->other_html_attributes();
+            $html    .= ' data-question_label="'.$html_id.'-lbl"';
             $html    .= '>&nbsp;';
             $html    .= $display_text;
-            $html    .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+            $html    .= EEH_HTML::nl(-1, 'checkbox').'</label>';
         }
         return $html;
     }

core/libraries/form_sections/strategies/display/EE_Checkbox_Dropdown_Selector_Display_Strategy.strategy.php

Indentation +161 added lines, -161 removed lines

@@ -10,182 +10,182 @@
  */
 class EE_Checkbox_Dropdown_Selector_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
-    /**
-     * enqueues css and js, so that this can be called statically
-     */
-    public static function enqueue_styles_and_scripts()
-    {
-        wp_register_style(
-            'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
-            ['espresso_default'],
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_register_style(
-            'espresso_default',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-            ['dashicons'],
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('checkbox_dropdown_selector');
-        wp_register_script(
-            'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
-            ['jquery'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_localize_script(
-            'ticket_selector',
-            'eeDTS',
-            [
-                'maxChecked' => EE_Registry::instance()
-                    ->CFG
-                    ->template_settings
-                    ->EED_Ticket_Selector
-                    ->getDatetimeSelectorMaxChecked(),
-            ]
-        );
-        wp_enqueue_script('checkbox_dropdown_selector');
-    }
+	/**
+	 * enqueues css and js, so that this can be called statically
+	 */
+	public static function enqueue_styles_and_scripts()
+	{
+		wp_register_style(
+			'checkbox_dropdown_selector',
+			EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
+			['espresso_default'],
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_register_style(
+			'espresso_default',
+			EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+			['dashicons'],
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('checkbox_dropdown_selector');
+		wp_register_script(
+			'checkbox_dropdown_selector',
+			EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
+			['jquery'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_localize_script(
+			'ticket_selector',
+			'eeDTS',
+			[
+				'maxChecked' => EE_Registry::instance()
+					->CFG
+					->template_settings
+					->EED_Ticket_Selector
+					->getDatetimeSelectorMaxChecked(),
+			]
+		);
+		wp_enqueue_script('checkbox_dropdown_selector');
+	}
 
 
-    /**
-     * Informs the rest of the forms system what CSS and JS is needed to display the input
-     */
-    public function enqueue_js()
-    {
-        EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
-    }
+	/**
+	 * Informs the rest of the forms system what CSS and JS is needed to display the input
+	 */
+	public function enqueue_js()
+	{
+		EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
+	}
 
 
-    /**
-     * callback for Iframe::addStylesheets() child class methods
-     *
-     * @param array $iframe_css
-     * @return array
-     */
-    public function iframe_css(array $iframe_css): array
-    {
-        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
-        return $iframe_css;
-    }
+	/**
+	 * callback for Iframe::addStylesheets() child class methods
+	 *
+	 * @param array $iframe_css
+	 * @return array
+	 */
+	public function iframe_css(array $iframe_css): array
+	{
+		$iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
+		return $iframe_css;
+	}
 
 
-    /**
-     * callback for Iframe::addScripts() child class methods
-     *
-     * @param array $iframe_js
-     * @return array
-     */
-    public function iframe_js(array $iframe_js): array
-    {
-        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
-        return $iframe_js;
-    }
+	/**
+	 * callback for Iframe::addScripts() child class methods
+	 *
+	 * @param array $iframe_js
+	 * @return array
+	 */
+	public function iframe_js(array $iframe_js): array
+	{
+		$iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
+		return $iframe_js;
+	}
 
 
-    /**
-     * @return string of html to display the field
-     * @throws EE_Error
-     */
-    public function display(): string
-    {
-        $input              = $this->get_input();
-        $select_button_text = $input instanceof EE_Checkbox_Dropdown_Selector_Input
-            ? $input->select_button_text()
-            : '';
-        // $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
-            EE_Error::doing_it_wrong(
-                'EE_Checkbox_Display_Strategy::display()',
-                sprintf(
-                    esc_html__(
-                        'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
-                        'event_espresso'
-                    ),
-                    $input->html_id(),
-                    var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
-                ),
-                '4.8.1'
-            );
-        }
+	/**
+	 * @return string of html to display the field
+	 * @throws EE_Error
+	 */
+	public function display(): string
+	{
+		$input              = $this->get_input();
+		$select_button_text = $input instanceof EE_Checkbox_Dropdown_Selector_Input
+			? $input->select_button_text()
+			: '';
+		// $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+			EE_Error::doing_it_wrong(
+				'EE_Checkbox_Display_Strategy::display()',
+				sprintf(
+					esc_html__(
+						'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
+						'event_espresso'
+					),
+					$input->html_id(),
+					var_export($input->raw_value(), true),
+					$input->html_name() . '[]'
+				),
+				'4.8.1'
+			);
+		}
 
 
-        $html = EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
+		$html = EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
 
-        $html .= '<button id="' . $input->html_id() . '-btn"';
-        $html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button--secondary button"';
-        $html .= ' style="' . $input->html_style() . '"';
-        $html .= ' data-target="' . $input->html_id() . '-options-dv"';
-        $html .= ' ' . $input->other_html_attributes() . '>';
-        $html .= '<span class="checkbox-dropdown-selector-selected-spn">';
-        $html .= $select_button_text;
-        $html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
-        $html .= '</button>';
+		$html .= '<button id="' . $input->html_id() . '-btn"';
+		$html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button--secondary button"';
+		$html .= ' style="' . $input->html_style() . '"';
+		$html .= ' data-target="' . $input->html_id() . '-options-dv"';
+		$html .= ' ' . $input->other_html_attributes() . '>';
+		$html .= '<span class="checkbox-dropdown-selector-selected-spn">';
+		$html .= $select_button_text;
+		$html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
+		$html .= '</button>';
 
-        $html .= EEH_HTML::div(
-            '',
-            $input->html_id() . '-options-dv',
-            'checkbox-dropdown-selector'
-        );
-        $html .= EEH_HTML::link(
-            '',
-            '<span class="dashicons dashicons-no"></span>',
-            esc_html__('close datetime selector', 'event_espresso'),
-            '',
-            'close-espresso-notice'
-        );
-        $html .= EEH_HTML::ul();
+		$html .= EEH_HTML::div(
+			'',
+			$input->html_id() . '-options-dv',
+			'checkbox-dropdown-selector'
+		);
+		$html .= EEH_HTML::link(
+			'',
+			'<span class="dashicons dashicons-no"></span>',
+			esc_html__('close datetime selector', 'event_espresso'),
+			'',
+			'close-espresso-notice'
+		);
+		$html .= EEH_HTML::ul();
 
-        $input_raw_value = (array) $input->raw_value();
-        foreach ($input->options() as $value => $display_text) {
-            $html    .= EEH_HTML::li();
-            $value   = $input->get_normalization_strategy()->unnormalize_one($value);
-            $html_id = $this->get_sub_input_id($value);
-            $html    .= EEH_HTML::nl(0, 'checkbox');
-            $html    .= "
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$html    .= EEH_HTML::li();
+			$value   = $input->get_normalization_strategy()->unnormalize_one($value);
+			$html_id = $this->get_sub_input_id($value);
+			$html    .= EEH_HTML::nl(0, 'checkbox');
+			$html    .= "
                 <label for='$html_id'
                        id='$html_id-lbl'
                        class='ee-checkbox-label-after$label_size_class'
                 >";
-            $html    .= EEH_HTML::nl(1, 'checkbox');
-            $html    .= '<input type="checkbox"';
-            $html    .= ' name="' . $input->html_name() . '[]"';
-            $html    .= ' id="' . $html_id . '"';
-            $html    .= $input->html_class() ? ' class="' . $input->html_class() . '-option"' : '';
-            $html    .= $input->html_style() ? ' style="' . $input->html_style() . '"' : '';
-            $html    .= ' value="' . esc_attr($value) . '"';
-            if ($input->hasLabel()) {
-                $html .= ' aria-labelledby="' . $html_id . '-lbl"';
-            }
-            $html    .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
-                ? ' checked'
-                : '';
-            $html    .= ' ' . $this->_input->other_html_attributes();
-            $html    .= '>';
-            $html    .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
-            $html    .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
-            $html    .= EEH_HTML::lix();
-        }
-        $html .= EEH_HTML::ulx();
-        $html .= EEH_HTML::divx();
-        $html .= EEH_HTML::divx();
-        $html .= EEH_HTML::p(
-            apply_filters(
-                'FHEE__EE_Checkbox_Dropdown_Selector_Display_Strategy__display__html',
-                esc_html__(
-                    'To view additional ticket options, click the "Filter by Date" button and select more dates.',
-                    'event_espresso'
-                )
-            ),
-            $input->html_id() . '-date-time-filter-notice-pg',
-            'date-time-filter-notice-pg small-text lt-grey-text'
-        );
-        $html .= EEH_HTML::br();
-        return $html;
-    }
+			$html    .= EEH_HTML::nl(1, 'checkbox');
+			$html    .= '<input type="checkbox"';
+			$html    .= ' name="' . $input->html_name() . '[]"';
+			$html    .= ' id="' . $html_id . '"';
+			$html    .= $input->html_class() ? ' class="' . $input->html_class() . '-option"' : '';
+			$html    .= $input->html_style() ? ' style="' . $input->html_style() . '"' : '';
+			$html    .= ' value="' . esc_attr($value) . '"';
+			if ($input->hasLabel()) {
+				$html .= ' aria-labelledby="' . $html_id . '-lbl"';
+			}
+			$html    .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
+				? ' checked'
+				: '';
+			$html    .= ' ' . $this->_input->other_html_attributes();
+			$html    .= '>';
+			$html    .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
+			$html    .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+			$html    .= EEH_HTML::lix();
+		}
+		$html .= EEH_HTML::ulx();
+		$html .= EEH_HTML::divx();
+		$html .= EEH_HTML::divx();
+		$html .= EEH_HTML::p(
+			apply_filters(
+				'FHEE__EE_Checkbox_Dropdown_Selector_Display_Strategy__display__html',
+				esc_html__(
+					'To view additional ticket options, click the "Filter by Date" button and select more dates.',
+					'event_espresso'
+				)
+			),
+			$input->html_id() . '-date-time-filter-notice-pg',
+			'date-time-filter-notice-pg small-text lt-grey-text'
+		);
+		$html .= EEH_HTML::br();
+		return $html;
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -17,20 +17,20 @@ 
     {
         wp_register_style(
             'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
+            EE_GLOBAL_ASSETS_URL.'css/checkbox_dropdown_selector.css',
             ['espresso_default'],
             EVENT_ESPRESSO_VERSION
         );
         wp_register_style(
             'espresso_default',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+            EE_GLOBAL_ASSETS_URL.'css/espresso_default.css',
             ['dashicons'],
             EVENT_ESPRESSO_VERSION
         );
         wp_enqueue_style('checkbox_dropdown_selector');
         wp_register_script(
             'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/checkbox_dropdown_selector.js',
             ['jquery'],
             EVENT_ESPRESSO_VERSION,
             true
@@ -67,7 +67,7 @@ 
      */
     public function iframe_css(array $iframe_css): array
     {
-        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
+        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL.'css/checkbox_dropdown_selector.css';
         return $iframe_css;
     }
 
@@ -80,7 +80,7 @@ 
      */
     public function iframe_js(array $iframe_js): array
     {
-        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
+        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL.'scripts/checkbox_dropdown_selector.js';
         return $iframe_js;
     }
 
@@ -98,7 +98,7 @@ 
         // $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
         $input->set_label_sizes();
         $label_size_class = $input->get_label_size_class();
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+        if ( ! is_array($input->raw_value()) && $input->raw_value() !== null) {
             EE_Error::doing_it_wrong(
                 'EE_Checkbox_Display_Strategy::display()',
                 sprintf(
@@ -108,7 +108,7 @@ 
                     ),
                     $input->html_id(),
                     var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
+                    $input->html_name().'[]'
                 ),
                 '4.8.1'
             );
@@ -117,11 +117,11 @@ 
 
         $html = EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
 
-        $html .= '<button id="' . $input->html_id() . '-btn"';
-        $html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button--secondary button"';
-        $html .= ' style="' . $input->html_style() . '"';
-        $html .= ' data-target="' . $input->html_id() . '-options-dv"';
-        $html .= ' ' . $input->other_html_attributes() . '>';
+        $html .= '<button id="'.$input->html_id().'-btn"';
+        $html .= ' class="'.$input->html_class().' checkbox-dropdown-selector-btn button--secondary button"';
+        $html .= ' style="'.$input->html_style().'"';
+        $html .= ' data-target="'.$input->html_id().'-options-dv"';
+        $html .= ' '.$input->other_html_attributes().'>';
         $html .= '<span class="checkbox-dropdown-selector-selected-spn">';
         $html .= $select_button_text;
         $html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
@@ -129,7 +129,7 @@ 
 
         $html .= EEH_HTML::div(
             '',
-            $input->html_id() . '-options-dv',
+            $input->html_id().'-options-dv',
             'checkbox-dropdown-selector'
         );
         $html .= EEH_HTML::link(
@@ -154,21 +154,21 @@ 
                 >";
             $html    .= EEH_HTML::nl(1, 'checkbox');
             $html    .= '<input type="checkbox"';
-            $html    .= ' name="' . $input->html_name() . '[]"';
-            $html    .= ' id="' . $html_id . '"';
-            $html    .= $input->html_class() ? ' class="' . $input->html_class() . '-option"' : '';
-            $html    .= $input->html_style() ? ' style="' . $input->html_style() . '"' : '';
-            $html    .= ' value="' . esc_attr($value) . '"';
+            $html    .= ' name="'.$input->html_name().'[]"';
+            $html    .= ' id="'.$html_id.'"';
+            $html    .= $input->html_class() ? ' class="'.$input->html_class().'-option"' : '';
+            $html    .= $input->html_style() ? ' style="'.$input->html_style().'"' : '';
+            $html    .= ' value="'.esc_attr($value).'"';
             if ($input->hasLabel()) {
-                $html .= ' aria-labelledby="' . $html_id . '-lbl"';
+                $html .= ' aria-labelledby="'.$html_id.'-lbl"';
             }
             $html    .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
                 ? ' checked'
                 : '';
-            $html    .= ' ' . $this->_input->other_html_attributes();
+            $html    .= ' '.$this->_input->other_html_attributes();
             $html    .= '>';
-            $html    .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
-            $html    .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+            $html    .= '<span class="datetime-selector-option-text-spn">'.$display_text.'</span>';
+            $html    .= EEH_HTML::nl(-1, 'checkbox').'</label>';
             $html    .= EEH_HTML::lix();
         }
         $html .= EEH_HTML::ulx();
@@ -182,7 +182,7 @@ 
                     'event_espresso'
                 )
             ),
-            $input->html_id() . '-date-time-filter-notice-pg',
+            $input->html_id().'-date-time-filter-notice-pg',
             'date-time-filter-notice-pg small-text lt-grey-text'
         );
         $html .= EEH_HTML::br();

core/libraries/form_sections/strategies/display/EE_Text_Input_Display_Strategy.strategy.php

Indentation +53 added lines, -53 removed lines

@@ -14,64 +14,64 @@
  */
 class EE_Text_Input_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-     * The html "type" attribute value. default is "text"
-     *
-     * @var string
-     */
-    protected string $_type;
+	/**
+	 * The html "type" attribute value. default is "text"
+	 *
+	 * @var string
+	 */
+	protected string $_type;
 
 
-    /**
-     * @param string $type
-     */
-    public function __construct(string $type = 'text')
-    {
-        $this->_type = $type;
-        parent::__construct();
-    }
+	/**
+	 * @param string $type
+	 */
+	public function __construct(string $type = 'text')
+	{
+		$this->_type = $type;
+		parent::__construct();
+	}
 
 
-    /**
-     * Gets the html "type" attribute's value
-     *
-     * @return string
-     */
-    public function get_type(): string
-    {
-        if (
-            $this->_type === 'email'
-            && ! apply_filters('FHEE__EE_Text_Input_Display_Strategy__use_html5_email', true)
-        ) {
-            return 'text';
-        }
-        return $this->_type;
-    }
+	/**
+	 * Gets the html "type" attribute's value
+	 *
+	 * @return string
+	 */
+	public function get_type(): string
+	{
+		if (
+			$this->_type === 'email'
+			&& ! apply_filters('FHEE__EE_Text_Input_Display_Strategy__use_html5_email', true)
+		) {
+			return 'text';
+		}
+		return $this->_type;
+	}
 
 
-    /**
-     * @return string of html to display the field
-     * @throws EE_Error
-     */
-    public function display(): string
-    {
-        $type = $this->get_type();
-        $name = $this->_input->html_name();
-        $html_id = $this->_input->html_id();
-        $class = $this->_input->required()
-            ? $this->_input->required_css_class() . ' ' . $this->_input->html_class()
-            : $this->_input->html_class();
-        $labelledby = $this->_input->hasLabel()
-            ? ' aria-labelledby="' . $this->_input->html_label_id() . '"'
-            : '';
-        // add html5 required
-        $required = $this->_input->required() ? ' required' : '';
-        $value = $this->_input->raw_value_in_form();
-        $style = $this->_input->html_style();
-        $style = $style ? " style=\"$style\"" : '';
-        $attributes = $this->_input->other_html_attributes();
-        $data_attributes = $this->dataAttributesString($this->_input->dataAttributes());
-        return "
+	/**
+	 * @return string of html to display the field
+	 * @throws EE_Error
+	 */
+	public function display(): string
+	{
+		$type = $this->get_type();
+		$name = $this->_input->html_name();
+		$html_id = $this->_input->html_id();
+		$class = $this->_input->required()
+			? $this->_input->required_css_class() . ' ' . $this->_input->html_class()
+			: $this->_input->html_class();
+		$labelledby = $this->_input->hasLabel()
+			? ' aria-labelledby="' . $this->_input->html_label_id() . '"'
+			: '';
+		// add html5 required
+		$required = $this->_input->required() ? ' required' : '';
+		$value = $this->_input->raw_value_in_form();
+		$style = $this->_input->html_style();
+		$style = $style ? " style=\"$style\"" : '';
+		$attributes = $this->_input->other_html_attributes();
+		$data_attributes = $this->dataAttributesString($this->_input->dataAttributes());
+		return "
         <input type=\"$type\" name=\"$name\" id=\"$html_id\" class=\"$class\" value=\"$value\"$labelledby$attributes$data_attributes$style$required />";
-    }
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -59,10 +59,10 @@
         $name = $this->_input->html_name();
         $html_id = $this->_input->html_id();
         $class = $this->_input->required()
-            ? $this->_input->required_css_class() . ' ' . $this->_input->html_class()
+            ? $this->_input->required_css_class().' '.$this->_input->html_class()
             : $this->_input->html_class();
         $labelledby = $this->_input->hasLabel()
-            ? ' aria-labelledby="' . $this->_input->html_label_id() . '"'
+            ? ' aria-labelledby="'.$this->_input->html_label_id().'"'
             : '';
         // add html5 required
         $required = $this->_input->required() ? ' required' : '';

core/libraries/form_sections/strategies/display/EE_Text_Area_Display_Strategy.strategy.php

Indentation +35 added lines, -35 removed lines

@@ -2,29 +2,29 @@ 
 
 class EE_Text_Area_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-     * @return string of html to display the field
-     * @throws EE_Error
-     */
-    public function display(): string
-    {
-        $input     = $this->_input;
-        $raw_value = maybe_serialize((string) $input->raw_value());
-        if ($input instanceof EE_Text_Area_Input) {
-            $rows = $input->get_rows();
-            $cols = $input->get_cols();
-        } else {
-            $rows = 4;
-            $cols = 20;
-        }
+	/**
+	 * @return string of html to display the field
+	 * @throws EE_Error
+	 */
+	public function display(): string
+	{
+		$input     = $this->_input;
+		$raw_value = maybe_serialize((string) $input->raw_value());
+		if ($input instanceof EE_Text_Area_Input) {
+			$rows = $input->get_rows();
+			$cols = $input->get_cols();
+		} else {
+			$rows = 4;
+			$cols = 20;
+		}
 
-        $labelledby = $input->hasLabel() ? ' aria-labelledby="' . $input->html_label_id() . '"' : '';
-        $other_attributes = $input->other_html_attributes();
-        $data_attributes  = $this->dataAttributesString($input->dataAttributes());
+		$labelledby = $input->hasLabel() ? ' aria-labelledby="' . $input->html_label_id() . '"' : '';
+		$other_attributes = $input->other_html_attributes();
+		$data_attributes  = $this->dataAttributesString($input->dataAttributes());
 
-        $text = esc_textarea($raw_value);
+		$text = esc_textarea($raw_value);
 
-        $html = "
+		$html = "
         <textarea id='{$input->html_id()}'
                   name='{$input->html_name()}'
                   class='{$input->html_class()}'
@@ -36,19 +36,19 @@ 
                   cols='$cols'
         >$text</textarea>";
 
-        foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
-            if (
-                $validation_strategy instanceof EE_Simple_HTML_Validation_Strategy
-                || $validation_strategy instanceof EE_Full_HTML_Validation_Strategy
-            ) {
-                $html .= sprintf(
-                    esc_html__('%1$s(allowed tags: %2$s)%3$s', 'event_espresso'),
-                    '<p class="ee-question-desc description">',
-                    $validation_strategy->get_list_of_allowed_tags(),
-                    '</p>'
-                );
-            }
-        }
-        return $html;
-    }
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+			if (
+				$validation_strategy instanceof EE_Simple_HTML_Validation_Strategy
+				|| $validation_strategy instanceof EE_Full_HTML_Validation_Strategy
+			) {
+				$html .= sprintf(
+					esc_html__('%1$s(allowed tags: %2$s)%3$s', 'event_espresso'),
+					'<p class="ee-question-desc description">',
+					$validation_strategy->get_list_of_allowed_tags(),
+					'</p>'
+				);
+			}
+		}
+		return $html;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
             $cols = 20;
         }
 
-        $labelledby = $input->hasLabel() ? ' aria-labelledby="' . $input->html_label_id() . '"' : '';
+        $labelledby = $input->hasLabel() ? ' aria-labelledby="'.$input->html_label_id().'"' : '';
         $other_attributes = $input->other_html_attributes();
         $data_attributes  = $this->dataAttributesString($input->dataAttributes());
 

core/libraries/form_sections/strategies/display/EE_Radio_Button_Display_Strategy.strategy.php

Indentation +57 added lines, -57 removed lines

@@ -11,65 +11,65 @@
  */
 class EE_Radio_Button_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
-    /**
-     *
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display(): string
-    {
-        $input = $this->get_input();
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        $html = '';
-        foreach ($input->options() as $value => $display_text) {
-            $value = $input->get_normalization_strategy()->unnormalize($value);
+	/**
+	 *
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display(): string
+	{
+		$input = $this->get_input();
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		$html = '';
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize($value);
 
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'radio');
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'radio');
 
-            $html .= $this->_opening_tag('label');
-            $html .= $this->_attributes_string(
-                array(
-                    'for' => $html_id,
-                    'id' => $html_id . '-lbl',
-                    'class' => apply_filters(
-                        'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
-                        $this,
-                        $input,
-                        $value
-                    )
-                )
-            );
-            $html .= '>';
-            $html .= EEH_HTML::nl(1, 'radio');
-            $html .= $this->_opening_tag('input');
-            $attributes = array(
-                'id' => $html_id,
-                'name' => $input->html_name(),
-                'class' => $input->html_class(),
-                'style' => $input->html_style(),
-                'type' => 'radio',
-                'value' => $value,
-                0 => $input->other_html_attributes(),
-                'data-question_label' => "$html_id-lbl"
-            );
-            if ($input->raw_value() === $value) {
-                $attributes['checked'] = 'checked';
-            }
-            $html .= $this->_attributes_string($attributes);
+			$html .= $this->_opening_tag('label');
+			$html .= $this->_attributes_string(
+				array(
+					'for' => $html_id,
+					'id' => $html_id . '-lbl',
+					'class' => apply_filters(
+						'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
+						'ee-radio-label-after' . $label_size_class,
+						$this,
+						$input,
+						$value
+					)
+				)
+			);
+			$html .= '>';
+			$html .= EEH_HTML::nl(1, 'radio');
+			$html .= $this->_opening_tag('input');
+			$attributes = array(
+				'id' => $html_id,
+				'name' => $input->html_name(),
+				'class' => $input->html_class(),
+				'style' => $input->html_style(),
+				'type' => 'radio',
+				'value' => $value,
+				0 => $input->other_html_attributes(),
+				'data-question_label' => "$html_id-lbl"
+			);
+			if ($input->raw_value() === $value) {
+				$attributes['checked'] = 'checked';
+			}
+			$html .= $this->_attributes_string($attributes);
 
-            if ($input->hasLabel()) {
-                $html .= ' aria-labelledby="' . $html_id . '-lbl"';
-            }
+			if ($input->hasLabel()) {
+				$html .= ' aria-labelledby="' . $html_id . '-lbl"';
+			}
 
-            $html .= '> ';
-            $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
-        }
-        $html .= EEH_HTML::div('', '', 'clear-float');
-        $html .= EEH_HTML::divx();
-        return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
-    }
+			$html .= '>&nbsp;';
+			$html .= $display_text;
+			$html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+		}
+		$html .= EEH_HTML::div('', '', 'clear-float');
+		$html .= EEH_HTML::divx();
+		return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -32,10 +32,10 @@ 
             $html .= $this->_attributes_string(
                 array(
                     'for' => $html_id,
-                    'id' => $html_id . '-lbl',
+                    'id' => $html_id.'-lbl',
                     'class' => apply_filters(
                         'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
+                        'ee-radio-label-after'.$label_size_class,
                         $this,
                         $input,
                         $value
@@ -61,12 +61,12 @@ 
             $html .= $this->_attributes_string($attributes);
 
             if ($input->hasLabel()) {
-                $html .= ' aria-labelledby="' . $html_id . '-lbl"';
+                $html .= ' aria-labelledby="'.$html_id.'-lbl"';
             }
 
             $html .= '> ';
             $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+            $html .= EEH_HTML::nl(-1, 'radio').'</label>';
         }
         $html .= EEH_HTML::div('', '', 'clear-float');
         $html .= EEH_HTML::divx();