eventespresso / event-espresso-core

core/domain/services/commands/registration/CancelRegistrationAndTicketLineItemCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var CancelRegistrationAndTicketLineItemCommand $command */
-        if (! $command instanceof CancelRegistrationAndTicketLineItemCommand) {
+        if ( ! $command instanceof CancelRegistrationAndTicketLineItemCommand) {
             throw new InvalidEntityException(get_class($command), 'CancelRegistrationAndTicketLineItemCommand');
         }
         $registration = $command->registration();

Indentation +40 added lines, -40 removed lines

@@ -26,48 +26,48 @@
  */
 class CancelRegistrationAndTicketLineItemCommandHandler extends CommandHandler
 {
-    /**
-     * @var CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    private $cancel_ticket_line_item_service;
+	/**
+	 * @var CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	private $cancel_ticket_line_item_service;
 
 
-    /**
-     * Command constructor
-     *
-     * @param CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
-    {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
+	{
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
+	}
 
 
-    /**
-     * @param CommandInterface|CancelRegistrationAndTicketLineItemCommand $command
-     * @return boolean
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CancelRegistrationAndTicketLineItemCommand $command */
-        if (! $command instanceof CancelRegistrationAndTicketLineItemCommand) {
-            throw new InvalidEntityException(get_class($command), 'CancelRegistrationAndTicketLineItemCommand');
-        }
-        $registration = $command->registration();
-        $this->cancel_ticket_line_item_service->forRegistration($registration);
-        // cancel original registration
-        $registration->set_status(EEM_Registration::status_id_cancelled);
-        $registration->save();
-        return true;
-    }
+	/**
+	 * @param CommandInterface|CancelRegistrationAndTicketLineItemCommand $command
+	 * @return boolean
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CancelRegistrationAndTicketLineItemCommand $command */
+		if (! $command instanceof CancelRegistrationAndTicketLineItemCommand) {
+			throw new InvalidEntityException(get_class($command), 'CancelRegistrationAndTicketLineItemCommand');
+		}
+		$registration = $command->registration();
+		$this->cancel_ticket_line_item_service->forRegistration($registration);
+		// cancel original registration
+		$registration->set_status(EEM_Registration::status_id_cancelled);
+		$registration->save();
+		return true;
+	}
 }

