eventespresso / event-espresso-core

admin_pages/registrations/EE_Attendee_Contact_List_Table.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -303,7 +303,7 @@ 
      * ATT_address column
      *
      * @param EE_Attendee $attendee
-     * @return mixed
+     * @return string
      * @throws EE_Error
      */
     public function column_ATT_address(EE_Attendee $attendee)
@@ -316,7 +316,7 @@ 
      * ATT_city column
      *
      * @param EE_Attendee $attendee
-     * @return mixed
+     * @return string
      * @throws EE_Error
      */
     public function column_ATT_city(EE_Attendee $attendee)
@@ -369,7 +369,7 @@ 
      * Phone Number column
      *
      * @param EE_Attendee $attendee
-     * @return mixed
+     * @return string
      * @throws EE_Error
      */
     public function column_ATT_phone(EE_Attendee $attendee)

Indentation +370 added lines, -370 removed lines

@@ -12,374 +12,374 @@
  */
 class EE_Attendee_Contact_List_Table extends EE_Admin_List_Table
 {
-    /**
-     * Initial setup of data (called by parent).
-     */
-    protected function _setup_data()
-    {
-        $this->_data = $this->_view !== 'trash'
-            ? $this->_admin_page->get_attendees($this->_per_page)
-            : $this->_admin_page->get_attendees($this->_per_page, false, true);
-        $this->_all_data_count = $this->_view !== 'trash'
-            ? $this->_admin_page->get_attendees($this->_per_page, true)
-            : $this->_admin_page->get_attendees($this->_per_page, true, true);
-    }
-
-
-    /**
-     * Initial setup of properties.
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => esc_html__('attendee', 'event_espresso'),
-            'plural'   => esc_html__('attendees', 'event_espresso'),
-            'ajax'     => true,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'                 => '<input type="checkbox" />', // Render a checkbox instead of text
-            'ATT_ID'             => esc_html__('ID', 'event_espresso'),
-            'ATT_fname'          => esc_html__('First Name', 'event_espresso'),
-            'ATT_lname'          => esc_html__('Last Name', 'event_espresso'),
-            'ATT_email'          => esc_html__('Email Address', 'event_espresso'),
-            'Registration_Count' => esc_html__('# Registrations', 'event_espresso'),
-            'ATT_phone'          => esc_html__('Phone', 'event_espresso'),
-            'ATT_address'        => esc_html__('Address', 'event_espresso'),
-            'ATT_city'           => esc_html__('City', 'event_espresso'),
-            'STA_ID'             => esc_html__('State/Province', 'event_espresso'),
-            'CNT_ISO'            => esc_html__('Country', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'ATT_ID'             => array('ATT_ID' => false),
-            'ATT_lname'          => array('ATT_lname' => true), // true means its already sorted
-            'ATT_fname'          => array('ATT_fname' => false),
-            'ATT_email'          => array('ATT_email' => false),
-            'Registration_Count' => array('Registration_Count' => false),
-            'ATT_city'           => array('ATT_city' => false),
-            'STA_ID'             => array('STA_ID' => false),
-            'CNT_ISO'            => array('CNT_ISO' => false),
-        );
-
-        $this->_hidden_columns = array(
-            'ATT_phone',
-            'ATT_address',
-            'ATT_city',
-            'STA_ID',
-            'CNT_ISO',
-        );
-    }
-
-
-    /**
-     * Initial setup of filters
-     *
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        return array();
-    }
-
-
-    /**
-     * Initial setup of counts for views
-     *
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _add_view_counts()
-    {
-        $this->_views['in_use']['count'] = $this->_admin_page->get_attendees($this->_per_page, true);
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_delete_contacts',
-            'espresso_registrations_delete_registration'
-        )) {
-            $this->_views['trash']['count'] = $this->_admin_page->get_attendees($this->_per_page, true, true);
-        }
-    }
-
-
-    /**
-     * Get count of attendees.
-     *
-     * @return int
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _get_attendees_count()
-    {
-        return EEM_Attendee::instance()->count();
-    }
-
-
-    /**
-     * Checkbox column
-     *
-     * @param EE_Attendee $attendee Unable to typehint this method because overrides parent.
-     * @return string
-     * @throws EE_Error
-     */
-    public function column_cb($attendee)
-    {
-        if (! $attendee instanceof EE_Attendee) {
-            return '';
-        }
-        return sprintf(
-            '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />',
-            $attendee->ID()
-        );
-    }
-
-
-    /**
-     * ATT_ID column
-     *
-     * @param EE_Attendee $attendee
-     * @return string
-     * @throws EE_Error
-     */
-    public function column_ATT_ID(EE_Attendee $attendee)
-    {
-        $content = $attendee->ID();
-        $attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-        $content .= '  <span class="show-on-mobile-view-only">' . $attendee_name . '</span>';
-        return $content;
-    }
-
-
-    /**
-     * ATT_lname column
-     *
-     * @param EE_Attendee $attendee
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws EE_Error
-     */
-    public function column_ATT_lname(EE_Attendee $attendee)
-    {
-        // edit attendee link
-        $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'edit_attendee',
-                'post'   => $attendee->ID(),
-            ),
-            REG_ADMIN_URL
-        );
-        $name_link = EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_contacts',
-            'espresso_registrations_edit_attendee'
-        )
-            ? '<a href="' . $edit_lnk_url . '" title="'
-              . esc_attr__('Edit Contact', 'event_espresso') . '">'
-              . $attendee->lname() . '</a>'
-            : $attendee->lname();
-        return $name_link;
-    }
-
-
-    /**
-     * ATT_fname column
-     *
-     * @param EE_Attendee $attendee
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws EE_Error
-     */
-    public function column_ATT_fname(EE_Attendee $attendee)
-    {
-        // Build row actions
-        $actions = array();
-        // edit attendee link
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_contacts',
-            'espresso_registrations_edit_attendee'
-        )) {
-            $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action' => 'edit_attendee',
-                    'post'   => $attendee->ID(),
-                ),
-                REG_ADMIN_URL
-            );
-            $actions['edit'] = '<a href="' . $edit_lnk_url . '" title="'
-                               . esc_attr__('Edit Contact', 'event_espresso') . '">'
-                               . esc_html__('Edit', 'event_espresso') . '</a>';
-        }
-
-        if ($this->_view === 'in_use') {
-            // trash attendee link
-            if (EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_contacts',
-                'espresso_registrations_trash_attendees'
-            )) {
-                $trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                    array(
-                        'action' => 'trash_attendee',
-                        'ATT_ID' => $attendee->ID(),
-                    ),
-                    REG_ADMIN_URL
-                );
-                $actions['trash'] = '<a href="' . $trash_lnk_url . '" title="'
-                                    . esc_attr__('Move Contact to Trash', 'event_espresso')
-                                    . '">' . esc_html__('Trash', 'event_espresso') . '</a>';
-            }
-        } else {
-            if (EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_contacts',
-                'espresso_registrations_restore_attendees'
-            )) {
-                // restore attendee link
-                $restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                    array(
-                        'action' => 'restore_attendees',
-                        'ATT_ID' => $attendee->ID(),
-                    ),
-                    REG_ADMIN_URL
-                );
-                $actions['restore'] = '<a href="' . $restore_lnk_url . '" title="'
-                                      . esc_attr__('Restore Contact', 'event_espresso') . '">'
-                                      . esc_html__('Restore', 'event_espresso') . '</a>';
-            }
-        }
-
-        $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-            array(
-                'action' => 'edit_attendee',
-                'post'   => $attendee->ID(),
-            ),
-            REG_ADMIN_URL
-        );
-        $name_link = EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_contacts',
-            'espresso_registrations_edit_attendee'
-        )
-            ? '<a href="' . $edit_lnk_url . '" title="'
-              . esc_attr__('Edit Contact', 'event_espresso') . '">' . $attendee->fname() . '</a>'
-            : $attendee->fname();
-
-        // Return the name contents
-        return sprintf('%1$s %2$s', $name_link, $this->row_actions($actions));
-    }
-
-
-    /**
-     * Email Column
-     *
-     * @param EE_Attendee $attendee
-     * @return string
-     * @throws EE_Error
-     */
-    public function column_ATT_email(EE_Attendee $attendee)
-    {
-        return '<a href="mailto:' . $attendee->email() . '">' . $attendee->email() . '</a>';
-    }
-
-
-    /**
-     * Column displaying count of registrations attached to Attendee.
-     *
-     * @param EE_Attendee $attendee
-     * @return string
-     * @throws EE_Error
-     */
-    public function column_Registration_Count(EE_Attendee $attendee)
-    {
-        $link = EEH_URL::add_query_args_and_nonce(
-            array(
-                'action' => 'default',
-                'ATT_ID' => $attendee->ID(),
-            ),
-            REG_ADMIN_URL
-        );
-        return '<a href="' . $link . '">' . $attendee->getCustomSelect('Registration_Count') . '</a>';
-    }
-
-
-    /**
-     * ATT_address column
-     *
-     * @param EE_Attendee $attendee
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function column_ATT_address(EE_Attendee $attendee)
-    {
-        return $attendee->address();
-    }
-
-
-    /**
-     * ATT_city column
-     *
-     * @param EE_Attendee $attendee
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function column_ATT_city(EE_Attendee $attendee)
-    {
-        return $attendee->city();
-    }
-
-
-    /**
-     * State Column
-     *
-     * @param EE_Attendee $attendee
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function column_STA_ID(EE_Attendee $attendee)
-    {
-        $states = EEM_State::instance()->get_all_states();
-        $state = isset($states[ $attendee->state_ID() ])
-            ? $states[ $attendee->state_ID() ]->get('STA_name')
-            : $attendee->state_ID();
-        return ! is_numeric($state) ? $state : '';
-    }
-
-
-    /**
-     * Country Column
-     *
-     * @param EE_Attendee $attendee
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function column_CNT_ISO(EE_Attendee $attendee)
-    {
-        $countries = EEM_Country::instance()->get_all_countries();
-        $country = isset($countries[ $attendee->country_ID() ])
-            ? $countries[ $attendee->country_ID() ]->get('CNT_name')
-            : $attendee->country_ID();
-        return ! is_numeric($country) ? $country : '';
-    }
-
-
-    /**
-     * Phone Number column
-     *
-     * @param EE_Attendee $attendee
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function column_ATT_phone(EE_Attendee $attendee)
-    {
-        return $attendee->phone();
-    }
+	/**
+	 * Initial setup of data (called by parent).
+	 */
+	protected function _setup_data()
+	{
+		$this->_data = $this->_view !== 'trash'
+			? $this->_admin_page->get_attendees($this->_per_page)
+			: $this->_admin_page->get_attendees($this->_per_page, false, true);
+		$this->_all_data_count = $this->_view !== 'trash'
+			? $this->_admin_page->get_attendees($this->_per_page, true)
+			: $this->_admin_page->get_attendees($this->_per_page, true, true);
+	}
+
+
+	/**
+	 * Initial setup of properties.
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => esc_html__('attendee', 'event_espresso'),
+			'plural'   => esc_html__('attendees', 'event_espresso'),
+			'ajax'     => true,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'                 => '<input type="checkbox" />', // Render a checkbox instead of text
+			'ATT_ID'             => esc_html__('ID', 'event_espresso'),
+			'ATT_fname'          => esc_html__('First Name', 'event_espresso'),
+			'ATT_lname'          => esc_html__('Last Name', 'event_espresso'),
+			'ATT_email'          => esc_html__('Email Address', 'event_espresso'),
+			'Registration_Count' => esc_html__('# Registrations', 'event_espresso'),
+			'ATT_phone'          => esc_html__('Phone', 'event_espresso'),
+			'ATT_address'        => esc_html__('Address', 'event_espresso'),
+			'ATT_city'           => esc_html__('City', 'event_espresso'),
+			'STA_ID'             => esc_html__('State/Province', 'event_espresso'),
+			'CNT_ISO'            => esc_html__('Country', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'ATT_ID'             => array('ATT_ID' => false),
+			'ATT_lname'          => array('ATT_lname' => true), // true means its already sorted
+			'ATT_fname'          => array('ATT_fname' => false),
+			'ATT_email'          => array('ATT_email' => false),
+			'Registration_Count' => array('Registration_Count' => false),
+			'ATT_city'           => array('ATT_city' => false),
+			'STA_ID'             => array('STA_ID' => false),
+			'CNT_ISO'            => array('CNT_ISO' => false),
+		);
+
+		$this->_hidden_columns = array(
+			'ATT_phone',
+			'ATT_address',
+			'ATT_city',
+			'STA_ID',
+			'CNT_ISO',
+		);
+	}
+
+
+	/**
+	 * Initial setup of filters
+	 *
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		return array();
+	}
+
+
+	/**
+	 * Initial setup of counts for views
+	 *
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _add_view_counts()
+	{
+		$this->_views['in_use']['count'] = $this->_admin_page->get_attendees($this->_per_page, true);
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_delete_contacts',
+			'espresso_registrations_delete_registration'
+		)) {
+			$this->_views['trash']['count'] = $this->_admin_page->get_attendees($this->_per_page, true, true);
+		}
+	}
+
+
+	/**
+	 * Get count of attendees.
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _get_attendees_count()
+	{
+		return EEM_Attendee::instance()->count();
+	}
+
+
+	/**
+	 * Checkbox column
+	 *
+	 * @param EE_Attendee $attendee Unable to typehint this method because overrides parent.
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column_cb($attendee)
+	{
+		if (! $attendee instanceof EE_Attendee) {
+			return '';
+		}
+		return sprintf(
+			'<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />',
+			$attendee->ID()
+		);
+	}
+
+
+	/**
+	 * ATT_ID column
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column_ATT_ID(EE_Attendee $attendee)
+	{
+		$content = $attendee->ID();
+		$attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
+		$content .= '  <span class="show-on-mobile-view-only">' . $attendee_name . '</span>';
+		return $content;
+	}
+
+
+	/**
+	 * ATT_lname column
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws EE_Error
+	 */
+	public function column_ATT_lname(EE_Attendee $attendee)
+	{
+		// edit attendee link
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'edit_attendee',
+				'post'   => $attendee->ID(),
+			),
+			REG_ADMIN_URL
+		);
+		$name_link = EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_contacts',
+			'espresso_registrations_edit_attendee'
+		)
+			? '<a href="' . $edit_lnk_url . '" title="'
+			  . esc_attr__('Edit Contact', 'event_espresso') . '">'
+			  . $attendee->lname() . '</a>'
+			: $attendee->lname();
+		return $name_link;
+	}
+
+
+	/**
+	 * ATT_fname column
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws EE_Error
+	 */
+	public function column_ATT_fname(EE_Attendee $attendee)
+	{
+		// Build row actions
+		$actions = array();
+		// edit attendee link
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_contacts',
+			'espresso_registrations_edit_attendee'
+		)) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action' => 'edit_attendee',
+					'post'   => $attendee->ID(),
+				),
+				REG_ADMIN_URL
+			);
+			$actions['edit'] = '<a href="' . $edit_lnk_url . '" title="'
+							   . esc_attr__('Edit Contact', 'event_espresso') . '">'
+							   . esc_html__('Edit', 'event_espresso') . '</a>';
+		}
+
+		if ($this->_view === 'in_use') {
+			// trash attendee link
+			if (EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_contacts',
+				'espresso_registrations_trash_attendees'
+			)) {
+				$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+					array(
+						'action' => 'trash_attendee',
+						'ATT_ID' => $attendee->ID(),
+					),
+					REG_ADMIN_URL
+				);
+				$actions['trash'] = '<a href="' . $trash_lnk_url . '" title="'
+									. esc_attr__('Move Contact to Trash', 'event_espresso')
+									. '">' . esc_html__('Trash', 'event_espresso') . '</a>';
+			}
+		} else {
+			if (EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_contacts',
+				'espresso_registrations_restore_attendees'
+			)) {
+				// restore attendee link
+				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+					array(
+						'action' => 'restore_attendees',
+						'ATT_ID' => $attendee->ID(),
+					),
+					REG_ADMIN_URL
+				);
+				$actions['restore'] = '<a href="' . $restore_lnk_url . '" title="'
+									  . esc_attr__('Restore Contact', 'event_espresso') . '">'
+									  . esc_html__('Restore', 'event_espresso') . '</a>';
+			}
+		}
+
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+			array(
+				'action' => 'edit_attendee',
+				'post'   => $attendee->ID(),
+			),
+			REG_ADMIN_URL
+		);
+		$name_link = EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_contacts',
+			'espresso_registrations_edit_attendee'
+		)
+			? '<a href="' . $edit_lnk_url . '" title="'
+			  . esc_attr__('Edit Contact', 'event_espresso') . '">' . $attendee->fname() . '</a>'
+			: $attendee->fname();
+
+		// Return the name contents
+		return sprintf('%1$s %2$s', $name_link, $this->row_actions($actions));
+	}
+
+
+	/**
+	 * Email Column
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column_ATT_email(EE_Attendee $attendee)
+	{
+		return '<a href="mailto:' . $attendee->email() . '">' . $attendee->email() . '</a>';
+	}
+
+
+	/**
+	 * Column displaying count of registrations attached to Attendee.
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column_Registration_Count(EE_Attendee $attendee)
+	{
+		$link = EEH_URL::add_query_args_and_nonce(
+			array(
+				'action' => 'default',
+				'ATT_ID' => $attendee->ID(),
+			),
+			REG_ADMIN_URL
+		);
+		return '<a href="' . $link . '">' . $attendee->getCustomSelect('Registration_Count') . '</a>';
+	}
+
+
+	/**
+	 * ATT_address column
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function column_ATT_address(EE_Attendee $attendee)
+	{
+		return $attendee->address();
+	}
+
+
+	/**
+	 * ATT_city column
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function column_ATT_city(EE_Attendee $attendee)
+	{
+		return $attendee->city();
+	}
+
+
+	/**
+	 * State Column
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function column_STA_ID(EE_Attendee $attendee)
+	{
+		$states = EEM_State::instance()->get_all_states();
+		$state = isset($states[ $attendee->state_ID() ])
+			? $states[ $attendee->state_ID() ]->get('STA_name')
+			: $attendee->state_ID();
+		return ! is_numeric($state) ? $state : '';
+	}
+
+
+	/**
+	 * Country Column
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function column_CNT_ISO(EE_Attendee $attendee)
+	{
+		$countries = EEM_Country::instance()->get_all_countries();
+		$country = isset($countries[ $attendee->country_ID() ])
+			? $countries[ $attendee->country_ID() ]->get('CNT_name')
+			: $attendee->country_ID();
+		return ! is_numeric($country) ? $country : '';
+	}
+
+
+	/**
+	 * Phone Number column
+	 *
+	 * @param EE_Attendee $attendee
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function column_ATT_phone(EE_Attendee $attendee)
+	{
+		return $attendee->phone();
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -127,7 +127,7 @@ 
      */
     public function column_cb($attendee)
     {
-        if (! $attendee instanceof EE_Attendee) {
+        if ( ! $attendee instanceof EE_Attendee) {
             return '';
         }
         return sprintf(
@@ -148,7 +148,7 @@ 
     {
         $content = $attendee->ID();
         $attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-        $content .= '  <span class="show-on-mobile-view-only">' . $attendee_name . '</span>';
+        $content .= '  <span class="show-on-mobile-view-only">'.$attendee_name.'</span>';
         return $content;
     }
 
@@ -177,9 +177,9 @@ 
             'ee_edit_contacts',
             'espresso_registrations_edit_attendee'
         )
-            ? '<a href="' . $edit_lnk_url . '" title="'
-              . esc_attr__('Edit Contact', 'event_espresso') . '">'
-              . $attendee->lname() . '</a>'
+            ? '<a href="'.$edit_lnk_url.'" title="'
+              . esc_attr__('Edit Contact', 'event_espresso').'">'
+              . $attendee->lname().'</a>'
             : $attendee->lname();
         return $name_link;
     }
@@ -211,9 +211,9 @@ 
                 ),
                 REG_ADMIN_URL
             );
