eventespresso / event-espresso-core

caffeinated/admin/new/pricing/help_tabs/pricing_add_new_price_type.help_tab.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 <p><strong><?php esc_html_e('Add New Price Type', 'event_espresso'); ?></strong></p>
 <p>
 <?php printf(
-    esc_html__('This page allows you to create a new price type for %s.', 'event_espresso'),
-    Domain::brandName()
+	esc_html__('This page allows you to create a new price type for %s.', 'event_espresso'),
+	Domain::brandName()
 ); ?>
 </p>
 <ul>

caffeinated/admin/new/pricing/help_tabs/pricing_edit_default_price.help_tab.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 <p><strong><?php esc_html_e('Edit Default Price', 'event_espresso'); ?></strong></p>
 <p>
 <?php printf(
-    esc_html__('This page allows you to edit a default price for %s.', 'event_espresso'),
-    Domain::brandName()
+	esc_html__('This page allows you to edit a default price for %s.', 'event_espresso'),
+	Domain::brandName()
 ); ?>
 </p>
 <ul>

caffeinated/admin/new/pricing/help_tabs/pricing_edit_price_type.help_tab.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 <p><strong><?php esc_html_e('Edit Price Type', 'event_espresso'); ?></strong></p>
 <p>
 <?php printf(
-    esc_html__('This page allows you to edit a price type for %s.', 'event_espresso'),
-    Domain::brandName()
+	esc_html__('This page allows you to edit a price type for %s.', 'event_espresso'),
+	Domain::brandName()
 ); ?>
 </p>
 <ul>

caffeinated/admin/new/pricing/help_tabs/pricing_add_new_default_price.help_tab.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 <p><strong><?php esc_html_e('Add New Default Price', 'event_espresso'); ?></strong></p>
 <p>
 <?php printf(
-    esc_html__('This page allows you to create a new default price for %s.', 'event_espresso'),
-    Domain::brandName()
+	esc_html__('This page allows you to create a new default price for %s.', 'event_espresso'),
+	Domain::brandName()
 ); ?>
 </p>
 <ul>

core/domain/services/admin/ajax/WordpressHeartbeat.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             $this->loader->getShared(
                 'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat'
             );
-        } elseif ($screenID === 'front' && ! empty($heartbeat_data[ self::RESPONSE_KEY_THANK_YOU_PAGE ])) {
+        } elseif ($screenID === 'front' && ! empty($heartbeat_data[self::RESPONSE_KEY_THANK_YOU_PAGE])) {
             $this->loader->getShared(
                 'EventEspresso\core\domain\services\admin\ajax\ThankYouPageIpnMonitor'
             );

Indentation +42 added lines, -42 removed lines

@@ -16,52 +16,52 @@
  */
 class WordpressHeartbeat
 {
-    const RESPONSE_KEY_THANK_YOU_PAGE = 'espresso_thank_you_page';
+	const RESPONSE_KEY_THANK_YOU_PAGE = 'espresso_thank_you_page';
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
 
-    /**
-     * WordpressHeartbeat constructor.
-     *
-     * @param LoaderInterface  $loader
-     * @param RequestInterface $request
-     */
-    public function __construct(
-        LoaderInterface $loader,
-        RequestInterface $request
-    ) {
-        $this->loader = $loader;
-        $this->request = $request;
-        do_action('AHEE__EventEspresso_core_domain_services_admin_ajax_WordpressHeartbeat__constructor', $this);
-        add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'resolveRoutes'));
-    }
+	/**
+	 * WordpressHeartbeat constructor.
+	 *
+	 * @param LoaderInterface  $loader
+	 * @param RequestInterface $request
+	 */
+	public function __construct(
+		LoaderInterface $loader,
+		RequestInterface $request
+	) {
+		$this->loader = $loader;
+		$this->request = $request;
+		do_action('AHEE__EventEspresso_core_domain_services_admin_ajax_WordpressHeartbeat__constructor', $this);
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'resolveRoutes'));
+	}
 
 
-    /**
-     * @since 4.9.76.p
-     * @throws InvalidClassException
-     */
-    public function resolveRoutes()
-    {
-        $screenID = $this->request->getRequestParam('screen_id');
-        $heartbeat_data = $this->request->getRequestParam('data', [], 'string', true);
-        if ($screenID === 'espresso_events') {
-            $this->loader->getShared(
-                'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat'
-            );
-        } elseif ($screenID === 'front' && ! empty($heartbeat_data[ self::RESPONSE_KEY_THANK_YOU_PAGE ])) {
-            $this->loader->getShared(
-                'EventEspresso\core\domain\services\admin\ajax\ThankYouPageIpnMonitor'
-            );
-        }
-    }
+	/**
+	 * @since 4.9.76.p
+	 * @throws InvalidClassException
+	 */
+	public function resolveRoutes()
+	{
+		$screenID = $this->request->getRequestParam('screen_id');
+		$heartbeat_data = $this->request->getRequestParam('data', [], 'string', true);
+		if ($screenID === 'espresso_events') {
+			$this->loader->getShared(
+				'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat'
+			);
+		} elseif ($screenID === 'front' && ! empty($heartbeat_data[ self::RESPONSE_KEY_THANK_YOU_PAGE ])) {
+			$this->loader->getShared(
+				'EventEspresso\core\domain\services\admin\ajax\ThankYouPageIpnMonitor'
+			);
+		}
+	}
 }

