eventespresso / event-espresso-core

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

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
         $input->set_label_sizes();
         $label_size_class = $input->get_label_size_class();
         $html = '';
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+        if ( ! is_array($input->raw_value()) && $input->raw_value() !== null) {
             EE_Error::doing_it_wrong(
                 'EE_Checkbox_Display_Strategy::display()',
                 sprintf(
@@ -35,7 +35,7 @@ 
                     ),
                     $input->html_id(),
                     var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
+                    $input->html_name().'[]'
                 ),
                 '4.8.1'
             );
@@ -54,19 +54,19 @@ 
                      . '">';
             $html .= EEH_HTML::nl(1, 'checkbox');
             $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '"';
-            $html .= ' style="' . $input->html_style() . '"';
-            $html .= ' value="' . esc_attr($value) . '"';
+            $html .= ' name="'.$input->html_name().'[]"';
+            $html .= ' id="'.$html_id.'"';
+            $html .= ' class="'.$input->html_class().'"';
+            $html .= ' style="'.$input->html_style().'"';
+            $html .= ' value="'.esc_attr($value).'"';
             $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
                 ? ' checked="checked"'
                 : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
-            $html .= ' data-question_label="' . $input->html_label_id() . '"';
+            $html .= ' '.$this->_input->other_html_attributes();
+            $html .= ' data-question_label="'.$input->html_label_id().'"';
             $html .= '>&nbsp;';
             $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+            $html .= EEH_HTML::nl(-1, 'checkbox').'</label>';
         }
         return $html;
     }

Indentation +56 added lines, -56 removed lines

@@ -12,60 +12,60 @@
 class EE_Checkbox_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
 
