eventespresso / event-espresso-core

admin_pages/transactions/Transactions_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -22,15 +22,15 @@
     {
 
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! defined('TXN_PG_SLUG')) {
+        if ( ! defined('TXN_PG_SLUG')) {
             define('TXN_PG_SLUG', 'espresso_transactions');
             define('TXN_PG_NAME', ucwords(str_replace('_', '', TXN_PG_SLUG)));
-            define('TXN_ADMIN', EE_ADMIN_PAGES . 'transactions/');
-            define('TXN_ADMIN_URL', admin_url('admin.php?page=' . TXN_PG_SLUG));
-            define('TXN_ASSETS_PATH', TXN_ADMIN . 'assets/');
-            define('TXN_ASSETS_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/assets/'));
-            define('TXN_TEMPLATE_PATH', TXN_ADMIN . 'templates/');
-            define('TXN_TEMPLATE_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/templates/'));
+            define('TXN_ADMIN', EE_ADMIN_PAGES.'transactions/');
+            define('TXN_ADMIN_URL', admin_url('admin.php?page='.TXN_PG_SLUG));
+            define('TXN_ASSETS_PATH', TXN_ADMIN.'assets/');
+            define('TXN_ASSETS_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL.'transactions/assets/'));
+            define('TXN_TEMPLATE_PATH', TXN_ADMIN.'templates/');
+            define('TXN_TEMPLATE_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL.'transactions/templates/'));
         }
         parent::__construct();
     }

Indentation +49 added lines, -49 removed lines

@@ -11,58 +11,58 @@
  */
 class Transactions_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    /**
-     * @Constructor
-     * @access public
-     * @return Transactions_Admin_Page_Init
-     */
-    public function __construct()
-    {
+	/**
+	 * @Constructor
+	 * @access public
+	 * @return Transactions_Admin_Page_Init
+	 */
+	public function __construct()
+	{
 
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! defined('TXN_PG_SLUG')) {
-            define('TXN_PG_SLUG', 'espresso_transactions');
-            define('TXN_PG_NAME', ucwords(str_replace('_', '', TXN_PG_SLUG)));
-            define('TXN_ADMIN', EE_ADMIN_PAGES . 'transactions/');
-            define('TXN_ADMIN_URL', admin_url('admin.php?page=' . TXN_PG_SLUG));
-            define('TXN_ASSETS_PATH', TXN_ADMIN . 'assets/');
-            define('TXN_ASSETS_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/assets/'));
-            define('TXN_TEMPLATE_PATH', TXN_ADMIN . 'templates/');
-            define('TXN_TEMPLATE_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/templates/'));
-        }
-        parent::__construct();
-    }
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if (! defined('TXN_PG_SLUG')) {
+			define('TXN_PG_SLUG', 'espresso_transactions');
+			define('TXN_PG_NAME', ucwords(str_replace('_', '', TXN_PG_SLUG)));
+			define('TXN_ADMIN', EE_ADMIN_PAGES . 'transactions/');
+			define('TXN_ADMIN_URL', admin_url('admin.php?page=' . TXN_PG_SLUG));
+			define('TXN_ASSETS_PATH', TXN_ADMIN . 'assets/');
+			define('TXN_ASSETS_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/assets/'));
+			define('TXN_TEMPLATE_PATH', TXN_ADMIN . 'templates/');
+			define('TXN_TEMPLATE_URL', str_replace('\\', '/', EE_ADMIN_PAGES_URL . 'transactions/templates/'));
+		}
+		parent::__construct();
+	}
 
 
-    /**
-     *    _set_init_properties
-     *
-     * @return void
-     */
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Transactions Overview', 'event_espresso');
-    }
+	/**
+	 *    _set_init_properties
+	 *
+	 * @return void
+	 */
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Transactions Overview', 'event_espresso');
+	}
 
 
-    /**
-     *    _set_menu_map
-     *
-     * @return void
-     */
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'main',
-                'menu_order'      => 50,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => TXN_PG_SLUG,
-                'menu_label'      => esc_html__('Transactions', 'event_espresso'),
-                'capability'      => 'ee_read_transactions',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	/**
+	 *    _set_menu_map
+	 *
+	 * @return void
+	 */
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'main',
+				'menu_order'      => 50,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => TXN_PG_SLUG,
+				'menu_label'      => esc_html__('Transactions', 'event_espresso'),
+				'capability'      => 'ee_read_transactions',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