-            $actions['edit'] = '<a href="' . $edit_lnk_url . '" title="'
-                               . esc_attr__('Edit Contact', 'event_espresso') . '">'
-                               . esc_html__('Edit', 'event_espresso') . '</a>';
+            $actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'
+                               . esc_attr__('Edit Contact', 'event_espresso').'">'
+                               . esc_html__('Edit', 'event_espresso').'</a>';
         }
 
         if ($this->_view === 'in_use') {
@@ -229,9 +229,9 @@ 
                     ),
                     REG_ADMIN_URL
                 );
-                $actions['trash'] = '<a href="' . $trash_lnk_url . '" title="'
+                $actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'
                                     . esc_attr__('Move Contact to Trash', 'event_espresso')
-                                    . '">' . esc_html__('Trash', 'event_espresso') . '</a>';
+                                    . '">'.esc_html__('Trash', 'event_espresso').'</a>';
             }
         } else {
             if (EE_Registry::instance()->CAP->current_user_can(
@@ -246,9 +246,9 @@ 
                     ),
                     REG_ADMIN_URL
                 );
-                $actions['restore'] = '<a href="' . $restore_lnk_url . '" title="'
-                                      . esc_attr__('Restore Contact', 'event_espresso') . '">'
-                                      . esc_html__('Restore', 'event_espresso') . '</a>';
+                $actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'
+                                      . esc_attr__('Restore Contact', 'event_espresso').'">'
+                                      . esc_html__('Restore', 'event_espresso').'</a>';
             }
         }
 
@@ -263,8 +263,8 @@ 
             'ee_edit_contacts',
             'espresso_registrations_edit_attendee'
         )
-            ? '<a href="' . $edit_lnk_url . '" title="'
-              . esc_attr__('Edit Contact', 'event_espresso') . '">' . $attendee->fname() . '</a>'
+            ? '<a href="'.$edit_lnk_url.'" title="'
+              . esc_attr__('Edit Contact', 'event_espresso').'">'.$attendee->fname().'</a>'
             : $attendee->fname();
 
         // Return the name contents
@@ -281,7 +281,7 @@ 
      */
     public function column_ATT_email(EE_Attendee $attendee)
     {
-        return '<a href="mailto:' . $attendee->email() . '">' . $attendee->email() . '</a>';
+        return '<a href="mailto:'.$attendee->email().'">'.$attendee->email().'</a>';
     }
 
 
@@ -301,7 +301,7 @@ 
             ),
             REG_ADMIN_URL
         );
-        return '<a href="' . $link . '">' . $attendee->getCustomSelect('Registration_Count') . '</a>';
+        return '<a href="'.$link.'">'.$attendee->getCustomSelect('Registration_Count').'</a>';
     }
 
 
