eventespresso / event-espresso-core

core/domain/services/graphql/types/Country.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function __construct(EEM_Country $country_model)
     {
-        $this->setName($this->namespace . 'Country');
+        $this->setName($this->namespace.'Country');
         $this->setDescription(__('A country', 'event_espresso'));
         $this->setIsCustomPostType(false);
         parent::__construct($country_model);

Indentation +113 added lines, -113 removed lines

@@ -19,120 +19,120 @@
  */
 class Country extends TypeBase
 {
-    /**
-     * Country constructor.
-     *
-     * @param EEM_Country $country_model
-     */
-    public function __construct(EEM_Country $country_model)
-    {
-        $this->setName($this->namespace . 'Country');
-        $this->setDescription(__('A country', 'event_espresso'));
-        $this->setIsCustomPostType(false);
-        parent::__construct($country_model);
-    }
+	/**
+	 * Country constructor.
+	 *
+	 * @param EEM_Country $country_model
+	 */
+	public function __construct(EEM_Country $country_model)
+	{
+		$this->setName($this->namespace . 'Country');
+		$this->setDescription(__('A country', 'event_espresso'));
+		$this->setIsCustomPostType(false);
+		parent::__construct($country_model);
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    public function getFields(): array
-    {
-        $fields = [
-            new GraphQLField(
-                'id',
-                ['non_null' => 'ID'],
-                null,
-                esc_html__('The globally unique ID for the object.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'cacheId',
-                ['non_null' => 'String'],
-                null,
-                esc_html__('The cache ID of the object.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'isActive',
-                'Boolean',
-                'is_active',
-                esc_html__(
-                    'Flag that indicates if the country should appear in dropdown select lists',
-                    'event_espresso'
-                )
-            ),
-            new GraphQLField(
-                'ISO',
-                'String',
-                'ID',
-                esc_html__('Country ISO Code', 'event_espresso')
-            ),
-            new GraphQLField(
-                'ISO3',
-                'String',
-                'ISO3',
-                esc_html__('Country ISO3 Code', 'event_espresso')
-            ),
-            new GraphQLField(
-                'name',
-                'String',
-                'name',
-                esc_html__('Country Name', 'event_espresso')
-            ),
-            new GraphQLField(
-                'currencyCode',
-                'String',
-                'currency_code',
-                esc_html__('Country Currency Code', 'event_espresso')
-            ),
-            new GraphQLField(
-                'currencySingular',
-                'String',
-                'currency_name_single',
-                esc_html__('Currency Name Singular', 'event_espresso')
-            ),
-            new GraphQLField(
-                'currencyPlural',
-                'String',
-                'currency_name_plural',
-                esc_html__('Currency Name Plural', 'event_espresso')
-            ),
-            new GraphQLField(
-                'currencySign',
-                'String',
-                'currency_sign',
-                __('Currency Sign', 'event_espresso')
-            ),
-            new GraphQLField(
-                'currencySignBeforeNumber',
-                'String',
-                'currency_sign_before',
-                esc_html__('Currency Sign Before Number', 'event_espresso')
-            ),
-            new GraphQLField(
-                'currencyDecimalPlaces',
-                'String',
-                'currency_decimal_places',
-                esc_html__('Currency Decimal Places', 'event_espresso')
-            ),
-            new GraphQLField(
-                'currencyDecimalMark',
-                'String',
-                'currency_decimal_mark',
-                esc_html__('Currency Decimal Mark', 'event_espresso')
-            ),
-            new GraphQLField(
-                'currencyThousandsSeparator',
-                'String',
-                'currency_thousands_separator',
-                esc_html__('Currency Thousands Separator', 'event_espresso')
-            ),
-        ];
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	public function getFields(): array
+	{
+		$fields = [
+			new GraphQLField(
+				'id',
+				['non_null' => 'ID'],
+				null,
+				esc_html__('The globally unique ID for the object.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'cacheId',
+				['non_null' => 'String'],
+				null,
+				esc_html__('The cache ID of the object.', 'event_espresso')
+			),
+			new GraphQLField(
+				'isActive',
+				'Boolean',
+				'is_active',
+				esc_html__(
+					'Flag that indicates if the country should appear in dropdown select lists',
+					'event_espresso'
+				)
+			),
+			new GraphQLField(
+				'ISO',
+				'String',
+				'ID',
+				esc_html__('Country ISO Code', 'event_espresso')
+			),
+			new GraphQLField(
+				'ISO3',
+				'String',
+				'ISO3',
+				esc_html__('Country ISO3 Code', 'event_espresso')
+			),
+			new GraphQLField(
+				'name',
+				'String',
+				'name',
+				esc_html__('Country Name', 'event_espresso')
+			),
+			new GraphQLField(
+				'currencyCode',
+				'String',
+				'currency_code',
+				esc_html__('Country Currency Code', 'event_espresso')
+			),
+			new GraphQLField(
+				'currencySingular',
+				'String',
+				'currency_name_single',
+				esc_html__('Currency Name Singular', 'event_espresso')
+			),
+			new GraphQLField(
+				'currencyPlural',
+				'String',
+				'currency_name_plural',
+				esc_html__('Currency Name Plural', 'event_espresso')
+			),
+			new GraphQLField(
+				'currencySign',
+				'String',
+				'currency_sign',
+				__('Currency Sign', 'event_espresso')
+			),
+			new GraphQLField(
+				'currencySignBeforeNumber',
+				'String',
+				'currency_sign_before',
+				esc_html__('Currency Sign Before Number', 'event_espresso')
+			),
+			new GraphQLField(
+				'currencyDecimalPlaces',
+				'String',
+				'currency_decimal_places',
+				esc_html__('Currency Decimal Places', 'event_espresso')
+			),
+			new GraphQLField(
+				'currencyDecimalMark',
+				'String',
+				'currency_decimal_mark',
+				esc_html__('Currency Decimal Mark', 'event_espresso')
+			),
+			new GraphQLField(
+				'currencyThousandsSeparator',
+				'String',
+				'currency_thousands_separator',
+				esc_html__('Currency Thousands Separator', 'event_espresso')
+			),
+		];
 
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_types__country_fields',
-            $fields,
-            $this->name,
-            $this->model
-        );
-    }
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_types__country_fields',
+			$fields,
+			$this->name,
+			$this->model
+		);
+	}
 }

core/domain/services/graphql/types/Attendee.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function __construct(EEM_Attendee $attendee_model)
     {
-        $this->setName($this->namespace . 'Attendee');
+        $this->setName($this->namespace.'Attendee');
         $this->setIsCustomPostType(false); // Set to false to use our model queries
         parent::__construct($attendee_model);
     }
@@ -107,7 +107,7 @@ 
             ),
             new GraphQLOutputField(
                 'country',
-                $this->namespace . 'Country',
+                $this->namespace.'Country',
                 null,
                 esc_html__('Country', 'event_espresso'),
                 null,
@@ -161,7 +161,7 @@ 
             ),
             new GraphQLOutputField(
                 'state',
-                $this->namespace . 'State',
+                $this->namespace.'State',
                 null,
                 esc_html__('State', 'event_espresso'),
                 null,

Indentation +177 added lines, -177 removed lines

@@ -23,187 +23,187 @@
  */
 class Attendee extends TypeBase
 {
-    /**
-     * Attendee constructor.
-     *
-     * @param EEM_Attendee $attendee_model
-     */
-    public function __construct(EEM_Attendee $attendee_model)
-    {
-        $this->setName($this->namespace . 'Attendee');
-        $this->setIsCustomPostType(false); // Set to false to use our model queries
-        parent::__construct($attendee_model);
-    }
+	/**
+	 * Attendee constructor.
+	 *
+	 * @param EEM_Attendee $attendee_model
+	 */
+	public function __construct(EEM_Attendee $attendee_model)
+	{
+		$this->setName($this->namespace . 'Attendee');
+		$this->setIsCustomPostType(false); // Set to false to use our model queries
+		parent::__construct($attendee_model);
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    public function getFields(): array
-    {
-        $fields = [
-            new GraphQLField(
-                'id',
-                ['non_null' => 'ID'],
-                null,
-                esc_html__('The globally unique ID for the object.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'dbId',
-                ['non_null' => 'Int'],
-                'ID',
-                esc_html__('The attendee ID.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'cacheId',
-                ['non_null' => 'String'],
-                null,
-                esc_html__('The cache ID of the object.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'address',
-                'String',
-                'address',
-                esc_html__('Address Part 1', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'address2',
-                'String',
-                'address2',
-                esc_html__('Address Part 2', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'avatar',
-                'String',
-                null,
-                esc_html__('User avatar URL', 'event_espresso'),
-                null,
-                [$this, 'getAvatar'],
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'bio',
-                'String',
-                'bio',
-                esc_html__('Attendee Biography', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'city',
-                'String',
-                'city',
-                esc_html__('City', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'country',
-                $this->namespace . 'Country',
-                null,
-                esc_html__('Country', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'email',
-                'String',
-                'email',
-                esc_html__('Email Address', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'firstName',
-                'String',
-                'fname',
-                esc_html__('Attendee First Name', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'fullName',
-                'String',
-                'full_name',
-                esc_html__('Attendee Name', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'lastName',
-                'String',
-                'lname',
-                esc_html__('Attendee Last Name', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'phone',
-                'String',
-                'phone',
-                esc_html__('Phone', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'shortBio',
-                'String',
-                'short_bio',
-                esc_html__('Attendee Short Biography', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'state',
-                $this->namespace . 'State',
-                null,
-                esc_html__('State', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-            new GraphQLOutputField(
-                'zip',
-                'String',
-                'zip',
-                esc_html__('ZIP/Postal Code', 'event_espresso'),
-                null,
-                null,
-                ['ee_edit_contacts']
-            ),
-        ];
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	public function getFields(): array
+	{
+		$fields = [
+			new GraphQLField(
+				'id',
+				['non_null' => 'ID'],
+				null,
+				esc_html__('The globally unique ID for the object.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'dbId',
+				['non_null' => 'Int'],
+				'ID',
+				esc_html__('The attendee ID.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'cacheId',
+				['non_null' => 'String'],
+				null,
+				esc_html__('The cache ID of the object.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'address',
+				'String',
+				'address',
+				esc_html__('Address Part 1', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'address2',
+				'String',
+				'address2',
+				esc_html__('Address Part 2', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'avatar',
+				'String',
+				null,
+				esc_html__('User avatar URL', 'event_espresso'),
+				null,
+				[$this, 'getAvatar'],
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'bio',
+				'String',
+				'bio',
+				esc_html__('Attendee Biography', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'city',
+				'String',
+				'city',
+				esc_html__('City', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'country',
+				$this->namespace . 'Country',
+				null,
+				esc_html__('Country', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'email',
+				'String',
+				'email',
+				esc_html__('Email Address', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'firstName',
+				'String',
+				'fname',
+				esc_html__('Attendee First Name', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'fullName',
+				'String',
+				'full_name',
+				esc_html__('Attendee Name', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'lastName',
+				'String',
+				'lname',
+				esc_html__('Attendee Last Name', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'phone',
+				'String',
+				'phone',
+				esc_html__('Phone', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'shortBio',
+				'String',
+				'short_bio',
+				esc_html__('Attendee Short Biography', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'state',
+				$this->namespace . 'State',
+				null,
+				esc_html__('State', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+			new GraphQLOutputField(
+				'zip',
+				'String',
+				'zip',
+				esc_html__('ZIP/Postal Code', 'event_espresso'),
+				null,
+				null,
+				['ee_edit_contacts']
+			),
+		];
 
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_types__attendee_fields',
-            $fields,
-            $this->name,
-            $this->model
-        );
-    }
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_types__attendee_fields',
+			$fields,
+			$this->name,
+			$this->model
+		);
+	}
 
 
-    /**
-     * @param EE_Attendee $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 string|null
-     * @throws EE_Error
-     */
-    public function getAvatar(EE_Attendee $source, array $args, AppContext $context, ResolveInfo $info): ?string
-    {
-        $email = $source->email();
+	/**
+	 * @param EE_Attendee $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 string|null
+	 * @throws EE_Error
+	 */
+	public function getAvatar(EE_Attendee $source, array $args, AppContext $context, ResolveInfo $info): ?string
+	{
+		$email = $source->email();
 
-        if (empty($email)) {
-            return get_avatar_url('', ['force_default' => true]);
-        }
-        $avatar = get_avatar_url($email);
-        return $avatar ?: null;
-    }
+		if (empty($email)) {
+			return get_avatar_url('', ['force_default' => true]);
+		}
+		$avatar = get_avatar_url($email);
+		return $avatar ?: null;
+	}
 }

core/domain/services/graphql/resolvers/FieldResolver.php

Spacing +5 added lines, -5 removed lines

@@ -80,22 +80,22 @@ 
     public function resolve($source, array $args, AppContext $context, ResolveInfo $info)
     {
         $fieldName = $info->fieldName;
-        $field     = $this->fields[ $fieldName ] ?? null;
+        $field     = $this->fields[$fieldName] ?? null;
         // Field should exist in teh registered fields
         if ($field instanceof GraphQLField) {
             // check if the field should be resolved.
-            if (! $field->shouldResolve()) {
+            if ( ! $field->shouldResolve()) {
                 return null;
             }
             // Give priority to the internal resolver.
             if ($field->hasInternalResolver()) {
                 return $field->resolve($source, $args, $context, $info);
             }
-            if (! ($source instanceof EE_Base_Class)) {
+            if ( ! ($source instanceof EE_Base_Class)) {
                 return null;
             }
             // Check if the field has a key mapped to model.
-            if (! empty($field->key())) {
+            if ( ! empty($field->key())) {
                 $value = $source->{$field->key()}();
                 return $field->mayBeFormatValue($value, $source);
             }
@@ -132,7 +132,7 @@ 
      */
     public function resolveId($source): ?string
     {
-        if (! $source instanceof EE_Base_Class) {
+        if ( ! $source instanceof EE_Base_Class) {
             return null;
         }
         // If the model has a UUID method

Indentation +233 added lines, -233 removed lines

@@ -37,260 +37,260 @@
  */
 class FieldResolver extends ResolverBase
 {
-    /**
-     * @var EEM_Base $model
-     */
-    protected $model;
+	/**
+	 * @var EEM_Base $model
+	 */
+	protected $model;
 
-    /**
-     * @var array $fields .
-     */
-    protected $fields;
+	/**
+	 * @var array $fields .
+	 */
+	protected $fields;
 
 
-    /**
-     * FieldResolver constructor.
-     *
-     * @param EEM_Base|null $model  The model instance.
-     * @param array         $fields The fields registered for the type.
-     */
-    public function __construct(EEM_Base $model = null, array $fields = [])
-    {
-        $this->model  = $model;
-        $this->fields = $fields;
-    }
+	/**
+	 * FieldResolver constructor.
+	 *
+	 * @param EEM_Base|null $model  The model instance.
+	 * @param array         $fields The fields registered for the type.
+	 */
+	public function __construct(EEM_Base $model = null, array $fields = [])
+	{
+		$this->model  = $model;
+		$this->fields = $fields;
+	}
 
 
-    /**
-     * @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
-     * @throws EE_Error
-     * @throws Exception
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws UserError
-     * @throws UnexpectedEntityException
-     */
-    public function resolve($source, array $args, AppContext $context, ResolveInfo $info)
-    {
-        $fieldName = $info->fieldName;
-        $field     = $this->fields[ $fieldName ] ?? null;
-        // Field should exist in teh registered fields
-        if ($field instanceof GraphQLField) {
-            // check if the field should be resolved.
-            if (! $field->shouldResolve()) {
-                return null;
-            }
-            // Give priority to the internal resolver.
-            if ($field->hasInternalResolver()) {
-                return $field->resolve($source, $args, $context, $info);
-            }
-            if (! ($source instanceof EE_Base_Class)) {
-                return null;
-            }
-            // Check if the field has a key mapped to model.
-            if (! empty($field->key())) {
-                $value = $source->{$field->key()}();
-                return $field->mayBeFormatValue($value, $source);
-            }
-            switch ($fieldName) {
-                case 'id': // the global ID
-                    return $this->resolveId($source);
-                case 'cacheId':
-                    return $this->resolveCacheId($source);
-                case 'parent':
-                    return $this->resolveParent($source);
-                case 'event':
-                    return $this->resolveEvent($source, $args, $context);
-                case 'wpUser':
-                case 'manager':
-                    return $this->resolveWpUser($source, $args, $context);
-                case 'userId':
-                    return $this->resolveUserId($source, $args, $context);
-                case 'state': // Venue
-                    return $this->resolveState($source);
-                case 'country': // State, Venue
-                    return $this->resolveCountry($source);
-            }
-        }
-        return 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
+	 * @throws EE_Error
+	 * @throws Exception
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws UserError
+	 * @throws UnexpectedEntityException
+	 */
+	public function resolve($source, array $args, AppContext $context, ResolveInfo $info)
+	{
+		$fieldName = $info->fieldName;
+		$field     = $this->fields[ $fieldName ] ?? null;
+		// Field should exist in teh registered fields
+		if ($field instanceof GraphQLField) {
+			// check if the field should be resolved.
+			if (! $field->shouldResolve()) {
+				return null;
+			}
+			// Give priority to the internal resolver.
+			if ($field->hasInternalResolver()) {
+				return $field->resolve($source, $args, $context, $info);
+			}
+			if (! ($source instanceof EE_Base_Class)) {
+				return null;
+			}
+			// Check if the field has a key mapped to model.
+			if (! empty($field->key())) {
+				$value = $source->{$field->key()}();
+				return $field->mayBeFormatValue($value, $source);
+			}
+			switch ($fieldName) {
+				case 'id': // the global ID
+					return $this->resolveId($source);
+				case 'cacheId':
+					return $this->resolveCacheId($source);
+				case 'parent':
+					return $this->resolveParent($source);
+				case 'event':
+					return $this->resolveEvent($source, $args, $context);
+				case 'wpUser':
+				case 'manager':
+					return $this->resolveWpUser($source, $args, $context);
+				case 'userId':
+					return $this->resolveUserId($source, $args, $context);
+				case 'state': // Venue
+					return $this->resolveState($source);
+				case 'country': // State, Venue
+					return $this->resolveCountry($source);
+			}
+		}
+		return null;
+	}
 
 
-    /**
-     * Resolve the global ID
-     *
-     * @param mixed $source
-     * @return string|null
-     * @throws Exception
-     */
-    public function resolveId($source): ?string
-    {
-        if (! $source instanceof EE_Base_Class) {
-            return null;
-        }
-        // If the model has a UUID method
-        if (method_exists($source, 'UUID') && is_callable([$source, 'UUID'])) {
-            return $source->UUID();
-        }
+	/**
+	 * Resolve the global ID
+	 *
+	 * @param mixed $source
+	 * @return string|null
+	 * @throws Exception
+	 */
+	public function resolveId($source): ?string
+	{
+		if (! $source instanceof EE_Base_Class) {
+			return null;
+		}
+		// If the model has a UUID method
+		if (method_exists($source, 'UUID') && is_callable([$source, 'UUID'])) {
+			return $source->UUID();
+		}
 
-        return Relay::toGlobalId($this->model->item_name(), $source->ID());
-    }
+		return Relay::toGlobalId($this->model->item_name(), $source->ID());
+	}
 
 
-    /**
-     * Resolve the cache ID
-     *
-     * @param mixed $source
-     * @return string
-     */
-    public function resolveCacheId($source): string
-    {
-        $model_name = $this->model->item_name();
-        $ID         = $source->ID();
-        // Since cacheId does not need to be globally unique
-        // $uniqid is sufficient, still adding the model name and ID
-        // may be we need/use them in future.
-        return uniqid("{$model_name}:{$ID}:", true);
-    }
+	/**
+	 * Resolve the cache ID
+	 *
+	 * @param mixed $source
+	 * @return string
+	 */
+	public function resolveCacheId($source): string
+	{
+		$model_name = $this->model->item_name();
+		$ID         = $source->ID();
+		// Since cacheId does not need to be globally unique
+		// $uniqid is sufficient, still adding the model name and ID
+		// may be we need/use them in future.
+		return uniqid("{$model_name}:{$ID}:", true);
+	}
 
 
-    /**
-     * @param mixed     $source
-     * @param           $args
-     * @param           $context
-     * @return Deferred|null
-     * @throws Exception
-     */
-    public function resolveWpUser($source, $args, $context): ?Deferred
-    {
-        $user_id = $source->wp_user();
-        return $user_id
-            ? $context->get_loader('user')->load_deferred($user_id)
-            : null;
-    }
+	/**
+	 * @param mixed     $source
+	 * @param           $args
+	 * @param           $context
+	 * @return Deferred|null
+	 * @throws Exception
+	 */
+	public function resolveWpUser($source, $args, $context): ?Deferred
+	{
+		$user_id = $source->wp_user();
+		return $user_id
+			? $context->get_loader('user')->load_deferred($user_id)
+			: null;
+	}
 
 
-    /**
-     * @param mixed     $source
-     * @param           $args
-     * @param           $context
-     * @return string|null
-     * @throws Exception
-     */
-    public function resolveUserId($source, $args, $context): ?string
-    {
-        $user_id = $source->wp_user();
-        return $user_id
-            ? Relay::toGlobalId('user', $user_id)
-            : null;
-    }
+	/**
+	 * @param mixed     $source
+	 * @param           $args
+	 * @param           $context
+	 * @return string|null
+	 * @throws Exception
+	 */
+	public function resolveUserId($source, $args, $context): ?string
+	{
+		$user_id = $source->wp_user();
+		return $user_id
+			? Relay::toGlobalId('user', $user_id)
+			: null;
+	}
 
 
-    /**
-     * @param mixed $source
-     * @return EE_Base_Class|null
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws EE_Error
-     */
-    public function resolveParent($source): ?EE_Base_Class
-    {
-        return $this->model->get_one_by_ID($source->parent());
-    }
+	/**
+	 * @param mixed $source
+	 * @return EE_Base_Class|null
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws EE_Error
+	 */
+	public function resolveParent($source): ?EE_Base_Class
+	{
+		return $this->model->get_one_by_ID($source->parent());
+	}
 
 
-    /**
-     * @param mixed       $source
-     * @param             $args
-     * @param             $context
-     * @return Deferred|null
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws UserError
-     * @throws UnexpectedEntityException
-     */
-    public function resolveEvent($source, $args, $context): ?Deferred
-    {
-        switch (true) {
-            case $source instanceof EE_Datetime:
-                $event = $source->event();
-                break;
-            case $source instanceof EE_Venue:
-            case $source instanceof EE_Ticket:
-                $event = $source->get_related_event();
-                break;
-            default:
-                $event = null;
-                break;
-        }
-        return $event instanceof EE_Event
-            ? $context->get_loader('post')->load_deferred($event->ID())
-            : null;
-    }
+	/**
+	 * @param mixed       $source
+	 * @param             $args
+	 * @param             $context
+	 * @return Deferred|null
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws UserError
+	 * @throws UnexpectedEntityException
+	 */
+	public function resolveEvent($source, $args, $context): ?Deferred
+	{
+		switch (true) {
+			case $source instanceof EE_Datetime:
+				$event = $source->event();
+				break;
+			case $source instanceof EE_Venue:
+			case $source instanceof EE_Ticket:
+				$event = $source->get_related_event();
+				break;
+			default:
+				$event = null;
+				break;
+		}
+		return $event instanceof EE_Event
+			? $context->get_loader('post')->load_deferred($event->ID())
+			: null;
+	}
 
 
-    /**
-     * @param mixed $source The source instance.
-     * @return EE_Base_Class|null
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function resolveState($source): ?EE_Base_Class
-    {
-        switch (true) {
-            case $source instanceof EE_Attendee:
-            case $source instanceof EE_Venue:
-                $state_id = $source->state_ID();
-                break;
-            default:
-                $state_id = null;
-                break;
-        }
-        return $state_id
-            ? EEM_State::instance()->get_one_by_ID($state_id)
-            : null;
-    }
+	/**
+	 * @param mixed $source The source instance.
+	 * @return EE_Base_Class|null
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function resolveState($source): ?EE_Base_Class
+	{
+		switch (true) {
+			case $source instanceof EE_Attendee:
+			case $source instanceof EE_Venue:
+				$state_id = $source->state_ID();
+				break;
+			default:
+				$state_id = null;
+				break;
+		}
+		return $state_id
+			? EEM_State::instance()->get_one_by_ID($state_id)
+			: null;
+	}
 
 
-    /**
-     * @param mixed $source The source instance.
-     * @return EE_Base_Class|null
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function resolveCountry($source): ?EE_Base_Class
-    {
-        switch (true) {
-            case $source instanceof EE_State:
-                $country_iso = $source->country_iso();
-                break;
-            case $source instanceof EE_Attendee:
-            case $source instanceof EE_Venue:
-                $country_iso = $source->country_ID();
-                break;
-            default:
-                $country_iso = null;
-                break;
-        }
+	/**
+	 * @param mixed $source The source instance.
+	 * @return EE_Base_Class|null
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function resolveCountry($source): ?EE_Base_Class
+	{
+		switch (true) {
+			case $source instanceof EE_State:
+				$country_iso = $source->country_iso();
+				break;
+			case $source instanceof EE_Attendee:
+			case $source instanceof EE_Venue:
+				$country_iso = $source->country_ID();
+				break;
+			default:
+				$country_iso = null;
+				break;
+		}
 
-        return $country_iso
-            ? EEM_Country::instance()->get_one_by_ID($country_iso)
-            : null;
-    }
+		return $country_iso
+			? EEM_Country::instance()->get_one_by_ID($country_iso)
+			: null;
+	}
 }

core/domain/services/graphql/connection_resolvers/FormSectionConnectionResolver.php

Indentation +123 added lines, -123 removed lines

@@ -14,127 +14,127 @@
  */
 class FormSectionConnectionResolver extends AbstractConnectionResolver
 {
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_loader_name(): string
-    {
-        return 'espresso_formSection';
-    }
-
-    /**
-     * @return EEM_Form_Section
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query(): EEM_Form_Section
-    {
-        return EEM_Form_Section::instance();
-    }
-
-
-    /**
-     * Return an array of item IDs from the query
-     *
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_ids(): array
-    {
-        $results = $this->query->get_col($this->query_args);
-        return ! empty($results) ? $results : [];
-    }
-
-
-    /**
-     * Here, we map the args from the input, then we make sure that we're only querying
-     * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
-     * handle batch resolution of the posts.
-     *
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query_args(): array
-    {
-        $where_params = [];
-        $query_args   = [];
-
-        $query_args['limit'] = $this->getLimit();
-
-        // Avoid multiple entries by join.
-        $query_args['group_by'] = 'FSC_UUID';
-
-        /**
-         * Collect the input fields and sanitize them to prepare them for sending to the Query
-         */
-        $input_fields = [];
-        if (! empty($this->args['where'])) {
-            $input_fields = $this->sanitizeInputFields($this->args['where']);
-
-            // Use the proper operator.
-            if (! empty($input_fields['FSC_appliesTo']) && is_array($input_fields['FSC_appliesTo'])) {
-                $input_fields['FSC_appliesTo'] = ['IN', $input_fields['FSC_appliesTo']];
-            }
-            if (! empty($input_fields['FSC_belongsTo']) && is_array($input_fields['FSC_belongsTo'])) {
-                $input_fields['FSC_belongsTo'] = ['IN', $input_fields['FSC_belongsTo']];
-            }
-            if (! empty($input_fields['FSC_status']) && is_array($input_fields['FSC_status'])) {
-                $input_fields['FSC_status'] = ['IN', $input_fields['FSC_status']];
-            }
-        }
-
-        /**
-         * Merge the input_fields with the default query_args
-         */
-        if (! empty($input_fields)) {
-            $where_params = array_merge($where_params, $input_fields);
-        }
-
-        $where_params = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__form_section_where_params',
-            $where_params,
-            $this->source,
-            $this->args
-        );
-
-        if (! empty($where_params)) {
-            $query_args[] = $where_params;
-        }
-
-
-        /**
-         * Return the $query_args
-         */
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__form_section_query_args',
-            $query_args,
-            $this->source,
-            $this->args
-        );
-    }
-
-
-    /**
-     * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
-     * friendly keys.
-     *
-     * @param array $where_args
-     * @return array
-     */
-    public function sanitizeInputFields(array $where_args): array
-    {
-        return $this->sanitizeWhereArgsForInputFields(
-            $where_args,
-            [
-                'appliesTo' => 'FSC_appliesTo',
-                'belongsTo' => 'FSC_belongsTo',
-                'status'    => 'FSC_status',
-            ]
-        );
-    }
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_loader_name(): string
+	{
+		return 'espresso_formSection';
+	}
+
+	/**
+	 * @return EEM_Form_Section
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query(): EEM_Form_Section
+	{
+		return EEM_Form_Section::instance();
+	}
+
+
+	/**
+	 * Return an array of item IDs from the query
+	 *
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_ids(): array
+	{
+		$results = $this->query->get_col($this->query_args);
+		return ! empty($results) ? $results : [];
+	}
+
+
+	/**
+	 * Here, we map the args from the input, then we make sure that we're only querying
+	 * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
+	 * handle batch resolution of the posts.
+	 *
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query_args(): array
+	{
+		$where_params = [];
+		$query_args   = [];
+
+		$query_args['limit'] = $this->getLimit();
+
+		// Avoid multiple entries by join.
+		$query_args['group_by'] = 'FSC_UUID';
+
+		/**
+		 * Collect the input fields and sanitize them to prepare them for sending to the Query
+		 */
+		$input_fields = [];
+		if (! empty($this->args['where'])) {
+			$input_fields = $this->sanitizeInputFields($this->args['where']);
+
+			// Use the proper operator.
+			if (! empty($input_fields['FSC_appliesTo']) && is_array($input_fields['FSC_appliesTo'])) {
+				$input_fields['FSC_appliesTo'] = ['IN', $input_fields['FSC_appliesTo']];
+			}
+			if (! empty($input_fields['FSC_belongsTo']) && is_array($input_fields['FSC_belongsTo'])) {
+				$input_fields['FSC_belongsTo'] = ['IN', $input_fields['FSC_belongsTo']];
+			}
+			if (! empty($input_fields['FSC_status']) && is_array($input_fields['FSC_status'])) {
+				$input_fields['FSC_status'] = ['IN', $input_fields['FSC_status']];
+			}
+		}
+
+		/**
+		 * Merge the input_fields with the default query_args
+		 */
+		if (! empty($input_fields)) {
+			$where_params = array_merge($where_params, $input_fields);
+		}
+
+		$where_params = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__form_section_where_params',
+			$where_params,
+			$this->source,
+			$this->args
+		);
+
+		if (! empty($where_params)) {
+			$query_args[] = $where_params;
+		}
+
+
+		/**
+		 * Return the $query_args
+		 */
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__form_section_query_args',
+			$query_args,
+			$this->source,
+			$this->args
+		);
+	}
+
+
+	/**
+	 * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
+	 * friendly keys.
+	 *
+	 * @param array $where_args
+	 * @return array
+	 */
+	public function sanitizeInputFields(array $where_args): array
+	{
+		return $this->sanitizeWhereArgsForInputFields(
+			$where_args,
+			[
+				'appliesTo' => 'FSC_appliesTo',
+				'belongsTo' => 'FSC_belongsTo',
+				'status'    => 'FSC_status',
+			]
+		);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -73,17 +73,17 @@ 
          * Collect the input fields and sanitize them to prepare them for sending to the Query
          */
         $input_fields = [];
-        if (! empty($this->args['where'])) {
+        if ( ! empty($this->args['where'])) {
             $input_fields = $this->sanitizeInputFields($this->args['where']);
 
             // Use the proper operator.
-            if (! empty($input_fields['FSC_appliesTo']) && is_array($input_fields['FSC_appliesTo'])) {
+            if ( ! empty($input_fields['FSC_appliesTo']) && is_array($input_fields['FSC_appliesTo'])) {
                 $input_fields['FSC_appliesTo'] = ['IN', $input_fields['FSC_appliesTo']];
             }
-            if (! empty($input_fields['FSC_belongsTo']) && is_array($input_fields['FSC_belongsTo'])) {
+            if ( ! empty($input_fields['FSC_belongsTo']) && is_array($input_fields['FSC_belongsTo'])) {
                 $input_fields['FSC_belongsTo'] = ['IN', $input_fields['FSC_belongsTo']];
             }
-            if (! empty($input_fields['FSC_status']) && is_array($input_fields['FSC_status'])) {
+            if ( ! empty($input_fields['FSC_status']) && is_array($input_fields['FSC_status'])) {
                 $input_fields['FSC_status'] = ['IN', $input_fields['FSC_status']];
             }
         }
@@ -91,7 +91,7 @@ 
         /**
          * Merge the input_fields with the default query_args
          */
-        if (! empty($input_fields)) {
+        if ( ! empty($input_fields)) {
             $where_params = array_merge($where_params, $input_fields);
         }
 
@@ -102,7 +102,7 @@ 
             $this->args
         );
 
-        if (! empty($where_params)) {
+        if ( ! empty($where_params)) {
             $query_args[] = $where_params;
         }
 

core/domain/services/graphql/connection_resolvers/AbstractConnectionResolver.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
      */
     public function getUtilities(): Utilities
     {
-        if (! $this->utilities instanceof Utilities) {
+        if ( ! $this->utilities instanceof Utilities) {
             $this->utilities = LoaderFactory::getLoader()->getShared(Utilities::class);
         }
         return $this->utilities;
@@ -143,14 +143,14 @@ 
         /**
          * Map the orderby inputArgs to the WP_Query
          */
-        if (! empty($this->args['where']['orderby']) && is_array($this->args['where']['orderby'])) {
+        if ( ! empty($this->args['where']['orderby']) && is_array($this->args['where']['orderby'])) {
             $query_args['order_by'] = [];
             foreach ($this->args['where']['orderby'] as $orderby_input) {
-                $query_args['order_by'][ $orderby_input['field'] ] = $orderby_input['order'];
+                $query_args['order_by'][$orderby_input['field']] = $orderby_input['order'];
             }
         } elseif ($offset) {
             $compare = $this->args['last'] ? '<' : '>';
-            $where_params[ $primary_key ] = [$compare, $offset];
+            $where_params[$primary_key] = [$compare, $offset];
         }
         return [$query_args, $where_params];
     }
@@ -183,7 +183,7 @@ 
     protected function getSearchKeywords(array $where_args): string
     {
         $search = '';
-        if (! empty($where_args['search'])) {
+        if ( ! empty($where_args['search'])) {
             $search = sanitize_text_field($where_args['search']);
         }
         return esc_sql($search);

Indentation +170 added lines, -170 removed lines

@@ -19,174 +19,174 @@
  */
 abstract class AbstractConnectionResolver extends WPGraphQLConnectionResolver
 {
-    const MAX_QUERY_LIMIT = 250;
-
-    /**
-     * @var Utilities
-     */
-    private $utilities;
-
-
-    /**
-     * @return Utilities
-     */
-    public function getUtilities(): Utilities
-    {
-        if (! $this->utilities instanceof Utilities) {
-            $this->utilities = LoaderFactory::getLoader()->getShared(Utilities::class);
-        }
-        return $this->utilities;
-    }
-
-    /**
-     * Determine whether the Query should execute. If it's determined that the query should
-     * not be run based on context such as, but not limited to, who the user is, where in the
-     * ResolveTree the Query is, the relation to the node the Query is connected to, etc
-     * Return false to prevent the query from executing.
-     *
-     * @return bool
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function should_execute(): bool
-    {
-        return $this->should_execute;
-    }
-
-
-    /**
-     * Set limit the highest value of first and last, with a (filterable) max of 500
-     *
-     * @return int
-     */
-    protected function getLimit(): int
-    {
-        $first = ! empty($this->args['first'])
-            ? absint($this->args['first'])
-            : null;
-        $last  = ! empty($this->args['last'])
-            ? absint($this->args['last'])
-            : null;
-
-        $limit = min(
-            max($first, $last, self::MAX_QUERY_LIMIT),
-            $this->query_amount
-        );
-        $limit++;
-        return $limit;
-    }
-
-    // /**
-    //  * Get_amount_requested
-    //  *
-    //  * This checks the $args to determine the amount requested
-    //  *
-    //  * @return int|null
-    //  * @throws Exception
-    //  */
-    // // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    // public function get_amount_requested(): ?int
-    // {
-    //     $amount_requested = parent::get_amount_requested();
-    //
-    //     /**
-    //      * If both first & last are used in the input args, throw an exception as that won't
-    //      * work properly
-    //      */
-    //     if (empty($this->args['first']) && empty($this->args['last']) && $amount_requested === ConnectionsManager::MAX_AMOUNT_REQUESTED) {
-    //         return ConnectionsManager::MAX_AMOUNT_REQUESTED; // default.
-    //     }
-    //
-    //     return $amount_requested;
-    // }
-
-    /**
-     * Determine whether or not the the offset is valid, i.e the entity corresponding to the
-     * offset exists. Offset is equivalent to entity ID. So this function is equivalent to
-     * checking if the entity with the given ID exists.
-     *
-     * @param int $offset The ID of the node used for the cursor offset
-     * @return bool
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function is_valid_offset($offset): bool
-    {
-        $entity = $this->get_query()->get_one_by_ID($offset);
-
-        return $entity instanceof EE_Base_Class;
-    }
-
-    /**
-     * Validates Model.
-     *
-     * @param array $model Entity node.
-     * @return bool
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    protected function is_valid_model($model): bool
-    {
-        return $model instanceof EE_Base_Class;
-    }
-
-
-    /**
-     * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
-     * friendly keys.
-     *
-     * @param array  $query_args
-     * @param array  $where_params
-     * @param string $primary_key
-     * @return array
-     */
-    protected function mapOrderbyInputArgs(array $query_args, array $where_params, string $primary_key): array
-    {
-        // ID of the current offset
-        $offset = $this->get_offset();
-        /**
-         * Map the orderby inputArgs to the WP_Query
-         */
-        if (! empty($this->args['where']['orderby']) && is_array($this->args['where']['orderby'])) {
-            $query_args['order_by'] = [];
-            foreach ($this->args['where']['orderby'] as $orderby_input) {
-                $query_args['order_by'][ $orderby_input['field'] ] = $orderby_input['order'];
-            }
-        } elseif ($offset) {
-            $compare = $this->args['last'] ? '<' : '>';
-            $where_params[ $primary_key ] = [$compare, $offset];
-        }
-        return [$query_args, $where_params];
-    }
-
-
-    /**
-     * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
-     * friendly keys.
-     *
-     * @param array $where_args
-     * @param array $arg_mapping
-     * @param array $id_fields The fields to convert from global IDs to DB IDs.
-     * @return array
-     */
-    protected function sanitizeWhereArgsForInputFields(array $where_args, array $arg_mapping, array $id_fields = []): array
-    {
-        $query_args = $this->getUtilities()->sanitizeWhereArgs($where_args, $arg_mapping, $id_fields);
-        return ! empty($query_args) && is_array($query_args)
-            ? $query_args
-            : [];
-    }
-
-
-    /**
-     * This returns the sanitized "search" keywords from where_args
-     *
-     * @param array $where_args
-     * @return string
-     */
-    protected function getSearchKeywords(array $where_args): string
-    {
-        $search = '';
-        if (! empty($where_args['search'])) {
-            $search = sanitize_text_field($where_args['search']);
-        }
-        return esc_sql($search);
-    }
+	const MAX_QUERY_LIMIT = 250;
+
+	/**
+	 * @var Utilities
+	 */
+	private $utilities;
+
+
+	/**
+	 * @return Utilities
+	 */
+	public function getUtilities(): Utilities
+	{
+		if (! $this->utilities instanceof Utilities) {
+			$this->utilities = LoaderFactory::getLoader()->getShared(Utilities::class);
+		}
+		return $this->utilities;
+	}
+
+	/**
+	 * Determine whether the Query should execute. If it's determined that the query should
+	 * not be run based on context such as, but not limited to, who the user is, where in the
+	 * ResolveTree the Query is, the relation to the node the Query is connected to, etc
+	 * Return false to prevent the query from executing.
+	 *
+	 * @return bool
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function should_execute(): bool
+	{
+		return $this->should_execute;
+	}
+
+
+	/**
+	 * Set limit the highest value of first and last, with a (filterable) max of 500
+	 *
+	 * @return int
+	 */
+	protected function getLimit(): int
+	{
+		$first = ! empty($this->args['first'])
+			? absint($this->args['first'])
+			: null;
+		$last  = ! empty($this->args['last'])
+			? absint($this->args['last'])
+			: null;
+
+		$limit = min(
+			max($first, $last, self::MAX_QUERY_LIMIT),
+			$this->query_amount
+		);
+		$limit++;
+		return $limit;
+	}
+
+	// /**
+	//  * Get_amount_requested
+	//  *
+	//  * This checks the $args to determine the amount requested
+	//  *
+	//  * @return int|null
+	//  * @throws Exception
+	//  */
+	// // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	// public function get_amount_requested(): ?int
+	// {
+	//     $amount_requested = parent::get_amount_requested();
+	//
+	//     /**
+	//      * If both first & last are used in the input args, throw an exception as that won't
+	//      * work properly
+	//      */
+	//     if (empty($this->args['first']) && empty($this->args['last']) && $amount_requested === ConnectionsManager::MAX_AMOUNT_REQUESTED) {
+	//         return ConnectionsManager::MAX_AMOUNT_REQUESTED; // default.
+	//     }
+	//
+	//     return $amount_requested;
+	// }
+
+	/**
+	 * Determine whether or not the the offset is valid, i.e the entity corresponding to the
+	 * offset exists. Offset is equivalent to entity ID. So this function is equivalent to
+	 * checking if the entity with the given ID exists.
+	 *
+	 * @param int $offset The ID of the node used for the cursor offset
+	 * @return bool
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function is_valid_offset($offset): bool
+	{
+		$entity = $this->get_query()->get_one_by_ID($offset);
+
+		return $entity instanceof EE_Base_Class;
+	}
+
+	/**
+	 * Validates Model.
+	 *
+	 * @param array $model Entity node.
+	 * @return bool
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	protected function is_valid_model($model): bool
+	{
+		return $model instanceof EE_Base_Class;
+	}
+
+
+	/**
+	 * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
+	 * friendly keys.
+	 *
+	 * @param array  $query_args
+	 * @param array  $where_params
+	 * @param string $primary_key
+	 * @return array
+	 */
+	protected function mapOrderbyInputArgs(array $query_args, array $where_params, string $primary_key): array
+	{
+		// ID of the current offset
+		$offset = $this->get_offset();
+		/**
+		 * Map the orderby inputArgs to the WP_Query
+		 */
+		if (! empty($this->args['where']['orderby']) && is_array($this->args['where']['orderby'])) {
+			$query_args['order_by'] = [];
+			foreach ($this->args['where']['orderby'] as $orderby_input) {
+				$query_args['order_by'][ $orderby_input['field'] ] = $orderby_input['order'];
+			}
+		} elseif ($offset) {
+			$compare = $this->args['last'] ? '<' : '>';
+			$where_params[ $primary_key ] = [$compare, $offset];
+		}
+		return [$query_args, $where_params];
+	}
+
+
+	/**
+	 * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
+	 * friendly keys.
+	 *
+	 * @param array $where_args
+	 * @param array $arg_mapping
+	 * @param array $id_fields The fields to convert from global IDs to DB IDs.
+	 * @return array
+	 */
+	protected function sanitizeWhereArgsForInputFields(array $where_args, array $arg_mapping, array $id_fields = []): array
+	{
+		$query_args = $this->getUtilities()->sanitizeWhereArgs($where_args, $arg_mapping, $id_fields);
+		return ! empty($query_args) && is_array($query_args)
+			? $query_args
+			: [];
+	}
+
+
+	/**
+	 * This returns the sanitized "search" keywords from where_args
+	 *
+	 * @param array $where_args
+	 * @return string
+	 */
+	protected function getSearchKeywords(array $where_args): string
+	{
+		$search = '';
+		if (! empty($where_args['search'])) {
+			$search = sanitize_text_field($where_args['search']);
+		}
+		return esc_sql($search);
+	}
 }

core/domain/services/graphql/connection_resolvers/PriceTypeConnectionResolver.php

Indentation +64 added lines, -64 removed lines

@@ -14,79 +14,79 @@
  */
 class PriceTypeConnectionResolver extends AbstractConnectionResolver
 {
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_loader_name(): string
-    {
-        return 'espresso_priceType';
-    }
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_loader_name(): string
+	{
+		return 'espresso_priceType';
+	}
 
-    /**
-     * @return EEM_Price_Type
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query(): EEM_Price_Type
-    {
-        return EEM_Price_Type::instance();
-    }
+	/**
+	 * @return EEM_Price_Type
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query(): EEM_Price_Type
+	{
+		return EEM_Price_Type::instance();
+	}
 
 
-    /**
-     * Return an array of item IDs from the query
-     *
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_ids(): array
-    {
-        $results = $this->query->get_col($this->query_args);
+	/**
+	 * Return an array of item IDs from the query
+	 *
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_ids(): array
+	{
+		$results = $this->query->get_col($this->query_args);
 
-        return ! empty($results) ? $results : [];
-    }
+		return ! empty($results) ? $results : [];
+	}
 
 
-    /**
-     * Here, we map the args from the input, then we make sure that we're only querying
-     * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
-     * handle batch resolution of the posts.
-     *
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query_args(): array
-    {
-        $where_params = [];
-        $query_args   = [];
+	/**
+	 * Here, we map the args from the input, then we make sure that we're only querying
+	 * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
+	 * handle batch resolution of the posts.
+	 *
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query_args(): array
+	{
+		$where_params = [];
+		$query_args   = [];
 
-        $query_args['limit'] = $this->getLimit();
+		$query_args['limit'] = $this->getLimit();
 
-        // Avoid multiple entries by join.
-        $query_args['group_by'] = 'PRT_ID';
+		// Avoid multiple entries by join.
+		$query_args['group_by'] = 'PRT_ID';
 
-        $where_params = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__priceType_where_params',
-            $where_params,
-            $this->source,
-            $this->args
-        );
+		$where_params = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__priceType_where_params',
+			$where_params,
+			$this->source,
+			$this->args
+		);
 
-        $query_args[] = $where_params;
+		$query_args[] = $where_params;
 
-        /**
-         * Return the $query_args
-         */
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__priceType_query_args',
-            $query_args,
-            $this->source,
-            $this->args
-        );
-    }
+		/**
+		 * Return the $query_args
+		 */
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__priceType_query_args',
+			$query_args,
+			$this->source,
+			$this->args
+		);
+	}
 }

core/services/json/JsonDataHandler.php

Spacing +4 added lines, -4 removed lines

@@ -90,13 +90,13 @@ 
      */
     public function __construct()
     {
-        if (! defined('JSON_INVALID_UTF8_IGNORE')) {
+        if ( ! defined('JSON_INVALID_UTF8_IGNORE')) {
             define('JSON_INVALID_UTF8_IGNORE', 1048576);
         }
-        if (! defined('JSON_INVALID_UTF8_SUBSTITUTE')) {
+        if ( ! defined('JSON_INVALID_UTF8_SUBSTITUTE')) {
             define('JSON_INVALID_UTF8_SUBSTITUTE', 2097152);
         }
-        if (! defined('JSON_THROW_ON_ERROR')) {
+        if ( ! defined('JSON_THROW_ON_ERROR')) {
             define('JSON_THROW_ON_ERROR', 4194304);
         }
     }
@@ -331,7 +331,7 @@ 
      */
     public function isJson($maybe_json): bool
     {
-        if (! is_string($maybe_json)) {
+        if ( ! is_string($maybe_json)) {
             return false;
         }
         $decoded = json_decode($maybe_json, $this->asAssociative(), $this->depth, $this->decode_flags);

Indentation +342 added lines, -342 removed lines

@@ -14,346 +14,346 @@
  */
 class JsonDataHandler
 {
-    const DATA_TYPE_ARRAY     = 'array';
-
-    const DATA_TYPE_OBJECT    = 'object';
-
-    const DATA_TYPE_USE_FLAGS = 'flags';
-
-    const NO_ERROR_MSG        = 'No error';
-
-    /**
-     * @var string|null
-     */
-    private $data_type = null;
-
-    /**
-     * @var array|stdClass|null
-     */
-    private $decoded_data = null;
-
-    /**
-     * JSON_BIGINT_AS_STRING,
-     * JSON_INVALID_UTF8_IGNORE,
-     * JSON_INVALID_UTF8_SUBSTITUTE,
-     * JSON_OBJECT_AS_ARRAY,
-     * JSON_THROW_ON_ERROR
-     *
-     * @var int
-     */
-    private $decode_flags = 0;
-
-    /**
-     * @var int
-     */
-    private $depth = 512;
-
-    /**
-     * @var string
-     */
-    private $encoded_data = '';
-
-    /**
-     * JSON_FORCE_OBJECT,
-     * JSON_HEX_QUOT,
-     * JSON_HEX_TAG,
-     * JSON_HEX_AMP,
-     * JSON_HEX_APOS,
-     * JSON_INVALID_UTF8_IGNORE,
-     * JSON_INVALID_UTF8_SUBSTITUTE,
-     * JSON_NUMERIC_CHECK,
-     * JSON_PARTIAL_OUTPUT_ON_ERROR,
-     * JSON_PRESERVE_ZERO_FRACTION,
-     * JSON_PRETTY_PRINT,
-     * JSON_UNESCAPED_LINE_TERMINATORS,
-     * JSON_UNESCAPED_SLASHES,
-     * JSON_UNESCAPED_UNICODE,
-     * JSON_THROW_ON_ERROR.
-     *
-     * @var int
-     */
-    private $encode_flags = 0;
-
-    /**
-     * @var int
-     */
-    private $last_error_code = JSON_ERROR_NONE;
-
-    /**
-     * @var string
-     */
-    private $last_error_msg = JsonDataHandler::NO_ERROR_MSG;
-
-
-    /**
-     * JsonDataHandler constructor.
-     */
-    public function __construct()
-    {
-        if (! defined('JSON_INVALID_UTF8_IGNORE')) {
-            define('JSON_INVALID_UTF8_IGNORE', 1048576);
-        }
-        if (! defined('JSON_INVALID_UTF8_SUBSTITUTE')) {
-            define('JSON_INVALID_UTF8_SUBSTITUTE', 2097152);
-        }
-        if (! defined('JSON_THROW_ON_ERROR')) {
-            define('JSON_THROW_ON_ERROR', 4194304);
-        }
-    }
-
-
-    /**
-     * set $data_type, $decode_flags, $encode_flags, and depth all in one shot
-     *
-     * @param string $data_type
-     * @param int    $decode_flags
-     * @param int    $encode_flags
-     * @param int    $depth
-     */
-    public function configure(
-        string $data_type = JsonDataHandler::DATA_TYPE_USE_FLAGS,
-        int $decode_flags = 0,
-        int $encode_flags = 0,
-        int $depth = 512
-    ) {
-        $this->setDataType($data_type);
-        $this->setDecodeFlags($decode_flags);
-        $this->setDepth($depth);
-        $this->setEncodeFlags($encode_flags);
-    }
-
-
-    /**
-     * @param string $data_type
-     */
-    public function setDataType(string $data_type): void
-    {
-        $this->data_type = $data_type === JsonDataHandler::DATA_TYPE_ARRAY
-                           || $data_type === JsonDataHandler::DATA_TYPE_OBJECT
-                           || $data_type === JsonDataHandler::DATA_TYPE_USE_FLAGS
-            ? $data_type
-            : JsonDataHandler::DATA_TYPE_USE_FLAGS;
-    }
-
-
-    /**
-     * One or more Bitmask values:
-     * JSON_BIGINT_AS_STRING,
-     * JSON_INVALID_UTF8_IGNORE,        PHP >= 7.2
-     * JSON_INVALID_UTF8_SUBSTITUTE,    PHP >= 7.2
-     * JSON_OBJECT_AS_ARRAY,
-     * JSON_THROW_ON_ERROR              PHP >= 7.3
-     *
-     * pass multiple values separated with |
-     * ex: JSON_BIGINT_AS_STRING | JSON_INVALID_UTF8_IGNORE | JSON_OBJECT_AS_ARRAY
-     *
-     * @param int $decode_flags
-     */
-    public function setDecodeFlags(int $decode_flags): void
-    {
-        $this->decode_flags = $decode_flags === JSON_BIGINT_AS_STRING
-                              || $decode_flags === JSON_OBJECT_AS_ARRAY
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_ignoreFound
-                              || $decode_flags === JSON_INVALID_UTF8_IGNORE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_substituteFound
-                              || $decode_flags === JSON_INVALID_UTF8_SUBSTITUTE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_throw_on_errorFound
-                              || $decode_flags === JSON_THROW_ON_ERROR
-            ? $decode_flags
-            : 0;
-    }
-
-
-    /**
-     * @param int $depth
-     */
-    public function setDepth(int $depth): void
-    {
-        $depth       = absint($depth);
-        $this->depth = $depth ?: 512;
-    }
-
-
-    /**
-     * One or more Bitmask values:
-     * JSON_FORCE_OBJECT,
-     * JSON_HEX_QUOT,
-     * JSON_HEX_TAG,
-     * JSON_HEX_AMP,
-     * JSON_HEX_APOS,
-     * JSON_INVALID_UTF8_IGNORE,        PHP >= 7.2
-     * JSON_INVALID_UTF8_SUBSTITUTE,    PHP >= 7.2
-     * JSON_NUMERIC_CHECK,
-     * JSON_PARTIAL_OUTPUT_ON_ERROR,
-     * JSON_PRESERVE_ZERO_FRACTION,
-     * JSON_PRETTY_PRINT,
-     * JSON_UNESCAPED_LINE_TERMINATORS,
-     * JSON_UNESCAPED_SLASHES,
-     * JSON_UNESCAPED_UNICODE,
-     * JSON_THROW_ON_ERROR.             PHP >= 7.3
-     *
-     * pass multiple values separated with |
-     * ex: JSON_FORCE_OBJECT | JSON_INVALID_UTF8_IGNORE | JSON_THROW_ON_ERROR
-     *
-     * @param int $encode_flags
-     */
-    public function setEncodeFlags(int $encode_flags): void
-    {
-        $this->encode_flags = $encode_flags === JSON_FORCE_OBJECT
-                              || $encode_flags === JSON_HEX_QUOT
-                              || $encode_flags === JSON_HEX_TAG
-                              || $encode_flags === JSON_HEX_AMP
-                              || $encode_flags === JSON_HEX_APOS
-                              || $encode_flags === JSON_NUMERIC_CHECK
-                              || $encode_flags === JSON_PARTIAL_OUTPUT_ON_ERROR
-                              || $encode_flags === JSON_PRESERVE_ZERO_FRACTION
-                              || $encode_flags === JSON_PRETTY_PRINT
-                              || $encode_flags === JSON_UNESCAPED_LINE_TERMINATORS
-                              || $encode_flags === JSON_UNESCAPED_SLASHES
-                              || $encode_flags === JSON_UNESCAPED_UNICODE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_ignoreFound
-                              || $encode_flags === JSON_INVALID_UTF8_IGNORE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_substituteFound
-                              || $encode_flags === JSON_INVALID_UTF8_SUBSTITUTE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_throw_on_errorFound
-                              || $encode_flags === JSON_THROW_ON_ERROR
-            ? $encode_flags
-            : 0;
-    }
-
-
-    /**
-     * @return string|null
-     */
-    public function dataType(): ?string
-    {
-        return $this->data_type;
-    }
-
-
-    /**
-     * @return bool|null
-     */
-    private function asAssociative(): ?bool
-    {
-        switch ($this->data_type) {
-            case JsonDataHandler::DATA_TYPE_ARRAY:
-                return true;
-            case JsonDataHandler::DATA_TYPE_OBJECT:
-                return false;
-            case JsonDataHandler::DATA_TYPE_USE_FLAGS:
-                return null;
-        }
-        return null;
-    }
-
-
-    /**
-     * @param array|string $json
-     * @return array|mixed|stdClass
-     */
-    public function decodeJson($json)
-    {
-        $this->resetErrors();
-        if ($this->isJson($json)) {
-            $this->decoded_data    = json_decode($json, $this->asAssociative(), $this->depth, $this->decode_flags);
-            $this->last_error_code = json_last_error();
-            $this->last_error_msg  = json_last_error_msg();
-        } else {
-            $this->decoded_data    = $json;
-            $this->last_error_code = JSON_ERROR_NONE;
-            $this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
-        }
-        return $this->decoded_data;
-    }
-
-
-    /**
-     * @param $data
-     * @return string
-     */
-    public function encodeData($data): string
-    {
-        $this->resetErrors();
-        if ($this->isJson($data)) {
-            $this->encoded_data = $data;
-            $this->last_error_code = JSON_ERROR_NONE;
-            $this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
-        } else {
-            $this->encoded_data = json_encode($data, $this->encode_flags, $this->depth);
-            $this->last_error_code = json_last_error();
-            $this->last_error_msg  = json_last_error_msg();
-        }
-        return $this->encoded_data ?: '{}';
-    }
-
-
-    /**
-     * @return array|stdClass
-     */
-    public function getDecodedData()
-    {
-        return $this->decoded_data;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getEncodedData(): string
-    {
-        return $this->encoded_data;
-    }
-
-
-    /**
-     * @param bool $reset
-     * @return int
-     */
-    public function getLastErrorCode(bool $reset = false): int
-    {
-        $last_error = $this->last_error_code;
-        if ($reset) {
-            $this->resetErrors();
-        }
-        return $last_error;
-    }
-
-
-    /**
-     * @param bool $reset
-     * @return string
-     */
-    public function getLastErrorMessage(bool $reset = false): string
-    {
-        $last_error = $this->last_error_msg;
-        if ($reset) {
-            $this->resetErrors();
-        }
-        return $last_error;
-    }
-
-
-    /**
-     * @param array|string $maybe_json
-     * @return bool
-     */
-    public function isJson($maybe_json): bool
-    {
-        if (! is_string($maybe_json)) {
-            return false;
-        }
-        $decoded = json_decode($maybe_json, $this->asAssociative(), $this->depth, $this->decode_flags);
-        return json_last_error() === JSON_ERROR_NONE && ! ($decoded === null && ! empty($maybe_json));
-    }
-
-
-    /**
-     * @since $VID:$
-     */
-    public function resetErrors()
-    {
-        $this->last_error_code = JSON_ERROR_NONE;
-        $this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
-    }
+	const DATA_TYPE_ARRAY     = 'array';
+
+	const DATA_TYPE_OBJECT    = 'object';
+
+	const DATA_TYPE_USE_FLAGS = 'flags';
+
+	const NO_ERROR_MSG        = 'No error';
+
+	/**
+	 * @var string|null
+	 */
+	private $data_type = null;
+
+	/**
+	 * @var array|stdClass|null
+	 */
+	private $decoded_data = null;
+
+	/**
+	 * JSON_BIGINT_AS_STRING,
+	 * JSON_INVALID_UTF8_IGNORE,
+	 * JSON_INVALID_UTF8_SUBSTITUTE,
+	 * JSON_OBJECT_AS_ARRAY,
+	 * JSON_THROW_ON_ERROR
+	 *
+	 * @var int
+	 */
+	private $decode_flags = 0;
+
+	/**
+	 * @var int
+	 */
+	private $depth = 512;
+
+	/**
+	 * @var string
+	 */
+	private $encoded_data = '';
+
+	/**
+	 * JSON_FORCE_OBJECT,
+	 * JSON_HEX_QUOT,
+	 * JSON_HEX_TAG,
+	 * JSON_HEX_AMP,
+	 * JSON_HEX_APOS,
+	 * JSON_INVALID_UTF8_IGNORE,
+	 * JSON_INVALID_UTF8_SUBSTITUTE,
+	 * JSON_NUMERIC_CHECK,
+	 * JSON_PARTIAL_OUTPUT_ON_ERROR,
+	 * JSON_PRESERVE_ZERO_FRACTION,
+	 * JSON_PRETTY_PRINT,
+	 * JSON_UNESCAPED_LINE_TERMINATORS,
+	 * JSON_UNESCAPED_SLASHES,
+	 * JSON_UNESCAPED_UNICODE,
+	 * JSON_THROW_ON_ERROR.
+	 *
+	 * @var int
+	 */
+	private $encode_flags = 0;
+
+	/**
+	 * @var int
+	 */
+	private $last_error_code = JSON_ERROR_NONE;
+
+	/**
+	 * @var string
+	 */
+	private $last_error_msg = JsonDataHandler::NO_ERROR_MSG;
+
+
+	/**
+	 * JsonDataHandler constructor.
+	 */
+	public function __construct()
+	{
+		if (! defined('JSON_INVALID_UTF8_IGNORE')) {
+			define('JSON_INVALID_UTF8_IGNORE', 1048576);
+		}
+		if (! defined('JSON_INVALID_UTF8_SUBSTITUTE')) {
+			define('JSON_INVALID_UTF8_SUBSTITUTE', 2097152);
+		}
+		if (! defined('JSON_THROW_ON_ERROR')) {
+			define('JSON_THROW_ON_ERROR', 4194304);
+		}
+	}
+
+
+	/**
+	 * set $data_type, $decode_flags, $encode_flags, and depth all in one shot
+	 *
+	 * @param string $data_type
+	 * @param int    $decode_flags
+	 * @param int    $encode_flags
+	 * @param int    $depth
+	 */
+	public function configure(
+		string $data_type = JsonDataHandler::DATA_TYPE_USE_FLAGS,
+		int $decode_flags = 0,
+		int $encode_flags = 0,
+		int $depth = 512
+	) {
+		$this->setDataType($data_type);
+		$this->setDecodeFlags($decode_flags);
+		$this->setDepth($depth);
+		$this->setEncodeFlags($encode_flags);
+	}
+
+
+	/**
+	 * @param string $data_type
+	 */
+	public function setDataType(string $data_type): void
+	{
+		$this->data_type = $data_type === JsonDataHandler::DATA_TYPE_ARRAY
+						   || $data_type === JsonDataHandler::DATA_TYPE_OBJECT
+						   || $data_type === JsonDataHandler::DATA_TYPE_USE_FLAGS
+			? $data_type
+			: JsonDataHandler::DATA_TYPE_USE_FLAGS;
+	}
+
+
+	/**
+	 * One or more Bitmask values:
+	 * JSON_BIGINT_AS_STRING,
+	 * JSON_INVALID_UTF8_IGNORE,        PHP >= 7.2
+	 * JSON_INVALID_UTF8_SUBSTITUTE,    PHP >= 7.2
+	 * JSON_OBJECT_AS_ARRAY,
+	 * JSON_THROW_ON_ERROR              PHP >= 7.3
+	 *
+	 * pass multiple values separated with |
+	 * ex: JSON_BIGINT_AS_STRING | JSON_INVALID_UTF8_IGNORE | JSON_OBJECT_AS_ARRAY
+	 *
+	 * @param int $decode_flags
+	 */
+	public function setDecodeFlags(int $decode_flags): void
+	{
+		$this->decode_flags = $decode_flags === JSON_BIGINT_AS_STRING
+							  || $decode_flags === JSON_OBJECT_AS_ARRAY
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_ignoreFound
+							  || $decode_flags === JSON_INVALID_UTF8_IGNORE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_substituteFound
+							  || $decode_flags === JSON_INVALID_UTF8_SUBSTITUTE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_throw_on_errorFound
+							  || $decode_flags === JSON_THROW_ON_ERROR
+			? $decode_flags
+			: 0;
+	}
+
+
+	/**
+	 * @param int $depth
+	 */
+	public function setDepth(int $depth): void
+	{
+		$depth       = absint($depth);
+		$this->depth = $depth ?: 512;
+	}
+
+
+	/**
+	 * One or more Bitmask values:
+	 * JSON_FORCE_OBJECT,
+	 * JSON_HEX_QUOT,
+	 * JSON_HEX_TAG,
+	 * JSON_HEX_AMP,
+	 * JSON_HEX_APOS,
+	 * JSON_INVALID_UTF8_IGNORE,        PHP >= 7.2
+	 * JSON_INVALID_UTF8_SUBSTITUTE,    PHP >= 7.2
+	 * JSON_NUMERIC_CHECK,
+	 * JSON_PARTIAL_OUTPUT_ON_ERROR,
+	 * JSON_PRESERVE_ZERO_FRACTION,
+	 * JSON_PRETTY_PRINT,
+	 * JSON_UNESCAPED_LINE_TERMINATORS,
+	 * JSON_UNESCAPED_SLASHES,
+	 * JSON_UNESCAPED_UNICODE,
+	 * JSON_THROW_ON_ERROR.             PHP >= 7.3
+	 *
+	 * pass multiple values separated with |
+	 * ex: JSON_FORCE_OBJECT | JSON_INVALID_UTF8_IGNORE | JSON_THROW_ON_ERROR
+	 *
+	 * @param int $encode_flags
+	 */
+	public function setEncodeFlags(int $encode_flags): void
+	{
+		$this->encode_flags = $encode_flags === JSON_FORCE_OBJECT
+							  || $encode_flags === JSON_HEX_QUOT
+							  || $encode_flags === JSON_HEX_TAG
+							  || $encode_flags === JSON_HEX_AMP
+							  || $encode_flags === JSON_HEX_APOS
+							  || $encode_flags === JSON_NUMERIC_CHECK
+							  || $encode_flags === JSON_PARTIAL_OUTPUT_ON_ERROR
+							  || $encode_flags === JSON_PRESERVE_ZERO_FRACTION
+							  || $encode_flags === JSON_PRETTY_PRINT
+							  || $encode_flags === JSON_UNESCAPED_LINE_TERMINATORS
+							  || $encode_flags === JSON_UNESCAPED_SLASHES
+							  || $encode_flags === JSON_UNESCAPED_UNICODE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_ignoreFound
+							  || $encode_flags === JSON_INVALID_UTF8_IGNORE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_substituteFound
+							  || $encode_flags === JSON_INVALID_UTF8_SUBSTITUTE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_throw_on_errorFound
+							  || $encode_flags === JSON_THROW_ON_ERROR
+			? $encode_flags
+			: 0;
+	}
+
+
+	/**
+	 * @return string|null
+	 */
+	public function dataType(): ?string
+	{
+		return $this->data_type;
+	}
+
+
+	/**
+	 * @return bool|null
+	 */
+	private function asAssociative(): ?bool
+	{
+		switch ($this->data_type) {
+			case JsonDataHandler::DATA_TYPE_ARRAY:
+				return true;
+			case JsonDataHandler::DATA_TYPE_OBJECT:
+				return false;
+			case JsonDataHandler::DATA_TYPE_USE_FLAGS:
+				return null;
+		}
+		return null;
+	}
+
+
+	/**
+	 * @param array|string $json
+	 * @return array|mixed|stdClass
+	 */
+	public function decodeJson($json)
+	{
+		$this->resetErrors();
+		if ($this->isJson($json)) {
+			$this->decoded_data    = json_decode($json, $this->asAssociative(), $this->depth, $this->decode_flags);
+			$this->last_error_code = json_last_error();
+			$this->last_error_msg  = json_last_error_msg();
+		} else {
+			$this->decoded_data    = $json;
+			$this->last_error_code = JSON_ERROR_NONE;
+			$this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
+		}
+		return $this->decoded_data;
+	}
+
+
+	/**
+	 * @param $data
+	 * @return string
+	 */
+	public function encodeData($data): string
+	{
+		$this->resetErrors();
+		if ($this->isJson($data)) {
+			$this->encoded_data = $data;
+			$this->last_error_code = JSON_ERROR_NONE;
+			$this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
+		} else {
+			$this->encoded_data = json_encode($data, $this->encode_flags, $this->depth);
+			$this->last_error_code = json_last_error();
+			$this->last_error_msg  = json_last_error_msg();
+		}
+		return $this->encoded_data ?: '{}';
+	}
+
+
+	/**
+	 * @return array|stdClass
+	 */
+	public function getDecodedData()
+	{
+		return $this->decoded_data;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getEncodedData(): string
+	{
+		return $this->encoded_data;
+	}
+
+
+	/**
+	 * @param bool $reset
+	 * @return int
+	 */
+	public function getLastErrorCode(bool $reset = false): int
+	{
+		$last_error = $this->last_error_code;
+		if ($reset) {
+			$this->resetErrors();
+		}
+		return $last_error;
+	}
+
+
+	/**
+	 * @param bool $reset
+	 * @return string
+	 */
+	public function getLastErrorMessage(bool $reset = false): string
+	{
+		$last_error = $this->last_error_msg;
+		if ($reset) {
+			$this->resetErrors();
+		}
+		return $last_error;
+	}
+
+
+	/**
+	 * @param array|string $maybe_json
+	 * @return bool
+	 */
+	public function isJson($maybe_json): bool
+	{
+		if (! is_string($maybe_json)) {
+			return false;
+		}
+		$decoded = json_decode($maybe_json, $this->asAssociative(), $this->depth, $this->decode_flags);
+		return json_last_error() === JSON_ERROR_NONE && ! ($decoded === null && ! empty($maybe_json));
+	}
+
+
+	/**
+	 * @since $VID:$
+	 */
+	public function resetErrors()
+	{
+		$this->last_error_code = JSON_ERROR_NONE;
+		$this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
+	}
 }

core/db_classes/EE_Form_Submission.class.php

Indentation +148 added lines, -148 removed lines

@@ -5,152 +5,152 @@
 class EE_Form_Submission extends EE_Base_Class
 {
 
-    /**
-     * @param array $props_n_values
-     * @return EE_Form_Submission
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function new_instance(array $props_n_values = []): EE_Form_Submission
-    {
-        $props_n_values['FSB_submitted'] = new DateTime();
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__);
-        return $has_object ?: new self($props_n_values);
-    }
-
-
-    /**
-     * @param array $props_n_values
-     * @return EE_Form_Submission
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function new_instance_from_db(array $props_n_values = []): EE_Form_Submission
-    {
-        return new self($props_n_values, true);
-    }
-
-
-    /**
-     * Form Section UUID (universally unique identifier)
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function UUID(): string
-    {
-        return $this->get('FSB_UUID');
-    }
-
-
-    /**
-     * @param string $UUID
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setUUID(string $UUID)
-    {
-        $this->set('FSB_UUID', $UUID);
-    }
-
-
-    /**
-     * UUID or ID of related entity this form submission belongs to.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function formSection(): string
-    {
-        return $this->get('FSC_UUID');
-    }
-
-
-    /**
-     * @param string $form_section_UUID
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setFormSection(string $form_section_UUID)
-    {
-        $this->set('FSC_UUID', $form_section_UUID);
-    }
-
-
-    /**
-     * Returns the related EE_Transaction this form submission belongs to.
-     *
-     * @return EE_Transaction
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     * @throws ReflectionException
-     */
-    public function transaction(): EE_Transaction
-    {
-        $transaction = $this->get_first_related('Transaction');
-        if (! $transaction instanceof EE_Transaction) {
-            throw new EntityNotFoundException('Transaction ID', $this->transactionID());
-        }
-        return $transaction;
-    }
-
-
-    /**
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function transactionID(): int
-    {
-        return $this->get('TXN_ID');
-    }
-
-
-    /**
-     * @param int $TXN_ID
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setTransactionID(int $TXN_ID = 0)
-    {
-        $this->set('TXN_ID', $TXN_ID);
-    }
-
-
-    /**
-     * @return mixed
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function data()
-    {
-        return $this->get('FSB_data');
-    }
-
-
-    /**
-     * @param array|string $data
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setData($data)
-    {
-        $this->set('FSB_data', $data);
-    }
-
-
-    /**
-     * @param bool $raw
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function submitted(bool $raw = false): int
-    {
-        return $raw
-            ? $this->get_raw('FSB_submitted')
-            : $this->get('FSB_submitted');
-    }
+	/**
+	 * @param array $props_n_values
+	 * @return EE_Form_Submission
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function new_instance(array $props_n_values = []): EE_Form_Submission
+	{
+		$props_n_values['FSB_submitted'] = new DateTime();
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ?: new self($props_n_values);
+	}
+
+
+	/**
+	 * @param array $props_n_values
+	 * @return EE_Form_Submission
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function new_instance_from_db(array $props_n_values = []): EE_Form_Submission
+	{
+		return new self($props_n_values, true);
+	}
+
+
+	/**
+	 * Form Section UUID (universally unique identifier)
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function UUID(): string
+	{
+		return $this->get('FSB_UUID');
+	}
+
+
+	/**
+	 * @param string $UUID
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setUUID(string $UUID)
+	{
+		$this->set('FSB_UUID', $UUID);
+	}
+
+
+	/**
+	 * UUID or ID of related entity this form submission belongs to.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function formSection(): string
+	{
+		return $this->get('FSC_UUID');
+	}
+
+
+	/**
+	 * @param string $form_section_UUID
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setFormSection(string $form_section_UUID)
+	{
+		$this->set('FSC_UUID', $form_section_UUID);
+	}
+
+
+	/**
+	 * Returns the related EE_Transaction this form submission belongs to.
+	 *
+	 * @return EE_Transaction
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 * @throws ReflectionException
+	 */
+	public function transaction(): EE_Transaction
+	{
+		$transaction = $this->get_first_related('Transaction');
+		if (! $transaction instanceof EE_Transaction) {
+			throw new EntityNotFoundException('Transaction ID', $this->transactionID());
+		}
+		return $transaction;
+	}
+
+
+	/**
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function transactionID(): int
+	{
+		return $this->get('TXN_ID');
+	}
+
+
+	/**
+	 * @param int $TXN_ID
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setTransactionID(int $TXN_ID = 0)
+	{
+		$this->set('TXN_ID', $TXN_ID);
+	}
+
+
+	/**
+	 * @return mixed
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function data()
+	{
+		return $this->get('FSB_data');
+	}
+
+
+	/**
+	 * @param array|string $data
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setData($data)
+	{
+		$this->set('FSB_data', $data);
+	}
+
+
+	/**
+	 * @param bool $raw
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function submitted(bool $raw = false): int
+	{
+		return $raw
+			? $this->get_raw('FSB_submitted')
+			: $this->get('FSB_submitted');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
     public function transaction(): EE_Transaction
     {
         $transaction = $this->get_first_related('Transaction');
-        if (! $transaction instanceof EE_Transaction) {
+        if ( ! $transaction instanceof EE_Transaction) {
             throw new EntityNotFoundException('Transaction ID', $this->transactionID());
         }
         return $transaction;

core/services/form/meta/HelpText.php

Spacing +2 added lines, -2 removed lines

@@ -131,7 +131,7 @@ 
     public function addHtmlClass(string $htmlClass): void
     {
         $htmlClass = sanitize_key($htmlClass);
-        if (! in_array($htmlClass, $this->htmlClasses, true)) {
+        if ( ! in_array($htmlClass, $this->htmlClasses, true)) {
             $this->htmlClasses[] = $htmlClass;
         }
     }
@@ -143,7 +143,7 @@ 
     public function removeHtmlClass(string $htmlClass): void
     {
         $htmlClass = sanitize_key($htmlClass);
-        unset($this->htmlClasses[ $htmlClass ]);
+        unset($this->htmlClasses[$htmlClass]);
     }
 
 

Indentation +137 added lines, -137 removed lines

@@ -14,141 +14,141 @@
  */
 class HelpText implements JsonableInterface
 {
-    /**
-     * @var JsonDataHandler
-     */
-    private $json_data_handler;
-
-    /**
-     * Additional text displayed alongside a form input to assist users with completing the form.
-     *
-     * @var string
-     */
-    private $helpText;
-
-    /**
-     * Custom HTML classes to be applied to this form input's help text.
-     *
-     * @var array
-     */
-    private $htmlClasses;
-
-
-    /**
-     * HelpText constructor.
-     *
-     * @param JsonDataHandler $json_data_handler
-     * @param array           $htmlClass
-     * @param string          $helpText
-     */
-    public function __construct(
-        JsonDataHandler $json_data_handler,
-        array $htmlClass,
-        string $helpText
-    ) {
-        $this->json_data_handler = $json_data_handler;
-        $this->setHtmlClasses($htmlClass);
-        $this->setHelpText($helpText);
-    }
-
-
-    /**
-     * @param string $json
-     * @return HelpText
-     */
-    public static function fromJson(string $json): HelpText
-    {
-        $json_data_handler = new JsonDataHandler();
-        $json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
-        $data      = $json_data_handler->decodeJson($json);
-        $htmlClass = (array) ($data->htmlClass ?? []);
-        $helpText  = $data->helpText ?? '';
-        return new HelpText($json_data_handler, $htmlClass, $helpText);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return [
-            'helpText'  => $this->helpText,
-            'htmlClass' => $this->htmlClasses(),
-        ];
-    }
-
-
-    /**
-     * @return string
-     */
-    public function toJson(): string
-    {
-        return $this->json_data_handler->encodeData($this->toArray());
-    }
-
-
-    /**
-     * Input label displayed on public forms, ie: the actual question text.
-     *
-     * @return string
-     */
-    public function helpText(): string
-    {
-        return $this->helpText;
-    }
-
-
-    /**
-     * @param string $helpText
-     */
-    public function setHelpText(string $helpText): void
-    {
-        $this->helpText = sanitize_text_field($helpText);
-    }
-
-
-    /**
-     * Custom HTML classes to be applied to this form input's help text.
-     * returns a concatenated string unless $as_array is set to true
-     *
-     * @return array|string
-     */
-    public function htmlClasses($as_array = false)
-    {
-        return $as_array
-            ? $this->htmlClasses
-            : implode(' ', $this->htmlClasses);
-    }
-
-
-    /**
-     * @param string $htmlClass
-     */
-    public function addHtmlClass(string $htmlClass): void
-    {
-        $htmlClass = sanitize_key($htmlClass);
-        if (! in_array($htmlClass, $this->htmlClasses, true)) {
-            $this->htmlClasses[] = $htmlClass;
-        }
-    }
-
-
-    /**
-     * @param string $htmlClass
-     */
-    public function removeHtmlClass(string $htmlClass): void
-    {
-        $htmlClass = sanitize_key($htmlClass);
-        unset($this->htmlClasses[ $htmlClass ]);
-    }
-
-
-    /**
-     * @param array $htmlClasses
-     */
-    public function setHtmlClasses(array $htmlClasses): void
-    {
-        $this->htmlClasses = array_map('sanitize_key', $htmlClasses);
-    }
+	/**
+	 * @var JsonDataHandler
+	 */
+	private $json_data_handler;
+
+	/**
+	 * Additional text displayed alongside a form input to assist users with completing the form.
+	 *
+	 * @var string
+	 */
+	private $helpText;
+
+	/**
+	 * Custom HTML classes to be applied to this form input's help text.
+	 *
+	 * @var array
+	 */
+	private $htmlClasses;
+
+
+	/**
+	 * HelpText constructor.
+	 *
+	 * @param JsonDataHandler $json_data_handler
+	 * @param array           $htmlClass
+	 * @param string          $helpText
+	 */
+	public function __construct(
+		JsonDataHandler $json_data_handler,
+		array $htmlClass,
+		string $helpText
+	) {
+		$this->json_data_handler = $json_data_handler;
+		$this->setHtmlClasses($htmlClass);
+		$this->setHelpText($helpText);
+	}
+
+
+	/**
+	 * @param string $json
+	 * @return HelpText
+	 */
+	public static function fromJson(string $json): HelpText
+	{
+		$json_data_handler = new JsonDataHandler();
+		$json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
+		$data      = $json_data_handler->decodeJson($json);
+		$htmlClass = (array) ($data->htmlClass ?? []);
+		$helpText  = $data->helpText ?? '';
+		return new HelpText($json_data_handler, $htmlClass, $helpText);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return [
+			'helpText'  => $this->helpText,
+			'htmlClass' => $this->htmlClasses(),
+		];
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function toJson(): string
+	{
+		return $this->json_data_handler->encodeData($this->toArray());
+	}
+
+
+	/**
+	 * Input label displayed on public forms, ie: the actual question text.
+	 *
+	 * @return string
+	 */
+	public function helpText(): string
+	{
+		return $this->helpText;
+	}
+
+
+	/**
+	 * @param string $helpText
+	 */
+	public function setHelpText(string $helpText): void
+	{
+		$this->helpText = sanitize_text_field($helpText);
+	}
+
+
+	/**
+	 * Custom HTML classes to be applied to this form input's help text.
+	 * returns a concatenated string unless $as_array is set to true
+	 *
+	 * @return array|string
+	 */
+	public function htmlClasses($as_array = false)
+	{
+		return $as_array
+			? $this->htmlClasses
+			: implode(' ', $this->htmlClasses);
+	}
+
+
+	/**
+	 * @param string $htmlClass
+	 */
+	public function addHtmlClass(string $htmlClass): void
+	{
+		$htmlClass = sanitize_key($htmlClass);
+		if (! in_array($htmlClass, $this->htmlClasses, true)) {
+			$this->htmlClasses[] = $htmlClass;
+		}
+	}
+
+
+	/**
+	 * @param string $htmlClass
+	 */
+	public function removeHtmlClass(string $htmlClass): void
+	{
+		$htmlClass = sanitize_key($htmlClass);
+		unset($this->htmlClasses[ $htmlClass ]);
+	}
+
+
+	/**
+	 * @param array $htmlClasses
+	 */
+	public function setHtmlClasses(array $htmlClasses): void
+	{
+		$this->htmlClasses = array_map('sanitize_key', $htmlClasses);
+	}
 }