core/third-party-compatibility.php

Indentation +20 added lines, -20 removed lines

@@ -7,24 +7,24 @@
  * ACF compatibility
  */
 add_action(
-    'plugins_loaded',
-    function () {
-        if (function_exists('acf_include')) {
-            add_filter(
-                'acf/get_post_types',
-                function ($post_types, $args) {
-                    if (! empty($args['show_ui'])) {
-                        $ee_post_types = get_post_types(array('show_ee_ui' => 1));
-                        $ee_post_types = array_keys($ee_post_types);
-                        $post_types = array_merge($post_types, $ee_post_types);
-                        $post_types = array_unique($post_types);
-                    }
-                    return $post_types;
-                },
-                10,
-                2
-            );
-        }
-    },
-    100
+	'plugins_loaded',
+	function () {
+		if (function_exists('acf_include')) {
+			add_filter(
+				'acf/get_post_types',
+				function ($post_types, $args) {
+					if (! empty($args['show_ui'])) {
+						$ee_post_types = get_post_types(array('show_ee_ui' => 1));
+						$ee_post_types = array_keys($ee_post_types);
+						$post_types = array_merge($post_types, $ee_post_types);
+						$post_types = array_unique($post_types);
+					}
+					return $post_types;
+				},
+				10,
+				2
+			);
+		}
+	},
+	100
 );

Spacing +3 added lines, -3 removed lines