-    /**
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = $this->get_input();
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        $html = '';
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
-            EE_Error::doing_it_wrong(
-                'EE_Checkbox_Display_Strategy::display()',
-                sprintf(
-                    esc_html_x(
-                        'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
-                        'Input values for checkboxes should be an array of values, but the value for input "form-input-id" is "form-input-value". Please verify that the input name is exactly "form_input_name[]"',
-                        'event_espresso'
-                    ),
-                    $input->html_id(),
-                    var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
-                ),
-                '4.8.1'
-            );
-        }
-        $input_raw_value = (array) $input->raw_value();
-        foreach ($input->options() as $value => $display_text) {
-            $value = $input->get_normalization_strategy()->unnormalize_one($value);
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'checkbox');
-            $html .= '<label for="'
-                     . $html_id
-                     . '" id="'
-                     . $html_id
-                     . '-lbl" class="ee-checkbox-label-after'
-                     . $label_size_class
-                     . '">';
-            $html .= EEH_HTML::nl(1, 'checkbox');
-            $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '"';
-            $html .= ' style="' . $input->html_style() . '"';
-            $html .= ' value="' . esc_attr($value) . '"';
-            $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
-                ? ' checked="checked"'
-                : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
-            $html .= ' data-question_label="' . $input->html_label_id() . '"';
-            $html .= '>&nbsp;';
-            $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
-        }
-        return $html;
-    }
+	/**
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->get_input();
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		$html = '';
+		if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+			EE_Error::doing_it_wrong(
+				'EE_Checkbox_Display_Strategy::display()',
+				sprintf(
+					esc_html_x(
+						'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
+						'Input values for checkboxes should be an array of values, but the value for input "form-input-id" is "form-input-value". Please verify that the input name is exactly "form_input_name[]"',
+						'event_espresso'
+					),
+					$input->html_id(),
+					var_export($input->raw_value(), true),
+					$input->html_name() . '[]'
+				),
+				'4.8.1'
+			);
+		}
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize_one($value);
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'checkbox');
+			$html .= '<label for="'
+					 . $html_id
+					 . '" id="'
+					 . $html_id
+					 . '-lbl" class="ee-checkbox-label-after'
+					 . $label_size_class
+					 . '">';
+			$html .= EEH_HTML::nl(1, 'checkbox');
+			$html .= '<input type="checkbox"';
+			$html .= ' name="' . $input->html_name() . '[]"';
+			$html .= ' id="' . $html_id . '"';
+			$html .= ' class="' . $input->html_class() . '"';
+			$html .= ' style="' . $input->html_style() . '"';
+			$html .= ' value="' . esc_attr($value) . '"';
+			$html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
+				? ' checked="checked"'
+				: '';
+			$html .= ' ' . $this->_input->other_html_attributes();
+			$html .= ' data-question_label="' . $input->html_label_id() . '"';
+			$html .= '>&nbsp;';
+			$html .= $display_text;
+			$html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+		}
+		return $html;
+	}
 }

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

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($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($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

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,
                 );
             }

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/erasure/PersonalDataEraserInterface.php

Indentation +17 added lines, -17 removed lines

@@ -15,25 +15,25 @@
 interface PersonalDataEraserInterface
 {
 
-    /**
-     * Gets a translated string name for the data eraser
-     *
-     * @return string
-     */
-    public function name();
+	/**
+	 * Gets a translated string name for the data eraser
+	 *
+	 * @return string
+	 */
+	public function name();
 
 
-    /**
-     * 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);
+	/**
+	 * 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);
 }
 // End of file PersonalDataEraserInterface.php
 // Location: EventEspresso\core\domain\services\admin/PersonalDataEraserInterface.php

core/services/privacy/export/PersonalDataExporterManager.php

Indentation +58 added lines, -58 removed lines

@@ -23,68 +23,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

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'),
             );

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

@@ -23,65 +23,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/domain/services/custom_post_types/RegisterCustomTaxonomies.php

Indentation +85 added lines, -85 removed lines

@@ -17,97 +17,97 @@
 class RegisterCustomTaxonomies
 {
 
-    /**
-     * @var CustomTaxonomyDefinitions $custom_taxonomies
-     */
-    public $custom_taxonomies;
+	/**
+	 * @var CustomTaxonomyDefinitions $custom_taxonomies
+	 */
+	public $custom_taxonomies;
 
 
-    /**
-     * RegisterCustomTaxonomies constructor.
-     *
-     * @param CustomTaxonomyDefinitions $custom_taxonomies
-     */
-    public function __construct(CustomTaxonomyDefinitions $custom_taxonomies)
-    {
-        $this->custom_taxonomies = $custom_taxonomies;
-    }
+	/**
+	 * RegisterCustomTaxonomies constructor.
+	 *
+	 * @param CustomTaxonomyDefinitions $custom_taxonomies
+	 */
+	public function __construct(CustomTaxonomyDefinitions $custom_taxonomies)
+	{
+		$this->custom_taxonomies = $custom_taxonomies;
+	}
 
 
-    /**
-     * @return void
-     * @throws DomainException
-     */
-    public function registerCustomTaxonomies()
-    {
-        $custom_taxonomies = $this->custom_taxonomies->getCustomTaxonomyDefinitions();
-        foreach ($custom_taxonomies as $taxonomy => $tax) {
-            $this->registerCustomTaxonomy(
-                $taxonomy,
-                $tax['singular_name'],
-                $tax['plural_name'],
-                $tax['args']
-            );
-        }
-    }
+	/**
+	 * @return void
+	 * @throws DomainException
+	 */
+	public function registerCustomTaxonomies()
+	{
+		$custom_taxonomies = $this->custom_taxonomies->getCustomTaxonomyDefinitions();
+		foreach ($custom_taxonomies as $taxonomy => $tax) {
+			$this->registerCustomTaxonomy(
+				$taxonomy,
+				$tax['singular_name'],
+				$tax['plural_name'],
+				$tax['args']
+			);
+		}
+	}
 
 
-    /**
-     * Registers a custom taxonomy. Should be called before registering custom post types,
-     * otherwise you should link the taxonomy to the custom post type using 'register_taxonomy_for_object_type'.
-     *
-     * @param string $taxonomy_name      , eg 'books'
-     * @param string $singular_name      internationalized singular name
-     * @param string $plural_name        internationalized plural name
-     * @param array  $override_arguments like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
-     * @throws DomainException
-     */
-    public function registerCustomTaxonomy($taxonomy_name, $singular_name, $plural_name, array $override_arguments)
-    {
-        $result = register_taxonomy(
-            $taxonomy_name,
-            null,
-            $this->prepareArguments(
-                $singular_name,
-                $plural_name,
-                $override_arguments
-            )
-        );
-        if ($result instanceof WP_Error) {
-            throw new DomainException($result->get_error_message());
-        }
-    }
+	/**
+	 * Registers a custom taxonomy. Should be called before registering custom post types,
+	 * otherwise you should link the taxonomy to the custom post type using 'register_taxonomy_for_object_type'.
+	 *
+	 * @param string $taxonomy_name      , eg 'books'
+	 * @param string $singular_name      internationalized singular name
+	 * @param string $plural_name        internationalized plural name
+	 * @param array  $override_arguments like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
+	 * @throws DomainException
+	 */
+	public function registerCustomTaxonomy($taxonomy_name, $singular_name, $plural_name, array $override_arguments)
+	{
+		$result = register_taxonomy(
+			$taxonomy_name,
+			null,
+			$this->prepareArguments(
+				$singular_name,
+				$plural_name,
+				$override_arguments
+			)
+		);
+		if ($result instanceof WP_Error) {
+			throw new DomainException($result->get_error_message());
+		}
+	}
 
 
-    /**
-     * @param string $singular_name
-     * @param string $plural_name
-     * @param array  $override_arguments
-     * @since 4.9.62.p
-     * @return array
-     */
-    protected function prepareArguments($singular_name, $plural_name, array $override_arguments)
-    {
-        $arguments = array(
-            'hierarchical'      => true,
-            'labels'            => array(
-                'name'          => $plural_name,
-                'singular_name' => $singular_name,
-            ),
-            'show_ui'           => true,
-            'show_ee_ui'        => true,
-            'show_admin_column' => true,
-            'query_var'         => true,
-            'show_in_nav_menus' => false,
-            'map_meta_cap'      => true,
-        );
-        if ($override_arguments) {
-            if (isset($override_args['labels'])) {
-                $labels = array_merge($arguments['labels'], $override_arguments['labels']);
-                $arguments['labels'] = $labels;
-            }
-            $arguments = array_merge($arguments, $override_arguments);
-        }
-        return $arguments;
-    }
+	/**
+	 * @param string $singular_name
+	 * @param string $plural_name
+	 * @param array  $override_arguments
+	 * @since 4.9.62.p
+	 * @return array
+	 */
+	protected function prepareArguments($singular_name, $plural_name, array $override_arguments)
+	{
+		$arguments = array(
+			'hierarchical'      => true,
+			'labels'            => array(
+				'name'          => $plural_name,
+				'singular_name' => $singular_name,
+			),
+			'show_ui'           => true,
+			'show_ee_ui'        => true,
+			'show_admin_column' => true,
+			'query_var'         => true,
+			'show_in_nav_menus' => false,
+			'map_meta_cap'      => true,
+		);
+		if ($override_arguments) {
+			if (isset($override_args['labels'])) {
+				$labels = array_merge($arguments['labels'], $override_arguments['labels']);
+				$arguments['labels'] = $labels;
+			}
+			$arguments = array_merge($arguments, $override_arguments);
+		}
+		return $arguments;
+	}
 }

