eventespresso / event-espresso-core

core/bootstrap_espresso.php

Spacing +15 added lines, -15 removed lines

@@ -19,13 +19,13 @@ 
         return;
     }
     // load debugging tools
-    if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
-        require_once EE_HELPERS . 'EEH_Debug_Tools.helper.php';
+    if (WP_DEBUG === true && is_readable(EE_HELPERS.'EEH_Debug_Tools.helper.php')) {
+        require_once EE_HELPERS.'EEH_Debug_Tools.helper.php';
         EEH_Debug_Tools::instance();
     }
     // load error handling
-    if (is_readable(EE_CORE . 'EE_Error.core.php')) {
-        require_once EE_CORE . 'EE_Error.core.php';
+    if (is_readable(EE_CORE.'EE_Error.core.php')) {
+        require_once EE_CORE.'EE_Error.core.php';
         // if you're a dev and want to receive all errors via email
         // add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
         if (
@@ -84,52 +84,52 @@ 
  */
 function bootstrap_espresso()
 {
-    require_once __DIR__ . '/espresso_definitions.php';
+    require_once __DIR__.'/espresso_definitions.php';
     try {
         espresso_load_error_handling();
         // include WordPress shims for functions introduced in later versions of WordPress
         espresso_load_required(
             '',
-            EE_CORE . 'wordpress-shims.php'
+            EE_CORE.'wordpress-shims.php'
         );
         espresso_load_required(
             '',
-            EE_CORE . 'third-party-compatibility.php'
+            EE_CORE.'third-party-compatibility.php'
         );
         espresso_load_required(
             'EEH_Base',
-            EE_CORE . 'helpers/EEH_Base.helper.php'
+            EE_CORE.'helpers/EEH_Base.helper.php'
         );
         espresso_load_required(
             'EEH_File',
-            EE_CORE . 'interfaces/EEHI_File.interface.php'
+            EE_CORE.'interfaces/EEHI_File.interface.php'
         );
         espresso_load_required(
             'EEH_File',
-            EE_CORE . 'helpers/EEH_File.helper.php'
+            EE_CORE.'helpers/EEH_File.helper.php'
         );
         espresso_load_required(
             'EEH_Array',
-            EE_CORE . 'helpers/EEH_Array.helper.php'
+            EE_CORE.'helpers/EEH_Array.helper.php'
         );
         espresso_load_required(
             'EE_Base',
-            EE_CORE . 'EE_Base.core.php'
+            EE_CORE.'EE_Base.core.php'
         );
         // instantiate and configure PSR4 autoloader
         espresso_load_required(
             'Psr4Autoloader',
-            EE_CORE . 'Psr4Autoloader.php'
+            EE_CORE.'Psr4Autoloader.php'
         );
         espresso_load_required(
             'EE_Psr4AutoloaderInit',
-            EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
+            EE_CORE.'EE_Psr4AutoloaderInit.core.php'
         );
         $AutoloaderInit = new EE_Psr4AutoloaderInit();
         $AutoloaderInit->initializeAutoloader();
         new EventEspresso\core\services\bootstrap\BootstrapCore();
     } catch (Exception $e) {
-        require_once EE_CORE . 'exceptions/ExceptionStackTraceDisplay.php';
+        require_once EE_CORE.'exceptions/ExceptionStackTraceDisplay.php';
         new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
     }
 }

Indentation +90 added lines, -90 removed lines

@@ -14,33 +14,33 @@ 
  */
 function espresso_load_error_handling()
 {
-    static $error_handling_loaded = false;
-    if ($error_handling_loaded) {
-        return;
-    }
-    // load debugging tools
-    if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
-        require_once EE_HELPERS . 'EEH_Debug_Tools.helper.php';
-        EEH_Debug_Tools::instance();
-    }
-    // load error handling
-    if (is_readable(EE_CORE . 'EE_Error.core.php')) {
-        require_once EE_CORE . 'EE_Error.core.php';
-        // if you're a dev and want to receive all errors via email
-        // add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
-        if (
-            defined('WP_DEBUG')
-            && WP_DEBUG === true
-            && defined('EE_ERROR_EMAILS')
-            && EE_ERROR_EMAILS === true
-        ) {
-            set_error_handler(['EE_Error', 'error_handler']);
-            register_shutdown_function(['EE_Error', 'fatal_error_handler']);
-        }
-    } else {
-        wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
-    }
-    $error_handling_loaded = true;
+	static $error_handling_loaded = false;
+	if ($error_handling_loaded) {
+		return;
+	}
+	// load debugging tools
+	if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
+		require_once EE_HELPERS . 'EEH_Debug_Tools.helper.php';
+		EEH_Debug_Tools::instance();
+	}
+	// load error handling
+	if (is_readable(EE_CORE . 'EE_Error.core.php')) {
+		require_once EE_CORE . 'EE_Error.core.php';
+		// if you're a dev and want to receive all errors via email
+		// add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
+		if (
+			defined('WP_DEBUG')
+			&& WP_DEBUG === true
+			&& defined('EE_ERROR_EMAILS')
+			&& EE_ERROR_EMAILS === true
+		) {
+			set_error_handler(['EE_Error', 'error_handler']);
+			register_shutdown_function(['EE_Error', 'fatal_error_handler']);
+		}
+	} else {
+		wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
+	}
+	$error_handling_loaded = true;
 }
 
 
@@ -54,21 +54,21 @@ 
  */
 function espresso_load_required(string $classname, string $full_path_to_file)
 {
-    if (is_readable($full_path_to_file)) {
-        require_once $full_path_to_file;
-    } else {
-        throw new EE_Error(
-            sprintf(
-                esc_html__(
-                    'The %1$s class file could not be located or is not readable due to file permissions. %3$s supplied path: %2$s',
-                    'event_espresso'
-                ),
-                $classname,
-                $full_path_to_file,
-                '<br>'
-            )
-        );
-    }
+	if (is_readable($full_path_to_file)) {
+		require_once $full_path_to_file;
+	} else {
+		throw new EE_Error(
+			sprintf(
+				esc_html__(
+					'The %1$s class file could not be located or is not readable due to file permissions. %3$s supplied path: %2$s',
+					'event_espresso'
+				),
+				$classname,
+				$full_path_to_file,
+				'<br>'
+			)
+		);
+	}
 }
 
 
@@ -86,52 +86,52 @@ 
  */
 function bootstrap_espresso()
 {
-    require_once __DIR__ . '/espresso_definitions.php';
-    try {
-        espresso_load_error_handling();
-        // include WordPress shims for functions introduced in later versions of WordPress
-        espresso_load_required(
-            '',
-            EE_CORE . 'wordpress-shims.php'
-        );
-        espresso_load_required(
-            '',
-            EE_CORE . 'third-party-compatibility.php'
-        );
-        espresso_load_required(
-            'EEH_Base',
-            EE_CORE . 'helpers/EEH_Base.helper.php'
-        );
-        espresso_load_required(
-            'EEH_File',
-            EE_CORE . 'interfaces/EEHI_File.interface.php'
-        );
-        espresso_load_required(
-            'EEH_File',
-            EE_CORE . 'helpers/EEH_File.helper.php'
-        );
-        espresso_load_required(
-            'EEH_Array',
-            EE_CORE . 'helpers/EEH_Array.helper.php'
-        );
-        espresso_load_required(
-            'EE_Base',
-            EE_CORE . 'EE_Base.core.php'
-        );
-        // instantiate and configure PSR4 autoloader
-        espresso_load_required(
-            'Psr4Autoloader',
-            EE_CORE . 'Psr4Autoloader.php'
-        );
-        espresso_load_required(
-            'EE_Psr4AutoloaderInit',
-            EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
-        );
-        $AutoloaderInit = new EE_Psr4AutoloaderInit();
-        $AutoloaderInit->initializeAutoloader();
-        new EventEspresso\core\services\bootstrap\BootstrapCore();
-    } catch (Exception $e) {
-        require_once EE_CORE . 'exceptions/ExceptionStackTraceDisplay.php';
-        new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
-    }
+	require_once __DIR__ . '/espresso_definitions.php';
+	try {
+		espresso_load_error_handling();
+		// include WordPress shims for functions introduced in later versions of WordPress
+		espresso_load_required(
+			'',
+			EE_CORE . 'wordpress-shims.php'
+		);
+		espresso_load_required(
+			'',
+			EE_CORE . 'third-party-compatibility.php'
+		);
+		espresso_load_required(
+			'EEH_Base',
+			EE_CORE . 'helpers/EEH_Base.helper.php'
+		);
+		espresso_load_required(
+			'EEH_File',
+			EE_CORE . 'interfaces/EEHI_File.interface.php'
+		);
+		espresso_load_required(
+			'EEH_File',
+			EE_CORE . 'helpers/EEH_File.helper.php'
+		);
+		espresso_load_required(
+			'EEH_Array',
+			EE_CORE . 'helpers/EEH_Array.helper.php'
+		);
+		espresso_load_required(
+			'EE_Base',
+			EE_CORE . 'EE_Base.core.php'
+		);
+		// instantiate and configure PSR4 autoloader
+		espresso_load_required(
+			'Psr4Autoloader',
+			EE_CORE . 'Psr4Autoloader.php'
+		);
+		espresso_load_required(
+			'EE_Psr4AutoloaderInit',
+			EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
+		);
+		$AutoloaderInit = new EE_Psr4AutoloaderInit();
+		$AutoloaderInit->initializeAutoloader();
+		new EventEspresso\core\services\bootstrap\BootstrapCore();
+	} catch (Exception $e) {
+		require_once EE_CORE . 'exceptions/ExceptionStackTraceDisplay.php';
+		new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
+	}
 }

core/domain/services/admin/registrations/list_table/csv_reports/PaymentsInfoCSV.php

Indentation +19 added lines, -19 removed lines

@@ -11,23 +11,23 @@
  */
 class PaymentsInfoCSV
 {
-    /**
-     * Extracts payment information using the payment records
-     *
-     * @param array $payments_info
-     * @return array
-     */
-    public static function extractPaymentInfo(array $payments_info): array
-    {
-        $payment_methods = [];
-        $gateway_txn_ids_etc = [];
-        $payment_times = [];
-        foreach ($payments_info as $payment_method_and_gateway_txn_id) {
-            $payment_methods[] = $payment_method_and_gateway_txn_id['name']
-                                 ?? esc_html__('Unknown', 'event_espresso');
-            $gateway_txn_ids_etc[] = $payment_method_and_gateway_txn_id['gateway_txn_id'] ?? '';
-            $payment_times[] = $payment_method_and_gateway_txn_id['payment_time'] ?? '';
-        }
-        return [$payment_methods, $gateway_txn_ids_etc, $payment_times];
-    }
+	/**
+	 * Extracts payment information using the payment records
+	 *
+	 * @param array $payments_info
+	 * @return array
+	 */
+	public static function extractPaymentInfo(array $payments_info): array
+	{
+		$payment_methods = [];
+		$gateway_txn_ids_etc = [];
+		$payment_times = [];
+		foreach ($payments_info as $payment_method_and_gateway_txn_id) {
+			$payment_methods[] = $payment_method_and_gateway_txn_id['name']
+								 ?? esc_html__('Unknown', 'event_espresso');
+			$gateway_txn_ids_etc[] = $payment_method_and_gateway_txn_id['gateway_txn_id'] ?? '';
+			$payment_times[] = $payment_method_and_gateway_txn_id['payment_time'] ?? '';
+		}
+		return [$payment_methods, $gateway_txn_ids_etc, $payment_times];
+	}
 }

core/domain/services/admin/registrations/list_table/csv_reports/RegistrationCSV.php

Indentation +63 added lines, -63 removed lines

@@ -17,67 +17,67 @@
  */
 class RegistrationCSV
 {
-    /**
-     * Adds registration columns to the CSV row
-     *
-     * @param array $fields
-     * @param array $reg_row
-     * @param array $data
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function addRegistrationColumns(array $fields, array $reg_row, array $data): array
-    {
-        $reg_model = EEM_Registration::instance();
-        foreach ($fields as $field_name) {
-            $field = $reg_model->field_settings_for($field_name);
-            switch ($field_name) {
-                case 'REG_final_price':
-                    $value = EEH_Export::prepare_value_from_db_for_display(
-                        $reg_model,
-                        $field_name,
-                        $reg_row['Registration.REG_final_price'],
-                        'localized_float'
-                    );
-                    break;
-                case 'REG_count':
-                    $value = sprintf(
-                        /* translators: 1: number of registration in group (REG_count), 2: registration group size (REG_group_size) */
-                        esc_html__('%1$s of %2$s', 'event_espresso'),
-                        EEH_Export::prepare_value_from_db_for_display(
-                            $reg_model,
-                            'REG_count',
-                            $reg_row['Registration.REG_count']
-                        ),
-                        EEH_Export::prepare_value_from_db_for_display(
-                            $reg_model,
-                            'REG_group_size',
-                            $reg_row['Registration.REG_group_size']
-                        )
-                    );
-                    break;
-                case 'REG_date':
-                    $value = EEH_Export::prepare_value_from_db_for_display(
-                        $reg_model,
-                        $field_name,
-                        $reg_row['Registration.REG_date'],
-                        'no_html'
-                    );
-                    break;
-                default:
-                    $value = EEH_Export::prepare_value_from_db_for_display(
-                        $reg_model,
-                        $field_name,
-                        $reg_row[ $field->get_qualified_column() ]
-                    );
-            }
-            $data[ EEH_Export::get_column_name_for_field($field) ] = $value;
-            if ($field_name == 'REG_final_price') {
-                // add a column named Currency after the final price
-                $data[ esc_html__("Currency", "event_espresso") ] = EE_Config::instance()->currency->code;
-            }
-        }
-        return $data;
-    }
+	/**
+	 * Adds registration columns to the CSV row
+	 *
+	 * @param array $fields
+	 * @param array $reg_row
+	 * @param array $data
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function addRegistrationColumns(array $fields, array $reg_row, array $data): array
+	{
+		$reg_model = EEM_Registration::instance();
+		foreach ($fields as $field_name) {
+			$field = $reg_model->field_settings_for($field_name);
+			switch ($field_name) {
+				case 'REG_final_price':
+					$value = EEH_Export::prepare_value_from_db_for_display(
+						$reg_model,
+						$field_name,
+						$reg_row['Registration.REG_final_price'],
+						'localized_float'
+					);
+					break;
+				case 'REG_count':
+					$value = sprintf(
+						/* translators: 1: number of registration in group (REG_count), 2: registration group size (REG_group_size) */
+						esc_html__('%1$s of %2$s', 'event_espresso'),
+						EEH_Export::prepare_value_from_db_for_display(
+							$reg_model,
+							'REG_count',
+							$reg_row['Registration.REG_count']
+						),
+						EEH_Export::prepare_value_from_db_for_display(
+							$reg_model,
+							'REG_group_size',
+							$reg_row['Registration.REG_group_size']
+						)
+					);
+					break;
+				case 'REG_date':
+					$value = EEH_Export::prepare_value_from_db_for_display(
+						$reg_model,
+						$field_name,
+						$reg_row['Registration.REG_date'],
+						'no_html'
+					);
+					break;
+				default:
+					$value = EEH_Export::prepare_value_from_db_for_display(
+						$reg_model,
+						$field_name,
+						$reg_row[ $field->get_qualified_column() ]
+					);
+			}
+			$data[ EEH_Export::get_column_name_for_field($field) ] = $value;
+			if ($field_name == 'REG_final_price') {
+				// add a column named Currency after the final price
+				$data[ esc_html__("Currency", "event_espresso") ] = EE_Config::instance()->currency->code;
+			}
+		}
+		return $data;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -69,13 +69,13 @@
                     $value = EEH_Export::prepare_value_from_db_for_display(
                         $reg_model,
                         $field_name,
-                        $reg_row[ $field->get_qualified_column() ]
+                        $reg_row[$field->get_qualified_column()]
                     );
             }
