eventespresso / event-espresso-core

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

Doc Comments +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 
     /**
      * @param EE_Datetime $datetime
-     * @param mixed       $field
+     * @param string       $field
      * @return string
      * @since $VID:$
      */

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 
 namespace EventEspresso\core\domain\services\graphql\types;
 
-use EE_Base_Class;
 use EE_Datetime;
 use EE_Error;
 use EE_Event;

Indentation +195 added lines, -195 removed lines

@@ -45,203 +45,203 @@
 class Datetime extends TypeBase
 {
 
-    /**
-     * EventDate constructor.
-     *
-     * @param EEM_Datetime $datetime_model
-     */
-    public function __construct(EEM_Datetime $datetime_model)
-    {
-        $this->model = $datetime_model;
-        $this->setName('Datetime');
-        $this->setDescription(__('An event date', 'event_espresso'));
-        $this->setIsCustomPostType(false);
-        $this->setFields([
-            'id'          => [
-                'type'        => [
-                    'non_null' => 'Int',
-                ],
-                'description' => __('The datetime ID.', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'ID');
-                },
-            ],
-            'name'        => [
-                'type'        => 'String',
-                'description' => __('Datetime Name', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'name');
-                },
-            ],
-            'description' => [
-                'type'        => 'String',
-                'description' => __('Description for Datetime', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'description');
-                },
-            ],
-            'start'       => [
-                'type'        => 'String',
-                'description' => __('Start timestamp of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'start');
-                },
-            ],
-            'startDate'   => [
-                'type'        => 'String',
-                'description' => __('Start time/date of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'start_date');
-                },
-            ],
-            'end'         => [
-                'type'        => 'String',
-                'description' => __('End timestamp of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'end');
-                },
-            ],
-            'endDate'     => [
-                'type'        => 'String',
-                'description' => __('End time/date of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'end_date');
-                },
-            ],
-            'startTime'   => [
-                'type'        => 'String',
-                'description' => __('Start time of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'start_time');
-                },
-            ],
-            'endTime'     => [
-                'type'        => 'String',
-                'description' => __('End time of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'end_time');
-                },
-            ],
-            'capacity'    => [
-                'type'        => 'Int',
-                'description' => __('Registration Limit for this time', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    $capacity = $datetime instanceof EE_Datetime ? $datetime->reg_limit() : EE_INF;
-                    return $this->parseInfiniteValue($capacity);
-                },
-            ],
-            'sold'        => [
-                'type'        => 'Int',
-                'description' => __('How many sales for this Datetime that have occurred', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'sold');
-                },
-            ],
-            'reserved'    => [
-                'type'        => 'Int',
-                'description' => __('Quantity of tickets reserved, but not yet fully purchased', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'reserved');
-                },
-            ],
-            'order'       => [
-                'type'        => 'Int',
-                'description' => __('The order in which the Datetime is displayed', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'order');
-                },
-            ],
-            'length'      => [
-                'type'        => 'Int',
-                'description' => __('The length of the event (start to end time) in seconds', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'length');
-                },
-            ],
-            'parent'      => [
-                'type'        => 'Datetime',
-                'description' => __('The parent datetime of the current datetime', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveParent($datetime);
-                },
-            ],
-            'isPrimary'   => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating datetime is primary one for event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'is_primary');
-                },
-            ],
-            'isSoldOut'   => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating whether the tickets sold for this datetime, met or exceed the registration limit',
-                    'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'sold_out');
-                },
-            ],
-            'isUpcoming'  => [
-                'type'        => 'Boolean',
-                'description' => __('Whether the date is upcoming', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'is_upcoming');
-                },
-            ],
-            'isActive'    => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating datetime is active', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'is_active');
-                },
-            ],
-            'isExpired'   => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating datetime is expired or not', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
-                    return $this->resolveField($datetime, 'is_expired');
-                },
-            ],
-            'event'       => [
-                'type'        => 'Event',
-                'description' => __('Event of the datetime.', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime, $args, $context) {
-                    return $this->resolveEvent($datetime, $args, $context);
-                },
-            ],
-        ]);
-    }
+	/**
+	 * EventDate constructor.
+	 *
+	 * @param EEM_Datetime $datetime_model
+	 */
+	public function __construct(EEM_Datetime $datetime_model)
+	{
+		$this->model = $datetime_model;
+		$this->setName('Datetime');
+		$this->setDescription(__('An event date', 'event_espresso'));
+		$this->setIsCustomPostType(false);
+		$this->setFields([
+			'id'          => [
+				'type'        => [
+					'non_null' => 'Int',
+				],
+				'description' => __('The datetime ID.', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'ID');
+				},
+			],
+			'name'        => [
+				'type'        => 'String',
+				'description' => __('Datetime Name', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'name');
+				},
+			],
+			'description' => [
+				'type'        => 'String',
+				'description' => __('Description for Datetime', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'description');
+				},
+			],
+			'start'       => [
+				'type'        => 'String',
+				'description' => __('Start timestamp of Event', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'start');
+				},
+			],
+			'startDate'   => [
+				'type'        => 'String',
+				'description' => __('Start time/date of Event', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'start_date');
+				},
+			],
+			'end'         => [
+				'type'        => 'String',
+				'description' => __('End timestamp of Event', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'end');
+				},
+			],
+			'endDate'     => [
+				'type'        => 'String',
+				'description' => __('End time/date of Event', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'end_date');
+				},
+			],
+			'startTime'   => [
+				'type'        => 'String',
+				'description' => __('Start time of Event', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'start_time');
+				},
+			],
+			'endTime'     => [
+				'type'        => 'String',
+				'description' => __('End time of Event', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'end_time');
+				},
+			],
+			'capacity'    => [
+				'type'        => 'Int',
+				'description' => __('Registration Limit for this time', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					$capacity = $datetime instanceof EE_Datetime ? $datetime->reg_limit() : EE_INF;
+					return $this->parseInfiniteValue($capacity);
+				},
+			],
+			'sold'        => [
+				'type'        => 'Int',
+				'description' => __('How many sales for this Datetime that have occurred', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'sold');
+				},
+			],
+			'reserved'    => [
+				'type'        => 'Int',
+				'description' => __('Quantity of tickets reserved, but not yet fully purchased', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'reserved');
+				},
+			],
+			'order'       => [
+				'type'        => 'Int',
+				'description' => __('The order in which the Datetime is displayed', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'order');
+				},
+			],
+			'length'      => [
+				'type'        => 'Int',
+				'description' => __('The length of the event (start to end time) in seconds', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'length');
+				},
+			],
+			'parent'      => [
+				'type'        => 'Datetime',
+				'description' => __('The parent datetime of the current datetime', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveParent($datetime);
+				},
+			],
+			'isPrimary'   => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating datetime is primary one for event', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'is_primary');
+				},
+			],
+			'isSoldOut'   => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating whether the tickets sold for this datetime, met or exceed the registration limit',
+					'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'sold_out');
+				},
+			],
+			'isUpcoming'  => [
+				'type'        => 'Boolean',
+				'description' => __('Whether the date is upcoming', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'is_upcoming');
+				},
+			],
+			'isActive'    => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating datetime is active', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'is_active');
+				},
+			],
+			'isExpired'   => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating datetime is expired or not', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime) {
+					return $this->resolveField($datetime, 'is_expired');
+				},
+			],
+			'event'       => [
+				'type'        => 'Event',
+				'description' => __('Event of the datetime.', 'event_espresso'),
+				'resolve'     => function (EE_Datetime $datetime, $args, $context) {
+					return $this->resolveEvent($datetime, $args, $context);
+				},
+			],
+		]);
+	}
 
 
-    /**
-     * @param EE_Datetime $datetime
-     * @param mixed       $field
-     * @return string
-     * @since $VID:$
-     */
-    public function resolveField(EE_Datetime $datetime, $field)
-    {
-        return $datetime instanceof EE_Datetime ? $datetime->{$field}() : null;
-    }
+	/**
+	 * @param EE_Datetime $datetime
+	 * @param mixed       $field
+	 * @return string
+	 * @since $VID:$
+	 */
+	public function resolveField(EE_Datetime $datetime, $field)
+	{
+		return $datetime instanceof EE_Datetime ? $datetime->{$field}() : null;
+	}
 
 
-    /**
-     * @param EE_Datetime $datetime
-     * @param             $args
-     * @param             $context
-     * @return Deferred|null
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws UserError
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function resolveEvent(EE_Datetime $datetime, $args, $context)
-    {
-        $event = $datetime instanceof EE_Datetime ? $datetime->event() : null;
-        return $event instanceof EE_Event
-            ? DataSource::resolve_post_object($event->ID(), $context)
-            : null;
-    }
+	/**
+	 * @param EE_Datetime $datetime
+	 * @param             $args
+	 * @param             $context
+	 * @return Deferred|null
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws UserError
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function resolveEvent(EE_Datetime $datetime, $args, $context)
+	{
+		$event = $datetime instanceof EE_Datetime ? $datetime->event() : null;
+		return $event instanceof EE_Event
+			? DataSource::resolve_post_object($event->ID(), $context)
+			: null;
+	}
 }
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -62,70 +62,70 @@ 
                     'non_null' => 'Int',
                 ],
                 'description' => __('The datetime ID.', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'ID');
                 },
             ],
             'name'        => [
                 'type'        => 'String',
                 'description' => __('Datetime Name', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'name');
                 },
             ],
             'description' => [
                 'type'        => 'String',
                 'description' => __('Description for Datetime', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'description');
                 },
             ],
             'start'       => [
                 'type'        => 'String',
                 'description' => __('Start timestamp of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'start');
                 },
             ],
             'startDate'   => [
                 'type'        => 'String',
                 'description' => __('Start time/date of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'start_date');
                 },
             ],
             'end'         => [
                 'type'        => 'String',
                 'description' => __('End timestamp of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'end');
                 },
             ],
             'endDate'     => [
                 'type'        => 'String',
                 'description' => __('End time/date of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'end_date');
                 },
             ],
             'startTime'   => [
                 'type'        => 'String',
                 'description' => __('Start time of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'start_time');
                 },
             ],
             'endTime'     => [
                 'type'        => 'String',
                 'description' => __('End time of Event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'end_time');
                 },
             ],
             'capacity'    => [
                 'type'        => 'Int',
                 'description' => __('Registration Limit for this time', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     $capacity = $datetime instanceof EE_Datetime ? $datetime->reg_limit() : EE_INF;
                     return $this->parseInfiniteValue($capacity);
                 },
@@ -133,42 +133,42 @@ 
             'sold'        => [
                 'type'        => 'Int',
                 'description' => __('How many sales for this Datetime that have occurred', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'sold');
                 },
             ],
             'reserved'    => [
                 'type'        => 'Int',
                 'description' => __('Quantity of tickets reserved, but not yet fully purchased', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'reserved');
                 },
             ],
             'order'       => [
                 'type'        => 'Int',
                 'description' => __('The order in which the Datetime is displayed', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'order');
                 },
             ],
             'length'      => [
                 'type'        => 'Int',
                 'description' => __('The length of the event (start to end time) in seconds', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'length');
                 },
             ],
             'parent'      => [
                 'type'        => 'Datetime',
                 'description' => __('The parent datetime of the current datetime', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveParent($datetime);
                 },
             ],
             'isPrimary'   => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating datetime is primary one for event', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'is_primary');
                 },
             ],
@@ -176,35 +176,35 @@ 
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating whether the tickets sold for this datetime, met or exceed the registration limit',
                     'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'sold_out');
                 },
             ],
             'isUpcoming'  => [
                 'type'        => 'Boolean',
                 'description' => __('Whether the date is upcoming', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'is_upcoming');
                 },
             ],
             'isActive'    => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating datetime is active', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'is_active');
                 },
             ],
             'isExpired'   => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating datetime is expired or not', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime) {
+                'resolve'     => function(EE_Datetime $datetime) {
                     return $this->resolveField($datetime, 'is_expired');
                 },
             ],
             'event'       => [
                 'type'        => 'Event',
                 'description' => __('Event of the datetime.', 'event_espresso'),
-                'resolve'     => function (EE_Datetime $datetime, $args, $context) {
+                'resolve'     => function(EE_Datetime $datetime, $args, $context) {
                     return $this->resolveEvent($datetime, $args, $context);
                 },
             ],

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

Doc Comments +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
 
     /**
      * @param $source
-     * @param mixed $field
+     * @param string $field
      * @return string
      * @since $VID:$
      */

Indentation +208 added lines, -208 removed lines

@@ -37,224 +37,224 @@
 class Event extends TypeBase
 {
 
-    /**
-     * Event constructor.
-     *
-     * @param EEM_Event $event_model
-     */
-    public function __construct(EEM_Event $event_model)
-    {
-        $this->model = $event_model;
-        $this->setName('Event');
-        $this->setIsCustomPostType(true);
-        $this->setFields( [
-            'name'                  => [
-                'type'        => 'String',
-                'description' => __('Event Name', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'name');
-                },
-            ],
-            'desc'                  => [
-                'type'        => 'String',
-                'description' => __('Event Description', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'description');
-                },
-            ],
-            'shortDesc'             => [
-                'type'        => 'String',
-                'description' => __('Event Short Description', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'short_description');
-                },
-            ],
-            'created'               => [
-                'type'        => 'String',
-                'description' => __('Date/Time Event Created', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'created');
-                },
-            ],
-            // Already registered by WP GraphQL
-            /* 'modified'  => [
+	/**
+	 * Event constructor.
+	 *
+	 * @param EEM_Event $event_model
+	 */
+	public function __construct(EEM_Event $event_model)
+	{
+		$this->model = $event_model;
+		$this->setName('Event');
+		$this->setIsCustomPostType(true);
+		$this->setFields( [
+			'name'                  => [
+				'type'        => 'String',
+				'description' => __('Event Name', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'name');
+				},
+			],
+			'desc'                  => [
+				'type'        => 'String',
+				'description' => __('Event Description', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'description');
+				},
+			],
+			'shortDesc'             => [
+				'type'        => 'String',
+				'description' => __('Event Short Description', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'short_description');
+				},
+			],
+			'created'               => [
+				'type'        => 'String',
+				'description' => __('Date/Time Event Created', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'created');
+				},
+			],
+			// Already registered by WP GraphQL
+			/* 'modified'  => [
                 'type'        => 'String',
                 'description' => __('Date/Time Event Modified', 'event_espresso'),
             ], */
-            'wpUser'                => [
-                'type'        => 'User',
-                'description' => __('Event Creator', 'event_espresso'),
-                'resolve'     => function ($source, $args, $context) {
-                    return $this->resolveWpUser($source, $args, $context);
-                },
-            ],
-            'order'                 => [
-                'type'        => 'Int',
-                'description' => __('Event Menu Order', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'order');
-                },
-            ],
-            // Already registered by WP GraphQL
-            /* 'parent'  => [
+			'wpUser'                => [
+				'type'        => 'User',
+				'description' => __('Event Creator', 'event_espresso'),
+				'resolve'     => function ($source, $args, $context) {
+					return $this->resolveWpUser($source, $args, $context);
+				},
+			],
+			'order'                 => [
+				'type'        => 'Int',
+				'description' => __('Event Menu Order', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'order');
+				},
+			],
+			// Already registered by WP GraphQL
+			/* 'parent'  => [
                 'type'        => 'Venue',
                 'description' => __('Venue Parent ID', 'event_espresso'),
             ], */