@@ -8,12 +8,12 @@
  */
 add_action(
     'plugins_loaded',
-    function () {
+    function() {
         if (function_exists('acf_include')) {
             add_filter(
                 'acf/get_post_types',
-                function ($post_types, $args) {
-                    if (! empty($args['show_ui'])) {
+                function($post_types, $args) {
+                    if ( ! empty($args['show_ui'])) {
                         $ee_post_types = get_post_types(array('show_ee_ui' => 1));
                         $ee_post_types = array_keys($ee_post_types);
                         $post_types = array_merge($post_types, $ee_post_types);

admin_pages/registrations/Registrations_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -23,15 +23,15 @@
     public function __construct()
     {
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! defined('REG_PG_SLUG')) {
+        if ( ! defined('REG_PG_SLUG')) {
             define('REG_PG_SLUG', 'espresso_registrations');
             define('REG_PG_NAME', ucwords(str_replace('_', '', REG_PG_SLUG)));
-            define('REG_ADMIN', EE_ADMIN_PAGES . 'registrations/');
-            define('REG_ADMIN_URL', admin_url('admin.php?page=' . REG_PG_SLUG));
-            define('REG_ASSETS_PATH', REG_ADMIN . 'assets/');
-            define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registrations/assets/');
-            define('REG_TEMPLATE_PATH', REG_ADMIN . 'templates/');
-            define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registrations/templates/');
+            define('REG_ADMIN', EE_ADMIN_PAGES.'registrations/');
+            define('REG_ADMIN_URL', admin_url('admin.php?page='.REG_PG_SLUG));
+            define('REG_ASSETS_PATH', REG_ADMIN.'assets/');
+            define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL.'registrations/assets/');
+            define('REG_TEMPLATE_PATH', REG_ADMIN.'templates/');
+            define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'registrations/templates/');
         }
 
         parent::__construct();

Indentation +39 added lines, -39 removed lines

@@ -13,48 +13,48 @@
  */
 class Registrations_Admin_Page_Init extends EE_Admin_Page_CPT_Init
 {
-    /**
-     *        constructor
-     *
-     * @Constructor
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! defined('REG_PG_SLUG')) {
-            define('REG_PG_SLUG', 'espresso_registrations');
-            define('REG_PG_NAME', ucwords(str_replace('_', '', REG_PG_SLUG)));
-            define('REG_ADMIN', EE_ADMIN_PAGES . 'registrations/');
-            define('REG_ADMIN_URL', admin_url('admin.php?page=' . REG_PG_SLUG));
-            define('REG_ASSETS_PATH', REG_ADMIN . 'assets/');
-            define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registrations/assets/');
-            define('REG_TEMPLATE_PATH', REG_ADMIN . 'templates/');
-            define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registrations/templates/');
-        }
+	/**
+	 *        constructor
+	 *
+	 * @Constructor
+	 * @access public
+	 * @return void
+	 */
+	public function __construct()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if (! defined('REG_PG_SLUG')) {
+			define('REG_PG_SLUG', 'espresso_registrations');
+			define('REG_PG_NAME', ucwords(str_replace('_', '', REG_PG_SLUG)));
+			define('REG_ADMIN', EE_ADMIN_PAGES . 'registrations/');
+			define('REG_ADMIN_URL', admin_url('admin.php?page=' . REG_PG_SLUG));
+			define('REG_ASSETS_PATH', REG_ADMIN . 'assets/');
+			define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registrations/assets/');
+			define('REG_TEMPLATE_PATH', REG_ADMIN . 'templates/');
+			define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registrations/templates/');
+		}
 
-        parent::__construct();
-    }
+		parent::__construct();
+	}
 
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Registrations Overview', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Registrations Overview', 'event_espresso');
+	}
 
 
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'    => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'   => AdminMenuGroup::MENU_SLUG_MAIN,
-            'menu_order'   => 40,
-            'show_on_menu' => AdminMenuItem::DISPLAY_BLOG_ONLY,
-            'parent_slug'  => AdminMenuTopLevel::MENU_PARENT_ACTIVE,
-            'menu_slug'    => REG_PG_SLUG,
-            'menu_label'   => esc_html__('Registrations', 'event_espresso'),
-            'capability'   => 'ee_read_registrations',
-        ];
-    }
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'    => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'   => AdminMenuGroup::MENU_SLUG_MAIN,
+			'menu_order'   => 40,
+			'show_on_menu' => AdminMenuItem::DISPLAY_BLOG_ONLY,
+			'parent_slug'  => AdminMenuTopLevel::MENU_PARENT_ACTIVE,
+			'menu_slug'    => REG_PG_SLUG,
+			'menu_label'   => esc_html__('Registrations', 'event_espresso'),
+			'capability'   => 'ee_read_registrations',
+		];
+	}
 }

core/services/bootstrap/BootstrapCore.php

Spacing +4 added lines, -4 removed lines

@@ -199,7 +199,7 @@ 
         // load interfaces
         espresso_load_required(
             'EEH_Autoloader',
-            EE_CORE . 'helpers/EEH_Autoloader.helper.php'
+            EE_CORE.'helpers/EEH_Autoloader.helper.php'
         );
         EEH_Autoloader::instance();
     }
@@ -213,13 +213,13 @@ 
     protected function setAutoloadersForRequiredFiles()
     {
         // load interfaces
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'interfaces', true);
         // load helpers
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
         // register legacy request stack classes just in case
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'request_stack/');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'request_stack/');
         // register legacy middleware classes just in case
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'middleware/');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'middleware/');
     }
 
 

Indentation +187 added lines, -187 removed lines