-            $data[ EEH_Export::get_column_name_for_field($field) ] = $value;
+            $data[EEH_Export::get_column_name_for_field($field)] = $value;
             if ($field_name == 'REG_final_price') {
                 // add a column named Currency after the final price
-                $data[ esc_html__("Currency", "event_espresso") ] = EE_Config::instance()->currency->code;
+                $data[esc_html__("Currency", "event_espresso")] = EE_Config::instance()->currency->code;
             }
         }
         return $data;

core/domain/services/admin/registrations/list_table/csv_reports/AttendeeCSV.php

Indentation +49 added lines, -49 removed lines

@@ -18,53 +18,53 @@
  */
 class AttendeeCSV
 {
-    /**
-     * Adds attendee columns to the CSV row
-     *
-     * @param array $fields
-     * @param array $reg_row
-     * @param array $data
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function addAttendeeColumns(array $fields, array $reg_row, array $data): array
-    {
-        $att_model = EEM_Attendee::instance();
-        $state_model   = EEM_State::instance();
-        $country_model = EEM_Country::instance();
-        foreach ($fields as $field_name) {
-            $field_obj = $att_model->field_settings_for($field_name);
-            if ($reg_row['Attendee_CPT.ID']) {
-                switch ($field_name) {
-                    case 'STA_ID':
-                        $value = $state_model->get_var(
-                            [
-                                ['STA_ID' => $reg_row['Attendee_Meta.STA_ID']]
-                            ],
-                            'STA_name'
-                        );
-                        break;
-                    case 'CNT_ISO':
-                        $value = $country_model->get_var(
-                            [
-                                ['CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO']]
-                            ],
-                            'CNT_name'
-                        );
-                        break;
-                    default:
-                        $value = EEH_Export::prepare_value_from_db_for_display(
-                            $att_model,
-                            $field_name,
-                            $reg_row[ $field_obj->get_qualified_column() ]
-                        );
-                }
-            } else {
-                $value = '';
-            }
-            $data[ EEH_Export::get_column_name_for_field($field_obj) ] = $value;
-        }
-        return $data;
-    }
+	/**
+	 * Adds attendee columns to the CSV row
+	 *
+	 * @param array $fields
+	 * @param array $reg_row
+	 * @param array $data
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function addAttendeeColumns(array $fields, array $reg_row, array $data): array
+	{
+		$att_model = EEM_Attendee::instance();
+		$state_model   = EEM_State::instance();
+		$country_model = EEM_Country::instance();
+		foreach ($fields as $field_name) {
+			$field_obj = $att_model->field_settings_for($field_name);
+			if ($reg_row['Attendee_CPT.ID']) {
+				switch ($field_name) {
+					case 'STA_ID':
+						$value = $state_model->get_var(
+							[
+								['STA_ID' => $reg_row['Attendee_Meta.STA_ID']]
+							],
+							'STA_name'
+						);
+						break;
+					case 'CNT_ISO':
+						$value = $country_model->get_var(
+							[
+								['CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO']]
+							],
+							'CNT_name'
+						);
+						break;
+					default:
+						$value = EEH_Export::prepare_value_from_db_for_display(
+							$att_model,
+							$field_name,
+							$reg_row[ $field_obj->get_qualified_column() ]
+						);
+				}
+			} else {
+				$value = '';
+			}
+			$data[ EEH_Export::get_column_name_for_field($field_obj) ] = $value;
+		}
+		return $data;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -57,13 +57,13 @@
                         $value = EEH_Export::prepare_value_from_db_for_display(
                             $att_model,
                             $field_name,
-                            $reg_row[ $field_obj->get_qualified_column() ]
+                            $reg_row[$field_obj->get_qualified_column()]
                         );
                 }
             } else {
                 $value = '';
             }
-            $data[ EEH_Export::get_column_name_for_field($field_obj) ] = $value;
+            $data[EEH_Export::get_column_name_for_field($field_obj)] = $value;
         }
         return $data;
     }

core/services/request/sanitizers/ServerSanitizer.php

Indentation +56 added lines, -56 removed lines

@@ -11,60 +11,60 @@
  */
 class ServerSanitizer
 {
-    /**
-     * @param string $key
-     * @param string $value
-     * @return mixed|string
-     */
-    public function clean($key, $value)
-    {
-        switch ($key) {
-            case 'AUTH_TYPE':
-                $valid_types = [
-                    'Basic',
-                    'Bearer',
-                    'Digest',
-                    'HOBA',
-                    'Mutual',
-                    'Negotiate',
-                    'OAuth',
-                    'SCRAM-SHA-1',
-                    'SCRAM-SHA-256',
-                    'vapid',
-                ];
-                return in_array($value, $valid_types, true) ? $value : 'Basic';
-            case 'argc':
-            case 'HTTP_DNT':
-            case 'HTTP_UPGRADE_INSECURE_REQUESTS':
-            case 'SERVER_PORT':
-            case 'REMOTE_PORT':
-            case 'REQUEST_TIME':
-                return (int) filter_var($value, FILTER_SANITIZE_NUMBER_INT);
-            case 'REQUEST_TIME_FLOAT':
-                return (float) filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-            case 'REQUEST_METHOD':
-                $valid_types = [
-                    'CONNECT',
-                    'DELETE',
-                    'GET',
-                    'HEAD',
-                    'OPTIONS',
-                    'PATCH',
-                    'POST',
-                    'PUT',
-                    'TRACE',
-                ];
-                return in_array($value, $valid_types, true) ? $value : 'GET';
-            case 'HTTP_HOST':
-            case 'QUERY_STRING':
-            case 'REQUEST_URI':
-            case 'SCRIPT_NAME':
-            case 'SERVER_NAME':
-                return filter_var($value, FILTER_SANITIZE_URL);
-            case 'SERVER_ADMIN':
-                return filter_var($value, FILTER_SANITIZE_EMAIL);
-            default:
-                return filter_var($value, FILTER_UNSAFE_RAW);
-        }
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return mixed|string
+	 */
+	public function clean($key, $value)
+	{
+		switch ($key) {
+			case 'AUTH_TYPE':
+				$valid_types = [
+					'Basic',
+					'Bearer',
+					'Digest',
+					'HOBA',
+					'Mutual',
+					'Negotiate',
+					'OAuth',
+					'SCRAM-SHA-1',
+					'SCRAM-SHA-256',
+					'vapid',
+				];
+				return in_array($value, $valid_types, true) ? $value : 'Basic';
+			case 'argc':
+			case 'HTTP_DNT':
+			case 'HTTP_UPGRADE_INSECURE_REQUESTS':
+			case 'SERVER_PORT':
+			case 'REMOTE_PORT':
+			case 'REQUEST_TIME':
+				return (int) filter_var($value, FILTER_SANITIZE_NUMBER_INT);
+			case 'REQUEST_TIME_FLOAT':
+				return (float) filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			case 'REQUEST_METHOD':
+				$valid_types = [
+					'CONNECT',
+					'DELETE',
+					'GET',
+					'HEAD',
+					'OPTIONS',
+					'PATCH',
+					'POST',
+					'PUT',
+					'TRACE',
+				];
+				return in_array($value, $valid_types, true) ? $value : 'GET';
+			case 'HTTP_HOST':
+			case 'QUERY_STRING':
+			case 'REQUEST_URI':
+			case 'SCRIPT_NAME':
+			case 'SERVER_NAME':
+				return filter_var($value, FILTER_SANITIZE_URL);
+			case 'SERVER_ADMIN':
+				return filter_var($value, FILTER_SANITIZE_EMAIL);
+			default:
+				return filter_var($value, FILTER_UNSAFE_RAW);
+		}
+	}
 }

admin_pages/general_settings/templates/espresso_page_settings.template.php

Indentation +63 added lines, -63 removed lines

@@ -17,13 +17,13 @@ 
     </h2>
     <p class="ee-attention">
         <?php printf(
-            esc_html__(
-                'The following shortcodes and page settings are required for Event Espresso to function properly. These shortcodes should not be replaced with any other shortcodes. Please view %sthis page%s for a list of optional shortcodes you can use on other pages.',
-                'event_espresso'
-            ),
-            '<a href="admin.php?page=espresso_support">',
-            '</a>'
-        );
+			esc_html__(
+				'The following shortcodes and page settings are required for Event Espresso to function properly. These shortcodes should not be replaced with any other shortcodes. Please view %sthis page%s for a list of optional shortcodes you can use on other pages.',
+				'event_espresso'
+			),
+			'<a href="admin.php?page=espresso_support">',
+			'</a>'
+		);
 ?>
     </p>
 
@@ -54,19 +54,19 @@ 
                     </select>
                     <div class="ee-page-status__wrapper">
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $reg_page_obj,
-                        '[ESPRESSO_CHECKOUT]'
-                    ); // already escaped ?>
+						$reg_page_obj,
+						'[ESPRESSO_CHECKOUT]'
+					); // already escaped ?>
                     </div>
                     <br />
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
-                                'event_espresso'
-                            ),
-                            '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
-                        );
+							esc_html__(
+								'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
+								'event_espresso'
+							),
+							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
+						);
 ?>
                     </p>
                     <br /><br />
