eventespresso / event-espresso-core

admin_pages/registration_form/RegistrationFormEditorForm.php

Spacing +54 added lines, -54 removed lines

@@ -3,8 +3,8 @@ 
 
 use EventEspresso\core\libraries\form_sections\strategies\validation\ValidationStrategiesLoader;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -45,7 +45,7 @@ 
 	 *
 	 * @param \EEM_Question $EEM_Question
 	 */
-	public function __construct( \EEM_Question $EEM_Question) {
+	public function __construct(\EEM_Question $EEM_Question) {
 		$this->form_input_config_fields = $EEM_Question->field_settings();
 	}
 
@@ -56,10 +56,10 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function rawForm( array $available_form_inputs ) {
+	public function rawForm(array $available_form_inputs) {
 		$subsections = array();
-		foreach ( $available_form_inputs as $form_input => $form_input_class_name ) {
-			$subsections[ $form_input ] = $this->rawFormInput( $form_input, $form_input_class_name );
+		foreach ($available_form_inputs as $form_input => $form_input_class_name) {
+			$subsections[$form_input] = $this->rawFormInput($form_input, $form_input_class_name);
 		}
 		return new \EE_Form_Section_Proper(
 			array(
@@ -79,24 +79,24 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function rawFormInput( $form_input, $form_input_class_name, $identifier = 'clone' ) {
-		if ( ! is_subclass_of( $form_input_class_name, 'EE_Form_Input_Base' ) ) {
+	public function rawFormInput($form_input, $form_input_class_name, $identifier = 'clone') {
+		if ( ! is_subclass_of($form_input_class_name, 'EE_Form_Input_Base')) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'The class "%1$s" needs to be a sub class of  EE_Form_Input_Base.', 'event_espresso' ),
+					__('The class "%1$s" needs to be a sub class of  EE_Form_Input_Base.', 'event_espresso'),
 					$form_input_class_name
 				)
 			);
 		}
-		$this->form_input = $this->formInput( $form_input, $form_input_class_name );
+		$this->form_input = $this->formInput($form_input, $form_input_class_name);
 		$subsections = array();
-		if ( $this->form_input instanceof \EE_Form_Input_With_Options_Base ) {
-			$subsections = $this->getInputOptions( $form_input, $this->form_input->options() );
+		if ($this->form_input instanceof \EE_Form_Input_With_Options_Base) {
+			$subsections = $this->getInputOptions($form_input, $this->form_input->options());
 		}
 		$subsections = array_merge(
 			$subsections,
-			$this->getBasicSettingsSubsections( $form_input ),
-			$this->getValidationStrategies( $form_input, $form_input_class_name )
+			$this->getBasicSettingsSubsections($form_input),
+			$this->getValidationStrategies($form_input, $form_input_class_name)
 		);
 		return new \EE_Form_Section_Proper(
 			array(
@@ -116,7 +116,7 @@ 
 	 * @return \EE_Form_Section_Proper (
 	 * @throws \EE_Error
 	 */
-	public function formInputForm( $form_input, $identifier = 'clone' ) {
+	public function formInputForm($form_input, $identifier = 'clone') {
 		return new \EE_Form_Section_Proper(
 			array(
 				'name'            => "reg_form[{$identifier}]",
@@ -139,10 +139,10 @@ 
 	 * @param array        $options
 	 * @return \EE_Form_Input_Base
 	 */
-	public function formInput( $form_input, $form_input_class_name, \EE_Question $question = null, $options = array() ) {
+	public function formInput($form_input, $form_input_class_name, \EE_Question $question = null, $options = array()) {
 		$is_question = $question instanceof \EE_Question;
-		if ( is_subclass_of( $form_input_class_name, 'EE_Form_Input_With_Options_Base' ) ) {
-			$options = ! empty( $options )
+		if (is_subclass_of($form_input_class_name, 'EE_Form_Input_With_Options_Base')) {
+			$options = ! empty($options)
 				? $options
 				: array(
 					'option 1' => 'option 1 description',
@@ -175,15 +175,15 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function getInputOptionsForm( $form_input, $identifier = 'clone' ) {
-		if ( ! $this->form_input instanceof \EE_Form_Input_With_Options_Base ) {
+	public function getInputOptionsForm($form_input, $identifier = 'clone') {
+		if ( ! $this->form_input instanceof \EE_Form_Input_With_Options_Base) {
 			throw new \EE_Error(
 				sprintf(
 					__(
 						'The class "%1$s" needs to be a sub class of EE_Form_Input_With_Options_Base to have options.',
 						'event_espresso'
 					),
-					get_class( $this->form_input )
+					get_class($this->form_input)
 				)
 			);
 		}
@@ -192,7 +192,7 @@ 
 				'name'            => "input_options[{$identifier}]",
 				'html_id'         => "input-options-{$identifier}",
 				'layout_strategy' => new \EE_Admin_Two_Column_Layout(), // EE_Div_Per_Section_Layout
-				'subsections'     => $this->getInputOptions( $form_input, $this->form_input->options() )
+				'subsections'     => $this->getInputOptions($form_input, $this->form_input->options())
 			)
 		);
 	}
@@ -205,26 +205,26 @@ 
 	 * @param array  $options
 	 * @return array
 	 */
-	public function getInputOptions( $form_input, $options, $identifier = 'clone' ) {
+	public function getInputOptions($form_input, $options, $identifier = 'clone') {
 		//if ( $form_input == 'checkbox_multi' ) {
 		//	\EEH_Debug_Tools::printr( $options, '$options', __FILE__, __LINE__ );
 		//}
 		$order = 0;
 		$subsections = array();
-		foreach ( $options as $key => $value ) {
+		foreach ($options as $key => $value) {
 			$order++;
-			$subsections[ 'value-' . $key ] = new \EE_Text_Input(
+			$subsections['value-'.$key] = new \EE_Text_Input(
 				array(
 					'html_name'  => "input_options[{$identifier}][{$order}][value]",
 					'html_id'    => "input-options-{$form_input}-{$identifier}-{$order}-value",
 					'html_class' => "ee-reg-form-option-label-text-js",
 					'default'    => $key,
 					'other_html_attributes' => "data-target=\"reg-form-{$identifier}-"
-					                           . str_replace( '_', '-', $form_input ) . '-'
-					                           . sanitize_key( $key ) . '-option-lbl"',
+					                           . str_replace('_', '-', $form_input).'-'
+					                           . sanitize_key($key).'-option-lbl"',
 				)
 			);
-			$subsections[ 'desc-' . $key ] = new \EE_Text_Input(
+			$subsections['desc-'.$key] = new \EE_Text_Input(
 				array(
 					'html_name' => "input_options[{$identifier}][{$order}][desc]",
 					'html_id'   => "input-options-{$form_input}-{$identifier}-{$order}-desc",
@@ -244,13 +244,13 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function getBasicSettings( $form_input, $identifier = 'clone', \EE_Question $question = null ) {
+	public function getBasicSettings($form_input, $identifier = 'clone', \EE_Question $question = null) {
 		return new \EE_Form_Section_Proper(
 			array(
 				'name'            => "settings[{$identifier}]",
 				'html_id'         => "settings-{$identifier}",
 				'layout_strategy' => new \EE_Admin_Two_Column_Layout(),
-				'subsections'     => $this->getBasicSettingsSubsections( $form_input, $identifier, $question )
+				'subsections'     => $this->getBasicSettingsSubsections($form_input, $identifier, $question)
 			)
 		);
 	}
@@ -263,7 +263,7 @@ 
 	 * @param \EE_Question $question
 	 * @return array
 	 */
-	protected function getBasicSettingsSubsections( $form_input, $identifier = 'clone', \EE_Question $question = null ) {
+	protected function getBasicSettingsSubsections($form_input, $identifier = 'clone', \EE_Question $question = null) {
 		$subsections = array(
 			'identifier' => new \EE_Fixed_Hidden_Input(
 				array(
@@ -272,11 +272,11 @@ 
 				)
 			)
 		);
-		foreach ( $this->form_input_config_fields as $field_name => $form_input_config_field ) {
-			$config_input = $this->getBasicConfigInput( $form_input, $identifier, $field_name, $question );
-			if ( $config_input instanceof \EE_Form_Input_Base ) {
-				$field_name = (string) str_replace( 'QST_', '', $field_name );
-				$subsections[ $field_name ] = $config_input;
+		foreach ($this->form_input_config_fields as $field_name => $form_input_config_field) {
+			$config_input = $this->getBasicConfigInput($form_input, $identifier, $field_name, $question);
+			if ($config_input instanceof \EE_Form_Input_Base) {
+				$field_name = (string) str_replace('QST_', '', $field_name);
+				$subsections[$field_name] = $config_input;
 			}
 		}
 		return $subsections;
@@ -298,14 +298,14 @@ 
 		\EE_Question $question = null
 	) {
 		// what kind of field is it ?
-		switch ( $field_name ) {
+		switch ($field_name) {
 
 			case 'QST_display_text' :
 				return new \EE_Text_Input(
 					array(
-						'html_label_text'       => __( 'Label Text', 'event_espresso' ),
+						'html_label_text'       => __('Label Text', 'event_espresso'),
 						'html_class'            => 'ee-reg-form-label-text-js',
-						'other_html_attributes' => "data-target=\"reg-form-{$identifier}-" . str_replace( '_', '-', $form_input ) . '-lbl"',
+						'other_html_attributes' => "data-target=\"reg-form-{$identifier}-".str_replace('_', '-', $form_input).'-lbl"',
 						'default'               => $question instanceof \EE_Question ? $question->display_text() : ''
 					)
 				);
@@ -313,7 +313,7 @@ 
 			case 'QST_desc' :
 				return new \EE_Text_Area_Input(
 					array(
-						'html_label_text' => __( 'Description', 'event_espresso' ),
+						'html_label_text' => __('Description', 'event_espresso'),
 						'default'         => $question instanceof \EE_Question ? $question->desc() : "",
 					)
 				);
@@ -321,7 +321,7 @@ 
 			case 'QST_html_class' :
 				return new \EE_Text_Input(
 					array(
-						'html_label_text' => __( 'Input CSS Classes', 'event_espresso' ),
+						'html_label_text' => __('Input CSS Classes', 'event_espresso'),
 						'default'         => $question instanceof \EE_Question ? $question->html_class() : "{$form_input}",
 					)
 				);
@@ -329,7 +329,7 @@ 
 			case 'QST_html_label_class' :
 				return new \EE_Text_Input(
 					array(
-						'html_label_text' => __( 'Label CSS Classes', 'event_espresso' ),
+						'html_label_text' => __('Label CSS Classes', 'event_espresso'),
 						'default'         => $question instanceof \EE_Question ? $question->html_label_class() : "{$form_input}-lbl",
 					)
 				);
@@ -359,7 +359,7 @@ 
 				'name'    => "settings[{$identifier}]",
 				'html_id' => "settings-{$identifier}",
 				'layout_strategy' => new \EE_Admin_Two_Column_Layout(),
-				'subsections'     => $this->getValidationStrategies( $form_input, $form_input_class_name, $question ),
+				'subsections'     => $this->getValidationStrategies($form_input, $form_input_class_name, $question),
 			)
 		);
 	}
@@ -372,7 +372,7 @@ 
 	 * @param \EE_Question $question
 	 * @return array
 	 */
-	protected function getValidationStrategies( $form_input, $form_input_class_name, \EE_Question $question = null ) {
+	protected function getValidationStrategies($form_input, $form_input_class_name, \EE_Question $question = null) {
 		// get validations strategies but only include those that are optional
 		$validation_strategies = ValidationStrategiesLoader::get(
 			/** @var \EE_Form_Input_Base $form_input_class_name */
@@ -380,22 +380,22 @@ 
 			true
 		);
 		$subsections = array();
-		foreach ( $validation_strategies as $validation_key => $validation_strategy ) {
+		foreach ($validation_strategies as $validation_key => $validation_strategy) {
 			//\EEH_Debug_Tools::printr( $key, '$key', __FILE__, __LINE__ );
 			//\EEH_Debug_Tools::printr( $validation_strategy, '$validation_strategy', __FILE__, __LINE__ );
 			/** @var \EE_Validation_Strategy_Base $validation_strategy */
 			//\EEH_Debug_Tools::printr( $validation_strategy::generally_applicable(), '$validation_strategy::generally_applicable()', __FILE__, __LINE__ );
-			unset( $validation_strategies[ $validation_key ] );
-			if ( ! $validation_strategy::generally_applicable() ) {
+			unset($validation_strategies[$validation_key]);
+			if ( ! $validation_strategy::generally_applicable()) {
 				continue;
 			}
-			$validation_strategies[ ucwords( str_replace( '_', ' ', $validation_key ) ) ] = $validation_strategy;
+			$validation_strategies[ucwords(str_replace('_', ' ', $validation_key))] = $validation_strategy;
 		}
-		$subsections['validation_strategies' ] = $this->getValidationStrategiesInput(
+		$subsections['validation_strategies'] = $this->getValidationStrategiesInput(
 			$validation_strategies,
 			$question
 		);
-		$subsections['validation_message' ] = $this->getFailedValidationMessage();
+		$subsections['validation_message'] = $this->getFailedValidationMessage();
 		// convert underscores in labels to spaces
 		//$validation_strategies = array_map(
 		//	function( $value ) {
@@ -414,11 +414,11 @@ 
 	 * @param \EE_Question $question
 	 * @return \EE_Checkbox_Multi_Input
 	 */
-	protected function getValidationStrategiesInput( array $validation_strategies, \EE_Question $question = null ) {
+	protected function getValidationStrategiesInput(array $validation_strategies, \EE_Question $question = null) {
 		return new \EE_Checkbox_Multi_Input(
-			array_flip( $validation_strategies ),
+			array_flip($validation_strategies),
 			array(
-				'html_label_text' =>  __( 'Apply Validation Rules', 'event_espresso' ),
+				'html_label_text' =>  __('Apply Validation Rules', 'event_espresso'),
 				'default' => $question instanceof \EE_Question ? $question->validation_strategies() : '',
 			)
 		);
@@ -432,7 +432,7 @@ 
 	protected function getFailedValidationMessage() {
 		return new \EE_Text_Area_Input(
 			array(
-				'html_label_text' =>  __( 'Failed Validation Message', 'event_espresso' ),
+				'html_label_text' =>  __('Failed Validation Message', 'event_espresso'),
 			)
 		);
 	}

admin_pages/registration_form/RegistrationFormEditorFormDisplay.php

Spacing +48 added lines, -48 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\admin_pages\registration_form;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -44,7 +44,7 @@ 
 	 *
 	 * @param RegistrationFormEditorForm $RegistrationFormEditorFormInputForm
 	 */
-	public function __construct( RegistrationFormEditorForm $RegistrationFormEditorFormInputForm) {
+	public function __construct(RegistrationFormEditorForm $RegistrationFormEditorFormInputForm) {
 		$this->reg_form_editor_form = $RegistrationFormEditorFormInputForm;
 	}
 
@@ -57,23 +57,23 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function formHTML( $form_input, $form_input_class_name, \EE_Question $question = null ) {
-		if ( ! is_subclass_of( $form_input_class_name, 'EE_Form_Input_Base' ) ) {
+	public function formHTML($form_input, $form_input_class_name, \EE_Question $question = null) {
+		if ( ! is_subclass_of($form_input_class_name, 'EE_Form_Input_Base')) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'The class "%1$s" needs to be a sub class of  EE_Form_Input_Base.', 'event_espresso' ),
+					__('The class "%1$s" needs to be a sub class of  EE_Form_Input_Base.', 'event_espresso'),
 					$form_input_class_name
 				)
 			);
 		}
 		$identifier = $question instanceof \EE_Question ? $question->identifier() : 'clone';
-		$this->form_input = $this->reg_form_editor_form->formInput( $form_input, $form_input_class_name, $question );
-		$this->input_has_options = $this->form_input instanceof \EE_Form_Input_With_Options_Base ? true :false;
-		$html = \EEH_HTML::div( '', '', 'ee-reg-form-editor-form-new-input-form' );
-		$html .= $this->reg_form_editor_form->formInputForm( $form_input, $identifier )->get_html();
-		$html .= \EEH_HTML::div( '', '', 'ee-new-form-input-settings-dv' );
-		$html .= $this->getTabs( $form_input, $identifier );
-		if ( $this->input_has_options ) {
+		$this->form_input = $this->reg_form_editor_form->formInput($form_input, $form_input_class_name, $question);
+		$this->input_has_options = $this->form_input instanceof \EE_Form_Input_With_Options_Base ? true : false;
+		$html = \EEH_HTML::div('', '', 'ee-reg-form-editor-form-new-input-form');
+		$html .= $this->reg_form_editor_form->formInputForm($form_input, $identifier)->get_html();
+		$html .= \EEH_HTML::div('', '', 'ee-new-form-input-settings-dv');
+		$html .= $this->getTabs($form_input, $identifier);
+		if ($this->input_has_options) {
 			// form input settings
 			$html .= \EEH_HTML::div(
 				'',
@@ -81,7 +81,7 @@ 
 				'ee-reg-form-input-settings-tab-panel-dv'
 			);
 			$html .= $this->getInputOptionsFormHeader();
-			$html .= $this->getInputOptionsForm( $form_input, $identifier );
+			$html .= $this->getInputOptionsForm($form_input, $identifier);
 			//$html .= $this->reg_form_editor_form->getInputOptions( $form_input )->get_html();
 			$html .= $this->getInputOptionsFormFooter();
 
@@ -93,7 +93,7 @@ 
 			"ee-reg-form-input-settings-tab-panel-1-{$identifier}-{$form_input}",
 			'ee-reg-form-input-settings-tab-panel-dv'
 		);
-		$html .= $this->reg_form_editor_form->getBasicSettings( $form_input, $identifier, $question )->get_html();
+		$html .= $this->reg_form_editor_form->getBasicSettings($form_input, $identifier, $question)->get_html();
 		$html .= \EEH_HTML::divx(); // end 'ee-reg-form-input-settings-tab-panel-dv'
 		// validation settings
 		$html .= \EEH_HTML::div(
@@ -102,7 +102,7 @@ 
 			'ee-reg-form-input-settings-tab-panel-dv'
 		);
 		$html .= $this->reg_form_editor_form
-			->getValidationSettings( $form_input, $identifier, $form_input_class_name, $question )
+			->getValidationSettings($form_input, $identifier, $form_input_class_name, $question)
 			->get_html();
 		$html .= \EEH_HTML::divx(); // end 'ee-reg-form-input-settings-tab-panel-dv'
 		$html .= \EEH_HTML::divx(); // end 'ee-new-form-input-settings-dv'
@@ -117,18 +117,18 @@ 
 	 * @param string  $identifier
 	 * @return string
 	 */
-	public function getTabs( $form_input, $identifier = 'clone' ) {
+	public function getTabs($form_input, $identifier = 'clone') {
 		$tabs = array(
 			0 => 'Input Options',
 			1 => 'Basic Settings',
 			2 => 'Validation Rules',
 		);
-		if ( ! $this->input_has_options ) {
-			unset( $tabs[0] );
+		if ( ! $this->input_has_options) {
+			unset($tabs[0]);
 		}
-		$html = \EEH_HTML::ul( '', 'ee-reg-form-input-settings-tab-ul');
+		$html = \EEH_HTML::ul('', 'ee-reg-form-input-settings-tab-ul');
 		$order = 1;
-		foreach ( $tabs as $panel => $tab_label ) {
+		foreach ($tabs as $panel => $tab_label) {
 			$active = $order === 1 ? ' ee-reg-form-input-settings-tab-active' : '';
 			$html .= \EEH_HTML::li(
 				\EEH_HTML::link(
@@ -153,24 +153,24 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function getInputOptionsForm( $form_input, $identifier = 'clone' ) {
+	public function getInputOptionsForm($form_input, $identifier = 'clone') {
 		$html = '';
-		if ( $this->form_input instanceof \EE_Form_Input_With_Options_Base ) {
-			$options = $this->reg_form_editor_form->getInputOptions( $form_input, $this->form_input->options(), $identifier );
+		if ($this->form_input instanceof \EE_Form_Input_With_Options_Base) {
+			$options = $this->reg_form_editor_form->getInputOptions($form_input, $this->form_input->options(), $identifier);
 			$order = 2;
-			foreach( (array)$options as $key => $input ) {
-				if ( $input instanceof \EE_Form_Input_Base ) {
-					$html .= $this->getInputOptionsInputs( $key, $input );
+			foreach ((array) $options as $key => $input) {
+				if ($input instanceof \EE_Form_Input_Base) {
+					$html .= $this->getInputOptionsInputs($key, $input);
 					$order++;
 				}
 			}
-			$order = floor( $order /2 );
+			$order = floor($order / 2);
 			$hidden = $order > 2 ? true : false;
-			$html .= $this->addEmptyInputOptionsInputs( $form_input, $identifier, 0, $hidden );
+			$html .= $this->addEmptyInputOptionsInputs($form_input, $identifier, 0, $hidden);
 			//if ( $order <= 2 ) {
 			//	$html .= $this->addEmptyInputOptionsInputs( $form_input, 0, true );
 			//}
-			$html .= $this->getNewInputOptionOrderInput( $order );
+			$html .= $this->getNewInputOptionOrderInput($order);
 		}
 		return $html;
 	}
@@ -184,13 +184,13 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	protected function getInputOptionsInputs( $key, \EE_Form_Input_Base $input, $hidden = false ) {
+	protected function getInputOptionsInputs($key, \EE_Form_Input_Base $input, $hidden = false) {
 		$html = '';
 		$hide_row = $hidden ? 'display:none;' : '';
 		$new_row = $hidden ? 'ee-input-option-new-row' : 'ee-input-option-sortable-row';
-		switch ( substr( $key, 0, 4 ) ) {
+		switch (substr($key, 0, 4)) {
 			case 'valu' :
-				$html .= \EEH_HTML::tr( '', '', $new_row, $hide_row );
+				$html .= \EEH_HTML::tr('', '', $new_row, $hide_row);
 				$html .= \EEH_HTML::td();
 				$html .= $input->get_html_for_input();
 				$html .= \EEH_HTML::tdx();
@@ -206,25 +206,25 @@ 
 						'',
 						'ee-input-option-add dashicons dashicons-plus-alt',
 						'',
-						'title="' . __( 'Click to Add a New Option', 'event_espresso' ) . '"'
-					) . \EEH_HTML::span(
+						'title="'.__('Click to Add a New Option', 'event_espresso').'"'
+					).\EEH_HTML::span(
 						'',
 						'',
 						'ee-input-option-delete dashicons dashicons-trash',
 						'',
-						'title="' . __( 'Click to Delete This Option', 'event_espresso' ) . '"'
-					) . \EEH_HTML::span(
+						'title="'.__('Click to Delete This Option', 'event_espresso').'"'
+					).\EEH_HTML::span(
 						'',
 						'',
 						'ee-input-option-sort dashicons dashicons-arrow-up-alt2',
 						'',
-						'title="' . __( 'Drag to Sort', 'event_espresso' ) . '"'
-					) . \EEH_HTML::span(
+						'title="'.__('Drag to Sort', 'event_espresso').'"'
+					).\EEH_HTML::span(
 						'',
 						'',
 						'ee-input-option-sort dashicons dashicons-arrow-down-alt2', //list-view
 						'',
-						'title="' . __( 'Drag to Sort', 'event_espresso' ) . '"'
+						'title="'.__('Drag to Sort', 'event_espresso').'"'
 					),
 					'',
 					'ee-input-option-controls'
@@ -246,7 +246,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function addEmptyInputOptionsInputs( $form_input, $identifier = 'clone', $order = 0, $hidden = true ) {
+	protected function addEmptyInputOptionsInputs($form_input, $identifier = 'clone', $order = 0, $hidden = true) {
 		$order = $order !== 0 ? $order : 'order';
 		$html = $this->getInputOptionsInputs(
 			'value',
@@ -280,7 +280,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function getNewInputOptionOrderInput( $order ) {
+	public function getNewInputOptionOrderInput($order) {
 		$order_input = new \EE_Hidden_Input(
 			array(
 				'html_name' => 'ee_new_input_option_order',
@@ -288,7 +288,7 @@ 
 				'default'   => $order,
 			)
 		);
-		$html = \EEH_HTML::tr( '', '', 'ee_new_input_option_order', 'display:none;' );
+		$html = \EEH_HTML::tr('', '', 'ee_new_input_option_order', 'display:none;');
 		$html .= \EEH_HTML::td();
 		$html .= $order_input->get_html_for_input();
 		$html .= \EEH_HTML::tdx();
@@ -302,18 +302,18 @@ 
 	 * @return string
 	 */
 	public function getInputOptionsFormHeader() {
-		$html = \EEH_HTML::table( '', '', 'input-options-table form-table' );
+		$html = \EEH_HTML::table('', '', 'input-options-table form-table');
 		$html .= \EEH_HTML::thead(
 			\EEH_HTML::tr(
-				\EEH_HTML::th( __( 'Value', 'event_espresso' ), '', 'option-value-header' ) .
+				\EEH_HTML::th(__('Value', 'event_espresso'), '', 'option-value-header').
 				\EEH_HTML::th(
-					__( 'Description (optional, only shown on registration form)', 'event_espresso' ),
+					__('Description (optional, only shown on registration form)', 'event_espresso'),
 					'',
 					'option-desc-header'
 				)
 			)
 		);
-		$html .= \EEH_HTML::tbody( '', '', 'ee-input-options-table-body' );
+		$html .= \EEH_HTML::tbody('', '', 'ee-input-options-table-body');
 		return $html;
 	}
 
@@ -325,7 +325,7 @@ 
 	 * @return string
 	 */
 	public function getInputOptionsFormFooter() {
-		return \EEH_HTML::tbodyx() . \EEH_HTML::tablex( '', 'question-options-table' );
+		return \EEH_HTML::tbodyx().\EEH_HTML::tablex('', 'question-options-table');
 	}