core/domain/services/commands/transaction/CreateTransactionCommand.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     public function getCapCheck()
     {
         // need cap for non-AJAX admin requests
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+        if ( ! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
             // there's no specific caps for editing/creating transactions,
             // so that's why we are using ee_edit_registrations
             return new CapCheck('ee_edit_registrations', 'create_new_transaction');

Indentation +47 added lines, -47 removed lines

@@ -20,60 +20,60 @@
  */
 class CreateTransactionCommand extends Command implements CommandRequiresCapCheckInterface
 {
-    /**
-     * @var EE_Checkout $checkout
-     */
-    protected $checkout;
+	/**
+	 * @var EE_Checkout $checkout
+	 */
+	protected $checkout;
 
-    /**
-     * @var array $transaction_details
-     */
-    protected $transaction_details;
+	/**
+	 * @var array $transaction_details
+	 */
+	protected $transaction_details;
 
 
-    /**
-     * CreateTransactionCommand constructor.
-     *
-     * @param EE_Checkout|null $checkout
-     * @param array            $transaction_details
-     */
-    public function __construct(EE_Checkout $checkout = null, array $transaction_details = [])
-    {
-        $this->checkout            = $checkout;
-        $this->transaction_details = $transaction_details;
-    }
+	/**
+	 * CreateTransactionCommand constructor.
+	 *
+	 * @param EE_Checkout|null $checkout
+	 * @param array            $transaction_details
+	 */
+	public function __construct(EE_Checkout $checkout = null, array $transaction_details = [])
+	{
+		$this->checkout            = $checkout;
+		$this->transaction_details = $transaction_details;
+	}
 
 
-    /**
-     * @return CapCheckInterface
-     * @throws InvalidDataTypeException
-     */
-    public function getCapCheck()
-    {
-        // need cap for non-AJAX admin requests
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
-            // there's no specific caps for editing/creating transactions,
-            // so that's why we are using ee_edit_registrations
-            return new CapCheck('ee_edit_registrations', 'create_new_transaction');
-        }
-        return new PublicCapabilities('', 'create_new_transaction');
-    }
+	/**
+	 * @return CapCheckInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function getCapCheck()
+	{
+		// need cap for non-AJAX admin requests
+		if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+			// there's no specific caps for editing/creating transactions,
+			// so that's why we are using ee_edit_registrations
+			return new CapCheck('ee_edit_registrations', 'create_new_transaction');
+		}
+		return new PublicCapabilities('', 'create_new_transaction');
+	}
 
 
-    /**
-     * @return EE_Checkout
-     */
-    public function checkout()
-    {
-        return $this->checkout;
-    }
+	/**
+	 * @return EE_Checkout
+	 */
+	public function checkout()
+	{
+		return $this->checkout;
+	}
 
 
-    /**
-     * @return array
-     */
-    public function transactionDetails()
-    {
-        return $this->transaction_details;
-    }
+	/**
+	 * @return array
+	 */
+	public function transactionDetails()
+	{
+		return $this->transaction_details;
+	}
 }

core/domain/services/commands/ticket/CreateTicketLineItemCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var CreateTicketLineItemCommand $command */
-        if (! $command instanceof CreateTicketLineItemCommand) {
+        if ( ! $command instanceof CreateTicketLineItemCommand) {
             throw new InvalidEntityException(get_class($command), 'CreateTicketLineItemCommand');
         }
         // create new line item for ticket

Indentation +34 added lines, -34 removed lines

@@ -20,42 +20,42 @@
  */
 class CreateTicketLineItemCommandHandler extends CommandHandler
 {
-    /**
-     * @var CreateTicketLineItemService $factory
-     */
-    private $factory;
+	/**
+	 * @var CreateTicketLineItemService $factory
+	 */
+	private $factory;
 
 
-    /**
-     * Command constructor
-     *
-     * @param CreateTicketLineItemService $factory
-     */
-    public function __construct(CreateTicketLineItemService $factory)
-    {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->factory = $factory;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param CreateTicketLineItemService $factory
+	 */
+	public function __construct(CreateTicketLineItemService $factory)
+	{
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->factory = $factory;
+	}
 
 
-    /**
-     * @param CommandInterface|CreateTicketLineItemCommand $command
-     * @return EE_Line_Item
-     * @throws InvalidEntityException
-     * @throws UnexpectedEntityException
-     * @throws EE_Error
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CreateTicketLineItemCommand $command */
-        if (! $command instanceof CreateTicketLineItemCommand) {
-            throw new InvalidEntityException(get_class($command), 'CreateTicketLineItemCommand');
-        }
-        // create new line item for ticket
-        return $this->factory->create(
-            $command->transaction(),
-            $command->ticket(),
-            $command->quantity()
-        );
-    }
+	/**
+	 * @param CommandInterface|CreateTicketLineItemCommand $command
+	 * @return EE_Line_Item
+	 * @throws InvalidEntityException
+	 * @throws UnexpectedEntityException
+	 * @throws EE_Error
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CreateTicketLineItemCommand $command */
+		if (! $command instanceof CreateTicketLineItemCommand) {
+			throw new InvalidEntityException(get_class($command), 'CreateTicketLineItemCommand');
+		}
+		// create new line item for ticket
+		return $this->factory->create(
+			$command->transaction(),
+			$command->ticket(),
+			$command->quantity()
+		);
+	}
 }

core/domain/services/commands/ticket/CancelTicketLineItemCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var CancelTicketLineItemCommand $command */
-        if (! $command instanceof CancelTicketLineItemCommand) {
+        if ( ! $command instanceof CancelTicketLineItemCommand) {
             throw new InvalidEntityException(get_class($command), 'CancelTicketLineItemCommand');
         }
         return $this->cancel_ticket_line_item_service->cancel(

Indentation +33 added lines, -33 removed lines

@@ -21,41 +21,41 @@
  */
 class CancelTicketLineItemCommandHandler extends CommandHandler
 {
-    /**
-     * @var CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    private $cancel_ticket_line_item_service;
+	/**
+	 * @var CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	private $cancel_ticket_line_item_service;
 
 
-    /**
-     * Command constructor
-     *
-     * @param CancelTicketLineItemService $cancel_ticket_line_item_service
-     */
-    public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
-    {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
-    }
+	/**
+	 * Command constructor
+	 *
+	 * @param CancelTicketLineItemService $cancel_ticket_line_item_service
+	 */
+	public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service)
+	{
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service;
+	}
 
 
-    /**
-     * @param CommandInterface|CancelTicketLineItemCommand $command
-     * @return mixed
-     * @throws InvalidEntityException
-     * @throws RuntimeException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CancelTicketLineItemCommand $command */
-        if (! $command instanceof CancelTicketLineItemCommand) {
-            throw new InvalidEntityException(get_class($command), 'CancelTicketLineItemCommand');
-        }
-        return $this->cancel_ticket_line_item_service->cancel(
-            $command->transaction(),
-            $command->ticket(),
-            $command->quantity(),
-            $command->ticketLineItem()
-        );
-    }
+	/**
+	 * @param CommandInterface|CancelTicketLineItemCommand $command
+	 * @return mixed
+	 * @throws InvalidEntityException
+	 * @throws RuntimeException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CancelTicketLineItemCommand $command */
+		if (! $command instanceof CancelTicketLineItemCommand) {
+			throw new InvalidEntityException(get_class($command), 'CancelTicketLineItemCommand');
+		}
+		return $this->cancel_ticket_line_item_service->cancel(
+			$command->transaction(),
+			$command->ticket(),
+			$command->quantity(),
+			$command->ticketLineItem()
+		);
+	}
 }