@@ -101,19 +101,19 @@ 
                     </select>
                     <div class='ee-page-status__wrapper'>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $txn_page_obj,
-                        '[ESPRESSO_TXN_PAGE]'
-                    ); // already escaped ?>
+						$txn_page_obj,
+						'[ESPRESSO_TXN_PAGE]'
+					); // already escaped ?>
                     </div>
                     <br />
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
-                                'event_espresso'
-                            ),
-                            '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
-                        );
+							esc_html__(
+								'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
+								'event_espresso'
+							),
+							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
+						);
 ?>
                     </p>
                     <br /><br />
@@ -144,19 +144,19 @@ 
                     </select>
                     <div class='ee-page-status__wrapper'>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $thank_you_page_obj,
-                        '[ESPRESSO_THANK_YOU]'
-                    ); // already escaped ?>
+						$thank_you_page_obj,
+						'[ESPRESSO_THANK_YOU]'
+					); // already escaped ?>
                     </div>
                     <br />
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
-                                'event_espresso'
-                            ),
-                            '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
-                        );
+							esc_html__(
+								'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
+								'event_espresso'
+							),
+							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
+						);
 ?>
                     </p>
                     <br /><br />
@@ -187,19 +187,19 @@ 
                     </select>
                     <div class='ee-page-status__wrapper'>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $cancel_page_obj,
