eventespresso / event-espresso-core

modules/thank_you_page/templates/thank-you-page-payment-details.template.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 <div id="espresso-thank-you-page-payment-details-dv">
     <?php
-    if (! empty($payments)) { ?>
+    if ( ! empty($payments)) { ?>
         <table class="ee-table">
             <thead>
             <tr>

Indentation +32 added lines, -32 removed lines

@@ -16,7 +16,7 @@ 
 
 <div id="espresso-thank-you-page-payment-details-dv">
     <?php
-    if (! empty($payments)) { ?>
+	if (! empty($payments)) { ?>
         <table class="ee-table">
             <thead>
             <tr>
@@ -36,37 +36,37 @@ 
             </thead>
             <tbody>
             <?php
-            foreach ($payments as $payment) {
-                echo wp_kses($payment, AllowedTags::getWithFormTags());
-            }
-            ?>
+			foreach ($payments as $payment) {
+				echo wp_kses($payment, AllowedTags::getWithFormTags());
+			}
+			?>
             </tbody>
         </table>
         <?php
-    } else {
-        if ($transaction->total()) {
-            echo apply_filters(
-                'FHEE__payment_overview_template__no_payments_made',
-                sprintf(
-                    esc_html__('%sNo payments towards this transaction have been received.%s', 'event_espresso'),
-                    '<p class="important-notice">',
-                    '</p>'
-                )
-            );
-            do_action('AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction);
-        } else {
-            echo apply_filters(
-                'FHEE__payment_overview_template__no_payment_required',
-                sprintf(
-                    esc_html__('%sNo payment is required for this transaction.%s', 'event_espresso'),
-                    '<p>',
-                    '</p>'
-                )
-            );
-            do_action('AHEE__thank_you_page_payment_details_template__no_payment_required');
-        }
-    }
-    echo wp_kses($gateway_content, AllowedTags::getWithFormTags());
-    do_action('AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content);
-    echo '<br/>';
-    do_action('AHEE__thank_you_page_payment_details_template__after_payment_details');
+	} else {
+		if ($transaction->total()) {
+			echo apply_filters(
+				'FHEE__payment_overview_template__no_payments_made',
+				sprintf(
+					esc_html__('%sNo payments towards this transaction have been received.%s', 'event_espresso'),
+					'<p class="important-notice">',
+					'</p>'
+				)
+			);
+			do_action('AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction);
+		} else {
+			echo apply_filters(
+				'FHEE__payment_overview_template__no_payment_required',
+				sprintf(
+					esc_html__('%sNo payment is required for this transaction.%s', 'event_espresso'),
+					'<p>',
+					'</p>'
+				)
+			);
+			do_action('AHEE__thank_you_page_payment_details_template__no_payment_required');
+		}
+	}
+	echo wp_kses($gateway_content, AllowedTags::getWithFormTags());
+	do_action('AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content);
+	echo '<br/>';
+	do_action('AHEE__thank_you_page_payment_details_template__after_payment_details');

core/domain/services/admin/privacy/policy/PrivacyPolicy.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         }
         $session_lifespan_in_hours = round($this->session_lifespan->inSeconds() / HOUR_IN_SECONDS);
         return (string) EEH_Template::display_template(
-            __DIR__ . '/privacy_policy.template.php',
+            __DIR__.'/privacy_policy.template.php',
             array(
                 'active_onsite_payment_methods' => $active_onsite_pms,
                 'active_offsite_payment_methods' => $active_offsite_pms,

Indentation +68 added lines, -68 removed lines

@@ -19,80 +19,80 @@
  */
 class PrivacyPolicy implements PrivacyPolicyInterface
 {
-    /**
-     * @var EEM_Payment_Method
-     */
-    protected $payment_method_model;
+	/**
+	 * @var EEM_Payment_Method
+	 */
+	protected $payment_method_model;
 
-    /**
-     * @var SessionLifespan
-     */
-    protected $session_lifespan;
+	/**
+	 * @var SessionLifespan
+	 */
+	protected $session_lifespan;
 
-    /**
-     * PrivacyPolicy constructor.
-     *
-     * @param EEM_Payment_Method $payment_method_model
-     * @param SessionLifespan    $session_lifespan
-     */
-    public function __construct(EEM_Payment_Method $payment_method_model, SessionLifespan $session_lifespan)
-    {
-        $this->payment_method_model = $payment_method_model;
-        $this->session_lifespan = $session_lifespan;
-    }
+	/**
+	 * PrivacyPolicy constructor.
+	 *
+	 * @param EEM_Payment_Method $payment_method_model
+	 * @param SessionLifespan    $session_lifespan
+	 */
+	public function __construct(EEM_Payment_Method $payment_method_model, SessionLifespan $session_lifespan)
+	{
+		$this->payment_method_model = $payment_method_model;
+		$this->session_lifespan = $session_lifespan;
+	}
 
 
-    /**
-     * Returns the name of the plugin and will be shown in the privacy policy's postbox header
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return esc_html__('Event Espresso', 'event_espresso');
-    }
+	/**
+	 * Returns the name of the plugin and will be shown in the privacy policy's postbox header
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return esc_html__('Event Espresso', 'event_espresso');
+	}
 
 
-    /**
-     * Gets the HTML for the privacy policy. May be dynamic
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        // do they have any offsite payment methods? or onsite payment methods?
-        $active_payment_methods = $this->payment_method_model->get_all_active(EEM_Payment_Method::scope_cart);
-        $active_onsite_pms = array();
-        $active_offsite_pms = array();
-        foreach ($active_payment_methods as $payment_method) {
-            if ($payment_method->type_obj() instanceof \EE_PMT_Base) {
-                if ($payment_method->type_obj()->get_gateway() instanceof EE_Onsite_Gateway) {
-                    $active_onsite_pms[] = $payment_method->name();
-                } elseif ($payment_method->type_obj()->get_gateway() instanceof EE_Offsite_Gateway) {
-                    $active_offsite_pms[] = $payment_method->name();
-                }
-            }
-        }
-        $session_lifespan_in_hours = round($this->session_lifespan->inSeconds() / HOUR_IN_SECONDS);
-        return (string) EEH_Template::display_template(
-            __DIR__ . '/privacy_policy.template.php',
-            array(
-                'active_onsite_payment_methods' => $active_onsite_pms,
-                'active_offsite_payment_methods' => $active_offsite_pms,
-                'session_lifespan' => sprintf(
-                    _nx(
-                        '%1$s hour',
-                        '%1$s hours',
-                        $session_lifespan_in_hours,
-                        '2 hours',
-                        'event_espresso'
-                    ),
-                    $session_lifespan_in_hours
-                )
-            ),
-            true
-        );
-    }
+	/**
+	 * Gets the HTML for the privacy policy. May be dynamic
+	 *
+	 * @return string
+	 */
+	public function getContent()
+	{
+		// do they have any offsite payment methods? or onsite payment methods?
+		$active_payment_methods = $this->payment_method_model->get_all_active(EEM_Payment_Method::scope_cart);
+		$active_onsite_pms = array();
+		$active_offsite_pms = array();
+		foreach ($active_payment_methods as $payment_method) {
+			if ($payment_method->type_obj() instanceof \EE_PMT_Base) {
+				if ($payment_method->type_obj()->get_gateway() instanceof EE_Onsite_Gateway) {
+					$active_onsite_pms[] = $payment_method->name();
+				} elseif ($payment_method->type_obj()->get_gateway() instanceof EE_Offsite_Gateway) {
+					$active_offsite_pms[] = $payment_method->name();
+				}
+			}
+		}
+		$session_lifespan_in_hours = round($this->session_lifespan->inSeconds() / HOUR_IN_SECONDS);
+		return (string) EEH_Template::display_template(
+			__DIR__ . '/privacy_policy.template.php',
+			array(
+				'active_onsite_payment_methods' => $active_onsite_pms,
+				'active_offsite_payment_methods' => $active_offsite_pms,
+				'session_lifespan' => sprintf(
+					_nx(
+						'%1$s hour',
+						'%1$s hours',
+						$session_lifespan_in_hours,
+						'2 hours',
+						'event_espresso'
+					),
+					$session_lifespan_in_hours
+				)
+			),
+			true
+		);
+	}
 }
 // End of file PrivacyPolicy.php
 // Location: EventEspresso\core\domain\services\admin\privacy\policy\PrivacyPolicy.php

core/services/assets/BlockAssetManagerCollection.php

Indentation +37 added lines, -37 removed lines

@@ -16,41 +16,41 @@
 class BlockAssetManagerCollection extends Collection
 {
 
-    /**
-     * Collection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('EventEspresso\core\services\assets\BlockAssetManager');
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function addAssets()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $this->current()->addAssets();
-            $this->next();
-        }
-        $this->rewind();
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function enqueueAssets()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $this->current()->enqueueAssets();
-            $this->next();
-        }
-        $this->rewind();
-    }
+	/**
+	 * Collection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('EventEspresso\core\services\assets\BlockAssetManager');
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function addAssets()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$this->current()->addAssets();
+			$this->next();
+		}
+		$this->rewind();
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function enqueueAssets()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$this->current()->enqueueAssets();
+			$this->next();
+		}
+		$this->rewind();
+	}
 }

core/domain/services/admin/privacy/export/ExportAttendeeBillingData.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
                 } catch (EE_Error $e) {
                     $billing_info = null;
                 }
-                if (! $billing_info instanceof EE_Form_Section_Proper) {
+                if ( ! $billing_info instanceof EE_Form_Section_Proper) {
                     continue;
                 }
                 $found_something = true;
@@ -109,7 +109,7 @@ 
                 $export_items[] = array(
                     'group_id'    => 'billing_data',
                     'group_label' => esc_html__('Billing Data', 'event_espresso'),
-                    'item_id'     => $attendee->ID() . '-' . $payment_method->ID(),
+                    'item_id'     => $attendee->ID().'-'.$payment_method->ID(),
                     'data'        => $data,
                 );
             }

Indentation +107 added lines, -107 removed lines

@@ -18,117 +18,117 @@
  */
 class ExportAttendeeBillingData implements PersonalDataExporterInterface
 {
-    /**
-     * @var EEM_Attendee
-     */
-    protected $attendee_model;
+	/**
+	 * @var EEM_Attendee
+	 */
+	protected $attendee_model;
 
-    /**
-     * @var EEM_Payment_Method
-     */
-    protected $payment_method_model;
+	/**
+	 * @var EEM_Payment_Method
+	 */
+	protected $payment_method_model;
 
-    /**
-     * ExportAttendeeBillingData constructor.
-     *
-     * @param EEM_Attendee $attendee_model
-     */
-    public function __construct(EEM_Attendee $attendee_model, EEM_Payment_Method $payment_method_model)
-    {
-        $this->attendee_model = $attendee_model;
-        $this->payment_method_model = $payment_method_model;
-    }
+	/**
+	 * ExportAttendeeBillingData constructor.
+	 *
+	 * @param EEM_Attendee $attendee_model
+	 */
+	public function __construct(EEM_Attendee $attendee_model, EEM_Payment_Method $payment_method_model)
+	{
+		$this->attendee_model = $attendee_model;
+		$this->payment_method_model = $payment_method_model;
+	}
 
-    /**
-     * Returns data for export.
-     *
-     * @param string    $email_address ,
-     * @param int       $page          starts at 1, not 0
-     * @return array {
-     * @type array      $data          {
-     * @type array {
-     * @type string     $group_id      (not translated, same for all exports)
-     * @type string     $group_label   (translated string)
-     * @type string|int $item_id
-     * @type array      $data          {
-     * @type array {
-     * @type string     $name          what's shown in the left-column of the export row
-     * @type string     $value         what's showin the right-column of the export row
-     *                                 }
-     *                                 }
-     *                                 }
-     *                                 }
-     *                                 }
-     */
-    public function export($email_address, $page = 1)
-    {
-        $page_size = 10;
-        $attendees = $this->attendee_model->get_all(
-            array(
-                array(
-                    'ATT_email' => $email_address,
-                ),
-                'limit' => array(
-                    ($page - 1) * $page_size,
-                    $page_size,
-                ),
-            )
-        );
-        // get all payment methods, even inactive ones
-        $payment_methods = $this->payment_method_model->get_all(
-            array(
-                'group_by' => array('PMD_type'),
-            )
-        );
-        $export_items = array();
-        $found_something = false;
-        foreach ($attendees as $attendee) {
-            foreach ($payment_methods as $payment_method) {
-                try {
-                    $billing_info = $attendee->billing_info_for_payment_method($payment_method);
-                } catch (EE_Error $e) {
-                    $billing_info = null;
-                }
-                if (! $billing_info instanceof EE_Form_Section_Proper) {
-                    continue;
-                }
-                $found_something = true;
-                $data = array();
-                foreach ($billing_info->input_pretty_values(true, true) as $input_name => $display_value) {
-                    try {
-                        $input = $billing_info->get_input($input_name);
-                        $input_display_name = $input->html_label_text();
-                    } catch (EE_Error $e) {
-                        $input_display_name = $input_name;
-                    }
-                    $data[] = array(
-                        'name'  => strip_tags((string) $input_display_name),
-                        'value' => $display_value,
-                    );
-                }
-                $export_items[] = array(
-                    'group_id'    => 'billing_data',
-                    'group_label' => esc_html__('Billing Data', 'event_espresso'),
-                    'item_id'     => $attendee->ID() . '-' . $payment_method->ID(),
-                    'data'        => $data,
-                );
-            }
-        }
-        return array(
-            'data' => $export_items,
-            'done' => ! $found_something,
-        );
-    }
+	/**
+	 * Returns data for export.
+	 *
+	 * @param string    $email_address ,
+	 * @param int       $page          starts at 1, not 0
+	 * @return array {
+	 * @type array      $data          {
+	 * @type array {
+	 * @type string     $group_id      (not translated, same for all exports)
+	 * @type string     $group_label   (translated string)
+	 * @type string|int $item_id
+	 * @type array      $data          {
+	 * @type array {
+	 * @type string     $name          what's shown in the left-column of the export row
+	 * @type string     $value         what's showin the right-column of the export row
+	 *                                 }
+	 *                                 }
+	 *                                 }
+	 *                                 }
+	 *                                 }
+	 */
+	public function export($email_address, $page = 1)
+	{
+		$page_size = 10;
+		$attendees = $this->attendee_model->get_all(
+			array(
+				array(
+					'ATT_email' => $email_address,
+				),
+				'limit' => array(
+					($page - 1) * $page_size,
+					$page_size,
+				),
+			)
+		);
+		// get all payment methods, even inactive ones
+		$payment_methods = $this->payment_method_model->get_all(
+			array(
+				'group_by' => array('PMD_type'),
+			)
+		);
+		$export_items = array();
+		$found_something = false;
+		foreach ($attendees as $attendee) {
+			foreach ($payment_methods as $payment_method) {
+				try {
+					$billing_info = $attendee->billing_info_for_payment_method($payment_method);
+				} catch (EE_Error $e) {
+					$billing_info = null;
+				}
+				if (! $billing_info instanceof EE_Form_Section_Proper) {
+					continue;
+				}
+				$found_something = true;
+				$data = array();
+				foreach ($billing_info->input_pretty_values(true, true) as $input_name => $display_value) {
+					try {
+						$input = $billing_info->get_input($input_name);
+						$input_display_name = $input->html_label_text();
+					} catch (EE_Error $e) {
+						$input_display_name = $input_name;
+					}
+					$data[] = array(
+						'name'  => strip_tags((string) $input_display_name),
+						'value' => $display_value,
+					);
+				}
+				$export_items[] = array(
+					'group_id'    => 'billing_data',
+					'group_label' => esc_html__('Billing Data', 'event_espresso'),
+					'item_id'     => $attendee->ID() . '-' . $payment_method->ID(),
+					'data'        => $data,
+				);
+			}
+		}
+		return array(
+			'data' => $export_items,
+			'done' => ! $found_something,
+		);
+	}
 
-    /**
-     * Gets the Translated name of this exporter
-     *
-     * @return string
-     */
-    public function name()
-    {
-        return esc_html__('Event Espresso Attendee Billing Data Exporter', 'event_espresso');
-    }
+	/**
+	 * Gets the Translated name of this exporter
+	 *
+	 * @return string
+	 */
+	public function name()
+	{
+		return esc_html__('Event Espresso Attendee Billing Data Exporter', 'event_espresso');
+	}
 }
 // End of file ExportAttendeeBillingData.php
 // Location: EventEspresso\core\domain\services\admin\privacy\export/ExportAttendeeBillingData.php

core/domain/services/admin/privacy/erasure/EraseAnswers.php

Indentation +76 added lines, -76 removed lines

@@ -16,88 +16,88 @@
  */
 class EraseAnswers implements PersonalDataEraserInterface
 {
-    /**
-     * @var EEM_Answer
-     */
-    protected $answer_model;
+	/**
+	 * @var EEM_Answer
+	 */
+	protected $answer_model;
 
-    /**
-     * @var EEM_Question
-     */
-    protected $question_model;
+	/**
+	 * @var EEM_Question
+	 */
+	protected $question_model;
 
-    /**
-     * EraseAnswers constructor.
-     *
-     * @param EEM_Answer   $answer_model
-     * @param EEM_Question $question_model
-     */
-    public function __construct(EEM_Answer $answer_model, EEM_Question $question_model)
-    {
-        $this->answer_model = $answer_model;
-        $this->question_model = $question_model;
-    }
+	/**
+	 * EraseAnswers constructor.
+	 *
+	 * @param EEM_Answer   $answer_model
+	 * @param EEM_Question $question_model
+	 */
+	public function __construct(EEM_Answer $answer_model, EEM_Question $question_model)
+	{
+		$this->answer_model = $answer_model;
+		$this->question_model = $question_model;
+	}
 
 
-    /**
-     * Gets a translated string name for the data eraser
-     *
-     * @return string
-     */
-    public function name()
-    {
-        return esc_html__('Event Espresso Registration Answers', 'event_espresso');
-    }
+	/**
+	 * Gets a translated string name for the data eraser
+	 *
+	 * @return string
+	 */
+	public function name()
+	{
+		return esc_html__('Event Espresso Registration Answers', 'event_espresso');
+	}
 
-    /**
-     * Erases a "page" of personal user data
-     *
-     * @return array {
-     * @type boolean $items_removed  whether items were removed successfully or not
-     * @type boolean $items_retained whether any items were skipped or not
-     * @type array   $messages       values are messages to show
-     * @type boolean $done           whether this eraser is done or has more pages
-     *               }
-     */
-    public function erase($email_address, $page = 1)
-    {
-        $multi_answer_enum_question_types = $this->question_model->question_types_in_category('multi-answer-enum');
-        $normal_questions_updated = $this->answer_model->update(
-            array(
-                'ANS_value' => '',
-            ),
-            array(
-                array(
-                    'Registration.Attendee.ATT_email' => $email_address,
-                    'Question.QST_type'               => array(
-                        'NOT_IN',
-                        $multi_answer_enum_question_types,
-                    ),
-                ),
-            )
-        );
-        $multi_value_questions_updated = $this->answer_model->update(
-            array(
-                'ANS_value' => array(),
-            ),
-            array(
-                array(
-                    'Registration.Attendee.ATT_email' => $email_address,
-                    'Question.QST_type'               => array(
-                        'IN',
-                        $multi_answer_enum_question_types,
-                    ),
-                ),
-            )
-        );
+	/**
+	 * Erases a "page" of personal user data
+	 *
+	 * @return array {
+	 * @type boolean $items_removed  whether items were removed successfully or not
+	 * @type boolean $items_retained whether any items were skipped or not
+	 * @type array   $messages       values are messages to show
+	 * @type boolean $done           whether this eraser is done or has more pages
+	 *               }
+	 */
+	public function erase($email_address, $page = 1)
+	{
+		$multi_answer_enum_question_types = $this->question_model->question_types_in_category('multi-answer-enum');
+		$normal_questions_updated = $this->answer_model->update(
+			array(
+				'ANS_value' => '',
+			),
+			array(
+				array(
+					'Registration.Attendee.ATT_email' => $email_address,
+					'Question.QST_type'               => array(
+						'NOT_IN',
+						$multi_answer_enum_question_types,
+					),
+				),
+			)
+		);
+		$multi_value_questions_updated = $this->answer_model->update(
+			array(
+				'ANS_value' => array(),
+			),
+			array(
+				array(
+					'Registration.Attendee.ATT_email' => $email_address,
+					'Question.QST_type'               => array(
+						'IN',
+						$multi_answer_enum_question_types,
+					),
+				),
+			)
+		);
 
-        return array(
-            'items_removed'  => (bool) $normal_questions_updated || (bool) $multi_value_questions_updated,
-            'items_retained' => false, // always false in this example
-            'messages'       => array(), // no messages in this example
-            'done'           => true,
-        );
-    }
+		return array(
+			'items_removed'  => (bool) $normal_questions_updated || (bool) $multi_value_questions_updated,
+			'items_retained' => false, // always false in this example
+			'messages'       => array(), // no messages in this example
+			'done'           => true,
+		);
+	}
 }
 // End of file EraseAnswers.php
 // Location: EventEspresso\core\domain\services\privacy\erasure/EraseAnswers.php

core/services/privacy/export/PersonalDataExporterInterface.php

Indentation +28 added lines, -28 removed lines

@@ -14,35 +14,35 @@
  */
 interface PersonalDataExporterInterface
 {
-    /**
-     * Gets the Translated name of this exporter
-     *
-     * @return string
-     */
-    public function name();
+	/**
+	 * Gets the Translated name of this exporter
+	 *
+	 * @return string
+	 */
+	public function name();
 
-    /**
-     * Returns data for export.
-     *
-     * @param string    $email_address ,
-     * @param int       $page          starts at 1, not 0
-     * @return array {
-     * @type array      $data          {
-     * @type array {
-     * @type string     $group_id      (not translated, same for all exports)
-     * @type string     $group_label   (translated string)
-     * @type string|int $item_id
-     * @type array      $data          {
-     * @type array {
-     * @type string     $name          what's shown in the left-column of the export row
-     * @type string     $value         what's showin the right-column of the export row
-     *                                 }
-     *                                 }
-     *                                 }
-     *                                 }
-     *                                 }
-     */
-    public function export($email_address, $page = 1);
+	/**
+	 * Returns data for export.
+	 *
+	 * @param string    $email_address ,
+	 * @param int       $page          starts at 1, not 0
+	 * @return array {
+	 * @type array      $data          {
+	 * @type array {
+	 * @type string     $group_id      (not translated, same for all exports)
+	 * @type string     $group_label   (translated string)
+	 * @type string|int $item_id
+	 * @type array      $data          {
+	 * @type array {
+	 * @type string     $name          what's shown in the left-column of the export row
+	 * @type string     $value         what's showin the right-column of the export row
+	 *                                 }
+	 *                                 }
+	 *                                 }
+	 *                                 }
+	 *                                 }
+	 */
+	public function export($email_address, $page = 1);
 }
 // End of file PersonalDataExporterInterface.php
 // Location: EventEspresso\core\domain\services\admin/PersonalDataExporterInterface.php

core/services/privacy/export/PersonalDataExporterManager.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         // load all the privacy policy stuff
         // add post policy text
         foreach ($this->loadPrivateDataExporterCollection() as $exporter) {
-            $exporters[ get_class($exporter) ] = array(
+            $exporters[get_class($exporter)] = array(
                 'exporter_friendly_name' => $exporter->name(),
                 'callback'               => array($exporter, 'export'),
             );

Indentation +58 added lines, -58 removed lines

@@ -22,68 +22,68 @@
  */
 class PersonalDataExporterManager
 {
-    public function __construct()
-    {
-        add_filter(
-            'wp_privacy_personal_data_exporters',
-            array($this, 'hookInExporters')
-        );
-    }
+	public function __construct()
+	{
+		add_filter(
+			'wp_privacy_personal_data_exporters',
+			array($this, 'hookInExporters')
+		);
+	}
 
 
-    /**
-     * Adds EE's exporters to the list of WP exporters
-     *
-     * @param array $exporters
-     * @return array
-     */
-    public function hookInExporters($exporters)
-    {
-        // load all the privacy policy stuff
-        // add post policy text
-        foreach ($this->loadPrivateDataExporterCollection() as $exporter) {
-            $exporters[ get_class($exporter) ] = array(
-                'exporter_friendly_name' => $exporter->name(),
-                'callback'               => array($exporter, 'export'),
-            );
-        }
-        return $exporters;
-    }
+	/**
+	 * Adds EE's exporters to the list of WP exporters
+	 *
+	 * @param array $exporters
+	 * @return array
+	 */
+	public function hookInExporters($exporters)
+	{
+		// load all the privacy policy stuff
+		// add post policy text
+		foreach ($this->loadPrivateDataExporterCollection() as $exporter) {
+			$exporters[ get_class($exporter) ] = array(
+				'exporter_friendly_name' => $exporter->name(),
+				'callback'               => array($exporter, 'export'),
+			);
+		}
+		return $exporters;
+	}
 
 
-    /**
-     * @return CollectionInterface|PersonalDataExporterInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function loadPrivateDataExporterCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-                // collection name
-                'personal_data_exporters',
-                // collection interface
-                'EventEspresso\core\services\privacy\export\PersonalDataExporterInterface',
-                // FQCNs for classes to add (all classes within that namespace will be loaded)
-                apply_filters(
-                    'FHEE__EventEspresso_core_services_privacy_export_PersonalDataExporterManager__exporters',
-                    array('EventEspresso\core\domain\services\admin\privacy\export')
-                ),
-                // filepaths to classes to add
-                array(),
-                // file mask to use if parsing folder for files to add
-                '',
-                // what to use as identifier for collection entities
-                // using CLASS NAME prevents duplicates (works like a singleton)
-                CollectionDetails::ID_CLASS_NAME
-            )
-        );
-        return $loader->getCollection();
-    }
+	/**
+	 * @return CollectionInterface|PersonalDataExporterInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function loadPrivateDataExporterCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+				// collection name
+				'personal_data_exporters',
+				// collection interface
+				'EventEspresso\core\services\privacy\export\PersonalDataExporterInterface',
+				// FQCNs for classes to add (all classes within that namespace will be loaded)
+				apply_filters(
+					'FHEE__EventEspresso_core_services_privacy_export_PersonalDataExporterManager__exporters',
+					array('EventEspresso\core\domain\services\admin\privacy\export')
+				),
+				// filepaths to classes to add
+				array(),
+				// file mask to use if parsing folder for files to add
+				'',
+				// what to use as identifier for collection entities
+				// using CLASS NAME prevents duplicates (works like a singleton)
+				CollectionDetails::ID_CLASS_NAME
+			)
+		);
+		return $loader->getCollection();
+	}
 }
 
 // End of file PersonalDataExporterManager.php

core/services/privacy/erasure/PersonalDataEraserManager.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         // load all the privacy policy stuff
         // add post policy text
         foreach ($this->loadPrivateDataEraserCollection() as $eraser) {
-            $erasers[ get_class($eraser) ] = array(
+            $erasers[get_class($eraser)] = array(
                 'eraser_friendly_name' => $eraser->name(),
                 'callback'             => array($eraser, 'erase'),
             );

Indentation +55 added lines, -55 removed lines

@@ -22,65 +22,65 @@
  */
 class PersonalDataEraserManager
 {
-    public function __construct()
-    {
-        add_filter(
-            'wp_privacy_personal_data_erasers',
-            array($this, 'hookInErasers')
-        );
-    }
+	public function __construct()
+	{
+		add_filter(
+			'wp_privacy_personal_data_erasers',
+			array($this, 'hookInErasers')
+		);
+	}
 
 
-    /**
-     * For all the registered `PrivateDataEraserInterface`s, add them as erasers
-     */
-    public function hookInErasers($erasers)
-    {
-        // load all the privacy policy stuff
-        // add post policy text
-        foreach ($this->loadPrivateDataEraserCollection() as $eraser) {
-            $erasers[ get_class($eraser) ] = array(
-                'eraser_friendly_name' => $eraser->name(),
-                'callback'             => array($eraser, 'erase'),
-            );
-        }
-        return $erasers;
-    }
+	/**
+	 * For all the registered `PrivateDataEraserInterface`s, add them as erasers
+	 */
+	public function hookInErasers($erasers)
+	{
+		// load all the privacy policy stuff
+		// add post policy text
+		foreach ($this->loadPrivateDataEraserCollection() as $eraser) {
+			$erasers[ get_class($eraser) ] = array(
+				'eraser_friendly_name' => $eraser->name(),
+				'callback'             => array($eraser, 'erase'),
+			);
+		}
+		return $erasers;
+	}
 
 
-    /**
-     * @return CollectionInterface|PersonalDataEraserInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function loadPrivateDataEraserCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-                // collection name
-                'privacy_erasers',
-                // collection interface
-                'EventEspresso\core\services\privacy\erasure\PersonalDataEraserInterface',
-                // FQCNs for classes to add (all classes within that namespace will be loaded)
-                apply_filters(
-                    'FHEE__EventEspresso_core_services_privacy_erasure_PersonalDataEraserManager__erasers',
-                    array('EventEspresso\core\domain\services\admin\privacy\erasure')
-                ),
-                // filepaths to classes to add
-                array(),
-                // file mask to use if parsing folder for files to add
-                '',
-                // what to use as identifier for collection entities
-                // using CLASS NAME prevents duplicates (works like a singleton)
-                CollectionDetails::ID_CLASS_NAME
-            )
-        );
-        return $loader->getCollection();
-    }
+	/**
+	 * @return CollectionInterface|PersonalDataEraserInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function loadPrivateDataEraserCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+				// collection name
+				'privacy_erasers',
+				// collection interface
+				'EventEspresso\core\services\privacy\erasure\PersonalDataEraserInterface',
+				// FQCNs for classes to add (all classes within that namespace will be loaded)
+				apply_filters(
+					'FHEE__EventEspresso_core_services_privacy_erasure_PersonalDataEraserManager__erasers',
+					array('EventEspresso\core\domain\services\admin\privacy\erasure')
+				),
+				// filepaths to classes to add
+				array(),
+				// file mask to use if parsing folder for files to add
+				'',
+				// what to use as identifier for collection entities
+				// using CLASS NAME prevents duplicates (works like a singleton)
+				CollectionDetails::ID_CLASS_NAME
+			)
+		);
+		return $loader->getCollection();
+	}
 }
 // End of file PersonalDataEraserManager.php
 // Location: EventEspresso\core\domain\services\admin/PersonalDataEraserManager.php

core/services/request/middleware/RecommendedVersions.php

Spacing +5 added lines, -5 removed lines

@@ -32,18 +32,18 @@ 
         $this->request = $request;
         $this->response = $response;
         // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
+        if ( ! $this->minimumWordPressVersionRequired()) {
             $this->request->unSetRequestParam('activate', true);
             add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
             $this->response->terminateRequest();
             $this->response->deactivatePlugin();
         }
         // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
+        if ( ! $this->minimumPhpVersionRecommended()) {
             $this->displayMinimumRecommendedPhpVersionNotice();
         }
         // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
+        if ( ! $this->upcomingRequiredPhpVersion()) {
             $this->displayUpcomingRequiredVersion();
         }
         $this->response = $this->processRequestStack($this->request, $this->response);
@@ -142,7 +142,7 @@ 
     {
         if ($this->request->isAdmin()) {
             new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+                'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
                 sprintf(
                     esc_html__(
                         'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
@@ -180,7 +180,7 @@ 
             && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
             && current_user_can('update_plugins')
         ) {
-            add_action('admin_notices', function () {
+            add_action('admin_notices', function() {
                 echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
                      . sprintf(
                          esc_html__(

Indentation +173 added lines, -173 removed lines

@@ -18,183 +18,183 @@
  */
 class RecommendedVersions extends Middleware
 {
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidDataTypeException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
-            $this->request->unSetRequestParam('activate', true);
-            add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
-            $this->response->terminateRequest();
-            $this->response->deactivatePlugin();
-        }
-        // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
-            $this->displayMinimumRecommendedPhpVersionNotice();
-        }
-        // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
-            $this->displayUpcomingRequiredVersion();
-        }
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
-
-
-    /**
-     * Helper method to assess installed wp version against given values.
-     * By default this compares the required minimum version of WP for EE against the installed version of WP
-     * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
-     * against) so consider that when sending in your values.
-     *
-     * @param string $version_to_check
-     * @param string $operator
-     * @return bool
-     */
-    public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
-    {
-        global $wp_version;
-        return version_compare(
-            // first account for wp_version being pre-release
-            // (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
-            strpos($wp_version, '-') > 0
-                ? substr($wp_version, 0, strpos($wp_version, '-'))
-                : $wp_version,
-            $version_to_check,
-            $operator
-        );
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumWordPressVersionRequired()
-    {
-        return RecommendedVersions::compareWordPressVersion();
-    }
-
-
-    /**
-     * @param string $min_version
-     * @return boolean
-     */
-    private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
-    {
-        return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumPhpVersionRecommended()
-    {
-        return $this->checkPhpVersion();
-    }
-
-
-    /**
-     * @return void
-     */
-    public function minimumWpVersionError()
-    {
-        global $wp_version;
-        ?>
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		// check required WP version
+		if (! $this->minimumWordPressVersionRequired()) {
+			$this->request->unSetRequestParam('activate', true);
+			add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
+			$this->response->terminateRequest();
+			$this->response->deactivatePlugin();
+		}
+		// check recommended PHP version
+		if (! $this->minimumPhpVersionRecommended()) {
+			$this->displayMinimumRecommendedPhpVersionNotice();
+		}
+		// upcoming required version
+		if (! $this->upcomingRequiredPhpVersion()) {
+			$this->displayUpcomingRequiredVersion();
+		}
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
+
+
+	/**
+	 * Helper method to assess installed wp version against given values.
+	 * By default this compares the required minimum version of WP for EE against the installed version of WP
+	 * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
+	 * against) so consider that when sending in your values.
+	 *
+	 * @param string $version_to_check
+	 * @param string $operator
+	 * @return bool
+	 */
+	public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
+	{
+		global $wp_version;
+		return version_compare(
+			// first account for wp_version being pre-release
+			// (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
+			strpos($wp_version, '-') > 0
+				? substr($wp_version, 0, strpos($wp_version, '-'))
+				: $wp_version,
+			$version_to_check,
+			$operator
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumWordPressVersionRequired()
+	{
+		return RecommendedVersions::compareWordPressVersion();
+	}
+
+
+	/**
+	 * @param string $min_version
+	 * @return boolean
+	 */
+	private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
+	{
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumPhpVersionRecommended()
+	{
+		return $this->checkPhpVersion();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function minimumWpVersionError()
+	{
+		global $wp_version;
+		?>
         <div class="error">
             <p>
                 <?php
-                printf(
-                    esc_html__(
-                        'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
-                        'event_espresso'
-                    ),
-                    EE_MIN_WP_VER_REQUIRED,
-                    $wp_version,
-                    '<br/>',
-                    '<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
-                );
-                ?>
+				printf(
+					esc_html__(
+						'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
+						'event_espresso'
+					),
+					EE_MIN_WP_VER_REQUIRED,
+					$wp_version,
+					'<br/>',
+					'<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
+				);
+				?>
             </p>
         </div>
         <?php
-    }
-
-
-    /**
-     *    _display_minimum_recommended_php_version_notice
-     *
-     * @access private
-     * @return void
-     * @throws InvalidDataTypeException
-     */
-    private function displayMinimumRecommendedPhpVersionNotice()
-    {
-        if ($this->request->isAdmin()) {
-            new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
-                sprintf(
-                    esc_html__(
-                        'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                        'event_espresso'
-                    ),
-                    EE_MIN_PHP_VER_RECOMMENDED,
-                    PHP_VERSION,
-                    '<br/>',
-                    '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Returns whether the provided php version number is less than the current version of php installed on the server.
-     *
-     * @param string $version_required
-     * @return bool
-     */
-    private function upcomingRequiredPhpVersion($version_required = '5.5')
-    {
-        return true;
-        // return $this->checkPhpVersion($version_required);
-    }
-
-
-    /**
-     *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
-     */
-    private function displayUpcomingRequiredVersion()
-    {
-        if (
-            $this->request->isAdmin()
-            && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
-            && current_user_can('update_plugins')
-        ) {
-            add_action('admin_notices', function () {
-                echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
-                     . sprintf(
-                         esc_html__(
-                             'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
-                             'event_espresso'
-                         ),
-                         '<strong>',
-                         '</strong>',
-                         PHP_VERSION,
-                         '<a href="https://wordpress.org/support/upgrade-php/">',
-                         '</a>'
-                     )
-                     . '</p></div>';
-            });
-        }
-    }
+	}
+
+
+	/**
+	 *    _display_minimum_recommended_php_version_notice
+	 *
+	 * @access private
+	 * @return void
+	 * @throws InvalidDataTypeException
+	 */
+	private function displayMinimumRecommendedPhpVersionNotice()
+	{
+		if ($this->request->isAdmin()) {
+			new PersistentAdminNotice(
+				'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+				sprintf(
+					esc_html__(
+						'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+						'event_espresso'
+					),
+					EE_MIN_PHP_VER_RECOMMENDED,
+					PHP_VERSION,
+					'<br/>',
+					'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Returns whether the provided php version number is less than the current version of php installed on the server.
+	 *
+	 * @param string $version_required
+	 * @return bool
+	 */
+	private function upcomingRequiredPhpVersion($version_required = '5.5')
+	{
+		return true;
+		// return $this->checkPhpVersion($version_required);
+	}
+
+
+	/**
+	 *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
+	 */
+	private function displayUpcomingRequiredVersion()
+	{
+		if (
+			$this->request->isAdmin()
+			&& apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
+			&& current_user_can('update_plugins')
+		) {
+			add_action('admin_notices', function () {
+				echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
+					 . sprintf(
+						 esc_html__(
+							 'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
+							 'event_espresso'
+						 ),
+						 '<strong>',
+						 '</strong>',
+						 PHP_VERSION,
+						 '<a href="https://wordpress.org/support/upgrade-php/">',
+						 '</a>'
+					 )
+					 . '</p></div>';
+			});
+		}
+	}
 }