core/domain/services/commands/attendee/CreateAttendeeCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     public function handle(CommandInterface $command)
     {
         /** @var CreateAttendeeCommand $command */
-        if (! $command instanceof CreateAttendeeCommand) {
+        if ( ! $command instanceof CreateAttendeeCommand) {
             throw new InvalidEntityException(get_class($command), 'CreateAttendeeCommand');
         }
         // have we met before?

Indentation +128 added lines, -128 removed lines

@@ -20,142 +20,142 @@
  */
 class CreateAttendeeCommandHandler extends CommandHandler
 {
-    /**
-     * @var EEM_Attendee $attendee_model
-     */
-    protected $attendee_model;
+	/**
+	 * @var EEM_Attendee $attendee_model
+	 */
+	protected $attendee_model;
 
 
-    /**
-     * @param EEM_Attendee $attendee_model
-     */
-    public function __construct(EEM_Attendee $attendee_model)
-    {
-        defined('EVENT_ESPRESSO_VERSION') || exit;
-        $this->attendee_model = $attendee_model;
-    }
+	/**
+	 * @param EEM_Attendee $attendee_model
+	 */
+	public function __construct(EEM_Attendee $attendee_model)
+	{
+		defined('EVENT_ESPRESSO_VERSION') || exit;
+		$this->attendee_model = $attendee_model;
+	}
 
 
-    /**
-     * @param CommandInterface|CreateAttendeeCommand $command
-     * @return EE_Attendee
-     * @throws EE_Error
-     * @throws InvalidEntityException
-     */
-    public function handle(CommandInterface $command)
-    {
-        /** @var CreateAttendeeCommand $command */
-        if (! $command instanceof CreateAttendeeCommand) {
-            throw new InvalidEntityException(get_class($command), 'CreateAttendeeCommand');
-        }
-        // have we met before?
-        $attendee = $this->findExistingAttendee(
-            $command->registration(),
-            $command->attendeeDetails()
-        );
-        // did we find an already existing record for this attendee ?
-        if ($attendee instanceof EE_Attendee) {
-            $attendee = $this->updateExistingAttendeeData(
-                $attendee,
-                $command->attendeeDetails()
-            );
-        } else {
-            $attendee = $this->createNewAttendee(
-                $command->registration(),
-                $command->attendeeDetails()
-            );
-        }
-        return $attendee;
-    }
+	/**
+	 * @param CommandInterface|CreateAttendeeCommand $command
+	 * @return EE_Attendee
+	 * @throws EE_Error
+	 * @throws InvalidEntityException
+	 */
+	public function handle(CommandInterface $command)
+	{
+		/** @var CreateAttendeeCommand $command */
+		if (! $command instanceof CreateAttendeeCommand) {
+			throw new InvalidEntityException(get_class($command), 'CreateAttendeeCommand');
+		}
+		// have we met before?
+		$attendee = $this->findExistingAttendee(
+			$command->registration(),
+			$command->attendeeDetails()
+		);
+		// did we find an already existing record for this attendee ?
+		if ($attendee instanceof EE_Attendee) {
+			$attendee = $this->updateExistingAttendeeData(
+				$attendee,
+				$command->attendeeDetails()
+			);
+		} else {
+			$attendee = $this->createNewAttendee(
+				$command->registration(),
+				$command->attendeeDetails()
+			);
+		}
+		return $attendee;
+	}
 
 
-    /**
-     * find_existing_attendee
-     *
-     * @param EE_Registration $registration
-     * @param array           $attendee_data
-     * @return EE_Attendee
-     * @throws EE_Error
-     */
-    private function findExistingAttendee(EE_Registration $registration, array $attendee_data)
-    {
-        $existing_attendee = null;
-        // does this attendee already exist in the db ?
-        // we're searching using a combination of first name, last name, AND email address
-        $ATT_fname = ! empty($attendee_data['ATT_fname'])
-            ? $attendee_data['ATT_fname']
-            : '';
-        $ATT_lname = ! empty($attendee_data['ATT_lname'])
-            ? $attendee_data['ATT_lname']
-            : '';
-        $ATT_email = ! empty($attendee_data['ATT_email'])
-            ? $attendee_data['ATT_email']
-            : '';
-        // but only if those have values
-        if ($ATT_fname && $ATT_lname && $ATT_email) {
-            $existing_attendee = $this->attendee_model->find_existing_attendee(
-                [
-                    'ATT_fname' => $ATT_fname,
-                    'ATT_lname' => $ATT_lname,
-                    'ATT_email' => $ATT_email,
-                ]
-            );
-        }
-        return apply_filters(
-            'FHEE_EventEspresso_core_domain_services_commands_attendee_CreateAttendeeCommandHandler__findExistingAttendee__existing_attendee',
-            $existing_attendee,
-            $registration,
-            $attendee_data
-        );
-    }
+	/**
+	 * find_existing_attendee
+	 *
+	 * @param EE_Registration $registration
+	 * @param array           $attendee_data
+	 * @return EE_Attendee
+	 * @throws EE_Error
+	 */
+	private function findExistingAttendee(EE_Registration $registration, array $attendee_data)
+	{
+		$existing_attendee = null;
+		// does this attendee already exist in the db ?
+		// we're searching using a combination of first name, last name, AND email address
+		$ATT_fname = ! empty($attendee_data['ATT_fname'])
+			? $attendee_data['ATT_fname']
+			: '';
+		$ATT_lname = ! empty($attendee_data['ATT_lname'])
+			? $attendee_data['ATT_lname']
+			: '';
+		$ATT_email = ! empty($attendee_data['ATT_email'])
+			? $attendee_data['ATT_email']
+			: '';
+		// but only if those have values
+		if ($ATT_fname && $ATT_lname && $ATT_email) {
+			$existing_attendee = $this->attendee_model->find_existing_attendee(
+				[
+					'ATT_fname' => $ATT_fname,
+					'ATT_lname' => $ATT_lname,
+					'ATT_email' => $ATT_email,
+				]
+			);
+		}
+		return apply_filters(
+			'FHEE_EventEspresso_core_domain_services_commands_attendee_CreateAttendeeCommandHandler__findExistingAttendee__existing_attendee',
+			$existing_attendee,
+			$registration,
+			$attendee_data
+		);
+	}
 
 
-    /**
-     * _update_existing_attendee_data
-     * in case it has changed since last time they registered for an event
-     *
-     * @param EE_Attendee $existing_attendee
-     * @param array       $attendee_data
-     * @return EE_Attendee
-     * @throws EE_Error
-     */
-    private function updateExistingAttendeeData(EE_Attendee $existing_attendee, array $attendee_data)
-    {
-        // first remove fname, lname, and email from attendee data
-        // because these properties will be exactly the same as the returned attendee object,
-        // since they were used in the query to get the attendee object in the first place
-        $dont_set = ['ATT_fname', 'ATT_lname', 'ATT_email'];
-        // now loop thru what's left and add to attendee CPT
-        foreach ($attendee_data as $property_name => $property_value) {
-            if (
-                ! in_array($property_name, $dont_set, true)
-                && $this->attendee_model->has_field($property_name)
-            ) {
-                $existing_attendee->set($property_name, $property_value);
-            }
-        }
-        // better save that now
-        $existing_attendee->save();
-        return $existing_attendee;
-    }
+	/**
+	 * _update_existing_attendee_data
+	 * in case it has changed since last time they registered for an event
+	 *
+	 * @param EE_Attendee $existing_attendee
+	 * @param array       $attendee_data
+	 * @return EE_Attendee
+	 * @throws EE_Error
+	 */
+	private function updateExistingAttendeeData(EE_Attendee $existing_attendee, array $attendee_data)
+	{
+		// first remove fname, lname, and email from attendee data
+		// because these properties will be exactly the same as the returned attendee object,
+		// since they were used in the query to get the attendee object in the first place
+		$dont_set = ['ATT_fname', 'ATT_lname', 'ATT_email'];
+		// now loop thru what's left and add to attendee CPT
+		foreach ($attendee_data as $property_name => $property_value) {
+			if (
+				! in_array($property_name, $dont_set, true)
+				&& $this->attendee_model->has_field($property_name)
+			) {
+				$existing_attendee->set($property_name, $property_value);
+			}
+		}
+		// better save that now
+		$existing_attendee->save();
+		return $existing_attendee;
+	}
 
 
-    /**
-     * create_new_attendee
-     *
-     * @param EE_Registration $registration
-     * @param array           $attendee_data
-     * @return EE_Attendee
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     */
-    private function createNewAttendee(EE_Registration $registration, array $attendee_data)
-    {
-        // create new attendee object
-        $new_attendee = EE_Attendee::new_instance($attendee_data);
-        // set author to event creator
-        $new_attendee->set('ATT_author', $registration->event()->wp_user());
-        $new_attendee->save();
-        return $new_attendee;
-    }
+	/**
+	 * create_new_attendee
+	 *
+	 * @param EE_Registration $registration
+	 * @param array           $attendee_data
+	 * @return EE_Attendee
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 */
+	private function createNewAttendee(EE_Registration $registration, array $attendee_data)
+	{
+		// create new attendee object
+		$new_attendee = EE_Attendee::new_instance($attendee_data);
+		// set author to event creator
+		$new_attendee->set('ATT_author', $registration->event()->wp_user());
+		$new_attendee->save();
+		return $new_attendee;
+	}
 }

core/domain/services/commands/attendee/CreateAttendeeCommand.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
     public function getCapCheck()
     {
         // need cap for non-AJAX admin requests
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+        if ( ! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
             return new CapCheck('ee_edit_contacts', 'create_new_contact');
         }
         return new PublicCapabilities('', 'create_new_contact');

Indentation +49 added lines, -49 removed lines

@@ -20,62 +20,62 @@
  */
 class CreateAttendeeCommand extends Command implements CommandRequiresCapCheckInterface
 {
-    /**
-     * array of details where keys are names of EEM_Attendee model fields
-     *
-     * @var array $attendee_details
-     */
-    protected $attendee_details;
+	/**
+	 * array of details where keys are names of EEM_Attendee model fields
+	 *
+	 * @var array $attendee_details
+	 */
+	protected $attendee_details;
 
-    /**
-     * an existing registration to associate this attendee with
-     *
-     * @var EE_Registration $registration
-     */
-    protected $registration;
+	/**
+	 * an existing registration to associate this attendee with
+	 *
+	 * @var EE_Registration $registration
+	 */
+	protected $registration;
 
 
-    /**
-     * CreateAttendeeCommand constructor.
-     *
-     * @param array           $attendee_details
-     * @param EE_Registration $registration
-     */
-    public function __construct(array $attendee_details, EE_Registration $registration)
-    {
-        $this->attendee_details = $attendee_details;
-        $this->registration     = $registration;
-    }
+	/**
+	 * CreateAttendeeCommand constructor.
+	 *
+	 * @param array           $attendee_details
+	 * @param EE_Registration $registration
+	 */
+	public function __construct(array $attendee_details, EE_Registration $registration)
+	{
+		$this->attendee_details = $attendee_details;
+		$this->registration     = $registration;
+	}
 
 
-    /**
-     * @return array
-     */
-    public function attendeeDetails()
-    {
-        return $this->attendee_details;
-    }
+	/**
+	 * @return array
+	 */
+	public function attendeeDetails()
+	{
+		return $this->attendee_details;
+	}
 
 
-    /**
-     * @return EE_Registration
-     */
-    public function registration()
-    {
-        return $this->registration;
-    }
+	/**
+	 * @return EE_Registration
+	 */
+	public function registration()
+	{
+		return $this->registration;
+	}
 
 
-    /**
-     * @return CapCheckInterface
-     * @throws InvalidDataTypeException
-     */
-    public function getCapCheck()
-    {
-        // need cap for non-AJAX admin requests
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
-            return new CapCheck('ee_edit_contacts', 'create_new_contact');
-        }
-        return new PublicCapabilities('', 'create_new_contact');
-    }
+	/**
+	 * @return CapCheckInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function getCapCheck()
+	{
+		// need cap for non-AJAX admin requests
+		if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+			return new CapCheck('ee_edit_contacts', 'create_new_contact');
+		}
+		return new PublicCapabilities('', 'create_new_contact');
+	}
 }

modules/ticket_selector/TicketDatetimeAvailabilityTracker.php

Spacing +13 added lines, -13 removed lines

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

Indentation +213 added lines, -213 removed lines

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

core/services/bootstrap/BootstrapDependencyInjectionContainer.php

Spacing +2 added lines, -2 removed lines

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

Indentation +101 added lines, -101 removed lines

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

core/services/loaders/CoreLoader.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
      */
     public function __construct($generator)
     {
-        if (! ($generator instanceof EE_Registry || $generator instanceof CoffeeShop)) {
+        if ( ! ($generator instanceof EE_Registry || $generator instanceof CoffeeShop)) {
             throw new InvalidArgumentException(
                 esc_html__(
                     'The CoreLoader class must receive an instance of EE_Registry or the CoffeeShop DI container.',

Indentation +101 added lines, -101 removed lines

@@ -28,111 +28,111 @@
  */
 class CoreLoader implements LoaderDecoratorInterface
 {
-    /**
-     * @var EE_Registry|CoffeeShop $generator
-     */
-    private $generator;
+	/**
+	 * @var EE_Registry|CoffeeShop $generator
+	 */
+	private $generator;
 
 
-    /**
-     * CoreLoader constructor.
-     *
-     * @param EE_Registry|CoffeeShop $generator
-     * @throws InvalidArgumentException
-     */
-    public function __construct($generator)
-    {
-        if (! ($generator instanceof EE_Registry || $generator instanceof CoffeeShop)) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'The CoreLoader class must receive an instance of EE_Registry or the CoffeeShop DI container.',
-                    'event_espresso'
-                )
-            );
-        }
-        $this->generator = $generator;
-    }
+	/**
+	 * CoreLoader constructor.
+	 *
+	 * @param EE_Registry|CoffeeShop $generator
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($generator)
+	{
+		if (! ($generator instanceof EE_Registry || $generator instanceof CoffeeShop)) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'The CoreLoader class must receive an instance of EE_Registry or the CoffeeShop DI container.',
+					'event_espresso'
+				)
+			);
+		}
+		$this->generator = $generator;
+	}
 
 
-    /**
-     * Calls the appropriate loading method from the installed generator;
-     * If EE_Registry is being used, then the additional parameters for the EE_Registry::create() method
-     * can be added to the $arguments array and they will be extracted and passed to EE_Registry::create(),
-     * but NOT to the class being instantiated.
-     * This is done by adding the parameters to the $arguments array as follows:
-     *  array(
-     *      'EE_Registry::create(from_db)'   => true, // boolean value, default = false
-     *      'EE_Registry::create(load_only)' => true, // boolean value, default = false
-     *      'EE_Registry::create(addon)'     => true, // boolean value, default = false
-     *  )
-     *
-     * @param string $fqcn
-     * @param array  $arguments
-     * @param bool   $shared
-     * @return mixed
-     * @throws OutOfBoundsException
-     * @throws ServiceExistsException
-     * @throws InstantiationException
-     * @throws InvalidIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     * @throws EE_Error
-     * @throws ServiceNotFoundException
-     * @throws ReflectionException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public function load($fqcn, $arguments = array(), $shared = true)
-    {
-        $shared = filter_var($shared, FILTER_VALIDATE_BOOLEAN);
-        if ($this->generator instanceof EE_Registry) {
-            // check if additional EE_Registry::create() arguments have been passed
-            // from_db
-            $from_db = isset($arguments['EE_Registry::create(from_db)'])
-                ? filter_var($arguments['EE_Registry::create(from_db)'], FILTER_VALIDATE_BOOLEAN)
-                : false;
-            // load_only
-            $load_only = isset($arguments['EE_Registry::create(load_only)'])
-                ? filter_var($arguments['EE_Registry::create(load_only)'], FILTER_VALIDATE_BOOLEAN)
-                : false;
-            // addon
-            $addon = isset($arguments['EE_Registry::create(addon)'])
-                ? filter_var($arguments['EE_Registry::create(addon)'], FILTER_VALIDATE_BOOLEAN)
-                : false;
-            unset(
-                $arguments['EE_Registry::create(from_db)'],
-                $arguments['EE_Registry::create(load_only)'],
-                $arguments['EE_Registry::create(addon)']
-            );
-            // addons need to be cached on EE_Registry
-            $shared = $addon ? true : $shared;
-            return $this->generator->create(
-                $fqcn,
-                $arguments,
-                $shared,
-                $from_db,
-                $load_only,
-                $addon
-            );
-        }
-        return $this->generator->brew(
-            $fqcn,
-            $arguments,
-            $shared ? CoffeeMaker::BREW_SHARED : CoffeeMaker::BREW_NEW
-        );
-    }
+	/**
+	 * Calls the appropriate loading method from the installed generator;
+	 * If EE_Registry is being used, then the additional parameters for the EE_Registry::create() method
+	 * can be added to the $arguments array and they will be extracted and passed to EE_Registry::create(),
+	 * but NOT to the class being instantiated.
+	 * This is done by adding the parameters to the $arguments array as follows:
+	 *  array(
+	 *      'EE_Registry::create(from_db)'   => true, // boolean value, default = false
+	 *      'EE_Registry::create(load_only)' => true, // boolean value, default = false
+	 *      'EE_Registry::create(addon)'     => true, // boolean value, default = false
+	 *  )
+	 *
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @param bool   $shared
+	 * @return mixed
+	 * @throws OutOfBoundsException
+	 * @throws ServiceExistsException
+	 * @throws InstantiationException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 * @throws EE_Error
+	 * @throws ServiceNotFoundException
+	 * @throws ReflectionException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public function load($fqcn, $arguments = array(), $shared = true)
+	{
+		$shared = filter_var($shared, FILTER_VALIDATE_BOOLEAN);
+		if ($this->generator instanceof EE_Registry) {
+			// check if additional EE_Registry::create() arguments have been passed
+			// from_db
+			$from_db = isset($arguments['EE_Registry::create(from_db)'])
+				? filter_var($arguments['EE_Registry::create(from_db)'], FILTER_VALIDATE_BOOLEAN)
+				: false;
+			// load_only
+			$load_only = isset($arguments['EE_Registry::create(load_only)'])
+				? filter_var($arguments['EE_Registry::create(load_only)'], FILTER_VALIDATE_BOOLEAN)
+				: false;
+			// addon
+			$addon = isset($arguments['EE_Registry::create(addon)'])
+				? filter_var($arguments['EE_Registry::create(addon)'], FILTER_VALIDATE_BOOLEAN)
+				: false;
+			unset(
+				$arguments['EE_Registry::create(from_db)'],
+				$arguments['EE_Registry::create(load_only)'],
+				$arguments['EE_Registry::create(addon)']
+			);
+			// addons need to be cached on EE_Registry
+			$shared = $addon ? true : $shared;
+			return $this->generator->create(
+				$fqcn,
+				$arguments,
+				$shared,
+				$from_db,
+				$load_only,
+				$addon
+			);
+		}
+		return $this->generator->brew(
+			$fqcn,
+			$arguments,
+			$shared ? CoffeeMaker::BREW_SHARED : CoffeeMaker::BREW_NEW
+		);
+	}
 
 
-    /**
-     * calls reset() on generator if method exists
-     *
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function reset()
-    {
-        if ($this->generator instanceof ResettableInterface) {
-            $this->generator->reset();
-        }
-    }
+	/**
+	 * calls reset() on generator if method exists
+	 *
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function reset()
+	{
+		if ($this->generator instanceof ResettableInterface) {
+			$this->generator->reset();
+		}
+	}
 }