-                        '[ESPRESSO_CANCELLED]'
-                    ); // already escaped ?>
+						$cancel_page_obj,
+						'[ESPRESSO_CANCELLED]'
+					); // already escaped ?>
                     </div>
                     <br />
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.',
-                                'event_espresso'
-                            ),
-                            '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
-                        );
+							esc_html__(
+								'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.',
+								'event_espresso'
+							),
+							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
+						);
 ?>
                     </p>
                     <br /><br />
@@ -222,19 +222,19 @@ 
                 <td>
                     <p class="description">
                         <?php esc_html_e(
-                            'Events are custom post types and use WordPress\' normal archive pages for displaying events.',
-                            'event_espresso'
-                        ) ?>
+							'Events are custom post types and use WordPress\' normal archive pages for displaying events.',
+							'event_espresso'
+						) ?>
                     </p>
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
-                                'event_espresso'
-                            ),
-                            '<a href="admin.php?page=espresso_support">',
-                            '</a>'
-                        ); ?>
+							esc_html__(
+								'If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
+								'event_espresso'
+							),
+							'<a href="admin.php?page=espresso_support">',
+							'</a>'
+						); ?>
                     </p>
                     <br /><br />
                 </td>
@@ -256,19 +256,19 @@ 
                 <td>
                     <p class="description">
                         <?php esc_html_e(
-                            'Venues are custom post types and use WordPress\' normal archive pages for displaying events.',
-                            'event_espresso'
-                        ) ?>
+							'Venues are custom post types and use WordPress\' normal archive pages for displaying events.',
+							'event_espresso'
+						) ?>
                     </p>
                     <p class="description">
                         <?php printf(
-                            esc_html__(
-                                'If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
-                                'event_espresso'
-                            ),
-                            '<a href="admin.php?page=espresso_support">',
-                            '</a>'
-                        ); ?>
+							esc_html__(
+								'If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s',
+								'event_espresso'
+							),
+							'<a href="admin.php?page=espresso_support">',
+							'</a>'
+						); ?>
                     </p>
                 </td>
             </tr>

