eventespresso / event-espresso-core

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

Spacing +22 added lines, -22 removed lines

@@ -19,20 +19,20 @@ 
     {
         wp_register_style(
             'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
+            EE_GLOBAL_ASSETS_URL.'css/checkbox_dropdown_selector.css',
             array('espresso_default'),
             EVENT_ESPRESSO_VERSION
         );
         wp_register_style(
             'espresso_default',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+            EE_GLOBAL_ASSETS_URL.'css/espresso_default.css',
             array('dashicons'),
             EVENT_ESPRESSO_VERSION
         );
         wp_enqueue_style('checkbox_dropdown_selector');
         wp_register_script(
             'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/checkbox_dropdown_selector.js',
             array('jquery'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -71,7 +71,7 @@ 
      */
     public function iframe_css(array $iframe_css)
     {
-        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
+        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL.'css/checkbox_dropdown_selector.css';
         return $iframe_css;
     }
 
@@ -85,7 +85,7 @@ 
      */
     public function iframe_js(array $iframe_js)
     {
-        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
+        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL.'scripts/checkbox_dropdown_selector.js';
         return $iframe_js;
     }
 
@@ -101,7 +101,7 @@ 
         // $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
         $input->set_label_sizes();
         $label_size_class = $input->get_label_size_class();
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+        if ( ! is_array($input->raw_value()) && $input->raw_value() !== null) {
             EE_Error::doing_it_wrong(
                 'EE_Checkbox_Display_Strategy::display()',
                 sprintf(
@@ -111,7 +111,7 @@ 
                     ),
                     $input->html_id(),
                     var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
+                    $input->html_name().'[]'
                 ),
                 '4.8.1'
             );
@@ -119,19 +119,19 @@ 
 
 
         $html = \EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
-        $html .= '<button id="' . $input->html_id() . '-btn"';
+        $html .= '<button id="'.$input->html_id().'-btn"';
         // $html .= ' name="' . $input->html_name() . '"';
-        $html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button-secondary button"';
-        $html .= ' style="' . $input->html_style() . '"';
-        $html .= ' data-target="' . $input->html_id() . '-options-dv"';
-        $html .= ' ' . $input->other_html_attributes() . '>';
+        $html .= ' class="'.$input->html_class().' checkbox-dropdown-selector-btn button-secondary button"';
+        $html .= ' style="'.$input->html_style().'"';
+        $html .= ' data-target="'.$input->html_id().'-options-dv"';
+        $html .= ' '.$input->other_html_attributes().'>';
         $html .= '<span class="checkbox-dropdown-selector-selected-spn">';
         $html .= $select_button_text;
         $html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
         $html .= '</button>';
         $html .= EEH_HTML::div(
             '',
-            $input->html_id() . '-options-dv',
+            $input->html_id().'-options-dv',
             'checkbox-dropdown-selector'
         );
         $html .= EEH_HTML::link(
@@ -157,18 +157,18 @@ 
                      . '">';
             $html .= EEH_HTML::nl(1, 'checkbox');
             $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '-option"';
-            $html .= $input->html_style() ? ' style="' . $input->html_style() . '"' : '';
-            $html .= ' value="' . esc_attr($value) . '"';
+            $html .= ' name="'.$input->html_name().'[]"';
+            $html .= ' id="'.$html_id.'"';
+            $html .= ' class="'.$input->html_class().'-option"';
+            $html .= $input->html_style() ? ' style="'.$input->html_style().'"' : '';
+            $html .= ' value="'.esc_attr($value).'"';
             $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
                 ? ' checked="checked"'
                 : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
+            $html .= ' '.$this->_input->other_html_attributes();
             $html .= '>';
-            $html .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+            $html .= '<span class="datetime-selector-option-text-spn">'.$display_text.'</span>';
+            $html .= EEH_HTML::nl(-1, 'checkbox').'</label>';
             $html .= EEH_HTML::lix();
         }
         $html .= EEH_HTML::ulx();
@@ -182,7 +182,7 @@ 
                     'event_espresso'
                 )
             ),
-            $input->html_id() . '-date-time-filter-notice-pg',
+            $input->html_id().'-date-time-filter-notice-pg',
             'date-time-filter-notice-pg small-text lt-grey-text'
         );
         $html .= \EEH_HTML::br();

Indentation +176 added lines, -176 removed lines