admin_pages/venues/Venues_Admin_Page_Init.core.php

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
     {
         // define some event categories related constants
         define('EE_VENUES_PG_SLUG', 'espresso_venues');
-        define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page=' . EE_VENUES_PG_SLUG));
-        define('EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'venues/assets/');
-        define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES . 'venues/templates/');
+        define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page='.EE_VENUES_PG_SLUG));
+        define('EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL.'venues/assets/');
+        define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES.'venues/templates/');
 
         parent::__construct();
-        $this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . '/';
+        $this->_folder_path = EE_ADMIN_PAGES.$this->_folder_name.'/';
     }
 
     protected function _set_init_properties()

Indentation +31 added lines, -31 removed lines

@@ -15,39 +15,39 @@
  */
 class Venues_Admin_Page_Init extends EE_Admin_Page_CPT_Init
 {
-    public function __construct()
-    {
-        // define some event categories related constants
-        define('EE_VENUES_PG_SLUG', 'espresso_venues');
-        define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page=' . EE_VENUES_PG_SLUG));
-        define('EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'venues/assets/');
-        define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES . 'venues/templates/');
+	public function __construct()
+	{
+		// define some event categories related constants
+		define('EE_VENUES_PG_SLUG', 'espresso_venues');
+		define('EE_VENUES_ADMIN_URL', admin_url('admin.php?page=' . EE_VENUES_PG_SLUG));
+		define('EE_VENUES_ASSETS_URL', EE_ADMIN_PAGES_URL . 'venues/assets/');
+		define('EE_VENUES_TEMPLATE_PATH', EE_ADMIN_PAGES . 'venues/templates/');
 
-        parent::__construct();
-        $this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . '/';
-    }
+		parent::__construct();
+		$this->_folder_path = EE_ADMIN_PAGES . $this->_folder_name . '/';
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Event Venues', 'event_espresso');
-        $this->menu_label = esc_html__('Venues', 'event_espresso');
-        $this->menu_slug = EE_VENUES_PG_SLUG;
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Event Venues', 'event_espresso');
+		$this->menu_label = esc_html__('Venues', 'event_espresso');
+		$this->menu_slug = EE_VENUES_PG_SLUG;
+	}
 
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'management',
-                'menu_order'      => 40,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => EE_VENUES_PG_SLUG,
-                'menu_label'      => esc_html__('Venues', 'event_espresso'),
-                'capability'      => 'ee_read_venues',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'management',
+				'menu_order'      => 40,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => EE_VENUES_PG_SLUG,
+				'menu_label'      => esc_html__('Venues', 'event_espresso'),
+				'capability'      => 'ee_read_venues',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

admin_pages/messages/Messages_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -24,15 +24,15 @@
 
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        if (! defined('EE_MSG_PG_SLUG')) {
+        if ( ! defined('EE_MSG_PG_SLUG')) {
             define('EE_MSG_PG_SLUG', 'espresso_messages');
             define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
-            define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages/');
-            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
-            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets/');
-            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
-            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates/');
-            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
+            define('EE_MSG_ADMIN', EE_ADMIN_PAGES.'messages/');
+            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page='.EE_MSG_PG_SLUG));
+            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN.'assets/');
+            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL.'messages/assets/');
+            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN.'templates/');
+            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'messages/templates/');
         }
 
         parent::__construct();

Indentation +41 added lines, -41 removed lines