@@ -54,213 +54,213 @@
  */
 class BootstrapCore
 {
-    private LoaderInterface $loader;
+	private LoaderInterface $loader;
 
-    protected RequestInterface $request;
+	protected RequestInterface $request;
 
-    protected ResponseInterface $response;
+	protected ResponseInterface $response;
 
-    protected RequestStackBuilder $request_stack_builder;
+	protected RequestStackBuilder $request_stack_builder;
 
-    protected RequestStack $request_stack;
+	protected RequestStack $request_stack;
 
 
-    /**
-     * BootstrapCore constructor.
-     */
-    public function __construct()
-    {
-        do_action('AHEE__EventEspresso_core_services_bootstrap_BootstrapCore___construct');
-        // construct request stack and run middleware apps as soon as all WP plugins are loaded
-        add_action('plugins_loaded', [$this, 'initialize'], 0);
-    }
+	/**
+	 * BootstrapCore constructor.
+	 */
+	public function __construct()
+	{
+		do_action('AHEE__EventEspresso_core_services_bootstrap_BootstrapCore___construct');
+		// construct request stack and run middleware apps as soon as all WP plugins are loaded
+		add_action('plugins_loaded', [$this, 'initialize'], 0);
+	}
 
 
-    /**
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws Exception
-     * @throws InvalidArgumentException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     * @throws InvalidInterfaceException
-     * @throws InvalidRequestStackMiddlewareException
-     * @throws OutOfBoundsException
-     * @throws ReflectionException
-     * @throws Throwable
-     */
-    public function initialize()
-    {
-        $this->bootstrapDependencyInjectionContainer();
-        $this->bootstrapDomain();
-        $bootstrap_request = $this->bootstrapRequestResponseObjects();
-        add_action(
-            'EE_Load_Espresso_Core__handle_request__initialize_core_loading',
-            [$bootstrap_request, 'setupLegacyRequest']
-        );
-        $this->runRequestStack();
-    }
+	/**
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws Exception
+	 * @throws InvalidArgumentException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidRequestStackMiddlewareException
+	 * @throws OutOfBoundsException
+	 * @throws ReflectionException
+	 * @throws Throwable
+	 */
+	public function initialize()
+	{
+		$this->bootstrapDependencyInjectionContainer();
+		$this->bootstrapDomain();
+		$bootstrap_request = $this->bootstrapRequestResponseObjects();
+		add_action(
+			'EE_Load_Espresso_Core__handle_request__initialize_core_loading',
+			[$bootstrap_request, 'setupLegacyRequest']
+		);
+		$this->runRequestStack();
+	}
 
 
-    /**
-     * @throws ReflectionException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws OutOfBoundsException
-     */
-    private function bootstrapDependencyInjectionContainer()
-    {
-        $bootstrap_di = new BootstrapDependencyInjectionContainer();
-        $bootstrap_di->buildLegacyDependencyInjectionContainer();
-        $bootstrap_di->buildLoader();
-        $registry       = $bootstrap_di->getRegistry();
-        $dependency_map = $bootstrap_di->getDependencyMap();
-        $dependency_map->initialize();
-        $registry->initialize();
-        $this->loader = $bootstrap_di->getLoader();
-    }
+	/**
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws OutOfBoundsException
+	 */
+	private function bootstrapDependencyInjectionContainer()
+	{
+		$bootstrap_di = new BootstrapDependencyInjectionContainer();
+		$bootstrap_di->buildLegacyDependencyInjectionContainer();
+		$bootstrap_di->buildLoader();
+		$registry       = $bootstrap_di->getRegistry();
+		$dependency_map = $bootstrap_di->getDependencyMap();
+		$dependency_map->initialize();
+		$registry->initialize();
+		$this->loader = $bootstrap_di->getLoader();
+	}
 
 
-    /**
-     * configures the Domain object for core
-     *
-     * @return void
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     * @throws InvalidFilePathException
-     * @throws InvalidInterfaceException
-     */
-    private function bootstrapDomain()
-    {
-        DomainFactory::getEventEspressoCoreDomain();
-    }
+	/**
+	 * configures the Domain object for core
+	 *
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidInterfaceException
+	 */
+	private function bootstrapDomain()
+	{
+		DomainFactory::getEventEspressoCoreDomain();
+	}
 
 
-    /**
-     * sets up the request and response objects
-     *
-     * @return BootstrapRequestResponseObjects
-     * @throws InvalidArgumentException
-     */
-    private function bootstrapRequestResponseObjects(): BootstrapRequestResponseObjects
-    {
-        /** @var BootstrapRequestResponseObjects $bootstrap_request */
-        $bootstrap_request = $this->loader->getShared(
-            'EventEspresso\core\services\bootstrap\BootstrapRequestResponseObjects',
-            [$this->loader]
-        );
-        $bootstrap_request->buildRequestResponse();
-        $bootstrap_request->shareRequestResponse();
-        $this->request  = $this->loader->getShared('EventEspresso\core\services\request\Request');
-        $this->response = $this->loader->getShared('EventEspresso\core\services\request\Response');
-        return $bootstrap_request;
-    }
+	/**
+	 * sets up the request and response objects
+	 *
+	 * @return BootstrapRequestResponseObjects
+	 * @throws InvalidArgumentException
+	 */
+	private function bootstrapRequestResponseObjects(): BootstrapRequestResponseObjects
+	{
+		/** @var BootstrapRequestResponseObjects $bootstrap_request */
+		$bootstrap_request = $this->loader->getShared(
+			'EventEspresso\core\services\bootstrap\BootstrapRequestResponseObjects',
+			[$this->loader]
+		);
+		$bootstrap_request->buildRequestResponse();
+		$bootstrap_request->shareRequestResponse();
+		$this->request  = $this->loader->getShared('EventEspresso\core\services\request\Request');
+		$this->response = $this->loader->getShared('EventEspresso\core\services\request\Response');
+		return $bootstrap_request;
+	}
 
 
-    /**
-     * run_request_stack
-     * construct request stack and run middleware apps
-     *
-     * @throws EE_Error
-     * @throws Exception
-     * @throws Throwable
-     */
-    public function runRequestStack()
-    {
-        $this->loadAutoloader();
-        $this->setAutoloadersForRequiredFiles();
-        $this->request_stack_builder = $this->buildRequestStack();
-        $this->request_stack         = $this->request_stack_builder->resolve(
-            new RequestStackCoreApp()
-        );
-        $this->request_stack->handleRequest($this->request, $this->response);
-        $this->request_stack->handleResponse();
-    }
+	/**
+	 * run_request_stack
+	 * construct request stack and run middleware apps
+	 *
+	 * @throws EE_Error
+	 * @throws Exception
+	 * @throws Throwable
+	 */
+	public function runRequestStack()
+	{
+		$this->loadAutoloader();
+		$this->setAutoloadersForRequiredFiles();
+		$this->request_stack_builder = $this->buildRequestStack();
+		$this->request_stack         = $this->request_stack_builder->resolve(
+			new RequestStackCoreApp()
+		);
+		$this->request_stack->handleRequest($this->request, $this->response);
+		$this->request_stack->handleResponse();
+	}
 
 
-    /**
-     * load_autoloader
-     *
-     * @throws EE_Error
-     */
-    protected function loadAutoloader()
-    {
-        // load interfaces
-        espresso_load_required(
-            'EEH_Autoloader',
-            EE_CORE . 'helpers/EEH_Autoloader.helper.php'
-        );
-        EEH_Autoloader::instance();
-    }
+	/**
+	 * load_autoloader
+	 *
+	 * @throws EE_Error
+	 */
+	protected function loadAutoloader()
+	{
+		// load interfaces
+		espresso_load_required(
+			'EEH_Autoloader',
+			EE_CORE . 'helpers/EEH_Autoloader.helper.php'
+		);
+		EEH_Autoloader::instance();
+	}
 
 
-    /**
-     * load_required_files
-     *
-     * @throws EE_Error
-     */
-    protected function setAutoloadersForRequiredFiles()
-    {
-        // load interfaces
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces', true);
-        // load helpers
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
-        // register legacy request stack classes just in case
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'request_stack/');
-        // register legacy middleware classes just in case
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'middleware/');
-    }
+	/**
+	 * load_required_files
+	 *
+	 * @throws EE_Error
+	 */
+	protected function setAutoloadersForRequiredFiles()
+	{
+		// load interfaces
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces', true);
+		// load helpers
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
+		// register legacy request stack classes just in case
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'request_stack/');
+		// register legacy middleware classes just in case
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'middleware/');
+	}
 
 
-    /**
-     * build_request_stack
-     *
-     * @return RequestStackBuilder
-     */
-    public function buildRequestStack(): RequestStackBuilder
-    {
-        $request_stack_builder = new RequestStackBuilder($this->loader);
-        /**
-         * ! IMPORTANT ! The middleware stack operates FILO : FIRST IN LAST OUT
-         * so items at the beginning of the final middleware stack will run last.
-         * First parameter is the middleware classname, second is an array of arguments
-         */
-        $stack_apps = apply_filters(
-            'FHEE__EventEspresso_core_services_bootstrap_BootstrapCore__buildRequestStack__stack_apps',
-            [
-                // first in last out
-                BotDetector::class                 => [],
-                DetectFileEditorRequest::class     => [],
-                PreProductionVersionWarning::class => [],
-                RecommendedVersions::class         => [],
-                DetectLogin::class                 => [],
-                // last in first out
-                SkipRequests::class                => [],
-            ]
-        );
-        // legacy filter for backwards compatibility
-        $stack_apps = apply_filters(
-            'FHEE__EE_Bootstrap__build_request_stack__stack_apps',
-            $stack_apps
-        );
-        // load middleware onto stack : FILO (First In Last Out)
-        // items at the beginning of the $stack_apps array will run last
-        foreach ((array) $stack_apps as $stack_app => $stack_app_args) {
-            $request_stack_builder->push([$stack_app, $stack_app_args]);
-        }
-        // finally, we'll add this on its own because we need it to always be part of the stack
-        // and we also need it to always run first because the rest of the system relies on it
-        $request_stack_builder->push(
-            [SetRequestTypeContextChecker::class, []]
-        );
-        return apply_filters(
-            'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
-            $request_stack_builder
-        );
-    }
+	/**
+	 * build_request_stack
+	 *
+	 * @return RequestStackBuilder
+	 */
+	public function buildRequestStack(): RequestStackBuilder
+	{
+		$request_stack_builder = new RequestStackBuilder($this->loader);
+		/**
+		 * ! IMPORTANT ! The middleware stack operates FILO : FIRST IN LAST OUT
+		 * so items at the beginning of the final middleware stack will run last.
+		 * First parameter is the middleware classname, second is an array of arguments
+		 */
+		$stack_apps = apply_filters(
+			'FHEE__EventEspresso_core_services_bootstrap_BootstrapCore__buildRequestStack__stack_apps',
+			[
+				// first in last out
+				BotDetector::class                 => [],
+				DetectFileEditorRequest::class     => [],
+				PreProductionVersionWarning::class => [],
+				RecommendedVersions::class         => [],
+				DetectLogin::class                 => [],
+				// last in first out
+				SkipRequests::class                => [],
+			]
+		);
+		// legacy filter for backwards compatibility
+		$stack_apps = apply_filters(
+			'FHEE__EE_Bootstrap__build_request_stack__stack_apps',
+			$stack_apps
+		);
+		// load middleware onto stack : FILO (First In Last Out)
+		// items at the beginning of the $stack_apps array will run last
+		foreach ((array) $stack_apps as $stack_app => $stack_app_args) {
+			$request_stack_builder->push([$stack_app, $stack_app_args]);
+		}
+		// finally, we'll add this on its own because we need it to always be part of the stack
+		// and we also need it to always run first because the rest of the system relies on it
+		$request_stack_builder->push(
+			[SetRequestTypeContextChecker::class, []]
+		);
+		return apply_filters(
+			'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
+			$request_stack_builder
+		);
+	}
 }