caffeinated/admin/extend/about/templates/ee4-overview.template.php

Indentation +117 added lines, -117 removed lines

@@ -2,75 +2,75 @@ 
     <div class='padding'>
         <div class="headline-feature">
             <h2 class="about-headline-callout"><?php
-                esc_html_e('Welcome to Event Espresso 4!', 'event_espresso'); ?></h2>
+				esc_html_e('Welcome to Event Espresso 4!', 'event_espresso'); ?></h2>
             <p>
                 <?php
-                printf(
-                    esc_html__(
-                        'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.',
-                        'event_espresso'
-                    ),
-                    '<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Caffeinated">',
-                    '</a>'
-                ); ?>
+				printf(
+					esc_html__(
+						'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.',
+						'event_espresso'
+					),
+					'<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Caffeinated">',
+					'</a>'
+				); ?>
             </p>
             <h2>
                 <?php
-                esc_html_e(
-                    'Powering 40,000+ event websites; $100 million in ticket sales per year!',
-                    'event_espresso'
-                ); ?>
+				esc_html_e(
+					'Powering 40,000+ event websites; $100 million in ticket sales per year!',
+					'event_espresso'
+				); ?>
             </h2>
             <p>
                 <?php
-                printf(
-                    esc_html__(
-                        'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.',
-                        'event_espresso'
-                    ),
-                    '<a href="https://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf" rel="nofollow">',
-                    '</a>'
-                ); ?>
+				printf(
+					esc_html__(
+						'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.',
+						'event_espresso'
+					),
+					'<a href="https://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf" rel="nofollow">',
+					'</a>'
+				); ?>
             </p>
         </div>
         <div class="feature-section has-3-columns is-fullwidth three-col">
             <div class="column col">
                 <img src="<?php
