eventespresso / event-espresso-core

core/libraries/form_sections/strategies/layout/EE_Div_Per_Section_Layout.strategy.php

Spacing +21 added lines, -21 removed lines

@@ -46,40 +46,40 @@ 
             ? (string) $input->html_id()
             : spl_object_hash($input);
         // and add a generic input type class
-        $html_class = sanitize_key(str_replace('_', '-', get_class($input))) . '-dv';
+        $html_class = sanitize_key(str_replace('_', '-', get_class($input))).'-dv';
         if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
+            $html .= EEH_HTML::nl().$input->get_html_for_input();
         } elseif ($input instanceof EE_Submit_Input) {
             $html .= EEH_HTML::div(
                 $input->get_html_for_input(),
-                $html_id . '-submit-dv',
+                $html_id.'-submit-dv',
                 "{$input->html_class()}-submit-dv {$html_class}"
             );
         } elseif ($input instanceof EE_Select_Input) {
             $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
+                EEH_HTML::nl(1).$input->get_html_for_label().
+                EEH_HTML::nl().$input->get_html_for_errors().
+                EEH_HTML::nl().$input->get_html_for_input().
+                EEH_HTML::nl().$input->get_html_for_help(),
+                $html_id.'-input-dv',
                 "{$input->html_class()}-input-dv {$html_class}"
             );
         } elseif ($input instanceof EE_Form_Input_With_Options_Base) {
             $html .= EEH_HTML::div(
-                EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
+                EEH_HTML::nl().$this->_display_label_for_option_type_question($input).
+                EEH_HTML::nl().$input->get_html_for_errors().
+                EEH_HTML::nl().$input->get_html_for_input().
+                EEH_HTML::nl().$input->get_html_for_help(),
+                $html_id.'-input-dv',
                 "{$input->html_class()}-input-dv {$html_class}"
             );
         } else {
             $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
+                EEH_HTML::nl(1).$input->get_html_for_label().
+                EEH_HTML::nl().$input->get_html_for_errors().
+                EEH_HTML::nl().$input->get_html_for_input().
+                EEH_HTML::nl().$input->get_html_for_help(),
+                $html_id.'-input-dv',
                 "{$input->html_class()}-input-dv {$html_class}"
             );
         }
@@ -103,11 +103,11 @@ 
             $html_label_text = $input->html_label_text();
             $label_html = EEH_HTML::div(
                 $input->required()
-                    ? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
+                    ? $html_label_text.EEH_HTML::span('*', '', 'ee-asterisk')
                     : $html_label_text,
                 $input->html_label_id(),
                 $input->required()
-                    ? 'ee-required-label ' . $input->html_label_class()
+                    ? 'ee-required-label '.$input->html_label_class()
                     : $input->html_label_class(),
                 $input->html_label_style(),
                 $input->other_html_attributes()
@@ -132,7 +132,7 @@ 
      */
     public function layout_subsection($form_section)
     {
-        return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+        return EEH_HTML::nl(1).$form_section->get_html().EEH_HTML::nl(-1);
     }
 
 

Indentation +120 added lines, -120 removed lines

@@ -11,136 +11,136 @@
  */
 class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base
 {
-    /**
-     * opening div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_begin()
-    {
-        return EEH_HTML::div(
-            '',
-            $this->_form_section->html_id(),
-            $this->_form_section->html_class(),
-            $this->_form_section->html_style()
-        );
-    }
+	/**
+	 * opening div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_begin()
+	{
+		return EEH_HTML::div(
+			'',
+			$this->_form_section->html_id(),
+			$this->_form_section->html_class(),
+			$this->_form_section->html_style()
+		);
+	}
 
 
 
-    /**
-     * Lays out the row for the input, including label and errors
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     * @throws \EE_Error
-     */
-    public function layout_input($input)
-    {
-        $html = '';
-        // set something unique for the id
-        $html_id = (string) $input->html_id() !== ''
-            ? (string) $input->html_id()
-            : spl_object_hash($input);
-        // and add a generic input type class
-        $html_class = sanitize_key(str_replace('_', '-', get_class($input))) . '-dv';
-        if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-        } elseif ($input instanceof EE_Submit_Input) {
-            $html .= EEH_HTML::div(
-                $input->get_html_for_input(),
-                $html_id . '-submit-dv',
-                "{$input->html_class()}-submit-dv {$html_class}"
-            );
-        } elseif ($input instanceof EE_Select_Input) {
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "{$input->html_class()}-input-dv {$html_class}"
-            );
-        } elseif ($input instanceof EE_Form_Input_With_Options_Base) {
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "{$input->html_class()}-input-dv {$html_class}"
-            );
-        } else {
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "{$input->html_class()}-input-dv {$html_class}"
-            );
-        }
-        return $html;
-    }
+	/**
+	 * Lays out the row for the input, including label and errors
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function layout_input($input)
+	{
+		$html = '';
+		// set something unique for the id
+		$html_id = (string) $input->html_id() !== ''
+			? (string) $input->html_id()
+			: spl_object_hash($input);
+		// and add a generic input type class
+		$html_class = sanitize_key(str_replace('_', '-', get_class($input))) . '-dv';
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::nl() . $input->get_html_for_input();
+		} elseif ($input instanceof EE_Submit_Input) {
+			$html .= EEH_HTML::div(
+				$input->get_html_for_input(),
+				$html_id . '-submit-dv',
+				"{$input->html_class()}-submit-dv {$html_class}"
+			);
+		} elseif ($input instanceof EE_Select_Input) {
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl(1) . $input->get_html_for_label() .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"{$input->html_class()}-input-dv {$html_class}"
+			);
+		} elseif ($input instanceof EE_Form_Input_With_Options_Base) {
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"{$input->html_class()}-input-dv {$html_class}"
+			);
+		} else {
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl(1) . $input->get_html_for_label() .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"{$input->html_class()}-input-dv {$html_class}"
+			);
+		}
+		return $html;
+	}
 
 
 
-    /**
-     *
-     * _display_label_for_option_type_question
-     * Gets the HTML for the 'label', which is just text for this (because labels
-     * should be for each input)
-     *
-     * @param EE_Form_Input_With_Options_Base $input
-     * @return string
-     */
-    protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input)
-    {
-        if ($input->display_html_label_text()) {
-            $html_label_text = $input->html_label_text();
-            $label_html = EEH_HTML::div(
-                $input->required()
-                    ? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
-                    : $html_label_text,
-                $input->html_label_id(),
-                $input->required()
-                    ? 'ee-required-label ' . $input->html_label_class()
-                    : $input->html_label_class(),
-                $input->html_label_style(),
-                $input->other_html_attributes()
-            );
-            // if no content was provided to EEH_HTML::div() above (ie: an empty label),
-            // then we need to close the div manually
-            if (empty($html_label_text)) {
-                $label_html .= EEH_HTML::divx($input->html_label_id(), $input->html_label_class());
-            }
-            return $label_html;
-        }
-        return '';
-    }
+	/**
+	 *
+	 * _display_label_for_option_type_question
+	 * Gets the HTML for the 'label', which is just text for this (because labels
+	 * should be for each input)
+	 *
+	 * @param EE_Form_Input_With_Options_Base $input
+	 * @return string
+	 */
+	protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input)
+	{
+		if ($input->display_html_label_text()) {
+			$html_label_text = $input->html_label_text();
+			$label_html = EEH_HTML::div(
+				$input->required()
+					? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
+					: $html_label_text,
+				$input->html_label_id(),
+				$input->required()
+					? 'ee-required-label ' . $input->html_label_class()
+					: $input->html_label_class(),
+				$input->html_label_style(),
+				$input->other_html_attributes()
+			);
+			// if no content was provided to EEH_HTML::div() above (ie: an empty label),
+			// then we need to close the div manually
+			if (empty($html_label_text)) {
+				$label_html .= EEH_HTML::divx($input->html_label_id(), $input->html_label_class());
+			}
+			return $label_html;
+		}
+		return '';
+	}
 
 
 