@@ -13,180 +13,180 @@
 {
 
 
-    /**
-     * enqueues css and js, so that this can be called statically
-     */
-    public static function enqueue_styles_and_scripts()
-    {
-        wp_register_style(
-            'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
-            array('espresso_default'),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_register_style(
-            'espresso_default',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-            array('dashicons'),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('checkbox_dropdown_selector');
-        wp_register_script(
-            'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
-            array('jquery'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_localize_script(
-            'ticket_selector',
-            'eeDTS',
-            array(
-                'maxChecked' => EE_Registry::instance()
-                    ->CFG
-                    ->template_settings
-                    ->EED_Ticket_Selector
-                    ->getDatetimeSelectorMaxChecked()
-            )
-        );
-        wp_enqueue_script('checkbox_dropdown_selector');
-    }
-
-
-
-    /**
-     * Informs the rest of the forms system what CSS and JS is needed to display the input
-     */
-    public function enqueue_js()
-    {
-        EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
-    }
-
-
-
-    /**
-     * callback for Iframe::addStylesheets() child class methods
-     *
-     * @param array $iframe_css
-     * @return array
-     */
-    public function iframe_css(array $iframe_css)
-    {
-        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
-        return $iframe_css;
-    }
-
-
-
-    /**
-     * callback for Iframe::addScripts() child class methods
-     *
-     * @param array $iframe_js
-     * @return array
-     */
-    public function iframe_js(array $iframe_js)
-    {
-        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
-        return $iframe_js;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = $this->get_input();
-        $select_button_text = $input instanceof EE_Checkbox_Dropdown_Selector_Input ? $input->select_button_text() : '';
-        // $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
-            EE_Error::doing_it_wrong(
-                'EE_Checkbox_Display_Strategy::display()',
-                sprintf(
-                    esc_html__(
-                        'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
-                        'event_espresso'
-                    ),
-                    $input->html_id(),
-                    var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
-                ),
-                '4.8.1'
-            );
-        }
-
-
-        $html = \EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
-        $html .= '<button id="' . $input->html_id() . '-btn"';
-        // $html .= ' name="' . $input->html_name() . '"';
-        $html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button-secondary button"';
-        $html .= ' style="' . $input->html_style() . '"';
-        $html .= ' data-target="' . $input->html_id() . '-options-dv"';
-        $html .= ' ' . $input->other_html_attributes() . '>';
-        $html .= '<span class="checkbox-dropdown-selector-selected-spn">';
-        $html .= $select_button_text;
-        $html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
-        $html .= '</button>';
-        $html .= EEH_HTML::div(
-            '',
-            $input->html_id() . '-options-dv',
-            'checkbox-dropdown-selector'
-        );
-        $html .= EEH_HTML::link(
-            '',
-            '<span class="dashicons dashicons-no"></span>',
-            esc_html__('close datetime selector', 'event_espresso'),
-            '',
-            'close-espresso-notice'
-        );
-        $html .= EEH_HTML::ul();
-        $input_raw_value = (array) $input->raw_value();
-        foreach ($input->options() as $value => $display_text) {
-            $html .= EEH_HTML::li();
-            $value = $input->get_normalization_strategy()->unnormalize_one($value);
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'checkbox');
-            $html .= '<label for="'
-                     . $html_id
-                     . '" id="'
-                     . $html_id
-                     . '-lbl" class="ee-checkbox-label-after'
-                     . $label_size_class
-                     . '">';
-            $html .= EEH_HTML::nl(1, 'checkbox');
-            $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '-option"';
-            $html .= $input->html_style() ? ' style="' . $input->html_style() . '"' : '';
-            $html .= ' value="' . esc_attr($value) . '"';
-            $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
-                ? ' checked="checked"'
-                : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
-            $html .= '>';
-            $html .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
-            $html .= EEH_HTML::lix();
-        }
-        $html .= EEH_HTML::ulx();
-        $html .= EEH_HTML::divx();
-        $html .= EEH_HTML::divx();
-        $html .= EEH_HTML::p(
-            apply_filters(
-                'FHEE__EE_Checkbox_Dropdown_Selector_Display_Strategy__display__html',
-                esc_html__(
-                    'To view additional ticket options, click the "Filter by Date" button and select more dates.',
-                    'event_espresso'
-                )
-            ),
-            $input->html_id() . '-date-time-filter-notice-pg',
-            'date-time-filter-notice-pg small-text lt-grey-text'
-        );
-        $html .= \EEH_HTML::br();
-        return $html;
-    }
+	/**
+	 * enqueues css and js, so that this can be called statically
+	 */
+	public static function enqueue_styles_and_scripts()
+	{
+		wp_register_style(
+			'checkbox_dropdown_selector',
+			EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
+			array('espresso_default'),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_register_style(
+			'espresso_default',
+			EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+			array('dashicons'),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('checkbox_dropdown_selector');
+		wp_register_script(
+			'checkbox_dropdown_selector',
+			EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
+			array('jquery'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_localize_script(
+			'ticket_selector',
+			'eeDTS',
+			array(
+				'maxChecked' => EE_Registry::instance()
+					->CFG
+					->template_settings
+					->EED_Ticket_Selector
+					->getDatetimeSelectorMaxChecked()
+			)
+		);
+		wp_enqueue_script('checkbox_dropdown_selector');
+	}
+
+
+
+	/**
+	 * Informs the rest of the forms system what CSS and JS is needed to display the input
+	 */
+	public function enqueue_js()
+	{
+		EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
+	}
+
+
+
+	/**
+	 * callback for Iframe::addStylesheets() child class methods
+	 *
+	 * @param array $iframe_css
+	 * @return array
+	 */
+	public function iframe_css(array $iframe_css)
+	{
+		$iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
+		return $iframe_css;
+	}
+
+
+
+	/**
+	 * callback for Iframe::addScripts() child class methods
+	 *
+	 * @param array $iframe_js
+	 * @return array
+	 */
+	public function iframe_js(array $iframe_js)
+	{
+		$iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
+		return $iframe_js;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->get_input();
+		$select_button_text = $input instanceof EE_Checkbox_Dropdown_Selector_Input ? $input->select_button_text() : '';
+		// $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+			EE_Error::doing_it_wrong(
+				'EE_Checkbox_Display_Strategy::display()',
+				sprintf(
+					esc_html__(
+						'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
+						'event_espresso'
+					),
+					$input->html_id(),
+					var_export($input->raw_value(), true),
+					$input->html_name() . '[]'
+				),
+				'4.8.1'
+			);
+		}
+
+
+		$html = \EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
+		$html .= '<button id="' . $input->html_id() . '-btn"';
+		// $html .= ' name="' . $input->html_name() . '"';
+		$html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button-secondary button"';
+		$html .= ' style="' . $input->html_style() . '"';
+		$html .= ' data-target="' . $input->html_id() . '-options-dv"';
+		$html .= ' ' . $input->other_html_attributes() . '>';
+		$html .= '<span class="checkbox-dropdown-selector-selected-spn">';
+		$html .= $select_button_text;
+		$html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
+		$html .= '</button>';
+		$html .= EEH_HTML::div(
+			'',
+			$input->html_id() . '-options-dv',
+			'checkbox-dropdown-selector'
+		);
+		$html .= EEH_HTML::link(
+			'',
+			'<span class="dashicons dashicons-no"></span>',
+			esc_html__('close datetime selector', 'event_espresso'),
+			'',
+			'close-espresso-notice'
+		);
+		$html .= EEH_HTML::ul();
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$html .= EEH_HTML::li();
+			$value = $input->get_normalization_strategy()->unnormalize_one($value);
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'checkbox');
+			$html .= '<label for="'
+					 . $html_id
+					 . '" id="'
+					 . $html_id
+					 . '-lbl" class="ee-checkbox-label-after'
+					 . $label_size_class
+					 . '">';
+			$html .= EEH_HTML::nl(1, 'checkbox');
+			$html .= '<input type="checkbox"';
+			$html .= ' name="' . $input->html_name() . '[]"';
+			$html .= ' id="' . $html_id . '"';
+			$html .= ' class="' . $input->html_class() . '-option"';
+			$html .= $input->html_style() ? ' style="' . $input->html_style() . '"' : '';
+			$html .= ' value="' . esc_attr($value) . '"';
+			$html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
+				? ' checked="checked"'
+				: '';
+			$html .= ' ' . $this->_input->other_html_attributes();
+			$html .= '>';
+			$html .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
+			$html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+			$html .= EEH_HTML::lix();
+		}
+		$html .= EEH_HTML::ulx();
+		$html .= EEH_HTML::divx();
+		$html .= EEH_HTML::divx();
+		$html .= EEH_HTML::p(
+			apply_filters(
+				'FHEE__EE_Checkbox_Dropdown_Selector_Display_Strategy__display__html',
+				esc_html__(
+					'To view additional ticket options, click the "Filter by Date" button and select more dates.',
+					'event_espresso'
+				)
+			),
+			$input->html_id() . '-date-time-filter-notice-pg',
+			'date-time-filter-notice-pg small-text lt-grey-text'
+		);
+		$html .= \EEH_HTML::br();
+		return $html;
+	}
 }

core/services/admin/AdminPageHeaderDecorator.php

Indentation +13 added lines, -13 removed lines

@@ -16,19 +16,19 @@
 abstract class AdminPageHeaderDecorator implements AdminPageHeaderDecoratorInterface
 {
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
 
-    /**
-     * AdminPageHeader constructor.
-     *
-     * @param RequestInterface $request
-     */
-    public function __construct(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
+	/**
+	 * AdminPageHeader constructor.
+	 *
+	 * @param RequestInterface $request
+	 */
+	public function __construct(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
 }

core/domain/services/admin/registrations/list_table/QueryBuilder.php

Indentation +380 added lines, -380 removed lines

@@ -21,384 +21,384 @@
 class QueryBuilder
 {
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var EEM_Registration $registration_model
-     */
-    protected $registration_model;
-
-    /**
-     * @var string $view
-     */
-    protected $view;
-
-    /**
-     * @var array $where_params
-     */
-    protected $where_params;
-
-
-    /**
-     * QueryBuilder constructor.
-     *
-     * @param array            $extra_request_params
-     * @param RequestInterface $request
-     * @param EEM_Registration $registration_model
-     */
-    public function __construct(
-        array $extra_request_params,
-        RequestInterface $request,
-        EEM_Registration $registration_model
-    ) {
-        $this->request = $request;
-        $this->registration_model = $registration_model;
-        foreach ($extra_request_params as $key => $value) {
-            $this->request->setRequestParam($key, $value);
-        }
-        $this->view = $this->request->getRequestParam('status', '');
-        $this->where_params = [];
-    }
-
-
-    /**
-     * Sets up the where conditions for the registrations query.
-     *
-     * @param int  $per_page
-     * @param bool $count_query
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function getQueryParams($per_page = 10, $count_query = false)
-    {
-        $query_params = [
-            0                          => $this->getWhereClause(),
-            'caps'                     => EEM_Registration::caps_read_admin,
-            'default_where_conditions' => 'this_model_only',
-        ];
-        if (! $count_query) {
-            $query_params = array_merge(
-                $query_params,
-                $this->getOrderbyClause(),
-                $this->getLimitClause($per_page)
-            );
-        }
-
-        return $query_params;
-    }
-
-
-    /**
-     * Sets up the where conditions for the registrations query.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function getWhereClause()
-    {
-        $this->addAttendeeIdToWhereConditions();
-        $this->addEventIdToWhereConditions();
-        $this->addCategoryIdToWhereConditions();
-        $this->addDatetimeIdToWhereConditions();
-        $this->addTicketIdToWhereConditions();
-        $this->addRegistrationStatusToWhereConditions();
-        $this->addDateToWhereConditions();
-        $this->addSearchToWhereConditions();
-        return apply_filters(
-            'FHEE__Registrations_Admin_Page___get_where_conditions_for_registrations_query',
-            $this->where_params,
-            $this->request->requestParams()
-        );
-    }
-
-
-    /**
-     * This will add ATT_ID to the provided $this->where_clause array for EE model query parameters.
-     */
-    protected function addAttendeeIdToWhereConditions()
-    {
-        $ATT_ID = $this->request->getRequestParam('attendee_id');
-        $ATT_ID = $this->request->getRequestParam('ATT_ID', $ATT_ID);
-        if ($ATT_ID) {
-            $this->where_params['ATT_ID'] = absint($ATT_ID);
-        }
-    }
-
-
-    /**
-     * This will add EVT_ID to the provided $this->where_clause array for EE model query parameters.
-     */
-    protected function addEventIdToWhereConditions()
-    {
-        $EVT_ID = $this->request->getRequestParam('event_id');
-        $EVT_ID = $this->request->getRequestParam('EVT_ID', $EVT_ID);
-        if ($EVT_ID) {
-            $this->where_params['EVT_ID'] = absint($EVT_ID);
-        }
-    }
-
-
-    /**
-     * Adds category ID if it exists in the request to the where conditions for the registrations query.
-     */
-    protected function addCategoryIdToWhereConditions()
-    {
-        $EVT_CAT = (int) $this->request->getRequestParam('EVT_CAT');
-        if ($EVT_CAT > 0) {
-            $this->where_params['Event.Term_Taxonomy.term_id'] = absint($EVT_CAT);
-        }
-    }
-
-
-    /**
-     * Adds the datetime ID if it exists in the request to the where conditions for the registrations query.
-     */
-    protected function addDatetimeIdToWhereConditions()
-    {
-        // first look for 'datetime_id' then 'DTT_ID' using first result as fallback default value
-        $DTT_ID = $this->request->getRequestParam('datetime_id');
-        $DTT_ID = $this->request->getRequestParam('DTT_ID', $DTT_ID);
-        if ($DTT_ID) {
-            $this->where_params['Ticket.Datetime.DTT_ID'] = absint($DTT_ID);
-        }
-    }
-
-
-    /**
-     * Adds the ticket ID if it exists in the request to the where conditions for the registrations query.
-     */
-    protected function addTicketIdToWhereConditions()
-    {
-        // first look for 'ticket_id' then 'TKT_ID' using first result as fallback default value
-        $TKT_ID = $this->request->getRequestParam('ticket_id');
-        $TKT_ID = $this->request->getRequestParam('TKT_ID', $TKT_ID);
-        if ($TKT_ID) {
-            $this->where_params['TKT_ID'] = absint($TKT_ID);
-        }
-    }
-
-
-    /**
-     * Adds the correct registration status to the where conditions for the registrations query.
-     * If filtering by registration status, then we show registrations matching that status.
-     * If not filtering by specified status, then we show all registrations excluding incomplete registrations
-     * UNLESS viewing trashed registrations.
-     */
-    protected function addRegistrationStatusToWhereConditions()
-    {
-        $registration_status = $this->request->getRequestParam('_reg_status');
-        if ($registration_status) {
-            $this->where_params['STS_ID'] = sanitize_text_field($registration_status);
-            return;
-        }
-        // make sure we exclude incomplete registrations, but only if not trashed.
-        if ($this->view === 'trash') {
-            $this->where_params['REG_deleted'] = true;
-            return;
-        }
-        $this->where_params['STS_ID'] = $this->view === 'incomplete'
-            ? EEM_Registration::status_id_incomplete
-            : ['!=', EEM_Registration::status_id_incomplete];
-    }
-
-
-    /**
-     * Adds any provided date restraints to the where conditions for the registrations query.
-     *
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function addDateToWhereConditions()
-    {
-        if ($this->view === 'today') {
-            $now = date('Y-m-d', current_time('timestamp'));
-            $this->where_params['REG_date'] = [
-                'BETWEEN',
-                [
-                    $this->registration_model->convert_datetime_for_query(
-                        'REG_date',
-                        $now . ' 00:00:00',
-                        'Y-m-d H:i:s'
-                    ),
-                    $this->registration_model->convert_datetime_for_query(
-                        'REG_date',
-                        $now . ' 23:59:59',
-                        'Y-m-d H:i:s'
-                    ),
-                ],
-            ];
-            return;
-        }
-        if ($this->view === 'month') {
-            $current_year_and_month = date('Y-m', current_time('timestamp'));
-            $days_this_month = date('t', current_time('timestamp'));
-            $this->where_params['REG_date'] = [
-                'BETWEEN',
-                [
-                    $this->registration_model->convert_datetime_for_query(
-                        'REG_date',
-                        $current_year_and_month . '-01 00:00:00',
-                        'Y-m-d H:i:s'
-                    ),
-                    $this->registration_model->convert_datetime_for_query(
-                        'REG_date',
-                        $current_year_and_month . '-' . $days_this_month . ' 23:59:59',
-                        'Y-m-d H:i:s'
-                    ),
-                ],
-            ];
-            return;
-        }
-        $month_range = $this->request->getRequestParam('month_range');
-        if ($month_range) {
-            $month_range = sanitize_text_field($month_range);
-            $pieces = explode(' ', $month_range, 3);
-            $month_requested = ! empty($pieces[0])
-                ? date('m', EEH_DTT_Helper::first_of_month_timestamp($pieces[0]))
-                : '';
-            $year_requested = ! empty($pieces[1])
-                ? $pieces[1]
-                : '';
-            // if there is not a month or year then we can't go further
-            if ($month_requested && $year_requested) {
-                $days_in_month = date('t', strtotime($year_requested . '-' . $month_requested . '-' . '01'));
-                $this->where_params['REG_date'] = [
-                    'BETWEEN',
-                    [
-                        $this->registration_model->convert_datetime_for_query(
-                            'REG_date',
-                            $year_requested . '-' . $month_requested . '-01 00:00:00',
-                            'Y-m-d H:i:s'
-                        ),
-                        $this->registration_model->convert_datetime_for_query(
-                            'REG_date',
-                            $year_requested . '-' . $month_requested . '-' . $days_in_month . ' 23:59:59',
-                            'Y-m-d H:i:s'
-                        ),
-                    ],
-                ];
-            }
-        }
-    }
-
-
-    /**
-     * Adds any provided search restraints to the where conditions for the registrations query
-     */
-    protected function addSearchToWhereConditions()
-    {
-        $search = $this->request->getRequestParam('s');
-        if ($search) {
-            $search_string = '%' . sanitize_text_field($search) . '%';
-            $this->where_params['OR*search_conditions'] = [
-                'Event.EVT_name'                          => ['LIKE', $search_string],
-                'Event.EVT_desc'                          => ['LIKE', $search_string],
-                'Event.EVT_short_desc'                    => ['LIKE', $search_string],
-                'Attendee.ATT_full_name'                  => ['LIKE', $search_string],
-                'Attendee.ATT_fname'                      => ['LIKE', $search_string],
-                'Attendee.ATT_lname'                      => ['LIKE', $search_string],
-                'Attendee.ATT_short_bio'                  => ['LIKE', $search_string],
-                'Attendee.ATT_email'                      => ['LIKE', $search_string],
-                'Attendee.ATT_address'                    => ['LIKE', $search_string],
-                'Attendee.ATT_address2'                   => ['LIKE', $search_string],
-                'Attendee.ATT_city'                       => ['LIKE', $search_string],
-                'REG_final_price'                         => ['LIKE', $search_string],
-                'REG_code'                                => ['LIKE', $search_string],
-                'REG_count'                               => ['LIKE', $search_string],
-                'REG_group_size'                          => ['LIKE', $search_string],
-                'Ticket.TKT_name'                         => ['LIKE', $search_string],
-                'Ticket.TKT_description'                  => ['LIKE', $search_string],
-                'Transaction.Payment.PAY_txn_id_chq_nmbr' => ['LIKE', $search_string],
-            ];
-        }
-    }
-
-
-    /**
-     * Sets up the orderby for the registrations query.
-     *
-     * @return array
-     */
-    protected function getOrderbyClause()
-    {
-        $orderby_field = $this->request->getRequestParam('orderby');
-        $orderby_field = $orderby_field ? sanitize_text_field($orderby_field) : '_REG_date';
-        switch ($orderby_field) {
-            case '_REG_ID':
-                $orderby = ['REG_ID'];
-                break;
-            case '_Reg_status':
-                $orderby = ['STS_ID'];
-                break;
-            case 'ATT_fname':
-                $orderby = ['Attendee.ATT_fname', 'Attendee.ATT_lname'];
-                break;
-            case 'ATT_lname':
-                $orderby = ['Attendee.ATT_lname', 'Attendee.ATT_fname'];
-                break;
-            case 'event_name':
-                $orderby = ['Event.EVT_name'];
-                break;
-            case 'DTT_EVT_start':
-                $orderby = ['Event.Datetime.DTT_EVT_start'];
-                break;
-            case '_REG_date':
-                $orderby = ['REG_date'];
-                break;
-            default:
-                $orderby = [$orderby_field];
-                break;
-        }
-        $order = $this->request->getRequestParam('order');
-        $order = $order ? sanitize_text_field($order) : 'DESC';
-
-        $orderby = array_combine(
-            $orderby,
-            array_fill(0, count($orderby), $order)
-        );
-        // because there are many registrations with the same date, define
-        // a secondary way to order them, otherwise MySQL seems to be a bit random
-        if (empty($orderby['REG_ID'])) {
-            $orderby['REG_ID'] = $order;
-        }
-
-        $orderby = apply_filters(
-            'FHEE__Registrations_Admin_Page___get_orderby_for_registrations_query',
-            $orderby,
-            $this->request->requestParams()
-        );
-        return ['order_by' => $orderby];
-    }
-
-
-    /**
-     * Sets up the limit for the registrations query.
-     *
-     * @param $per_page
-     * @return array
-     */
-    protected function getLimitClause($per_page)
-    {
-        $current_page = $this->request->getRequestParam('paged');
-        $current_page = $current_page ? absint($current_page) : 1;
-        $per_page = (int) $this->request->getRequestParam('perpage', $per_page);
-        // -1 means return all results so get out if that's set.
-        if ($per_page === -1) {
-            return [];
-        }
-        $per_page = absint($per_page);
-        $offset = ($current_page - 1) * $per_page;
-        return ['limit' => [$offset, $per_page]];
-    }
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var EEM_Registration $registration_model
+	 */
+	protected $registration_model;
+
+	/**
+	 * @var string $view
+	 */
+	protected $view;
+
+	/**
+	 * @var array $where_params
+	 */
+	protected $where_params;
+
+
+	/**
+	 * QueryBuilder constructor.
+	 *
+	 * @param array            $extra_request_params
+	 * @param RequestInterface $request
+	 * @param EEM_Registration $registration_model
+	 */
+	public function __construct(
+		array $extra_request_params,
+		RequestInterface $request,
+		EEM_Registration $registration_model
+	) {
+		$this->request = $request;
+		$this->registration_model = $registration_model;
+		foreach ($extra_request_params as $key => $value) {
+			$this->request->setRequestParam($key, $value);
+		}
+		$this->view = $this->request->getRequestParam('status', '');
+		$this->where_params = [];
+	}
+
+
+	/**
+	 * Sets up the where conditions for the registrations query.
+	 *
+	 * @param int  $per_page
+	 * @param bool $count_query
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function getQueryParams($per_page = 10, $count_query = false)
+	{
+		$query_params = [
+			0                          => $this->getWhereClause(),
+			'caps'                     => EEM_Registration::caps_read_admin,
+			'default_where_conditions' => 'this_model_only',
+		];
+		if (! $count_query) {
+			$query_params = array_merge(
+				$query_params,
+				$this->getOrderbyClause(),
+				$this->getLimitClause($per_page)
+			);
+		}
+
+		return $query_params;
+	}
+
+
+	/**
+	 * Sets up the where conditions for the registrations query.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function getWhereClause()
+	{
+		$this->addAttendeeIdToWhereConditions();
+		$this->addEventIdToWhereConditions();
+		$this->addCategoryIdToWhereConditions();
+		$this->addDatetimeIdToWhereConditions();
+		$this->addTicketIdToWhereConditions();
+		$this->addRegistrationStatusToWhereConditions();
+		$this->addDateToWhereConditions();
+		$this->addSearchToWhereConditions();
+		return apply_filters(
+			'FHEE__Registrations_Admin_Page___get_where_conditions_for_registrations_query',
+			$this->where_params,
+			$this->request->requestParams()
+		);
+	}
+
+
+	/**
+	 * This will add ATT_ID to the provided $this->where_clause array for EE model query parameters.
+	 */
+	protected function addAttendeeIdToWhereConditions()
+	{
+		$ATT_ID = $this->request->getRequestParam('attendee_id');
+		$ATT_ID = $this->request->getRequestParam('ATT_ID', $ATT_ID);
+		if ($ATT_ID) {
+			$this->where_params['ATT_ID'] = absint($ATT_ID);
+		}
+	}
+
+
+	/**
+	 * This will add EVT_ID to the provided $this->where_clause array for EE model query parameters.
+	 */
+	protected function addEventIdToWhereConditions()
+	{
+		$EVT_ID = $this->request->getRequestParam('event_id');
+		$EVT_ID = $this->request->getRequestParam('EVT_ID', $EVT_ID);
+		if ($EVT_ID) {
+			$this->where_params['EVT_ID'] = absint($EVT_ID);
+		}
+	}
+
+
+	/**
+	 * Adds category ID if it exists in the request to the where conditions for the registrations query.
+	 */
+	protected function addCategoryIdToWhereConditions()
+	{
+		$EVT_CAT = (int) $this->request->getRequestParam('EVT_CAT');
+		if ($EVT_CAT > 0) {
+			$this->where_params['Event.Term_Taxonomy.term_id'] = absint($EVT_CAT);
+		}
+	}
+
+
+	/**
+	 * Adds the datetime ID if it exists in the request to the where conditions for the registrations query.
+	 */
+	protected function addDatetimeIdToWhereConditions()
+	{
+		// first look for 'datetime_id' then 'DTT_ID' using first result as fallback default value
+		$DTT_ID = $this->request->getRequestParam('datetime_id');
+		$DTT_ID = $this->request->getRequestParam('DTT_ID', $DTT_ID);
+		if ($DTT_ID) {
+			$this->where_params['Ticket.Datetime.DTT_ID'] = absint($DTT_ID);
+		}
+	}
+
+
+	/**
+	 * Adds the ticket ID if it exists in the request to the where conditions for the registrations query.
+	 */
+	protected function addTicketIdToWhereConditions()
+	{
+		// first look for 'ticket_id' then 'TKT_ID' using first result as fallback default value
+		$TKT_ID = $this->request->getRequestParam('ticket_id');
+		$TKT_ID = $this->request->getRequestParam('TKT_ID', $TKT_ID);
+		if ($TKT_ID) {
+			$this->where_params['TKT_ID'] = absint($TKT_ID);
+		}
+	}
+
+
+	/**
+	 * Adds the correct registration status to the where conditions for the registrations query.
+	 * If filtering by registration status, then we show registrations matching that status.
+	 * If not filtering by specified status, then we show all registrations excluding incomplete registrations
+	 * UNLESS viewing trashed registrations.
+	 */
+	protected function addRegistrationStatusToWhereConditions()
+	{
+		$registration_status = $this->request->getRequestParam('_reg_status');
+		if ($registration_status) {
+			$this->where_params['STS_ID'] = sanitize_text_field($registration_status);
+			return;
+		}
+		// make sure we exclude incomplete registrations, but only if not trashed.
+		if ($this->view === 'trash') {
+			$this->where_params['REG_deleted'] = true;
+			return;
+		}
+		$this->where_params['STS_ID'] = $this->view === 'incomplete'
+			? EEM_Registration::status_id_incomplete
+			: ['!=', EEM_Registration::status_id_incomplete];
+	}
+
+
+	/**
+	 * Adds any provided date restraints to the where conditions for the registrations query.
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function addDateToWhereConditions()
+	{
+		if ($this->view === 'today') {
+			$now = date('Y-m-d', current_time('timestamp'));
+			$this->where_params['REG_date'] = [
+				'BETWEEN',
+				[
+					$this->registration_model->convert_datetime_for_query(
+						'REG_date',
+						$now . ' 00:00:00',
+						'Y-m-d H:i:s'
+					),
+					$this->registration_model->convert_datetime_for_query(
+						'REG_date',
+						$now . ' 23:59:59',
+						'Y-m-d H:i:s'
+					),
+				],
+			];
+			return;
+		}
+		if ($this->view === 'month') {
+			$current_year_and_month = date('Y-m', current_time('timestamp'));
+			$days_this_month = date('t', current_time('timestamp'));
+			$this->where_params['REG_date'] = [
+				'BETWEEN',
+				[
+					$this->registration_model->convert_datetime_for_query(
+						'REG_date',
+						$current_year_and_month . '-01 00:00:00',
+						'Y-m-d H:i:s'
+					),
+					$this->registration_model->convert_datetime_for_query(
+						'REG_date',
+						$current_year_and_month . '-' . $days_this_month . ' 23:59:59',
+						'Y-m-d H:i:s'
+					),
+				],
+			];
+			return;
+		}
+		$month_range = $this->request->getRequestParam('month_range');
+		if ($month_range) {
+			$month_range = sanitize_text_field($month_range);
+			$pieces = explode(' ', $month_range, 3);
+			$month_requested = ! empty($pieces[0])
+				? date('m', EEH_DTT_Helper::first_of_month_timestamp($pieces[0]))
+				: '';
+			$year_requested = ! empty($pieces[1])
+				? $pieces[1]
+				: '';
+			// if there is not a month or year then we can't go further
+			if ($month_requested && $year_requested) {
+				$days_in_month = date('t', strtotime($year_requested . '-' . $month_requested . '-' . '01'));
+				$this->where_params['REG_date'] = [
+					'BETWEEN',
+					[
+						$this->registration_model->convert_datetime_for_query(
+							'REG_date',
+							$year_requested . '-' . $month_requested . '-01 00:00:00',
+							'Y-m-d H:i:s'
+						),
+						$this->registration_model->convert_datetime_for_query(
+							'REG_date',
+							$year_requested . '-' . $month_requested . '-' . $days_in_month . ' 23:59:59',
+							'Y-m-d H:i:s'
+						),
+					],
+				];
+			}
+		}
+	}
+
+
+	/**
+	 * Adds any provided search restraints to the where conditions for the registrations query
+	 */
+	protected function addSearchToWhereConditions()
+	{
+		$search = $this->request->getRequestParam('s');
+		if ($search) {
+			$search_string = '%' . sanitize_text_field($search) . '%';
+			$this->where_params['OR*search_conditions'] = [
+				'Event.EVT_name'                          => ['LIKE', $search_string],
+				'Event.EVT_desc'                          => ['LIKE', $search_string],
+				'Event.EVT_short_desc'                    => ['LIKE', $search_string],
+				'Attendee.ATT_full_name'                  => ['LIKE', $search_string],
+				'Attendee.ATT_fname'                      => ['LIKE', $search_string],
+				'Attendee.ATT_lname'                      => ['LIKE', $search_string],
+				'Attendee.ATT_short_bio'                  => ['LIKE', $search_string],
+				'Attendee.ATT_email'                      => ['LIKE', $search_string],
+				'Attendee.ATT_address'                    => ['LIKE', $search_string],
+				'Attendee.ATT_address2'                   => ['LIKE', $search_string],
+				'Attendee.ATT_city'                       => ['LIKE', $search_string],
+				'REG_final_price'                         => ['LIKE', $search_string],
+				'REG_code'                                => ['LIKE', $search_string],
+				'REG_count'                               => ['LIKE', $search_string],
+				'REG_group_size'                          => ['LIKE', $search_string],
+				'Ticket.TKT_name'                         => ['LIKE', $search_string],
+				'Ticket.TKT_description'                  => ['LIKE', $search_string],
+				'Transaction.Payment.PAY_txn_id_chq_nmbr' => ['LIKE', $search_string],
+			];
+		}
+	}
+
+
+	/**
+	 * Sets up the orderby for the registrations query.
+	 *
+	 * @return array
+	 */
+	protected function getOrderbyClause()
+	{
+		$orderby_field = $this->request->getRequestParam('orderby');
+		$orderby_field = $orderby_field ? sanitize_text_field($orderby_field) : '_REG_date';
+		switch ($orderby_field) {
+			case '_REG_ID':
+				$orderby = ['REG_ID'];
+				break;
+			case '_Reg_status':
+				$orderby = ['STS_ID'];
+				break;
+			case 'ATT_fname':
+				$orderby = ['Attendee.ATT_fname', 'Attendee.ATT_lname'];
+				break;
+			case 'ATT_lname':
+				$orderby = ['Attendee.ATT_lname', 'Attendee.ATT_fname'];
+				break;
+			case 'event_name':
+				$orderby = ['Event.EVT_name'];
+				break;
+			case 'DTT_EVT_start':
+				$orderby = ['Event.Datetime.DTT_EVT_start'];
+				break;
+			case '_REG_date':
+				$orderby = ['REG_date'];
+				break;
+			default:
+				$orderby = [$orderby_field];
+				break;
+		}
+		$order = $this->request->getRequestParam('order');
+		$order = $order ? sanitize_text_field($order) : 'DESC';
+
+		$orderby = array_combine(
+			$orderby,
+			array_fill(0, count($orderby), $order)
+		);
+		// because there are many registrations with the same date, define
+		// a secondary way to order them, otherwise MySQL seems to be a bit random
+		if (empty($orderby['REG_ID'])) {
+			$orderby['REG_ID'] = $order;
+		}
+
+		$orderby = apply_filters(
+			'FHEE__Registrations_Admin_Page___get_orderby_for_registrations_query',
+			$orderby,
+			$this->request->requestParams()
+		);
+		return ['order_by' => $orderby];
+	}
+
+
+	/**
+	 * Sets up the limit for the registrations query.
+	 *
+	 * @param $per_page
+	 * @return array
+	 */
+	protected function getLimitClause($per_page)
+	{
+		$current_page = $this->request->getRequestParam('paged');
+		$current_page = $current_page ? absint($current_page) : 1;
+		$per_page = (int) $this->request->getRequestParam('perpage', $per_page);
+		// -1 means return all results so get out if that's set.
+		if ($per_page === -1) {
+			return [];
+		}
+		$per_page = absint($per_page);
+		$offset = ($current_page - 1) * $per_page;
+		return ['limit' => [$offset, $per_page]];
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -82,7 +82,7 @@ 
             'caps'                     => EEM_Registration::caps_read_admin,
             'default_where_conditions' => 'this_model_only',
         ];
-        if (! $count_query) {
+        if ( ! $count_query) {
             $query_params = array_merge(
                 $query_params,
                 $this->getOrderbyClause(),
@@ -228,12 +228,12 @@ 
                 [
                     $this->registration_model->convert_datetime_for_query(
                         'REG_date',
-                        $now . ' 00:00:00',
+                        $now.' 00:00:00',
                         'Y-m-d H:i:s'
                     ),
                     $this->registration_model->convert_datetime_for_query(
                         'REG_date',
-                        $now . ' 23:59:59',
+                        $now.' 23:59:59',
                         'Y-m-d H:i:s'
                     ),
                 ],
@@ -248,12 +248,12 @@ 
                 [
                     $this->registration_model->convert_datetime_for_query(
                         'REG_date',
-                        $current_year_and_month . '-01 00:00:00',
+                        $current_year_and_month.'-01 00:00:00',
                         'Y-m-d H:i:s'
                     ),
                     $this->registration_model->convert_datetime_for_query(
                         'REG_date',
-                        $current_year_and_month . '-' . $days_this_month . ' 23:59:59',
+                        $current_year_and_month.'-'.$days_this_month.' 23:59:59',
                         'Y-m-d H:i:s'
                     ),
                 ],
@@ -272,18 +272,18 @@ 
                 : '';
             // if there is not a month or year then we can't go further
             if ($month_requested && $year_requested) {
-                $days_in_month = date('t', strtotime($year_requested . '-' . $month_requested . '-' . '01'));
+                $days_in_month = date('t', strtotime($year_requested.'-'.$month_requested.'-'.'01'));
                 $this->where_params['REG_date'] = [
                     'BETWEEN',
                     [
                         $this->registration_model->convert_datetime_for_query(
                             'REG_date',
-                            $year_requested . '-' . $month_requested . '-01 00:00:00',
+                            $year_requested.'-'.$month_requested.'-01 00:00:00',
                             'Y-m-d H:i:s'
                         ),
                         $this->registration_model->convert_datetime_for_query(
                             'REG_date',
-                            $year_requested . '-' . $month_requested . '-' . $days_in_month . ' 23:59:59',
+                            $year_requested.'-'.$month_requested.'-'.$days_in_month.' 23:59:59',
                             'Y-m-d H:i:s'
                         ),
                     ],
@@ -300,7 +300,7 @@ 
     {
         $search = $this->request->getRequestParam('s');
         if ($search) {
-            $search_string = '%' . sanitize_text_field($search) . '%';
+            $search_string = '%'.sanitize_text_field($search).'%';
             $this->where_params['OR*search_conditions'] = [
                 'Event.EVT_name'                          => ['LIKE', $search_string],
                 'Event.EVT_desc'                          => ['LIKE', $search_string],

core/domain/services/contexts/RequestTypeContextFactory.php

Indentation +120 added lines, -120 removed lines

@@ -17,128 +17,128 @@
 class RequestTypeContextFactory implements RequestTypeContextFactoryInterface
 {
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * RequestTypeContextFactory constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * RequestTypeContextFactory constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * @param string $slug
-     * @return RequestTypeContext
-     */
-    public function create($slug)
-    {
-        switch ($slug) {
-            case RequestTypeContext::ACTIVATION:
-                $description = esc_html__(
-                    'The current request is for some form of activation',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::API:
-                $description = esc_html__(
-                    'The current request is for the EE REST API',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_FRONT:
-                $description = esc_html__(
-                    'The current request is for the frontend via AJAX',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_ADMIN:
-                $description = esc_html__(
-                    'The current request is for the admin via AJAX',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_HEARTBEAT:
-                $description = esc_html__(
-                    'The current request is for the WP Heartbeat',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_OTHER:
-                $description = esc_html__(
-                    'The current request is for non-EE related code via AJAX',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::CRON:
-                $description = esc_html__(
-                    'The current request is for a WP_Cron',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::CLI:
-                $description = esc_html__(
-                    'The current request is from the command line',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::ADMIN:
-                $description = esc_html__(
-                    'The current request is for the admin',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::IFRAME:
-                $description = esc_html__(
-                    'The current request is for an iframe',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::FEED:
-                $description = esc_html__(
-                    'The current request is for a feed (ie: RSS)',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::GQL:
-                $description = esc_html__(
-                    'The current request is for the EE GraphQL Manager',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::WP_API:
-                $description = esc_html__(
-                    'The current request is for the WordPress REST API',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::WP_SCRAPE:
-                $description = esc_html__(
-                    'The current request is for a WordPress loopback scrape',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::FRONTEND:
-            default:
-                $description = esc_html__(
-                    'The current request is for the frontend',
-                    'event_espresso'
-                );
-                break;
-        }
-        // we're using the Loader with sharing turned on,
-        // so that the generated RequestTypeContext object is accessible anywhere
-        // by simply requesting it again from the loader
-        return $this->loader->getShared(
-            'EventEspresso\core\domain\entities\contexts\RequestTypeContext',
-            array($slug, $description)
-        );
-    }
+	/**
+	 * @param string $slug
+	 * @return RequestTypeContext
+	 */
+	public function create($slug)
+	{
+		switch ($slug) {
+			case RequestTypeContext::ACTIVATION:
+				$description = esc_html__(
+					'The current request is for some form of activation',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::API:
+				$description = esc_html__(
+					'The current request is for the EE REST API',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_FRONT:
+				$description = esc_html__(
+					'The current request is for the frontend via AJAX',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_ADMIN:
+				$description = esc_html__(
+					'The current request is for the admin via AJAX',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_HEARTBEAT:
+				$description = esc_html__(
+					'The current request is for the WP Heartbeat',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_OTHER:
+				$description = esc_html__(
+					'The current request is for non-EE related code via AJAX',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::CRON:
+				$description = esc_html__(
+					'The current request is for a WP_Cron',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::CLI:
+				$description = esc_html__(
+					'The current request is from the command line',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::ADMIN:
+				$description = esc_html__(
+					'The current request is for the admin',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::IFRAME:
+				$description = esc_html__(
+					'The current request is for an iframe',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::FEED:
+				$description = esc_html__(
+					'The current request is for a feed (ie: RSS)',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::GQL:
+				$description = esc_html__(
+					'The current request is for the EE GraphQL Manager',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::WP_API:
+				$description = esc_html__(
+					'The current request is for the WordPress REST API',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::WP_SCRAPE:
+				$description = esc_html__(
+					'The current request is for a WordPress loopback scrape',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::FRONTEND:
+			default:
+				$description = esc_html__(
+					'The current request is for the frontend',
+					'event_espresso'
+				);
+				break;
+		}
+		// we're using the Loader with sharing turned on,
+		// so that the generated RequestTypeContext object is accessible anywhere
+		// by simply requesting it again from the loader
+		return $this->loader->getShared(
+			'EventEspresso\core\domain\entities\contexts\RequestTypeContext',
+			array($slug, $description)
+		);
+	}
 }

core/domain/services/converters/json/DatetimeToJson.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
         $jsonDates = [];
         foreach ($datetimes as $datetime) {
             if ($datetime instanceof EE_Datetime) {
-                $jsonDates[ $datetime->ID() ] = $this->convertAndEncode($datetime);
+                $jsonDates[$datetime->ID()] = $this->convertAndEncode($datetime);
             }
         }
         return $jsonDates;
@@ -75,7 +75,7 @@ 
         $arrayOfDates = [];
         foreach ($datetimes as $datetime) {
             if ($datetime instanceof EE_Datetime) {
-                $arrayOfDates[ $datetime->ID() ] = $this->convert($datetime);
+                $arrayOfDates[$datetime->ID()] = $this->convert($datetime);
             }
         }
         return $arrayOfDates;
@@ -127,7 +127,7 @@ 
         $jsonDates = [];
         foreach ($datetimes as $datetime) {
             if ($datetime instanceof EE_Datetime) {
-                $jsonDates[ $datetime->ID() ] = $this->encode($datetime);
+                $jsonDates[$datetime->ID()] = $this->encode($datetime);
             }
         }
         return $jsonDates;

Indentation +111 added lines, -111 removed lines

@@ -22,125 +22,125 @@
 class DatetimeToJson implements ModelObjectToJsonConverterInterface
 {
 
-    /**
-     * @param EE_Datetime[] $datetimes
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function convertAndEncodeArrayOf(array $datetimes)
-    {
-        $jsonDates = [];
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                $jsonDates[ $datetime->ID() ] = $this->convertAndEncode($datetime);
-            }
-        }
-        return $jsonDates;
-    }
+	/**
+	 * @param EE_Datetime[] $datetimes
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function convertAndEncodeArrayOf(array $datetimes)
+	{
+		$jsonDates = [];
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$jsonDates[ $datetime->ID() ] = $this->convertAndEncode($datetime);
+			}
+		}
+		return $jsonDates;
+	}
 
 
-    /**
-     * @param EE_Datetime $datetime
-     * @return false|string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function convertAndEncode($datetime)
-    {
-        return $datetime instanceof EE_Datetime ? $this->encode($this->convert($datetime)) : false;
-    }
+	/**
+	 * @param EE_Datetime $datetime
+	 * @return false|string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function convertAndEncode($datetime)
+	{
+		return $datetime instanceof EE_Datetime ? $this->encode($this->convert($datetime)) : false;
+	}
 
 
-    /**
-     * @param EE_Datetime[] $datetimes
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function convertArrayOf(array $datetimes)
-    {
-        $arrayOfDates = [];
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                $arrayOfDates[ $datetime->ID() ] = $this->convert($datetime);
-            }
-        }
-        return $arrayOfDates;
-    }
+	/**
+	 * @param EE_Datetime[] $datetimes
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function convertArrayOf(array $datetimes)
+	{
+		$arrayOfDates = [];
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$arrayOfDates[ $datetime->ID() ] = $this->convert($datetime);
+			}
+		}
+		return $arrayOfDates;
+	}
 
 
-    /**
-     * @param EE_Datetime $datetime
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function convert($datetime)
-    {
-        return $datetime instanceof EE_Datetime ? [
-            'DTT_ID'          => $datetime->ID(),
-            'EVT_ID'          => $datetime->event() instanceof EE_Event ? $datetime->event()->ID() : 0,
-            'DTT_name'        => $datetime->name(),
-            'DTT_description' => $datetime->description(),
-            'DTT_EVT_start'   => $datetime->start_date(DATE_ATOM),
-            'DTT_EVT_end'     => $datetime->end_date(DATE_ATOM),
-            'DTT_sold'        => $datetime->sold(),
-            'DTT_reserved'    => $datetime->reserved(),
-            'DTT_reg_limit'   => $datetime->reg_limit() === INF ? -1 : $datetime->reg_limit(),
-            'DTT_is_primary'  => $datetime->get_active_status(),
-            'DTT_order'       => $datetime->order(),
-            'DTT_parent'      => $datetime->parent(),
-            'DTT_deleted'     => $datetime->get('DTT_deleted'),
-        ] : [];
-    }
+	/**
+	 * @param EE_Datetime $datetime
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function convert($datetime)
+	{
+		return $datetime instanceof EE_Datetime ? [
+			'DTT_ID'          => $datetime->ID(),
+			'EVT_ID'          => $datetime->event() instanceof EE_Event ? $datetime->event()->ID() : 0,
+			'DTT_name'        => $datetime->name(),
+			'DTT_description' => $datetime->description(),
+			'DTT_EVT_start'   => $datetime->start_date(DATE_ATOM),
+			'DTT_EVT_end'     => $datetime->end_date(DATE_ATOM),
+			'DTT_sold'        => $datetime->sold(),
+			'DTT_reserved'    => $datetime->reserved(),
+			'DTT_reg_limit'   => $datetime->reg_limit() === INF ? -1 : $datetime->reg_limit(),
+			'DTT_is_primary'  => $datetime->get_active_status(),
+			'DTT_order'       => $datetime->order(),
+			'DTT_parent'      => $datetime->parent(),
+			'DTT_deleted'     => $datetime->get('DTT_deleted'),
+		] : [];
+	}
 
 
-    /**
-     * @param EE_Datetime[] $datetimes
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function encodeArrayOf(array $datetimes)
-    {
-        $jsonDates = [];
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                $jsonDates[ $datetime->ID() ] = $this->encode($datetime);
-            }
-        }
-        return $jsonDates;
-    }
+	/**
+	 * @param EE_Datetime[] $datetimes
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function encodeArrayOf(array $datetimes)
+	{
+		$jsonDates = [];
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$jsonDates[ $datetime->ID() ] = $this->encode($datetime);
+			}
+		}
+		return $jsonDates;
+	}
 
 
-    /**
-     * @param array $datetime_array
-     * @return false|string
-     * @since $VID:$
-     */
-    public function encode(array $datetime_array)
-    {
-        return wp_json_encode($datetime_array);
-    }
+	/**
+	 * @param array $datetime_array
+	 * @return false|string
+	 * @since $VID:$
+	 */
+	public function encode(array $datetime_array)
+	{
+		return wp_json_encode($datetime_array);
+	}
 }

modules/single_page_checkout/reg_steps/attendee_information/attendee_info_main.template.php

Indentation +32 added lines, -32 removed lines

@@ -6,16 +6,16 @@ 
 <?php if (!is_admin()) : ?>
     <p id="spco-attendee_information-pg" class="spco-steps-pg small-text drk-grey-text">
         <?php echo apply_filters(
-            'FHEE__registration_page_attendee_information__attendee_information_pg',
-            sprintf(
-                __(
-                    'In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.',
-                    'event_espresso'
-                ),
-                '<br />',
-                '<span class="asterisk">*</span>'
-            )
-        ); ?>
+			'FHEE__registration_page_attendee_information__attendee_information_pg',
+			sprintf(
+				__(
+					'In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.',
+					'event_espresso'
+				),
+				'<br />',
+				'<span class="asterisk">*</span>'
+			)
+		); ?>
 </p>
 <?php endif; ?>
 
@@ -25,10 +25,10 @@ 
 $prev_ticket = 0;
 
 if (count($registrations) > 0) {
-    foreach ($registrations as $registration) {
-        if ($registration instanceof EE_Registration) {
-            $att_nmbr++;
-            ?>
+	foreach ($registrations as $registration) {
+		if ($registration instanceof EE_Registration) {
+			$att_nmbr++;
+			?>
 
             <div id="spco-attendee-panel-dv-<?php echo $registration->reg_url_link(); ?>"
                  class="spco-attendee-panel-dv spco-attendee-ticket-<?php echo $registration->ticket()->ID(); ?>">
@@ -50,19 +50,19 @@ 
                                     <th scope="col" width="" class="jst-left"><?php _e('Name and Description', 'event_espresso'); ?></th>
                                     <th scope="col" width="7.5%" class="jst-rght">
                                         <?php _e(
-                                            'Qty',
-                                            'event_espresso'
-                                        ); ?></th>
+											'Qty',
+											'event_espresso'
+										); ?></th>
                                     <th scope="col" width="17.5%" class="jst-rght">
                                         <?php _e(
-                                            'Price',
-                                            'event_espresso'
-                                        ); ?></th>
+											'Price',
+											'event_espresso'
+										); ?></th>
                                     <th scope="col" width="17.5%" class="jst-rght">
                                         <?php _e(
-                                            'Total',
-                                            'event_espresso'
-                                        ); ?></th>
+											'Total',
+											'event_espresso'
+										); ?></th>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -74,19 +74,19 @@ 
                 <?php } ?>
 
                 <?php
-                // ATTENDEE QUESTIONS
-                $reg_form = EE_Template_Layout::get_subform_name($registration->reg_url_link());
-                echo ${$reg_form};
-                ?>
+				// ATTENDEE QUESTIONS
+				$reg_form = EE_Template_Layout::get_subform_name($registration->reg_url_link());
+				echo ${$reg_form};
+				?>
 
             </div>
             <?php
-            $prev_event = $registration->event()->ID();
-            $prev_ticket = $registration->ticket()->ID();
-        } // if ( $registration instanceof EE_Registration )
-    } // end foreach ( $registrations as $registration )
+			$prev_event = $registration->event()->ID();
+			$prev_ticket = $registration->ticket()->ID();
+		} // if ( $registration instanceof EE_Registration )
+	} // end foreach ( $registrations as $registration )
 
-    echo $default_hidden_inputs;
+	echo $default_hidden_inputs;
 } // end if ( count( $registrations ) > 0 )
 
 ?>

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 /** @var array $ticket_line_item */
 /** @var string $default_hidden_inputs */
 ?>
-<?php if (!is_admin()) : ?>
+<?php if ( ! is_admin()) : ?>
     <p id="spco-attendee_information-pg" class="spco-steps-pg small-text drk-grey-text">
         <?php echo apply_filters(
             'FHEE__registration_page_attendee_information__attendee_information_pg',
@@ -33,15 +33,15 @@ 
             <div id="spco-attendee-panel-dv-<?php echo $registration->reg_url_link(); ?>"
                  class="spco-attendee-panel-dv spco-attendee-ticket-<?php echo $registration->ticket()->ID(); ?>">
 
-                <?php if (!is_admin() && $registration->event()->ID() !== $prev_event) { ?>
+                <?php if ( ! is_admin() && $registration->event()->ID() !== $prev_event) { ?>
                     <h4 id="event_title-<?php echo $registration->event()->ID() ?>" class="big-event-title-hdr">
                         <?php echo $registration->event()->name(); ?>
                     </h4>
                 <?php } ?>
                 <?php if ($registration->ticket()->ID() !== $prev_ticket) { ?>
-                    <?php if (! $revisit) { ?>
+                    <?php if ( ! $revisit) { ?>
                         <div class="spco-ticket-info-dv small-text">
-                            <?php if (!is_admin()) : ?>
+                            <?php if ( ! is_admin()) : ?>
                                 <h5><?php _e('Details', 'event_espresso'); ?></h5>
                             <?php endif; ?>
                             <table class="spco-ticket-details">
@@ -66,7 +66,7 @@ 
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <?php echo $ticket_line_item[ $registration->ticket()->ID() ]; ?>
+                                <?php echo $ticket_line_item[$registration->ticket()->ID()]; ?>
                                 </tbody>
                             </table>
                         </div>

core/services/assets/AssetManager.php

Spacing +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
         $version = ''
     ) {
         $dev_suffix = wp_scripts_get_suffix('dev');
-        $vendor_path = $this->domain->pluginUrl() . 'assets/vendor/';
+        $vendor_path = $this->domain->pluginUrl().'assets/vendor/';
         return $this->addJavascript(
             $handle,
             "{$vendor_path}{$handle}{$dev_suffix}.js",

Indentation +323 added lines, -323 removed lines

@@ -23,332 +23,332 @@
 abstract class AssetManager implements AssetManagerInterface
 {
 
-    /**
-     * @var AssetCollection|Asset[] $assets
-     */
-    protected $assets;
-
-    /**
-     * @var DomainInterface
-     */
-    protected $domain;
-
-    /**
-     * @var Registry $registry
-     */
-    protected $registry;
-
-
-    /**
-     * AssetRegister constructor.
-     *
-     * @param DomainInterface $domain
-     * @param AssetCollection $assets
-     * @param Registry        $registry
-     */
-    public function __construct(DomainInterface $domain, AssetCollection $assets, Registry $registry)
-    {
-        $this->domain = $domain;
-        $this->assets = $assets;
-        $this->registry = $registry;
-        $this->registry->addAssetCollection($assets);
-        add_action('wp_enqueue_scripts', array($this, 'addAssets'), 2);
-        add_action('admin_enqueue_scripts', array($this, 'addAssets'), 2);
-    }
-
-
-    /**
-     * @return AssetCollection
-     */
-    public function getAssets()
-    {
-        return $this->assets;
-    }
-
-
-    /**
-     * @since 4.9.71.p
-     * @return string
-     */
-    public function assetNamespace()
-    {
-        return $this->domain->assetNamespace();
-    }
-
-
-    /**
-     * @param string $handle
-     * @param string $source
-     * @param array  $dependencies
-     * @param bool   $load_in_footer
-     * @param string $version
-     * @return JavascriptAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     * @since 4.9.62.p
-     */
-    public function addJavascript(
-        $handle,
-        $source,
-        array $dependencies = array(),
-        $load_in_footer = true,
-        $version = ''
-    ) {
-        $asset = new JavascriptAsset(
-            $handle,
-            $source,
-            array_unique($dependencies),
-            $load_in_footer,
-            $this->domain,
-            $version
-        );
-        $this->assets->add($asset, $handle);
-        return $asset;
-    }
-
-
-    /**
-     * Used to register a javascript asset where everything is dynamically derived from the given handle.
-     *
-     * @param string       $handle
-     * @param string|array $extra_dependencies
-     * @return JavascriptAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     */
-    public function addJs($handle, $extra_dependencies = [])
-    {
-        $details = $this->getAssetDetails(
-            Asset::TYPE_JS,
-            $handle,
-            $extra_dependencies
-        );
-        $source = $this->registry->getJsUrl($this->domain->assetNamespace(), $handle);
-        return $this->addJavascript(
-            $handle,
-            $source,
-            $details['dependencies'],
-            true,
-            $details['version']
-        );
-    }
-
-
-    /**
-     * @param string $handle
-     * @param array  $dependencies
-     * @param bool   $load_in_footer
-     * @param string $version
-     * @return JavascriptAsset
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.71.p
-     */
-    public function addVendorJavascript(
-        $handle,
-        array $dependencies = array(),
-        $load_in_footer = true,
-        $version = ''
-    ) {
-        $dev_suffix = wp_scripts_get_suffix('dev');
-        $vendor_path = $this->domain->pluginUrl() . 'assets/vendor/';
-        return $this->addJavascript(
-            $handle,
-            "{$vendor_path}{$handle}{$dev_suffix}.js",
-            $dependencies,
-            $load_in_footer,
-            $version
-        );
-    }
-
-
-    /**
-     * @param string $handle
-     * @param string $source
-     * @param array  $dependencies
-     * @param string $media
-     * @param string $version
-     * @return StylesheetAsset
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.62.p
-     */
-    public function addStylesheet(
-        $handle,
-        $source,
-        array $dependencies = array(),
-        $media = 'all',
-        $version = ''
-    ) {
-        $asset = new StylesheetAsset(
-            $handle,
-            $source,
-            array_unique($dependencies),
-            $this->domain,
-            $media,
-            $version
-        );
-        $this->assets->add($asset, $handle);
-        return $asset;
-    }
-
-
-    /**
-     * Used to register a css asset where everything is dynamically derived from the given handle.
-     *
-     * @param string       $handle
-     * @param string|array $extra_dependencies
-     * @return StylesheetAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     */
-    public function addCss($handle, $extra_dependencies = [])
-    {
-        $details = $this->getAssetDetails(
-            Asset::TYPE_CSS,
-            $handle,
-            $extra_dependencies
-        );
-        return $this->addStylesheet(
-            $handle,
-            $this->registry->getCssUrl($this->domain->assetNamespace(), $handle),
-            $details['dependencies'],
-            'all',
-            $details['version']
-        );
-    }
-
-
-    /**
-     * @param string $handle
-     * @return bool
-     * @since 4.9.62.p
-     */
-    public function enqueueAsset($handle)
-    {
-        if ($this->assets->has($handle)) {
-            /** @var Asset $asset */
-            $asset = $this->assets->get($handle);
-            if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
-                $asset->enqueueAsset();
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @return  void
-     * @since   $VID:$
-     */
-    public function enqueueBrowserAssets()
-    {
-        foreach ($this->assets as $asset) {
-            if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
-                $asset->enqueueAsset();
-            }
-        }
-    }
-
-
-    /**
-     * @param string $asset_type
-     * @param string $handle
-     * @param array  $extra_dependencies
-     * @return array
-     * @since 4.10.2.p
-     */
-    private function getAssetDetails($asset_type, $handle, $extra_dependencies = [])
-    {
-        $getAssetDetails = '';
-        switch ($asset_type) {
-            case Asset::TYPE_JS :
-                $getAssetDetails = 'getJsAssetDetails';
-                break;
-            case Asset::TYPE_CSS :
-                $getAssetDetails = 'getCssAssetDetails';
-                break;
-        }
-        if ($getAssetDetails === '') {
-            return ['dependencies' => [], 'version' => ''];
-        }
-        $details = $this->registry->$getAssetDetails(
-            $this->domain->assetNamespace(),
-            $handle
-        );
-        $details['dependencies'] = isset($details['dependencies'])
-            ? $details['dependencies']
-            : [];
-        $details['version'] = isset($details['version'])
-            ? $details['version']
-            : '';
-        $details['dependencies'] = ! empty($extra_dependencies)
-            ? array_merge($details['dependencies'], (array) $extra_dependencies)
-            : $details['dependencies'];
-        return $details;
-
-    }
-
-
-    /**
-     * @param string $handle
-     * @return bool
-     * @throws DomainException
-     */
-    public function verifyAssetIsRegistered($handle)
-    {
-        if (wp_script_is($handle, 'registered')) {
-            return true;
-        }
-        if (WP_DEBUG) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" script is not registered when it should be!%2$s
+	/**
+	 * @var AssetCollection|Asset[] $assets
+	 */
+	protected $assets;
+
+	/**
+	 * @var DomainInterface
+	 */
+	protected $domain;
+
+	/**
+	 * @var Registry $registry
+	 */
+	protected $registry;
+
+
+	/**
+	 * AssetRegister constructor.
+	 *
+	 * @param DomainInterface $domain
+	 * @param AssetCollection $assets
+	 * @param Registry        $registry
+	 */
+	public function __construct(DomainInterface $domain, AssetCollection $assets, Registry $registry)
+	{
+		$this->domain = $domain;
+		$this->assets = $assets;
+		$this->registry = $registry;
+		$this->registry->addAssetCollection($assets);
+		add_action('wp_enqueue_scripts', array($this, 'addAssets'), 2);
+		add_action('admin_enqueue_scripts', array($this, 'addAssets'), 2);
+	}
+
+
+	/**
+	 * @return AssetCollection
+	 */
+	public function getAssets()
+	{
+		return $this->assets;
+	}
+
+
+	/**
+	 * @since 4.9.71.p
+	 * @return string
+	 */
+	public function assetNamespace()
+	{
+		return $this->domain->assetNamespace();
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @param string $source
+	 * @param array  $dependencies
+	 * @param bool   $load_in_footer
+	 * @param string $version
+	 * @return JavascriptAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 * @since 4.9.62.p
+	 */
+	public function addJavascript(
+		$handle,
+		$source,
+		array $dependencies = array(),
+		$load_in_footer = true,
+		$version = ''
+	) {
+		$asset = new JavascriptAsset(
+			$handle,
+			$source,
+			array_unique($dependencies),
+			$load_in_footer,
+			$this->domain,
+			$version
+		);
+		$this->assets->add($asset, $handle);
+		return $asset;
+	}
+
+
+	/**
+	 * Used to register a javascript asset where everything is dynamically derived from the given handle.
+	 *
+	 * @param string       $handle
+	 * @param string|array $extra_dependencies
+	 * @return JavascriptAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 */
+	public function addJs($handle, $extra_dependencies = [])
+	{
+		$details = $this->getAssetDetails(
+			Asset::TYPE_JS,
+			$handle,
+			$extra_dependencies
+		);
+		$source = $this->registry->getJsUrl($this->domain->assetNamespace(), $handle);
+		return $this->addJavascript(
+			$handle,
+			$source,
+			$details['dependencies'],
+			true,
+			$details['version']
+		);
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @param array  $dependencies
+	 * @param bool   $load_in_footer
+	 * @param string $version
+	 * @return JavascriptAsset
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.71.p
+	 */
+	public function addVendorJavascript(
+		$handle,
+		array $dependencies = array(),
+		$load_in_footer = true,
+		$version = ''
+	) {
+		$dev_suffix = wp_scripts_get_suffix('dev');
+		$vendor_path = $this->domain->pluginUrl() . 'assets/vendor/';
+		return $this->addJavascript(
+			$handle,
+			"{$vendor_path}{$handle}{$dev_suffix}.js",
+			$dependencies,
+			$load_in_footer,
+			$version
+		);
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @param string $source
+	 * @param array  $dependencies
+	 * @param string $media
+	 * @param string $version
+	 * @return StylesheetAsset
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.62.p
+	 */
+	public function addStylesheet(
+		$handle,
+		$source,
+		array $dependencies = array(),
+		$media = 'all',
+		$version = ''
+	) {
+		$asset = new StylesheetAsset(
+			$handle,
+			$source,
+			array_unique($dependencies),
+			$this->domain,
+			$media,
+			$version
+		);
+		$this->assets->add($asset, $handle);
+		return $asset;
+	}
+
+
+	/**
+	 * Used to register a css asset where everything is dynamically derived from the given handle.
+	 *
+	 * @param string       $handle
+	 * @param string|array $extra_dependencies
+	 * @return StylesheetAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 */
+	public function addCss($handle, $extra_dependencies = [])
+	{
+		$details = $this->getAssetDetails(
+			Asset::TYPE_CSS,
+			$handle,
+			$extra_dependencies
+		);
+		return $this->addStylesheet(
+			$handle,
+			$this->registry->getCssUrl($this->domain->assetNamespace(), $handle),
+			$details['dependencies'],
+			'all',
+			$details['version']
+		);
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @return bool
+	 * @since 4.9.62.p
+	 */
+	public function enqueueAsset($handle)
+	{
+		if ($this->assets->has($handle)) {
+			/** @var Asset $asset */
+			$asset = $this->assets->get($handle);
+			if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
+				$asset->enqueueAsset();
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @return  void
+	 * @since   $VID:$
+	 */
+	public function enqueueBrowserAssets()
+	{
+		foreach ($this->assets as $asset) {
+			if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
+				$asset->enqueueAsset();
+			}
+		}
+	}
+
+
+	/**
+	 * @param string $asset_type
+	 * @param string $handle
+	 * @param array  $extra_dependencies
+	 * @return array
+	 * @since 4.10.2.p
+	 */
+	private function getAssetDetails($asset_type, $handle, $extra_dependencies = [])
+	{
+		$getAssetDetails = '';
+		switch ($asset_type) {
+			case Asset::TYPE_JS :
+				$getAssetDetails = 'getJsAssetDetails';
+				break;
+			case Asset::TYPE_CSS :
+				$getAssetDetails = 'getCssAssetDetails';
+				break;
+		}
+		if ($getAssetDetails === '') {
+			return ['dependencies' => [], 'version' => ''];
+		}
+		$details = $this->registry->$getAssetDetails(
+			$this->domain->assetNamespace(),
+			$handle
+		);
+		$details['dependencies'] = isset($details['dependencies'])
+			? $details['dependencies']
+			: [];
+		$details['version'] = isset($details['version'])
+			? $details['version']
+			: '';
+		$details['dependencies'] = ! empty($extra_dependencies)
+			? array_merge($details['dependencies'], (array) $extra_dependencies)
+			: $details['dependencies'];
+		return $details;
+
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @return bool
+	 * @throws DomainException
+	 */
+	public function verifyAssetIsRegistered($handle)
+	{
+		if (wp_script_is($handle, 'registered')) {
+			return true;
+		}
+		if (WP_DEBUG) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The "%1$s" script is not registered when it should be!%2$s
                         Are you running the Barista plugin for development purposes? 
                         If so, then you need to build the appropriate assets for this domain.%2$s
                         If you are seeing this error on a live website, then you should not have 
                         the WP_DEBUG constant in your wp-config.php file set to "true". 
                         Please contact Event Espresso support for more information.',
-                        'event_espresso'
-                    ),
-                    $handle,
-                    '<br />'
-                )
-            );
-        }
-        return false;
-    }
-
-
-    /**************** deprecated ****************/
-
-
-    /**
-     * @return void
-     * @deprecated $VID:$
-     */
-    public function addManifestFile()
-    {
-    }
-
-
-    /**
-     * @return void
-     * @deprecated $VID:$
-     */
-    public function getManifestFile()
-    {
-    }
+						'event_espresso'
+					),
+					$handle,
+					'<br />'
+				)
+			);
+		}
+		return false;
+	}
+
+
+	/**************** deprecated ****************/
+
+
+	/**
+	 * @return void
+	 * @deprecated $VID:$
+	 */
+	public function addManifestFile()
+	{
+	}
+
+
+	/**
+	 * @return void
+	 * @deprecated $VID:$
+	 */
+	public function getManifestFile()
+	{
+	}
 }

core/admin/EE_Admin_Page_CPT_Init.core.php

Indentation +36 added lines, -36 removed lines

@@ -14,44 +14,44 @@
 {
 
 
-    public function do_initial_loads()
-    {
-        // we want to use the corresponding admin page object (but not route it!).
-        // To do this we just set _routing to false.
-        // That way this page object is being loaded on all pages to make sure we hook into admin properly.
-        // But note... we are ONLY doing this if the given page is NOT pages we WANT to load ;)
-        // This is important because we have hooks that help redirect custom post type saves
-        $requested_page = isset($_REQUEST['page']) ? sanitize_text_field($_REQUEST['page']) : '';
-        if ($requested_page !== $this->_menu_map->menu_slug) {
-            $this->_routing = false;
-            $this->_initialize_admin_page();
-        } else {
-            // normal init loads
-            $this->_initialize_admin_page();
-            // added for 4.1 to completely disable autosave for our pages. This can be removed once we fully enable autosave functionality
-            remove_filter('wp_print_scripts', 'wp_just_in_time_script_localization');
-            add_filter('wp_print_scripts', array($this, 'wp_just_in_time_script_localization'), 100);
-            // end removal of autosave functionality.
-        }
-    }
+	public function do_initial_loads()
+	{
+		// we want to use the corresponding admin page object (but not route it!).
+		// To do this we just set _routing to false.
+		// That way this page object is being loaded on all pages to make sure we hook into admin properly.
+		// But note... we are ONLY doing this if the given page is NOT pages we WANT to load ;)
+		// This is important because we have hooks that help redirect custom post type saves
+		$requested_page = isset($_REQUEST['page']) ? sanitize_text_field($_REQUEST['page']) : '';
+		if ($requested_page !== $this->_menu_map->menu_slug) {
+			$this->_routing = false;
+			$this->_initialize_admin_page();
+		} else {
+			// normal init loads
+			$this->_initialize_admin_page();
+			// added for 4.1 to completely disable autosave for our pages. This can be removed once we fully enable autosave functionality
+			remove_filter('wp_print_scripts', 'wp_just_in_time_script_localization');
+			add_filter('wp_print_scripts', array($this, 'wp_just_in_time_script_localization'), 100);
+			// end removal of autosave functionality.
+		}
+	}
 
 
-    public function wp_just_in_time_script_localization()
-    {
-        wp_localize_script(
-            'autosave',
-            'autosaveL10n',
-            array(
-                'autosaveInterval' => 172800,
-                'savingText'       => __('Saving Draft…', 'event_espresso'),
-                'saveAlert'        => __('The changes you made will be lost if you navigate away from this page.', 'event_espresso'),
-            )
-        );
-    }
+	public function wp_just_in_time_script_localization()
+	{
+		wp_localize_script(
+			'autosave',
+			'autosaveL10n',
+			array(
+				'autosaveInterval' => 172800,
+				'savingText'       => __('Saving Draft…', 'event_espresso'),
+				'saveAlert'        => __('The changes you made will be lost if you navigate away from this page.', 'event_espresso'),
+			)
+		);
+	}
 
 
-    public function adjust_post_lock_window($interval)
-    {
-        return 172800;
-    }
+	public function adjust_post_lock_window($interval)
+	{
+		return 172800;
+	}
 }

core/domain/services/admin/events/default_settings/AdvancedEditorAdminFormSection.php

Indentation +76 added lines, -76 removed lines

@@ -39,86 +39,86 @@
 class AdvancedEditorAdminFormSection
 {
 
-    /**
-     * @var EE_Admin_Config
-     */
-    protected $admin_config;
+	/**
+	 * @var EE_Admin_Config
+	 */
+	protected $admin_config;
 
 
-    /**
-     * AdvancedEditorAdminForm constructor.
-     *
-     * @param EE_Admin_Config $admin_config
-     */
-    public function __construct(EE_Admin_Config $admin_config)
-    {
-        $this->admin_config = $admin_config;
-        add_filter(
-            'FHEE__Events_Admin_Page___default_event_settings_form__form_subsections',
-            [$this, 'mergeFormSubsections']
-        );
-        add_action(
-            'AHEE__Events_Admin_Page___update_default_event_settings',
-            [$this, 'updateAdminFormSettings'],
-            10,
-            2
-        );
-    }
+	/**
+	 * AdvancedEditorAdminForm constructor.
+	 *
+	 * @param EE_Admin_Config $admin_config
+	 */
+	public function __construct(EE_Admin_Config $admin_config)
+	{
+		$this->admin_config = $admin_config;
+		add_filter(
+			'FHEE__Events_Admin_Page___default_event_settings_form__form_subsections',
+			[$this, 'mergeFormSubsections']
+		);
+		add_action(
+			'AHEE__Events_Admin_Page___update_default_event_settings',
+			[$this, 'updateAdminFormSettings'],
+			10,
+			2
+		);
+	}
 
 
-    /**
-     * @param array $default_event_settings_form_subsections
-     * @return array
-     * @since $VID:$
-     */
-    public function mergeFormSubsections(array $default_event_settings_form_subsections)
-    {
-        return [
-                   'use_advanced_editor'     => new EE_Select_Input(
-                       apply_filters(
-                           'FHEE__Events_Admin_Page___default_event_settings_form__advanced_editor_input_answer_options',
-                           [
-                               esc_html__('Legacy Editor', 'event_espresso'),
-                               esc_html__('Advanced Editor', 'event_espresso'),
-                           ]
-                       ),
-                       apply_filters(
-                           'FHEE__Events_Admin_Page___default_event_settings_form__advanced_editor_input_settings',
-                           [
-                               'default'         => $this->admin_config->useAdvancedEditor(),
-                               'html_label_text' => esc_html__('Activate Advanced Editor?', 'event_espresso'),
-                               'html_help_text'  => sprintf(
-                                   esc_html__(
-                                       'Controls whether the Event Espresso Event Editor continues to use the existing legacy editor that functions like the typical older WordPress admin you are used to,%1$sor uses the new Advanced Editor with a more powerful and easier to use interface. This may be automatically turned on in order to utilize advanced features from new addons.',
-                                       'event_espresso'
-                                   ),
-                                   '<br />'
-                               ),
-                           ]
-                       )
-                   ),
-                   'defaults_section_header' => new EE_Form_Section_HTML(
-                       EEH_HTML::h2(
-                           esc_html__('Default Settings', 'event_espresso'),
-                           '',
-                           'ee-admin-settings-hdr'
-                       )
-                   ),
-               ] + $default_event_settings_form_subsections;
-    }
+	/**
+	 * @param array $default_event_settings_form_subsections
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function mergeFormSubsections(array $default_event_settings_form_subsections)
+	{
+		return [
+				   'use_advanced_editor'     => new EE_Select_Input(
+					   apply_filters(
+						   'FHEE__Events_Admin_Page___default_event_settings_form__advanced_editor_input_answer_options',
+						   [
+							   esc_html__('Legacy Editor', 'event_espresso'),
+							   esc_html__('Advanced Editor', 'event_espresso'),
+						   ]
+					   ),
+					   apply_filters(
+						   'FHEE__Events_Admin_Page___default_event_settings_form__advanced_editor_input_settings',
+						   [
+							   'default'         => $this->admin_config->useAdvancedEditor(),
+							   'html_label_text' => esc_html__('Activate Advanced Editor?', 'event_espresso'),
+							   'html_help_text'  => sprintf(
+								   esc_html__(
+									   'Controls whether the Event Espresso Event Editor continues to use the existing legacy editor that functions like the typical older WordPress admin you are used to,%1$sor uses the new Advanced Editor with a more powerful and easier to use interface. This may be automatically turned on in order to utilize advanced features from new addons.',
+									   'event_espresso'
+								   ),
+								   '<br />'
+							   ),
+						   ]
+					   )
+				   ),
+				   'defaults_section_header' => new EE_Form_Section_HTML(
+					   EEH_HTML::h2(
+						   esc_html__('Default Settings', 'event_espresso'),
+						   '',
+						   'ee-admin-settings-hdr'
+					   )
+				   ),
+			   ] + $default_event_settings_form_subsections;
+	}
 
 
-    /**
-     * @param array     $valid_data
-     * @param EE_Config $config
-     * @since $VID:$
-     */
-    public function updateAdminFormSettings(array $valid_data, EE_Config $config)
-    {
-        $config->admin->setUseAdvancedEditor(
-            isset($valid_data['use_advanced_editor'])
-                ? $valid_data['use_advanced_editor']
-                : false
-        );
-    }
+	/**
+	 * @param array     $valid_data
+	 * @param EE_Config $config
+	 * @since $VID:$
+	 */
+	public function updateAdminFormSettings(array $valid_data, EE_Config $config)
+	{
+		$config->admin->setUseAdvancedEditor(
+			isset($valid_data['use_advanced_editor'])
+				? $valid_data['use_advanced_editor']
+				: false
+		);
+	}
 }