core/services/container/OpenCoffeeShop.php

Spacing +8 added lines, -8 removed lines

@@ -129,8 +129,8 @@ 
                 array(),
                 CoffeeMaker::BREW_LOAD_ONLY,
                 array(
-                    EE_INTERFACES . '*.php',
-                    EE_INTERFACES . '*.interfaces.php',
+                    EE_INTERFACES.'*.php',
+                    EE_INTERFACES.'*.interfaces.php',
                 )
             )
         );
@@ -142,7 +142,7 @@ 
                 array(),
                 array(),
                 CoffeeMaker::BREW_SHARED,
-                EE_MODELS . '*.model.php'
+                EE_MODELS.'*.model.php'
             )
         );
         // add a wildcard recipe for loading core classes
@@ -154,10 +154,10 @@ 
                 array(),
                 CoffeeMaker::BREW_SHARED,
                 array(
-                    EE_CORE . '*.core.php',
-                    EE_ADMIN . '*.core.php',
-                    EE_CPTS . '*.core.php',
-                    EE_CORE . 'data_migration_scripts/*.core.php',
+                    EE_CORE.'*.core.php',
+                    EE_ADMIN.'*.core.php',
+                    EE_CPTS.'*.core.php',
+                    EE_CORE.'data_migration_scripts/*.core.php',
                 )
             )
         );