@@ -344,8 +344,8 @@ 
     public function column_STA_ID(EE_Attendee $attendee)
     {
         $states = EEM_State::instance()->get_all_states();
-        $state = isset($states[ $attendee->state_ID() ])
-            ? $states[ $attendee->state_ID() ]->get('STA_name')
+        $state = isset($states[$attendee->state_ID()])
+            ? $states[$attendee->state_ID()]->get('STA_name')
             : $attendee->state_ID();
         return ! is_numeric($state) ? $state : '';
     }
@@ -364,8 +364,8 @@ 
     public function column_CNT_ISO(EE_Attendee $attendee)
     {
         $countries = EEM_Country::instance()->get_all_countries();
-        $country = isset($countries[ $attendee->country_ID() ])
-            ? $countries[ $attendee->country_ID() ]->get('CNT_name')
+        $country = isset($countries[$attendee->country_ID()])
+            ? $countries[$attendee->country_ID()]->get('CNT_name')
             : $attendee->country_ID();
         return ! is_numeric($country) ? $country : '';
     }

core/domain/services/factories/ModelFactory.php

Indentation +13 added lines, -13 removed lines

@@ -25,17 +25,17 @@
 class ModelFactory
 {
 
-    /**
-     * @param string $model_name
-     * @return bool|EEM_Base
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public static function getModel($model_name)
-    {
-        return EE_Registry::instance()->load_model($model_name);
-    }
+	/**
+	 * @param string $model_name
+	 * @return bool|EEM_Base
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public static function getModel($model_name)
+	{
+		return EE_Registry::instance()->load_model($model_name);
+	}
 }

modules/ticket_selector/TicketDatetimeAvailabilityTracker.php

Spacing +13 added lines, -13 removed lines

@@ -66,24 +66,24 @@ 
     public function ticketDatetimeAvailability(EE_Ticket $ticket, $get_original_ticket_spaces = false)
     {
         // if the $_available_spaces array has not been set up yet...
-        if (! isset($this->available_spaces['tickets'][ $ticket->ID() ])) {
+        if ( ! isset($this->available_spaces['tickets'][$ticket->ID()])) {
             $this->setInitialTicketDatetimeAvailability($ticket);
         }
         $available_spaces = $ticket->qty() - $ticket->sold();
-        if (isset($this->available_spaces['tickets'][ $ticket->ID() ])) {
+        if (isset($this->available_spaces['tickets'][$ticket->ID()])) {
             // loop thru tickets, which will ALSO include individual ticket records AND a total
-            foreach ($this->available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces) {
+            foreach ($this->available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
                 // if we want the original datetime availability BEFORE we started subtracting tickets ?
                 if ($get_original_ticket_spaces) {
                     // then grab the available spaces from the "tickets" array
                     // and compare with the above to get the lowest number
                     $available_spaces = min(
                         $available_spaces,
-                        $this->available_spaces['tickets'][ $ticket->ID() ][ $DTD_ID ]
+                        $this->available_spaces['tickets'][$ticket->ID()][$DTD_ID]
                     );
                 } else {
                     // we want the updated ticket availability as stored in the "datetimes" array
-                    $available_spaces = min($available_spaces, $this->available_spaces['datetimes'][ $DTD_ID ]);
+                    $available_spaces = min($available_spaces, $this->available_spaces['datetimes'][$DTD_ID]);
                 }
             }
         }
@@ -114,7 +114,7 @@ 
                 'order_by' => array('DTT_EVT_start' => 'ASC'),
             )
         );
-        if (! empty($datetimes)) {
+        if ( ! empty($datetimes)) {
             // now loop thru all of the datetimes
             foreach ($datetimes as $datetime) {
                 if ($datetime instanceof EE_Datetime) {
@@ -122,17 +122,17 @@ 
                     $spaces_remaining = $datetime->spaces_remaining();
                     // save the total available spaces ( the lesser of the ticket qty minus the number of tickets sold
                     // or the datetime spaces remaining) to this ticket using the datetime ID as the key
-                    $this->available_spaces['tickets'][ $ticket->ID() ][ $datetime->ID() ] = min(
+                    $this->available_spaces['tickets'][$ticket->ID()][$datetime->ID()] = min(
                         $ticket->qty() - $ticket->sold(),
                         $spaces_remaining
                     );
                     // if the remaining spaces for this datetime is already set,
                     // then compare that against the datetime spaces remaining, and take the lowest number,
                     // else just take the datetime spaces remaining, and assign to the datetimes array
-                    $this->available_spaces['datetimes'][ $datetime->ID() ] = isset(
-                        $this->available_spaces['datetimes'][ $datetime->ID() ]
+                    $this->available_spaces['datetimes'][$datetime->ID()] = isset(
+                        $this->available_spaces['datetimes'][$datetime->ID()]
                     )
-                        ? min($this->available_spaces['datetimes'][ $datetime->ID() ], $spaces_remaining)
+                        ? min($this->available_spaces['datetimes'][$datetime->ID()], $spaces_remaining)
                         : $spaces_remaining;
                 }
             }
@@ -148,11 +148,11 @@ 
      */
     public function recalculateTicketDatetimeAvailability(EE_Ticket $ticket, $qty = 0)
     {
-        if (isset($this->available_spaces['tickets'][ $ticket->ID() ])) {
+        if (isset($this->available_spaces['tickets'][$ticket->ID()])) {
             // loop thru tickets, which will ALSO include individual ticket records AND a total
-            foreach ($this->available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces) {
+            foreach ($this->available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
                 // subtract the qty of selected tickets from each datetime's available spaces this ticket has access to,
-                $this->available_spaces['datetimes'][ $DTD_ID ] -= $qty;
+                $this->available_spaces['datetimes'][$DTD_ID] -= $qty;
             }
         }
     }

Indentation +211 added lines, -211 removed lines

@@ -22,215 +22,215 @@
 class TicketDatetimeAvailabilityTracker
 {
 
-    /**
-     * array of datetimes and the spaces available for them
-     *
-     * @var array[][]
-     */
-    private $available_spaces = array();
-
-    /**
-     * @var EEM_Datetime $datetime_model
-     */
-    private $datetime_model;
-
-
-    /**
-     * TicketDatetimeAvailabilityTracker constructor.
-     *
-     * @param EEM_Datetime $datetime_model
-     */
-    public function __construct(EEM_Datetime $datetime_model)
-    {
-        $this->datetime_model = $datetime_model;
-    }
-
-
-    /**
-     * ticketDatetimeAvailability
-     * creates an array of tickets plus all of the datetimes available to each ticket
-     * and tracks the spaces remaining for each of those datetimes
-     *
-     * @param EE_Ticket $ticket - selected ticket
-     * @param bool      $get_original_ticket_spaces
-     * @return int
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function ticketDatetimeAvailability(EE_Ticket $ticket, $get_original_ticket_spaces = false)
-    {
-        // if the $_available_spaces array has not been set up yet...
-        if (! isset($this->available_spaces['tickets'][ $ticket->ID() ])) {
-            $this->setInitialTicketDatetimeAvailability($ticket);
-        }
-        $available_spaces = $ticket->qty() - $ticket->sold();
-        if (isset($this->available_spaces['tickets'][ $ticket->ID() ])) {
-            // loop thru tickets, which will ALSO include individual ticket records AND a total
-            foreach ($this->available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces) {
-                // if we want the original datetime availability BEFORE we started subtracting tickets ?
-                if ($get_original_ticket_spaces) {
-                    // then grab the available spaces from the "tickets" array
-                    // and compare with the above to get the lowest number
-                    $available_spaces = min(
-                        $available_spaces,
-                        $this->available_spaces['tickets'][ $ticket->ID() ][ $DTD_ID ]
-                    );
-                } else {
-                    // we want the updated ticket availability as stored in the "datetimes" array
-                    $available_spaces = min($available_spaces, $this->available_spaces['datetimes'][ $DTD_ID ]);
-                }
-            }
-        }
-        return $available_spaces;
-    }
-
-
-    /**
-     * @param EE_Ticket $ticket
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     */
-    private function setInitialTicketDatetimeAvailability(EE_Ticket $ticket)
-    {
-        // first, get all of the datetimes that are available to this ticket
-        $datetimes = $ticket->get_many_related(
-            'Datetime',
-            array(
-                array(
-                    'DTT_EVT_end' => array(
-                        '>=',
-                        $this->datetime_model->current_time_for_query('DTT_EVT_end'),
-                    ),
-                ),
-                'order_by' => array('DTT_EVT_start' => 'ASC'),
-            )
-        );
-        if (! empty($datetimes)) {
-            // now loop thru all of the datetimes
-            foreach ($datetimes as $datetime) {
-                if ($datetime instanceof EE_Datetime) {
-                    // the number of spaces available for the datetime without considering individual ticket quantities
-                    $spaces_remaining = $datetime->spaces_remaining();
-                    // save the total available spaces ( the lesser of the ticket qty minus the number of tickets sold
-                    // or the datetime spaces remaining) to this ticket using the datetime ID as the key
-                    $this->available_spaces['tickets'][ $ticket->ID() ][ $datetime->ID() ] = min(
-                        $ticket->qty() - $ticket->sold(),
-                        $spaces_remaining
-                    );
-                    // if the remaining spaces for this datetime is already set,
-                    // then compare that against the datetime spaces remaining, and take the lowest number,
-                    // else just take the datetime spaces remaining, and assign to the datetimes array
-                    $this->available_spaces['datetimes'][ $datetime->ID() ] = isset(
-                        $this->available_spaces['datetimes'][ $datetime->ID() ]
-                    )
-                        ? min($this->available_spaces['datetimes'][ $datetime->ID() ], $spaces_remaining)
-                        : $spaces_remaining;
-                }
-            }
-        }
-    }
-
-
-    /**
-     * @param    EE_Ticket $ticket
-     * @param    int       $qty
-     * @return    void
-     * @throws EE_Error
-     */
-    public function recalculateTicketDatetimeAvailability(EE_Ticket $ticket, $qty = 0)
-    {
-        if (isset($this->available_spaces['tickets'][ $ticket->ID() ])) {
-            // loop thru tickets, which will ALSO include individual ticket records AND a total
-            foreach ($this->available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces) {
-                // subtract the qty of selected tickets from each datetime's available spaces this ticket has access to,
-                $this->available_spaces['datetimes'][ $DTD_ID ] -= $qty;
-            }
-        }
-    }
-
-
-    /**
-     * @param EE_Ticket $ticket
-     * @param           $qty
-     * @param int       $total_ticket_count
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function processAvailabilityError(EE_Ticket $ticket, $qty, $total_ticket_count = 1)
-    {
-        // tickets can not be purchased but let's find the exact number left
-        // for the last ticket selected PRIOR to subtracting tickets
-        $available_spaces = $this->ticketDatetimeAvailability($ticket, true);
-        // greedy greedy greedy eh?
-        if ($available_spaces > 0) {
-            if (apply_filters(
-                'FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_display_availability_error',
-                true,
-                $ticket,
-                $qty,
-                $available_spaces
-            )) {
-                $this->availabilityError(
-                    $available_spaces,
-                    $total_ticket_count
-                );
-            }
-        } else {
-            EE_Error::add_error(
-                esc_html__(
-                    'We\'re sorry, but there are no available spaces left for this event at this particular date and time.',
-                    'event_espresso'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-    }
-
-
-    /**
-     * @param int $available_spaces
-     * @param int $total_ticket_count
-     */
-    private function availabilityError($available_spaces = 1, $total_ticket_count = 1)
-    {
-        // add error messaging - we're using the _n function that will generate
-        // the appropriate singular or plural message based on the number of $available_spaces
-        if ($total_ticket_count) {
-            $msg = sprintf(
-                esc_html(
-                    _n(
-                        'We\'re sorry, but there is only %1$s available space left for this event at this particular date and time. Please select a different number (or different combination) of tickets by cancelling the current selection and choosing again, or proceed to registration.',
-                        'We\'re sorry, but there are only %1$s available spaces left for this event at this particular date and time. Please select a different number (or different combination) of tickets by cancelling the current selection and choosing again, or proceed to registration.',
-                        $available_spaces,
-                        'event_espresso'
-                    )
-                ),
-                $available_spaces,
-                '<br />'
-            );
-        } else {
-            $msg = sprintf(
-                esc_html(
-                    _n(
-                        'We\'re sorry, but there is only %1$s available space left for this event at this particular date and time. Please select a different number (or different combination) of tickets.',
-                        'We\'re sorry, but there are only %1$s available spaces left for this event at this particular date and time. Please select a different number (or different combination) of tickets.',
-                        $available_spaces,
-                        'event_espresso'
-                    )
-                ),
-                $available_spaces,
-                '<br />'
-            );
-        }
-        EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-    }
+	/**
+	 * array of datetimes and the spaces available for them
+	 *
+	 * @var array[][]
+	 */
+	private $available_spaces = array();
+
+	/**
+	 * @var EEM_Datetime $datetime_model
+	 */
+	private $datetime_model;
+
+
+	/**
+	 * TicketDatetimeAvailabilityTracker constructor.
+	 *
+	 * @param EEM_Datetime $datetime_model
+	 */
+	public function __construct(EEM_Datetime $datetime_model)
+	{
+		$this->datetime_model = $datetime_model;
+	}
+
+
+	/**
+	 * ticketDatetimeAvailability
+	 * creates an array of tickets plus all of the datetimes available to each ticket
+	 * and tracks the spaces remaining for each of those datetimes
+	 *
+	 * @param EE_Ticket $ticket - selected ticket
+	 * @param bool      $get_original_ticket_spaces
+	 * @return int
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function ticketDatetimeAvailability(EE_Ticket $ticket, $get_original_ticket_spaces = false)
+	{
+		// if the $_available_spaces array has not been set up yet...
+		if (! isset($this->available_spaces['tickets'][ $ticket->ID() ])) {
+			$this->setInitialTicketDatetimeAvailability($ticket);
+		}
+		$available_spaces = $ticket->qty() - $ticket->sold();
+		if (isset($this->available_spaces['tickets'][ $ticket->ID() ])) {
+			// loop thru tickets, which will ALSO include individual ticket records AND a total
+			foreach ($this->available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces) {
+				// if we want the original datetime availability BEFORE we started subtracting tickets ?
+				if ($get_original_ticket_spaces) {
+					// then grab the available spaces from the "tickets" array
+					// and compare with the above to get the lowest number
+					$available_spaces = min(
+						$available_spaces,
+						$this->available_spaces['tickets'][ $ticket->ID() ][ $DTD_ID ]
+					);
+				} else {
+					// we want the updated ticket availability as stored in the "datetimes" array
+					$available_spaces = min($available_spaces, $this->available_spaces['datetimes'][ $DTD_ID ]);
+				}
+			}
+		}
+		return $available_spaces;
+	}
+
+
+	/**
+	 * @param EE_Ticket $ticket
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 */
+	private function setInitialTicketDatetimeAvailability(EE_Ticket $ticket)
+	{
+		// first, get all of the datetimes that are available to this ticket
+		$datetimes = $ticket->get_many_related(
+			'Datetime',
+			array(
+				array(
+					'DTT_EVT_end' => array(
+						'>=',
+						$this->datetime_model->current_time_for_query('DTT_EVT_end'),
+					),
+				),
+				'order_by' => array('DTT_EVT_start' => 'ASC'),
+			)
+		);
+		if (! empty($datetimes)) {
+			// now loop thru all of the datetimes
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					// the number of spaces available for the datetime without considering individual ticket quantities
+					$spaces_remaining = $datetime->spaces_remaining();
+					// save the total available spaces ( the lesser of the ticket qty minus the number of tickets sold
+					// or the datetime spaces remaining) to this ticket using the datetime ID as the key
+					$this->available_spaces['tickets'][ $ticket->ID() ][ $datetime->ID() ] = min(
+						$ticket->qty() - $ticket->sold(),
+						$spaces_remaining
+					);
+					// if the remaining spaces for this datetime is already set,
+					// then compare that against the datetime spaces remaining, and take the lowest number,
+					// else just take the datetime spaces remaining, and assign to the datetimes array
+					$this->available_spaces['datetimes'][ $datetime->ID() ] = isset(
+						$this->available_spaces['datetimes'][ $datetime->ID() ]
+					)
+						? min($this->available_spaces['datetimes'][ $datetime->ID() ], $spaces_remaining)
+						: $spaces_remaining;
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * @param    EE_Ticket $ticket
+	 * @param    int       $qty
+	 * @return    void
+	 * @throws EE_Error
+	 */
+	public function recalculateTicketDatetimeAvailability(EE_Ticket $ticket, $qty = 0)
+	{
+		if (isset($this->available_spaces['tickets'][ $ticket->ID() ])) {
+			// loop thru tickets, which will ALSO include individual ticket records AND a total
+			foreach ($this->available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces) {
+				// subtract the qty of selected tickets from each datetime's available spaces this ticket has access to,
+				$this->available_spaces['datetimes'][ $DTD_ID ] -= $qty;
+			}
+		}
+	}
+
+
+	/**
+	 * @param EE_Ticket $ticket
+	 * @param           $qty
+	 * @param int       $total_ticket_count
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function processAvailabilityError(EE_Ticket $ticket, $qty, $total_ticket_count = 1)
+	{
+		// tickets can not be purchased but let's find the exact number left
+		// for the last ticket selected PRIOR to subtracting tickets
+		$available_spaces = $this->ticketDatetimeAvailability($ticket, true);
+		// greedy greedy greedy eh?
+		if ($available_spaces > 0) {
+			if (apply_filters(
+				'FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_display_availability_error',
+				true,
+				$ticket,
+				$qty,
+				$available_spaces
+			)) {
+				$this->availabilityError(
+					$available_spaces,
+					$total_ticket_count
+				);
+			}
+		} else {
+			EE_Error::add_error(
+				esc_html__(
+					'We\'re sorry, but there are no available spaces left for this event at this particular date and time.',
+					'event_espresso'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+	}
+
+
+	/**
+	 * @param int $available_spaces
+	 * @param int $total_ticket_count
+	 */
+	private function availabilityError($available_spaces = 1, $total_ticket_count = 1)
+	{
+		// add error messaging - we're using the _n function that will generate
+		// the appropriate singular or plural message based on the number of $available_spaces
+		if ($total_ticket_count) {
+			$msg = sprintf(
+				esc_html(
+					_n(
+						'We\'re sorry, but there is only %1$s available space left for this event at this particular date and time. Please select a different number (or different combination) of tickets by cancelling the current selection and choosing again, or proceed to registration.',
+						'We\'re sorry, but there are only %1$s available spaces left for this event at this particular date and time. Please select a different number (or different combination) of tickets by cancelling the current selection and choosing again, or proceed to registration.',
+						$available_spaces,
+						'event_espresso'
+					)
+				),
+				$available_spaces,
+				'<br />'
+			);
+		} else {
+			$msg = sprintf(
+				esc_html(
+					_n(
+						'We\'re sorry, but there is only %1$s available space left for this event at this particular date and time. Please select a different number (or different combination) of tickets.',
+						'We\'re sorry, but there are only %1$s available spaces left for this event at this particular date and time. Please select a different number (or different combination) of tickets.',
+						$available_spaces,
+						'event_espresso'
+					)
+				),
+				$available_spaces,
+				'<br />'
+			);
+		}
+		EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+	}
 }

core/domain/entities/notifications/PersistentAdminNotice.php

Spacing +7 added lines, -7 removed lines

@@ -130,7 +130,7 @@ 
      */
     private function setName($name)
     {
-        if (! is_string($name)) {
+        if ( ! is_string($name)) {
             throw new InvalidDataTypeException('$name', $name, 'string');
         }
         $this->name = sanitize_key($name);
@@ -154,7 +154,7 @@ 
      */
     private function setMessage($message)
     {
-        if (! is_string($message)) {
+        if ( ! is_string($message)) {
             throw new InvalidDataTypeException('$message', $message, 'string');
         }
         global $allowedtags;
@@ -200,7 +200,7 @@ 
      */
     private function setCapability($capability)
     {
-        if (! is_string($capability)) {
+        if ( ! is_string($capability)) {
             throw new InvalidDataTypeException('$capability', $capability, 'string');
         }
         $this->capability = ! empty($capability) ? $capability : 'manage_options';
@@ -224,7 +224,7 @@ 
      */
     private function setCapContext($cap_context)
     {
-        if (! is_string($cap_context)) {
+        if ( ! is_string($cap_context)) {
             throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
         }
         $this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
@@ -258,7 +258,7 @@ 
      */
     public function getCapCheck()
     {
-        if (! $this->cap_check instanceof CapCheckInterface) {
+        if ( ! $this->cap_check instanceof CapCheckInterface) {
             $this->setCapCheck(
                 new CapCheck(
                     $this->capability,
@@ -343,10 +343,10 @@ 
      */
     public function confirmRegistered()
     {
-        if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
+        if ( ! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
             PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
         }
-        if (! $this->registered && WP_DEBUG) {
+        if ( ! $this->registered && WP_DEBUG) {
             throw new DomainException(
                 sprintf(
                     esc_html__(

Indentation +312 added lines, -312 removed lines

@@ -25,316 +25,316 @@
 class PersistentAdminNotice implements RequiresCapCheckInterface
 {
 
-    /**
-     * @var string $name
-     */
-    protected $name = '';
-
-    /**
-     * @var string $message
-     */
-    protected $message = '';
-
-    /**
-     * @var boolean $force_update
-     */
-    protected $force_update = false;
-
-    /**
-     * @var string $capability
-     */
-    protected $capability = 'manage_options';
-
-    /**
-     * @var string $cap_context
-     */
-    protected $cap_context = 'view persistent admin notice';
-
-    /**
-     * @var boolean $dismissed
-     */
-    protected $dismissed = false;
-
-    /**
-     * @var CapCheckInterface $cap_check
-     */
-    protected $cap_check;
-
-    /**
-     * if true, then this notice will be deleted from the database
-     *
-     * @var boolean $purge
-     */
-    protected $purge = false;
-
-    /**
-     * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
-     * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
-     *
-     * @var boolean $registered
-     */
-    private $registered = false;
-
-
-    /**
-     * PersistentAdminNotice constructor
-     *
-     * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
-     * @param string $message      [required] the message to be stored persistently until dismissed
-     * @param bool   $force_update enforce the reappearance of a persistent message
-     * @param string $capability   user capability required to view this notice
-     * @param string $cap_context  description for why the cap check is being performed
-     * @param bool   $dismissed    whether or not the user has already dismissed/viewed this notice
-     * @throws InvalidDataTypeException
-     */
-    public function __construct(
-        $name,
-        $message,
-        $force_update = false,
-        $capability = 'manage_options',
-        $cap_context = 'view persistent admin notice',
-        $dismissed = false
-    ) {
-        $this->setName($name);
-        $this->setMessage($message);
-        $this->setForceUpdate($force_update);
-        $this->setCapability($capability);
-        $this->setCapContext($cap_context);
-        $this->setDismissed($dismissed);
-        add_action(
-            'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
-            array($this, 'registerPersistentAdminNotice')
-        );
-        add_action('shutdown', array($this, 'confirmRegistered'), 999);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * @param string $name
-     * @throws InvalidDataTypeException
-     */
-    private function setName($name)
-    {
-        if (! is_string($name)) {
-            throw new InvalidDataTypeException('$name', $name, 'string');
-        }
-        $this->name = sanitize_key($name);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-
-    /**
-     * @param string $message
-     * @throws InvalidDataTypeException
-     */
-    private function setMessage($message)
-    {
-        if (! is_string($message)) {
-            throw new InvalidDataTypeException('$message', $message, 'string');
-        }
-        global $allowedtags;
-        $allowedtags['br'] = array();
-        $this->message = wp_kses($message, $allowedtags);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getForceUpdate()
-    {
-        return $this->force_update;
-    }
-
-
-    /**
-     * @param bool $force_update
-     */
-    private function setForceUpdate($force_update)
-    {
-        $this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getCapability()
-    {
-        return $this->capability;
-    }
-
-
-    /**
-     * @param string $capability
-     * @throws InvalidDataTypeException
-     */
-    private function setCapability($capability)
-    {
-        if (! is_string($capability)) {
-            throw new InvalidDataTypeException('$capability', $capability, 'string');
-        }
-        $this->capability = ! empty($capability) ? $capability : 'manage_options';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getCapContext()
-    {
-        return $this->cap_context;
-    }
-
-
-    /**
-     * @param string $cap_context
-     * @throws InvalidDataTypeException
-     */
-    private function setCapContext($cap_context)
-    {
-        if (! is_string($cap_context)) {
-            throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
-        }
-        $this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getDismissed()
-    {
-        return $this->dismissed;
-    }
-
-
-    /**
-     * @param bool $dismissed
-     */
-    public function setDismissed($dismissed)
-    {
-        $this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return CapCheckInterface
-     * @throws InvalidDataTypeException
-     */
-    public function getCapCheck()
-    {
-        if (! $this->cap_check instanceof CapCheckInterface) {
-            $this->setCapCheck(
-                new CapCheck(
-                    $this->capability,
-                    $this->cap_context
-                )
-            );
-        }
-        return $this->cap_check;
-    }
-
-
-    /**
-     * @param CapCheckInterface $cap_check
-     */
-    private function setCapCheck(CapCheckInterface $cap_check)
-    {
-        $this->cap_check = $cap_check;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getPurge()
-    {
-        return $this->purge;
-    }
-
-
-    /**
-     * @param bool $purge
-     */
-    public function setPurge($purge)
-    {
-        $this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * given a valid PersistentAdminNotice Collection,
-     * this notice will be added if it is not already found in the collection (using its name as the identifier)
-     * if an existing notice is found that has already been dismissed,
-     * but we are overriding with a forced update, then we will toggle its dismissed state,
-     * so that the notice is displayed again
-     *
-     * @param Collection $persistent_admin_notice_collection
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
-    {
-        if ($this->registered) {
-            return;
-        }
-        // first check if this notice has already been added to the collection
-        if ($persistent_admin_notice_collection->has($this->name)) {
-            /** @var PersistentAdminNotice $existing */
-            $existing = $persistent_admin_notice_collection->get($this->name);
-            // we don't need to add it again (we can't actually)
-            // but if it has already been dismissed, and we are overriding with a forced update
-            if ($existing->getDismissed() && $this->getForceUpdate()) {
-                // then toggle the notice's dismissed state to true
-                // so that it gets displayed again
-                $existing->setDismissed(false);
-                // and make sure the message is set
-                $existing->setMessage($this->message);
-            }
-        } else {
-            $persistent_admin_notice_collection->add($this, $this->name);
-        }
-        $this->registered = true;
-    }
-
-
-    /**
-     * @throws Exception
-     */
-    public function confirmRegistered()
-    {
-        if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
-            PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
-        }
-        if (! $this->registered && WP_DEBUG) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
-                        'event_espresso'
-                    ),
-                    $this->name
-                )
-            );
-        }
-    }
+	/**
+	 * @var string $name
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string $message
+	 */
+	protected $message = '';
+
+	/**
+	 * @var boolean $force_update
+	 */
+	protected $force_update = false;
+
+	/**
+	 * @var string $capability
+	 */
+	protected $capability = 'manage_options';
+
+	/**
+	 * @var string $cap_context
+	 */
+	protected $cap_context = 'view persistent admin notice';
+
+	/**
+	 * @var boolean $dismissed
+	 */
+	protected $dismissed = false;
+
+	/**
+	 * @var CapCheckInterface $cap_check
+	 */
+	protected $cap_check;
+
+	/**
+	 * if true, then this notice will be deleted from the database
+	 *
+	 * @var boolean $purge
+	 */
+	protected $purge = false;
+
+	/**
+	 * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
+	 * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
+	 *
+	 * @var boolean $registered
+	 */
+	private $registered = false;
+
+
+	/**
+	 * PersistentAdminNotice constructor
+	 *
+	 * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
+	 * @param string $message      [required] the message to be stored persistently until dismissed
+	 * @param bool   $force_update enforce the reappearance of a persistent message
+	 * @param string $capability   user capability required to view this notice
+	 * @param string $cap_context  description for why the cap check is being performed
+	 * @param bool   $dismissed    whether or not the user has already dismissed/viewed this notice
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct(
+		$name,
+		$message,
+		$force_update = false,
+		$capability = 'manage_options',
+		$cap_context = 'view persistent admin notice',
+		$dismissed = false
+	) {
+		$this->setName($name);
+		$this->setMessage($message);
+		$this->setForceUpdate($force_update);
+		$this->setCapability($capability);
+		$this->setCapContext($cap_context);
+		$this->setDismissed($dismissed);
+		add_action(
+			'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
+			array($this, 'registerPersistentAdminNotice')
+		);
+		add_action('shutdown', array($this, 'confirmRegistered'), 999);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * @param string $name
+	 * @throws InvalidDataTypeException
+	 */
+	private function setName($name)
+	{
+		if (! is_string($name)) {
+			throw new InvalidDataTypeException('$name', $name, 'string');
+		}
+		$this->name = sanitize_key($name);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getMessage()
+	{
+		return $this->message;
+	}
+
+
+	/**
+	 * @param string $message
+	 * @throws InvalidDataTypeException
+	 */
+	private function setMessage($message)
+	{
+		if (! is_string($message)) {
+			throw new InvalidDataTypeException('$message', $message, 'string');
+		}
+		global $allowedtags;
+		$allowedtags['br'] = array();
+		$this->message = wp_kses($message, $allowedtags);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getForceUpdate()
+	{
+		return $this->force_update;
+	}
+
+
+	/**
+	 * @param bool $force_update
+	 */
+	private function setForceUpdate($force_update)
+	{
+		$this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getCapability()
+	{
+		return $this->capability;
+	}
+
+
+	/**
+	 * @param string $capability
+	 * @throws InvalidDataTypeException
+	 */
+	private function setCapability($capability)
+	{
+		if (! is_string($capability)) {
+			throw new InvalidDataTypeException('$capability', $capability, 'string');
+		}
+		$this->capability = ! empty($capability) ? $capability : 'manage_options';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getCapContext()
+	{
+		return $this->cap_context;
+	}
+
+
+	/**
+	 * @param string $cap_context
+	 * @throws InvalidDataTypeException
+	 */
+	private function setCapContext($cap_context)
+	{
+		if (! is_string($cap_context)) {
+			throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
+		}
+		$this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getDismissed()
+	{
+		return $this->dismissed;
+	}
+
+
+	/**
+	 * @param bool $dismissed
+	 */
+	public function setDismissed($dismissed)
+	{
+		$this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return CapCheckInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function getCapCheck()
+	{
+		if (! $this->cap_check instanceof CapCheckInterface) {
+			$this->setCapCheck(
+				new CapCheck(
+					$this->capability,
+					$this->cap_context
+				)
+			);
+		}
+		return $this->cap_check;
+	}
+
+
+	/**
+	 * @param CapCheckInterface $cap_check
+	 */
+	private function setCapCheck(CapCheckInterface $cap_check)
+	{
+		$this->cap_check = $cap_check;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getPurge()
+	{
+		return $this->purge;
+	}
+
+
+	/**
+	 * @param bool $purge
+	 */
+	public function setPurge($purge)
+	{
+		$this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * given a valid PersistentAdminNotice Collection,
+	 * this notice will be added if it is not already found in the collection (using its name as the identifier)
+	 * if an existing notice is found that has already been dismissed,
+	 * but we are overriding with a forced update, then we will toggle its dismissed state,
+	 * so that the notice is displayed again
+	 *
+	 * @param Collection $persistent_admin_notice_collection
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
+	{
+		if ($this->registered) {
+			return;
+		}
+		// first check if this notice has already been added to the collection
+		if ($persistent_admin_notice_collection->has($this->name)) {
+			/** @var PersistentAdminNotice $existing */
+			$existing = $persistent_admin_notice_collection->get($this->name);
+			// we don't need to add it again (we can't actually)
+			// but if it has already been dismissed, and we are overriding with a forced update
+			if ($existing->getDismissed() && $this->getForceUpdate()) {
+				// then toggle the notice's dismissed state to true
+				// so that it gets displayed again
+				$existing->setDismissed(false);
+				// and make sure the message is set
+				$existing->setMessage($this->message);
+			}
+		} else {
+			$persistent_admin_notice_collection->add($this, $this->name);
+		}
+		$this->registered = true;
+	}
+
+
+	/**
+	 * @throws Exception
+	 */
+	public function confirmRegistered()
+	{
+		if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
+			PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
+		}
+		if (! $this->registered && WP_DEBUG) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
+						'event_espresso'
+					),
+					$this->name
+				)
+			);
+		}
+	}
 }

acceptance_tests/Helpers/EventsAdmin.php

Indentation +129 added lines, -129 removed lines

@@ -14,133 +14,133 @@
 trait EventsAdmin
 {
 
-    /**
-     * @param string $additional_params
-     */
-    public function amOnDefaultEventsListTablePage($additional_params = '')
-    {
-        $this->actor()->amOnAdminPage(EventsPage::defaultEventsListTableUrl($additional_params));
-    }
-
-
-    /**
-     * Triggers the publishing of the Event.
-     */
-    public function publishEvent()
-    {
-        $this->actor()->scrollTo(EventsPage::EVENT_EDITOR_TITLE_FIELD_SELECTOR);
-        $this->actor()->wait(3);
-        $this->actor()->click(EventsPage::EVENT_EDITOR_PUBLISH_BUTTON_SELECTOR);
-        $this->actor()->waitForText('Event published.', 30);
-    }
-
-
-    /**
-     * Triggers saving the Event.
-     */
-    public function saveEvent()
-    {
-        $this->actor()->scrollTo(EventsPage::EVENT_EDITOR_TITLE_FIELD_SELECTOR);
-        $this->actor()->wait(2);
-        $this->actor()->click(EventsPage::EVENT_EDITOR_SAVE_BUTTON_SELECTOR);
-    }
-
-
-    /**
-     * Navigates the actor to the event list table page and will attempt to edit the event for the given title.
-     * First this will search using the given title and then attempt to edit from the results of the search.
-     *
-     * Assumes actor is already logged in.
-     * @param $event_title
-     */
-    public function amEditingTheEventWithTitle($event_title)
-    {
-        $this->amOnDefaultEventsListTablePage();
-        $this->actor()->fillField(EventsPage::EVENT_LIST_TABLE_SEARCH_INPUT_SELECTOR, $event_title);
-        $this->actor()->click(CoreAdmin::LIST_TABLE_SEARCH_SUBMIT_SELECTOR);
-        $this->actor()->waitForText($event_title, 15);
-        $this->actor()->click(EventsPage::eventListTableEventTitleEditLinkSelectorForTitle($event_title));
-    }
-
-
-    /**
-     * Navigates the user to the single event page (frontend view) for the given event title via clicking the "View"
-     * link for the event in the event list table.
-     * Assumes the actor is already logged in and on the Event list table page.
-     *
-     * @param string $event_title
-     */
-    public function amOnEventPageAfterClickingViewLinkInListTableForEvent($event_title)
-    {
-        $this->actor()->moveMouseOver(EventsPage::eventListTableEventTitleEditLinkSelectorForTitle($event_title));
-        $this->actor()->click(EventsPage::eventListTableEventTitleViewLinkSelectorForTitle($event_title));
-    }
-
-
-    /**
-     * Used to retrieve the event id for the event via the list table and for the given event.
-     * @param string $event_title
-     */
-    public function observeEventIdInListTableForEvent($event_title)
-    {
-        return $this->actor()->observeValueFromInputAt(EventsPage::eventListTableEventIdSelectorForTitle($event_title));
-    }
-
-
-    /**
-     * This performs the click action on the gear icon that triggers the advanced settings view state.
-     * Assumes the actor is already logged in and editing an event.
-     *
-     * @param int $row_number  What ticket row to toggle open/close.
-     */
-    public function toggleAdvancedSettingsViewForTicketRow($row_number = 1)
-    {
-        $this->actor()->click(EventsPage::eventEditorTicketAdvancedDetailsSelector($row_number));
-    }
-
-
-    /**
-     * Toggles the TKT_is_taxable checkbox for the ticket in the given row.
-     * Assumes the actor is already logged in and editing an event and that the advanced settings view state for that
-     * ticket is "open".
-     *
-     * @param int $row_number  What ticket row to toggle the checkbox for.
-     */
-    public function toggleTicketIsTaxableForTicketRow($row_number = 1)
-    {
-        $this->actor()->click(EventsPage::eventEditorTicketTaxableCheckboxSelector($row_number));
-    }
-
-
-    /**
-     * Use to change the default registration status for the event.
-     * Assumes the view is already on the event editor.
-     * @param $registration_status
-     */
-    public function changeDefaultRegistrationStatusTo($registration_status)
-    {
-        $this->actor()->selectOption(
-            EventsPage::EVENT_EDITOR_DEFAULT_REGISTRATION_STATUS_FIELD_SELECTOR,
-            $registration_status
-        );
-    }
-
-
-    /**
-     * Use this from the context of the event editor to select the given custom template for a given message type and
-     * messenger.
-     *
-     * @param string $message_type_label  The visible label for the message type (eg Registration Approved)
-     * @param string $messenger_slug      The slug for the messenger (eg 'email')
-     * @param string $custom_template_label The visible label in the select input for the custom template you want
-     *                                      selected.
-     */
-    public function selectCustomTemplateFor($message_type_label, $messenger_slug, $custom_template_label)
-    {
-        $this->actor()->click(EventsPage::eventEditorNotificationsMetaBoxMessengerTabSelector($messenger_slug));
-        $this->actor()->selectOption(
-            EventsPage::eventEditorNotificationsMetaBoxSelectSelectorForMessageType($message_type_label),
-            $custom_template_label
-        );
-    }
+	/**
+	 * @param string $additional_params
+	 */
+	public function amOnDefaultEventsListTablePage($additional_params = '')
+	{
+		$this->actor()->amOnAdminPage(EventsPage::defaultEventsListTableUrl($additional_params));
+	}
+
+
+	/**
+	 * Triggers the publishing of the Event.
+	 */
+	public function publishEvent()
+	{
+		$this->actor()->scrollTo(EventsPage::EVENT_EDITOR_TITLE_FIELD_SELECTOR);
+		$this->actor()->wait(3);
+		$this->actor()->click(EventsPage::EVENT_EDITOR_PUBLISH_BUTTON_SELECTOR);
+		$this->actor()->waitForText('Event published.', 30);
+	}
+
+
+	/**
+	 * Triggers saving the Event.
+	 */
+	public function saveEvent()
+	{
+		$this->actor()->scrollTo(EventsPage::EVENT_EDITOR_TITLE_FIELD_SELECTOR);
+		$this->actor()->wait(2);
+		$this->actor()->click(EventsPage::EVENT_EDITOR_SAVE_BUTTON_SELECTOR);
+	}
+
+
+	/**
+	 * Navigates the actor to the event list table page and will attempt to edit the event for the given title.
+	 * First this will search using the given title and then attempt to edit from the results of the search.
+	 *
+	 * Assumes actor is already logged in.
+	 * @param $event_title
+	 */
+	public function amEditingTheEventWithTitle($event_title)
+	{
+		$this->amOnDefaultEventsListTablePage();
+		$this->actor()->fillField(EventsPage::EVENT_LIST_TABLE_SEARCH_INPUT_SELECTOR, $event_title);
+		$this->actor()->click(CoreAdmin::LIST_TABLE_SEARCH_SUBMIT_SELECTOR);
+		$this->actor()->waitForText($event_title, 15);
+		$this->actor()->click(EventsPage::eventListTableEventTitleEditLinkSelectorForTitle($event_title));
+	}
+
+
+	/**
+	 * Navigates the user to the single event page (frontend view) for the given event title via clicking the "View"
+	 * link for the event in the event list table.
+	 * Assumes the actor is already logged in and on the Event list table page.
+	 *
+	 * @param string $event_title
+	 */
+	public function amOnEventPageAfterClickingViewLinkInListTableForEvent($event_title)
+	{
+		$this->actor()->moveMouseOver(EventsPage::eventListTableEventTitleEditLinkSelectorForTitle($event_title));
+		$this->actor()->click(EventsPage::eventListTableEventTitleViewLinkSelectorForTitle($event_title));
+	}
+
+
+	/**
+	 * Used to retrieve the event id for the event via the list table and for the given event.
+	 * @param string $event_title
+	 */
+	public function observeEventIdInListTableForEvent($event_title)
+	{
+		return $this->actor()->observeValueFromInputAt(EventsPage::eventListTableEventIdSelectorForTitle($event_title));
+	}
+
+
+	/**
+	 * This performs the click action on the gear icon that triggers the advanced settings view state.
+	 * Assumes the actor is already logged in and editing an event.
+	 *
+	 * @param int $row_number  What ticket row to toggle open/close.
+	 */
+	public function toggleAdvancedSettingsViewForTicketRow($row_number = 1)
+	{
+		$this->actor()->click(EventsPage::eventEditorTicketAdvancedDetailsSelector($row_number));
+	}
+
+
+	/**
+	 * Toggles the TKT_is_taxable checkbox for the ticket in the given row.
+	 * Assumes the actor is already logged in and editing an event and that the advanced settings view state for that
+	 * ticket is "open".
+	 *
+	 * @param int $row_number  What ticket row to toggle the checkbox for.
+	 */
+	public function toggleTicketIsTaxableForTicketRow($row_number = 1)
+	{
+		$this->actor()->click(EventsPage::eventEditorTicketTaxableCheckboxSelector($row_number));
+	}
+
+
+	/**
+	 * Use to change the default registration status for the event.
+	 * Assumes the view is already on the event editor.
+	 * @param $registration_status
+	 */
+	public function changeDefaultRegistrationStatusTo($registration_status)
+	{
+		$this->actor()->selectOption(
+			EventsPage::EVENT_EDITOR_DEFAULT_REGISTRATION_STATUS_FIELD_SELECTOR,
+			$registration_status
+		);
+	}
+
+
+	/**
+	 * Use this from the context of the event editor to select the given custom template for a given message type and
+	 * messenger.
+	 *
+	 * @param string $message_type_label  The visible label for the message type (eg Registration Approved)
+	 * @param string $messenger_slug      The slug for the messenger (eg 'email')
+	 * @param string $custom_template_label The visible label in the select input for the custom template you want
+	 *                                      selected.
+	 */
+	public function selectCustomTemplateFor($message_type_label, $messenger_slug, $custom_template_label)
+	{
+		$this->actor()->click(EventsPage::eventEditorNotificationsMetaBoxMessengerTabSelector($messenger_slug));
+		$this->actor()->selectOption(
+			EventsPage::eventEditorNotificationsMetaBoxSelectSelectorForMessageType($message_type_label),
+			$custom_template_label
+		);
+	}
 }
\ No newline at end of file

admin_pages/payments/Payment_Log_Admin_List_Table.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
     /**
      * _get_table_filters
      *
-     * @return array
+     * @return string[]
      */
     protected function _get_table_filters()
     {

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
              . __(
                  'Download Results',
                  'event_espresso'
-             ) . "'>";
+             )."'>";
     }
 
 

Indentation +225 added lines, -225 removed lines

@@ -13,111 +13,111 @@ 
 class Payment_Log_Admin_List_Table extends EE_Admin_List_Table
 {
 
-    /**
-     * @param \EE_Admin_Page $admin_page
-     * @return Payment_Log_Admin_List_Table
-     */
-    public function __construct($admin_page)
-    {
-        parent::__construct($admin_page);
-    }
-
-
-    /**
-     * _setup_data
-     *
-     * @return void
-     */
-    protected function _setup_data()
-    {
-        $this->_data = $this->_admin_page->get_payment_logs($this->_per_page, $this->_current_page);
-        // if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash') {
-        //     $this->_data = $this->_admin_page->get_trashed_questions($this->_per_page, $this->_current_page, false);
-        // } else {
-        //     $this->_data = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, false);
-        // }
-        $this->_all_data_count = $this->_admin_page->get_payment_logs($this->_per_page, $this->_current_page, true);
-        add_action(
-            'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons',
-            array($this, 'add_download_logs_checkbox')
-        );
-    }
-
-
-    /**
-     * add_download_logs_checkbox
-     * adds a checkbox to the bottom of the list table, instead of at the top with the rest of the filters
-     *
-     * @return void
-     */
-    public function add_download_logs_checkbox()
-    {
-        echo "<input type='submit' class='button-primary' id='download_results' name='download_results' value='"
-             . __(
-                 'Download Results',
-                 'event_espresso'
-             ) . "'>";
-    }
-
-
-    /**
-     * _set_properties
-     *
-     * @return void
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => __('payment log', 'event_espresso'),
-            'plural'   => __('payment logs', 'event_espresso'),
-            'ajax'     => true, // for now,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-        $this->_columns = array(
-            'cb'       => '<input type="checkbox" />',
-            'id'       => __('ID', 'event_espresso'),
-            'LOG_time' => __('Time', 'event_espresso'),
-            'PMD_ID'   => __('Payment Method', 'event_espresso'),
-            'TXN_ID'   => __('Transaction ID', 'event_espresso'),
-        );
-        $this->_sortable_columns = array(
-            'LOG_time' => array('LOG_time' => true),
-        );
-        $this->_hidden_columns = array();
-    }
-
-
-    /**
-     * _get_table_filters
-     *
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        $filters = array();
-        // todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as methods.
-        $payment_methods = EEM_Payment_Method::instance()->get_all();
-        $payment_method_names = array(
-            array('id' => 'all', 'text' => __("All", 'event_espresso')),
-            array('id' => '0', 'text' => __("Unknown Payment Method", 'event_espresso')),
-        );
-        foreach ($payment_methods as $payment_method) {
-            $payment_method_names[] = array('id' => $payment_method->ID(), 'text' => $payment_method->admin_name());
-        }
-        $filters[] = EEH_Form_Fields::select_input(
-            '_payment_method',
-            $payment_method_names,
-            isset($this->_req_data['_payment_method'])
-                ? $this->_req_data['_payment_method'] : 'all'
-        );
-        $start_date = isset($this->_req_data['payment-filter-start-date']) ? wp_strip_all_tags(
-            $this->_req_data['payment-filter-start-date']
-        ) : date('m/d/Y', strtotime('-6 months'));
-        $end_date = isset($this->_req_data['payment-filter-end-date']) ? wp_strip_all_tags(
-            $this->_req_data['payment-filter-end-date']
-        ) : date('m/d/Y');
-        ob_start();
-        ?>
+	/**
+	 * @param \EE_Admin_Page $admin_page
+	 * @return Payment_Log_Admin_List_Table
+	 */
+	public function __construct($admin_page)
+	{
+		parent::__construct($admin_page);
+	}
+
+
+	/**
+	 * _setup_data
+	 *
+	 * @return void
+	 */
+	protected function _setup_data()
+	{
+		$this->_data = $this->_admin_page->get_payment_logs($this->_per_page, $this->_current_page);
+		// if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash') {
+		//     $this->_data = $this->_admin_page->get_trashed_questions($this->_per_page, $this->_current_page, false);
+		// } else {
+		//     $this->_data = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, false);
+		// }
+		$this->_all_data_count = $this->_admin_page->get_payment_logs($this->_per_page, $this->_current_page, true);
+		add_action(
+			'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons',
+			array($this, 'add_download_logs_checkbox')
+		);
+	}
+
+
+	/**
+	 * add_download_logs_checkbox
+	 * adds a checkbox to the bottom of the list table, instead of at the top with the rest of the filters
+	 *
+	 * @return void
+	 */
+	public function add_download_logs_checkbox()
+	{
+		echo "<input type='submit' class='button-primary' id='download_results' name='download_results' value='"
+			 . __(
+				 'Download Results',
+				 'event_espresso'
+			 ) . "'>";
+	}
+
+
+	/**
+	 * _set_properties
+	 *
+	 * @return void
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => __('payment log', 'event_espresso'),
+			'plural'   => __('payment logs', 'event_espresso'),
+			'ajax'     => true, // for now,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+		$this->_columns = array(
+			'cb'       => '<input type="checkbox" />',
+			'id'       => __('ID', 'event_espresso'),
+			'LOG_time' => __('Time', 'event_espresso'),
+			'PMD_ID'   => __('Payment Method', 'event_espresso'),
+			'TXN_ID'   => __('Transaction ID', 'event_espresso'),
+		);
+		$this->_sortable_columns = array(
+			'LOG_time' => array('LOG_time' => true),
+		);
+		$this->_hidden_columns = array();
+	}
+
+
+	/**
+	 * _get_table_filters
+	 *
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		$filters = array();
+		// todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as methods.
+		$payment_methods = EEM_Payment_Method::instance()->get_all();
+		$payment_method_names = array(
+			array('id' => 'all', 'text' => __("All", 'event_espresso')),
+			array('id' => '0', 'text' => __("Unknown Payment Method", 'event_espresso')),
+		);
+		foreach ($payment_methods as $payment_method) {
+			$payment_method_names[] = array('id' => $payment_method->ID(), 'text' => $payment_method->admin_name());
+		}
+		$filters[] = EEH_Form_Fields::select_input(
+			'_payment_method',
+			$payment_method_names,
+			isset($this->_req_data['_payment_method'])
+				? $this->_req_data['_payment_method'] : 'all'
+		);
+		$start_date = isset($this->_req_data['payment-filter-start-date']) ? wp_strip_all_tags(
+			$this->_req_data['payment-filter-start-date']
+		) : date('m/d/Y', strtotime('-6 months'));
+		$end_date = isset($this->_req_data['payment-filter-end-date']) ? wp_strip_all_tags(
+			$this->_req_data['payment-filter-end-date']
+		) : date('m/d/Y');
+		ob_start();
+		?>
         <label for="txn-filter-start-date"><?php _e('Display Transactions from ', 'event_espresso'); ?></label>
         <input id="payment-filter-start-date" class="datepicker" type="text" value="<?php echo $start_date; ?>"
                name="payment-filter-start-date" size="15"/>
@@ -125,124 +125,124 @@ 
         <input id="payment-filter-end-date" class="datepicker" type="text" value="<?php echo $end_date; ?>"
                name="payment-filter-end-date" size="15"/>
         <?php
-        $filters[] = ob_get_clean();
-        return $filters;
-    }
-
-
-    /**
-     * _add_view_counts
-     *
-     * @return void
-     */
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count'] = $this->_admin_page->get_payment_logs(
-            $this->_per_page,
-            $this->_current_page,
-            true
-        );
-    }
-
-
-    /**
-     * column_cb
-     *
-     * @param \EE_Change_Log $item
-     * @return string
-     */
-    public function column_cb($item)
-    {
-        return sprintf('<input type="checkbox" class="option_id" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
-    }
-
-
-    /**
-     * column_id
-     *
-     * @param \EE_Change_Log $item
-     * @return string
-     */
-    public function column_id(EE_Change_Log $item)
-    {
-        $details_query_args = array(
-            'action' => 'payment_log_details',
-            'ID'     => $item->ID(),
-        );
-        $url = EE_Admin_Page::add_query_args_and_nonce($details_query_args, EE_PAYMENTS_ADMIN_URL);
-        return "<a href='$url'>{$item->ID()}</a>";
-    }
-
-
-    /**
-     * column_LOG_time
-     *
-     * @param \EE_Change_Log $item
-     * @return string
-     */
-    public function column_LOG_time(EE_Change_Log $item)
-    {
-        return $item->get_datetime('LOG_time');
-    }
-
-
-    /**
-     * column_PMD_ID
-     *
-     * @param \EE_Change_Log $item
-     * @return string
-     */
-    public function column_PMD_ID(EE_Change_Log $item)
-    {
-        if ($item->object() instanceof EE_Payment_Method) {
-            return $item->object()->admin_name();
-        } elseif ($item->object() instanceof EE_Payment && $item->object()->payment_method()) {
-            return $item->object()->payment_method()->admin_name();
-        } elseif ($item->object() instanceof EE_Transaction) {
-            return esc_html__('Unknown', 'event_espresso');
-        } else {
-            return esc_html__("No longer exists", 'event_espresso');
-        }
-    }
-
-
-    /**
-     * column_TXN_ID
-     *
-     * @param \EE_Change_Log $item
-     * @return string
-     */
-    public function column_TXN_ID(EE_Change_Log $item)
-    {
-        if ($item->object() instanceof EE_Payment) {
-            $transaction_id = $item->object()->TXN_ID();
-        } elseif ($item->object() instanceof EE_Transaction) {
-            $transaction_id = $item->object()->ID();
-        } else {
-            $transaction_id = null;
-        }
-        if ($transaction_id
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_transaction',
-                'espresso_transactions_view_transaction',
-                $transaction_id
-            )) {
-            $view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
-                array('action' => 'view_transaction', 'TXN_ID' => $transaction_id),
-                TXN_ADMIN_URL
-            );
-            return '<a href="'
-                   . $view_txn_lnk_url
-                   . '"  title="'
-                   . sprintf(
-                       esc_attr__('click to view transaction #%s', 'event_espresso'),
-                       $transaction_id
-                   )
-                   . '">'
-                   . sprintf(esc_html__('view txn %s', 'event_espresso'), $transaction_id)
-                   . '</a>';
-        }
-        // No transaction id or use can not view the transaction.
-        return __("Unable to find transaction", 'event_espresso');
-    }
+		$filters[] = ob_get_clean();
+		return $filters;
+	}
+
+
+	/**
+	 * _add_view_counts
+	 *
+	 * @return void
+	 */
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count'] = $this->_admin_page->get_payment_logs(
+			$this->_per_page,
+			$this->_current_page,
+			true
+		);
+	}
+
+
+	/**
+	 * column_cb
+	 *
+	 * @param \EE_Change_Log $item
+	 * @return string
+	 */
+	public function column_cb($item)
+	{
+		return sprintf('<input type="checkbox" class="option_id" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
+	}
+
+
+	/**
+	 * column_id
+	 *
+	 * @param \EE_Change_Log $item
+	 * @return string
+	 */
+	public function column_id(EE_Change_Log $item)
+	{
+		$details_query_args = array(
+			'action' => 'payment_log_details',
+			'ID'     => $item->ID(),
+		);
+		$url = EE_Admin_Page::add_query_args_and_nonce($details_query_args, EE_PAYMENTS_ADMIN_URL);
+		return "<a href='$url'>{$item->ID()}</a>";
+	}
+
+
+	/**
+	 * column_LOG_time
+	 *
+	 * @param \EE_Change_Log $item
+	 * @return string
+	 */
+	public function column_LOG_time(EE_Change_Log $item)
+	{
+		return $item->get_datetime('LOG_time');
+	}
+
+
+	/**
+	 * column_PMD_ID
+	 *
+	 * @param \EE_Change_Log $item
+	 * @return string
+	 */
+	public function column_PMD_ID(EE_Change_Log $item)
+	{
+		if ($item->object() instanceof EE_Payment_Method) {
+			return $item->object()->admin_name();
+		} elseif ($item->object() instanceof EE_Payment && $item->object()->payment_method()) {
+			return $item->object()->payment_method()->admin_name();
+		} elseif ($item->object() instanceof EE_Transaction) {
+			return esc_html__('Unknown', 'event_espresso');
+		} else {
+			return esc_html__("No longer exists", 'event_espresso');
+		}
+	}
+
+
+	/**
+	 * column_TXN_ID
+	 *
+	 * @param \EE_Change_Log $item
+	 * @return string
+	 */
+	public function column_TXN_ID(EE_Change_Log $item)
+	{
+		if ($item->object() instanceof EE_Payment) {
+			$transaction_id = $item->object()->TXN_ID();
+		} elseif ($item->object() instanceof EE_Transaction) {
+			$transaction_id = $item->object()->ID();
+		} else {
+			$transaction_id = null;
+		}
+		if ($transaction_id
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_transaction',
+				'espresso_transactions_view_transaction',
+				$transaction_id
+			)) {
+			$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
+				array('action' => 'view_transaction', 'TXN_ID' => $transaction_id),
+				TXN_ADMIN_URL
+			);
+			return '<a href="'
+				   . $view_txn_lnk_url
+				   . '"  title="'
+				   . sprintf(
+					   esc_attr__('click to view transaction #%s', 'event_espresso'),
+					   $transaction_id
+				   )
+				   . '">'
+				   . sprintf(esc_html__('view txn %s', 'event_espresso'), $transaction_id)
+				   . '</a>';
+		}
+		// No transaction id or use can not view the transaction.
+		return __("Unable to find transaction", 'event_espresso');
+	}
 }

core/middleware/EE_Detect_File_Editor_Request.core.php

Indentation +23 added lines, -23 removed lines

@@ -14,28 +14,28 @@
 class EE_Detect_File_Editor_Request extends EE_Middleware
 {
 
-    /**
-     * @deprecated
-     * @param EE_Request  $request
-     * @param EE_Response $response
-     * @return EE_Response
-     */
-    public function handle_request(EE_Request $request, EE_Response $response)
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\middleware\DetectFileEditorRequest',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.52'
-        );
-        return $response;
-    }
+	/**
+	 * @deprecated
+	 * @param EE_Request  $request
+	 * @param EE_Response $response
+	 * @return EE_Response
+	 */
+	public function handle_request(EE_Request $request, EE_Response $response)
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\middleware\DetectFileEditorRequest',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.52'
+		);
+		return $response;
+	}
 
 }

core/domain/services/admin/PluginUpsells.php

Spacing +3 added lines, -3 removed lines

@@ -83,12 +83,12 @@
                     <div class="notice inline notice-alt">
                         <div class="ee-upsell-container">
                             <div class="ee-upsell-inner-container">
-                                <a href="' . $button_url . '">
-                                    ' . $button_text . '
+                                <a href="' . $button_url.'">
+                                    ' . $button_text.'
                                 </a>
                             </div>
                             <div class="ee-upsell-inner-container">
-                                <p>' . $upsell_text . '</p>
+                                <p>' . $upsell_text.'</p>
                             </div>
                             <div style="clear:both"></div>
                         </div>

Indentation +57 added lines, -57 removed lines

@@ -17,47 +17,47 @@ 
 class PluginUpsells
 {
 
-    /**
-     * @var DomainInterface
-     */
-    private $domain;
+	/**
+	 * @var DomainInterface
+	 */
+	private $domain;
 
 
-    /**
-     * PluginUpsells constructor.
-     *
-     * @param DomainInterface $domain
-     */
-    public function __construct(DomainInterface $domain)
-    {
-        $this->domain = $domain;
-    }
+	/**
+	 * PluginUpsells constructor.
+	 *
+	 * @param DomainInterface $domain
+	 */
+	public function __construct(DomainInterface $domain)
+	{
+		$this->domain = $domain;
+	}
 
 
-    /**
-     * Hook in various upsells for the decaf version of EE.
-     */
-    public function decafUpsells()
-    {
-        if ($this->domain instanceof CaffeinatedInterface && ! $this->domain->isCaffeinated()) {
-            add_action('after_plugin_row', array($this, 'doPremiumUpsell'), 10, 3);
-        }
-    }
+	/**
+	 * Hook in various upsells for the decaf version of EE.
+	 */
+	public function decafUpsells()
+	{
+		if ($this->domain instanceof CaffeinatedInterface && ! $this->domain->isCaffeinated()) {
+			add_action('after_plugin_row', array($this, 'doPremiumUpsell'), 10, 3);
+		}
+	}
 
 
-    /**
-     * Callback for `after_plugin_row` to add upsell info
-     *
-     * @param string $plugin_file
-     * @param array  $plugin_data
-     * @param string $status
-     * @throws DomainException
-     */
-    public function doPremiumUpsell($plugin_file, $plugin_data, $status)
-    {
-        if ($plugin_file === $this->domain->pluginBasename()) {
-            list($button_text, $button_url, $upsell_text) = $this->getAfterPluginRowDetails();
-            echo '<tr class="plugin-update-tr ee-upsell-plugin-list-table active">
+	/**
+	 * Callback for `after_plugin_row` to add upsell info
+	 *
+	 * @param string $plugin_file
+	 * @param array  $plugin_data
+	 * @param string $status
+	 * @throws DomainException
+	 */
+	public function doPremiumUpsell($plugin_file, $plugin_data, $status)
+	{
+		if ($plugin_file === $this->domain->pluginBasename()) {
+			list($button_text, $button_url, $upsell_text) = $this->getAfterPluginRowDetails();
+			echo '<tr class="plugin-update-tr ee-upsell-plugin-list-table active">
                 <td colspan="3" class="plugin-update colspanchange">
                     <div class="notice inline notice-alt">
                         <div class="ee-upsell-container">
@@ -74,27 +74,27 @@ 
                     </div>
                 </td>
               </tr>';
-        }
-    }
+		}
+	}
 
-    /**
-     * Provide the details used for the upsell container.
-     *
-     * @return array
-     */
-    protected function getAfterPluginRowDetails()
-    {
-        return array(
-            esc_html__('Upgrade for Support', 'event_espresso'),
-            'https://eventespresso.com/purchase/?slug=ee4-license-personal&utm_source=wp_admin_plugins_screen&utm_medium=link&utm_campaign=plugins_screen_upgrade_link" class="button button-primary',
-            sprintf(
-                esc_html__(
-                    'You\'re missing out on %1$sexpert support%2$s and %1$sone-click updates%2$s! Don\'t have an Event Espresso support license key? Support the project and buy one today!',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            ),
-        );
-    }
+	/**
+	 * Provide the details used for the upsell container.
+	 *
+	 * @return array
+	 */
+	protected function getAfterPluginRowDetails()
+	{
+		return array(
+			esc_html__('Upgrade for Support', 'event_espresso'),
+			'https://eventespresso.com/purchase/?slug=ee4-license-personal&utm_source=wp_admin_plugins_screen&utm_medium=link&utm_campaign=plugins_screen_upgrade_link" class="button button-primary',
+			sprintf(
+				esc_html__(
+					'You\'re missing out on %1$sexpert support%2$s and %1$sone-click updates%2$s! Don\'t have an Event Espresso support license key? Support the project and buy one today!',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			),
+		);
+	}
 }

core/services/bootstrap/BootstrapDependencyInjectionContainer.php

Spacing +2 added lines, -2 removed lines

@@ -78,13 +78,13 @@
         // EE_Dependency_Map: info about how to load classes required by other classes
         espresso_load_required(
             'EE_Dependency_Map',
-            EE_CORE . 'EE_Dependency_Map.core.php'
+            EE_CORE.'EE_Dependency_Map.core.php'
         );
         $this->dependency_map = EE_Dependency_Map::instance($this->class_cache);
         // EE_Registry: central repository for classes (legacy)
         espresso_load_required(
             'EE_Registry',
-            EE_CORE . 'EE_Registry.core.php'
+            EE_CORE.'EE_Registry.core.php'
         );
         $this->registry = EE_Registry::instance(
             $this->dependency_map,

Indentation +119 added lines, -119 removed lines

@@ -25,123 +25,123 @@
 class BootstrapDependencyInjectionContainer
 {
 
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
-
-    /**
-     * @type LoaderInterface $loader
-     */
-    protected $loader;
-
-    /**
-     * @var EE_Registry $registry
-     */
-    protected $registry;
-
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
-
-    /**
-     * @var Mirror
-     */
-    private $mirror;
-
-    /**
-     * @var ObjectIdentifier
-     */
-    private $object_identifier;
-
-
-    /**
-     * Can't use this just yet until we exorcise some more of our singleton usage from core
-     */
-    public function buildDependencyInjectionContainer()
-    {
-        // build DI container
-        // $OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
-        // $OpenCoffeeShop->addRecipes();
-        // $CoffeeShop = $OpenCoffeeShop->CoffeeShop();
-    }
-
-
-    /**
-     * Setups  EE_Registry and EE_Dependency_Map
-     *
-     * @throws EE_Error
-     */
-    public function buildLegacyDependencyInjectionContainer()
-    {
-        $this->class_cache = new ClassInterfaceCache();
-        $this->object_identifier = new ObjectIdentifier($this->class_cache);
-        $this->mirror = new Mirror();
-        // EE_Dependency_Map: info about how to load classes required by other classes
-        espresso_load_required(
-            'EE_Dependency_Map',
-            EE_CORE . 'EE_Dependency_Map.core.php'
-        );
-        $this->dependency_map = EE_Dependency_Map::instance($this->class_cache);
-        // EE_Registry: central repository for classes (legacy)
-        espresso_load_required(
-            'EE_Registry',
-            EE_CORE . 'EE_Registry.core.php'
-        );
-        $this->registry = EE_Registry::instance(
-            $this->dependency_map,
-            $this->mirror,
-            $this->class_cache,
-            $this->object_identifier
-        );
-    }
-
-
-    /**
-     * Performs initial setup for the generic Loader
-     *
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public function buildLoader()
-    {
-        $this->loader = LoaderFactory::getLoader(
-            $this->registry,
-            $this->class_cache,
-            $this->object_identifier
-        );
-        $this->loader->share('EventEspresso\core\services\loaders\ClassInterfaceCache', $this->class_cache);
-        $this->loader->share('EventEspresso\core\services\loaders\ObjectIdentifier', $this->object_identifier);
-        $this->loader->share('EventEspresso\core\services\container\Mirror', $this->mirror);
-        $this->dependency_map->setLoader($this->loader);
-    }
-
-
-    /**
-     * @return EE_Dependency_Map
-     */
-    public function getDependencyMap()
-    {
-        return $this->dependency_map;
-    }
-
-
-    /**
-     * @return EE_Registry
-     */
-    public function getRegistry()
-    {
-        return $this->registry;
-    }
-
-
-    /**
-     * @return LoaderInterface
-     */
-    public function getLoader()
-    {
-        return $this->loader;
-    }
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
+
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	protected $loader;
+
+	/**
+	 * @var EE_Registry $registry
+	 */
+	protected $registry;
+
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
+
+	/**
+	 * @var Mirror
+	 */
+	private $mirror;
+
+	/**
+	 * @var ObjectIdentifier
+	 */
+	private $object_identifier;
+
+
+	/**
+	 * Can't use this just yet until we exorcise some more of our singleton usage from core
+	 */
+	public function buildDependencyInjectionContainer()
+	{
+		// build DI container
+		// $OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
+		// $OpenCoffeeShop->addRecipes();
+		// $CoffeeShop = $OpenCoffeeShop->CoffeeShop();
+	}
+
+
+	/**
+	 * Setups  EE_Registry and EE_Dependency_Map
+	 *
+	 * @throws EE_Error
+	 */
+	public function buildLegacyDependencyInjectionContainer()
+	{
+		$this->class_cache = new ClassInterfaceCache();
+		$this->object_identifier = new ObjectIdentifier($this->class_cache);
+		$this->mirror = new Mirror();
+		// EE_Dependency_Map: info about how to load classes required by other classes
+		espresso_load_required(
+			'EE_Dependency_Map',
+			EE_CORE . 'EE_Dependency_Map.core.php'
+		);
+		$this->dependency_map = EE_Dependency_Map::instance($this->class_cache);
+		// EE_Registry: central repository for classes (legacy)
+		espresso_load_required(
+			'EE_Registry',
+			EE_CORE . 'EE_Registry.core.php'
+		);
+		$this->registry = EE_Registry::instance(
+			$this->dependency_map,
+			$this->mirror,
+			$this->class_cache,
+			$this->object_identifier
+		);
+	}
+
+
+	/**
+	 * Performs initial setup for the generic Loader
+	 *
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public function buildLoader()
+	{
+		$this->loader = LoaderFactory::getLoader(
+			$this->registry,
+			$this->class_cache,
+			$this->object_identifier
+		);
+		$this->loader->share('EventEspresso\core\services\loaders\ClassInterfaceCache', $this->class_cache);
+		$this->loader->share('EventEspresso\core\services\loaders\ObjectIdentifier', $this->object_identifier);
+		$this->loader->share('EventEspresso\core\services\container\Mirror', $this->mirror);
+		$this->dependency_map->setLoader($this->loader);
+	}
+
+
+	/**
+	 * @return EE_Dependency_Map
+	 */
+	public function getDependencyMap()
+	{
+		return $this->dependency_map;
+	}
+
+
+	/**
+	 * @return EE_Registry
+	 */
+	public function getRegistry()
+	{
+		return $this->registry;
+	}
+
+
+	/**
+	 * @return LoaderInterface
+	 */
+	public function getLoader()
+	{
+		return $this->loader;
+	}
 }