eventespresso / event-espresso-core

core/libraries/form_sections/EE_Sample_Form.form.php

Indentation +56 added lines, -56 removed lines

@@ -2,62 +2,62 @@
 
 class EE_Sample_Form extends EE_Form_Section_Proper
 {
-    public function __construct()
-    {
-        $this->_subsections = array(
-            'h1' => new EE_Form_Section_HTML('hello wordl'),
-            'name' => new EE_Text_Input(array('required' => true,'default' => 'your name here')),
-            'email' => new EE_Email_Input(array('required' => false)),
-            'shirt_size' => new EE_Select_Input(array('' => 'Please select...', 's' =>  esc_html__("Small", "event_espresso"),'m' =>  esc_html__("Medium", "event_espresso"),'l' =>  esc_html__("Large", "event_espresso")), array('required' => true,'default' => 's')),
-            'month_normal' => new EE_Month_Input(),
-            'month_leading_zero' => new EE_Month_Input(true),
-            'year_2' => new EE_Year_Input(false, 1, 1),
-            'year_4' => new EE_Year_Input(true, 0, 10, array('default' => '2017')),
-            'yes_no' => new EE_Yes_No_Input(array('html_label_text' =>  esc_html__("Yes or No", "event_espresso"))),
-            'credit_card' => new EE_Credit_Card_Input(),
-            'image_1' => new EE_Admin_File_Uploader_Input(),
-            'image_2' => new EE_Admin_File_Uploader_Input(),
-            'skillz' => new EE_Checkbox_Multi_Input(array('php' => 'PHP','mysql' => 'MYSQL'), array('default' => array('php'))),
-            'float' => new EE_Float_Input(),
-            'essay' => new EE_Text_Area_Input(),
-            'amenities' => new EE_Select_Multiple_Input(
-                array(
-                    'hottub' => 'Hot Tub',
-                    'balcony' => "Balcony",
-                    'skylight' => 'SkyLight',
-                    'no_axe' => 'No Axe Murderers'
-                ),
-                array(
-                    'default' => array(
-                        'hottub',
-                        'no_axe' ),
-                )
-            ),
-            'payment_methods' => new EE_Select_Multi_Model_Input(EEM_Payment_Method::instance()->get_all()),
-            );
-        $this->_layout_strategy = new EE_Div_Per_Section_Layout();
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		$this->_subsections = array(
+			'h1' => new EE_Form_Section_HTML('hello wordl'),
+			'name' => new EE_Text_Input(array('required' => true,'default' => 'your name here')),
+			'email' => new EE_Email_Input(array('required' => false)),
+			'shirt_size' => new EE_Select_Input(array('' => 'Please select...', 's' =>  esc_html__("Small", "event_espresso"),'m' =>  esc_html__("Medium", "event_espresso"),'l' =>  esc_html__("Large", "event_espresso")), array('required' => true,'default' => 's')),
+			'month_normal' => new EE_Month_Input(),
+			'month_leading_zero' => new EE_Month_Input(true),
+			'year_2' => new EE_Year_Input(false, 1, 1),
+			'year_4' => new EE_Year_Input(true, 0, 10, array('default' => '2017')),
+			'yes_no' => new EE_Yes_No_Input(array('html_label_text' =>  esc_html__("Yes or No", "event_espresso"))),
+			'credit_card' => new EE_Credit_Card_Input(),
+			'image_1' => new EE_Admin_File_Uploader_Input(),
+			'image_2' => new EE_Admin_File_Uploader_Input(),
+			'skillz' => new EE_Checkbox_Multi_Input(array('php' => 'PHP','mysql' => 'MYSQL'), array('default' => array('php'))),
+			'float' => new EE_Float_Input(),
+			'essay' => new EE_Text_Area_Input(),
+			'amenities' => new EE_Select_Multiple_Input(
+				array(
+					'hottub' => 'Hot Tub',
+					'balcony' => "Balcony",
+					'skylight' => 'SkyLight',
+					'no_axe' => 'No Axe Murderers'
+				),
+				array(
+					'default' => array(
+						'hottub',
+						'no_axe' ),
+				)
+			),
+			'payment_methods' => new EE_Select_Multi_Model_Input(EEM_Payment_Method::instance()->get_all()),
+			);
+		$this->_layout_strategy = new EE_Div_Per_Section_Layout();
+		parent::__construct();
+	}
 
-    /**
-     * Extra validation for the 'name' input.
-     * @param EE_Text_Input $form_input
-     */
-    public function _validate_name($form_input)
-    {
-        if ($form_input->raw_value() != 'Mike') {
-            $form_input->add_validation_error(esc_html__("You are not mike. You must be brent or darren. Thats ok, I guess", 'event_espresso'), 'not-mike');
-        }
-    }
+	/**
+	 * Extra validation for the 'name' input.
+	 * @param EE_Text_Input $form_input
+	 */
+	public function _validate_name($form_input)
+	{
+		if ($form_input->raw_value() != 'Mike') {
+			$form_input->add_validation_error(esc_html__("You are not mike. You must be brent or darren. Thats ok, I guess", 'event_espresso'), 'not-mike');
+		}
+	}
 
-    public function _validate()
-    {
-        parent::_validate();
-        if (
-            $this->_subsections['shirt_size']->normalized_value() == 's'
-                && $this->_subsections['year_4']->normalized_value() < 2010
-        ) {
-            $this->add_validation_error(esc_html__("If you want a small shirt, you should be born after 2010. Otherwise theyre just too big", 'event_espresso'), 'too-old');
-        }
-    }
+	public function _validate()
+	{
+		parent::_validate();
+		if (
+			$this->_subsections['shirt_size']->normalized_value() == 's'
+				&& $this->_subsections['year_4']->normalized_value() < 2010
+		) {
+			$this->add_validation_error(esc_html__("If you want a small shirt, you should be born after 2010. Otherwise theyre just too big", 'event_espresso'), 'too-old');
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@ 
     {
         $this->_subsections = array(
             'h1' => new EE_Form_Section_HTML('hello wordl'),
-            'name' => new EE_Text_Input(array('required' => true,'default' => 'your name here')),
+            'name' => new EE_Text_Input(array('required' => true, 'default' => 'your name here')),
             'email' => new EE_Email_Input(array('required' => false)),
-            'shirt_size' => new EE_Select_Input(array('' => 'Please select...', 's' =>  esc_html__("Small", "event_espresso"),'m' =>  esc_html__("Medium", "event_espresso"),'l' =>  esc_html__("Large", "event_espresso")), array('required' => true,'default' => 's')),
+            'shirt_size' => new EE_Select_Input(array('' => 'Please select...', 's' =>  esc_html__("Small", "event_espresso"), 'm' =>  esc_html__("Medium", "event_espresso"), 'l' =>  esc_html__("Large", "event_espresso")), array('required' => true, 'default' => 's')),
             'month_normal' => new EE_Month_Input(),
             'month_leading_zero' => new EE_Month_Input(true),
             'year_2' => new EE_Year_Input(false, 1, 1),
@@ -17,7 +17,7 @@ 
             'credit_card' => new EE_Credit_Card_Input(),
             'image_1' => new EE_Admin_File_Uploader_Input(),
             'image_2' => new EE_Admin_File_Uploader_Input(),
-            'skillz' => new EE_Checkbox_Multi_Input(array('php' => 'PHP','mysql' => 'MYSQL'), array('default' => array('php'))),
+            'skillz' => new EE_Checkbox_Multi_Input(array('php' => 'PHP', 'mysql' => 'MYSQL'), array('default' => array('php'))),
             'float' => new EE_Float_Input(),
             'essay' => new EE_Text_Area_Input(),
             'amenities' => new EE_Select_Multiple_Input(

core/libraries/form_sections/strategies/validation/EE_URL_Validation_Strategy.strategy.php

Spacing +5 added lines, -5 removed lines

@@ -39,11 +39,11 @@ 
         $check_file_exists = false,
         URLValidator $url_validator = null
     ) {
-        if (! $url_validator instanceof URLValidator) {
+        if ( ! $url_validator instanceof URLValidator) {
             $url_validator = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\validators\URLValidator');
         }
         $this->url_validator = $url_validator;
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = esc_html__("Please enter a valid URL. Eg https://eventespresso.com", "event_espresso");
         }
         $this->check_file_exists = $check_file_exists;
@@ -62,7 +62,7 @@ 
     public function validate($normalized_value)
     {
         if ($normalized_value) {
-            if (! $this->url_validator->isValid($normalized_value)) {
+            if ( ! $this->url_validator->isValid($normalized_value)) {
                 throw new EE_Validation_Error($this->get_validation_error_message(), 'invalid_url');
             } elseif (apply_filters('FHEE__EE_URL_Validation_Strategy__validate__check_remote_file_exists', $this->check_file_exists, $this->_input)) {
                 if (
@@ -70,7 +70,7 @@ 
                         $normalized_value,
                         array(
                             'sslverify' => false,
-                            'limit_response_size' => 4095,// we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
+                            'limit_response_size' => 4095, // we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
                         )
                     )
                 ) {
@@ -87,6 +87,6 @@ 
      */
     public function get_jquery_validation_rule_array()
     {
-        return array( 'validUrl' => true, 'messages' => array( 'validUrl' => $this->get_validation_error_message() ) );
+        return array('validUrl' => true, 'messages' => array('validUrl' => $this->get_validation_error_message()));
     }
 }

Indentation +67 added lines, -67 removed lines

@@ -15,79 +15,79 @@
  */
 class EE_URL_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * @var @boolean whether we should check if the file exists or not
-     */
-    protected $check_file_exists;
+	/**
+	 * @var @boolean whether we should check if the file exists or not
+	 */
+	protected $check_file_exists;
 
-    /**
-     * @var URLValidator
-     */
-    protected $url_validator;
+	/**
+	 * @var URLValidator
+	 */
+	protected $url_validator;
 
-    /**
-     * @param null $validation_error_message
-     * @param boolean $check_file_exists
-     * @param URLValidator $url_validator
-     * @throws InvalidArgumentException
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     */
-    public function __construct(
-        $validation_error_message = null,
-        $check_file_exists = false,
-        URLValidator $url_validator = null
-    ) {
-        if (! $url_validator instanceof URLValidator) {
-            $url_validator = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\validators\URLValidator');
-        }
-        $this->url_validator = $url_validator;
-        if (! $validation_error_message) {
-            $validation_error_message = esc_html__("Please enter a valid URL. Eg https://eventespresso.com", "event_espresso");
-        }
-        $this->check_file_exists = $check_file_exists;
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 * @param boolean $check_file_exists
+	 * @param URLValidator $url_validator
+	 * @throws InvalidArgumentException
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 */
+	public function __construct(
+		$validation_error_message = null,
+		$check_file_exists = false,
+		URLValidator $url_validator = null
+	) {
+		if (! $url_validator instanceof URLValidator) {
+			$url_validator = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\validators\URLValidator');
+		}
+		$this->url_validator = $url_validator;
+		if (! $validation_error_message) {
+			$validation_error_message = esc_html__("Please enter a valid URL. Eg https://eventespresso.com", "event_espresso");
+		}
+		$this->check_file_exists = $check_file_exists;
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * just checks the field isn't blank
-     *
-     * @param $normalized_value
-     * @return bool
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if ($normalized_value) {
-            if (! $this->url_validator->isValid($normalized_value)) {
-                throw new EE_Validation_Error($this->get_validation_error_message(), 'invalid_url');
-            } elseif (apply_filters('FHEE__EE_URL_Validation_Strategy__validate__check_remote_file_exists', $this->check_file_exists, $this->_input)) {
-                if (
-                    ! EEH_URL::remote_file_exists(
-                        $normalized_value,
-                        array(
-                            'sslverify' => false,
-                            'limit_response_size' => 4095,// we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
-                        )
-                    )
-                ) {
-                    throw new EE_Validation_Error(
-                        esc_html__("That URL seems to be broken. Please enter a valid URL", "event_espresso")
-                    );
-                }
-            }
-        }
-    }
+	/**
+	 * just checks the field isn't blank
+	 *
+	 * @param $normalized_value
+	 * @return bool
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if ($normalized_value) {
+			if (! $this->url_validator->isValid($normalized_value)) {
+				throw new EE_Validation_Error($this->get_validation_error_message(), 'invalid_url');
+			} elseif (apply_filters('FHEE__EE_URL_Validation_Strategy__validate__check_remote_file_exists', $this->check_file_exists, $this->_input)) {
+				if (
+					! EEH_URL::remote_file_exists(
+						$normalized_value,
+						array(
+							'sslverify' => false,
+							'limit_response_size' => 4095,// we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
+						)
+					)
+				) {
+					throw new EE_Validation_Error(
+						esc_html__("That URL seems to be broken. Please enter a valid URL", "event_espresso")
+					);
+				}
+			}
+		}
+	}
 
 
 
-    /**
-     * @return array
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array( 'validUrl' => true, 'messages' => array( 'validUrl' => $this->get_validation_error_message() ) );
-    }
+	/**
+	 * @return array
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array( 'validUrl' => true, 'messages' => array( 'validUrl' => $this->get_validation_error_message() ) );
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Int_Validation_Strategy.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = esc_html__("Only digits are allowed.", "event_espresso");
         }
         parent::__construct($validation_error_message);

Indentation +31 added lines, -31 removed lines

@@ -9,41 +9,41 @@
  */
 class EE_Int_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = esc_html__("Only digits are allowed.", "event_espresso");
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = esc_html__("Only digits are allowed.", "event_espresso");
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * @param $normalized_value
-     */
-    public function validate($normalized_value)
-    {
-        // this should have already been detected by the normalization strategy
-    }
+	/**
+	 * @param $normalized_value
+	 */
+	public function validate($normalized_value)
+	{
+		// this should have already been detected by the normalization strategy
+	}
 
 
 
-    /**
-     * @return array
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array(
-            'number' => true,
-            'step' => 1,
-            'messages' => array(
-                'number' => $this->get_validation_error_message(),
-                'step' => $this->get_validation_error_message()
-            )
-        );
-    }
+	/**
+	 * @return array
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array(
+			'number' => true,
+			'step' => 1,
+			'messages' => array(
+				'number' => $this->get_validation_error_message(),
+				'step' => $this->get_validation_error_message()
+			)
+		);
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Full_HTML_Validation_Strategy.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = sprintf(
                 esc_html__('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
                 '<br />',

Indentation +52 added lines, -52 removed lines

@@ -13,62 +13,62 @@
  */
 class EE_Full_HTML_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = sprintf(
-                esc_html__('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
-                '<br />',
-                $this->get_list_of_allowed_tags()
-            );
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = sprintf(
+				esc_html__('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
+				'<br />',
+				$this->get_list_of_allowed_tags()
+			);
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
-    /**
-     * get_list_of_allowed_tags
-     *
-     * generates and returns a string that lists the top-level HTML tags that are allowable for this input
-     *
-     * @return string
-     */
-    public function get_list_of_allowed_tags()
-    {
-        $tags_we_allow = $this->getAllowedTags();
-        ksort($tags_we_allow);
-        return implode(', ', array_keys($tags_we_allow));
-    }
+	/**
+	 * get_list_of_allowed_tags
+	 *
+	 * generates and returns a string that lists the top-level HTML tags that are allowable for this input
+	 *
+	 * @return string
+	 */
+	public function get_list_of_allowed_tags()
+	{
+		$tags_we_allow = $this->getAllowedTags();
+		ksort($tags_we_allow);
+		return implode(', ', array_keys($tags_we_allow));
+	}
 
 
-    /**
-     * Returns an array whose keys are allowed tags and values are an array of allowed attributes
-     *
-     * @return array
-     */
-    protected function getAllowedTags()
-    {
-        global $allowedposttags;
-        return array_merge_recursive(
-            $allowedposttags,
-            EEH_HTML::get_simple_tags()
-        );
-    }
+	/**
+	 * Returns an array whose keys are allowed tags and values are an array of allowed attributes
+	 *
+	 * @return array
+	 */
+	protected function getAllowedTags()
+	{
+		global $allowedposttags;
+		return array_merge_recursive(
+			$allowedposttags,
+			EEH_HTML::get_simple_tags()
+		);
+	}
 
 
-    /**
-     * @param $normalized_value
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        parent::validate($normalized_value);
-        $normalized_value_sans_tags = wp_kses("$normalized_value", $this->getAllowedTags());
-        if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
-        }
-    }
+	/**
+	 * @param $normalized_value
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		parent::validate($normalized_value);
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $this->getAllowedTags());
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
+		}
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Credit_Card_Validation_Strategy.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = esc_html__("Please enter a valid credit card number", "event_espresso");
         }
         parent::__construct(

Indentation +15 added lines, -15 removed lines

@@ -13,19 +13,19 @@
  */
 class EE_Credit_Card_Validation_Strategy extends EE_Text_Validation_Strategy
 {
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = esc_html__("Please enter a valid credit card number", "event_espresso");
-        }
-        parent::__construct(
-            $validation_error_message,
-            // @codingStandardsIgnoreStart
-            '~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|2[2-7][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~'
-            // @codingStandardsIgnoreEnd
-        );
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = esc_html__("Please enter a valid credit card number", "event_espresso");
+		}
+		parent::__construct(
+			$validation_error_message,
+			// @codingStandardsIgnoreStart
+			'~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|2[2-7][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~'
+			// @codingStandardsIgnoreEnd
+		);
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Enum_Validation_Strategy.strategy.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function validate($normalized_value)
     {
         parent::validate($normalized_value);
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+        if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
             throw new EE_Error(sprintf(esc_html__("Cannot use Enum Validation Strategy with an input that doesn't have options", "event_espresso")));
         }
         $enum_options = $this->_input->flat_options();
@@ -49,7 +49,7 @@ 
     public function get_validation_error_message()
     {
         $parent_validation_error_message = parent::get_validation_error_message();
-        if (! $parent_validation_error_message) {
+        if ( ! $parent_validation_error_message) {
             $enum_options = $this->_input instanceof EE_Form_Input_With_Options_Base ? $this->_input->flat_options() : '';
             return sprintf(
                 esc_html__("This is not allowed option. Allowed options are %s.", "event_espresso"),

Indentation +46 added lines, -46 removed lines

@@ -11,51 +11,51 @@
  */
 class EE_Enum_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * Check that the value is in the allowed list
-     * @param $normalized_value
-     * @throws EE_Error
-     * @throws EE_Validation_Error
-     * @return boolean
-     */
-    public function validate($normalized_value)
-    {
-        parent::validate($normalized_value);
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
-            throw new EE_Error(sprintf(esc_html__("Cannot use Enum Validation Strategy with an input that doesn't have options", "event_espresso")));
-        }
-        $enum_options = $this->_input->flat_options();
-        if ($normalized_value === true) {
-            $normalized_value = 1;
-        } elseif ($normalized_value === false) {
-            $normalized_value = 0;
-        }
-        if ($normalized_value !== null && ! array_key_exists($normalized_value, $enum_options)) {
-            throw new EE_Validation_Error(
-                $this->get_validation_error_message(),
-                'invalid_enum_value'
-            );
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Check that the value is in the allowed list
+	 * @param $normalized_value
+	 * @throws EE_Error
+	 * @throws EE_Validation_Error
+	 * @return boolean
+	 */
+	public function validate($normalized_value)
+	{
+		parent::validate($normalized_value);
+		if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+			throw new EE_Error(sprintf(esc_html__("Cannot use Enum Validation Strategy with an input that doesn't have options", "event_espresso")));
+		}
+		$enum_options = $this->_input->flat_options();
+		if ($normalized_value === true) {
+			$normalized_value = 1;
+		} elseif ($normalized_value === false) {
+			$normalized_value = 0;
+		}
+		if ($normalized_value !== null && ! array_key_exists($normalized_value, $enum_options)) {
+			throw new EE_Validation_Error(
+				$this->get_validation_error_message(),
+				'invalid_enum_value'
+			);
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * If we are using the default validation error message, make it dynamic based
-     * on the allowed options.
-     * @return string
-     */
-    public function get_validation_error_message()
-    {
-        $parent_validation_error_message = parent::get_validation_error_message();
-        if (! $parent_validation_error_message) {
-            $enum_options = $this->_input instanceof EE_Form_Input_With_Options_Base ? $this->_input->flat_options() : '';
-            return sprintf(
-                esc_html__("This is not allowed option. Allowed options are %s.", "event_espresso"),
-                implode(', ', $enum_options)
-            );
-        } else {
-            return $parent_validation_error_message;
-        }
-    }
+	/**
+	 * If we are using the default validation error message, make it dynamic based
+	 * on the allowed options.
+	 * @return string
+	 */
+	public function get_validation_error_message()
+	{
+		$parent_validation_error_message = parent::get_validation_error_message();
+		if (! $parent_validation_error_message) {
+			$enum_options = $this->_input instanceof EE_Form_Input_With_Options_Base ? $this->_input->flat_options() : '';
+			return sprintf(
+				esc_html__("This is not allowed option. Allowed options are %s.", "event_espresso"),
+				implode(', ', $enum_options)
+			);
+		} else {
+			return $parent_validation_error_message;
+		}
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Required_Validation_Strategy.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = esc_html__("This field is required.", "event_espresso");
         }
         parent::__construct($validation_error_message);

Indentation +44 added lines, -44 removed lines

@@ -11,54 +11,54 @@
  */
 class EE_Required_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * @param string $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = esc_html__("This field is required.", "event_espresso");
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param string $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = esc_html__("This field is required.", "event_espresso");
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * just checks the field isn't blank, provided the requirement conditions
-     * indicate this input is still required
-     *
-     * @param $normalized_value
-     * @return bool
-     * @throws \EE_Error
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if (
-            $normalized_value === ''
-            || $normalized_value === null
-            || $normalized_value === array()
-        ) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * just checks the field isn't blank, provided the requirement conditions
+	 * indicate this input is still required
+	 *
+	 * @param $normalized_value
+	 * @return bool
+	 * @throws \EE_Error
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if (
+			$normalized_value === ''
+			|| $normalized_value === null
+			|| $normalized_value === array()
+		) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
+		} else {
+			return true;
+		}
+	}
 
 
 
-    /**
-     * @return array
-     * @throws \EE_Error
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array(
-            'required' => true,
-            'messages' => array(
-                'required' => $this->get_validation_error_message()
-            )
-        );
-    }
+	/**
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array(
+			'required' => true,
+			'messages' => array(
+				'required' => $this->get_validation_error_message()
+			)
+		);
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Model_Matching_Query_Validation_Strategy.strategy.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function __construct($validation_error_message = null, $model_name = '', $query_params = array(), $input_field_name = '')
     {
-        if (! EE_Registry::instance()->is_model_name($model_name)) {
+        if ( ! EE_Registry::instance()->is_model_name($model_name)) {
             throw new EE_Error(sprintf(esc_html__('You must provide a valid model object ', 'event_espresso'), $model_name));
         }
         $this->_model = EE_Registry::instance()->load_model($model_name);
@@ -59,8 +59,8 @@ 
             return true;
         }
         $combined_query_params = $this->get_query_params();
-        $combined_query_params[0][ $this->treat_input_as_field() ] = $normalized_value;
-        if (! $this->get_model()->exists($combined_query_params)) {
+        $combined_query_params[0][$this->treat_input_as_field()] = $normalized_value;
+        if ( ! $this->get_model()->exists($combined_query_params)) {
             throw new EE_Validation_Error($this->get_validation_error_message(), 'no_matching_model_object');
         }
     }

Indentation +71 added lines, -71 removed lines

@@ -13,86 +13,86 @@
  */
 class EE_Model_Matching_Query_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     *
-     * @var EEM_Base
-     */
-    protected $_model;
-    protected $_query_params;
-    protected $_input_field_name;
+	/**
+	 *
+	 * @var EEM_Base
+	 */
+	protected $_model;
+	protected $_query_params;
+	protected $_input_field_name;
 
 
 
-    /**
-     * @param string $validation_error_message
-     * @param string $model_name  name of an EEM_Base model
-     * @param array  $query_params     @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @param string $input_field_name the input will be treated as this field's value
-     * @throws \EE_Error
-     */
-    public function __construct($validation_error_message = null, $model_name = '', $query_params = array(), $input_field_name = '')
-    {
-        if (! EE_Registry::instance()->is_model_name($model_name)) {
-            throw new EE_Error(sprintf(esc_html__('You must provide a valid model object ', 'event_espresso'), $model_name));
-        }
-        $this->_model = EE_Registry::instance()->load_model($model_name);
-        $this->_query_params = $query_params;
-        if (empty($input_field_name)) {
-            $input_field_name = $this->_model->primary_key_name();
-        }
-        $this->_input_field_name = $input_field_name;
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param string $validation_error_message
+	 * @param string $model_name  name of an EEM_Base model
+	 * @param array  $query_params     @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @param string $input_field_name the input will be treated as this field's value
+	 * @throws \EE_Error
+	 */
+	public function __construct($validation_error_message = null, $model_name = '', $query_params = array(), $input_field_name = '')
+	{
+		if (! EE_Registry::instance()->is_model_name($model_name)) {
+			throw new EE_Error(sprintf(esc_html__('You must provide a valid model object ', 'event_espresso'), $model_name));
+		}
+		$this->_model = EE_Registry::instance()->load_model($model_name);
+		$this->_query_params = $query_params;
+		if (empty($input_field_name)) {
+			$input_field_name = $this->_model->primary_key_name();
+		}
+		$this->_input_field_name = $input_field_name;
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * @param $normalized_value
-     * @return bool|void
-     * @throws \EE_Error
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if (empty($normalized_value)) {
-            return true;
-        }
-        $combined_query_params = $this->get_query_params();
-        $combined_query_params[0][ $this->treat_input_as_field() ] = $normalized_value;
-        if (! $this->get_model()->exists($combined_query_params)) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'no_matching_model_object');
-        }
-    }
+	/**
+	 * @param $normalized_value
+	 * @return bool|void
+	 * @throws \EE_Error
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if (empty($normalized_value)) {
+			return true;
+		}
+		$combined_query_params = $this->get_query_params();
+		$combined_query_params[0][ $this->treat_input_as_field() ] = $normalized_value;
+		if (! $this->get_model()->exists($combined_query_params)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'no_matching_model_object');
+		}
+	}
 
-    /**
-     * Gets the model used for querying
-     * @return EEM_Base
-     */
-    public function get_model()
-    {
-        return $this->_model;
-    }
+	/**
+	 * Gets the model used for querying
+	 * @return EEM_Base
+	 */
+	public function get_model()
+	{
+		return $this->_model;
+	}
 
-    /**
-     * Returns query params used for model query
-     * @return array
-     */
-    public function get_query_params()
-    {
-        return (array) $this->_query_params;
-    }
+	/**
+	 * Returns query params used for model query
+	 * @return array
+	 */
+	public function get_query_params()
+	{
+		return (array) $this->_query_params;
+	}
 
-    /**
-     * Gets the name of the field that will be used for lookup.
-     * eg it could be "EVT_name", meaning that if there is a model object in
-     * the database that has that event name, and matching the other query parameters
-     * on this strategy, the input will pass validation server-side
-     * @return string
-     */
-    public function treat_input_as_field()
-    {
-        return $this->_input_field_name;
-    }
+	/**
+	 * Gets the name of the field that will be used for lookup.
+	 * eg it could be "EVT_name", meaning that if there is a model object in
+	 * the database that has that event name, and matching the other query parameters
+	 * on this strategy, the input will pass validation server-side
+	 * @return string
+	 */
+	public function treat_input_as_field()
+	{
+		return $this->_input_field_name;
+	}
 }
 
 // End of file EE_FUll_HTML_Validation_Strategy.strategy.php

core/libraries/form_sections/strategies/validation/EE_Plaintext_Validation_Strategy.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = esc_html__("HTML tags are not permitted in this field", "event_espresso");
         }
         parent::__construct($validation_error_message);

Indentation +23 added lines, -23 removed lines

@@ -13,28 +13,28 @@
  */
 class EE_Plaintext_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = esc_html__("HTML tags are not permitted in this field", "event_espresso");
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = esc_html__("HTML tags are not permitted in this field", "event_espresso");
+		}
+		parent::__construct($validation_error_message);
+	}
 
-    /**
-     * @param string|null $normalized_value
-     * @throws EE_Validation_Error
-     */
-    public function validate($normalized_value = '')
-    {
-        $normalized_value = (string) $normalized_value;
-        $no_tags = wp_strip_all_tags($normalized_value);
-        if (strlen($no_tags) < strlen(trim($normalized_value))) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'no_html_tags');
-        }
-        parent::validate($normalized_value);
-    }
+	/**
+	 * @param string|null $normalized_value
+	 * @throws EE_Validation_Error
+	 */
+	public function validate($normalized_value = '')
+	{
+		$normalized_value = (string) $normalized_value;
+		$no_tags = wp_strip_all_tags($normalized_value);
+		if (strlen($no_tags) < strlen(trim($normalized_value))) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'no_html_tags');
+		}
+		parent::validate($normalized_value);
+	}
 }