-            'displayDesc'           => [
-                'type'        => 'Boolean',
-                'description' => __('Display Description Flag', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'display_description');
-                },
-            ],
-            'displayTicketSelector' => [
-                'type'        => 'Boolean',
-                'description' => __('Display Ticket Selector Flag', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'display_ticket_selector');
-                },
-            ],
-            'visibleOn'             => [
-                'type'        => 'String',
-                'description' => __('Event Visible Date', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'visible_on');
-                },
-            ],
-            'additionalLimit'       => [
-                'type'        => 'String',
-                'description' => __('Limit of Additional Registrations on Same Transaction', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'additional_limit');
-                },
-            ],
-            'phone'                 => [
-                'type'        => 'String',
-                'description' => __('Event Phone Number', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'phone');
-                },
-            ],
-            'memberOnly'            => [
-                'type'        => 'Boolean',
-                'description' => __('Member-Only Event Flag', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'member_only');
-                },
-            ],
-            'allowOverflow'         => [
-                'type'        => 'Boolean',
-                'description' => __('Allow Overflow on Event', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'allow_overflow');
-                },
-            ],
-            'timezoneString'        => [
-                'type'        => 'String',
-                'description' => __('Timezone (name) for Event times', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'timezone_string');
-                },
-            ],
-            'externalUrl'           => [
-                'type'        => 'String',
-                'description' => __('URL of Event Page if hosted elsewhere', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'external_url');
-                },
-            ],
-            'donations'             => [
-                'type'        => 'Boolean',
-                'description' => __('Accept Donations?', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'donations');
-                },
-            ],
-            'isSoldOut'             => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating whether the tickets sold for the event, met or exceed the registration limit',
-                    'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'is_sold_out');
-                },
-            ],
-            'isPostponed'           => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating whether the event is marked as postponed', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'is_postponed');
-                },
-            ],
-            'isCancelled'           => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating whether the event is marked as cancelled', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'is_cancelled');
-                },
-            ],
-            'isUpcoming'            => [
-                'type'        => 'Boolean',
-                'description' => __('Whether the event is upcoming', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'is_upcoming');
-                },
-            ],
-            'isActive'              => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating event is active', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'is_active');
-                },
-            ],
-            'isInactive'            => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating event is inactive', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'is_inactive');
-                },
-            ],
-            'isExpired'             => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating event is expired or not', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'is_expired');
-                },
-            ],
-        ] );
-    }
+			'displayDesc'           => [
+				'type'        => 'Boolean',
+				'description' => __('Display Description Flag', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'display_description');
+				},
+			],
+			'displayTicketSelector' => [
+				'type'        => 'Boolean',
+				'description' => __('Display Ticket Selector Flag', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'display_ticket_selector');
+				},
+			],
+			'visibleOn'             => [
+				'type'        => 'String',
+				'description' => __('Event Visible Date', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'visible_on');
+				},
+			],
+			'additionalLimit'       => [
+				'type'        => 'String',
+				'description' => __('Limit of Additional Registrations on Same Transaction', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'additional_limit');
+				},
+			],
+			'phone'                 => [
+				'type'        => 'String',
+				'description' => __('Event Phone Number', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'phone');
+				},
+			],
+			'memberOnly'            => [
+				'type'        => 'Boolean',
+				'description' => __('Member-Only Event Flag', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'member_only');
+				},
+			],
+			'allowOverflow'         => [
+				'type'        => 'Boolean',
+				'description' => __('Allow Overflow on Event', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'allow_overflow');
+				},
+			],
+			'timezoneString'        => [
+				'type'        => 'String',
+				'description' => __('Timezone (name) for Event times', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'timezone_string');
+				},
+			],
+			'externalUrl'           => [
+				'type'        => 'String',
+				'description' => __('URL of Event Page if hosted elsewhere', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'external_url');
+				},
+			],
+			'donations'             => [
+				'type'        => 'Boolean',
+				'description' => __('Accept Donations?', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'donations');
+				},
+			],
+			'isSoldOut'             => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating whether the tickets sold for the event, met or exceed the registration limit',
+					'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'is_sold_out');
+				},
+			],
+			'isPostponed'           => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating whether the event is marked as postponed', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'is_postponed');
+				},
+			],
+			'isCancelled'           => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating whether the event is marked as cancelled', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'is_cancelled');
+				},
+			],
+			'isUpcoming'            => [
+				'type'        => 'Boolean',
+				'description' => __('Whether the event is upcoming', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'is_upcoming');
+				},
+			],
+			'isActive'              => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating event is active', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'is_active');
+				},
+			],
+			'isInactive'            => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating event is inactive', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'is_inactive');
+				},
+			],
+			'isExpired'             => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating event is expired or not', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'is_expired');
+				},
+			],
+		] );
+	}
 
 
-    /**
-     * @param Post|EE_Event $source
-     * @return EE_Base_Class|EE_Event|null
-     * @since $VID:$
-     */
-    private function getEvent($source)
-    {
-        // If it comes from a custom connection
-        // where the $source is already instantiated.
-        if ($source instanceof EE_Event) {
-            return $source;
-        }
+	/**
+	 * @param Post|EE_Event $source
+	 * @return EE_Base_Class|EE_Event|null
+	 * @since $VID:$
+	 */
+	private function getEvent($source)
+	{
+		// If it comes from a custom connection
+		// where the $source is already instantiated.
+		if ($source instanceof EE_Event) {
+			return $source;
+		}
 
-        $id = $source instanceof Post ? $source->ID : 0;
+		$id = $source instanceof Post ? $source->ID : 0;
 
-        if ($id) {
-            return $this->model->get_one_by_ID($id);
-        }
-        return null;
-    }
+		if ($id) {
+			return $this->model->get_one_by_ID($id);
+		}
+		return null;
+	}
 
 
-    /**
-     * @param $source
-     * @param mixed $field
-     * @return string
-     * @since $VID:$
-     */
-    public function resolveField($source, $field)
-    {
-        $event = $this->getEvent($source);
-        return $event instanceof EE_Event ? $event->{$field}() : null;
-    }
+	/**
+	 * @param $source
+	 * @param mixed $field
+	 * @return string
+	 * @since $VID:$
+	 */
+	public function resolveField($source, $field)
+	{
+		$event = $this->getEvent($source);
+		return $event instanceof EE_Event ? $event->{$field}() : null;
+	}
 }
\ No newline at end of file

Spacing +25 added lines, -25 removed lines

@@ -47,32 +47,32 @@ 
         $this->model = $event_model;
         $this->setName('Event');
         $this->setIsCustomPostType(true);
-        $this->setFields( [
+        $this->setFields([
             'name'                  => [
                 'type'        => 'String',
                 'description' => __('Event Name', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'name');
                 },
             ],
             'desc'                  => [
                 'type'        => 'String',
                 'description' => __('Event Description', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'description');
                 },
             ],
             'shortDesc'             => [
                 'type'        => 'String',
                 'description' => __('Event Short Description', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'short_description');
                 },
             ],
             'created'               => [
                 'type'        => 'String',
                 'description' => __('Date/Time Event Created', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'created');
                 },
             ],
@@ -84,14 +84,14 @@ 
             'wpUser'                => [
                 'type'        => 'User',
                 'description' => __('Event Creator', 'event_espresso'),
-                'resolve'     => function ($source, $args, $context) {
+                'resolve'     => function($source, $args, $context) {
                     return $this->resolveWpUser($source, $args, $context);
                 },
             ],
             'order'                 => [
                 'type'        => 'Int',
                 'description' => __('Event Menu Order', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'order');
                 },
             ],
@@ -103,70 +103,70 @@ 
             'displayDesc'           => [
                 'type'        => 'Boolean',
                 'description' => __('Display Description Flag', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'display_description');
                 },
             ],
             'displayTicketSelector' => [
                 'type'        => 'Boolean',
                 'description' => __('Display Ticket Selector Flag', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'display_ticket_selector');
                 },
             ],
             'visibleOn'             => [
                 'type'        => 'String',
                 'description' => __('Event Visible Date', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'visible_on');
                 },
             ],
             'additionalLimit'       => [
                 'type'        => 'String',
                 'description' => __('Limit of Additional Registrations on Same Transaction', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'additional_limit');
                 },
             ],
             'phone'                 => [
                 'type'        => 'String',
                 'description' => __('Event Phone Number', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'phone');
                 },
             ],
             'memberOnly'            => [
                 'type'        => 'Boolean',
                 'description' => __('Member-Only Event Flag', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'member_only');
                 },
             ],
             'allowOverflow'         => [
                 'type'        => 'Boolean',
                 'description' => __('Allow Overflow on Event', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'allow_overflow');
                 },
             ],
             'timezoneString'        => [
                 'type'        => 'String',
                 'description' => __('Timezone (name) for Event times', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'timezone_string');
                 },
             ],
             'externalUrl'           => [
                 'type'        => 'String',
                 'description' => __('URL of Event Page if hosted elsewhere', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'external_url');
                 },
             ],
             'donations'             => [
                 'type'        => 'Boolean',
                 'description' => __('Accept Donations?', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'donations');
                 },
             ],
@@ -174,53 +174,53 @@ 
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating whether the tickets sold for the event, met or exceed the registration limit',
                     'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'is_sold_out');
                 },
             ],
             'isPostponed'           => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating whether the event is marked as postponed', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'is_postponed');
                 },
             ],
             'isCancelled'           => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating whether the event is marked as cancelled', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'is_cancelled');
                 },
             ],
             'isUpcoming'            => [
                 'type'        => 'Boolean',
                 'description' => __('Whether the event is upcoming', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'is_upcoming');
                 },
             ],
             'isActive'              => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating event is active', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'is_active');
                 },
             ],
             'isInactive'            => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating event is inactive', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'is_inactive');
                 },
             ],
             'isExpired'             => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating event is expired or not', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'is_expired');
                 },
             ],
-        ] );
+        ]);
     }
 
 

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

Doc Comments +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
 
     /**
      * @param EE_Ticket $ticket
-     * @param mixed $field
+     * @param string $field
      * @return string
      * @since $VID:$
      */

Unused Use Statements -8 removed lines

@@ -20,17 +20,9 @@
 
 namespace EventEspresso\core\domain\services\graphql\types;
 
-use EE_Base_Class;
 use EE_Ticket;
-use EE_Error;
 use EEM_Ticket;
-use EventEspresso\core\exceptions\InvalidDataTypeException;
-use EventEspresso\core\exceptions\InvalidInterfaceException;
 use EventEspresso\core\services\graphql\TypeBase;
-use GraphQL\Deferred;
-use GraphQL\Error\UserError;
-use InvalidArgumentException;
-use ReflectionException;
 
 /**
  * Class Ticket

Indentation +181 added lines, -181 removed lines

@@ -43,187 +43,187 @@
 class Ticket extends TypeBase
 {
 
-    /**
-     * Ticket constructor.
-     *
-     * @param EEM_Ticket $ticket_model
-     */
-    public function __construct(EEM_Ticket $ticket_model)
-    {
-        $this->model = $ticket_model;
-        $this->setName('Ticket');
-        $this->setDescription(__('A ticket for an event date', 'event_espresso'));
-        $this->setIsCustomPostType(false);
-        $this->setFields([
-            'id'               => [
-                'type'        => [
-                    'non_null' => 'Int',
-                ],
-                'description' => __('Ticket ID', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'ID');
-                },
-            ],
-            'name'             => [
-                'type'        => 'String',
-                'description' => __('Ticket Name', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'name');
-                },
-            ],
-            'description'      => [
-                'type'        => 'String',
-                'description' => __('Description of Ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'description');
-                },
-            ],
-            'startDate'        => [
-                'type'        => 'String',
-                'description' => __('Start time/date of Ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'start_date');
-                },
-            ],
-            'endDate'          => [
-                'type'        => 'String',
-                'description' => __('End time/date of Ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'end_date');
-                },
-            ],
-            'min'              => [
-                'type'        => 'Int',
-                'description' => __('Minimum quantity of this ticket that must be purchased', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'min');
-                },
-            ],
-            'max'              => [
-                'type'        => 'Int',
-                'description' => __('Maximum quantity of this ticket that can be purchased in one transaction',
-                    'event_espresso'),
-                    'resolve' => function (EE_Ticket $ticket) {
-                        $max = $ticket instanceof EE_Ticket ? $ticket->max() : EE_INF;
-                        return $this->parseInfiniteValue($max);
-                    },
-            ],
-            'price'            => [
-                'type'        => 'Float',
-                'description' => __('Final calculated price for ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'price');
-                },
-            ],
-            'sold'             => [
-                'type'        => 'Int',
-                'description' => __('Number of this ticket sold', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'sold');
-                },
-            ],
-            'quantity'         => [
-                'type'        => 'Int',
-                'description' => __('Quantity of this ticket that is available', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    $qty = $ticket instanceof EE_Ticket ? $ticket->qty() : EE_INF;
-                    return $this->parseInfiniteValue($qty);
-                },
-            ],
-            'reserved'         => [
-                'type'        => 'Int',
-                'description' => __('Quantity of this ticket that is reserved, but not yet fully purchased',
-                    'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'reserved');
-                },
-            ],
-            'uses'             => [
-                'type'        => 'Int',
-                'description' => __('Number of datetimes this ticket can be used at', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    $uses = $ticket instanceof EE_Ticket ? $ticket->uses() : EE_INF;
-                    return $this->parseInfiniteValue($uses);
-                },
-            ],
-            'isRequired'       => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating whether this ticket must be purchased with a transaction',
-                    'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'required');
-                },
-            ],
-            'isTaxable'        => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating whether there is tax applied on this ticket',
-                    'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'taxable');
-                },
-            ],
-            'isDefault'        => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating that this ticket is a default ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'is_default');
-                },
-            ],
-            'order'            => [
-                'type'        => 'Int',
-                'description' => __('The order in which the Datetime is displayed', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'order');
-                },
-            ],
-            'row'              => [
-                'type'        => 'Int',
-                'description' => __('How tickets are displayed in the ui', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'row');
-                },
-            ],
-            'wpUser'           => [
-                'type'        => 'User',
-                'description' => __('Ticket Creator ID', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket, $args, $context) {
-                    return $this->resolveWpUser($ticket, $args, $context);
-                },
-            ],
-            'parent'           => [
-                'type'        => 'Ticket',
-                'description' => __('The parent ticket of the current ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveParent($ticket);
-                },
-            ],
-            'reverseCalculate' => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating whether ticket calculations should run in reverse and calculate the base ticket price from the provided ticket total.',
-                    'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'reverse_calculate');
-                },
-            ],
-            'isFree'           => [
-                'type'        => 'Boolean',
-                'description' => __('Flag indicating whether the ticket is free.', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
-                    return $this->resolveField($ticket, 'is_free');
-                },
-            ],
-        ] );
-    }
+	/**
+	 * Ticket constructor.
+	 *
+	 * @param EEM_Ticket $ticket_model
+	 */
+	public function __construct(EEM_Ticket $ticket_model)
+	{
+		$this->model = $ticket_model;
+		$this->setName('Ticket');
+		$this->setDescription(__('A ticket for an event date', 'event_espresso'));
+		$this->setIsCustomPostType(false);
+		$this->setFields([
+			'id'               => [
+				'type'        => [
+					'non_null' => 'Int',
+				],
+				'description' => __('Ticket ID', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'ID');
+				},
+			],
+			'name'             => [
+				'type'        => 'String',
+				'description' => __('Ticket Name', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'name');
+				},
+			],
+			'description'      => [
+				'type'        => 'String',
+				'description' => __('Description of Ticket', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'description');
+				},
+			],
+			'startDate'        => [
+				'type'        => 'String',
+				'description' => __('Start time/date of Ticket', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'start_date');
+				},
+			],
+			'endDate'          => [
+				'type'        => 'String',
+				'description' => __('End time/date of Ticket', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'end_date');
+				},
+			],
+			'min'              => [
+				'type'        => 'Int',
+				'description' => __('Minimum quantity of this ticket that must be purchased', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'min');
+				},
+			],
+			'max'              => [
+				'type'        => 'Int',
+				'description' => __('Maximum quantity of this ticket that can be purchased in one transaction',
+					'event_espresso'),
+					'resolve' => function (EE_Ticket $ticket) {
+						$max = $ticket instanceof EE_Ticket ? $ticket->max() : EE_INF;
+						return $this->parseInfiniteValue($max);
+					},
+			],
+			'price'            => [
+				'type'        => 'Float',
+				'description' => __('Final calculated price for ticket', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'price');
+				},
+			],
+			'sold'             => [
+				'type'        => 'Int',
+				'description' => __('Number of this ticket sold', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'sold');
+				},
+			],
+			'quantity'         => [
+				'type'        => 'Int',
+				'description' => __('Quantity of this ticket that is available', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					$qty = $ticket instanceof EE_Ticket ? $ticket->qty() : EE_INF;
+					return $this->parseInfiniteValue($qty);
+				},
+			],
+			'reserved'         => [
+				'type'        => 'Int',
+				'description' => __('Quantity of this ticket that is reserved, but not yet fully purchased',
+					'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'reserved');
+				},
+			],
+			'uses'             => [
+				'type'        => 'Int',
+				'description' => __('Number of datetimes this ticket can be used at', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					$uses = $ticket instanceof EE_Ticket ? $ticket->uses() : EE_INF;
+					return $this->parseInfiniteValue($uses);
+				},
+			],
+			'isRequired'       => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating whether this ticket must be purchased with a transaction',
+					'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'required');
+				},
+			],
+			'isTaxable'        => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating whether there is tax applied on this ticket',
+					'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'taxable');
+				},
+			],
+			'isDefault'        => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating that this ticket is a default ticket', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'is_default');
+				},
+			],
+			'order'            => [
+				'type'        => 'Int',
+				'description' => __('The order in which the Datetime is displayed', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'order');
+				},
+			],
+			'row'              => [
+				'type'        => 'Int',
+				'description' => __('How tickets are displayed in the ui', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'row');
+				},
+			],
+			'wpUser'           => [
+				'type'        => 'User',
+				'description' => __('Ticket Creator ID', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket, $args, $context) {
+					return $this->resolveWpUser($ticket, $args, $context);
+				},
+			],
+			'parent'           => [
+				'type'        => 'Ticket',
+				'description' => __('The parent ticket of the current ticket', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveParent($ticket);
+				},
+			],
+			'reverseCalculate' => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating whether ticket calculations should run in reverse and calculate the base ticket price from the provided ticket total.',
+					'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'reverse_calculate');
+				},
+			],
+			'isFree'           => [
+				'type'        => 'Boolean',
+				'description' => __('Flag indicating whether the ticket is free.', 'event_espresso'),
+				'resolve'     => function (EE_Ticket $ticket) {
+					return $this->resolveField($ticket, 'is_free');
+				},
+			],
+		] );
+	}
 
 
-    /**
-     * @param EE_Ticket $ticket
-     * @param mixed $field
-     * @return string
-     * @since $VID:$
-     */
-    public function resolveField(EE_Ticket $ticket, $field)
-    {
-        return $ticket instanceof EE_Ticket ? $ticket->{$field}() : null;
-    }
+	/**
+	 * @param EE_Ticket $ticket
+	 * @param mixed $field
+	 * @return string
+	 * @since $VID:$
+	 */
+	public function resolveField(EE_Ticket $ticket, $field)
+	{
+		return $ticket instanceof EE_Ticket ? $ticket->{$field}() : null;
+	}
 }
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -60,42 +60,42 @@ 
                     'non_null' => 'Int',
                 ],
                 'description' => __('Ticket ID', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'ID');
                 },
             ],
             'name'             => [
                 'type'        => 'String',
                 'description' => __('Ticket Name', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'name');
                 },
             ],
             'description'      => [
                 'type'        => 'String',
                 'description' => __('Description of Ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'description');
                 },
             ],
             'startDate'        => [
                 'type'        => 'String',
                 'description' => __('Start time/date of Ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'start_date');
                 },
             ],
             'endDate'          => [
                 'type'        => 'String',
                 'description' => __('End time/date of Ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'end_date');
                 },
             ],
             'min'              => [
                 'type'        => 'Int',
                 'description' => __('Minimum quantity of this ticket that must be purchased', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'min');
                 },
             ],