core/CPTs/EE_Register_CPTs.core.php

Indentation +313 added lines, -313 removed lines

@@ -19,303 +19,303 @@ 
 {
 
 
-    /**
-     * instantiated at init priority 5
-     *
-     * @deprecated 4.9.62.p
-     */
-    public function __construct()
-    {
-        do_action('AHEE__EE_Register_CPTs__construct_end', $this);
-    }
-
-
-    /**
-     * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
-     *
-     * @deprecated 4.9.62.p
-     * @return void
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public static function maybe_flush_rewrite_rules()
-    {
-        /** @var EventEspresso\core\domain\services\custom_post_types\RewriteRules $rewrite_rules */
-        $rewrite_rules = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\services\custom_post_types\RewriteRules'
-        );
-        $rewrite_rules->flushRewriteRules();
-    }
-
-
-    /**
-     * @return CustomTaxonomyDefinitions
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getTaxonomyDefinitions()
-    {
-        return LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions'
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $description The description content.
-     * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function ee_filter_ee_term_description_not_wp($description, $taxonomy)
-    {
-        $taxonomies = EE_Register_CPTs::getTaxonomyDefinitions();
-        return $taxonomies->filterCustomTermDescription($description, $taxonomy);
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_taxonomies()
-    {
-        $taxonomies = EE_Register_CPTs::getTaxonomyDefinitions();
-        return $taxonomies->getCustomTaxonomyDefinitions();
-    }
-
-
-    /**
-     * @return CustomPostTypeDefinitions
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getCustomPostTypeDefinitions()
-    {
-        return LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_CPTs()
-    {
-        $custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
-        return $custom_post_types->getDefinitions();
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_private_CPTs()
-    {
-        $custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
-        return $custom_post_types->getPrivateCustomPostTypes();
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $post_type_slug              If a slug is included, then attempt to retrieve the model name for
-     *                                            the given cpt slug.  Otherwise if empty, then we'll return all cpt
-     *                                            model names for cpts registered in EE.
-     * @return array           Empty array if no matching model names for the given slug or an array of model
-     *                                            names indexed by post type slug.
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_cpt_model_names($post_type_slug = '')
-    {
-        $custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
-        return $custom_post_types->getCustomPostTypeModelNames($post_type_slug);
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
-     *                               the cpt matching the given slug.  Otherwise all cpt models will be
-     *                               instantiated (if possible).
-     * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
-     *                               EEM models indexed by post slug.
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function instantiate_cpt_models($post_type_slug = '')
-    {
-        $custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
-        return $custom_post_types->getCustomPostTypeModels($post_type_slug);
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $taxonomy_name , eg 'books'
-     * @param string $singular_name internationalized singular name
-     * @param string $plural_name   internationalized plural name
-     * @param array  $override_args like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     */
-    public function register_taxonomy($taxonomy_name, $singular_name, $plural_name, $override_args = array())
-    {
-        /** @var \EventEspresso\core\domain\services\custom_post_types\registerCustomTaxonomies $taxonomies */
-        $taxonomies = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'
-        );
-        $taxonomies->registerCustomTaxonomy(
-            $taxonomy_name,
-            $singular_name,
-            $plural_name,
-            $override_args
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $post_type     the actual post type name
-     *                              (VERY IMPORTANT: this much match what the slug is for admin pages related to this
-     *                              cpt Also any models must use this slug as well)
-     * @param string $singular_name a pre-internationalized string for the singular name of the objects
-     * @param string $plural_name   a pre-internalized string for the plural name of the objects
-     * @param array  $override_args exactly like $args as described in
-     *                              http://codex.wordpress.org/Function_Reference/register_post_type The default values
-     *                              set in this function will be overridden by whatever you set in $override_args
-     * @param string $singular_slug
-     * @param string $plural_slug
-     * @return void , but registers the custom post type
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     */
-    public function register_CPT(
-        $post_type,
-        $singular_name,
-        $plural_name,
-        $override_args = array(),
-        $singular_slug = '',
-        $plural_slug = ''
-    ) {
-        /** @var \EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes $register_custom_post_types */
-        $register_custom_post_types = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'
-        );
-        $register_custom_post_types->registerCustomPostType(
-            $post_type,
-            $singular_name,
-            $plural_name,
-            $singular_slug,
-            $plural_slug,
-            $override_args
-        );
-    }
-
-
-    /**
-     * @return RegisterCustomTaxonomyTerms
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getRegisterCustomTaxonomyTerms()
-    {
-        return LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomyTerms'
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function set_must_use_event_types()
-    {
-        $register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
-        $register_custom_taxonomy_terms->setMustUseEventTypes();
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $taxonomy     The name of the taxonomy
-     * @param array  $term_details An array of term details indexed by slug and containing Name of term, and
-     *                             description as the elements in the array
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function set_must_use_terms($taxonomy, $term_details)
-    {
-        $register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
-        $register_custom_taxonomy_terms->setMustUseTerms($taxonomy, $term_details);
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $taxonomy  The taxonomy we're using for the default term
-     * @param string $term_slug The slug of the term that will be the default.
-     * @param array  $cpt_slugs An array of custom post types we want the default assigned to
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function set_default_term($taxonomy, $term_slug, $cpt_slugs = array())
-    {
-        $register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
-        $register_custom_taxonomy_terms->registerCustomTaxonomyTerm(
-            $taxonomy,
-            $term_slug,
-            $cpt_slugs
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param  int     $post_id ID of CPT being saved
-     * @param  WP_Post $post    Post object
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function save_default_term($post_id, $post)
-    {
-        $register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
-        $register_custom_taxonomy_terms->saveDefaultTerm($post_id, $post);
-    }
+	/**
+	 * instantiated at init priority 5
+	 *
+	 * @deprecated 4.9.62.p
+	 */
+	public function __construct()
+	{
+		do_action('AHEE__EE_Register_CPTs__construct_end', $this);
+	}
+
+
+	/**
+	 * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
+	 *
+	 * @deprecated 4.9.62.p
+	 * @return void
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public static function maybe_flush_rewrite_rules()
+	{
+		/** @var EventEspresso\core\domain\services\custom_post_types\RewriteRules $rewrite_rules */
+		$rewrite_rules = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\services\custom_post_types\RewriteRules'
+		);
+		$rewrite_rules->flushRewriteRules();
+	}
+
+
+	/**
+	 * @return CustomTaxonomyDefinitions
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getTaxonomyDefinitions()
+	{
+		return LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions'
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $description The description content.
+	 * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function ee_filter_ee_term_description_not_wp($description, $taxonomy)
+	{
+		$taxonomies = EE_Register_CPTs::getTaxonomyDefinitions();
+		return $taxonomies->filterCustomTermDescription($description, $taxonomy);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_taxonomies()
+	{
+		$taxonomies = EE_Register_CPTs::getTaxonomyDefinitions();
+		return $taxonomies->getCustomTaxonomyDefinitions();
+	}
+
+
+	/**
+	 * @return CustomPostTypeDefinitions
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getCustomPostTypeDefinitions()
+	{
+		return LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_CPTs()
+	{
+		$custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
+		return $custom_post_types->getDefinitions();
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_private_CPTs()
+	{
+		$custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
+		return $custom_post_types->getPrivateCustomPostTypes();
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $post_type_slug              If a slug is included, then attempt to retrieve the model name for
+	 *                                            the given cpt slug.  Otherwise if empty, then we'll return all cpt
+	 *                                            model names for cpts registered in EE.
+	 * @return array           Empty array if no matching model names for the given slug or an array of model
+	 *                                            names indexed by post type slug.
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_cpt_model_names($post_type_slug = '')
+	{
+		$custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
+		return $custom_post_types->getCustomPostTypeModelNames($post_type_slug);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
+	 *                               the cpt matching the given slug.  Otherwise all cpt models will be
+	 *                               instantiated (if possible).
+	 * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
+	 *                               EEM models indexed by post slug.
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function instantiate_cpt_models($post_type_slug = '')
+	{
+		$custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
+		return $custom_post_types->getCustomPostTypeModels($post_type_slug);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $taxonomy_name , eg 'books'
+	 * @param string $singular_name internationalized singular name
+	 * @param string $plural_name   internationalized plural name
+	 * @param array  $override_args like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 */
+	public function register_taxonomy($taxonomy_name, $singular_name, $plural_name, $override_args = array())
+	{
+		/** @var \EventEspresso\core\domain\services\custom_post_types\registerCustomTaxonomies $taxonomies */
+		$taxonomies = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'
+		);
+		$taxonomies->registerCustomTaxonomy(
+			$taxonomy_name,
+			$singular_name,
+			$plural_name,
+			$override_args
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $post_type     the actual post type name
+	 *                              (VERY IMPORTANT: this much match what the slug is for admin pages related to this
+	 *                              cpt Also any models must use this slug as well)
+	 * @param string $singular_name a pre-internationalized string for the singular name of the objects
+	 * @param string $plural_name   a pre-internalized string for the plural name of the objects
+	 * @param array  $override_args exactly like $args as described in
+	 *                              http://codex.wordpress.org/Function_Reference/register_post_type The default values
+	 *                              set in this function will be overridden by whatever you set in $override_args
+	 * @param string $singular_slug
+	 * @param string $plural_slug
+	 * @return void , but registers the custom post type
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 */
+	public function register_CPT(
+		$post_type,
+		$singular_name,
+		$plural_name,
+		$override_args = array(),
+		$singular_slug = '',
+		$plural_slug = ''
+	) {
+		/** @var \EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes $register_custom_post_types */
+		$register_custom_post_types = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'
+		);
+		$register_custom_post_types->registerCustomPostType(
+			$post_type,
+			$singular_name,
+			$plural_name,
+			$singular_slug,
+			$plural_slug,
+			$override_args
+		);
+	}
+
+
+	/**
+	 * @return RegisterCustomTaxonomyTerms
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getRegisterCustomTaxonomyTerms()
+	{
+		return LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomyTerms'
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function set_must_use_event_types()
+	{
+		$register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
+		$register_custom_taxonomy_terms->setMustUseEventTypes();
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $taxonomy     The name of the taxonomy
+	 * @param array  $term_details An array of term details indexed by slug and containing Name of term, and
+	 *                             description as the elements in the array
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function set_must_use_terms($taxonomy, $term_details)
+	{
+		$register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
+		$register_custom_taxonomy_terms->setMustUseTerms($taxonomy, $term_details);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $taxonomy  The taxonomy we're using for the default term
+	 * @param string $term_slug The slug of the term that will be the default.
+	 * @param array  $cpt_slugs An array of custom post types we want the default assigned to
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function set_default_term($taxonomy, $term_slug, $cpt_slugs = array())
+	{
+		$register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
+		$register_custom_taxonomy_terms->registerCustomTaxonomyTerm(
+			$taxonomy,
+			$term_slug,
+			$cpt_slugs
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param  int     $post_id ID of CPT being saved
+	 * @param  WP_Post $post    Post object
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function save_default_term($post_id, $post)
+	{
+		$register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
+		$register_custom_taxonomy_terms->saveDefaultTerm($post_id, $post);
+	}
 }
 
 /**
@@ -327,24 +327,24 @@ 
 class EE_Default_Term
 {
 
-    // props holding the items
-    public $taxonomy = '';
+	// props holding the items
+	public $taxonomy = '';
 
-    public $cpt_slugs = array();
+	public $cpt_slugs = array();
 
-    public $term_slug = '';
+	public $term_slug = '';
 
 
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $taxonomy  The taxonomy the default term belongs to
-     * @param string $term_slug The slug of the term that will be the default.
-     * @param array  $cpt_slugs The custom post type the default term gets saved with
-     */
-    public function __construct($taxonomy, $term_slug, $cpt_slugs = array())
-    {
-        $this->taxonomy = $taxonomy;
-        $this->cpt_slugs = (array) $cpt_slugs;
-        $this->term_slug = $term_slug;
-    }
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $taxonomy  The taxonomy the default term belongs to
+	 * @param string $term_slug The slug of the term that will be the default.
+	 * @param array  $cpt_slugs The custom post type the default term gets saved with
+	 */
+	public function __construct($taxonomy, $term_slug, $cpt_slugs = array())
+	{
+		$this->taxonomy = $taxonomy;
+		$this->cpt_slugs = (array) $cpt_slugs;
+		$this->term_slug = $term_slug;
+	}
 }