eventespresso / event-espresso-core

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/assets/AssetCollection.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
             /** @var Asset $asset */
             $asset = $this->current();
             if ($asset->type() === $type) {
-                $files[ $asset->handle() ] = $asset;
+                $files[$asset->handle()] = $asset;
             }
             $this->next();
         }
@@ -96,7 +96,7 @@ 
             /** @var JavascriptAsset $asset */
             $asset = $this->current();
             if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
-                $files[ $asset->handle() ] = $asset;
+                $files[$asset->handle()] = $asset;
             }
             $this->next();
         }

Indentation +188 added lines, -188 removed lines

@@ -21,192 +21,192 @@
 {
 
 
-    /**
-     * AssetCollection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('EventEspresso\core\domain\values\assets\Asset');
-    }
-
-
-    /**
-     * @return StylesheetAsset[]
-     * @since 4.9.62.p
-     */
-    public function getStylesheetAssets()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * @return JavascriptAsset[]
-     * @since 4.9.62.p
-     */
-    public function getJavascriptAssets()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_JS);
-    }
-
-
-    /**
-     * @return ManifestFile[]
-     * @since 4.9.62.p
-     */
-    public function getManifestFiles()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_MANIFEST);
-    }
-
-
-    /**
-     * @param $type
-     * @return JavascriptAsset[]|StylesheetAsset[]|ManifestFile[]
-     * @since 4.9.62.p
-     */
-    protected function getAssetsOfType($type)
-    {
-        $files = array();
-        $this->rewind();
-        while ($this->valid()) {
-            /** @var Asset $asset */
-            $asset = $this->current();
-            if ($asset->type() === $type) {
-                $files[ $asset->handle() ] = $asset;
-            }
-            $this->next();
-        }
-        $this->rewind();
-        return $files;
-    }
-
-
-    /**
-     * @return JavascriptAsset[]
-     * @since 4.9.62.p
-     */
-    public function getJavascriptAssetsWithData()
-    {
-        $files = array();
-        $this->rewind();
-        while ($this->valid()) {
-            /** @var JavascriptAsset $asset */
-            $asset = $this->current();
-            if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
-                $files[ $asset->handle() ] = $asset;
-            }
-            $this->next();
-        }
-        $this->rewind();
-        return $files;
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the object is within the Collection
-     * based on the supplied $identifier and type
-     *
-     * @param  mixed $identifier
-     * @param string $type
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasAssetOfType($identifier, $type = Asset::TYPE_JS)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
-                $this->rewind();
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the Javascript Asset is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasJavascriptAsset($identifier)
-    {
-        return $this->hasAssetOfType($identifier, Asset::TYPE_JS);
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the Stylesheet Asset is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasStylesheetAsset($identifier)
-    {
-        return $this->hasAssetOfType($identifier, Asset::TYPE_CSS);
-    }
-
-    /**
-     * returns the object from the Collection
-     * based on the supplied $identifier and type
-     *
-     * @param  mixed $identifier
-     * @param string $type
-     * @return JavascriptAsset|StylesheetAsset
-     * @since 4.9.63.p
-     */
-    public function getAssetOfType($identifier, $type = Asset::TYPE_JS)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
-                /** @var JavascriptAsset|StylesheetAsset $object */
-                $object = $this->current();
-                $this->rewind();
-                return $object;
-            }
-            $this->next();
-        }
-        return null;
-    }
-
-
-    /**
-     * returns the Stylesheet Asset from the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return StylesheetAsset
-     * @since 4.9.63.p
-     */
-    public function getStylesheetAsset($identifier)
-    {
-        return $this->getAssetOfType($identifier, Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * returns the Javascript Asset from the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return JavascriptAsset
-     * @since 4.9.63.p
-     */
-    public function getJavascriptAsset($identifier)
-    {
-        return $this->getAssetOfType($identifier, Asset::TYPE_JS);
-    }
+	/**
+	 * AssetCollection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('EventEspresso\core\domain\values\assets\Asset');
+	}
+
+
+	/**
+	 * @return StylesheetAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getStylesheetAssets()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * @return JavascriptAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getJavascriptAssets()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * @return ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	public function getManifestFiles()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_MANIFEST);
+	}
+
+
+	/**
+	 * @param $type
+	 * @return JavascriptAsset[]|StylesheetAsset[]|ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	protected function getAssetsOfType($type)
+	{
+		$files = array();
+		$this->rewind();
+		while ($this->valid()) {
+			/** @var Asset $asset */
+			$asset = $this->current();
+			if ($asset->type() === $type) {
+				$files[ $asset->handle() ] = $asset;
+			}
+			$this->next();
+		}
+		$this->rewind();
+		return $files;
+	}
+
+
+	/**
+	 * @return JavascriptAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getJavascriptAssetsWithData()
+	{
+		$files = array();
+		$this->rewind();
+		while ($this->valid()) {
+			/** @var JavascriptAsset $asset */
+			$asset = $this->current();
+			if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
+				$files[ $asset->handle() ] = $asset;
+			}
+			$this->next();
+		}
+		$this->rewind();
+		return $files;
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the object is within the Collection
+	 * based on the supplied $identifier and type
+	 *
+	 * @param  mixed $identifier
+	 * @param string $type
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasAssetOfType($identifier, $type = Asset::TYPE_JS)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
+				$this->rewind();
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the Javascript Asset is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasJavascriptAsset($identifier)
+	{
+		return $this->hasAssetOfType($identifier, Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the Stylesheet Asset is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasStylesheetAsset($identifier)
+	{
+		return $this->hasAssetOfType($identifier, Asset::TYPE_CSS);
+	}
+
+	/**
+	 * returns the object from the Collection
+	 * based on the supplied $identifier and type
+	 *
+	 * @param  mixed $identifier
+	 * @param string $type
+	 * @return JavascriptAsset|StylesheetAsset
+	 * @since 4.9.63.p
+	 */
+	public function getAssetOfType($identifier, $type = Asset::TYPE_JS)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
+				/** @var JavascriptAsset|StylesheetAsset $object */
+				$object = $this->current();
+				$this->rewind();
+				return $object;
+			}
+			$this->next();
+		}
+		return null;
+	}
+
+
+	/**
+	 * returns the Stylesheet Asset from the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return StylesheetAsset
+	 * @since 4.9.63.p
+	 */
+	public function getStylesheetAsset($identifier)
+	{
+		return $this->getAssetOfType($identifier, Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * returns the Javascript Asset from the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return JavascriptAsset
+	 * @since 4.9.63.p
+	 */
+	public function getJavascriptAsset($identifier)
+	{
+		return $this->getAssetOfType($identifier, Asset::TYPE_JS);
+	}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -32,10 +32,10 @@ 
             $html .= $this->_attributes_string(
                 array(
                     'for' => $html_id,
-                    'id' => $html_id . '-lbl',
+                    'id' => $html_id.'-lbl',
                     'class' => apply_filters(
                         'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
+                        'ee-radio-label-after'.$label_size_class,
                         $this,
                         $input,
                         $value
@@ -62,7 +62,7 @@ 
 
             $html .= '> ';
             $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+            $html .= EEH_HTML::nl(-1, 'radio').'</label>';
         }
         $html .= EEH_HTML::div('', '', 'clear-float');
         $html .= EEH_HTML::divx();

Indentation +54 added lines, -54 removed lines

@@ -11,61 +11,61 @@
  */
 class EE_Radio_Button_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
-    /**
-     *
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display(): string
-    {
-        $input = $this->get_input();
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        $html = '';
-        foreach ($input->options() as $value => $display_text) {
-            $value = $input->get_normalization_strategy()->unnormalize($value);
+	/**
+	 *
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display(): string
+	{
+		$input = $this->get_input();
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		$html = '';
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize($value);
 
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'radio');
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'radio');
 
-            $html .= $this->_opening_tag('label');
-            $html .= $this->_attributes_string(
-                array(
-                    'for' => $html_id,
-                    'id' => $html_id . '-lbl',
-                    'class' => apply_filters(
-                        'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
-                        $this,
-                        $input,
-                        $value
-                    )
-                )
-            );
-            $html .= '>';
-            $html .= EEH_HTML::nl(1, 'radio');
-            $html .= $this->_opening_tag('input');
-            $attributes = array(
-                'id' => $html_id,
-                'name' => $input->html_name(),
-                'class' => $input->html_class(),
-                'style' => $input->html_style(),
-                'type' => 'radio',
-                'value' => $value,
-                0 => $input->other_html_attributes(),
-                'data-question_label' => $input->html_label_id()
-            );
-            if ($input->raw_value() === $value) {
-                $attributes['checked'] = 'checked';
-            }
-            $html .= $this->_attributes_string($attributes);
+			$html .= $this->_opening_tag('label');
+			$html .= $this->_attributes_string(
+				array(
+					'for' => $html_id,
+					'id' => $html_id . '-lbl',
+					'class' => apply_filters(
+						'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
+						'ee-radio-label-after' . $label_size_class,
+						$this,
+						$input,
+						$value
+					)
+				)
+			);
+			$html .= '>';
+			$html .= EEH_HTML::nl(1, 'radio');
+			$html .= $this->_opening_tag('input');
+			$attributes = array(
+				'id' => $html_id,
+				'name' => $input->html_name(),
+				'class' => $input->html_class(),
+				'style' => $input->html_style(),
+				'type' => 'radio',
+				'value' => $value,
+				0 => $input->other_html_attributes(),
+				'data-question_label' => $input->html_label_id()
+			);
+			if ($input->raw_value() === $value) {
+				$attributes['checked'] = 'checked';
+			}
+			$html .= $this->_attributes_string($attributes);
 
-            $html .= '> ';
-            $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
-        }
-        $html .= EEH_HTML::div('', '', 'clear-float');
-        $html .= EEH_HTML::divx();
-        return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
-    }
+			$html .= '>&nbsp;';
+			$html .= $display_text;
+			$html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+		}
+		$html .= EEH_HTML::div('', '', 'clear-float');
+		$html .= EEH_HTML::divx();
+		return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
+	}
 }

core/services/collections/Collection.php

Spacing +10 added lines, -10 removed lines

@@ -66,7 +66,7 @@ 
      */
     protected function setCollectionInterface($collection_interface)
     {
-        if (! (interface_exists($collection_interface) || class_exists($collection_interface))) {
+        if ( ! (interface_exists($collection_interface) || class_exists($collection_interface))) {
             throw new InvalidInterfaceException($collection_interface);
         }
         $this->collection_interface = $collection_interface;
@@ -111,13 +111,13 @@ 
     protected function setCollectionIdentifier()
     {
         // hash a few collection details
-        $identifier = md5(spl_object_hash($this) . $this->collection_interface . time());
+        $identifier = md5(spl_object_hash($this).$this->collection_interface.time());
         // grab a few characters from the start, middle, and end of the hash
         $id = array();
         for ($x = 0; $x < 19; $x += 9) {
             $id[] = substr($identifier, $x, 3);
         }
-        $this->collection_identifier = $this->collection_name . '-' . strtoupper(implode('-', $id));
+        $this->collection_identifier = $this->collection_name.'-'.strtoupper(implode('-', $id));
     }
 
 
@@ -135,7 +135,7 @@ 
      */
     public function add($object, $identifier = null)
     {
-        if (! $object instanceof $this->collection_interface) {
+        if ( ! $object instanceof $this->collection_interface) {
             throw new InvalidEntityException($object, $this->collection_interface);
         }
         if ($this->contains($object)) {
@@ -351,7 +351,7 @@ 
      */
     public function indexOf($object)
     {
-        if (! $this->contains($object)) {
+        if ( ! $this->contains($object)) {
             return false;
         }
         foreach ($this as $index => $obj) {
@@ -420,9 +420,9 @@ 
             $remaining_objects = $this->slice($index, $this->count() - $index);
             foreach ($remaining_objects as $key => $remaining_object) {
                 // we need to grab the identifiers for each object and use them as keys
-                $remaining_objects[ $remaining_object->getInfo() ] = $remaining_object;
+                $remaining_objects[$remaining_object->getInfo()] = $remaining_object;
                 // and then remove the object from the current tracking array
-                unset($remaining_objects[ $key ]);
+                unset($remaining_objects[$key]);
                 // and then remove it from the Collection
                 $this->detach($remaining_object);
             }
@@ -446,17 +446,17 @@ 
      */
     public function insertAt($objects, $index)
     {
-        if (! is_array($objects)) {
+        if ( ! is_array($objects)) {
             $objects = array($objects);
         }
         // check to ensure that objects don't already exist in the collection
         foreach ($objects as $key => $object) {
             if ($this->contains($object)) {
-                unset($objects[ $key ]);
+                unset($objects[$key]);
             }
         }
         // do we have any objects left?
-        if (! $objects) {
+        if ( ! $objects) {
             return;
         }
         // detach any objects at or past this index

Indentation +510 added lines, -510 removed lines

@@ -18,514 +18,514 @@
  */
 class Collection extends SplObjectStorage implements CollectionInterface
 {
-    /**
-     * a unique string for identifying this collection
-     *
-     * @type string $collection_identifier
-     */
-    protected $collection_identifier;
-
-
-    /**
-     * an interface (or class) name to be used for restricting the type of objects added to the storage
-     * this should be set from within the child class constructor
-     *
-     * @type string $interface
-     */
-    protected $collection_interface;
-
-    /**
-     * a short dash separated string describing the contents of this collection
-     * used as the base for the $collection_identifier
-     * defaults to the class short name if not set
-     *
-     * @type string $collection_identifier
-     */
-    protected $collection_name;
-
-
-    /**
-     * Collection constructor
-     *
-     * @param string $collection_interface
-     * @param string $collection_name
-     * @throws InvalidInterfaceException
-     */
-    public function __construct($collection_interface, $collection_name = '')
-    {
-        $this->setCollectionInterface($collection_interface);
-        $this->setCollectionName($collection_name);
-        $this->setCollectionIdentifier();
-    }
-
-
-    /**
-     * @return string
-     * @since 4.10.33.p
-     */
-    public function collectionInterface(): string
-    {
-        return $this->collection_interface;
-    }
-
-
-    /**
-     * setCollectionInterface
-     *
-     * @param  string $collection_interface
-     * @throws InvalidInterfaceException
-     */
-    protected function setCollectionInterface($collection_interface)
-    {
-        if (! (interface_exists($collection_interface) || class_exists($collection_interface))) {
-            throw new InvalidInterfaceException($collection_interface);
-        }
-        $this->collection_interface = $collection_interface;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function collectionName()
-    {
-        return $this->collection_name;
-    }
-
-
-    /**
-     * @param string $collection_name
-     */
-    protected function setCollectionName($collection_name)
-    {
-        $this->collection_name = ! empty($collection_name)
-            ? sanitize_key($collection_name)
-            : basename(str_replace('\\', '/', get_class($this)));
-    }
-
-
-    /**
-     * @return string
-     */
-    public function collectionIdentifier()
-    {
-        return $this->collection_identifier;
-    }
-
-
-    /**
-     * creates a very readable unique 9 character identifier like:  CF2-532-DAC
-     * and appends it to the non-qualified class name, ex: ThingCollection-CF2-532-DAC
-     *
-     * @return void
-     */
-    protected function setCollectionIdentifier()
-    {
-        // hash a few collection details
-        $identifier = md5(spl_object_hash($this) . $this->collection_interface . time());
-        // grab a few characters from the start, middle, and end of the hash
-        $id = array();
-        for ($x = 0; $x < 19; $x += 9) {
-            $id[] = substr($identifier, $x, 3);
-        }
-        $this->collection_identifier = $this->collection_name . '-' . strtoupper(implode('-', $id));
-    }
-
-
-    /**
-     * add
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_identifier()
-     *
-     * @param        $object
-     * @param  mixed $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function add($object, $identifier = null)
-    {
-        if (! $object instanceof $this->collection_interface) {
-            throw new InvalidEntityException($object, $this->collection_interface);
-        }
-        if ($this->contains($object)) {
-            throw new DuplicateCollectionIdentifierException($identifier);
-        }
-        $this->attach($object);
-        $this->setIdentifier($object, $identifier);
-        return $this->contains($object);
-    }
-
-
-    /**
-     * getIdentifier
-     * if no $identifier is supplied, then the spl_object_hash() is used
-     *
-     * @param        $object
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function getIdentifier($object, $identifier = null)
-    {
-        return ! empty($identifier)
-            ? $identifier
-            : spl_object_hash($object);
-    }
-
-
-    /**
-     * setIdentifier
-     * Sets the data associated with an object in the Collection
-     * if no $identifier is supplied, then the spl_object_hash() is used
-     *
-     * @param        $object
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function setIdentifier($object, $identifier = null)
-    {
-        $identifier = $this->getIdentifier($object, $identifier);
-        $this->rewind();
-        while ($this->valid()) {
-            if ($object === $this->current()) {
-                $this->setInfo($identifier);
-                $this->rewind();
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * get
-     * finds and returns an object in the Collection based on the identifier that was set using addObject()
-     * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
-     *
-     * @param mixed $identifier
-     * @return mixed
-     */
-    public function get($identifier)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($identifier === $this->getInfo()) {
-                $object = $this->current();
-                $this->rewind();
-                return $object;
-            }
-            $this->next();
-        }
-        return null;
-    }
-
-
-    /**
-     * has
-     * returns TRUE or FALSE
-     * depending on whether the object is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function has($identifier)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($identifier === $this->getInfo()) {
-                $this->rewind();
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * hasObject
-     * returns TRUE or FALSE depending on whether the supplied object is within the Collection
-     *
-     * @param $object
-     * @return bool
-     */
-    public function hasObject($object)
-    {
-        return $this->contains($object);
-    }
-
-
-    /**
-     * hasObjects
-     * returns true if there are objects within the Collection, and false if it is empty
-     *
-     * @return bool
-     */
-    public function hasObjects()
-    {
-        return $this->count() !== 0;
-    }
-
-
-    /**
-     * isEmpty
-     * returns true if there are no objects within the Collection, and false if there are
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return $this->count() === 0;
-    }
-
-
-    /**
-     * remove
-     * detaches an object from the Collection
-     *
-     * @param $object
-     * @return bool
-     */
-    public function remove($object)
-    {
-        $this->detach($object);
-        return true;
-    }
-
-
-    /**
-     * setCurrent
-     * advances pointer to the object whose identifier matches that which was provided
-     *
-     * @param mixed $identifier
-     * @return boolean
-     */
-    public function setCurrent($identifier)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($identifier === $this->getInfo()) {
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * setCurrentUsingObject
-     * advances pointer to the provided object
-     *
-     * @param $object
-     * @return boolean
-     */
-    public function setCurrentUsingObject($object)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->current() === $object) {
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * Returns the object occupying the index before the current object,
-     * unless this is already the first object, in which case it just returns the first object
-     *
-     * @return mixed
-     */
-    public function previous()
-    {
-        $index = $this->indexOf($this->current());
-        if ($index === 0) {
-            return $this->current();
-        }
-        $index--;
-        return $this->objectAtIndex($index);
-    }
-
-
-    /**
-     * Returns the index of a given object, or false if not found
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param $object
-     * @return boolean|int|string
-     */
-    public function indexOf($object)
-    {
-        if (! $this->contains($object)) {
-            return false;
-        }
-        foreach ($this as $index => $obj) {
-            if ($obj === $object) {
-                return $index;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * Returns the object at the given index
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param int $index
-     * @return mixed
-     */
-    public function objectAtIndex($index)
-    {
-        $iterator = new LimitIterator($this, $index, 1);
-        $iterator->rewind();
-        return $iterator->current();
-    }
-
-
-    /**
-     * Returns the sequence of objects as specified by the offset and length
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param int $offset
-     * @param int $length
-     * @return array
-     */
-    public function slice($offset, $length)
-    {
-        $slice = array();
-        $iterator = new LimitIterator($this, $offset, $length);
-        foreach ($iterator as $object) {
-            $slice[] = $object;
-        }
-        return $slice;
-    }
-
-
-    /**
-     * Inserts an object at a certain point
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param mixed $object A single object
-     * @param int   $index
-     * @param mixed $identifier
-     * @return bool
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidEntityException
-     */
-    public function insertObjectAt($object, $index, $identifier = null)
-    {
-        // check to ensure that objects don't already exist in the collection
-        if ($this->has($identifier)) {
-            throw new DuplicateCollectionIdentifierException($identifier);
-        }
-        // detach any objects at or past this index
-        $remaining_objects = array();
-        if ($index < $this->count()) {
-            $remaining_objects = $this->slice($index, $this->count() - $index);
-            foreach ($remaining_objects as $key => $remaining_object) {
-                // we need to grab the identifiers for each object and use them as keys
-                $remaining_objects[ $remaining_object->getInfo() ] = $remaining_object;
-                // and then remove the object from the current tracking array
-                unset($remaining_objects[ $key ]);
-                // and then remove it from the Collection
-                $this->detach($remaining_object);
-            }
-        }
-        // add the new object we're splicing in
-        $this->add($object, $identifier);
-        // attach the objects we previously detached
-        foreach ($remaining_objects as $key => $remaining_object) {
-            $this->add($remaining_object, $key);
-        }
-        return $this->contains($object);
-    }
-
-
-    /**
-     * Inserts an object (or an array of objects) at a certain point
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param mixed $objects A single object or an array of objects
-     * @param int   $index
-     */
-    public function insertAt($objects, $index)
-    {
-        if (! is_array($objects)) {
-            $objects = array($objects);
-        }
-        // check to ensure that objects don't already exist in the collection
-        foreach ($objects as $key => $object) {
-            if ($this->contains($object)) {
-                unset($objects[ $key ]);
-            }
-        }
-        // do we have any objects left?
-        if (! $objects) {
-            return;
-        }
-        // detach any objects at or past this index
-        $remaining = array();
-        if ($index < $this->count()) {
-            $remaining = $this->slice($index, $this->count() - $index);
-            foreach ($remaining as $object) {
-                $this->detach($object);
-            }
-        }
-        // add the new objects we're splicing in
-        foreach ($objects as $object) {
-            $this->attach($object);
-        }
-        // attach the objects we previously detached
-        foreach ($remaining as $object) {
-            $this->attach($object);
-        }
-    }
-
-
-    /**
-     * Removes the object at the given index
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param int $index
-     */
-    public function removeAt($index)
-    {
-        $this->detach($this->objectAtIndex($index));
-    }
-
-
-    /**
-     * detaches ALL objects from the Collection
-     */
-    public function detachAll()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $object = $this->current();
-            $this->next();
-            $this->detach($object);
-        }
-    }
-
-
-    /**
-     * unsets and detaches ALL objects from the Collection
-     */
-    public function trashAndDetachAll()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $object = $this->current();
-            $this->next();
-            $this->detach($object);
-            unset($object);
-        }
-    }
+	/**
+	 * a unique string for identifying this collection
+	 *
+	 * @type string $collection_identifier
+	 */
+	protected $collection_identifier;
+
+
+	/**
+	 * an interface (or class) name to be used for restricting the type of objects added to the storage
+	 * this should be set from within the child class constructor
+	 *
+	 * @type string $interface
+	 */
+	protected $collection_interface;
+
+	/**
+	 * a short dash separated string describing the contents of this collection
+	 * used as the base for the $collection_identifier
+	 * defaults to the class short name if not set
+	 *
+	 * @type string $collection_identifier
+	 */
+	protected $collection_name;
+
+
+	/**
+	 * Collection constructor
+	 *
+	 * @param string $collection_interface
+	 * @param string $collection_name
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct($collection_interface, $collection_name = '')
+	{
+		$this->setCollectionInterface($collection_interface);
+		$this->setCollectionName($collection_name);
+		$this->setCollectionIdentifier();
+	}
+
+
+	/**
+	 * @return string
+	 * @since 4.10.33.p
+	 */
+	public function collectionInterface(): string
+	{
+		return $this->collection_interface;
+	}
+
+
+	/**
+	 * setCollectionInterface
+	 *
+	 * @param  string $collection_interface
+	 * @throws InvalidInterfaceException
+	 */
+	protected function setCollectionInterface($collection_interface)
+	{
+		if (! (interface_exists($collection_interface) || class_exists($collection_interface))) {
+			throw new InvalidInterfaceException($collection_interface);
+		}
+		$this->collection_interface = $collection_interface;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function collectionName()
+	{
+		return $this->collection_name;
+	}
+
+
+	/**
+	 * @param string $collection_name
+	 */
+	protected function setCollectionName($collection_name)
+	{
+		$this->collection_name = ! empty($collection_name)
+			? sanitize_key($collection_name)
+			: basename(str_replace('\\', '/', get_class($this)));
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function collectionIdentifier()
+	{
+		return $this->collection_identifier;
+	}
+
+
+	/**
+	 * creates a very readable unique 9 character identifier like:  CF2-532-DAC
+	 * and appends it to the non-qualified class name, ex: ThingCollection-CF2-532-DAC
+	 *
+	 * @return void
+	 */
+	protected function setCollectionIdentifier()
+	{
+		// hash a few collection details
+		$identifier = md5(spl_object_hash($this) . $this->collection_interface . time());
+		// grab a few characters from the start, middle, and end of the hash
+		$id = array();
+		for ($x = 0; $x < 19; $x += 9) {
+			$id[] = substr($identifier, $x, 3);
+		}
+		$this->collection_identifier = $this->collection_name . '-' . strtoupper(implode('-', $id));
+	}
+
+
+	/**
+	 * add
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_identifier()
+	 *
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function add($object, $identifier = null)
+	{
+		if (! $object instanceof $this->collection_interface) {
+			throw new InvalidEntityException($object, $this->collection_interface);
+		}
+		if ($this->contains($object)) {
+			throw new DuplicateCollectionIdentifierException($identifier);
+		}
+		$this->attach($object);
+		$this->setIdentifier($object, $identifier);
+		return $this->contains($object);
+	}
+
+
+	/**
+	 * getIdentifier
+	 * if no $identifier is supplied, then the spl_object_hash() is used
+	 *
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function getIdentifier($object, $identifier = null)
+	{
+		return ! empty($identifier)
+			? $identifier
+			: spl_object_hash($object);
+	}
+
+
+	/**
+	 * setIdentifier
+	 * Sets the data associated with an object in the Collection
+	 * if no $identifier is supplied, then the spl_object_hash() is used
+	 *
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function setIdentifier($object, $identifier = null)
+	{
+		$identifier = $this->getIdentifier($object, $identifier);
+		$this->rewind();
+		while ($this->valid()) {
+			if ($object === $this->current()) {
+				$this->setInfo($identifier);
+				$this->rewind();
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * get
+	 * finds and returns an object in the Collection based on the identifier that was set using addObject()
+	 * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
+	 *
+	 * @param mixed $identifier
+	 * @return mixed
+	 */
+	public function get($identifier)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($identifier === $this->getInfo()) {
+				$object = $this->current();
+				$this->rewind();
+				return $object;
+			}
+			$this->next();
+		}
+		return null;
+	}
+
+
+	/**
+	 * has
+	 * returns TRUE or FALSE
+	 * depending on whether the object is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function has($identifier)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($identifier === $this->getInfo()) {
+				$this->rewind();
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * hasObject
+	 * returns TRUE or FALSE depending on whether the supplied object is within the Collection
+	 *
+	 * @param $object
+	 * @return bool
+	 */
+	public function hasObject($object)
+	{
+		return $this->contains($object);
+	}
+
+
+	/**
+	 * hasObjects
+	 * returns true if there are objects within the Collection, and false if it is empty
+	 *
+	 * @return bool
+	 */
+	public function hasObjects()
+	{
+		return $this->count() !== 0;
+	}
+
+
+	/**
+	 * isEmpty
+	 * returns true if there are no objects within the Collection, and false if there are
+	 *
+	 * @return bool
+	 */
+	public function isEmpty()
+	{
+		return $this->count() === 0;
+	}
+
+
+	/**
+	 * remove
+	 * detaches an object from the Collection
+	 *
+	 * @param $object
+	 * @return bool
+	 */
+	public function remove($object)
+	{
+		$this->detach($object);
+		return true;
+	}
+
+
+	/**
+	 * setCurrent
+	 * advances pointer to the object whose identifier matches that which was provided
+	 *
+	 * @param mixed $identifier
+	 * @return boolean
+	 */
+	public function setCurrent($identifier)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($identifier === $this->getInfo()) {
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * setCurrentUsingObject
+	 * advances pointer to the provided object
+	 *
+	 * @param $object
+	 * @return boolean
+	 */
+	public function setCurrentUsingObject($object)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->current() === $object) {
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * Returns the object occupying the index before the current object,
+	 * unless this is already the first object, in which case it just returns the first object
+	 *
+	 * @return mixed
+	 */
+	public function previous()
+	{
+		$index = $this->indexOf($this->current());
+		if ($index === 0) {
+			return $this->current();
+		}
+		$index--;
+		return $this->objectAtIndex($index);
+	}
+
+
+	/**
+	 * Returns the index of a given object, or false if not found
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param $object
+	 * @return boolean|int|string
+	 */
+	public function indexOf($object)
+	{
+		if (! $this->contains($object)) {
+			return false;
+		}
+		foreach ($this as $index => $obj) {
+			if ($obj === $object) {
+				return $index;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * Returns the object at the given index
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param int $index
+	 * @return mixed
+	 */
+	public function objectAtIndex($index)
+	{
+		$iterator = new LimitIterator($this, $index, 1);
+		$iterator->rewind();
+		return $iterator->current();
+	}
+
+
+	/**
+	 * Returns the sequence of objects as specified by the offset and length
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param int $offset
+	 * @param int $length
+	 * @return array
+	 */
+	public function slice($offset, $length)
+	{
+		$slice = array();
+		$iterator = new LimitIterator($this, $offset, $length);
+		foreach ($iterator as $object) {
+			$slice[] = $object;
+		}
+		return $slice;
+	}
+
+
+	/**
+	 * Inserts an object at a certain point
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param mixed $object A single object
+	 * @param int   $index
+	 * @param mixed $identifier
+	 * @return bool
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidEntityException
+	 */
+	public function insertObjectAt($object, $index, $identifier = null)
+	{
+		// check to ensure that objects don't already exist in the collection
+		if ($this->has($identifier)) {
+			throw new DuplicateCollectionIdentifierException($identifier);
+		}
+		// detach any objects at or past this index
+		$remaining_objects = array();
+		if ($index < $this->count()) {
+			$remaining_objects = $this->slice($index, $this->count() - $index);
+			foreach ($remaining_objects as $key => $remaining_object) {
+				// we need to grab the identifiers for each object and use them as keys
+				$remaining_objects[ $remaining_object->getInfo() ] = $remaining_object;
+				// and then remove the object from the current tracking array
+				unset($remaining_objects[ $key ]);
+				// and then remove it from the Collection
+				$this->detach($remaining_object);
+			}
+		}
+		// add the new object we're splicing in
+		$this->add($object, $identifier);
+		// attach the objects we previously detached
+		foreach ($remaining_objects as $key => $remaining_object) {
+			$this->add($remaining_object, $key);
+		}
+		return $this->contains($object);
+	}
+
+
+	/**
+	 * Inserts an object (or an array of objects) at a certain point
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param mixed $objects A single object or an array of objects
+	 * @param int   $index
+	 */
+	public function insertAt($objects, $index)
+	{
+		if (! is_array($objects)) {
+			$objects = array($objects);
+		}
+		// check to ensure that objects don't already exist in the collection
+		foreach ($objects as $key => $object) {
+			if ($this->contains($object)) {
+				unset($objects[ $key ]);
+			}
+		}
+		// do we have any objects left?
+		if (! $objects) {
+			return;
+		}
+		// detach any objects at or past this index
+		$remaining = array();
+		if ($index < $this->count()) {
+			$remaining = $this->slice($index, $this->count() - $index);
+			foreach ($remaining as $object) {
+				$this->detach($object);
+			}
+		}
+		// add the new objects we're splicing in
+		foreach ($objects as $object) {
+			$this->attach($object);
+		}
+		// attach the objects we previously detached
+		foreach ($remaining as $object) {
+			$this->attach($object);
+		}
+	}
+
+
+	/**
+	 * Removes the object at the given index
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param int $index
+	 */
+	public function removeAt($index)
+	{
+		$this->detach($this->objectAtIndex($index));
+	}
+
+
+	/**
+	 * detaches ALL objects from the Collection
+	 */
+	public function detachAll()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$object = $this->current();
+			$this->next();
+			$this->detach($object);
+		}
+	}
+
+
+	/**
+	 * unsets and detaches ALL objects from the Collection
+	 */
+	public function trashAndDetachAll()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$object = $this->current();
+			$this->next();
+			$this->detach($object);
+			unset($object);
+		}
+	}
 }