@@ -103,7 +103,7 @@ 
                 'type'        => 'Int',
                 'description' => __('Maximum quantity of this ticket that can be purchased in one transaction',
                     'event_espresso'),
-                    'resolve' => function (EE_Ticket $ticket) {
+                    'resolve' => function(EE_Ticket $ticket) {
                         $max = $ticket instanceof EE_Ticket ? $ticket->max() : EE_INF;
                         return $this->parseInfiniteValue($max);
                     },
@@ -111,21 +111,21 @@ 
             'price'            => [
                 'type'        => 'Float',
                 'description' => __('Final calculated price for ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'price');
                 },
             ],
             'sold'             => [
                 'type'        => 'Int',
                 'description' => __('Number of this ticket sold', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'sold');
                 },
             ],
             'quantity'         => [
                 'type'        => 'Int',
                 'description' => __('Quantity of this ticket that is available', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     $qty = $ticket instanceof EE_Ticket ? $ticket->qty() : EE_INF;
                     return $this->parseInfiniteValue($qty);
                 },
@@ -134,14 +134,14 @@ 
                 'type'        => 'Int',
                 'description' => __('Quantity of this ticket that is reserved, but not yet fully purchased',
                     'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'reserved');
                 },
             ],
             'uses'             => [
                 'type'        => 'Int',
                 'description' => __('Number of datetimes this ticket can be used at', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     $uses = $ticket instanceof EE_Ticket ? $ticket->uses() : EE_INF;
                     return $this->parseInfiniteValue($uses);
                 },
@@ -150,7 +150,7 @@ 
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating whether this ticket must be purchased with a transaction',
                     'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'required');
                 },
             ],
@@ -158,42 +158,42 @@ 
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating whether there is tax applied on this ticket',
                     'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'taxable');
                 },
             ],
             'isDefault'        => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating that this ticket is a default ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'is_default');
                 },
             ],
             'order'            => [
                 'type'        => 'Int',
                 'description' => __('The order in which the Datetime is displayed', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'order');
                 },
             ],
             'row'              => [
                 'type'        => 'Int',
                 'description' => __('How tickets are displayed in the ui', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'row');
                 },
             ],
             'wpUser'           => [
                 'type'        => 'User',
                 'description' => __('Ticket Creator ID', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket, $args, $context) {
+                'resolve'     => function(EE_Ticket $ticket, $args, $context) {
                     return $this->resolveWpUser($ticket, $args, $context);
                 },
             ],
             'parent'           => [
                 'type'        => 'Ticket',
                 'description' => __('The parent ticket of the current ticket', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveParent($ticket);
                 },
             ],
@@ -201,18 +201,18 @@ 
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating whether ticket calculations should run in reverse and calculate the base ticket price from the provided ticket total.',
                     'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'reverse_calculate');
                 },
             ],
             'isFree'           => [
                 'type'        => 'Boolean',
                 'description' => __('Flag indicating whether the ticket is free.', 'event_espresso'),
-                'resolve'     => function (EE_Ticket $ticket) {
+                'resolve'     => function(EE_Ticket $ticket) {
                     return $this->resolveField($ticket, 'is_free');
                 },
             ],
-        ] );
+        ]);
     }
 
 

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

Doc Comments +2 added lines, -2 removed lines

@@ -254,7 +254,7 @@ 
 
     /**
      * @param Post|EE_Venue $source The source instance.
-     * @return int
+     * @return EE_Base_Class|null
      * @since $VID:$
      */
     public function resolveState($source)
@@ -270,7 +270,7 @@ 
 
     /**
      * @param Post|EE_Venue $source The source instance.
-     * @return int
+     * @return EE_Base_Class|null
      * @since $VID:$
      */
     public function resolveCountry($source)

Indentation +225 added lines, -225 removed lines

@@ -39,247 +39,247 @@
 class Venue extends TypeBase
 {
 
-    /**
-     * Venue constructor.
-     *
-     * @param EEM_Venue $venue_model
-     */
-    public function __construct(EEM_Venue $venue_model)
-    {
-        $this->model = $venue_model;
-        $this->setName('Venue');
-        $this->setIsCustomPostType(true);
-        $this->setFields([
-            'name'          => [
-                'type'        => 'String',
-                'description' => __('Venue Name', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'name');
-                },
-            ],
-            'desc'          => [
-                'type'        => 'String',
-                'description' => __('Venue Description', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'description');
-                },
-            ],
-            'shortDesc'     => [
-                'type'        => 'String',
-                'description' => __('Short Description of Venue', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'excerpt');
-                },
-            ],
-            'identifier'    => [
-                'type'        => 'String',
-                'description' => __('Venue Identifier', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'identifier');
-                },
-            ],
-            'created'       => [
-                'type'        => 'String',
-                'description' => __('Date Venue Created', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'created');
-                },
-            ],
-            // Already registered
-            /* 'modified'  => [
+	/**
+	 * Venue constructor.
+	 *
+	 * @param EEM_Venue $venue_model
+	 */
+	public function __construct(EEM_Venue $venue_model)
+	{
+		$this->model = $venue_model;
+		$this->setName('Venue');
+		$this->setIsCustomPostType(true);
+		$this->setFields([
+			'name'          => [
+				'type'        => 'String',
+				'description' => __('Venue Name', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'name');
+				},
+			],
+			'desc'          => [
+				'type'        => 'String',
+				'description' => __('Venue Description', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'description');
+				},
+			],
+			'shortDesc'     => [
+				'type'        => 'String',
+				'description' => __('Short Description of Venue', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'excerpt');
+				},
+			],
+			'identifier'    => [
+				'type'        => 'String',
+				'description' => __('Venue Identifier', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'identifier');
+				},
+			],
+			'created'       => [
+				'type'        => 'String',
+				'description' => __('Date Venue Created', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'created');
+				},
+			],
+			// Already registered
+			/* 'modified'  => [
                 'type'        => 'String',
                 'description' => __('Venue Modified Date', 'event_espresso'),
             ], */
-            'order'         => [
-                'type'        => 'Int',
-                'description' => __('Venue order', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'order');
-                },
-            ],
-            'wpUser'        => [
-                'type'        => 'User',
-                'description' => __('Venue Creator', 'event_espresso'),
-                'resolve'     => function ($source, $args, $context) {
-                    return $this->resolveWpUser($source, $args, $context);
-                },
-            ],
-            // Already registered
-            /* 'parent'  => [
+			'order'         => [
+				'type'        => 'Int',
+				'description' => __('Venue order', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'order');
+				},
+			],
+			'wpUser'        => [
+				'type'        => 'User',
+				'description' => __('Venue Creator', 'event_espresso'),
+				'resolve'     => function ($source, $args, $context) {
+					return $this->resolveWpUser($source, $args, $context);
+				},
+			],
+			// Already registered
+			/* 'parent'  => [
                 'type'        => 'Venue',
                 'description' => __('Venue Parent ID', 'event_espresso'),
             ], */
-            'address'       => [
-                'type'        => 'String',
-                'description' => __('Venue Address line 1', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'address');
-                },
-            ],
-            'address2'      => [
-                'type'        => 'String',
-                'description' => __('Venue Address line 2', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'address2');
-                },
-            ],
-            'city'          => [
-                'type'        => 'String',
-                'description' => __('Venue City', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'city');
-                },
-            ],
-            'state'  => [
-                'type'        => 'State',
-                'description' => __('Venue state', 'event_espresso'),
-                'resolve'     => function ($source) {
-                    return $this->resolveState($source);
-                },
-            ],
-            'country'  => [
-                'type'        => 'Country',
-                'description' => __('Venue country', 'event_espresso'),
-                'resolve'     => function ($source) {
-                    return $this->resolveCountry($source);
-                },
-            ],
-            'zip'           => [
-                'type'        => 'String',
-                'description' => __('Venue Zip/Postal Code', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'zip');
-                },
-            ],
-            'capacity'      => [
-                'type'        => 'Int',
-                'description' => __('Venue Capacity', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveCapacity($source);
-                },
-            ],
-            'phone'         => [
-                'type'        => 'String',
-                'description' => __('Venue Phone', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'phone');
-                },
-            ],
-            'virtualPhone'  => [
-                'type'        => 'String',
-                'description' => __('Call in Number', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'virtual_phone');
-                },
-            ],
-            'url'           => [
-                'type'        => 'String',
-                'description' => __('Venue Website', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'venue_url');
-                },
-            ],
-            'virtualUrl'    => [
-                'type'        => 'String',
-                'description' => __('Virtual URL', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'virtual_url');
-                },
-            ],
-            'googleMapLink' => [
-                'type'        => 'String',
-                'description' => __('Google Map Link', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'google_map_link');
-                },
-            ],
-            'enableForGmap' => [
-                'type'        => 'String',
-                'description' => __('Show Google Map?', 'event_espresso'),
-                'resolve' => function ($source) {
-                    return $this->resolveField($source, 'enable_for_gmap');
-                },
-            ],
-        ] );
-    }
+			'address'       => [
+				'type'        => 'String',
+				'description' => __('Venue Address line 1', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'address');
+				},
+			],
+			'address2'      => [
+				'type'        => 'String',
+				'description' => __('Venue Address line 2', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'address2');
+				},
+			],
+			'city'          => [
+				'type'        => 'String',
+				'description' => __('Venue City', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'city');
+				},
+			],
+			'state'  => [
+				'type'        => 'State',
+				'description' => __('Venue state', 'event_espresso'),
+				'resolve'     => function ($source) {
+					return $this->resolveState($source);
+				},
+			],
+			'country'  => [
+				'type'        => 'Country',
+				'description' => __('Venue country', 'event_espresso'),
+				'resolve'     => function ($source) {
+					return $this->resolveCountry($source);
+				},
+			],
+			'zip'           => [
+				'type'        => 'String',
+				'description' => __('Venue Zip/Postal Code', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'zip');
+				},
+			],
+			'capacity'      => [
+				'type'        => 'Int',
+				'description' => __('Venue Capacity', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveCapacity($source);
+				},
+			],
+			'phone'         => [
+				'type'        => 'String',
+				'description' => __('Venue Phone', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'phone');
+				},
+			],
+			'virtualPhone'  => [
+				'type'        => 'String',
+				'description' => __('Call in Number', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'virtual_phone');
+				},
+			],
+			'url'           => [
+				'type'        => 'String',
+				'description' => __('Venue Website', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'venue_url');
+				},
+			],
+			'virtualUrl'    => [
+				'type'        => 'String',
+				'description' => __('Virtual URL', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'virtual_url');
+				},
+			],
+			'googleMapLink' => [
+				'type'        => 'String',
+				'description' => __('Google Map Link', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'google_map_link');
+				},
+			],
+			'enableForGmap' => [
+				'type'        => 'String',
+				'description' => __('Show Google Map?', 'event_espresso'),
+				'resolve' => function ($source) {
+					return $this->resolveField($source, 'enable_for_gmap');
+				},
+			],
+		] );
+	}
 
 
-    /**
-     * @param Post|EE_Venue $source
-     * @return EE_Base_Class|EE_Venue|null
-     * @since $VID:$
-     */
-    private function getVenue($source)
-    {
-        // If it comes from a custom connection
-        // where the $source is already instantiated.
-        if ($source instanceof EE_Venue) {
-            return $source;
-        }
+	/**
+	 * @param Post|EE_Venue $source
+	 * @return EE_Base_Class|EE_Venue|null
+	 * @since $VID:$
+	 */
+	private function getVenue($source)
+	{
+		// If it comes from a custom connection
+		// where the $source is already instantiated.
+		if ($source instanceof EE_Venue) {
+			return $source;
+		}
 
-        $id = $source instanceof Post ? $source->ID : 0;
+		$id = $source instanceof Post ? $source->ID : 0;
 
-        if ($id) {
-            return $this->model->get_one_by_ID($id);
-        }
-        return null;
-    }
+		if ($id) {
+			return $this->model->get_one_by_ID($id);
+		}
+		return null;
+	}
 
 
-    /**
-     * @param Post|EE_Venue $source The source instance.
-     * @param string        $field  The field name.
-     * @return mixed
-     * @since $VID:$
-     */
-    public function resolveField($source, $field)
-    {
-        $venue = $this->getVenue($source);
-        return $venue instanceof EE_Venue ? $venue->{$field}() : null;
-    }
+	/**
+	 * @param Post|EE_Venue $source The source instance.
+	 * @param string        $field  The field name.
+	 * @return mixed
+	 * @since $VID:$
+	 */
+	public function resolveField($source, $field)
+	{
+		$venue = $this->getVenue($source);
+		return $venue instanceof EE_Venue ? $venue->{$field}() : null;
+	}
 
 
-    /**
-     * @param Post|EE_Venue $source The source instance.
-     * @return int
-     * @since $VID:$
-     */
-    public function resolveCapacity($source)
-    {
-        $venue = $this->getVenue($source);
-        $capacity = $venue instanceof EE_Venue ? $venue->capacity() : EE_INF;
-        return $this->parseInfiniteValue($capacity);
-    }
+	/**
+	 * @param Post|EE_Venue $source The source instance.
+	 * @return int
+	 * @since $VID:$
+	 */
+	public function resolveCapacity($source)
+	{
+		$venue = $this->getVenue($source);
+		$capacity = $venue instanceof EE_Venue ? $venue->capacity() : EE_INF;
+		return $this->parseInfiniteValue($capacity);
+	}
 
 
-    /**
-     * @param Post|EE_Venue $source The source instance.
-     * @return int
-     * @since $VID:$
-     */
-    public function resolveState($source)
-    {
-        $venue = $this->getVenue($source);
-        $state_id = $venue instanceof EE_Venue ? $venue->state_ID() : 0;
-        if ($state_id) {
-            return EEM_State::instance()->get_one_by_ID($state_id);
-        }
-        return null;
-    }
+	/**
+	 * @param Post|EE_Venue $source The source instance.
+	 * @return int
+	 * @since $VID:$
+	 */
+	public function resolveState($source)
+	{
+		$venue = $this->getVenue($source);
+		$state_id = $venue instanceof EE_Venue ? $venue->state_ID() : 0;
+		if ($state_id) {
+			return EEM_State::instance()->get_one_by_ID($state_id);
+		}
+		return null;
+	}
 
 
-    /**
-     * @param Post|EE_Venue $source The source instance.
-     * @return int
-     * @since $VID:$
-     */
-    public function resolveCountry($source)
-    {
-        $venue = $this->getVenue($source);
-        $country_id = $venue instanceof EE_Venue ? $venue->country_ID() : 0;
-        if ($country_id) {
-            return EEM_Country::instance()->get_one_by_ID($country_id);
-        }
-        return null;
-    }
+	/**
+	 * @param Post|EE_Venue $source The source instance.
+	 * @return int
+	 * @since $VID:$
+	 */
+	public function resolveCountry($source)
+	{
+		$venue = $this->getVenue($source);
+		$country_id = $venue instanceof EE_Venue ? $venue->country_ID() : 0;
+		if ($country_id) {
+			return EEM_Country::instance()->get_one_by_ID($country_id);
+		}
+		return null;
+	}
 }
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -53,35 +53,35 @@ 
             'name'          => [
                 'type'        => 'String',
                 'description' => __('Venue Name', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'name');
                 },
             ],
             'desc'          => [
                 'type'        => 'String',
                 'description' => __('Venue Description', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'description');
                 },
             ],
             'shortDesc'     => [
                 'type'        => 'String',
                 'description' => __('Short Description of Venue', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'excerpt');
                 },
             ],
             'identifier'    => [
                 'type'        => 'String',
                 'description' => __('Venue Identifier', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'identifier');
                 },
             ],
             'created'       => [
                 'type'        => 'String',
                 'description' => __('Date Venue Created', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'created');
                 },
             ],