@@ -13,52 +13,52 @@
  */
 class Messages_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    /**
-     *constructor
-     *
-     * @Constructor
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
+	/**
+	 *constructor
+	 *
+	 * @Constructor
+	 * @access public
+	 * @return void
+	 */
+	public function __construct()
+	{
 
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        if (! defined('EE_MSG_PG_SLUG')) {
-            define('EE_MSG_PG_SLUG', 'espresso_messages');
-            define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
-            define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages/');
-            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
-            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets/');
-            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
-            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates/');
-            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
-        }
+		if (! defined('EE_MSG_PG_SLUG')) {
+			define('EE_MSG_PG_SLUG', 'espresso_messages');
+			define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
+			define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages/');
+			define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
+			define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets/');
+			define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
+			define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates/');
+			define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
+		}
 
-        parent::__construct();
-    }
+		parent::__construct();
+	}
 
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Messages System', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Messages System', 'event_espresso');
+	}
 
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'management',
-                'menu_order'      => 10,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => EE_MSG_PG_SLUG,
-                'menu_label'      => esc_html__('Messages', 'event_espresso'),
-                'capability'      => 'ee_read_global_messages',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'management',
+				'menu_order'      => 10,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => EE_MSG_PG_SLUG,
+				'menu_label'      => esc_html__('Messages', 'event_espresso'),
+				'capability'      => 'ee_read_global_messages',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

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 +41 added lines, -41 removed lines

@@ -11,50 +11,50 @@
  */
 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');
+	}
 
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'main',
-                'menu_order'      => 40,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => REG_PG_SLUG,
-                'menu_label'      => esc_html__('Registrations', 'event_espresso'),
-                'capability'      => 'ee_read_registrations',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'main',
+				'menu_order'      => 40,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => REG_PG_SLUG,
+				'menu_label'      => esc_html__('Registrations', 'event_espresso'),
+				'capability'      => 'ee_read_registrations',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

payment_methods/Paypal_Express/EE_PMT_Paypal_Express.pm.php

Spacing +3 added lines, -3 removed lines

@@ -20,18 +20,18 @@
      */
     public function __construct($pm_instance = null)
     {
-        require_once($this->file_folder() . 'EEG_Paypal_Express.gateway.php');
+        require_once($this->file_folder().'EEG_Paypal_Express.gateway.php');
         $this->_gateway = new EEG_Paypal_Express();
 
         $this->_pretty_name = esc_html__('PayPal Express', 'event_espresso');
-        $this->_template_path = $this->file_folder() . 'templates/';
+        $this->_template_path = $this->file_folder().'templates/';
         $this->_default_description = esc_html__(
             // @codingStandardsIgnoreStart
             'After clicking \'Finalize Registration\', you will be forwarded to PayPal website to Login and make your payment.',
             // @codingStandardsIgnoreEnd
             'event_espresso'
         );
-        $this->_default_button_url = $this->file_url() . 'lib/paypal-express-checkout-logo-gold-160.png';
+        $this->_default_button_url = $this->file_url().'lib/paypal-express-checkout-logo-gold-160.png';
 
         parent::__construct($pm_instance);
     }

Indentation +76 added lines, -76 removed lines