@@ -169,7 +169,7 @@ 
                 array(),
                 array(),
                 CoffeeMaker::BREW_LOAD_ONLY,
-                array(EE_ADMIN . '*.core.php')
+                array(EE_ADMIN.'*.core.php')
             )
         );
         // add a wildcard recipe for loading core classes

Indentation +178 added lines, -178 removed lines

@@ -19,192 +19,192 @@
  */
 class OpenCoffeeShop
 {
-    /**
-     * @var CoffeeShop $CoffeeShop
-     */
-    private $CoffeeShop;
+	/**
+	 * @var CoffeeShop $CoffeeShop
+	 */
+	private $CoffeeShop;
 
 
-    /**
-     * OpenCoffeeShop constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        // instantiate the DI container
-        $this->CoffeeShop = new CoffeeShop();
-    }
+	/**
+	 * OpenCoffeeShop constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		// instantiate the DI container
+		$this->CoffeeShop = new CoffeeShop();
+	}
 
 
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    /**
-     * @return CoffeeShop
-     */
-    public function CoffeeShop()
-    {
-        return $this->CoffeeShop;
-    }
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	/**
+	 * @return CoffeeShop
+	 */
+	public function CoffeeShop()
+	{
+		return $this->CoffeeShop;
+	}
 
 
-    /**
-     * configure coffee makers which control the different kinds of brews
-     * ( shared services, new factory objects, etc )
-     *
-     * @throws InvalidEntityException
-     */
-    public function setupCoffeeMakers()
-    {
-        // create a dependency injector class for resolving class constructor arguments
-        $DependencyInjector = new DependencyInjector(
-            $this->CoffeeShop,
-            new \EEH_Array()
-        );
-        // and some coffeemakers, one for creating new instances
-        $this->CoffeeShop->addCoffeeMaker(
-            new NewCoffeeMaker($this->CoffeeShop, $DependencyInjector),
-            CoffeeMaker::BREW_NEW
-        );
-        // one for shared services
-        $this->CoffeeShop->addCoffeeMaker(
-            new SharedCoffeeMaker($this->CoffeeShop, $DependencyInjector),
-            CoffeeMaker::BREW_SHARED
-        );
-        // and one for classes that only get loaded
-        $this->CoffeeShop->addCoffeeMaker(
-            new LoadOnlyCoffeeMaker($this->CoffeeShop, $DependencyInjector),
-            CoffeeMaker::BREW_LOAD_ONLY
-        );
-    }
+	/**
+	 * configure coffee makers which control the different kinds of brews
+	 * ( shared services, new factory objects, etc )
+	 *
+	 * @throws InvalidEntityException
+	 */
+	public function setupCoffeeMakers()
+	{
+		// create a dependency injector class for resolving class constructor arguments
+		$DependencyInjector = new DependencyInjector(
+			$this->CoffeeShop,
+			new \EEH_Array()
+		);
+		// and some coffeemakers, one for creating new instances
+		$this->CoffeeShop->addCoffeeMaker(
+			new NewCoffeeMaker($this->CoffeeShop, $DependencyInjector),
+			CoffeeMaker::BREW_NEW
+		);
+		// one for shared services
+		$this->CoffeeShop->addCoffeeMaker(
+			new SharedCoffeeMaker($this->CoffeeShop, $DependencyInjector),
+			CoffeeMaker::BREW_SHARED
+		);
+		// and one for classes that only get loaded
+		$this->CoffeeShop->addCoffeeMaker(
+			new LoadOnlyCoffeeMaker($this->CoffeeShop, $DependencyInjector),
+			CoffeeMaker::BREW_LOAD_ONLY
+		);
+	}
 
 
-    /**
-     * Recipes define how to load legacy classes
-     *
-     * @throws InvalidIdentifierException
-     */
-    public function addRecipes()
-    {
-        // add default recipe, which should handle loading for most PSR-4 compatible classes
-        // as long as they are not type hinting for interfaces
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                Recipe::DEFAULT_ID
-            )
-        );
-        // PSR-4 compatible class with aliases
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'CommandHandlerManager',
-                'EventEspresso\core\services\commands\CommandHandlerManager',
-                array(
-                    'CommandHandlerManagerInterface',
-                    'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
-                ),
-                array(),
-                CoffeeMaker::BREW_SHARED
-            )
-        );
-        // PSR-4 compatible class with aliases, which dependency on CommandHandlerManager
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'CommandBus',
-                'EventEspresso\core\services\commands\CommandBus',
-                array(
-                    'CommandBusInterface',
-                    'EventEspresso\core\services\commands\CommandBusInterface',
-                ),
-                array(),
-                CoffeeMaker::BREW_SHARED
-            )
-        );
-        // LEGACY classes that are NOT compatible with PSR-4 autoloading, and so must specify a filepath
-        // add a wildcard recipe for loading legacy core interfaces
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'EEI_*',
-                '',
-                array(),
-                array(),
-                CoffeeMaker::BREW_LOAD_ONLY,
-                array(
-                    EE_INTERFACES . '*.php',
-                    EE_INTERFACES . '*.interfaces.php',
-                )
-            )
-        );
-        // add a wildcard recipe for loading models
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'EEM_*',
-                '',
-                array(),
-                array(),
-                CoffeeMaker::BREW_SHARED,
-                EE_MODELS . '*.model.php'
-            )
-        );
-        // add a wildcard recipe for loading core classes
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'EE_*',
-                '',
-                array(),
-                array(),
-                CoffeeMaker::BREW_SHARED,
-                array(
-                    EE_CORE . '*.core.php',
-                    EE_ADMIN . '*.core.php',
-                    EE_CPTS . '*.core.php',
-                    EE_CORE . 'data_migration_scripts/*.core.php',
-                )
-            )
-        );
-        // load admin page parent class
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'EE_Admin_Page*',
-                '',
-                array(),
-                array(),
-                CoffeeMaker::BREW_LOAD_ONLY,
-                array(EE_ADMIN . '*.core.php')
-            )
-        );
-        // add a wildcard recipe for loading core classes
-        // $this->CoffeeShop->addRecipe(
-        //     new Recipe(
-        //         '*_Admin_Page',
-        //         '',
-        //         array(),
-        //         array(),
-        //         CoffeeMaker::BREW_SHARED,
-        //         array(
-        //             EE_ADMIN_PAGES . 'transactions/*.core.php',
-        //         )
-        //     )
-        // );
-    }
+	/**
+	 * Recipes define how to load legacy classes
+	 *
+	 * @throws InvalidIdentifierException
+	 */
+	public function addRecipes()
+	{
+		// add default recipe, which should handle loading for most PSR-4 compatible classes
+		// as long as they are not type hinting for interfaces
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				Recipe::DEFAULT_ID
+			)
+		);
+		// PSR-4 compatible class with aliases
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'CommandHandlerManager',
+				'EventEspresso\core\services\commands\CommandHandlerManager',
+				array(
+					'CommandHandlerManagerInterface',
+					'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
+				),
+				array(),
+				CoffeeMaker::BREW_SHARED
+			)
+		);
+		// PSR-4 compatible class with aliases, which dependency on CommandHandlerManager
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'CommandBus',
+				'EventEspresso\core\services\commands\CommandBus',
+				array(
+					'CommandBusInterface',
+					'EventEspresso\core\services\commands\CommandBusInterface',
+				),
+				array(),
+				CoffeeMaker::BREW_SHARED
+			)
+		);
+		// LEGACY classes that are NOT compatible with PSR-4 autoloading, and so must specify a filepath
+		// add a wildcard recipe for loading legacy core interfaces
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'EEI_*',
+				'',
+				array(),
+				array(),
+				CoffeeMaker::BREW_LOAD_ONLY,
+				array(
+					EE_INTERFACES . '*.php',
+					EE_INTERFACES . '*.interfaces.php',
+				)
+			)
+		);
+		// add a wildcard recipe for loading models
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'EEM_*',
+				'',
+				array(),
+				array(),
+				CoffeeMaker::BREW_SHARED,
+				EE_MODELS . '*.model.php'
+			)
+		);
+		// add a wildcard recipe for loading core classes
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'EE_*',
+				'',
+				array(),
+				array(),
+				CoffeeMaker::BREW_SHARED,
+				array(
+					EE_CORE . '*.core.php',
+					EE_ADMIN . '*.core.php',
+					EE_CPTS . '*.core.php',
+					EE_CORE . 'data_migration_scripts/*.core.php',
+				)
+			)
+		);
+		// load admin page parent class
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'EE_Admin_Page*',
+				'',
+				array(),
+				array(),
+				CoffeeMaker::BREW_LOAD_ONLY,
+				array(EE_ADMIN . '*.core.php')
+			)
+		);
+		// add a wildcard recipe for loading core classes
+		// $this->CoffeeShop->addRecipe(
+		//     new Recipe(
+		//         '*_Admin_Page',
+		//         '',
+		//         array(),
+		//         array(),
+		//         CoffeeMaker::BREW_SHARED,
+		//         array(
+		//             EE_ADMIN_PAGES . 'transactions/*.core.php',
+		//         )
+		//     )
+		// );
+	}
 
 
-    /**
-     * bootstrap EE and the request stack
-     *
-     * @throws ServiceNotFoundException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidIdentifierException
-     * @throws exceptions\ServiceExistsException
-     * @throws OutOfBoundsException
-     * @throws exceptions\InstantiationException
-     */
-    public function firstBrew()
-    {
-        $this->CoffeeShop->brew(
-            'EventEspresso\core\services\request\Request',
-            array($_GET, $_POST, $_COOKIE, $_SERVER)
-        );
-        $this->CoffeeShop->brew('EventEspresso\core\services\request\Response');
-        $this->CoffeeShop->brew('EE_Bootstrap');
-    }
+	/**
+	 * bootstrap EE and the request stack
+	 *
+	 * @throws ServiceNotFoundException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidIdentifierException
+	 * @throws exceptions\ServiceExistsException
+	 * @throws OutOfBoundsException
+	 * @throws exceptions\InstantiationException
+	 */
+	public function firstBrew()
+	{
+		$this->CoffeeShop->brew(
+			'EventEspresso\core\services\request\Request',
+			array($_GET, $_POST, $_COOKIE, $_SERVER)
+		);
+		$this->CoffeeShop->brew('EventEspresso\core\services\request\Response');
+		$this->CoffeeShop->brew('EE_Bootstrap');
+	}
 }