@@ -93,14 +93,14 @@ 
             'order'         => [
                 'type'        => 'Int',
                 'description' => __('Venue order', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'order');
                 },
             ],
             'wpUser'        => [
                 'type'        => 'User',
                 'description' => __('Venue Creator', 'event_espresso'),
-                'resolve'     => function ($source, $args, $context) {
+                'resolve'     => function($source, $args, $context) {
                     return $this->resolveWpUser($source, $args, $context);
                 },
             ],
@@ -112,95 +112,95 @@ 
             'address'       => [
                 'type'        => 'String',
                 'description' => __('Venue Address line 1', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'address');
                 },
             ],
             'address2'      => [
                 'type'        => 'String',
                 'description' => __('Venue Address line 2', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'address2');
                 },
             ],
             'city'          => [
                 'type'        => 'String',
                 'description' => __('Venue City', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'city');
                 },
             ],
             'state'  => [
                 'type'        => 'State',
                 'description' => __('Venue state', 'event_espresso'),
-                'resolve'     => function ($source) {
+                'resolve'     => function($source) {
                     return $this->resolveState($source);
                 },
             ],
             'country'  => [
                 'type'        => 'Country',
                 'description' => __('Venue country', 'event_espresso'),
-                'resolve'     => function ($source) {
+                'resolve'     => function($source) {
                     return $this->resolveCountry($source);
                 },
             ],
             'zip'           => [
                 'type'        => 'String',
                 'description' => __('Venue Zip/Postal Code', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'zip');
                 },
             ],
             'capacity'      => [
                 'type'        => 'Int',
                 'description' => __('Venue Capacity', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveCapacity($source);
                 },
             ],
             'phone'         => [
                 'type'        => 'String',
                 'description' => __('Venue Phone', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'phone');
                 },
             ],
             'virtualPhone'  => [
                 'type'        => 'String',
                 'description' => __('Call in Number', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'virtual_phone');
                 },
             ],
             'url'           => [
                 'type'        => 'String',
                 'description' => __('Venue Website', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'venue_url');
                 },
             ],
             'virtualUrl'    => [
                 'type'        => 'String',
                 'description' => __('Virtual URL', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'virtual_url');
                 },
             ],
             'googleMapLink' => [
                 'type'        => 'String',
                 'description' => __('Google Map Link', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'google_map_link');
                 },
             ],
             'enableForGmap' => [
                 'type'        => 'String',
                 'description' => __('Show Google Map?', 'event_espresso'),
-                'resolve' => function ($source) {
+                'resolve' => function($source) {
                     return $this->resolveField($source, 'enable_for_gmap');
                 },
             ],
-        ] );
+        ]);
     }
 
 

core/services/graphql/TypeBase.php

Doc Comments +1 added lines, -1 removed lines

