eventespresso / event-espresso-core

core/services/request/files/FileSubmission.php

Spacing +3 added lines, -3 removed lines

@@ -93,7 +93,7 @@ 
      */
     public function getType()
     {
-        if (!$this->type) {
+        if ( ! $this->type) {
             $this->type = $this->determineType();
         }
         return $this->type;
@@ -105,7 +105,7 @@ 
      */
     protected function determineType()
     {
-        if (!$this->getTmpFile()) {
+        if ( ! $this->getTmpFile()) {
             return '';
         }
         $finfo = new finfo(FILEINFO_MIME_TYPE);
@@ -119,7 +119,7 @@ 
      */
     public function getExtension()
     {
-        if (!$this->extension) {
+        if ( ! $this->extension) {
             $this->extension = $this->determineExtension();
         }
         return $this->extension;

Indentation +158 added lines, -158 removed lines

@@ -19,164 +19,164 @@
  */
 class FileSubmission implements FileSubmissionInterface
 {
-    /**
-     * @var string original name on the client machine
-     */
-    protected $name;
-
-    /**
-     * @var string mime type
-     */
-    protected $type;
-
-    /**
-     * @var string file extension
-     */
-    protected $extension;
-
-    /**
-     * @var int in bytes
-     */
-    protected $size;
-
-    /**
-     * @var string local filepath to the temporary file
-     */
-    protected $tmp_file;
-
-    /**
-     * @var int one of UPLOAD_ERR_OK, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE or other values
-     * although those aren't expected.
-     */
-    protected $error_code;
-
-    /**
-     * FileSubmission constructor.
-     * @param $name
-     * @param $tmp_file
-     * @param $size
-     * @param null $error_code
-     * @throws InvalidArgumentException
-     */
-    public function __construct($name, $tmp_file, $size, $error_code = null)
-    {
-        $this->name = basename($name);
-        $scheme = parse_url($tmp_file, PHP_URL_SCHEME);
-        if (in_array($scheme, ['http', 'https'])) {
-            // Wait a minute- just local filepaths please, no URL schemes allowed!
-            throw new InvalidArgumentException(
-                sprintf(
-                    // @codingStandardsIgnoreStart
-                    esc_html__('The scheme ("%1$s") on the temporary file ("%2$s") indicates is located elsewhere, that’s not ok!', 'event_espresso'),
-                    // @codingStandardsIgnoreEnd
-                    $scheme,
-                    $tmp_file
-                )
-            );
-        }
-        $this->tmp_file = (string) $tmp_file;
-        $this->size = (int) $size;
-        $this->error_code = (int) $error_code;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Gets the file's mime type
-     * @return string
-     */
-    public function getType()
-    {
-        if (!$this->type) {
-            $this->type = $this->determineType();
-        }
-        return $this->type;
-    }
-
-    /**
-     * @since 4.9.80.p
-     * @return string
-     */
-    protected function determineType()
-    {
-        if (!$this->getTmpFile()) {
-            return '';
-        }
-        $finfo = new finfo(FILEINFO_MIME_TYPE);
-        return $finfo->file($this->getTmpFile());
-    }
-
-    /**
-     * Gets the file's extension.
-     * @since 4.9.80.p
-     * @return string
-     */
-    public function getExtension()
-    {
-        if (!$this->extension) {
-            $this->extension = $this->determineExtension();
-        }
-        return $this->extension;
-    }
-
-    /**
-     * Determine's the file's extension given the temporary file.
-     * @since 4.9.80.p
-     * @return string
-     */
-    protected function determineExtension()
-    {
-        $position_of_period = strrpos($this->getName(), '.');
-        if ($position_of_period === false) {
-            return '';
-        }
-        return mb_substr(
-            $this->getName(),
-            $position_of_period + 1
-        );
-    }
-
-    /**
-     * Gets the size of the file
-     * @return int
-     */
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    /**
-     * Gets the path to the temporary file which was uploaded.
-     * @return string
-     */
-    public function getTmpFile()
-    {
-        return $this->tmp_file;
-    }
-
-    /**
-     * @since 4.9.80.p
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * Gets the error code PHP reported for the file upload.
-     * @return string
-     */
-    public function getErrorCode()
-    {
-        return $this->error_code;
-    }
+	/**
+	 * @var string original name on the client machine
+	 */
+	protected $name;
+
+	/**
+	 * @var string mime type
+	 */
+	protected $type;
+
+	/**
+	 * @var string file extension
+	 */
+	protected $extension;
+
+	/**
+	 * @var int in bytes
+	 */
+	protected $size;
+
+	/**
+	 * @var string local filepath to the temporary file
+	 */
+	protected $tmp_file;
+
+	/**
+	 * @var int one of UPLOAD_ERR_OK, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE or other values
+	 * although those aren't expected.
+	 */
+	protected $error_code;
+
+	/**
+	 * FileSubmission constructor.
+	 * @param $name
+	 * @param $tmp_file
+	 * @param $size
+	 * @param null $error_code
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($name, $tmp_file, $size, $error_code = null)
+	{
+		$this->name = basename($name);
+		$scheme = parse_url($tmp_file, PHP_URL_SCHEME);
+		if (in_array($scheme, ['http', 'https'])) {
+			// Wait a minute- just local filepaths please, no URL schemes allowed!
+			throw new InvalidArgumentException(
+				sprintf(
+					// @codingStandardsIgnoreStart
+					esc_html__('The scheme ("%1$s") on the temporary file ("%2$s") indicates is located elsewhere, that’s not ok!', 'event_espresso'),
+					// @codingStandardsIgnoreEnd
+					$scheme,
+					$tmp_file
+				)
+			);
+		}
+		$this->tmp_file = (string) $tmp_file;
+		$this->size = (int) $size;
+		$this->error_code = (int) $error_code;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Gets the file's mime type
+	 * @return string
+	 */
+	public function getType()
+	{
+		if (!$this->type) {
+			$this->type = $this->determineType();
+		}
+		return $this->type;
+	}
+
+	/**
+	 * @since 4.9.80.p
+	 * @return string
+	 */
+	protected function determineType()
+	{
+		if (!$this->getTmpFile()) {
+			return '';
+		}
+		$finfo = new finfo(FILEINFO_MIME_TYPE);
+		return $finfo->file($this->getTmpFile());
+	}
+
+	/**
+	 * Gets the file's extension.
+	 * @since 4.9.80.p
+	 * @return string
+	 */
+	public function getExtension()
+	{
+		if (!$this->extension) {
+			$this->extension = $this->determineExtension();
+		}
+		return $this->extension;
+	}
+
+	/**
+	 * Determine's the file's extension given the temporary file.
+	 * @since 4.9.80.p
+	 * @return string
+	 */
+	protected function determineExtension()
+	{
+		$position_of_period = strrpos($this->getName(), '.');
+		if ($position_of_period === false) {
+			return '';
+		}
+		return mb_substr(
+			$this->getName(),
+			$position_of_period + 1
+		);
+	}
+
+	/**
+	 * Gets the size of the file
+	 * @return int
+	 */
+	public function getSize()
+	{
+		return $this->size;
+	}
+
+	/**
+	 * Gets the path to the temporary file which was uploaded.
+	 * @return string
+	 */
+	public function getTmpFile()
+	{
+		return $this->tmp_file;
+	}
+
+	/**
+	 * @since 4.9.80.p
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->getName();
+	}
+
+	/**
+	 * Gets the error code PHP reported for the file upload.
+	 * @return string
+	 */
+	public function getErrorCode()
+	{
+		return $this->error_code;
+	}
 }
 // End of file FileSubmission.php
 // Location: EventEspresso\core\services\request\files/FileSubmission.php

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

Indentation +70 added lines, -70 removed lines

@@ -15,80 +15,80 @@
 class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy
 {
 
-    /**
-     * Arguments that will be passed into the select2 javascript constructor
-     * @var array
-     */
-    protected $_select2_js_args = array();
+	/**
+	 * Arguments that will be passed into the select2 javascript constructor
+	 * @var array
+	 */
+	protected $_select2_js_args = array();
 
-    /**
-     *
-     * @param array $select2_js_args pass in the EXACT array of JS arguments you want
-     * to pass into the select2 js/html input. See https://select2.github.io
-     */
-    public function __construct($select2_js_args = array())
-    {
-        $this->_select2_js_args = $select2_js_args;
-        parent::__construct();
-    }
+	/**
+	 *
+	 * @param array $select2_js_args pass in the EXACT array of JS arguments you want
+	 * to pass into the select2 js/html input. See https://select2.github.io
+	 */
+	public function __construct($select2_js_args = array())
+	{
+		$this->_select2_js_args = $select2_js_args;
+		parent::__construct();
+	}
 
-    /**
-     * enqueues the select2 initializing js (which depends on the select2 js) and
-     * the select2 css
-     */
-    public function enqueue_js()
-    {
-        // need to first deregister the select2 script in case some other plugin **cough cough Toolset Types cough**
-        // is carelessly registering an older version of Select2 on admin pages that don't even belong to them
-        wp_deregister_script('select2');
-        wp_deregister_style('select2');
-        wp_register_script('select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true);
-        wp_register_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
-        wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true);
-        wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
-    }
+	/**
+	 * enqueues the select2 initializing js (which depends on the select2 js) and
+	 * the select2 css
+	 */
+	public function enqueue_js()
+	{
+		// need to first deregister the select2 script in case some other plugin **cough cough Toolset Types cough**
+		// is carelessly registering an older version of Select2 on admin pages that don't even belong to them
+		wp_deregister_script('select2');
+		wp_deregister_style('select2');
+		wp_register_script('select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true);
+		wp_register_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
+		wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true);
+		wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
+	}
 
-    /**
-     * Gets the javascript args which will be localized and passed into the select2 js/html input
-     * @return array
-     */
-    public function get_js_args()
-    {
-        return $this->_select2_js_args;
-    }
+	/**
+	 * Gets the javascript args which will be localized and passed into the select2 js/html input
+	 * @return array
+	 */
+	public function get_js_args()
+	{
+		return $this->_select2_js_args;
+	}
 
-    /**
-     * Sets the exact js args which will be passed into the select2 js/html input
-     * @param array $js_args
-     */
-    public function set_js_args($js_args)
-    {
-        $this->_select2_js_args = $js_args;
-    }
+	/**
+	 * Sets the exact js args which will be passed into the select2 js/html input
+	 * @param array $js_args
+	 */
+	public function set_js_args($js_args)
+	{
+		$this->_select2_js_args = $js_args;
+	}
 
-    /**
-     * Adds select2 data for localization
-     * @param array $other_js_data
-     * @return array
-     */
-    public function get_other_js_data($other_js_data = array())
-    {
-        $other_js_data = parent::get_other_js_data($other_js_data);
-        if (! isset($other_js_data['select2s'])) {
-            $other_js_data['select2s'] = array();
-        }
-        $other_js_data['select2s'][ $this->_input->html_id() ] = $this->get_js_args();
-        return $other_js_data;
-    }
+	/**
+	 * Adds select2 data for localization
+	 * @param array $other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data($other_js_data = array())
+	{
+		$other_js_data = parent::get_other_js_data($other_js_data);
+		if (! isset($other_js_data['select2s'])) {
+			$other_js_data['select2s'] = array();
+		}
+		$other_js_data['select2s'][ $this->_input->html_id() ] = $this->get_js_args();
+		return $other_js_data;
+	}
 
-    /**
-     * Overrides standard attributes array to add the CSS class "ee-select2"
-     * @return array
-     */
-    protected function _standard_attributes_array()
-    {
-        $standard_attributes = parent::_standard_attributes_array();
-        $standard_attributes['class'] .= ' ee-select2';
-        return $standard_attributes;
-    }
+	/**
+	 * Overrides standard attributes array to add the CSS class "ee-select2"
+	 * @return array
+	 */
+	protected function _standard_attributes_array()
+	{
+		$standard_attributes = parent::_standard_attributes_array();
+		$standard_attributes['class'] .= ' ee-select2';
+		return $standard_attributes;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -42,10 +42,10 @@ 
         // is carelessly registering an older version of Select2 on admin pages that don't even belong to them
         wp_deregister_script('select2');
         wp_deregister_style('select2');
-        wp_register_script('select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true);
-        wp_register_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
-        wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true);
-        wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
+        wp_register_script('select2', EE_GLOBAL_ASSETS_URL.'scripts/select2.min.js', array(), '4.0.2', true);
+        wp_register_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
+        wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL.'scripts/form_section_select2_init.js', array('select2'), '1.0.0', true);
+        wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
     }
 
     /**
@@ -74,10 +74,10 @@ 
     public function get_other_js_data($other_js_data = array())
     {
         $other_js_data = parent::get_other_js_data($other_js_data);
-        if (! isset($other_js_data['select2s'])) {
+        if ( ! isset($other_js_data['select2s'])) {
             $other_js_data['select2s'] = array();
         }
-        $other_js_data['select2s'][ $this->_input->html_id() ] = $this->get_js_args();
+        $other_js_data['select2s'][$this->_input->html_id()] = $this->get_js_args();
         return $other_js_data;
     }
 

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

Indentation +7 added lines, -7 removed lines

@@ -10,11 +10,11 @@
  */
 class EE_File_Input_Display_Strategy extends EE_Text_Input_Display_Strategy
 {
-    /**
-     * Override's parent to just set the type. May someday support other arguments.
-     */
-    public function __construct()
-    {
-        parent::__construct('file');
-    }
+	/**
+	 * Override's parent to just set the type. May someday support other arguments.
+	 */
+	public function __construct()
+	{
+		parent::__construct('file');
+	}
 }

core/libraries/form_sections/inputs/EE_File_Input.input.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
                     esc_html__('Please provide a file of the requested filetype: %1$s', 'event_espresso'),
                     implode(', ', $this->allowed_file_extensions)
                 ),
-                '~.*\.(' . implode('|', $this->allowed_file_extensions) . ')$~'
+                '~.*\.('.implode('|', $this->allowed_file_extensions).')$~'
             )
         );
         parent::__construct($options);

Indentation +75 added lines, -75 removed lines

@@ -19,86 +19,86 @@
  */
 class EE_File_Input extends EE_Form_Input_Base
 {
-    /**
-     * @var array
-     */
-    protected $allowed_file_extensions;
+	/**
+	 * @var array
+	 */
+	protected $allowed_file_extensions;
 
-    /**
-     * @var array
-     */
-    protected $allowed_mime_types;
+	/**
+	 * @var array
+	 */
+	protected $allowed_mime_types;
 
-    /**
-     * @param array $options
-     * @throws InvalidArgumentException
-     */
-    public function __construct($options = array())
-    {
-        if (isset($options['allowed_file_extensions'])) {
-            $this->allowed_file_extensions = (array) $options['allowed_file_extensions'];
-        } else {
-            $this->allowed_file_extensions = ['csv'];
-        }
-        if (isset($options['allowed_mime_types'])) {
-            $this->allowed_mime_types = (array) $options['allowed_file_extensions'];
-        } else {
-            $this->allowed_mime_types = ['text/csv'];
-        }
+	/**
+	 * @param array $options
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($options = array())
+	{
+		if (isset($options['allowed_file_extensions'])) {
+			$this->allowed_file_extensions = (array) $options['allowed_file_extensions'];
+		} else {
+			$this->allowed_file_extensions = ['csv'];
+		}
+		if (isset($options['allowed_mime_types'])) {
+			$this->allowed_mime_types = (array) $options['allowed_file_extensions'];
+		} else {
+			$this->allowed_mime_types = ['text/csv'];
+		}
 
-        $this->_set_display_strategy(new EE_File_Input_Display_Strategy());
-        $this->_set_normalization_strategy(new EE_File_Normalization());
-        $this->add_validation_strategy(
-            new EE_Text_Validation_Strategy(
-                sprintf(
-                    // translators: %1$s is a list of allowed file extensions.
-                    esc_html__('Please provide a file of the requested filetype: %1$s', 'event_espresso'),
-                    implode(', ', $this->allowed_file_extensions)
-                ),
-                '~.*\.(' . implode('|', $this->allowed_file_extensions) . ')$~'
-            )
-        );
-        parent::__construct($options);
+		$this->_set_display_strategy(new EE_File_Input_Display_Strategy());
+		$this->_set_normalization_strategy(new EE_File_Normalization());
+		$this->add_validation_strategy(
+			new EE_Text_Validation_Strategy(
+				sprintf(
+					// translators: %1$s is a list of allowed file extensions.
+					esc_html__('Please provide a file of the requested filetype: %1$s', 'event_espresso'),
+					implode(', ', $this->allowed_file_extensions)
+				),
+				'~.*\.(' . implode('|', $this->allowed_file_extensions) . ')$~'
+			)
+		);
+		parent::__construct($options);
 
 //        It would be great to add this HTML attribute, but jQuery validate chokes on it.
-        $this->set_other_html_attributes(
-            $this->other_html_attributes()
-            . ' extension="'
-            . implode(
-                ',',
-                $this->allowed_file_extensions
-            )
-            . '"'
-        );
-    }
+		$this->set_other_html_attributes(
+			$this->other_html_attributes()
+			. ' extension="'
+			. implode(
+				',',
+				$this->allowed_file_extensions
+			)
+			. '"'
+		);
+	}
 
-    /**
-     * $_FILES has a really weird structure. So we let `FilesDataHandler` take care of finding the file info for
-     * this input.
-     * @since 4.9.80.p
-     * @param array $req_data
-     * @return FileSubmissionInterface
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function find_form_data_for_this_section($req_data)
-    {
-        // ignore $req_data. Files are in the files data handler.
-        $fileDataHandler = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\services\request\files\FilesDataHandler'
-        );
-        return $fileDataHandler->getFileObject($this->html_name());
-    }
+	/**
+	 * $_FILES has a really weird structure. So we let `FilesDataHandler` take care of finding the file info for
+	 * this input.
+	 * @since 4.9.80.p
+	 * @param array $req_data
+	 * @return FileSubmissionInterface
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function find_form_data_for_this_section($req_data)
+	{
+		// ignore $req_data. Files are in the files data handler.
+		$fileDataHandler = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\services\request\files\FilesDataHandler'
+		);
+		return $fileDataHandler->getFileObject($this->html_name());
+	}
 
-    /**
-     * Don't transform the file submission object into a string, thanks.
-     *
-     * @param string $value
-     * @return null|string
-     */
-    protected function _sanitize($value)
-    {
-        return $value;
-    }
+	/**
+	 * Don't transform the file submission object into a string, thanks.
+	 *
+	 * @param string $value
+	 * @return null|string
+	 */
+	protected function _sanitize($value)
+	{
+		return $value;
+	}
 }

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

Indentation +34 added lines, -34 removed lines

@@ -13,40 +13,40 @@
 class EE_File_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /**
-     * Keep in mind $value_to_normalize should be a FileSubmissionInterface or null, so this shouldn't really do
-     * much (other than NOT convert it to a string or something).
-     * @param string $value_to_normalize
-     * @return FileSubmissionInterface
-     */
-    public function normalize($value_to_normalize)
-    {
-        if ($value_to_normalize instanceof FileSubmissionInterface || is_null($value_to_normalize)) {
-            return $value_to_normalize;
-        } else {
-            throw new EE_Validation_Error(
-                esc_html__('The file input has an invalid format.', 'event_espresso')
-            );
-        }
-    }
+	/**
+	 * Keep in mind $value_to_normalize should be a FileSubmissionInterface or null, so this shouldn't really do
+	 * much (other than NOT convert it to a string or something).
+	 * @param string $value_to_normalize
+	 * @return FileSubmissionInterface
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if ($value_to_normalize instanceof FileSubmissionInterface || is_null($value_to_normalize)) {
+			return $value_to_normalize;
+		} else {
+			throw new EE_Validation_Error(
+				esc_html__('The file input has an invalid format.', 'event_espresso')
+			);
+		}
+	}
 
 
-    /**
-     * This may be called prematurely on submitted data, so we actually don't want to convert it into a string because
-     * we'll lose all the FileSubmissionInterface data. So prefer to leave it alone. FileSubmissionInterface
-     * can be cast to a string just fine so it's good as-is.
-     *
-     * @param string $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        if ($normalized_value instanceof FileSubmissionInterface || is_null($normalized_value)) {
-            // Leave it as the object, it can be treated like a string because it
-            // overrides __toString()
-            return $normalized_value;
-        } else {
-            return (string) $normalized_value;
-        }
-    }
+	/**
+	 * This may be called prematurely on submitted data, so we actually don't want to convert it into a string because
+	 * we'll lose all the FileSubmissionInterface data. So prefer to leave it alone. FileSubmissionInterface
+	 * can be cast to a string just fine so it's good as-is.
+	 *
+	 * @param string $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		if ($normalized_value instanceof FileSubmissionInterface || is_null($normalized_value)) {
+			// Leave it as the object, it can be treated like a string because it
+			// overrides __toString()
+			return $normalized_value;
+		} else {
+			return (string) $normalized_value;
+		}
+	}
 }

core/data_migration_scripts/EE_Data_Migration_Script_Stage_Table.core.php

Indentation +77 added lines, -77 removed lines

@@ -16,89 +16,89 @@
 abstract class EE_Data_Migration_Script_Stage_Table extends EE_Data_Migration_Script_Stage
 {
 
-    protected $_old_table;
+	protected $_old_table;
 
-    /**
-     * @var string The columns to select. May be overridden for children.
-     */
-    protected $select_expression = '*';
+	/**
+	 * @var string The columns to select. May be overridden for children.
+	 */
+	protected $select_expression = '*';
 
-    /**
-     * Set in the constructor to add this sql to both the counting query in
-     * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
-     * EE_Data_Migration_Script_Stage_Table::_get_rows().
-     * Eg "where column_name like '%some_value%'"
-     *
-     * @var string
-     */
-    protected $_extra_where_sql;
+	/**
+	 * Set in the constructor to add this sql to both the counting query in
+	 * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
+	 * EE_Data_Migration_Script_Stage_Table::_get_rows().
+	 * Eg "where column_name like '%some_value%'"
+	 *
+	 * @var string
+	 */
+	protected $_extra_where_sql;
 
 
-    /**
-     * IMPORTANT: if an error is encountered, or everything is finished, this stage should update its status property
-     * accordingly. Note: it should not alter the count of items migrated. That is done in the public function that
-     * calls this. IMPORTANT: The count of items migrated should ONLY be less than $num_items_to_migrate when it's the
-     * last migration step, otherwise it should always return $num_items_to_migrate. (Eg, if we're migrating attendees
-     * rows from the database, and $num_items_to_migrate is set to 50, then we SHOULD actually migrate 50 rows,but at
-     * very least we MUST report/return 50 items migrated)
-     *
-     * @param int $num_items
-     * @return int number of items ACTUALLY migrated
-     */
-    public function _migration_step($num_items = 50)
-    {
-        $rows = $this->_get_rows($num_items);
-        $items_actually_migrated = 0;
-        foreach ($rows as $old_row) {
-            $this->_migrate_old_row($old_row);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+	/**
+	 * IMPORTANT: if an error is encountered, or everything is finished, this stage should update its status property
+	 * accordingly. Note: it should not alter the count of items migrated. That is done in the public function that
+	 * calls this. IMPORTANT: The count of items migrated should ONLY be less than $num_items_to_migrate when it's the
+	 * last migration step, otherwise it should always return $num_items_to_migrate. (Eg, if we're migrating attendees
+	 * rows from the database, and $num_items_to_migrate is set to 50, then we SHOULD actually migrate 50 rows,but at
+	 * very least we MUST report/return 50 items migrated)
+	 *
+	 * @param int $num_items
+	 * @return int number of items ACTUALLY migrated
+	 */
+	public function _migration_step($num_items = 50)
+	{
+		$rows = $this->_get_rows($num_items);
+		$items_actually_migrated = 0;
+		foreach ($rows as $old_row) {
+			$this->_migrate_old_row($old_row);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
 
-    /**
-     * Gets the rows for each migration stage from the old table
-     *
-     * @global wpdb $wpdb
-     * @param int   $limit
-     * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
-     */
-    protected function _get_rows($limit)
-    {
-        global $wpdb;
-        $start_at_record = $this->count_records_migrated();
-        $query = "SELECT {$this->select_expression} FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare(
-            "LIMIT %d, %d",
-            $start_at_record,
-            $limit
-        );
-        return $wpdb->get_results($query, ARRAY_A);
-    }
+	/**
+	 * Gets the rows for each migration stage from the old table
+	 *
+	 * @global wpdb $wpdb
+	 * @param int   $limit
+	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
+	 */
+	protected function _get_rows($limit)
+	{
+		global $wpdb;
+		$start_at_record = $this->count_records_migrated();
+		$query = "SELECT {$this->select_expression} FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare(
+			"LIMIT %d, %d",
+			$start_at_record,
+			$limit
+		);
+		return $wpdb->get_results($query, ARRAY_A);
+	}
 
 
-    /**
-     * Counts the records to migrate; the public version may cache it
-     *
-     * @return int
-     */
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $query = "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
-        $count = $wpdb->get_var($query);
-        return $count;
-    }
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 *
+	 * @return int
+	 */
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$query = "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
+		$count = $wpdb->get_var($query);
+		return $count;
+	}
 
-    /**
-     * takes care of migrating this particular row from the OLD table to whatever its
-     * representation is in the new database. If there are errors, use $this->add_error to log them. If there is a
-     * fatal error which prevents all future migrations, throw an exception describing it
-     *
-     * @param array $old_row an associative array where keys are column names and values are their values.
-     * @return null
-     */
-    abstract protected function _migrate_old_row($old_row);
+	/**
+	 * takes care of migrating this particular row from the OLD table to whatever its
+	 * representation is in the new database. If there are errors, use $this->add_error to log them. If there is a
+	 * fatal error which prevents all future migrations, throw an exception describing it
+	 *
+	 * @param array $old_row an associative array where keys are column names and values are their values.
+	 * @return null
+	 */
+	abstract protected function _migrate_old_row($old_row);
 }

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     {
         global $wpdb;
         $start_at_record = $this->count_records_migrated();
-        $query = "SELECT {$this->select_expression} FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare(
+        $query = "SELECT {$this->select_expression} FROM {$this->_old_table} {$this->_extra_where_sql} ".$wpdb->prepare(
             "LIMIT %d, %d",
             $start_at_record,
             $limit

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

Spacing +14 added lines, -14 removed lines

@@ -67,19 +67,19 @@ 
         $html = '';
         // layout_form_begin
         $html .= apply_filters(
-            'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_' . $this->_form_section->name(),
+            'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_'.$this->_form_section->name(),
             $this->layout_form_begin(),
             $this->_form_section
         );
         // layout_form_loop
         $html .= apply_filters(
-            'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_' . $this->_form_section->name(),
+            'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_'.$this->_form_section->name(),
             $this->layout_form_loop(),
             $this->_form_section
         );
         // layout_form_end
         $html .= apply_filters(
-            'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_' . $this->_form_section->name(),
+            'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_'.$this->_form_section->name(),
             $this->layout_form_end(),
             $this->_form_section
         );
@@ -100,7 +100,7 @@ 
             if ($subsection instanceof EE_Form_Input_Base) {
                 $html .= apply_filters(
                     'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_'
-                    . $name . '__in_' . $this->_form_section->name(),
+                    . $name.'__in_'.$this->_form_section->name(),
                     $this->layout_input($subsection),
                     $this->_form_section,
                     $subsection
@@ -108,7 +108,7 @@ 
             } elseif ($subsection instanceof EE_Form_Section_Base) {
                 $html .= apply_filters(
                     'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_'
-                    . $name . '__in_' . $this->_form_section->name(),
+                    . $name.'__in_'.$this->_form_section->name(),
                     $this->layout_subsection($subsection),
                     $this->_form_section,
                     $subsection
@@ -177,10 +177,10 @@ 
             return '';
         }
         $class = $input->required()
-            ? 'ee-required-label ' . $input->html_label_class()
+            ? 'ee-required-label '.$input->html_label_class()
             : $input->html_label_class();
         $label_text = $input->required()
-            ? $input->html_label_text() . '<span class="ee-asterisk">*</span>'
+            ? $input->html_label_text().'<span class="ee-asterisk">*</span>'
             : $input->html_label_text();
         return '<label id="'
                . $input->html_label_id()
@@ -188,7 +188,7 @@ 
                . $class
                . '" style="'
                . $input->html_label_style()
-               . '" for="' . $input->html_id()
+               . '" for="'.$input->html_id()
                . '">'
                . $label_text
                . '</label>';
@@ -210,7 +210,7 @@ 
             // get all the errors on THIS form section (errors which aren't
             // for specific inputs, but instead for the entire form section)
             foreach ($this->_form_section->get_validation_errors() as $error) {
-                $html .= $error->getMessage() . '<br>';
+                $html .= $error->getMessage().'<br>';
             }
             $html .= '</div>';
         }
@@ -254,7 +254,7 @@ 
      */
     public function display_help_text($input)
     {
-        $help_text  = $input->html_help_text();
+        $help_text = $input->html_help_text();
         if ($help_text !== '' && $help_text !== null) {
             $tag = is_admin() ? 'p' : 'span';
             return '<'
@@ -286,14 +286,14 @@ 
     {
         // replace dashes and spaces with underscores
         $hook_name = str_replace(array('-', ' '), '_', $this->_form_section->html_id());
-        do_action('AHEE__Form_Section_Layout__' . $hook_name, $this->_form_section);
+        do_action('AHEE__Form_Section_Layout__'.$hook_name, $this->_form_section);
         $html = (string) apply_filters(
-            'AFEE__Form_Section_Layout__' . $hook_name . '__html',
+            'AFEE__Form_Section_Layout__'.$hook_name.'__html',
             $html,
             $this->_form_section
         );
-        $html .= EEH_HTML::nl() . '<!-- AHEE__Form_Section_Layout__' . $hook_name . '__html -->';
-        $html .= EEH_HTML::nl() . '<!-- AFEE__Form_Section_Layout__' . $hook_name . ' -->';
+        $html .= EEH_HTML::nl().'<!-- AHEE__Form_Section_Layout__'.$hook_name.'__html -->';
+        $html .= EEH_HTML::nl().'<!-- AFEE__Form_Section_Layout__'.$hook_name.' -->';
         return $html;
     }
 }

Indentation +283 added lines, -283 removed lines

@@ -12,287 +12,287 @@
 abstract class EE_Form_Section_Layout_Base
 {
 
-    /**
-     * Form section to lay out
-     *
-     * @var EE_Form_Section_Proper
-     */
-    protected $_form_section;
-
-
-
-    /**
-     *  __construct
-     */
-    public function __construct()
-    {
-    }
-
-
-
-    /**
-     * The form section on which this strategy is to perform
-     *
-     * @param EE_Form_Section_Proper $form
-     */
-    public function _construct_finalize(EE_Form_Section_Proper $form)
-    {
-        $this->_form_section = $form;
-    }
-
-
-
-    /**
-     * @return EE_Form_Section_Proper
-     */
-    public function form_section()
-    {
-        return $this->_form_section;
-    }
-
-
-
-    /**
-     * Also has teh side effect of enqueuing any needed JS and CSS for
-     * this form.
-     * Creates all the HTML necessary for displaying this form, its inputs, and
-     * proper subsections.
-     * Returns the HTML
-     *
-     * @return string HTML for displaying
-     * @throws EE_Error
-     */
-    public function layout_form()
-    {
-        $html = '';
-        // layout_form_begin
-        $html .= apply_filters(
-            'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_' . $this->_form_section->name(),
-            $this->layout_form_begin(),
-            $this->_form_section
-        );
-        // layout_form_loop
-        $html .= apply_filters(
-            'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_' . $this->_form_section->name(),
-            $this->layout_form_loop(),
-            $this->_form_section
-        );
-        // layout_form_end
-        $html .= apply_filters(
-            'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_' . $this->_form_section->name(),
-            $this->layout_form_end(),
-            $this->_form_section
-        );
-        return $this->add_form_section_hooks_and_filters($html);
-    }
-
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     */
-    public function layout_form_loop()
-    {
-        $html = '';
-        foreach ($this->_form_section->subsections() as $name => $subsection) {
-            if ($subsection instanceof EE_Form_Input_Base) {
-                $html .= apply_filters(
-                    'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_'
-                    . $name . '__in_' . $this->_form_section->name(),
-                    $this->layout_input($subsection),
-                    $this->_form_section,
-                    $subsection
-                );
-            } elseif ($subsection instanceof EE_Form_Section_Base) {
-                $html .= apply_filters(
-                    'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_'
-                    . $name . '__in_' . $this->_form_section->name(),
-                    $this->layout_subsection($subsection),
-                    $this->_form_section,
-                    $subsection
-                );
-            }
-        }
-        return $html;
-    }
-
-
-
-    /**
-     * Should be used to start teh form section (Eg a table tag, or a div tag, etc.)
-     *
-     * @return string
-     */
-    abstract public function layout_form_begin();
-
-
-
-    /**
-     * Should be used to end the form section (eg a /table tag, or a /div tag, etc.)
-     *
-     * @return string
-     */
-    abstract public function layout_form_end();
-
-
-
-    /**
-     * Should be used internally by layout_form() to lay out each input (eg, if this layout
-     * is putting each input in a row of its own, this should probably be called by a
-     *  foreach loop in layout_form() (WITHOUT adding any content directly within layout_form()'s foreach loop.
-     * Eg, this method should add the tr and td tags). This method is exposed in case you want to completely
-     * customize the form's layout, but would like to make use of it for laying out
-     * 'easy-to-layout' inputs
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string html
-     */
-    abstract public function layout_input($input);
-
-
-
-    /**
-     * Similar to layout_input(), should be used internally by layout_form() within a
-     * loop to lay out each proper subsection. Unlike layout_input(), however, it is assumed
-     * that the proper subsection will lay out its container, label, etc on its own.
-     *
-     * @param EE_Form_Section_Base $subsection
-     * @return string html
-     */
-    abstract public function layout_subsection($subsection);
-
-
-    /**
-     * Gets the HTML for the label tag and its contents for the input
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     * @throws EE_Error
-     */
-    public function display_label($input)
-    {
-        if ($input->get_display_strategy() instanceof EE_Hidden_Display_Strategy) {
-            return '';
-        }
-        $class = $input->required()
-            ? 'ee-required-label ' . $input->html_label_class()
-            : $input->html_label_class();
-        $label_text = $input->required()
-            ? $input->html_label_text() . '<span class="ee-asterisk">*</span>'
-            : $input->html_label_text();
-        return '<label id="'
-               . $input->html_label_id()
-               . '" class="'
-               . $class
-               . '" style="'
-               . $input->html_label_style()
-               . '" for="' . $input->html_id()
-               . '">'
-               . $label_text
-               . '</label>';
-    }
-
-
-
-    /**
-     * Gets the HTML for all the form's form-wide errors (ie, errors which
-     * are not for specific inputs. E.g., if two inputs somehow disagree,
-     * those errors would probably be on the form section, not one of its inputs)
-     * @return string
-     */
-    public function display_form_wide_errors()
-    {
-        $html = '';
-        if ($this->_form_section->get_validation_errors()) {
-            $html .= "<div class='ee-form-wide-errors'>";
-            // get all the errors on THIS form section (errors which aren't
-            // for specific inputs, but instead for the entire form section)
-            foreach ($this->_form_section->get_validation_errors() as $error) {
-                $html .= $error->getMessage() . '<br>';
-            }
-            $html .= '</div>';
-        }
-        return apply_filters(
-            'FHEE__EE_Form_Section_Layout_Base__display_form_wide_errors',
-            $html,
-            $this
-        );
-    }
-
-
-    /**
-     * returns the HTML for the server-side validation errors for the specified input
-     * Note that if JS is enabled, it should remove these and instead
-     * populate the form's errors in the jquery validate fashion
-     * using the localized data provided to the JS
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     * @throws EE_Error
-     */
-    public function display_errors($input)
-    {
-        if ($input->get_validation_errors()) {
-            return "<label  id='"
-                   . $input->html_id()
-                   . "-error' class='error' for='{$input->html_name()}'>"
-                   . $input->get_validation_error_string()
-                   . '</label>';
-        }
-        return '';
-    }
-
-
-    /**
-     * Displays the help span for the specified input
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     * @throws EE_Error
-     */
-    public function display_help_text($input)
-    {
-        $help_text  = $input->html_help_text();
-        if ($help_text !== '' && $help_text !== null) {
-            $tag = is_admin() ? 'p' : 'span';
-            return '<'
-                   . $tag
-                   . ' id="'
-                   . $input->html_id()
-                   . '-help" class="'
-                   . $input->html_help_class()
-                   . '" style="'
-                   . $input->html_help_style()
-                   . '">'
-                   . $help_text
-                   . '</'
-                   . $tag
-                   . '>';
-        }
-        return '';
-    }
-
-
-    /**
-     * Does an action and hook onto the end of teh form
-     *
-     * @param string $html
-     * @return string
-     * @throws EE_Error
-     */
-    public function add_form_section_hooks_and_filters($html)
-    {
-        // replace dashes and spaces with underscores
-        $hook_name = str_replace(array('-', ' '), '_', $this->_form_section->html_id());
-        do_action('AHEE__Form_Section_Layout__' . $hook_name, $this->_form_section);
-        $html = (string) apply_filters(
-            'AFEE__Form_Section_Layout__' . $hook_name . '__html',
-            $html,
-            $this->_form_section
-        );
-        $html .= EEH_HTML::nl() . '<!-- AHEE__Form_Section_Layout__' . $hook_name . '__html -->';
-        $html .= EEH_HTML::nl() . '<!-- AFEE__Form_Section_Layout__' . $hook_name . ' -->';
-        return $html;
-    }
+	/**
+	 * Form section to lay out
+	 *
+	 * @var EE_Form_Section_Proper
+	 */
+	protected $_form_section;
+
+
+
+	/**
+	 *  __construct
+	 */
+	public function __construct()
+	{
+	}
+
+
+
+	/**
+	 * The form section on which this strategy is to perform
+	 *
+	 * @param EE_Form_Section_Proper $form
+	 */
+	public function _construct_finalize(EE_Form_Section_Proper $form)
+	{
+		$this->_form_section = $form;
+	}
+
+
+
+	/**
+	 * @return EE_Form_Section_Proper
+	 */
+	public function form_section()
+	{
+		return $this->_form_section;
+	}
+
+
+
+	/**
+	 * Also has teh side effect of enqueuing any needed JS and CSS for
+	 * this form.
+	 * Creates all the HTML necessary for displaying this form, its inputs, and
+	 * proper subsections.
+	 * Returns the HTML
+	 *
+	 * @return string HTML for displaying
+	 * @throws EE_Error
+	 */
+	public function layout_form()
+	{
+		$html = '';
+		// layout_form_begin
+		$html .= apply_filters(
+			'FHEE__EE_Form_Section_Layout_Base__layout_form__start__for_' . $this->_form_section->name(),
+			$this->layout_form_begin(),
+			$this->_form_section
+		);
+		// layout_form_loop
+		$html .= apply_filters(
+			'FHEE__EE_Form_Section_Layout_Base__layout_form__loop__for_' . $this->_form_section->name(),
+			$this->layout_form_loop(),
+			$this->_form_section
+		);
+		// layout_form_end
+		$html .= apply_filters(
+			'FHEE__EE_Form_Section_Layout_Base__layout_form__end__for_' . $this->_form_section->name(),
+			$this->layout_form_end(),
+			$this->_form_section
+		);
+		return $this->add_form_section_hooks_and_filters($html);
+	}
+
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function layout_form_loop()
+	{
+		$html = '';
+		foreach ($this->_form_section->subsections() as $name => $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$html .= apply_filters(
+					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_input_'
+					. $name . '__in_' . $this->_form_section->name(),
+					$this->layout_input($subsection),
+					$this->_form_section,
+					$subsection
+				);
+			} elseif ($subsection instanceof EE_Form_Section_Base) {
+				$html .= apply_filters(
+					'FHEE__EE_Form_Section_Layout_Base__layout_form__loop_for_non_input_'
+					. $name . '__in_' . $this->_form_section->name(),
+					$this->layout_subsection($subsection),
+					$this->_form_section,
+					$subsection
+				);
+			}
+		}
+		return $html;
+	}
+
+
+
+	/**
+	 * Should be used to start teh form section (Eg a table tag, or a div tag, etc.)
+	 *
+	 * @return string
+	 */
+	abstract public function layout_form_begin();
+
+
+
+	/**
+	 * Should be used to end the form section (eg a /table tag, or a /div tag, etc.)
+	 *
+	 * @return string
+	 */
+	abstract public function layout_form_end();
+
+
+
+	/**
+	 * Should be used internally by layout_form() to lay out each input (eg, if this layout
+	 * is putting each input in a row of its own, this should probably be called by a
+	 *  foreach loop in layout_form() (WITHOUT adding any content directly within layout_form()'s foreach loop.
+	 * Eg, this method should add the tr and td tags). This method is exposed in case you want to completely
+	 * customize the form's layout, but would like to make use of it for laying out
+	 * 'easy-to-layout' inputs
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string html
+	 */
+	abstract public function layout_input($input);
+
+
+
+	/**
+	 * Similar to layout_input(), should be used internally by layout_form() within a
+	 * loop to lay out each proper subsection. Unlike layout_input(), however, it is assumed
+	 * that the proper subsection will lay out its container, label, etc on its own.
+	 *
+	 * @param EE_Form_Section_Base $subsection
+	 * @return string html
+	 */
+	abstract public function layout_subsection($subsection);
+
+
+	/**
+	 * Gets the HTML for the label tag and its contents for the input
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function display_label($input)
+	{
+		if ($input->get_display_strategy() instanceof EE_Hidden_Display_Strategy) {
+			return '';
+		}
+		$class = $input->required()
+			? 'ee-required-label ' . $input->html_label_class()
+			: $input->html_label_class();
+		$label_text = $input->required()
+			? $input->html_label_text() . '<span class="ee-asterisk">*</span>'
+			: $input->html_label_text();
+		return '<label id="'
+			   . $input->html_label_id()
+			   . '" class="'
+			   . $class
+			   . '" style="'
+			   . $input->html_label_style()
+			   . '" for="' . $input->html_id()
+			   . '">'
+			   . $label_text
+			   . '</label>';
+	}
+
+
+
+	/**
+	 * Gets the HTML for all the form's form-wide errors (ie, errors which
+	 * are not for specific inputs. E.g., if two inputs somehow disagree,
+	 * those errors would probably be on the form section, not one of its inputs)
+	 * @return string
+	 */
+	public function display_form_wide_errors()
+	{
+		$html = '';
+		if ($this->_form_section->get_validation_errors()) {
+			$html .= "<div class='ee-form-wide-errors'>";
+			// get all the errors on THIS form section (errors which aren't
+			// for specific inputs, but instead for the entire form section)
+			foreach ($this->_form_section->get_validation_errors() as $error) {
+				$html .= $error->getMessage() . '<br>';
+			}
+			$html .= '</div>';
+		}
+		return apply_filters(
+			'FHEE__EE_Form_Section_Layout_Base__display_form_wide_errors',
+			$html,
+			$this
+		);
+	}
+
+
+	/**
+	 * returns the HTML for the server-side validation errors for the specified input
+	 * Note that if JS is enabled, it should remove these and instead
+	 * populate the form's errors in the jquery validate fashion
+	 * using the localized data provided to the JS
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function display_errors($input)
+	{
+		if ($input->get_validation_errors()) {
+			return "<label  id='"
+				   . $input->html_id()
+				   . "-error' class='error' for='{$input->html_name()}'>"
+				   . $input->get_validation_error_string()
+				   . '</label>';
+		}
+		return '';
+	}
+
+
+	/**
+	 * Displays the help span for the specified input
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function display_help_text($input)
+	{
+		$help_text  = $input->html_help_text();
+		if ($help_text !== '' && $help_text !== null) {
+			$tag = is_admin() ? 'p' : 'span';
+			return '<'
+				   . $tag
+				   . ' id="'
+				   . $input->html_id()
+				   . '-help" class="'
+				   . $input->html_help_class()
+				   . '" style="'
+				   . $input->html_help_style()
+				   . '">'
+				   . $help_text
+				   . '</'
+				   . $tag
+				   . '>';
+		}
+		return '';
+	}
+
+
+	/**
+	 * Does an action and hook onto the end of teh form
+	 *
+	 * @param string $html
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function add_form_section_hooks_and_filters($html)
+	{
+		// replace dashes and spaces with underscores
+		$hook_name = str_replace(array('-', ' '), '_', $this->_form_section->html_id());
+		do_action('AHEE__Form_Section_Layout__' . $hook_name, $this->_form_section);
+		$html = (string) apply_filters(
+			'AFEE__Form_Section_Layout__' . $hook_name . '__html',
+			$html,
+			$this->_form_section
+		);
+		$html .= EEH_HTML::nl() . '<!-- AHEE__Form_Section_Layout__' . $hook_name . '__html -->';
+		$html .= EEH_HTML::nl() . '<!-- AFEE__Form_Section_Layout__' . $hook_name . ' -->';
+		return $html;
+	}
 }

core/services/commands/CommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     public function verify(CommandInterface $command)
     {
         $expected = str_replace('CommandHandler', 'Command', get_class($this));
-        if (! $command instanceof $expected) {
+        if ( ! $command instanceof $expected) {
             throw new InvalidEntityException($command, $expected);
         }
         return $this;

Indentation +22 added lines, -22 removed lines

@@ -14,26 +14,26 @@
  */
 abstract class CommandHandler implements CommandHandlerInterface
 {
-    /**
-     * Verifies the Command class matches the Handler class
-     * by simply removing "Handler" from the Command class and then comparing.
-     * IF the Command Handler has been changed via CommandHandlerManager::addCommandHandler,
-     * or via the filter in CommandHandlerManager::getCommandHandler(),
-     * then this method MUST be overridden in the new Command Handler class.
-     * PLZ NOTE: that it also needs to return itself ($this)
-     * because the CommandBus utilizes method chaining.
-     *
-     * @param CommandInterface $command
-     * @return CommandHandler
-     * @throws InvalidEntityException
-     * @since 4.9.80.p
-     */
-    public function verify(CommandInterface $command)
-    {
-        $expected = str_replace('CommandHandler', 'Command', get_class($this));
-        if (! $command instanceof $expected) {
-            throw new InvalidEntityException($command, $expected);
-        }
-        return $this;
-    }
+	/**
+	 * Verifies the Command class matches the Handler class
+	 * by simply removing "Handler" from the Command class and then comparing.
+	 * IF the Command Handler has been changed via CommandHandlerManager::addCommandHandler,
+	 * or via the filter in CommandHandlerManager::getCommandHandler(),
+	 * then this method MUST be overridden in the new Command Handler class.
+	 * PLZ NOTE: that it also needs to return itself ($this)
+	 * because the CommandBus utilizes method chaining.
+	 *
+	 * @param CommandInterface $command
+	 * @return CommandHandler
+	 * @throws InvalidEntityException
+	 * @since 4.9.80.p
+	 */
+	public function verify(CommandInterface $command)
+	{
+		$expected = str_replace('CommandHandler', 'Command', get_class($this));
+		if (! $command instanceof $expected) {
+			throw new InvalidEntityException($command, $expected);
+		}
+		return $this;
+	}
 }

core/services/commands/transaction/CreateTransactionCommandHandler.php

Indentation +39 added lines, -39 removed lines

@@ -26,43 +26,43 @@
 class CreateTransactionCommandHandler extends CommandHandler
 {
 
-    /**
-     * @param CommandInterface|CreateTransactionCommand $command
-     * @return mixed
-     * @throws EE_Error
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     */
-    public function handle(CommandInterface $command)
-    {
-        $transaction_details = $command->transactionDetails();
-        $cart_total = null;
-        if ($command->checkout() instanceof EE_Checkout) {
-            // ensure cart totals have been calculated
-            $command->checkout()->cart->get_grand_total()->recalculate_total_including_taxes();
-            // grab the cart grand total
-            $cart_total = $command->checkout()->cart->get_cart_grand_total();
-            $transaction_details['TXN_reg_steps'] = $command->checkout()->initialize_txn_reg_steps_array();
-            $transaction_details['TXN_total'] = $cart_total > 0 ? $cart_total : 0;
-        }
-        // create new TXN and save it so it has an ID
-        $transaction = EE_Transaction::new_instance($transaction_details);
-        if (! $transaction instanceof EE_Transaction) {
-            throw new InvalidEntityException(get_class($transaction), 'EE_Transaction');
-        }
-        $transaction->save();
-        // ensure grand total line item created
-        $cart_total = $cart_total instanceof EE_Line_Item
-            ? $cart_total
-            : EEH_Line_Item::create_total_line_item($transaction);
-        if (! $cart_total instanceof EE_Line_Item) {
-            throw new InvalidEntityException(get_class($cart_total), 'EE_Line_Item');
-        }
-        $cart_total->save_this_and_descendants_to_txn($transaction->ID());
-        return $transaction;
-    }
+	/**
+	 * @param CommandInterface|CreateTransactionCommand $command
+	 * @return mixed
+	 * @throws EE_Error
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		$transaction_details = $command->transactionDetails();
+		$cart_total = null;
+		if ($command->checkout() instanceof EE_Checkout) {
+			// ensure cart totals have been calculated
+			$command->checkout()->cart->get_grand_total()->recalculate_total_including_taxes();
+			// grab the cart grand total
+			$cart_total = $command->checkout()->cart->get_cart_grand_total();
+			$transaction_details['TXN_reg_steps'] = $command->checkout()->initialize_txn_reg_steps_array();
+			$transaction_details['TXN_total'] = $cart_total > 0 ? $cart_total : 0;
+		}
+		// create new TXN and save it so it has an ID
+		$transaction = EE_Transaction::new_instance($transaction_details);
+		if (! $transaction instanceof EE_Transaction) {
+			throw new InvalidEntityException(get_class($transaction), 'EE_Transaction');
+		}
+		$transaction->save();
+		// ensure grand total line item created
+		$cart_total = $cart_total instanceof EE_Line_Item
+			? $cart_total
+			: EEH_Line_Item::create_total_line_item($transaction);
+		if (! $cart_total instanceof EE_Line_Item) {
+			throw new InvalidEntityException(get_class($cart_total), 'EE_Line_Item');
+		}
+		$cart_total->save_this_and_descendants_to_txn($transaction->ID());
+		return $transaction;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
         }
         // create new TXN and save it so it has an ID
         $transaction = EE_Transaction::new_instance($transaction_details);
-        if (! $transaction instanceof EE_Transaction) {
+        if ( ! $transaction instanceof EE_Transaction) {
             throw new InvalidEntityException(get_class($transaction), 'EE_Transaction');
         }
         $transaction->save();
@@ -59,7 +59,7 @@ 
         $cart_total = $cart_total instanceof EE_Line_Item
             ? $cart_total
             : EEH_Line_Item::create_total_line_item($transaction);
-        if (! $cart_total instanceof EE_Line_Item) {
+        if ( ! $cart_total instanceof EE_Line_Item) {
             throw new InvalidEntityException(get_class($cart_total), 'EE_Line_Item');
         }
         $cart_total->save_this_and_descendants_to_txn($transaction->ID());