@@ -14,89 +14,89 @@
  */
 class EE_PMT_Paypal_Express extends EE_PMT_Base
 {
-    /**
-     * EE_PMT_Paypal_Express constructor.
-     */
-    public function __construct($pm_instance = null)
-    {
-        require_once($this->file_folder() . 'EEG_Paypal_Express.gateway.php');
-        $this->_gateway = new EEG_Paypal_Express();
+	/**
+	 * EE_PMT_Paypal_Express constructor.
+	 */
+	public function __construct($pm_instance = null)
+	{
+		require_once($this->file_folder() . 'EEG_Paypal_Express.gateway.php');
+		$this->_gateway = new EEG_Paypal_Express();
 
-        $this->_pretty_name = esc_html__('PayPal Express', 'event_espresso');
-        $this->_template_path = $this->file_folder() . 'templates/';
-        $this->_default_description = esc_html__(
-            // @codingStandardsIgnoreStart
-            'After clicking \'Finalize Registration\', you will be forwarded to PayPal website to Login and make your payment.',
-            // @codingStandardsIgnoreEnd
-            'event_espresso'
-        );
-        $this->_default_button_url = $this->file_url() . 'lib/paypal-express-checkout-logo-gold-160.png';
+		$this->_pretty_name = esc_html__('PayPal Express', 'event_espresso');
+		$this->_template_path = $this->file_folder() . 'templates/';
+		$this->_default_description = esc_html__(
+			// @codingStandardsIgnoreStart
+			'After clicking \'Finalize Registration\', you will be forwarded to PayPal website to Login and make your payment.',
+			// @codingStandardsIgnoreEnd
+			'event_espresso'
+		);
+		$this->_default_button_url = $this->file_url() . 'lib/paypal-express-checkout-logo-gold-160.png';
 
-        parent::__construct($pm_instance);
-    }
+		parent::__construct($pm_instance);
+	}
 
 
-    /**
-     * Adds the help tab.
-     *
-     * @see EE_PMT_Base::help_tabs_config()
-     * @return array
-     */
-    public function help_tabs_config()
-    {
-        return array(
-            $this->get_help_tab_name() => array(
-                'title'    => esc_html__('PayPal Express Settings', 'event_espresso'),
-                'filename' => 'payment_methods_overview_paypal_express'
-            )
-        );
-    }
+	/**
+	 * Adds the help tab.
+	 *
+	 * @see EE_PMT_Base::help_tabs_config()
+	 * @return array
+	 */
+	public function help_tabs_config()
+	{
+		return array(
+			$this->get_help_tab_name() => array(
+				'title'    => esc_html__('PayPal Express Settings', 'event_espresso'),
+				'filename' => 'payment_methods_overview_paypal_express'
+			)
+		);
+	}
 
 
-    /**
-     * Gets the form for all the settings related to this payment method type.
-     *
-     * @return EE_Payment_Method_Form
-     */
-    public function generate_new_settings_form()
-    {
-        return new SettingsForm(array(), $this->get_help_tab_link());
-    }
+	/**
+	 * Gets the form for all the settings related to this payment method type.
+	 *
+	 * @return EE_Payment_Method_Form
+	 */
+	public function generate_new_settings_form()
+	{
+		return new SettingsForm(array(), $this->get_help_tab_link());
+	}
 
 
-    /**
-     * Creates a billing form for this payment method type.
-     *
-     * @param \EE_Transaction $transaction
-     * @return \EE_Billing_Info_Form
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null)
-    {
-        if ($this->_pm_instance->debug_mode()) {
-            $form = new EE_Billing_Info_Form(
-                $this->_pm_instance,
-                array(
-                    'name' => 'paypal_express_Info_Form',
-                    'subsections' => array(
-                        'paypal_express_debug_info' => new EE_Form_Section_Proper(
-                            array(
-                                'layout_strategy' => new EE_Template_Layout(
-                                    array(
-                                        'layout_template_file' => $this->_template_path
-                                                                    . 'paypal_express_debug_info.template.php',
-                                        'template_args'        => array(
-                                            'debug_mode' => $this->_pm_instance->debug_mode()
-                                        )
-                                    )
-                                )
-                            )
-                        )
-                    )
-                )
-            );
-            return $form;
-        }
+	/**
+	 * Creates a billing form for this payment method type.
+	 *
+	 * @param \EE_Transaction $transaction
+	 * @return \EE_Billing_Info_Form
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null)
+	{
+		if ($this->_pm_instance->debug_mode()) {
+			$form = new EE_Billing_Info_Form(
+				$this->_pm_instance,
+				array(
+					'name' => 'paypal_express_Info_Form',
+					'subsections' => array(
+						'paypal_express_debug_info' => new EE_Form_Section_Proper(
+							array(
+								'layout_strategy' => new EE_Template_Layout(
+									array(
+										'layout_template_file' => $this->_template_path
+																	. 'paypal_express_debug_info.template.php',
+										'template_args'        => array(
+											'debug_mode' => $this->_pm_instance->debug_mode()
+										)
+									)
+								)
+							)
+						)
+					)
+				)
+			);
+			return $form;
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

core/services/bootstrap/BootstrapRequestResponseObjects.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
     {
         espresso_load_required(
             'EE_Request',
-            EE_CORE . 'request_stack/EE_Request.core.php'
+            EE_CORE.'request_stack/EE_Request.core.php'
         );
         $this->legacy_request = new EE_Request($_GET, $_POST, $_COOKIE, $_SERVER);
         $this->legacy_request->setRequest($this->request);

Indentation +69 added lines, -69 removed lines

@@ -28,84 +28,84 @@
  */
 class BootstrapRequestResponseObjects
 {
-    /**
-     * @type LegacyRequestInterface $legacy_request
-     */
-    protected $legacy_request;
+	/**
+	 * @type LegacyRequestInterface $legacy_request
+	 */
+	protected $legacy_request;
 
-    /**
-     * @type LoaderInterface $loader
-     */
-    protected $loader;
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	protected $loader;
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
 
 
-    /**
-     * BootstrapRequestResponseObjects constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * BootstrapRequestResponseObjects constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * @return void
-     */
-    public function buildRequestResponse()
-    {
-        $request_params = new RequestParams(new RequestSanitizer());
-        $server_params = new ServerParams(new ServerSanitizer());
-        // load our Request and Response objects
-        $this->request = new Request($request_params, $server_params);
-        $this->response = new Response();
-        $this->loader->share(RequestParams::class, $request_params);
-        $this->loader->share(ServerParams::class, $server_params);
-    }
+	/**
+	 * @return void
+	 */
+	public function buildRequestResponse()
+	{
+		$request_params = new RequestParams(new RequestSanitizer());
+		$server_params = new ServerParams(new ServerSanitizer());
+		// load our Request and Response objects
+		$this->request = new Request($request_params, $server_params);
+		$this->response = new Response();
+		$this->loader->share(RequestParams::class, $request_params);
+		$this->loader->share(ServerParams::class, $server_params);
+	}
 
 
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     */
-    public function shareRequestResponse()
-    {
-        $this->loader->share('EventEspresso\core\services\request\Request', $this->request);
-        $this->loader->share('EventEspresso\core\services\request\Response', $this->response);
-        EE_Dependency_Map::instance()->setRequest($this->request);
-        EE_Dependency_Map::instance()->setResponse($this->response);
-    }
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 */
+	public function shareRequestResponse()
+	{
+		$this->loader->share('EventEspresso\core\services\request\Request', $this->request);
+		$this->loader->share('EventEspresso\core\services\request\Response', $this->response);
+		EE_Dependency_Map::instance()->setRequest($this->request);
+		EE_Dependency_Map::instance()->setResponse($this->response);
+	}
 
 
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     */
-    public function setupLegacyRequest()
-    {
-        espresso_load_required(
-            'EE_Request',
-            EE_CORE . 'request_stack/EE_Request.core.php'
-        );
-        $this->legacy_request = new EE_Request($_GET, $_POST, $_COOKIE, $_SERVER);
-        $this->legacy_request->setRequest($this->request);
-        $this->legacy_request->admin = $this->request->isAdmin();
-        $this->legacy_request->ajax = $this->request->isAjax();
-        $this->legacy_request->front_ajax = $this->request->isFrontAjax();
-        EE_Dependency_Map::instance()->setLegacyRequest($this->legacy_request);
-        $this->loader->share('EE_Request', $this->legacy_request);
-        $this->loader->share('EventEspresso\core\services\request\LegacyRequestInterface', $this->legacy_request);
-    }
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 */
+	public function setupLegacyRequest()
+	{
+		espresso_load_required(
+			'EE_Request',
+			EE_CORE . 'request_stack/EE_Request.core.php'
+		);
+		$this->legacy_request = new EE_Request($_GET, $_POST, $_COOKIE, $_SERVER);
+		$this->legacy_request->setRequest($this->request);
+		$this->legacy_request->admin = $this->request->isAdmin();
+		$this->legacy_request->ajax = $this->request->isAjax();
+		$this->legacy_request->front_ajax = $this->request->isFrontAjax();
+		EE_Dependency_Map::instance()->setLegacyRequest($this->legacy_request);
+		$this->loader->share('EE_Request', $this->legacy_request);
+		$this->loader->share('EventEspresso\core\services\request\LegacyRequestInterface', $this->legacy_request);
+	}
 }

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 +199 added lines, -199 removed lines

@@ -46,225 +46,225 @@
  */
 class BootstrapCore
 {
-    /**
-     * @type LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	private $loader;
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
 
-    /**
-     * @var RequestStackBuilder $request_stack_builder
-     */
-    protected $request_stack_builder;
+	/**
+	 * @var RequestStackBuilder $request_stack_builder
+	 */
+	protected $request_stack_builder;
 
-    /**
-     * @var RequestStack $request_stack
-     */
-    protected $request_stack;
+	/**
+	 * @var RequestStack $request_stack
+	 */
+	protected $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', array($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', array($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
-     */
-    public function initialize()
-    {
-        $this->bootstrapDependencyInjectionContainer();
-        $this->bootstrapDomain();
-        $bootstrap_request = $this->bootstrapRequestResponseObjects();
-        add_action(
-            'EE_Load_Espresso_Core__handle_request__initialize_core_loading',
-            array($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
+	 */
+	public function initialize()
+	{
+		$this->bootstrapDependencyInjectionContainer();
+		$this->bootstrapDomain();
+		$bootstrap_request = $this->bootstrapRequestResponseObjects();
+		add_action(
+			'EE_Load_Espresso_Core__handle_request__initialize_core_loading',
+			array($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()
-    {
-        /** @var BootstrapRequestResponseObjects $bootstrap_request */
-        $bootstrap_request = $this->loader->getShared(
-            'EventEspresso\core\services\bootstrap\BootstrapRequestResponseObjects',
-            array($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()
+	{
+		/** @var BootstrapRequestResponseObjects $bootstrap_request */
+		$bootstrap_request = $this->loader->getShared(
+			'EventEspresso\core\services\bootstrap\BootstrapRequestResponseObjects',
+			array($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
-     */
-    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
+	 */
+	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()
-    {
-        $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',
-            array(
-                // first in last out
-                'EventEspresso\core\services\request\middleware\BotDetector'                 => array(),
-                'EventEspresso\core\services\request\middleware\DetectFileEditorRequest'     => array(),
-                'EventEspresso\core\services\request\middleware\PreProductionVersionWarning' => array(),
-                'EventEspresso\core\services\request\middleware\RecommendedVersions'         => array(),
-                // last in first out
-                'EventEspresso\core\services\request\middleware\DetectLogin'                 => array(),
-            )
-        );
-        // 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(array($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(
-            array('EventEspresso\core\services\request\middleware\SetRequestTypeContextChecker', array())
-        );
-        return apply_filters(
-            'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
-            $request_stack_builder
-        );
-    }
+	/**
+	 * build_request_stack
+	 *
+	 * @return RequestStackBuilder
+	 */
+	public function buildRequestStack()
+	{
+		$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',
+			array(
+				// first in last out
+				'EventEspresso\core\services\request\middleware\BotDetector'                 => array(),
+				'EventEspresso\core\services\request\middleware\DetectFileEditorRequest'     => array(),
+				'EventEspresso\core\services\request\middleware\PreProductionVersionWarning' => array(),
+				'EventEspresso\core\services\request\middleware\RecommendedVersions'         => array(),
+				// last in first out
+				'EventEspresso\core\services\request\middleware\DetectLogin'                 => array(),
+			)
+		);
+		// 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(array($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(
+			array('EventEspresso\core\services\request\middleware\SetRequestTypeContextChecker', array())
+		);
+		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');
+	}
 }

core/services/licensing/LicenseService.php

Indentation +90 added lines, -90 removed lines

@@ -15,94 +15,94 @@
  */
 class LicenseService
 {
-    /**
-     * @var Config
-     */
-    private $config;
-
-
-    /**
-     * @var Stats
-     */
-    private $stats_collection;
-
-    public function __construct(Stats $stats_collection, Config $config)
-    {
-        $this->config = $config;
-        $this->stats_collection = $stats_collection;
-        $this->loadPueClient();
-    }
-
-    private function loadPueClient()
-    {
-        // PUE Auto Upgrades stuff
-        if (is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) { // include the file
-            require_once(EE_THIRD_PARTY . 'pue/pue-client.php');
-
-            // $options needs to be an array with the included keys as listed.
-            $options = array(
-                // 'optionName' => '', //(optional) - used as the reference for saving update information in the
-                // clients options table.  Will be automatically set if left blank.
-                'apikey'                => $this->config->siteLicenseKey(),
-                // (required), you will need to obtain the apikey that the client gets from your site and
-                // then saves in their sites options table (see 'getting an api-key' below)
-                'lang_domain'           => $this->config->i18nDomain(),
-                // (optional) - put here whatever reference you are using for the localization of your plugin (if it's
-                // localized).  That way strings in this file will be included in the translation for your plugin.
-                'checkPeriod'           => $this->config->checkPeriod(),
-                // (optional) - use this parameter to indicate how often you want the client's install to ping your
-                // server for update checks.  The integer indicates hours.  If you don't include this parameter it will
-                // default to 12 hours.
-                'option_key'            => $this->config->optionKey(),
-                // this is what is used to reference the api_key in your plugin options.  PUE uses this to trigger
-                // updating your information message whenever this option_key is modified.
-                'options_page_slug'     => $this->config->optionsPageSlug(),
-                'plugin_basename'       => EE_PLUGIN_BASENAME,
-                'use_wp_update'         => true,
-                // if TRUE then you want FREE versions of the plugin to be updated from WP
-                'extra_stats'           => $this->stats_collection->statsCallback(),
-                'turn_on_notices_saved' => true,
-            );
-            // initiate the class and start the plugin update engine!
-            new PluginUpdateEngineChecker(
-                $this->config->hostServerUrl(),
-                $this->config->pluginSlug(),
-                $options
-            );
-        }
-    }
-
-
-    /**
-     * This is a handy helper method for retrieving whether there is an update available for the given plugin.
-     *
-     * @param  string $basename Use the equivalent result from plugin_basename() for this param as WP uses that to
-     *                          identify plugins. Defaults to core update
-     * @return boolean           True if update available, false if not.
-     */
-    public static function isUpdateAvailable($basename = '')
-    {
-        $basename = ! empty($basename) ? $basename : EE_PLUGIN_BASENAME;
-
-        $update = false;
-
-        // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
-        $folder = '/' . dirname($basename);
-
-        $plugins = get_plugins($folder);
-        $current = get_site_transient('update_plugins');
-
-        foreach ((array) $plugins as $plugin_file => $plugin_data) {
-            if (isset($current->response['plugin_file'])) {
-                $update = true;
-            }
-        }
-
-        // it's possible that there is an update but an invalid site-license-key is in use
-        if (get_site_option('pue_json_error_' . $basename)) {
-            $update = true;
-        }
-
-        return $update;
-    }
+	/**
+	 * @var Config
+	 */
+	private $config;
+
+
+	/**
+	 * @var Stats
+	 */
+	private $stats_collection;
+
+	public function __construct(Stats $stats_collection, Config $config)
+	{
+		$this->config = $config;
+		$this->stats_collection = $stats_collection;
+		$this->loadPueClient();
+	}
+
+	private function loadPueClient()
+	{
+		// PUE Auto Upgrades stuff
+		if (is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) { // include the file
+			require_once(EE_THIRD_PARTY . 'pue/pue-client.php');
+
+			// $options needs to be an array with the included keys as listed.
+			$options = array(
+				// 'optionName' => '', //(optional) - used as the reference for saving update information in the
+				// clients options table.  Will be automatically set if left blank.
+				'apikey'                => $this->config->siteLicenseKey(),
+				// (required), you will need to obtain the apikey that the client gets from your site and
+				// then saves in their sites options table (see 'getting an api-key' below)
+				'lang_domain'           => $this->config->i18nDomain(),
+				// (optional) - put here whatever reference you are using for the localization of your plugin (if it's
+				// localized).  That way strings in this file will be included in the translation for your plugin.
+				'checkPeriod'           => $this->config->checkPeriod(),
+				// (optional) - use this parameter to indicate how often you want the client's install to ping your
+				// server for update checks.  The integer indicates hours.  If you don't include this parameter it will
+				// default to 12 hours.
+				'option_key'            => $this->config->optionKey(),
+				// this is what is used to reference the api_key in your plugin options.  PUE uses this to trigger
+				// updating your information message whenever this option_key is modified.
+				'options_page_slug'     => $this->config->optionsPageSlug(),
+				'plugin_basename'       => EE_PLUGIN_BASENAME,
+				'use_wp_update'         => true,
+				// if TRUE then you want FREE versions of the plugin to be updated from WP
+				'extra_stats'           => $this->stats_collection->statsCallback(),
+				'turn_on_notices_saved' => true,
+			);
+			// initiate the class and start the plugin update engine!
+			new PluginUpdateEngineChecker(
+				$this->config->hostServerUrl(),
+				$this->config->pluginSlug(),
+				$options
+			);
+		}
+	}
+
+
+	/**
+	 * This is a handy helper method for retrieving whether there is an update available for the given plugin.
+	 *
+	 * @param  string $basename Use the equivalent result from plugin_basename() for this param as WP uses that to
+	 *                          identify plugins. Defaults to core update
+	 * @return boolean           True if update available, false if not.
+	 */
+	public static function isUpdateAvailable($basename = '')
+	{
+		$basename = ! empty($basename) ? $basename : EE_PLUGIN_BASENAME;
+
+		$update = false;
+
+		// should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
+		$folder = '/' . dirname($basename);
+
+		$plugins = get_plugins($folder);
+		$current = get_site_transient('update_plugins');
+
+		foreach ((array) $plugins as $plugin_file => $plugin_data) {
+			if (isset($current->response['plugin_file'])) {
+				$update = true;
+			}
+		}
+
+		// it's possible that there is an update but an invalid site-license-key is in use
+		if (get_site_option('pue_json_error_' . $basename)) {
+			$update = true;
+		}
+
+		return $update;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -36,8 +36,8 @@ 
     private function loadPueClient()
     {
         // PUE Auto Upgrades stuff
-        if (is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) { // include the file
-            require_once(EE_THIRD_PARTY . 'pue/pue-client.php');
+        if (is_readable(EE_THIRD_PARTY.'pue/pue-client.php')) { // include the file
+            require_once(EE_THIRD_PARTY.'pue/pue-client.php');
 
             // $options needs to be an array with the included keys as listed.
             $options = array(
@@ -87,7 +87,7 @@ 
         $update = false;
 
         // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
-        $folder = '/' . dirname($basename);
+        $folder = '/'.dirname($basename);
 
         $plugins = get_plugins($folder);
         $current = get_site_transient('update_plugins');
@@ -99,7 +99,7 @@ 
         }
 
         // it's possible that there is an update but an invalid site-license-key is in use
-        if (get_site_option('pue_json_error_' . $basename)) {
+        if (get_site_option('pue_json_error_'.$basename)) {
             $update = true;
         }