@@ -225,7 +225,7 @@
 
     /**
      * @param EE_Base_Class $model
-     * @return EE_Base_Class|null
+     * @return \EE_Base_Class|null
      * @throws EE_Error
      * @throws InvalidArgumentException
      * @throws InvalidDataTypeException

Indentation +198 added lines, -198 removed lines

@@ -39,203 +39,203 @@
 abstract class TypeBase implements TypeInterface
 {
 
-    /**
-     * @var EEM_Base $model
-     */
-    protected $model;
-
-    /**
-     * @var string $name
-     */
-    protected $name = '';
-
-    /**
-     * @var string $description
-     */
-    protected $description = '';
-
-    /**
-     * @var array $fields
-     */
-    protected $fields = [];
-
-    /**
-     * @var bool $is_custom_post_type
-     */
-    protected $is_custom_post_type = false;
-
-
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * @param string $name
-     */
-    protected function setName($name)
-    {
-        $this->name = $name;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function description()
-    {
-        return $this->description;
-    }
-
-
-    /**
-     * @param string $description
-     */
-    protected function setDescription($description)
-    {
-        $this->description = $description;
-    }
-
-
-    /**
-     * @return array
-     * @since $VID:$
-     */
-    public function fields()
-    {
-        return $this->fields;
-    }
-
-
-    /**
-     * @param array $fields
-     */
-    protected function setFields(array $fields)
-    {
-        $this->fields = $fields;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isCustomPostType()
-    {
-        return $this->is_custom_post_type;
-    }
-
-
-    /**
-     * @param bool $is_custom_post_type
-     */
-    protected function setIsCustomPostType($is_custom_post_type)
-    {
-        $this->is_custom_post_type = filter_var($is_custom_post_type, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @param int $value
-     * @return int
-     * @since $VID:$
-     */
-    protected function parseInfiniteValue($value)
-    {
-        return $value === EE_INF || is_infinite($value) ? -1 : $value;
-    }
-
-
-    /**
-     * @param EE_Model_Field_Base $field
-     * @return string
-     * @since $VID:$
-     */
-    protected function parseFieldType(EE_Model_Field_Base $field)
-    {
-        $schema_type = $field->getSchemaType();
-        $schema_type = is_array($schema_type) ? array_shift($schema_type) : $schema_type;
-        switch ($schema_type) {
-            case 'boolean';
-                return 'Boolean';
-            case 'date-time';
-            case 'string';
-                return 'String';
-            case 'integer';
-                if ($field instanceof EE_WP_User_Field) {
-                    return 'User';
-                }
-                return 'Int';
-            case 'number';
-                return 'Float';
-            case 'object';
-                if ($field instanceof EE_Post_Content_Field) {
-                    return 'String';
-                }
-                if ($field instanceof EE_Enum_Text_Field) {
-                    return 'String';
-                }
-                return 'object';
-        }
-    }
-
-
-    /**
-     * @param Post|EE_Base_Class $source
-     * @return int
-     * @since $VID:$
-     */
-    protected function getUserId($source)
-    {
-        if ($source instanceof Post) {
-            $source = $this->model->get_one_by_ID($source->ID);
-        }
-
-        if (is_subclass_of($source, 'EE_Base_Class')) {
-            return $source->wp_user();
-        }
-        return 0;
-    }
-
-
-    /**
-     * @param EE_Base_Class|Post $source
-     * @param           $args
-     * @param           $context
-     * @return Deferred|null
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws UserError
-     * @since $VID:$
-     */
-    public function resolveWpUser($source, $args, $context)
-    {
-        $user_id = $this->getUserId($source);
-        return $user_id
-            ? DataSource::resolve_user($user_id, $context)
-            : null;
-    }
-
-
-    /**
-     * @param EE_Base_Class $model
-     * @return EE_Base_Class|null
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function resolveParent($model)
-    {
-        return is_subclass_of($model, 'EE_Base_Class') ? $this->model->get_one_by_ID($model->parent()) : null;
-    }
+	/**
+	 * @var EEM_Base $model
+	 */
+	protected $model;
+
+	/**
+	 * @var string $name
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string $description
+	 */
+	protected $description = '';
+
+	/**
+	 * @var array $fields
+	 */
+	protected $fields = [];
+
+	/**
+	 * @var bool $is_custom_post_type
+	 */
+	protected $is_custom_post_type = false;
+
+
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * @param string $name
+	 */
+	protected function setName($name)
+	{
+		$this->name = $name;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function description()
+	{
+		return $this->description;
+	}
+
+
+	/**
+	 * @param string $description
+	 */
+	protected function setDescription($description)
+	{
+		$this->description = $description;
+	}
+
+
+	/**
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function fields()
+	{
+		return $this->fields;
+	}
+
+
+	/**
+	 * @param array $fields
+	 */
+	protected function setFields(array $fields)
+	{
+		$this->fields = $fields;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isCustomPostType()
+	{
+		return $this->is_custom_post_type;
+	}
+
+
+	/**
+	 * @param bool $is_custom_post_type
+	 */
+	protected function setIsCustomPostType($is_custom_post_type)
+	{
+		$this->is_custom_post_type = filter_var($is_custom_post_type, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @param int $value
+	 * @return int
+	 * @since $VID:$
+	 */
+	protected function parseInfiniteValue($value)
+	{
+		return $value === EE_INF || is_infinite($value) ? -1 : $value;
+	}
+
+
+	/**
+	 * @param EE_Model_Field_Base $field
+	 * @return string
+	 * @since $VID:$
+	 */
+	protected function parseFieldType(EE_Model_Field_Base $field)
+	{
+		$schema_type = $field->getSchemaType();
+		$schema_type = is_array($schema_type) ? array_shift($schema_type) : $schema_type;
+		switch ($schema_type) {
+			case 'boolean';
+				return 'Boolean';
+			case 'date-time';
+			case 'string';
+				return 'String';
+			case 'integer';
+				if ($field instanceof EE_WP_User_Field) {
+					return 'User';
+				}
+				return 'Int';
+			case 'number';
+				return 'Float';
+			case 'object';
+				if ($field instanceof EE_Post_Content_Field) {
+					return 'String';
+				}
+				if ($field instanceof EE_Enum_Text_Field) {
+					return 'String';
+				}
+				return 'object';
+		}
+	}
+
+
+	/**
+	 * @param Post|EE_Base_Class $source
+	 * @return int
+	 * @since $VID:$
+	 */
+	protected function getUserId($source)
+	{
+		if ($source instanceof Post) {
+			$source = $this->model->get_one_by_ID($source->ID);
+		}
+
+		if (is_subclass_of($source, 'EE_Base_Class')) {
+			return $source->wp_user();
+		}
+		return 0;
+	}
+
+
+	/**
+	 * @param EE_Base_Class|Post $source
+	 * @param           $args
+	 * @param           $context
+	 * @return Deferred|null
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws UserError
+	 * @since $VID:$
+	 */
+	public function resolveWpUser($source, $args, $context)
+	{
+		$user_id = $this->getUserId($source);
+		return $user_id
+			? DataSource::resolve_user($user_id, $context)
+			: null;
+	}
+
+
+	/**
+	 * @param EE_Base_Class $model
+	 * @return EE_Base_Class|null
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function resolveParent($model)
+	{
+		return is_subclass_of($model, 'EE_Base_Class') ? $this->model->get_one_by_ID($model->parent()) : null;
+	}
 
 }
\ No newline at end of file

core/EE_Dependency_Map.core.php

Indentation +1164 added lines, -1164 removed lines

@@ -20,1168 +20,1168 @@
 class EE_Dependency_Map
 {
 
-    /**
-     * This means that the requested class dependency is not present in the dependency map
-     */
-    const not_registered = 0;
-
-    /**
-     * This instructs class loaders to ALWAYS return a newly instantiated object for the requested class.
-     */
-    const load_new_object = 1;
-
-    /**
-     * This instructs class loaders to return a previously instantiated and cached object for the requested class.
-     * IF a previously instantiated object does not exist, a new one will be created and added to the cache.
-     */
-    const load_from_cache = 2;
-
-    /**
-     * When registering a dependency,
-     * this indicates to keep any existing dependencies that already exist,
-     * and simply discard any new dependencies declared in the incoming data
-     */
-    const KEEP_EXISTING_DEPENDENCIES = 0;
-
-    /**
-     * When registering a dependency,
-     * this indicates to overwrite any existing dependencies that already exist using the incoming data
-     */
-    const OVERWRITE_DEPENDENCIES = 1;
-
-
-    /**
-     * @type EE_Dependency_Map $_instance
-     */
-    protected static $_instance;
-
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
-
-    /**
-     * @type RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @type LegacyRequestInterface $legacy_request
-     */
-    protected $legacy_request;
-
-    /**
-     * @type ResponseInterface $response
-     */
-    protected $response;
-
-    /**
-     * @type LoaderInterface $loader
-     */
-    protected $loader;
-
-    /**
-     * @type array $_dependency_map
-     */
-    protected $_dependency_map = array();
-
-    /**
-     * @type array $_class_loaders
-     */
-    protected $_class_loaders = array();
-
-
-    /**
-     * EE_Dependency_Map constructor.
-     *
-     * @param ClassInterfaceCache $class_cache
-     */
-    protected function __construct(ClassInterfaceCache $class_cache)
-    {
-        $this->class_cache = $class_cache;
-        do_action('EE_Dependency_Map____construct', $this);
-    }
-
-
-    /**
-     * @return void
-     */
-    public function initialize()
-    {
-        $this->_register_core_dependencies();
-        $this->_register_core_class_loaders();
-        $this->_register_core_aliases();
-    }
-
-
-    /**
-     * @singleton method used to instantiate class object
-     * @param ClassInterfaceCache|null $class_cache
-     * @return EE_Dependency_Map
-     */
-    public static function instance(ClassInterfaceCache $class_cache = null)
-    {
-        // check if class object is instantiated, and instantiated properly
-        if (! self::$_instance instanceof EE_Dependency_Map
-            && $class_cache instanceof ClassInterfaceCache
-        ) {
-            self::$_instance = new EE_Dependency_Map($class_cache);
-        }
-        return self::$_instance;
-    }
-
-
-    /**
-     * @param RequestInterface $request
-     */
-    public function setRequest(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-
-    /**
-     * @param LegacyRequestInterface $legacy_request
-     */
-    public function setLegacyRequest(LegacyRequestInterface $legacy_request)
-    {
-        $this->legacy_request = $legacy_request;
-    }
-
-
-    /**
-     * @param ResponseInterface $response
-     */
-    public function setResponse(ResponseInterface $response)
-    {
-        $this->response = $response;
-    }
-
-
-    /**
-     * @param LoaderInterface $loader
-     */
-    public function setLoader(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-
-    /**
-     * @param string $class
-     * @param array  $dependencies
-     * @param int    $overwrite
-     * @return bool
-     */
-    public static function register_dependencies(
-        $class,
-        array $dependencies,
-        $overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
-    ) {
-        return self::$_instance->registerDependencies($class, $dependencies, $overwrite);
-    }
-
-
-    /**
-     * Assigns an array of class names and corresponding load sources (new or cached)
-     * to the class specified by the first parameter.
-     * IMPORTANT !!!
-     * The order of elements in the incoming $dependencies array MUST match
-     * the order of the constructor parameters for the class in question.
-     * This is especially important when overriding any existing dependencies that are registered.
-     * the third parameter controls whether any duplicate dependencies are overwritten or not.
-     *
-     * @param string $class
-     * @param array  $dependencies
-     * @param int    $overwrite
-     * @return bool
-     */
-    public function registerDependencies(
-        $class,
-        array $dependencies,
-        $overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
-    ) {
-        $class = trim($class, '\\');
-        $registered = false;
-        if (empty(self::$_instance->_dependency_map[ $class ])) {
-            self::$_instance->_dependency_map[ $class ] = array();
-        }
-        // we need to make sure that any aliases used when registering a dependency
-        // get resolved to the correct class name
-        foreach ($dependencies as $dependency => $load_source) {
-            $alias = self::$_instance->getFqnForAlias($dependency);
-            if ($overwrite === EE_Dependency_Map::OVERWRITE_DEPENDENCIES
-                || ! isset(self::$_instance->_dependency_map[ $class ][ $alias ])
-            ) {
-                unset($dependencies[ $dependency ]);
-                $dependencies[ $alias ] = $load_source;
-                $registered = true;
-            }
-        }
-        // now add our two lists of dependencies together.
-        // using Union (+=) favours the arrays in precedence from left to right,
-        // so $dependencies is NOT overwritten because it is listed first
-        // ie: with A = B + C, entries in B take precedence over duplicate entries in C
-        // Union is way faster than array_merge() but should be used with caution...
-        // especially with numerically indexed arrays
-        $dependencies += self::$_instance->_dependency_map[ $class ];
-        // now we need to ensure that the resulting dependencies
-        // array only has the entries that are required for the class
-        // so first count how many dependencies were originally registered for the class
-        $dependency_count = count(self::$_instance->_dependency_map[ $class ]);
-        // if that count is non-zero (meaning dependencies were already registered)
-        self::$_instance->_dependency_map[ $class ] = $dependency_count
-            // then truncate the  final array to match that count
-            ? array_slice($dependencies, 0, $dependency_count)
-            // otherwise just take the incoming array because nothing previously existed
-            : $dependencies;
-        return $registered;
-    }
-
-
-    /**
-     * @param string $class_name
-     * @param string $loader
-     * @return bool
-     * @throws DomainException
-     */
-    public static function register_class_loader($class_name, $loader = 'load_core')
-    {
-        if (! $loader instanceof Closure && strpos($class_name, '\\') !== false) {
-            throw new DomainException(
-                esc_html__('Don\'t use class loaders for FQCNs.', 'event_espresso')
-            );
-        }
-        // check that loader is callable or method starts with "load_" and exists in EE_Registry
-        if (! is_callable($loader)
-            && (
-                strpos($loader, 'load_') !== 0
-                || ! method_exists('EE_Registry', $loader)
-            )
-        ) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        '"%1$s" is not a valid loader method on EE_Registry.',
-                        'event_espresso'
-                    ),
-                    $loader
-                )
-            );
-        }
-        $class_name = self::$_instance->getFqnForAlias($class_name);
-        if (! isset(self::$_instance->_class_loaders[ $class_name ])) {
-            self::$_instance->_class_loaders[ $class_name ] = $loader;
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function dependency_map()
-    {
-        return $this->_dependency_map;
-    }
-
-
-    /**
-     * returns TRUE if dependency map contains a listing for the provided class name
-     *
-     * @param string $class_name
-     * @return boolean
-     */
-    public function has($class_name = '')
-    {
-        // all legacy models have the same dependencies
-        if (strpos($class_name, 'EEM_') === 0) {
-            $class_name = 'LEGACY_MODELS';
-        }
-        return isset($this->_dependency_map[ $class_name ]) ? true : false;
-    }
-
-
-    /**
-     * returns TRUE if dependency map contains a listing for the provided class name AND dependency
-     *
-     * @param string $class_name
-     * @param string $dependency
-     * @return bool
-     */
-    public function has_dependency_for_class($class_name = '', $dependency = '')
-    {
-        // all legacy models have the same dependencies
-        if (strpos($class_name, 'EEM_') === 0) {
-            $class_name = 'LEGACY_MODELS';
-        }
-        $dependency = $this->getFqnForAlias($dependency, $class_name);
-        return isset($this->_dependency_map[ $class_name ][ $dependency ])
-            ? true
-            : false;
-    }
-
-
-    /**
-     * returns loading strategy for whether a previously cached dependency should be loaded or a new instance returned
-     *
-     * @param string $class_name
-     * @param string $dependency
-     * @return int
-     */
-    public function loading_strategy_for_class_dependency($class_name = '', $dependency = '')
-    {
-        // all legacy models have the same dependencies
-        if (strpos($class_name, 'EEM_') === 0) {
-            $class_name = 'LEGACY_MODELS';
-        }
-        $dependency = $this->getFqnForAlias($dependency);
-        return $this->has_dependency_for_class($class_name, $dependency)
-            ? $this->_dependency_map[ $class_name ][ $dependency ]
-            : EE_Dependency_Map::not_registered;
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return string | Closure
-     */
-    public function class_loader($class_name)
-    {
-        // all legacy models use load_model()
-        if (strpos($class_name, 'EEM_') === 0) {
-            return 'load_model';
-        }
-        // EE_CPT_*_Strategy classes like EE_CPT_Event_Strategy, EE_CPT_Venue_Strategy, etc
-        // perform strpos() first to avoid loading regex every time we load a class
-        if (strpos($class_name, 'EE_CPT_') === 0
-            && preg_match('/^EE_CPT_([a-zA-Z]+)_Strategy$/', $class_name)
-        ) {
-            return 'load_core';
-        }
-        $class_name = $this->getFqnForAlias($class_name);
-        return isset($this->_class_loaders[ $class_name ]) ? $this->_class_loaders[ $class_name ] : '';
-    }
-
-
-    /**
-     * @return array
-     */
-    public function class_loaders()
-    {
-        return $this->_class_loaders;
-    }
-
-
-    /**
-     * adds an alias for a classname
-     *
-     * @param string $fqcn      the class name that should be used (concrete class to replace interface)
-     * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
-     * @param string $for_class the class that has the dependency (is type hinting for the interface)
-     */
-    public function add_alias($fqcn, $alias, $for_class = '')
-    {
-        $this->class_cache->addAlias($fqcn, $alias, $for_class);
-    }
-
-
-    /**
-     * Returns TRUE if the provided fully qualified name IS an alias
-     * WHY?
-     * Because if a class is type hinting for a concretion,
-     * then why would we need to find another class to supply it?
-     * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
-     * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
-     * Don't go looking for some substitute.
-     * Whereas if a class is type hinting for an interface...
-     * then we need to find an actual class to use.
-     * So the interface IS the alias for some other FQN,
-     * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
-     * represents some other class.
-     *
-     * @param string $fqn
-     * @param string $for_class
-     * @return bool
-     */
-    public function isAlias($fqn = '', $for_class = '')
-    {
-        return $this->class_cache->isAlias($fqn, $for_class);
-    }
-
-
-    /**
-     * Returns a FQN for provided alias if one exists, otherwise returns the original $alias
-     * functions recursively, so that multiple aliases can be used to drill down to a FQN
-     *  for example:
-     *      if the following two entries were added to the _aliases array:
-     *          array(
-     *              'interface_alias'           => 'some\namespace\interface'
-     *              'some\namespace\interface'  => 'some\namespace\classname'
-     *          )
-     *      then one could use EE_Registry::instance()->create( 'interface_alias' )
-     *      to load an instance of 'some\namespace\classname'
-     *
-     * @param string $alias
-     * @param string $for_class
-     * @return string
-     */
-    public function getFqnForAlias($alias = '', $for_class = '')
-    {
-        return (string) $this->class_cache->getFqnForAlias($alias, $for_class);
-    }
-
-
-    /**
-     * Registers the core dependencies and whether a previously instantiated object should be loaded from the cache,
-     * if one exists, or whether a new object should be generated every time the requested class is loaded.
-     * This is done by using the following class constants:
-     *        EE_Dependency_Map::load_from_cache - loads previously instantiated object
-     *        EE_Dependency_Map::load_new_object - generates a new object every time
-     */
-    protected function _register_core_dependencies()
-    {
-        $this->_dependency_map = array(
-            'EE_Request_Handler'                                                                                          => array(
-                'EE_Request' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_System'                                                                                                   => array(
-                'EE_Registry'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EE_Maintenance_Mode'                         => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Session'                                                                                                  => array(
-                'EventEspresso\core\services\cache\TransientCacheStorage'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\session\SessionStartHandler'  => EE_Dependency_Map::load_from_cache,
-                'EE_Encryption'                                            => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Cart'                                                                                                     => array(
-                'EE_Session' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Front_Controller'                                                                                         => array(
-                'EE_Registry'              => EE_Dependency_Map::load_from_cache,
-                'EE_Request_Handler'       => EE_Dependency_Map::load_from_cache,
-                'EE_Module_Request_Router' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Messenger_Collection_Loader'                                                                              => array(
-                'EE_Messenger_Collection' => EE_Dependency_Map::load_new_object,
-            ),
-            'EE_Message_Type_Collection_Loader'                                                                           => array(
-                'EE_Message_Type_Collection' => EE_Dependency_Map::load_new_object,
-            ),
-            'EE_Message_Resource_Manager'                                                                                 => array(
-                'EE_Messenger_Collection_Loader'    => EE_Dependency_Map::load_new_object,
-                'EE_Message_Type_Collection_Loader' => EE_Dependency_Map::load_new_object,
-                'EEM_Message_Template_Group'        => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Message_Factory'                                                                                          => array(
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_messages'                                                                                                 => array(
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Messages_Generator'                                                                                       => array(
-                'EE_Messages_Queue'                    => EE_Dependency_Map::load_new_object,
-                'EE_Messages_Data_Handler_Collection'  => EE_Dependency_Map::load_new_object,
-                'EE_Message_Template_Group_Collection' => EE_Dependency_Map::load_new_object,
-                'EEH_Parse_Shortcodes'                 => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Messages_Processor'                                                                                       => array(
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Messages_Queue'                                                                                           => array(
-                'EE_Message_Repository' => EE_Dependency_Map::load_new_object,
-            ),
-            'EE_Messages_Template_Defaults'                                                                               => array(
-                'EEM_Message_Template_Group' => EE_Dependency_Map::load_from_cache,
-                'EEM_Message_Template'       => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Message_To_Generate_From_Request'                                                                         => array(
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-                'EE_Request_Handler'          => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\CommandBus'                                                             => array(
-                'EventEspresso\core\services\commands\CommandHandlerManager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\services\commands\CommandHandler'                                                              => array(
-                'EE_Registry'         => EE_Dependency_Map::load_from_cache,
-                'CommandBusInterface' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\CommandHandlerManager'                                                  => array(
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\CompositeCommandHandler'                                                => array(
-                'EventEspresso\core\services\commands\CommandBus'     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\commands\CommandFactory' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\CommandFactory'                                                         => array(
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\middleware\CapChecker'                                                  => array(
-                'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker'                                         => array(
-                'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\capabilities\RegistrationsCapChecker'                                     => array(
-                'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\registration\CreateRegistrationCommandHandler'                          => array(
-                'EventEspresso\core\domain\services\registration\CreateRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommandHandler'                     => array(
-                'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommandHandler'                    => array(
-                'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler'         => array(
-                'EventEspresso\core\domain\services\registration\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler' => array(
-                'EventEspresso\core\domain\services\registration\UpdateRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommandHandler'                              => array(
-                'EventEspresso\core\domain\services\ticket\CreateTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\ticket\CancelTicketLineItemCommandHandler'                              => array(
-                'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\registration\CancelRegistrationService'                                   => array(
-                'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\commands\attendee\CreateAttendeeCommandHandler'                                  => array(
-                'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\database\TableManager'                                                           => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Data_Migration_Class_Base'                                                                                => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_1_0'                                                                                           => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_2_0'                                                                                           => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_3_0'                                                                                           => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_4_0'                                                                                           => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_5_0'                                                                                           => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_6_0'                                                                                           => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_7_0'                                                                                           => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_8_0'                                                                                           => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_9_0' => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_DMS_Core_4_10_0' => array(
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-                'EE_DMS_Core_4_9_0'                                  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\assets\I18nRegistry'                                                             => array(
-                array(),
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\assets\Registry'                                                                 => array(
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\I18nRegistry'    => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\shortcodes\EspressoCancelled'                                             => array(
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\shortcodes\EspressoCheckout'                                              => array(
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\shortcodes\EspressoEventAttendees'                                        => array(
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\shortcodes\EspressoEvents'                                                => array(
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\shortcodes\EspressoThankYou'                                              => array(
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\shortcodes\EspressoTicketSelector'                                        => array(
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\shortcodes\EspressoTxnPage'                                               => array(
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\cache\BasicCacheManager'                                                         => array(
-                'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\cache\PostRelatedCacheManager'                                                   => array(
-                'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\validation\email\EmailValidationService'                                  => array(
-                'EE_Registration_Config'                     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\values\EmailAddress'                                                               => array(
-                null,
-                'EventEspresso\core\domain\services\validation\email\EmailValidationService' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\orm\ModelFieldFactory'                                                           => array(
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ),
-            'LEGACY_MODELS'                                                                                               => array(
-                null,
-                'EventEspresso\core\services\database\ModelFieldFactory' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Module_Request_Router'                                                                                    => array(
-                'EE_Request' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Registration_Processor'                                                                                   => array(
-                'EE_Request' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'                                      => array(
-                null,
-                'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                         => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\licensing\LicenseService'                                                        => array(
-                'EventEspresso\core\domain\services\pue\Stats'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\pue\Config' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_Admin_Transactions_List_Table'                                                                            => array(
-                null,
-                'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\pue\Stats'                                                                => array(
-                'EventEspresso\core\domain\services\pue\Config'        => EE_Dependency_Map::load_from_cache,
-                'EE_Maintenance_Mode'                                  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\pue\StatsGatherer' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\pue\Config'                                                               => array(
-                'EE_Network_Config' => EE_Dependency_Map::load_from_cache,
-                'EE_Config'         => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\pue\StatsGatherer'                                                        => array(
-                'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache,
-                'EEM_Event'          => EE_Dependency_Map::load_from_cache,
-                'EEM_Datetime'       => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'         => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration'   => EE_Dependency_Map::load_from_cache,
-                'EEM_Transaction'    => EE_Dependency_Map::load_from_cache,
-                'EE_Config'          => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\ExitModal'                                                          => array(
-                'EventEspresso\core\services\assets\Registry' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\PluginUpsells'                                                      => array(
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\caffeinated\modules\recaptcha_invisible\InvisibleRecaptcha'                                    => array(
-                'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
-                'EE_Session'             => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\caffeinated\modules\recaptcha_invisible\RecaptchaAdminSettings'                                => array(
-                'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\modules\ticket_selector\ProcessTicketSelector'                                                 => array(
-                'EE_Core_Config'                                                          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                             => EE_Dependency_Map::load_from_cache,
-                'EE_Session'                                                              => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'                                                              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker'                                     => array(
-                'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'                              => array(
-                'EE_Core_Config'                             => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'                                => array(
-                'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'                               => array(
-                'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_CPT_Strategy'                                                                                             => array(
-                'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\loaders\ObjectIdentifier'                                                        => array(
-                'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\assets\CoreAssetManager'                                                  => array(
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
-                'EE_Currency_Config'                                 => EE_Dependency_Map::load_from_cache,
-                'EE_Template_Config'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\privacy\policy\PrivacyPolicy' => array(
-                'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportAttendee' => array(
-                'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportAttendeeBillingData' => array(
-                'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
-                'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportCheckins' => array(
-                'EEM_Checkin' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportRegistration' => array(
-                'EEM_Registration' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\privacy\export\ExportTransaction' => array(
-                'EEM_Transaction' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\privacy\erasure\EraseAttendeeData' => array(
-                'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\privacy\erasure\EraseAnswers' => array(
-                'EEM_Answer' => EE_Dependency_Map::load_from_cache,
-                'EEM_Question' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\CPTs\CptQueryModifier' => array(
-                null,
-                null,
-                null,
-                'EE_Request_Handler'                          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler' => array(
-                'EE_Registry' => EE_Dependency_Map::load_from_cache,
-                'EE_Config' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\core\services\editor\BlockRegistrationManager'                                                 => array(
-                'EventEspresso\core\services\assets\BlockAssetManagerCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\editor\BlockCollection'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\route_match\RouteMatchSpecificationManager' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                    => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager' => array(
-                'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer' => array(
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-                'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\entities\editor\blocks\EventAttendees' => array(
-                'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager' => self::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer' => self::load_from_cache,
-            ),
-            'EventEspresso\core\services\route_match\RouteMatchSpecificationDependencyResolver' => array(
-                'EventEspresso\core\services\container\Mirror' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
-                'EE_Dependency_Map' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\route_match\RouteMatchSpecificationFactory' => array(
-                'EventEspresso\core\services\route_match\RouteMatchSpecificationDependencyResolver' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\route_match\RouteMatchSpecificationManager' => array(
-                'EventEspresso\core\services\route_match\RouteMatchSpecificationCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\route_match\RouteMatchSpecificationFactory' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\libraries\rest_api\CalculatedModelFields' => array(
-                'EventEspresso\core\libraries\rest_api\calculations\CalculatedModelFieldsFactory' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\core\libraries\rest_api\calculations\CalculatedModelFieldsFactory' => array(
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\libraries\rest_api\controllers\model\Read' => array(
-                'EventEspresso\core\libraries\rest_api\CalculatedModelFields' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\core\libraries\rest_api\calculations\Datetime' => array(
-                'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\core\libraries\rest_api\calculations\Event' => array(
-                'EEM_Event' => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\core\libraries\rest_api\calculations\Registration' => array(
-                'EEM_Registration' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\core\services\session\SessionStartHandler' => array(
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EE_URL_Validation_Strategy' => array(
-                null,
-                null,
-                'EventEspresso\core\services\validators\URLValidator' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\admin_pages\general_settings\OrganizationSettings' => array(
-                'EE_Registry'                                             => EE_Dependency_Map::load_from_cache,
-                'EE_Organization_Config'                                  => EE_Dependency_Map::load_from_cache,
-                'EE_Core_Config'                                          => EE_Dependency_Map::load_from_cache,
-                'EE_Network_Core_Config'                                  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\address\CountrySubRegionDao' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\address\CountrySubRegionDao' => array(
-                'EEM_State'                                            => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\validators\JsonValidator' => EE_Dependency_Map::load_from_cache
-            ),
-            'EventEspresso\core\domain\services\admin\ajax\WordpressHeartbeat' => array(
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat' => array(
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-                'EE_Environment_Config'            => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspresso\core\services\request\files\FilesDataHandler' => array(
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ),
-            'EventEspressoBatchRequest\BatchRequestProcessor'                              => [
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\admin\registrations\list_table\QueryBuilder' => [
-                null,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\AttendeeFilterHeader' => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Attendee'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\DateFilterHeader' => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Datetime'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\EventFilterHeader' => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Event'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\TicketFilterHeader' => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\graphql\GraphQLManager' => [
-                'EventEspresso\core\services\graphql\TypesManager'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\ConnectionsManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\graphql\TypesManager' => [
-                'EventEspresso\core\services\graphql\TypeCollection'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\graphql\ConnectionsManager' => [
-                'EventEspresso\core\services\graphql\ConnectionCollection'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\types\Datetime' => [
-                'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\types\Event' => [
-                'EEM_Event' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\types\Ticket' => [
-                'EEM_Ticket' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\types\Venue' => [
-                'EEM_Venue' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\types\State' => [
-                'EEM_State' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\types\Country' => [
-                'EEM_Country' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection' => [
-                'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection' => [
-                'EEM_Ticket' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection' => [
-                'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection' => [
-                'EEM_Venue' => EE_Dependency_Map::load_from_cache,
-            ],
-        );
-    }
-
-
-    /**
-     * Registers how core classes are loaded.
-     * This can either be done by simply providing the name of one of the EE_Registry loader methods such as:
-     *        'EE_Request_Handler' => 'load_core'
-     *        'EE_Messages_Queue'  => 'load_lib'
-     *        'EEH_Debug_Tools'    => 'load_helper'
-     * or, if greater control is required, by providing a custom closure. For example:
-     *        'Some_Class' => function () {
-     *            return new Some_Class();
-     *        },
-     * This is required for instantiating dependencies
-     * where an interface has been type hinted in a class constructor. For example:
-     *        'Required_Interface' => function () {
-     *            return new A_Class_That_Implements_Required_Interface();
-     *        },
-     */
-    protected function _register_core_class_loaders()
-    {
-        $this->_class_loaders = array(
-            // load_core
-            'EE_Dependency_Map'                            => function () {
-                return $this;
-            },
-            'EE_Capabilities'                              => 'load_core',
-            'EE_Encryption'                                => 'load_core',
-            'EE_Front_Controller'                          => 'load_core',
-            'EE_Module_Request_Router'                     => 'load_core',
-            'EE_Registry'                                  => 'load_core',
-            'EE_Request'                                   => function () {
-                return $this->legacy_request;
-            },
-            'EventEspresso\core\services\request\Request'  => function () {
-                return $this->request;
-            },
-            'EventEspresso\core\services\request\Response' => function () {
-                return $this->response;
-            },
-            'EE_Base'                                      => 'load_core',
-            'EE_Request_Handler'                           => 'load_core',
-            'EE_Session'                                   => 'load_core',
-            'EE_Cron_Tasks'                                => 'load_core',
-            'EE_System'                                    => 'load_core',
-            'EE_Maintenance_Mode'                          => 'load_core',
-            'EE_Register_CPTs'                             => 'load_core',
-            'EE_Admin'                                     => 'load_core',
-            'EE_CPT_Strategy'                              => 'load_core',
-            // load_class
-            'EE_Registration_Processor'                    => 'load_class',
-            // load_lib
-            'EE_Message_Resource_Manager'                  => 'load_lib',
-            'EE_Message_Type_Collection'                   => 'load_lib',
-            'EE_Message_Type_Collection_Loader'            => 'load_lib',
-            'EE_Messenger_Collection'                      => 'load_lib',
-            'EE_Messenger_Collection_Loader'               => 'load_lib',
-            'EE_Messages_Processor'                        => 'load_lib',
-            'EE_Message_Repository'                        => 'load_lib',
-            'EE_Messages_Queue'                            => 'load_lib',
-            'EE_Messages_Data_Handler_Collection'          => 'load_lib',
-            'EE_Message_Template_Group_Collection'         => 'load_lib',
-            'EE_Payment_Method_Manager'                    => 'load_lib',
-            'EE_DMS_Core_4_1_0'                            => 'load_dms',
-            'EE_DMS_Core_4_2_0'                            => 'load_dms',
-            'EE_DMS_Core_4_3_0'                            => 'load_dms',
-            'EE_DMS_Core_4_5_0'                            => 'load_dms',
-            'EE_DMS_Core_4_6_0'                            => 'load_dms',
-            'EE_DMS_Core_4_7_0'                            => 'load_dms',
-            'EE_DMS_Core_4_8_0'                            => 'load_dms',
-            'EE_DMS_Core_4_9_0'                            => 'load_dms',
-            'EE_DMS_Core_4_10_0'                            => 'load_dms',
-            'EE_Messages_Generator'                        => function () {
-                return EE_Registry::instance()->load_lib(
-                    'Messages_Generator',
-                    array(),
-                    false,
-                    false
-                );
-            },
-            'EE_Messages_Template_Defaults'                => function ($arguments = array()) {
-                return EE_Registry::instance()->load_lib(
-                    'Messages_Template_Defaults',
-                    $arguments,
-                    false,
-                    false
-                );
-            },
-            // load_helper
-            'EEH_Parse_Shortcodes'                         => function () {
-                if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
-                    return new EEH_Parse_Shortcodes();
-                }
-                return null;
-            },
-            'EE_Template_Config'                           => function () {
-                return EE_Config::instance()->template_settings;
-            },
-            'EE_Currency_Config'                           => function () {
-                return EE_Config::instance()->currency;
-            },
-            'EE_Registration_Config'                       => function () {
-                return EE_Config::instance()->registration;
-            },
-            'EE_Core_Config'                               => function () {
-                return EE_Config::instance()->core;
-            },
-            'EventEspresso\core\services\loaders\Loader'   => function () {
-                return LoaderFactory::getLoader();
-            },
-            'EE_Network_Config'                            => function () {
-                return EE_Network_Config::instance();
-            },
-            'EE_Config'                                    => function () {
-                return EE_Config::instance();
-            },
-            'EventEspresso\core\domain\Domain'             => function () {
-                return DomainFactory::getEventEspressoCoreDomain();
-            },
-            'EE_Admin_Config'                              => function () {
-                return EE_Config::instance()->admin;
-            },
-            'EE_Organization_Config'                       => function () {
-                return EE_Config::instance()->organization;
-            },
-            'EE_Network_Core_Config'                       => function () {
-                return EE_Network_Config::instance()->core;
-            },
-            'EE_Environment_Config'                        => function () {
-                return EE_Config::instance()->environment;
-            },
-        );
-    }
-
-
-    /**
-     * can be used for supplying alternate names for classes,
-     * or for connecting interface names to instantiable classes
-     */
-    protected function _register_core_aliases()
-    {
-        $aliases = array(
-            'CommandBusInterface'                                                          => 'EventEspresso\core\services\commands\CommandBusInterface',
-            'EventEspresso\core\services\commands\CommandBusInterface'                     => 'EventEspresso\core\services\commands\CommandBus',
-            'CommandHandlerManagerInterface'                                               => 'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
-            'EventEspresso\core\services\commands\CommandHandlerManagerInterface'          => 'EventEspresso\core\services\commands\CommandHandlerManager',
-            'CapChecker'                                                                   => 'EventEspresso\core\services\commands\middleware\CapChecker',
-            'AddActionHook'                                                                => 'EventEspresso\core\services\commands\middleware\AddActionHook',
-            'CapabilitiesChecker'                                                          => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
-            'CapabilitiesCheckerInterface'                                                 => 'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface',
-            'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface' => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
-            'CreateRegistrationService'                                                    => 'EventEspresso\core\domain\services\registration\CreateRegistrationService',
-            'CreateRegistrationCommandHandler'                                             => 'EventEspresso\core\services\commands\registration\CreateRegistrationCommand',
-            'CopyRegistrationDetailsCommandHandler'                                        => 'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommand',
-            'CopyRegistrationPaymentsCommandHandler'                                       => 'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommand',
-            'CancelRegistrationAndTicketLineItemCommandHandler'                            => 'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler',
-            'UpdateRegistrationAndTransactionAfterChangeCommandHandler'                    => 'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler',
-            'CreateTicketLineItemCommandHandler'                                           => 'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommand',
-            'CreateTransactionCommandHandler'                                              => 'EventEspresso\core\services\commands\transaction\CreateTransactionCommandHandler',
-            'CreateAttendeeCommandHandler'                                                 => 'EventEspresso\core\services\commands\attendee\CreateAttendeeCommandHandler',
-            'TableManager'                                                                 => 'EventEspresso\core\services\database\TableManager',
-            'TableAnalysis'                                                                => 'EventEspresso\core\services\database\TableAnalysis',
-            'EspressoShortcode'                                                            => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
-            'ShortcodeInterface'                                                           => 'EventEspresso\core\services\shortcodes\ShortcodeInterface',
-            'EventEspresso\core\services\shortcodes\ShortcodeInterface'                    => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
-            'EventEspresso\core\services\cache\CacheStorageInterface'                      => 'EventEspresso\core\services\cache\TransientCacheStorage',
-            'LoaderInterface'                                                              => 'EventEspresso\core\services\loaders\LoaderInterface',
-            'EventEspresso\core\services\loaders\LoaderInterface'                          => 'EventEspresso\core\services\loaders\Loader',
-            'CommandFactoryInterface'                                                      => 'EventEspresso\core\services\commands\CommandFactoryInterface',
-            'EventEspresso\core\services\commands\CommandFactoryInterface'                 => 'EventEspresso\core\services\commands\CommandFactory',
-            'EmailValidatorInterface'                                                      => 'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface',
-            'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface'  => 'EventEspresso\core\domain\services\validation\email\EmailValidationService',
-            'NoticeConverterInterface'                                                     => 'EventEspresso\core\services\notices\NoticeConverterInterface',
-            'EventEspresso\core\services\notices\NoticeConverterInterface'                 => 'EventEspresso\core\services\notices\ConvertNoticesToEeErrors',
-            'NoticesContainerInterface'                                                    => 'EventEspresso\core\services\notices\NoticesContainerInterface',
-            'EventEspresso\core\services\notices\NoticesContainerInterface'                => 'EventEspresso\core\services\notices\NoticesContainer',
-            'EventEspresso\core\services\request\RequestInterface'                         => 'EventEspresso\core\services\request\Request',
-            'EventEspresso\core\services\request\ResponseInterface'                        => 'EventEspresso\core\services\request\Response',
-            'EventEspresso\core\domain\DomainInterface'                                    => 'EventEspresso\core\domain\Domain',
-            'Registration_Processor'                                                       => 'EE_Registration_Processor',
-        );
-        foreach ($aliases as $alias => $fqn) {
-            if (is_array($fqn)) {
-                foreach ($fqn as $class => $for_class) {
-                    $this->class_cache->addAlias($class, $alias, $for_class);
-                }
-                continue;
-            }
-            $this->class_cache->addAlias($fqn, $alias);
-        }
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
-            $this->class_cache->addAlias(
-                'EventEspresso\core\services\notices\ConvertNoticesToAdminNotices',
-                'EventEspresso\core\services\notices\NoticeConverterInterface'
-            );
-        }
-    }
-
-
-    /**
-     * This is used to reset the internal map and class_loaders to their original default state at the beginning of the
-     * request Primarily used by unit tests.
-     */
-    public function reset()
-    {
-        $this->_register_core_class_loaders();
-        $this->_register_core_dependencies();
-    }
-
-
-    /**
-     * PLZ NOTE: a better name for this method would be is_alias()
-     * because it returns TRUE if the provided fully qualified name IS an alias
-     * WHY?
-     * Because if a class is type hinting for a concretion,
-     * then why would we need to find another class to supply it?
-     * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
-     * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
-     * Don't go looking for some substitute.
-     * Whereas if a class is type hinting for an interface...
-     * then we need to find an actual class to use.
-     * So the interface IS the alias for some other FQN,
-     * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
-     * represents some other class.
-     *
-     * @deprecated 4.9.62.p
-     * @param string $fqn
-     * @param string $for_class
-     * @return bool
-     */
-    public function has_alias($fqn = '', $for_class = '')
-    {
-        return $this->isAlias($fqn, $for_class);
-    }
-
-
-    /**
-     * PLZ NOTE: a better name for this method would be get_fqn_for_alias()
-     * because it returns a FQN for provided alias if one exists, otherwise returns the original $alias
-     * functions recursively, so that multiple aliases can be used to drill down to a FQN
-     *  for example:
-     *      if the following two entries were added to the _aliases array:
-     *          array(
-     *              'interface_alias'           => 'some\namespace\interface'
-     *              'some\namespace\interface'  => 'some\namespace\classname'
-     *          )
-     *      then one could use EE_Registry::instance()->create( 'interface_alias' )
-     *      to load an instance of 'some\namespace\classname'
-     *
-     * @deprecated 4.9.62.p
-     * @param string $alias
-     * @param string $for_class
-     * @return string
-     */
-    public function get_alias($alias = '', $for_class = '')
-    {
-        return $this->getFqnForAlias($alias, $for_class);
-    }
+	/**
+	 * This means that the requested class dependency is not present in the dependency map
+	 */
+	const not_registered = 0;
+
+	/**
+	 * This instructs class loaders to ALWAYS return a newly instantiated object for the requested class.
+	 */
+	const load_new_object = 1;
+
+	/**
+	 * This instructs class loaders to return a previously instantiated and cached object for the requested class.
+	 * IF a previously instantiated object does not exist, a new one will be created and added to the cache.
+	 */
+	const load_from_cache = 2;
+
+	/**
+	 * When registering a dependency,
+	 * this indicates to keep any existing dependencies that already exist,
+	 * and simply discard any new dependencies declared in the incoming data
+	 */
+	const KEEP_EXISTING_DEPENDENCIES = 0;
+
+	/**
+	 * When registering a dependency,
+	 * this indicates to overwrite any existing dependencies that already exist using the incoming data
+	 */
+	const OVERWRITE_DEPENDENCIES = 1;
+
+
+	/**
+	 * @type EE_Dependency_Map $_instance
+	 */
+	protected static $_instance;
+
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
+
+	/**
+	 * @type RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @type LegacyRequestInterface $legacy_request
+	 */
+	protected $legacy_request;
+
+	/**
+	 * @type ResponseInterface $response
+	 */
+	protected $response;
+
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	protected $loader;
+
+	/**
+	 * @type array $_dependency_map
+	 */
+	protected $_dependency_map = array();
+
+	/**
+	 * @type array $_class_loaders
+	 */
+	protected $_class_loaders = array();
+
+
+	/**
+	 * EE_Dependency_Map constructor.
+	 *
+	 * @param ClassInterfaceCache $class_cache
+	 */
+	protected function __construct(ClassInterfaceCache $class_cache)
+	{
+		$this->class_cache = $class_cache;
+		do_action('EE_Dependency_Map____construct', $this);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function initialize()
+	{
+		$this->_register_core_dependencies();
+		$this->_register_core_class_loaders();
+		$this->_register_core_aliases();
+	}
+
+
+	/**
+	 * @singleton method used to instantiate class object
+	 * @param ClassInterfaceCache|null $class_cache
+	 * @return EE_Dependency_Map
+	 */
+	public static function instance(ClassInterfaceCache $class_cache = null)
+	{
+		// check if class object is instantiated, and instantiated properly
+		if (! self::$_instance instanceof EE_Dependency_Map
+			&& $class_cache instanceof ClassInterfaceCache
+		) {
+			self::$_instance = new EE_Dependency_Map($class_cache);
+		}
+		return self::$_instance;
+	}
+
+
+	/**
+	 * @param RequestInterface $request
+	 */
+	public function setRequest(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
+
+
+	/**
+	 * @param LegacyRequestInterface $legacy_request
+	 */
+	public function setLegacyRequest(LegacyRequestInterface $legacy_request)
+	{
+		$this->legacy_request = $legacy_request;
+	}
+
+
+	/**
+	 * @param ResponseInterface $response
+	 */
+	public function setResponse(ResponseInterface $response)
+	{
+		$this->response = $response;
+	}
+
+
+	/**
+	 * @param LoaderInterface $loader
+	 */
+	public function setLoader(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
+
+
+	/**
+	 * @param string $class
+	 * @param array  $dependencies
+	 * @param int    $overwrite
+	 * @return bool
+	 */
+	public static function register_dependencies(
+		$class,
+		array $dependencies,
+		$overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
+	) {
+		return self::$_instance->registerDependencies($class, $dependencies, $overwrite);
+	}
+
+
+	/**
+	 * Assigns an array of class names and corresponding load sources (new or cached)
+	 * to the class specified by the first parameter.
+	 * IMPORTANT !!!
+	 * The order of elements in the incoming $dependencies array MUST match
+	 * the order of the constructor parameters for the class in question.
+	 * This is especially important when overriding any existing dependencies that are registered.
+	 * the third parameter controls whether any duplicate dependencies are overwritten or not.
+	 *
+	 * @param string $class
+	 * @param array  $dependencies
+	 * @param int    $overwrite
+	 * @return bool
+	 */
+	public function registerDependencies(
+		$class,
+		array $dependencies,
+		$overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
+	) {
+		$class = trim($class, '\\');
+		$registered = false;
+		if (empty(self::$_instance->_dependency_map[ $class ])) {
+			self::$_instance->_dependency_map[ $class ] = array();
+		}
+		// we need to make sure that any aliases used when registering a dependency
+		// get resolved to the correct class name
+		foreach ($dependencies as $dependency => $load_source) {
+			$alias = self::$_instance->getFqnForAlias($dependency);
+			if ($overwrite === EE_Dependency_Map::OVERWRITE_DEPENDENCIES
+				|| ! isset(self::$_instance->_dependency_map[ $class ][ $alias ])
+			) {
+				unset($dependencies[ $dependency ]);
+				$dependencies[ $alias ] = $load_source;
+				$registered = true;
+			}
+		}
+		// now add our two lists of dependencies together.
+		// using Union (+=) favours the arrays in precedence from left to right,
+		// so $dependencies is NOT overwritten because it is listed first
+		// ie: with A = B + C, entries in B take precedence over duplicate entries in C
+		// Union is way faster than array_merge() but should be used with caution...
+		// especially with numerically indexed arrays
+		$dependencies += self::$_instance->_dependency_map[ $class ];
+		// now we need to ensure that the resulting dependencies
+		// array only has the entries that are required for the class
+		// so first count how many dependencies were originally registered for the class
+		$dependency_count = count(self::$_instance->_dependency_map[ $class ]);
+		// if that count is non-zero (meaning dependencies were already registered)
+		self::$_instance->_dependency_map[ $class ] = $dependency_count
+			// then truncate the  final array to match that count
+			? array_slice($dependencies, 0, $dependency_count)
+			// otherwise just take the incoming array because nothing previously existed
+			: $dependencies;
+		return $registered;
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @param string $loader
+	 * @return bool
+	 * @throws DomainException
+	 */
+	public static function register_class_loader($class_name, $loader = 'load_core')
+	{
+		if (! $loader instanceof Closure && strpos($class_name, '\\') !== false) {
+			throw new DomainException(
+				esc_html__('Don\'t use class loaders for FQCNs.', 'event_espresso')
+			);
+		}
+		// check that loader is callable or method starts with "load_" and exists in EE_Registry
+		if (! is_callable($loader)
+			&& (
+				strpos($loader, 'load_') !== 0
+				|| ! method_exists('EE_Registry', $loader)
+			)
+		) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'"%1$s" is not a valid loader method on EE_Registry.',
+						'event_espresso'
+					),
+					$loader
+				)
+			);
+		}
+		$class_name = self::$_instance->getFqnForAlias($class_name);
+		if (! isset(self::$_instance->_class_loaders[ $class_name ])) {
+			self::$_instance->_class_loaders[ $class_name ] = $loader;
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function dependency_map()
+	{
+		return $this->_dependency_map;
+	}
+
+
+	/**
+	 * returns TRUE if dependency map contains a listing for the provided class name
+	 *
+	 * @param string $class_name
+	 * @return boolean
+	 */
+	public function has($class_name = '')
+	{
+		// all legacy models have the same dependencies
+		if (strpos($class_name, 'EEM_') === 0) {
+			$class_name = 'LEGACY_MODELS';
+		}
+		return isset($this->_dependency_map[ $class_name ]) ? true : false;
+	}
+
+
+	/**
+	 * returns TRUE if dependency map contains a listing for the provided class name AND dependency
+	 *
+	 * @param string $class_name
+	 * @param string $dependency
+	 * @return bool
+	 */
+	public function has_dependency_for_class($class_name = '', $dependency = '')
+	{
+		// all legacy models have the same dependencies
+		if (strpos($class_name, 'EEM_') === 0) {
+			$class_name = 'LEGACY_MODELS';
+		}
+		$dependency = $this->getFqnForAlias($dependency, $class_name);
+		return isset($this->_dependency_map[ $class_name ][ $dependency ])
+			? true
+			: false;
+	}
+
+
+	/**
+	 * returns loading strategy for whether a previously cached dependency should be loaded or a new instance returned
+	 *
+	 * @param string $class_name
+	 * @param string $dependency
+	 * @return int
+	 */
+	public function loading_strategy_for_class_dependency($class_name = '', $dependency = '')
+	{
+		// all legacy models have the same dependencies
+		if (strpos($class_name, 'EEM_') === 0) {
+			$class_name = 'LEGACY_MODELS';
+		}
+		$dependency = $this->getFqnForAlias($dependency);
+		return $this->has_dependency_for_class($class_name, $dependency)
+			? $this->_dependency_map[ $class_name ][ $dependency ]
+			: EE_Dependency_Map::not_registered;
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return string | Closure
+	 */
+	public function class_loader($class_name)
+	{
+		// all legacy models use load_model()
+		if (strpos($class_name, 'EEM_') === 0) {
+			return 'load_model';
+		}
+		// EE_CPT_*_Strategy classes like EE_CPT_Event_Strategy, EE_CPT_Venue_Strategy, etc
+		// perform strpos() first to avoid loading regex every time we load a class
+		if (strpos($class_name, 'EE_CPT_') === 0
+			&& preg_match('/^EE_CPT_([a-zA-Z]+)_Strategy$/', $class_name)
+		) {
+			return 'load_core';
+		}
+		$class_name = $this->getFqnForAlias($class_name);
+		return isset($this->_class_loaders[ $class_name ]) ? $this->_class_loaders[ $class_name ] : '';
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function class_loaders()
+	{
+		return $this->_class_loaders;
+	}
+
+
+	/**
+	 * adds an alias for a classname
+	 *
+	 * @param string $fqcn      the class name that should be used (concrete class to replace interface)
+	 * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
+	 * @param string $for_class the class that has the dependency (is type hinting for the interface)
+	 */
+	public function add_alias($fqcn, $alias, $for_class = '')
+	{
+		$this->class_cache->addAlias($fqcn, $alias, $for_class);
+	}
+
+
+	/**
+	 * Returns TRUE if the provided fully qualified name IS an alias
+	 * WHY?
+	 * Because if a class is type hinting for a concretion,
+	 * then why would we need to find another class to supply it?
+	 * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
+	 * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
+	 * Don't go looking for some substitute.
+	 * Whereas if a class is type hinting for an interface...
+	 * then we need to find an actual class to use.
+	 * So the interface IS the alias for some other FQN,
+	 * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
+	 * represents some other class.
+	 *
+	 * @param string $fqn
+	 * @param string $for_class
+	 * @return bool
+	 */
+	public function isAlias($fqn = '', $for_class = '')
+	{
+		return $this->class_cache->isAlias($fqn, $for_class);
+	}
+
+
+	/**
+	 * Returns a FQN for provided alias if one exists, otherwise returns the original $alias
+	 * functions recursively, so that multiple aliases can be used to drill down to a FQN
+	 *  for example:
+	 *      if the following two entries were added to the _aliases array:
+	 *          array(
+	 *              'interface_alias'           => 'some\namespace\interface'
+	 *              'some\namespace\interface'  => 'some\namespace\classname'
+	 *          )
+	 *      then one could use EE_Registry::instance()->create( 'interface_alias' )
+	 *      to load an instance of 'some\namespace\classname'
+	 *
+	 * @param string $alias
+	 * @param string $for_class
+	 * @return string
+	 */
+	public function getFqnForAlias($alias = '', $for_class = '')
+	{
+		return (string) $this->class_cache->getFqnForAlias($alias, $for_class);
+	}
+
+
+	/**
+	 * Registers the core dependencies and whether a previously instantiated object should be loaded from the cache,
+	 * if one exists, or whether a new object should be generated every time the requested class is loaded.
+	 * This is done by using the following class constants:
+	 *        EE_Dependency_Map::load_from_cache - loads previously instantiated object
+	 *        EE_Dependency_Map::load_new_object - generates a new object every time
+	 */
+	protected function _register_core_dependencies()
+	{
+		$this->_dependency_map = array(
+			'EE_Request_Handler'                                                                                          => array(
+				'EE_Request' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_System'                                                                                                   => array(
+				'EE_Registry'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EE_Maintenance_Mode'                         => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Session'                                                                                                  => array(
+				'EventEspresso\core\services\cache\TransientCacheStorage'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\session\SessionStartHandler'  => EE_Dependency_Map::load_from_cache,
+				'EE_Encryption'                                            => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Cart'                                                                                                     => array(
+				'EE_Session' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Front_Controller'                                                                                         => array(
+				'EE_Registry'              => EE_Dependency_Map::load_from_cache,
+				'EE_Request_Handler'       => EE_Dependency_Map::load_from_cache,
+				'EE_Module_Request_Router' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Messenger_Collection_Loader'                                                                              => array(
+				'EE_Messenger_Collection' => EE_Dependency_Map::load_new_object,
+			),
+			'EE_Message_Type_Collection_Loader'                                                                           => array(
+				'EE_Message_Type_Collection' => EE_Dependency_Map::load_new_object,
+			),
+			'EE_Message_Resource_Manager'                                                                                 => array(
+				'EE_Messenger_Collection_Loader'    => EE_Dependency_Map::load_new_object,
+				'EE_Message_Type_Collection_Loader' => EE_Dependency_Map::load_new_object,
+				'EEM_Message_Template_Group'        => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Message_Factory'                                                                                          => array(
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_messages'                                                                                                 => array(
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Messages_Generator'                                                                                       => array(
+				'EE_Messages_Queue'                    => EE_Dependency_Map::load_new_object,
+				'EE_Messages_Data_Handler_Collection'  => EE_Dependency_Map::load_new_object,
+				'EE_Message_Template_Group_Collection' => EE_Dependency_Map::load_new_object,
+				'EEH_Parse_Shortcodes'                 => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Messages_Processor'                                                                                       => array(
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Messages_Queue'                                                                                           => array(
+				'EE_Message_Repository' => EE_Dependency_Map::load_new_object,
+			),
+			'EE_Messages_Template_Defaults'                                                                               => array(
+				'EEM_Message_Template_Group' => EE_Dependency_Map::load_from_cache,
+				'EEM_Message_Template'       => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Message_To_Generate_From_Request'                                                                         => array(
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+				'EE_Request_Handler'          => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\CommandBus'                                                             => array(
+				'EventEspresso\core\services\commands\CommandHandlerManager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\services\commands\CommandHandler'                                                              => array(
+				'EE_Registry'         => EE_Dependency_Map::load_from_cache,
+				'CommandBusInterface' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\CommandHandlerManager'                                                  => array(
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\CompositeCommandHandler'                                                => array(
+				'EventEspresso\core\services\commands\CommandBus'     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\commands\CommandFactory' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\CommandFactory'                                                         => array(
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\middleware\CapChecker'                                                  => array(
+				'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker'                                         => array(
+				'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\capabilities\RegistrationsCapChecker'                                     => array(
+				'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\registration\CreateRegistrationCommandHandler'                          => array(
+				'EventEspresso\core\domain\services\registration\CreateRegistrationService' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommandHandler'                     => array(
+				'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommandHandler'                    => array(
+				'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler'         => array(
+				'EventEspresso\core\domain\services\registration\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler' => array(
+				'EventEspresso\core\domain\services\registration\UpdateRegistrationService' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommandHandler'                              => array(
+				'EventEspresso\core\domain\services\ticket\CreateTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\ticket\CancelTicketLineItemCommandHandler'                              => array(
+				'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\registration\CancelRegistrationService'                                   => array(
+				'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\commands\attendee\CreateAttendeeCommandHandler'                                  => array(
+				'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\database\TableManager'                                                           => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Data_Migration_Class_Base'                                                                                => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_1_0'                                                                                           => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_2_0'                                                                                           => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_3_0'                                                                                           => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_4_0'                                                                                           => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_5_0'                                                                                           => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_6_0'                                                                                           => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_7_0'                                                                                           => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_8_0'                                                                                           => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_9_0' => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_DMS_Core_4_10_0' => array(
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+				'EE_DMS_Core_4_9_0'                                  => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\assets\I18nRegistry'                                                             => array(
+				array(),
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\assets\Registry'                                                                 => array(
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\I18nRegistry'    => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\shortcodes\EspressoCancelled'                                             => array(
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\shortcodes\EspressoCheckout'                                              => array(
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\shortcodes\EspressoEventAttendees'                                        => array(
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\shortcodes\EspressoEvents'                                                => array(
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\shortcodes\EspressoThankYou'                                              => array(
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\shortcodes\EspressoTicketSelector'                                        => array(
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\shortcodes\EspressoTxnPage'                                               => array(
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\cache\BasicCacheManager'                                                         => array(
+				'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\cache\PostRelatedCacheManager'                                                   => array(
+				'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\validation\email\EmailValidationService'                                  => array(
+				'EE_Registration_Config'                     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\values\EmailAddress'                                                               => array(
+				null,
+				'EventEspresso\core\domain\services\validation\email\EmailValidationService' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\orm\ModelFieldFactory'                                                           => array(
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			),
+			'LEGACY_MODELS'                                                                                               => array(
+				null,
+				'EventEspresso\core\services\database\ModelFieldFactory' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Module_Request_Router'                                                                                    => array(
+				'EE_Request' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Registration_Processor'                                                                                   => array(
+				'EE_Request' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'                                      => array(
+				null,
+				'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                         => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\licensing\LicenseService'                                                        => array(
+				'EventEspresso\core\domain\services\pue\Stats'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\pue\Config' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_Admin_Transactions_List_Table'                                                                            => array(
+				null,
+				'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\pue\Stats'                                                                => array(
+				'EventEspresso\core\domain\services\pue\Config'        => EE_Dependency_Map::load_from_cache,
+				'EE_Maintenance_Mode'                                  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\pue\StatsGatherer' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\pue\Config'                                                               => array(
+				'EE_Network_Config' => EE_Dependency_Map::load_from_cache,
+				'EE_Config'         => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\pue\StatsGatherer'                                                        => array(
+				'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache,
+				'EEM_Event'          => EE_Dependency_Map::load_from_cache,
+				'EEM_Datetime'       => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'         => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration'   => EE_Dependency_Map::load_from_cache,
+				'EEM_Transaction'    => EE_Dependency_Map::load_from_cache,
+				'EE_Config'          => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\ExitModal'                                                          => array(
+				'EventEspresso\core\services\assets\Registry' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\PluginUpsells'                                                      => array(
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\caffeinated\modules\recaptcha_invisible\InvisibleRecaptcha'                                    => array(
+				'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
+				'EE_Session'             => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\caffeinated\modules\recaptcha_invisible\RecaptchaAdminSettings'                                => array(
+				'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\modules\ticket_selector\ProcessTicketSelector'                                                 => array(
+				'EE_Core_Config'                                                          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                             => EE_Dependency_Map::load_from_cache,
+				'EE_Session'                                                              => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'                                                              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker'                                     => array(
+				'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'                              => array(
+				'EE_Core_Config'                             => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'                                => array(
+				'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'                               => array(
+				'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_CPT_Strategy'                                                                                             => array(
+				'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\loaders\ObjectIdentifier'                                                        => array(
+				'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\assets\CoreAssetManager'                                                  => array(
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
+				'EE_Currency_Config'                                 => EE_Dependency_Map::load_from_cache,
+				'EE_Template_Config'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\privacy\policy\PrivacyPolicy' => array(
+				'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportAttendee' => array(
+				'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportAttendeeBillingData' => array(
+				'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
+				'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportCheckins' => array(
+				'EEM_Checkin' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportRegistration' => array(
+				'EEM_Registration' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\privacy\export\ExportTransaction' => array(
+				'EEM_Transaction' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\privacy\erasure\EraseAttendeeData' => array(
+				'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\privacy\erasure\EraseAnswers' => array(
+				'EEM_Answer' => EE_Dependency_Map::load_from_cache,
+				'EEM_Question' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\CPTs\CptQueryModifier' => array(
+				null,
+				null,
+				null,
+				'EE_Request_Handler'                          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler' => array(
+				'EE_Registry' => EE_Dependency_Map::load_from_cache,
+				'EE_Config' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\core\services\editor\BlockRegistrationManager'                                                 => array(
+				'EventEspresso\core\services\assets\BlockAssetManagerCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\editor\BlockCollection'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\route_match\RouteMatchSpecificationManager' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                    => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager' => array(
+				'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer' => array(
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+				'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\entities\editor\blocks\EventAttendees' => array(
+				'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager' => self::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer' => self::load_from_cache,
+			),
+			'EventEspresso\core\services\route_match\RouteMatchSpecificationDependencyResolver' => array(
+				'EventEspresso\core\services\container\Mirror' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
+				'EE_Dependency_Map' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\route_match\RouteMatchSpecificationFactory' => array(
+				'EventEspresso\core\services\route_match\RouteMatchSpecificationDependencyResolver' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\route_match\RouteMatchSpecificationManager' => array(
+				'EventEspresso\core\services\route_match\RouteMatchSpecificationCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\route_match\RouteMatchSpecificationFactory' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\libraries\rest_api\CalculatedModelFields' => array(
+				'EventEspresso\core\libraries\rest_api\calculations\CalculatedModelFieldsFactory' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\core\libraries\rest_api\calculations\CalculatedModelFieldsFactory' => array(
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\libraries\rest_api\controllers\model\Read' => array(
+				'EventEspresso\core\libraries\rest_api\CalculatedModelFields' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\core\libraries\rest_api\calculations\Datetime' => array(
+				'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\core\libraries\rest_api\calculations\Event' => array(
+				'EEM_Event' => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\core\libraries\rest_api\calculations\Registration' => array(
+				'EEM_Registration' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\core\services\session\SessionStartHandler' => array(
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			),
+			'EE_URL_Validation_Strategy' => array(
+				null,
+				null,
+				'EventEspresso\core\services\validators\URLValidator' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\admin_pages\general_settings\OrganizationSettings' => array(
+				'EE_Registry'                                             => EE_Dependency_Map::load_from_cache,
+				'EE_Organization_Config'                                  => EE_Dependency_Map::load_from_cache,
+				'EE_Core_Config'                                          => EE_Dependency_Map::load_from_cache,
+				'EE_Network_Core_Config'                                  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\address\CountrySubRegionDao' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\address\CountrySubRegionDao' => array(
+				'EEM_State'                                            => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\validators\JsonValidator' => EE_Dependency_Map::load_from_cache
+			),
+			'EventEspresso\core\domain\services\admin\ajax\WordpressHeartbeat' => array(
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat' => array(
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+				'EE_Environment_Config'            => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspresso\core\services\request\files\FilesDataHandler' => array(
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			),
+			'EventEspressoBatchRequest\BatchRequestProcessor'                              => [
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\admin\registrations\list_table\QueryBuilder' => [
+				null,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\AttendeeFilterHeader' => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Attendee'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\DateFilterHeader' => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Datetime'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\EventFilterHeader' => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Event'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\admin\registrations\list_table\page_header\TicketFilterHeader' => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\graphql\GraphQLManager' => [
+				'EventEspresso\core\services\graphql\TypesManager'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\ConnectionsManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\graphql\TypesManager' => [
+				'EventEspresso\core\services\graphql\TypeCollection'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\graphql\ConnectionsManager' => [
+				'EventEspresso\core\services\graphql\ConnectionCollection'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\types\Datetime' => [
+				'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\types\Event' => [
+				'EEM_Event' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\types\Ticket' => [
+				'EEM_Ticket' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\types\Venue' => [
+				'EEM_Venue' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\types\State' => [
+				'EEM_State' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\types\Country' => [
+				'EEM_Country' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection' => [
+				'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection' => [
+				'EEM_Ticket' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection' => [
+				'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection' => [
+				'EEM_Venue' => EE_Dependency_Map::load_from_cache,
+			],
+		);
+	}
+
+
+	/**
+	 * Registers how core classes are loaded.
+	 * This can either be done by simply providing the name of one of the EE_Registry loader methods such as:
+	 *        'EE_Request_Handler' => 'load_core'
+	 *        'EE_Messages_Queue'  => 'load_lib'
+	 *        'EEH_Debug_Tools'    => 'load_helper'
+	 * or, if greater control is required, by providing a custom closure. For example:
+	 *        'Some_Class' => function () {
+	 *            return new Some_Class();
+	 *        },
+	 * This is required for instantiating dependencies
+	 * where an interface has been type hinted in a class constructor. For example:
+	 *        'Required_Interface' => function () {
+	 *            return new A_Class_That_Implements_Required_Interface();
+	 *        },
+	 */
+	protected function _register_core_class_loaders()
+	{
+		$this->_class_loaders = array(
+			// load_core
+			'EE_Dependency_Map'                            => function () {
+				return $this;
+			},
+			'EE_Capabilities'                              => 'load_core',
+			'EE_Encryption'                                => 'load_core',
+			'EE_Front_Controller'                          => 'load_core',
+			'EE_Module_Request_Router'                     => 'load_core',
+			'EE_Registry'                                  => 'load_core',
+			'EE_Request'                                   => function () {
+				return $this->legacy_request;
+			},
+			'EventEspresso\core\services\request\Request'  => function () {
+				return $this->request;
+			},
+			'EventEspresso\core\services\request\Response' => function () {
+				return $this->response;
+			},
+			'EE_Base'                                      => 'load_core',
+			'EE_Request_Handler'                           => 'load_core',
+			'EE_Session'                                   => 'load_core',
+			'EE_Cron_Tasks'                                => 'load_core',
+			'EE_System'                                    => 'load_core',
+			'EE_Maintenance_Mode'                          => 'load_core',
+			'EE_Register_CPTs'                             => 'load_core',
+			'EE_Admin'                                     => 'load_core',
+			'EE_CPT_Strategy'                              => 'load_core',
+			// load_class
+			'EE_Registration_Processor'                    => 'load_class',
+			// load_lib
+			'EE_Message_Resource_Manager'                  => 'load_lib',
+			'EE_Message_Type_Collection'                   => 'load_lib',
+			'EE_Message_Type_Collection_Loader'            => 'load_lib',
+			'EE_Messenger_Collection'                      => 'load_lib',
+			'EE_Messenger_Collection_Loader'               => 'load_lib',
+			'EE_Messages_Processor'                        => 'load_lib',
+			'EE_Message_Repository'                        => 'load_lib',
+			'EE_Messages_Queue'                            => 'load_lib',
+			'EE_Messages_Data_Handler_Collection'          => 'load_lib',
+			'EE_Message_Template_Group_Collection'         => 'load_lib',
+			'EE_Payment_Method_Manager'                    => 'load_lib',
+			'EE_DMS_Core_4_1_0'                            => 'load_dms',
+			'EE_DMS_Core_4_2_0'                            => 'load_dms',
+			'EE_DMS_Core_4_3_0'                            => 'load_dms',
+			'EE_DMS_Core_4_5_0'                            => 'load_dms',
+			'EE_DMS_Core_4_6_0'                            => 'load_dms',
+			'EE_DMS_Core_4_7_0'                            => 'load_dms',
+			'EE_DMS_Core_4_8_0'                            => 'load_dms',
+			'EE_DMS_Core_4_9_0'                            => 'load_dms',
+			'EE_DMS_Core_4_10_0'                            => 'load_dms',
+			'EE_Messages_Generator'                        => function () {
+				return EE_Registry::instance()->load_lib(
+					'Messages_Generator',
+					array(),
+					false,
+					false
+				);
+			},
+			'EE_Messages_Template_Defaults'                => function ($arguments = array()) {
+				return EE_Registry::instance()->load_lib(
+					'Messages_Template_Defaults',
+					$arguments,
+					false,
+					false
+				);
+			},
+			// load_helper
+			'EEH_Parse_Shortcodes'                         => function () {
+				if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
+					return new EEH_Parse_Shortcodes();
+				}
+				return null;
+			},
+			'EE_Template_Config'                           => function () {
+				return EE_Config::instance()->template_settings;
+			},
+			'EE_Currency_Config'                           => function () {
+				return EE_Config::instance()->currency;
+			},
+			'EE_Registration_Config'                       => function () {
+				return EE_Config::instance()->registration;
+			},
+			'EE_Core_Config'                               => function () {
+				return EE_Config::instance()->core;
+			},
+			'EventEspresso\core\services\loaders\Loader'   => function () {
+				return LoaderFactory::getLoader();
+			},
+			'EE_Network_Config'                            => function () {
+				return EE_Network_Config::instance();
+			},
+			'EE_Config'                                    => function () {
+				return EE_Config::instance();
+			},
+			'EventEspresso\core\domain\Domain'             => function () {
+				return DomainFactory::getEventEspressoCoreDomain();
+			},
+			'EE_Admin_Config'                              => function () {
+				return EE_Config::instance()->admin;
+			},
+			'EE_Organization_Config'                       => function () {
+				return EE_Config::instance()->organization;
+			},
+			'EE_Network_Core_Config'                       => function () {
+				return EE_Network_Config::instance()->core;
+			},
+			'EE_Environment_Config'                        => function () {
+				return EE_Config::instance()->environment;
+			},
+		);
+	}
+
+
+	/**
+	 * can be used for supplying alternate names for classes,
+	 * or for connecting interface names to instantiable classes
+	 */
+	protected function _register_core_aliases()
+	{
+		$aliases = array(
+			'CommandBusInterface'                                                          => 'EventEspresso\core\services\commands\CommandBusInterface',
+			'EventEspresso\core\services\commands\CommandBusInterface'                     => 'EventEspresso\core\services\commands\CommandBus',
+			'CommandHandlerManagerInterface'                                               => 'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
+			'EventEspresso\core\services\commands\CommandHandlerManagerInterface'          => 'EventEspresso\core\services\commands\CommandHandlerManager',
+			'CapChecker'                                                                   => 'EventEspresso\core\services\commands\middleware\CapChecker',
+			'AddActionHook'                                                                => 'EventEspresso\core\services\commands\middleware\AddActionHook',
+			'CapabilitiesChecker'                                                          => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
+			'CapabilitiesCheckerInterface'                                                 => 'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface',
+			'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface' => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
+			'CreateRegistrationService'                                                    => 'EventEspresso\core\domain\services\registration\CreateRegistrationService',
+			'CreateRegistrationCommandHandler'                                             => 'EventEspresso\core\services\commands\registration\CreateRegistrationCommand',
+			'CopyRegistrationDetailsCommandHandler'                                        => 'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommand',
+			'CopyRegistrationPaymentsCommandHandler'                                       => 'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommand',
+			'CancelRegistrationAndTicketLineItemCommandHandler'                            => 'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler',
+			'UpdateRegistrationAndTransactionAfterChangeCommandHandler'                    => 'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler',
+			'CreateTicketLineItemCommandHandler'                                           => 'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommand',
+			'CreateTransactionCommandHandler'                                              => 'EventEspresso\core\services\commands\transaction\CreateTransactionCommandHandler',
+			'CreateAttendeeCommandHandler'                                                 => 'EventEspresso\core\services\commands\attendee\CreateAttendeeCommandHandler',
+			'TableManager'                                                                 => 'EventEspresso\core\services\database\TableManager',
+			'TableAnalysis'                                                                => 'EventEspresso\core\services\database\TableAnalysis',
+			'EspressoShortcode'                                                            => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
+			'ShortcodeInterface'                                                           => 'EventEspresso\core\services\shortcodes\ShortcodeInterface',
+			'EventEspresso\core\services\shortcodes\ShortcodeInterface'                    => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
+			'EventEspresso\core\services\cache\CacheStorageInterface'                      => 'EventEspresso\core\services\cache\TransientCacheStorage',
+			'LoaderInterface'                                                              => 'EventEspresso\core\services\loaders\LoaderInterface',
+			'EventEspresso\core\services\loaders\LoaderInterface'                          => 'EventEspresso\core\services\loaders\Loader',
+			'CommandFactoryInterface'                                                      => 'EventEspresso\core\services\commands\CommandFactoryInterface',
+			'EventEspresso\core\services\commands\CommandFactoryInterface'                 => 'EventEspresso\core\services\commands\CommandFactory',
+			'EmailValidatorInterface'                                                      => 'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface',
+			'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface'  => 'EventEspresso\core\domain\services\validation\email\EmailValidationService',
+			'NoticeConverterInterface'                                                     => 'EventEspresso\core\services\notices\NoticeConverterInterface',
+			'EventEspresso\core\services\notices\NoticeConverterInterface'                 => 'EventEspresso\core\services\notices\ConvertNoticesToEeErrors',
+			'NoticesContainerInterface'                                                    => 'EventEspresso\core\services\notices\NoticesContainerInterface',
+			'EventEspresso\core\services\notices\NoticesContainerInterface'                => 'EventEspresso\core\services\notices\NoticesContainer',
+			'EventEspresso\core\services\request\RequestInterface'                         => 'EventEspresso\core\services\request\Request',
+			'EventEspresso\core\services\request\ResponseInterface'                        => 'EventEspresso\core\services\request\Response',
+			'EventEspresso\core\domain\DomainInterface'                                    => 'EventEspresso\core\domain\Domain',
+			'Registration_Processor'                                                       => 'EE_Registration_Processor',
+		);
+		foreach ($aliases as $alias => $fqn) {
+			if (is_array($fqn)) {
+				foreach ($fqn as $class => $for_class) {
+					$this->class_cache->addAlias($class, $alias, $for_class);
+				}
+				continue;
+			}
+			$this->class_cache->addAlias($fqn, $alias);
+		}
+		if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+			$this->class_cache->addAlias(
+				'EventEspresso\core\services\notices\ConvertNoticesToAdminNotices',
+				'EventEspresso\core\services\notices\NoticeConverterInterface'
+			);
+		}
+	}
+
+
+	/**
+	 * This is used to reset the internal map and class_loaders to their original default state at the beginning of the
+	 * request Primarily used by unit tests.
+	 */
+	public function reset()
+	{
+		$this->_register_core_class_loaders();
+		$this->_register_core_dependencies();
+	}
+
+
+	/**
+	 * PLZ NOTE: a better name for this method would be is_alias()
+	 * because it returns TRUE if the provided fully qualified name IS an alias
+	 * WHY?
+	 * Because if a class is type hinting for a concretion,
+	 * then why would we need to find another class to supply it?
+	 * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
+	 * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
+	 * Don't go looking for some substitute.
+	 * Whereas if a class is type hinting for an interface...
+	 * then we need to find an actual class to use.
+	 * So the interface IS the alias for some other FQN,
+	 * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
+	 * represents some other class.
+	 *
+	 * @deprecated 4.9.62.p
+	 * @param string $fqn
+	 * @param string $for_class
+	 * @return bool
+	 */
+	public function has_alias($fqn = '', $for_class = '')
+	{
+		return $this->isAlias($fqn, $for_class);
+	}
+
+
+	/**
+	 * PLZ NOTE: a better name for this method would be get_fqn_for_alias()
+	 * because it returns a FQN for provided alias if one exists, otherwise returns the original $alias
+	 * functions recursively, so that multiple aliases can be used to drill down to a FQN
+	 *  for example:
+	 *      if the following two entries were added to the _aliases array:
+	 *          array(
+	 *              'interface_alias'           => 'some\namespace\interface'
+	 *              'some\namespace\interface'  => 'some\namespace\classname'
+	 *          )
+	 *      then one could use EE_Registry::instance()->create( 'interface_alias' )
+	 *      to load an instance of 'some\namespace\classname'
+	 *
+	 * @deprecated 4.9.62.p
+	 * @param string $alias
+	 * @param string $for_class
+	 * @return string
+	 */
+	public function get_alias($alias = '', $for_class = '')
+	{
+		return $this->getFqnForAlias($alias, $for_class);
+	}
 }

core/services/graphql/ConnectionInterface.php

Indentation +23 added lines, -23 removed lines

@@ -33,29 +33,29 @@
 interface ConnectionInterface
 {
 
-    /**
-     * @return array
-     * @since $VID:$
-     */
-    public function config();
+	/**
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function config();
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return array
-     * @since $VID:$
-     */
-    public function resolveConnection($entity, $args, $context, $info);
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function resolveConnection($entity, $args, $context, $info);
 
-    /**
-     * @param $id
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return EE_Base_Class
-     * @since $VID:$
-     */
-    public function resolveNode($id, $args, $context, $info);
+	/**
+	 * @param $id
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return EE_Base_Class
+	 * @since $VID:$
+	 */
+	public function resolveNode($id, $args, $context, $info);
 }
\ No newline at end of file

core/services/graphql/TypeInterface.php

Indentation +20 added lines, -20 removed lines

@@ -31,27 +31,27 @@
 interface TypeInterface
 {
 
-    /**
-     * @return string
-     * @since $VID:$
-     */
-    public function name();
+	/**
+	 * @return string
+	 * @since $VID:$
+	 */
+	public function name();
 
-    /**
-     * @return string
-     * @since $VID:$
-     */
-    public function description();
+	/**
+	 * @return string
+	 * @since $VID:$
+	 */
+	public function description();
 
-    /**
-     * @return array
-     * @since $VID:$
-     */
-    public function fields();
+	/**
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function fields();
 
-    /**
-     * @return bool
-     * @since $VID:$
-     */
-    public function isCustomPostType();
+	/**
+	 * @return bool
+	 * @since $VID:$
+	 */
+	public function isCustomPostType();
 }
\ No newline at end of file

core/services/graphql/ResolverCollection.php

Indentation +74 added lines, -74 removed lines

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

Spacing +1 added lines, -1 removed lines

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