-    /**
-     * Lays out a row for the subsection
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
-        return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
-    }
+	/**
+	 * Lays out a row for the subsection
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+	}
 
 
 
-    /**
-     * closing div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_end()
-    {
-        return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
-    }
+	/**
+	 * closing div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_end()
+	{
+		return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
+	}
 }

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

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],

Indentation +378 added lines, -378 removed lines

@@ -20,382 +20,382 @@
  */
 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 RequestInterface $request
-     * @param EEM_Registration $registration_model
-     * @param array            $extra_request_params
-     */
-    public function __construct(
-        RequestInterface $request,
-        EEM_Registration $registration_model,
-        array $extra_request_params = []
-    ) {
-        $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, 'int');
-        if ($ATT_ID) {
-            $this->where_params['ATT_ID'] = $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, 'int');
-        if ($EVT_ID) {
-            $this->where_params['EVT_ID'] = $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', 0, 'int');
-        if ($EVT_CAT > 0) {
-            $this->where_params['Event.Term_Taxonomy.term_id'] = $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, 'int');
-        if ($DTT_ID) {
-            $this->where_params['Ticket.Datetime.DTT_ID'] = $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, 'int');
-        if ($TKT_ID) {
-            $this->where_params['TKT_ID'] = $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', 1, 'int');
-        $per_page = $this->request->getRequestParam('perpage', $per_page, 'int');
-        // -1 means return all results so get out if that's set.
-        if ($per_page === -1) {
-            return [];
-        }
-        $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 RequestInterface $request
+	 * @param EEM_Registration $registration_model
+	 * @param array            $extra_request_params
+	 */
+	public function __construct(
+		RequestInterface $request,
+		EEM_Registration $registration_model,
+		array $extra_request_params = []
+	) {
+		$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, 'int');
+		if ($ATT_ID) {
+			$this->where_params['ATT_ID'] = $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, 'int');
+		if ($EVT_ID) {
+			$this->where_params['EVT_ID'] = $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', 0, 'int');
+		if ($EVT_CAT > 0) {
+			$this->where_params['Event.Term_Taxonomy.term_id'] = $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, 'int');
+		if ($DTT_ID) {
+			$this->where_params['Ticket.Datetime.DTT_ID'] = $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, 'int');
+		if ($TKT_ID) {
+			$this->where_params['TKT_ID'] = $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', 1, 'int');
+		$per_page = $this->request->getRequestParam('perpage', $per_page, 'int');
+		// -1 means return all results so get out if that's set.
+		if ($per_page === -1) {
+			return [];
+		}
+		$offset = ($current_page - 1) * $per_page;
+		return ['limit' => [$offset, $per_page]];
+	}
 }

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

@@ -21,125 +21,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);
+	}
 }

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/services/graphql/fields/GraphQLField.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
     public function shouldResolve()
     {
         foreach ($this->caps as $cap) {
-            if (! current_user_can($cap)) {
+            if ( ! current_user_can($cap)) {
                 return false;
             }
         }
@@ -166,7 +166,7 @@ 
      */
     public function resolve($source, array $args, AppContext $context, ResolveInfo $info)
     {
-        if (! $this->hasInternalResolver()) {
+        if ( ! $this->hasInternalResolver()) {
             throw new LogicException('GraphQLField has no internal resolver.');
         }
         // dynamic methods using $this don't play nice

Indentation +258 added lines, -258 removed lines

@@ -19,262 +19,262 @@
  */
 class GraphQLField implements GraphQLFieldInterface
 {
-    /**
-     * @var string $name
-     */
-    protected $name;
-
-    /**
-     * @var string|string[] $type
-     */
-    protected $type;
-
-    /**
-     * @var string|null $key
-     */
-    protected $key;
-
-    /**
-     * @var string $description
-     */
-    protected $description;
-
-    /**
-     * @var callable $formatter
-     */
-    protected $formatter;
-
-    /**
-     * @var callable $resolve
-     */
-    protected $resolver;
-
-    /**
-     * @var array $caps
-     */
-    protected $caps;
-
-    /**
-     * @var array $args
-     */
-    protected $args;
-
-    /**
-     * @var bool $use_for_input
-     */
-    protected $use_for_input = true;
-
-    /**
-     * @var bool $use_for_output
-     */
-    protected $use_for_output = true;
-
-
-    /**
-     * @param string          $name
-     * @param string|string[] $type
-     * @param string|null     $key
-     * @param string          $description
-     * @param callable|null   $formatter
-     * @param callable|null   $resolver
-     * @param array           $args
-     * @param array           $caps
-     * @param array           $args
-     */
-    public function __construct(
-        $name,
-        $type,
-        $key = null,
-        $description = '',
-        callable $formatter = null,
-        callable $resolver = null,
-        array $caps = [],
-        array $args = []
-    ) {
-        $this->name = $name;
-        $this->type = $type;
-        $this->key = $key;
-        $this->description = $description;
-        $this->formatter = $formatter;
-        $this->resolver = $resolver;
-        $this->caps = $caps;
-        $this->args = $args;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function caps()
-    {
-        return $this->caps;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function description()
-    {
-        return $this->description;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function key()
-    {
-        return $this->key;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * @return string|string[]
-     */
-    public function type()
-    {
-        return $this->type;
-    }
-
-
-    /**
-     * Convert the field to array to be
-     * able to pass as config to WP GraphQL
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return get_object_vars($this);
-    }
-
-
-    /**
-     * Sets the value for use_for_input.
-     *
-     * @param bool $use_for_input
-     */
-    protected function setUseForInput($use_for_input)
-    {
-        $this->use_for_input = filter_var($use_for_input, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * Whether the field should be used for
-     * mutation inputs.
-     *
-     * @return bool
-     */
-    public function useForInput()
-    {
-        return (bool) $this->use_for_input;
-    }
-
-
-    /**
-     * Whether the field should be used for
-     * query outputs.
-     *
-     * @return bool
-     */
-    public function useForOutput()
-    {
-        return (bool) $this->use_for_output;
-    }
-
-
-    /**
-     * Sets the value for use_for_output
-     *
-     * @param bool $use_for_output
-     */
-    protected function setUseForOutput($use_for_output)
-    {
-        $this->use_for_output = filter_var($use_for_output, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * Whether the field should resolve
-     * based on the user caps etc.
-     *
-     * @return boolean
-     */
-    public function shouldResolve()
-    {
-        foreach ($this->caps as $cap) {
-            if (! current_user_can($cap)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    /**
-     * Whether the field has an explicit resolver set.
-     *
-     * @return boolean
-     */
-    public function hasInternalResolver()
-    {
-        return is_callable($this->resolver);
-    }
-
-
-    /**
-     * Whether the field has an explicit resolver set.
-     *
-     * @param mixed       $source  The source that's passed down the GraphQL queries
-     * @param array       $args    The inputArgs on the field
-     * @param AppContext  $context The AppContext passed down the GraphQL tree
-     * @param ResolveInfo $info    The ResolveInfo passed down the GraphQL tree
-     * @return mixed
-     * @throws LogicException
-     */
-    public function resolve($source, array $args, AppContext $context, ResolveInfo $info)
-    {
-        if (! $this->hasInternalResolver()) {
-            throw new LogicException('GraphQLField has no internal resolver.');
-        }
-        // dynamic methods using $this don't play nice
-        // so capture resolver to a single var first
-        $resolver = $this->resolver;
-        return $resolver($source, $args, $context, $info);
-    }
-
-
-    /**
-     * Checks if the format callback is set.
-     * If yes, then uses it to format the value.
-     *
-     * @param mixed         $value
-     * @param EE_Base_Class $source
-     * @return mixed The formatted value.
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public function mayBeFormatValue($value, EE_Base_Class $source)
-    {
-        if (is_callable($this->formatter)) {
-            // dynamic methods using $this don't play nice
-            // so capture formatter to a single var first
-            $formatter = $this->formatter;
-            return $formatter($value, $source);
-        }
-        return $value;
-    }
+	/**
+	 * @var string $name
+	 */
+	protected $name;
+
+	/**
+	 * @var string|string[] $type
+	 */
+	protected $type;
+
+	/**
+	 * @var string|null $key
+	 */
+	protected $key;
+
+	/**
+	 * @var string $description
+	 */
+	protected $description;
+
+	/**
+	 * @var callable $formatter
+	 */
+	protected $formatter;
+
+	/**
+	 * @var callable $resolve
+	 */
+	protected $resolver;
+
+	/**
+	 * @var array $caps
+	 */
+	protected $caps;
+
+	/**
+	 * @var array $args
+	 */
+	protected $args;
+
+	/**
+	 * @var bool $use_for_input
+	 */
+	protected $use_for_input = true;
+
+	/**
+	 * @var bool $use_for_output
+	 */
+	protected $use_for_output = true;
+
+
+	/**
+	 * @param string          $name
+	 * @param string|string[] $type
+	 * @param string|null     $key
+	 * @param string          $description
+	 * @param callable|null   $formatter
+	 * @param callable|null   $resolver
+	 * @param array           $args
+	 * @param array           $caps
+	 * @param array           $args
+	 */
+	public function __construct(
+		$name,
+		$type,
+		$key = null,
+		$description = '',
+		callable $formatter = null,
+		callable $resolver = null,
+		array $caps = [],
+		array $args = []
+	) {
+		$this->name = $name;
+		$this->type = $type;
+		$this->key = $key;
+		$this->description = $description;
+		$this->formatter = $formatter;
+		$this->resolver = $resolver;
+		$this->caps = $caps;
+		$this->args = $args;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function caps()
+	{
+		return $this->caps;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function description()
+	{
+		return $this->description;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function key()
+	{
+		return $this->key;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * @return string|string[]
+	 */
+	public function type()
+	{
+		return $this->type;
+	}
+
+
+	/**
+	 * Convert the field to array to be
+	 * able to pass as config to WP GraphQL
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return get_object_vars($this);
+	}
+
+
+	/**
+	 * Sets the value for use_for_input.
+	 *
+	 * @param bool $use_for_input
+	 */
+	protected function setUseForInput($use_for_input)
+	{
+		$this->use_for_input = filter_var($use_for_input, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * Whether the field should be used for
+	 * mutation inputs.
+	 *
+	 * @return bool
+	 */
+	public function useForInput()
+	{
+		return (bool) $this->use_for_input;
+	}
+
+
+	/**
+	 * Whether the field should be used for
+	 * query outputs.
+	 *
+	 * @return bool
+	 */
+	public function useForOutput()
+	{
+		return (bool) $this->use_for_output;
+	}
+
+
+	/**
+	 * Sets the value for use_for_output
+	 *
+	 * @param bool $use_for_output
+	 */
+	protected function setUseForOutput($use_for_output)
+	{
+		$this->use_for_output = filter_var($use_for_output, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * Whether the field should resolve
+	 * based on the user caps etc.
+	 *
+	 * @return boolean
+	 */
+	public function shouldResolve()
+	{
+		foreach ($this->caps as $cap) {
+			if (! current_user_can($cap)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * Whether the field has an explicit resolver set.
+	 *
+	 * @return boolean
+	 */
+	public function hasInternalResolver()
+	{
+		return is_callable($this->resolver);
+	}
+
+
+	/**
+	 * Whether the field has an explicit resolver set.
+	 *
+	 * @param mixed       $source  The source that's passed down the GraphQL queries
+	 * @param array       $args    The inputArgs on the field
+	 * @param AppContext  $context The AppContext passed down the GraphQL tree
+	 * @param ResolveInfo $info    The ResolveInfo passed down the GraphQL tree
+	 * @return mixed
+	 * @throws LogicException
+	 */
+	public function resolve($source, array $args, AppContext $context, ResolveInfo $info)
+	{
+		if (! $this->hasInternalResolver()) {
+			throw new LogicException('GraphQLField has no internal resolver.');
+		}
+		// dynamic methods using $this don't play nice
+		// so capture resolver to a single var first
+		$resolver = $this->resolver;
+		return $resolver($source, $args, $context, $info);
+	}
+
+
+	/**
+	 * Checks if the format callback is set.
+	 * If yes, then uses it to format the value.
+	 *
+	 * @param mixed         $value
+	 * @param EE_Base_Class $source
+	 * @return mixed The formatted value.
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public function mayBeFormatValue($value, EE_Base_Class $source)
+	{
+		if (is_callable($this->formatter)) {
+			// dynamic methods using $this don't play nice
+			// so capture formatter to a single var first
+			$formatter = $this->formatter;
+			return $formatter($value, $source);
+		}
+		return $value;
+	}
 }

core/domain/services/converters/RestApiSpoofer.php

Spacing +3 added lines, -3 removed lines

@@ -116,7 +116,7 @@ 
      */
     public function getOneApiResult(EEM_Base $model, array $query_params, $include = '')
     {
-        if (! array_key_exists('limit', $query_params)) {
+        if ( ! array_key_exists('limit', $query_params)) {
             $query_params['limit'] = 1;
         }
         $result = $this->getApiResults($model, $query_params, $include);
@@ -143,10 +143,10 @@ 
      */
     public function getApiResults(EEM_Base $model, array $query_params, $include = '')
     {
-        if (! array_key_exists('caps', $query_params)) {
+        if ( ! array_key_exists('caps', $query_params)) {
             $query_params['caps'] = EEM_Base::caps_read_admin;
         }
-        if (! array_key_exists('default_where_conditions', $query_params)) {
+        if ( ! array_key_exists('default_where_conditions', $query_params)) {
             $query_params['default_where_conditions'] = 'none';
         }
         /** @type array $results */

Indentation +123 added lines, -123 removed lines

@@ -49,137 +49,137 @@
  */
 class RestApiSpoofer
 {
-    /**
-     * @var WP_REST_Server $wp_rest_server
-     */
-    protected $wp_rest_server;
+	/**
+	 * @var WP_REST_Server $wp_rest_server
+	 */
+	protected $wp_rest_server;
 
-    /**
-     * @var Read
-     */
-    protected $rest_controller;
+	/**
+	 * @var Read
+	 */
+	protected $rest_controller;
 
-    /**
-     * @var EED_Core_Rest_Api $rest_module
-     */
-    protected $rest_module;
+	/**
+	 * @var EED_Core_Rest_Api $rest_module
+	 */
+	protected $rest_module;
 
 
-    /**
-     * RestApiSpoofer constructor.
-     *
-     * @param WP_REST_Server        $wp_rest_server
-     * @param EED_Core_Rest_Api $rest_module
-     * @param Read                  $rest_api
-     * @param string                $api_version
-     */
-    public function __construct(
-        WP_REST_Server $wp_rest_server,
-        EED_Core_Rest_Api $rest_module,
-        Read $rest_api,
-        $api_version = '4.8.36'
-    ) {
-        $this->wp_rest_server = $wp_rest_server;
-        $this->rest_module = $rest_module;
-        $this->rest_controller = $rest_api;
-        $this->rest_controller->setRequestedVersion($api_version);
-        $this->setUpRestServer();
-    }
+	/**
+	 * RestApiSpoofer constructor.
+	 *
+	 * @param WP_REST_Server        $wp_rest_server
+	 * @param EED_Core_Rest_Api $rest_module
+	 * @param Read                  $rest_api
+	 * @param string                $api_version
+	 */
+	public function __construct(
+		WP_REST_Server $wp_rest_server,
+		EED_Core_Rest_Api $rest_module,
+		Read $rest_api,
+		$api_version = '4.8.36'
+	) {
+		$this->wp_rest_server = $wp_rest_server;
+		$this->rest_module = $rest_module;
+		$this->rest_controller = $rest_api;
+		$this->rest_controller->setRequestedVersion($api_version);
+		$this->setUpRestServer();
+	}
 
 
-    private function setUpRestServer()
-    {
-        /* @var WP_REST_Server $wp_rest_server */
-        global $wp_rest_server;
-        $wp_rest_server = $this->wp_rest_server;
-        EED_Core_Rest_Api::set_hooks_both();
-        do_action('rest_api_init', $this->wp_rest_server);
-    }
+	private function setUpRestServer()
+	{
+		/* @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = $this->wp_rest_server;
+		EED_Core_Rest_Api::set_hooks_both();
+		do_action('rest_api_init', $this->wp_rest_server);
+	}
 
-    /**
-     * @param EEM_Base $model
-     * @param array    $query_params
-     * @param string   $include
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ModelConfigurationException
-     * @throws ReflectionException
-     * @throws RestException
-     * @throws RestPasswordIncorrectException
-     * @throws RestPasswordRequiredException
-     * @throws UnexpectedEntityException
-     * @throws DomainException
-     * @since $VID:$
-     */
-    public function getOneApiResult(EEM_Base $model, array $query_params, $include = '')
-    {
-        if (! array_key_exists('limit', $query_params)) {
-            $query_params['limit'] = 1;
-        }
-        $result = $this->getApiResults($model, $query_params, $include);
-        return is_array($result) && isset($result[0]) ? $result[0] : [];
-    }
+	/**
+	 * @param EEM_Base $model
+	 * @param array    $query_params
+	 * @param string   $include
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ModelConfigurationException
+	 * @throws ReflectionException
+	 * @throws RestException
+	 * @throws RestPasswordIncorrectException
+	 * @throws RestPasswordRequiredException
+	 * @throws UnexpectedEntityException
+	 * @throws DomainException
+	 * @since $VID:$
+	 */
+	public function getOneApiResult(EEM_Base $model, array $query_params, $include = '')
+	{
+		if (! array_key_exists('limit', $query_params)) {
+			$query_params['limit'] = 1;
+		}
+		$result = $this->getApiResults($model, $query_params, $include);
+		return is_array($result) && isset($result[0]) ? $result[0] : [];
+	}
 
-    /**
-     * @param EEM_Base $model
-     * @param array    $query_params
-     * @param string   $include
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ModelConfigurationException
-     * @throws ReflectionException
-     * @throws RestException
-     * @throws RestPasswordIncorrectException
-     * @throws RestPasswordRequiredException
-     * @throws UnexpectedEntityException
-     * @throws DomainException
-     * @since $VID:$
-     */
-    public function getApiResults(EEM_Base $model, array $query_params, $include = '')
-    {
-        if (! array_key_exists('caps', $query_params)) {
-            $query_params['caps'] = EEM_Base::caps_read_admin;
-        }
-        if (! array_key_exists('default_where_conditions', $query_params)) {
-            $query_params['default_where_conditions'] = 'none';
-        }
-        /** @type array $results */
-        $results = $model->get_all_wpdb_results($query_params);
-        $rest_request = new WP_REST_Request();
-        $rest_request->set_param('include', $include);
-        $rest_request->set_param('caps', 'edit');
-        $nice_results = array();
-        foreach ($results as $result) {
-            $nice_results[] = $this->rest_controller->createEntityFromWpdbResult(
-                $model,
-                $result,
-                $rest_request
-            );
-        }
-        return $nice_results;
-    }
+	/**
+	 * @param EEM_Base $model
+	 * @param array    $query_params
+	 * @param string   $include
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ModelConfigurationException
+	 * @throws ReflectionException
+	 * @throws RestException
+	 * @throws RestPasswordIncorrectException
+	 * @throws RestPasswordRequiredException
+	 * @throws UnexpectedEntityException
+	 * @throws DomainException
+	 * @since $VID:$
+	 */
+	public function getApiResults(EEM_Base $model, array $query_params, $include = '')
+	{
+		if (! array_key_exists('caps', $query_params)) {
+			$query_params['caps'] = EEM_Base::caps_read_admin;
+		}
+		if (! array_key_exists('default_where_conditions', $query_params)) {
+			$query_params['default_where_conditions'] = 'none';
+		}
+		/** @type array $results */
+		$results = $model->get_all_wpdb_results($query_params);
+		$rest_request = new WP_REST_Request();
+		$rest_request->set_param('include', $include);
+		$rest_request->set_param('caps', 'edit');
+		$nice_results = array();
+		foreach ($results as $result) {
+			$nice_results[] = $this->rest_controller->createEntityFromWpdbResult(
+				$model,
+				$result,
+				$rest_request
+			);
+		}
+		return $nice_results;
+	}
 
 
-    /**
-     * @param string $endpoint
-     * @return array
-     * @throws EE_Error
-     * @since $VID:$
-     */
-    public function getModelSchema($endpoint)
-    {
-        $response = $this->wp_rest_server->dispatch(
-            new WP_REST_Request(
-                'OPTIONS',
-                "/ee/v4.8.36/{$endpoint}"
-            )
-        );
-        return $response->get_data();
-    }
+	/**
+	 * @param string $endpoint
+	 * @return array
+	 * @throws EE_Error
+	 * @since $VID:$
+	 */
+	public function getModelSchema($endpoint)
+	{
+		$response = $this->wp_rest_server->dispatch(
+			new WP_REST_Request(
+				'OPTIONS',
+				"/ee/v4.8.36/{$endpoint}"
+			)
+		);
+		return $response->get_data();
+	}
 }

core/services/graphql/TypesManager.php

Spacing +5 added lines, -5 removed lines

@@ -75,8 +75,8 @@ 
             $config = $field->toArray();
             if ($field->useForInput()) {
                 // Register input fields for existing mutations.
-                register_graphql_field('Update' . $typeName . 'Input', $fieldName, $config);
-                register_graphql_field('Create' . $typeName . 'Input', $fieldName, $config);
+                register_graphql_field('Update'.$typeName.'Input', $fieldName, $config);
+                register_graphql_field('Create'.$typeName.'Input', $fieldName, $config);
             }
             if ($field->useForOutput()) {
                 $config['resolve'] = [$type, 'resolveField'];
@@ -102,15 +102,15 @@ 
             $fieldName = $field->name();
             $config = $field->toArray();
             if ($field->useForInput()) {
-                $inputFields[ $fieldName ] = $config;
+                $inputFields[$fieldName] = $config;
             }
             if ($field->useForOutput()) {
                 $config['resolve'] = [$type, 'resolveField'];
-                $outputFields[ $fieldName ] = $config;
+                $outputFields[$fieldName] = $config;
             }
         }
         $typeName = $type->name();
-        if (! empty($outputFields)) {
+        if ( ! empty($outputFields)) {
             // Register the object type.
             register_graphql_object_type(
                 $typeName,

Indentation +96 added lines, -96 removed lines

@@ -17,110 +17,110 @@
  */
 class TypesManager implements GQLManagerInterface
 {
-    /**
-     * @var TypeCollection|TypeInterface[] $types
-     */
-    private $types;
+	/**
+	 * @var TypeCollection|TypeInterface[] $types
+	 */
+	private $types;
 
 
-    /**
-     * TypesManager constructor.
-     *
-     * @param TypeCollection|TypeInterface[] $types
-     */
-    public function __construct(TypeCollection $types)
-    {
-        $this->types = $types;
-    }
+	/**
+	 * TypesManager constructor.
+	 *
+	 * @param TypeCollection|TypeInterface[] $types
+	 */
+	public function __construct(TypeCollection $types)
+	{
+		$this->types = $types;
+	}
 
 
-    /**
-     * @throws CollectionDetailsException
-     * @throws CollectionLoaderException
-     * @since $VID:$
-     */
-    public function init()
-    {
-        $this->types->loadTypes();
-        add_action('graphql_register_types', [$this, 'configureTypes'], 10);
-    }
+	/**
+	 * @throws CollectionDetailsException
+	 * @throws CollectionLoaderException
+	 * @since $VID:$
+	 */
+	public function init()
+	{
+		$this->types->loadTypes();
+		add_action('graphql_register_types', [$this, 'configureTypes'], 10);
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    public function configureTypes()
-    {
-        // loop through the collection of types and register their fields
-        foreach ($this->types as $type) {
-            if ($type->isCustomPostType()) {
-                $this->extendCustomPostType($type);
-            } else {
-                $this->registerType($type);
-            }
-        }
-    }
+	/**
+	 * @since $VID:$
+	 */
+	public function configureTypes()
+	{
+		// loop through the collection of types and register their fields
+		foreach ($this->types as $type) {
+			if ($type->isCustomPostType()) {
+				$this->extendCustomPostType($type);
+			} else {
+				$this->registerType($type);
+			}
+		}
+	}
 
 
-    /**
-     * @param TypeInterface $type
-     * @since $VID:$
-     */
-    public function extendCustomPostType(TypeInterface $type)
-    {
-        $typeName = $type->name();
-        foreach ($type->fields() as $field) {
-            $fieldName = $field->name();
-            $config = $field->toArray();
-            if ($field->useForInput()) {
-                // Register input fields for existing mutations.
-                register_graphql_field('Update' . $typeName . 'Input', $fieldName, $config);
-                register_graphql_field('Create' . $typeName . 'Input', $fieldName, $config);
-            }
-            if ($field->useForOutput()) {
-                $config['resolve'] = [$type, 'resolveField'];
-                // Register fields for queries.
-                register_graphql_field($typeName, $fieldName, $config);
-            }
-        }
-        if (is_callable([$type, 'extendMutations'])) {
-            $type->extendMutations();
-        }
-    }
+	/**
+	 * @param TypeInterface $type
+	 * @since $VID:$
+	 */
+	public function extendCustomPostType(TypeInterface $type)
+	{
+		$typeName = $type->name();
+		foreach ($type->fields() as $field) {
+			$fieldName = $field->name();
+			$config = $field->toArray();
+			if ($field->useForInput()) {
+				// Register input fields for existing mutations.
+				register_graphql_field('Update' . $typeName . 'Input', $fieldName, $config);
+				register_graphql_field('Create' . $typeName . 'Input', $fieldName, $config);
+			}
+			if ($field->useForOutput()) {
+				$config['resolve'] = [$type, 'resolveField'];
+				// Register fields for queries.
+				register_graphql_field($typeName, $fieldName, $config);
+			}
+		}
+		if (is_callable([$type, 'extendMutations'])) {
+			$type->extendMutations();
+		}
+	}
 
 
-    /**
-     * @param TypeInterface $type
-     * @since $VID:$
-     */
-    public function registerType(TypeInterface $type)
-    {
-        $outputFields = [];
-        $inputFields = [];
-        foreach ($type->fields() as $field) {
-            $fieldName = $field->name();
-            $config = $field->toArray();
-            if ($field->useForInput()) {
-                $inputFields[ $fieldName ] = $config;
-            }
-            if ($field->useForOutput()) {
-                $config['resolve'] = [$type, 'resolveField'];
-                $outputFields[ $fieldName ] = $config;
-            }
-        }
-        $typeName = $type->name();
-        if (! empty($outputFields)) {
-            // Register the object type.
-            register_graphql_object_type(
-                $typeName,
-                [
-                    'description' => $type->description(),
-                    'fields'      => $outputFields,
-                ]
-            );
-        }
-        if (is_callable([$type, 'registerMutations'])) {
-            $type->registerMutations($inputFields);
-        }
-    }
+	/**
+	 * @param TypeInterface $type
+	 * @since $VID:$
+	 */
+	public function registerType(TypeInterface $type)
+	{
+		$outputFields = [];
+		$inputFields = [];
+		foreach ($type->fields() as $field) {
+			$fieldName = $field->name();
+			$config = $field->toArray();
+			if ($field->useForInput()) {
+				$inputFields[ $fieldName ] = $config;
+			}
+			if ($field->useForOutput()) {
+				$config['resolve'] = [$type, 'resolveField'];
+				$outputFields[ $fieldName ] = $config;
+			}
+		}
+		$typeName = $type->name();
+		if (! empty($outputFields)) {
+			// Register the object type.
+			register_graphql_object_type(
+				$typeName,
+				[
+					'description' => $type->description(),
+					'fields'      => $outputFields,
+				]
+			);
+		}
+		if (is_callable([$type, 'registerMutations'])) {
+			$type->registerMutations($inputFields);
+		}
+	}
 }

core/services/graphql/types/TypeBase.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
         $fields = [];
         foreach ($this->fields() as $field) {
             if ($field->useForOutput()) {
-                $fields[ $field->name() ] = $field;
+                $fields[$field->name()] = $field;
             }
         }
         return $fields;

Indentation +266 added lines, -266 removed lines

@@ -34,270 +34,270 @@
  */
 abstract class TypeBase implements TypeInterface
 {
-    /**
-     * @var string $namespace The graphql namespace/prefix.
-     */
-    protected $namespace = 'Espresso';
-
-    /**
-     * @var EEM_Base $model
-     */
-    protected $model;
-
-    /**
-     * @var string $name
-     */
-    protected $name = '';
-
-    /**
-     * @var string $description
-     */
-    protected $description = '';
-
-    /**
-     * @var GraphQLFieldInterface[] $fields
-     */
-    protected $fields = [];
-
-    /**
-     * @var array $graphql_to_model_map
-     */
-    protected $graphql_to_model_map = [];
-
-    /**
-     * @var FieldResolver $field_resolver
-     */
-    protected $field_resolver;
-
-    /**
-     * @var bool $is_custom_post_type
-     */
-    protected $is_custom_post_type = false;
-
-
-    /**
-     * TypeBase constructor.
-     *
-     * @param EEM_Base|null $model
-     */
-    public function __construct(EEM_Base $model = null)
-    {
-        $this->model = $model;
-        $this->setFields($this->getFields());
-        $this->field_resolver = new FieldResolver(
-            $this->model,
-            $this->getFieldsForResolver()
-        );
-    }
-
-
-    /**
-     * @return GraphQLFieldInterface[]
-     * @since $VID:$
-     */
-    abstract protected function getFields(): array;
-
-
-    /**
-     * @return string
-     */
-    public function name(): string
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * @param string $name
-     */
-    protected function setName(string $name)
-    {
-        $this->name = $name;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function description(): string
-    {
-        return $this->description;
-    }
-
-
-    /**
-     * @param string $description
-     */
-    protected function setDescription(string $description)
-    {
-        $this->description = $description;
-    }
-
-
-    /**
-     * @return GraphQLFieldInterface[]
-     * @since $VID:$
-     */
-    public function fields(): array
-    {
-        return (array) $this->fields;
-    }
-
-
-    /**
-     * @param GraphQLFieldInterface[] $fields
-     */
-    protected function setFields(array $fields)
-    {
-        foreach ($fields as $field) {
-            if ($field instanceof GraphQLField) {
-                $this->fields[] = $field;
-            }
-        }
-    }
-
-
-    /**
-     * Creates a key map for internal resolver.
-     *
-     * @return array
-     * @since $VID:$
-     */
-    public function getFieldsForResolver(): array
-    {
-        $fields = [];
-        foreach ($this->fields() as $field) {
-            if ($field->useForOutput()) {
-                $fields[ $field->name() ] = $field;
-            }
-        }
-        return $fields;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isCustomPostType(): bool
-    {
-        return $this->is_custom_post_type;
-    }
-
-
-    /**
-     * @param bool $is_custom_post_type
-     */
-    protected function setIsCustomPostType(bool $is_custom_post_type)
-    {
-        $this->is_custom_post_type = filter_var($is_custom_post_type, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @param int|float $value
-     * @return int
-     * @since $VID:$
-     */
-    public function parseInfiniteValue($value): int
-    {
-        $value = trim($value);
-        return $value === null
-               || $value === ''
-               || $value === '∞'
-               || $value === 'INF'
-               || $value === INF
-               || $value === EE_INF
-               || is_infinite((float) $value)
-            ? -1
-            : $value;
-    }
-
-
-    /**
-     * @param mixed $source
-     * @return EE_Base_Class|null
-     * @throws EE_Error
-     */
-    private function getModel($source): ?EE_Base_Class
-    {
-        // If it comes from a custom connection
-        // where the $source is already instantiated.
-        if ($source instanceof EE_Base_Class) {
-            return $source;
-        }
-        return $source instanceof Post ? $this->model->get_one_by_ID($source->ID) : null;
-    }
-
-
-    /**
-     * @param mixed       $source  The source that's passed down the GraphQL queries
-     * @param array       $args    The inputArgs on the field
-     * @param AppContext  $context The AppContext passed down the GraphQL tree
-     * @param ResolveInfo $info    The ResolveInfo passed down the GraphQL tree
-     * @return EE_Base_Class|Deferred|string|null
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws UnexpectedEntityException
-     * @throws UserError
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function resolveField($source, array $args, AppContext $context, ResolveInfo $info)
-    {
-        $source = $source instanceof RootQuery ? $source : $this->getModel($source);
-
-        return $this->field_resolver->resolve($source, $args, $context, $info);
-    }
-
-
-    /**
-     * @param mixed      $payload The payload returned after mutation
-     * @param array      $args    The inputArgs on the field
-     * @param AppContext $context The AppContext passed down the GraphQL tree
-     * @return EE_Base_Class|EE_Soft_Delete_Base_Class|null
-     * @throws EE_Error
-     */
-    public function resolveFromPayload($payload, array $args, AppContext $context)
-    {
-        if (empty($payload['id'])) {
-            return null;
-        }
-        return $this->model->get_one_by_ID($payload['id']);
-    }
-
-
-    /**
-     * Prepares a datetime value in ISO8601/RFC3339 format.
-     * It is assumed that the value of $datetime is in the format
-     * returned by EE_Base_Class::get_format().
-     *
-     * @param string        $datetime The datetime value.
-     * @param EE_Base_Class $source   The source object.
-     * @return string ISO8601/RFC3339 formatted datetime.
-     */
-    public function formatDatetime(string $datetime, EE_Base_Class $source): string
-    {
-        $format   = $source->get_format();
-        // create date object based on local timezone
-        $datetime = DateTime::createFromFormat($format, $datetime, new DateTimeZone($source->get_timezone()));
-        // change the timezone to UTC
-        $datetime->setTimezone(new DateTimeZone('UTC'));
-
-        return $datetime->format(DateTime::RFC3339);
-    }
-
-
-    /**
-     * Converts an object to JSON. The object must have a "toJson" method.
-     *
-     * @param string        $object   The object/value.
-     * @param EE_Base_Class $source   The source object.
-     * @return string JSON representation of the object.
-     */
-    public function toJson(JsonableInterface $object, EE_Base_Class $source): string
-    {
-        return $object->toJson();
-    }
+	/**
+	 * @var string $namespace The graphql namespace/prefix.
+	 */
+	protected $namespace = 'Espresso';
+
+	/**
+	 * @var EEM_Base $model
+	 */
+	protected $model;
+
+	/**
+	 * @var string $name
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string $description
+	 */
+	protected $description = '';
+
+	/**
+	 * @var GraphQLFieldInterface[] $fields
+	 */
+	protected $fields = [];
+
+	/**
+	 * @var array $graphql_to_model_map
+	 */
+	protected $graphql_to_model_map = [];
+
+	/**
+	 * @var FieldResolver $field_resolver
+	 */
+	protected $field_resolver;
+
+	/**
+	 * @var bool $is_custom_post_type
+	 */
+	protected $is_custom_post_type = false;
+
+
+	/**
+	 * TypeBase constructor.
+	 *
+	 * @param EEM_Base|null $model
+	 */
+	public function __construct(EEM_Base $model = null)
+	{
+		$this->model = $model;
+		$this->setFields($this->getFields());
+		$this->field_resolver = new FieldResolver(
+			$this->model,
+			$this->getFieldsForResolver()
+		);
+	}
+
+
+	/**
+	 * @return GraphQLFieldInterface[]
+	 * @since $VID:$
+	 */
+	abstract protected function getFields(): array;
+
+
+	/**
+	 * @return string
+	 */
+	public function name(): string
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * @param string $name
+	 */
+	protected function setName(string $name)
+	{
+		$this->name = $name;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function description(): string
+	{
+		return $this->description;
+	}
+
+
+	/**
+	 * @param string $description
+	 */
+	protected function setDescription(string $description)
+	{
+		$this->description = $description;
+	}
+
+
+	/**
+	 * @return GraphQLFieldInterface[]
+	 * @since $VID:$
+	 */
+	public function fields(): array
+	{
+		return (array) $this->fields;
+	}
+
+
+	/**
+	 * @param GraphQLFieldInterface[] $fields
+	 */
+	protected function setFields(array $fields)
+	{
+		foreach ($fields as $field) {
+			if ($field instanceof GraphQLField) {
+				$this->fields[] = $field;
+			}
+		}
+	}
+
+
+	/**
+	 * Creates a key map for internal resolver.
+	 *
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function getFieldsForResolver(): array
+	{
+		$fields = [];
+		foreach ($this->fields() as $field) {
+			if ($field->useForOutput()) {
+				$fields[ $field->name() ] = $field;
+			}
+		}
+		return $fields;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isCustomPostType(): bool
+	{
+		return $this->is_custom_post_type;
+	}
+
+
+	/**
+	 * @param bool $is_custom_post_type
+	 */
+	protected function setIsCustomPostType(bool $is_custom_post_type)
+	{
+		$this->is_custom_post_type = filter_var($is_custom_post_type, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @param int|float $value
+	 * @return int
+	 * @since $VID:$
+	 */
+	public function parseInfiniteValue($value): int
+	{
+		$value = trim($value);
+		return $value === null
+			   || $value === ''
+			   || $value === '∞'
+			   || $value === 'INF'
+			   || $value === INF
+			   || $value === EE_INF
+			   || is_infinite((float) $value)
+			? -1
+			: $value;
+	}
+
+
+	/**
+	 * @param mixed $source
+	 * @return EE_Base_Class|null
+	 * @throws EE_Error
+	 */
+	private function getModel($source): ?EE_Base_Class
+	{
+		// If it comes from a custom connection
+		// where the $source is already instantiated.
+		if ($source instanceof EE_Base_Class) {
+			return $source;
+		}
+		return $source instanceof Post ? $this->model->get_one_by_ID($source->ID) : null;
+	}
+
+
+	/**
+	 * @param mixed       $source  The source that's passed down the GraphQL queries
+	 * @param array       $args    The inputArgs on the field
+	 * @param AppContext  $context The AppContext passed down the GraphQL tree
+	 * @param ResolveInfo $info    The ResolveInfo passed down the GraphQL tree
+	 * @return EE_Base_Class|Deferred|string|null
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws UnexpectedEntityException
+	 * @throws UserError
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function resolveField($source, array $args, AppContext $context, ResolveInfo $info)
+	{
+		$source = $source instanceof RootQuery ? $source : $this->getModel($source);
+
+		return $this->field_resolver->resolve($source, $args, $context, $info);
+	}
+
+
+	/**
+	 * @param mixed      $payload The payload returned after mutation
+	 * @param array      $args    The inputArgs on the field
+	 * @param AppContext $context The AppContext passed down the GraphQL tree
+	 * @return EE_Base_Class|EE_Soft_Delete_Base_Class|null
+	 * @throws EE_Error
+	 */
+	public function resolveFromPayload($payload, array $args, AppContext $context)
+	{
+		if (empty($payload['id'])) {
+			return null;
+		}
+		return $this->model->get_one_by_ID($payload['id']);
+	}
+
+
+	/**
+	 * Prepares a datetime value in ISO8601/RFC3339 format.
+	 * It is assumed that the value of $datetime is in the format
+	 * returned by EE_Base_Class::get_format().
+	 *
+	 * @param string        $datetime The datetime value.
+	 * @param EE_Base_Class $source   The source object.
+	 * @return string ISO8601/RFC3339 formatted datetime.
+	 */
+	public function formatDatetime(string $datetime, EE_Base_Class $source): string
+	{
+		$format   = $source->get_format();
+		// create date object based on local timezone
+		$datetime = DateTime::createFromFormat($format, $datetime, new DateTimeZone($source->get_timezone()));
+		// change the timezone to UTC
+		$datetime->setTimezone(new DateTimeZone('UTC'));
+
+		return $datetime->format(DateTime::RFC3339);
+	}
+
+
+	/**
+	 * Converts an object to JSON. The object must have a "toJson" method.
+	 *
+	 * @param string        $object   The object/value.
+	 * @param EE_Base_Class $source   The source object.
+	 * @return string JSON representation of the object.
+	 */
+	public function toJson(JsonableInterface $object, EE_Base_Class $source): string
+	{
+		return $object->toJson();
+	}
 }

core/services/graphql/resolvers/ResolverCollection.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      */
     private function loadCollection()
     {
-        if (! $this->loader instanceof CollectionLoader) {
+        if ( ! $this->loader instanceof CollectionLoader) {
             $this->loader = new CollectionLoader(
                 new CollectionDetails(
                     // collection name

Indentation +74 added lines, -74 removed lines

@@ -20,86 +20,86 @@
  */
 class ResolverCollection extends Collection
 {
-    const COLLECTION_NAME = 'espresso_graphql_resolvers';
+	const COLLECTION_NAME = 'espresso_graphql_resolvers';
 
-    /**
-     * @var CollectionLoader $loader
-     */
-    protected $loader;
+	/**
+	 * @var CollectionLoader $loader
+	 */
+	protected $loader;
 
-    /**
-     * ResolverCollection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            'EventEspresso\core\services\graphql\ResolverInterface',
-            ResolverCollection::COLLECTION_NAME
-        );
-    }
+	/**
+	 * ResolverCollection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			'EventEspresso\core\services\graphql\ResolverInterface',
+			ResolverCollection::COLLECTION_NAME
+		);
+	}
 
 
-    /**
-     * @throws CollectionDetailsException
-     * @throws CollectionLoaderException
-     * @since $VID:$
-     */
-    private function loadCollection()
-    {
-        if (! $this->loader instanceof CollectionLoader) {
-            $this->loader = new CollectionLoader(
-                new CollectionDetails(
-                    // collection name
-                    ResolverCollection::COLLECTION_NAME,
-                    // collection interface
-                    'EventEspresso\core\services\graphql\ResolverInterface',
-                    // FQCNs for classes to add (all classes within each namespace will be loaded)
-                    apply_filters(
-                        'FHEE__EventEspresso_core_services_graphql_ResolverCollection__loadCollection__collection_FQCNs',
-                        ['EventEspresso\core\domain\services\graphql\resolvers']
-                    ),
-                    // filepaths to classes to add
-                    array(),
-                    // file mask to use if parsing folder for files to add
-                    '',
-                    // what to use as identifier for collection entities
-                    // using CLASS NAME prevents duplicates (works like a singleton)
-                    CollectionDetails::ID_CLASS_NAME
-                ),
-                $this
-            );
-        }
-    }
+	/**
+	 * @throws CollectionDetailsException
+	 * @throws CollectionLoaderException
+	 * @since $VID:$
+	 */
+	private function loadCollection()
+	{
+		if (! $this->loader instanceof CollectionLoader) {
+			$this->loader = new CollectionLoader(
+				new CollectionDetails(
+					// collection name
+					ResolverCollection::COLLECTION_NAME,
+					// collection interface
+					'EventEspresso\core\services\graphql\ResolverInterface',
+					// FQCNs for classes to add (all classes within each namespace will be loaded)
+					apply_filters(
+						'FHEE__EventEspresso_core_services_graphql_ResolverCollection__loadCollection__collection_FQCNs',
+						['EventEspresso\core\domain\services\graphql\resolvers']
+					),
+					// filepaths to classes to add
+					array(),
+					// file mask to use if parsing folder for files to add
+					'',
+					// what to use as identifier for collection entities
+					// using CLASS NAME prevents duplicates (works like a singleton)
+					CollectionDetails::ID_CLASS_NAME
+				),
+				$this
+			);
+		}
+	}
 
 
-    /**
-     * @return CollectionInterface
-     * @throws CollectionDetailsException
-     * @throws CollectionLoaderException
-     * @since $VID:$
-     */
-    public function loadResolvers()
-    {
-        $this->loadCollection();
-        return $this->loader->getCollection();
-    }
+	/**
+	 * @return CollectionInterface
+	 * @throws CollectionDetailsException
+	 * @throws CollectionLoaderException
+	 * @since $VID:$
+	 */
+	public function loadResolvers()
+	{
+		$this->loadCollection();
+		return $this->loader->getCollection();
+	}
 
 
-    /**
-     * getIdentifier
-     * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
-     * If no $identifier is supplied, then the  fully qualified class name is used
-     *
-     * @param        $object
-     * @param mixed  $identifier
-     * @return bool
-     */
-    public function getIdentifier($object, $identifier = null)
-    {
-        return ! empty($identifier)
-            ? $identifier
-            : get_class($object);
-    }
+	/**
+	 * getIdentifier
+	 * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
+	 * If no $identifier is supplied, then the  fully qualified class name is used
+	 *
+	 * @param        $object
+	 * @param mixed  $identifier
+	 * @return bool
+	 */
+	public function getIdentifier($object, $identifier = null)
+	{
+		return ! empty($identifier)
+			? $identifier
+			: get_class($object);
+	}
 }