-                echo EEH_Template::getScreenshotUrl('publish_meta_box'); ?>">
+				echo EEH_Template::getScreenshotUrl('publish_meta_box'); ?>">
                 <h3><?php
-                    esc_html_e('Optimized aesthetic', 'event_espresso'); ?></h3>
+					esc_html_e('Optimized aesthetic', 'event_espresso'); ?></h3>
                 <p>
                     <?php
-                    esc_html_e(
-                        'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <div class="column col">
                 <img src="<?php
-                echo EEH_Template::getScreenshotUrl('registrations-overview'); ?>">
+				echo EEH_Template::getScreenshotUrl('registrations-overview'); ?>">
                 <h3><?php
-                    esc_html_e('Integrated management', 'event_espresso'); ?></h3>
+					esc_html_e('Integrated management', 'event_espresso'); ?></h3>
                 <p>
                     <?php
-                    esc_html_e(
-                        'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <div class="column col last-feature">
                 <img src="<?php
-                echo EEH_Template::getScreenshotUrl('refined-bookkeeping'); ?>">
+				echo EEH_Template::getScreenshotUrl('refined-bookkeeping'); ?>">
                 <h3><?php
-                    esc_html_e('Easy bookkeeping', 'event_espresso'); ?></h3>
+					esc_html_e('Easy bookkeeping', 'event_espresso'); ?></h3>
                 <p>
                     <?php
-                    esc_html_e(
-                        'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
         </div>
@@ -80,61 +80,61 @@ 
         <div class="feature-section has-2-columns is-fullwidth two-col">
             <div class="column col">
                 <h3><?php
-                    esc_html_e('Higher customer retention', 'event_espresso'); ?></h3>
+					esc_html_e('Higher customer retention', 'event_espresso'); ?></h3>
                 <p>
                     <?php
-                    esc_html_e(
-                        'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
+						'event_espresso'
+					); ?>
                 </p>
                 <h4><?php
-                    esc_html_e('Ticket selection boxes on any post page or post', 'event_espresso'); ?></h4>
+					esc_html_e('Ticket selection boxes on any post page or post', 'event_espresso'); ?></h4>
                 <p>
                     <?php
-                    esc_html_e(
-                        'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <div class="column col last-feature about-colors-img">
                 <img src="<?php
-                echo EEH_Template::getScreenshotUrl('registration-page-large'); ?>">
+				echo EEH_Template::getScreenshotUrl('registration-page-large'); ?>">
             </div>
         </div>
 
         <div class="feature-section has-2-columns is-fullwidth two-col">
             <div class="column col">
                 <h3><?php
-                    esc_html_e('Refined event management', 'event_espresso'); ?></h3>
+					esc_html_e('Refined event management', 'event_espresso'); ?></h3>
                 <p>
                     <?php
-                    esc_html_e(
-                        'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
+						'event_espresso'
+					); ?>
                 </p>
                 <h4><?php
-                    esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
+					esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
                 <p>
                     <?php
-                    esc_html_e(
-                        'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
-                        'event_espresso'
-                    ); ?>.
+					esc_html_e(
+						'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
+						'event_espresso'
+					); ?>.
                 </p>
                 <p>
                     <?php
-                    esc_html_e(
-                        'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <div class="column col last-feature about-themes-img">
                 <img src="<?php
-                echo EEH_Template::getScreenshotUrl('event-management'); ?>">
+				echo EEH_Template::getScreenshotUrl('event-management'); ?>">
             </div>
         </div>
 
@@ -142,50 +142,50 @@ 
 
         <h2 class="about-headline-callout">
             <?php
-            esc_html_e(
-                'People Like You Manage Event Registration with WordPress',
-                'event_espresso'
-            ); ?>
+			esc_html_e(
+				'People Like You Manage Event Registration with WordPress',
+				'event_espresso'
+			); ?>
         </h2>
         <div class="feature-section has-2-columns is-fullwidth two-col">
             <div class="column col">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
-                            'event_espresso'
-                        ),
-                        '<strong>',
-                        '</strong>'
-                    ); ?>
+					printf(
+						esc_html__(
+							'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
+							'event_espresso'
+						),
+						'<strong>',
+						'</strong>'
+					); ?>
                 </p>
                 <p>
                     <?php
-                    esc_html_e(
-                        'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <div class="column col">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
-                            'event_espresso'
-                        ),
-                        '<strong>',
-                        '</strong>'
-                    ); ?>
+					printf(
+						esc_html__(
+							'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
+							'event_espresso'
+						),
+						'<strong>',
+						'</strong>'
+					); ?>
                 </p>
                 <p>
                     <?php
-                    esc_html_e(
-                        'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
         </div>
@@ -194,37 +194,37 @@ 
             <div class="column col">
                 <h3>
                     <?php
-                    esc_html_e(
-                        'Turn your blog into a complete event registration and management system',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'Turn your blog into a complete event registration and management system',
+						'event_espresso'
+					); ?>
                 </h3>
                 <p>
                     <?php
-                    esc_html_e(
-                        'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
+						'event_espresso'
+					); ?>
                 </p>
                 <p>
                     <?php
-                    esc_html_e(
-                        'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
-                        'event_espresso'
-                    ); ?>
+					esc_html_e(
+						'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
+						'event_espresso'
+					); ?>
                 </p>
                 <p>
                     <?php
-                    echo sprintf(
-                        esc_html__('%sLearn more >>%s', 'event_espresso'),
-                        '<a href="https://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
-                        '</a>'
-                    ); ?>
+					echo sprintf(
+						esc_html__('%sLearn more >>%s', 'event_espresso'),
+						'<a href="https://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
+						'</a>'
+					); ?>
                 </p>
             </div>
             <div class="column col">
                 <img src="<?php
-                echo EEH_Template::getScreenshotUrl('single-event-page'); ?>">
+				echo EEH_Template::getScreenshotUrl('single-event-page'); ?>">
             </div>
         </div>
 
@@ -232,19 +232,19 @@ 
 
         <h2 class="about-headline-callout">
             <?php
-            esc_html_e('Pick a theme, any theme', 'event_espresso'); ?>
+			esc_html_e('Pick a theme, any theme', 'event_espresso'); ?>
         </h2>
         <div class="feature-section has-1-column is-fullwidth is-wide one-col">
             <div class="column col">
                 <p><?php
-                    esc_html_e(
-                        'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
-                        'event_espresso'
-                    ); ?></p>
+					esc_html_e(
+						'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
+						'event_espresso'
+					); ?></p>
                 <p>
                     <img class="about-overview-img"
                          src="<?php
-                         echo EEH_Template::getScreenshotUrl('multiple-themes'); ?>"
+						 echo EEH_Template::getScreenshotUrl('multiple-themes'); ?>"
                     />
                 </p>
             </div>

core/services/commands/CommandHandler.php

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 CommandHandlerInterface
-     * @throws InvalidEntityException
-     * @since 4.9.80.p
-     */
-    public function verify(CommandInterface $command): CommandHandlerInterface
-    {
-        $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 CommandHandlerInterface
+	 * @throws InvalidEntityException
+	 * @since 4.9.80.p
+	 */
+	public function verify(CommandInterface $command): CommandHandlerInterface
+	{
+		$expected = str_replace('CommandHandler', 'Command', get_class($this));
+		if (! $command instanceof $expected) {
+			throw new InvalidEntityException($command, $expected);
+		}
+		return $this;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

core/services/commands/CommandHandlerInterface.php

Indentation +19 added lines, -19 removed lines

@@ -9,24 +9,24 @@
  */
 interface CommandHandlerInterface
 {
-    /**
-     * verifies that the supplied command is the correct class for the handler.
-     *
-     * !!! IMPORTANT !!!
-     * Must return $this (ie: the handler itself)
-     * as the CommandBus utilizes method chaining
-     *
-     * @param CommandInterface $command
-     * @return CommandHandlerInterface
-     * @since 4.9.80.p
-     */
-    public function verify(CommandInterface $command): CommandHandlerInterface;
+	/**
+	 * verifies that the supplied command is the correct class for the handler.
+	 *
+	 * !!! IMPORTANT !!!
+	 * Must return $this (ie: the handler itself)
+	 * as the CommandBus utilizes method chaining
+	 *
+	 * @param CommandInterface $command
+	 * @return CommandHandlerInterface
+	 * @since 4.9.80.p
+	 */
+	public function verify(CommandInterface $command): CommandHandlerInterface;
 
-    /**
-     * Performs the command handler's logic.
-     *
-     * @param CommandInterface $command
-     * @return mixed
-     */
-    public function handle(CommandInterface $command);
+	/**
+	 * Performs the command handler's logic.
+	 *
+	 * @param CommandInterface $command
+	 * @return mixed
+	 */
+	public function handle(CommandInterface $command);
 }