eventespresso / event-espresso-core

modules/ticket_selector/TicketSelectorSimple.php

Spacing +1 added lines, -1 removed lines

@@ -72,6 +72,6 @@
         }
         $this->template_args['ticket_description'] = $ticket_selector_row->getTicketDescription();
         $this->template_args['template_path']      =
-            TICKET_SELECTOR_TEMPLATES_PATH . 'simple_ticket_selector.template.php';
+            TICKET_SELECTOR_TEMPLATES_PATH.'simple_ticket_selector.template.php';
     }
 }

Indentation +51 added lines, -51 removed lines

@@ -20,59 +20,59 @@
 class TicketSelectorSimple extends TicketSelector
 {
 
-    /**
-     * @var EE_Ticket $ticket
-     */
-    protected $ticket;
+	/**
+	 * @var EE_Ticket $ticket
+	 */
+	protected $ticket;
 
 
-    /**
-     * TicketSelectorSimple constructor.
-     *
-     * @param EE_Event  $event
-     * @param EE_Ticket $ticket
-     * @param int       $max_attendees
-     * @param array     $template_args
-     * @throws EE_Error
-     */
-    public function __construct(EE_Event $event, EE_Ticket $ticket, $max_attendees, array $template_args)
-    {
-        $this->ticket = $ticket;
-        parent::__construct(
-            $event,
-            [$this->ticket],
-            $max_attendees,
-            $template_args
-        );
-    }
+	/**
+	 * TicketSelectorSimple constructor.
+	 *
+	 * @param EE_Event  $event
+	 * @param EE_Ticket $ticket
+	 * @param int       $max_attendees
+	 * @param array     $template_args
+	 * @throws EE_Error
+	 */
+	public function __construct(EE_Event $event, EE_Ticket $ticket, $max_attendees, array $template_args)
+	{
+		$this->ticket = $ticket;
+		parent::__construct(
+			$event,
+			[$this->ticket],
+			$max_attendees,
+			$template_args
+		);
+	}
 
 
-    /**
-     * sets any and all template args that are required for this Ticket Selector
-     *
-     * @return void
-     * @throws UnexpectedEntityException
-     * @throws EE_Error
-     */
-    protected function addTemplateArgs()
-    {
-        $this->ticket_rows = 1;
-        unset($this->template_args['tickets']);
-        $this->template_args['ticket'] = $this->ticket;
-        $ticket_selector_row           = new TicketSelectorRowSimple(
-            $this->ticket,
-            $this->max_attendees,
-            $this->template_args['date_format'],
-            $this->template_args['event_status']
-        );
-        $this->template_args['TKT_ID'] = $this->ticket->ID();
-        $ticket_selector_row->setupTicketStatusDisplay();
-        $this->template_args['ticket_status_display'] = $ticket_selector_row->getTicketStatusDisplay();
-        if (empty($this->template_args['ticket_status_display'])) {
-            add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-        }
-        $this->template_args['ticket_description'] = $ticket_selector_row->getTicketDescription();
-        $this->template_args['template_path']      =
-            TICKET_SELECTOR_TEMPLATES_PATH . 'simple_ticket_selector.template.php';
-    }
+	/**
+	 * sets any and all template args that are required for this Ticket Selector
+	 *
+	 * @return void
+	 * @throws UnexpectedEntityException
+	 * @throws EE_Error
+	 */
+	protected function addTemplateArgs()
+	{
+		$this->ticket_rows = 1;
+		unset($this->template_args['tickets']);
+		$this->template_args['ticket'] = $this->ticket;
+		$ticket_selector_row           = new TicketSelectorRowSimple(
+			$this->ticket,
+			$this->max_attendees,
+			$this->template_args['date_format'],
+			$this->template_args['event_status']
+		);
+		$this->template_args['TKT_ID'] = $this->ticket->ID();
+		$ticket_selector_row->setupTicketStatusDisplay();
+		$this->template_args['ticket_status_display'] = $ticket_selector_row->getTicketStatusDisplay();
+		if (empty($this->template_args['ticket_status_display'])) {
+			add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+		}
+		$this->template_args['ticket_description'] = $ticket_selector_row->getTicketDescription();
+		$this->template_args['template_path']      =
+			TICKET_SELECTOR_TEMPLATES_PATH . 'simple_ticket_selector.template.php';
+	}
 }

modules/feeds/EED_Feeds.module.php

Indentation +214 added lines, -214 removed lines

@@ -12,218 +12,218 @@
 {
 
 
-    /**
-     * @return EED_Feeds
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-        add_action('parse_request', array('EED_Feeds', 'parse_request'), 10);
-        add_filter('default_feed', array('EED_Feeds', 'default_feed'), 10, 1);
-        add_filter('comment_feed_join', array('EED_Feeds', 'comment_feed_join'), 10, 2);
-        add_filter('comment_feed_where', array('EED_Feeds', 'comment_feed_where'), 10, 2);
-    }
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
-
-
-    /**
-     *    run - initial module setup
-     *
-     * @access    public
-     * @return    void
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     *    default_feed
-     *
-     * @access    public
-     * @param    type    rss2, atom, rss, rdf, rssjs
-     * @return    string
-     */
-    public static function default_feed($type = 'rss2')
-    {
-        // rss2, atom, rss, rdf, rssjs
-        $type = 'rss2';
-        return $type;
-    }
-
-
-    /**
-     *    parse_request
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function parse_request()
-    {
-        $request = self::getRequest();
-        if ($request->requestParamIsSet('post_type')) {
-            // define path to templates
-            define('RSS_FEEDS_TEMPLATES_PATH', str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/');
-            // what kinda post_type are we dealing with ?
-            switch ($request->getRequestParam('post_type')) {
-                case 'espresso_events':
-                    // for rss2, atom, rss, rdf
-                    add_filter('the_excerpt_rss', array('EED_Feeds', 'the_event_feed'), 10, 1);
-                    add_filter('the_content_feed', array('EED_Feeds', 'the_event_feed'), 10, 1);
-                    // for json ( also uses the above filter )
-                    add_filter('rssjs_feed_item', array('EED_Feeds', 'the_event_rssjs_feed'), 10, 1);
-                    break;
-                case 'espresso_venues':
-                    // for rss2, atom, rss, rdf
-                    add_filter('the_excerpt_rss', array('EED_Feeds', 'the_venue_feed'), 10, 1);
-                    add_filter('the_content_feed', array('EED_Feeds', 'the_venue_feed'), 10, 1);
-                    // for json ( also uses the above filter )
-                    add_filter('rssjs_feed_item', array('EED_Feeds', 'the_venue_rssjs_feed'), 10, 1);
-                    break;
-            }
-        }
-    }
-
-
-    /**
-     *    comment_feed_join - EVEN THOUGH... our espresso_attendees custom post type is set to NOT PUBLIC
-     *    WordPress thought it would be a good idea to display the comments for them in the RSS feeds... we think NOT
-     *    so this little snippet of SQL taps into the comment feed query and removes comments for the
-     *    espresso_attendees post_type
-     *
-     * @access    public
-     * @param    string $SQL the JOIN clause for the comment feed query
-     * @return    void
-     */
-    public static function comment_feed_join($SQL)
-    {
-        global $wpdb;
-        // check for wp_posts table in JOIN clause
-        if (strpos($SQL, $wpdb->posts) !== false) {
-            add_filter('EED_Feeds__comment_feed_where__espresso_attendees', '__return_true');
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    comment_feed_where - EVEN THOUGH... our espresso_attendees custom post type is set to NOT PUBLIC
-     *    WordPress thought it would be a good idea to display the comments for them in the RSS feeds... we think NOT
-     *    so this little snippet of SQL taps into the comment feed query and removes comments for the
-     *    espresso_attendees post_type
-     *
-     * @access    public
-     * @param    string $SQL the WHERE clause for the comment feed query
-     * @return    void
-     */
-    public static function comment_feed_where($SQL)
-    {
-        global $wp_query, $wpdb;
-        if ($wp_query->is_comment_feed && apply_filters('EED_Feeds__comment_feed_where__espresso_attendees', false)) {
-            $SQL .= " AND $wpdb->posts.post_type != 'espresso_attendees'";
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    the_event_feed
-     *
-     * @access    public
-     * @param    string $content
-     * @return    void
-     */
-    public static function the_event_feed($content)
-    {
-        if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH . 'espresso_events_feed.template.php')) {
-            global $post;
-            $template_args = array(
-                'EVT_ID'            => $post->ID,
-                'event_description' => get_option('rss_use_excerpt') ? $post->post_excerpt : $post->post_content,
-            );
-            $content = EEH_Template::display_template(
-                RSS_FEEDS_TEMPLATES_PATH . 'espresso_events_feed.template.php',
-                $template_args,
-                true
-            );
-        }
-        return $content;
-    }
-
-
-    /**
-     *    the_event_rssjs_feed
-     *
-     * @access    public
-     * @param    object $item
-     * @return    void
-     */
-    public static function the_event_rssjs_feed($item)
-    {
-        if (is_feed() && isset($item->description)) {
-            $item->description = EED_Feeds::the_event_feed($item->description);
-        }
-        return $item;
-    }
-
-
-    /**
-     *    the_venue_feed
-     *
-     * @access    public
-     * @param    string $content
-     * @return    void
-     */
-    public static function the_venue_feed($content)
-    {
-        if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH . 'espresso_venues_feed.template.php')) {
-            global $post;
-            $template_args = array(
-                'VNU_ID'            => $post->ID,
-                'venue_description' => get_option('rss_use_excerpt') ? $post->post_excerpt : $post->post_content,
-            );
-            $content = EEH_Template::display_template(
-                RSS_FEEDS_TEMPLATES_PATH . 'espresso_venues_feed.template.php',
-                $template_args,
-                true
-            );
-        }
-        return $content;
-    }
-
-
-    /**
-     *    the_venue_rssjs_feed
-     *
-     * @access    public
-     * @param    object $item
-     * @return    void
-     */
-    public static function the_venue_rssjs_feed($item)
-    {
-        if (is_feed() && isset($item->description)) {
-            $item->description = EED_Feeds::the_venue_feed($item->description);
-        }
-        return $item;
-    }
+	/**
+	 * @return EED_Feeds
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+		add_action('parse_request', array('EED_Feeds', 'parse_request'), 10);
+		add_filter('default_feed', array('EED_Feeds', 'default_feed'), 10, 1);
+		add_filter('comment_feed_join', array('EED_Feeds', 'comment_feed_join'), 10, 2);
+		add_filter('comment_feed_where', array('EED_Feeds', 'comment_feed_where'), 10, 2);
+	}
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
+
+
+	/**
+	 *    run - initial module setup
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 *    default_feed
+	 *
+	 * @access    public
+	 * @param    type    rss2, atom, rss, rdf, rssjs
+	 * @return    string
+	 */
+	public static function default_feed($type = 'rss2')
+	{
+		// rss2, atom, rss, rdf, rssjs
+		$type = 'rss2';
+		return $type;
+	}
+
+
+	/**
+	 *    parse_request
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function parse_request()
+	{
+		$request = self::getRequest();
+		if ($request->requestParamIsSet('post_type')) {
+			// define path to templates
+			define('RSS_FEEDS_TEMPLATES_PATH', str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/');
+			// what kinda post_type are we dealing with ?
+			switch ($request->getRequestParam('post_type')) {
+				case 'espresso_events':
+					// for rss2, atom, rss, rdf
+					add_filter('the_excerpt_rss', array('EED_Feeds', 'the_event_feed'), 10, 1);
+					add_filter('the_content_feed', array('EED_Feeds', 'the_event_feed'), 10, 1);
+					// for json ( also uses the above filter )
+					add_filter('rssjs_feed_item', array('EED_Feeds', 'the_event_rssjs_feed'), 10, 1);
+					break;
+				case 'espresso_venues':
+					// for rss2, atom, rss, rdf
+					add_filter('the_excerpt_rss', array('EED_Feeds', 'the_venue_feed'), 10, 1);
+					add_filter('the_content_feed', array('EED_Feeds', 'the_venue_feed'), 10, 1);
+					// for json ( also uses the above filter )
+					add_filter('rssjs_feed_item', array('EED_Feeds', 'the_venue_rssjs_feed'), 10, 1);
+					break;
+			}
+		}
+	}
+
+
+	/**
+	 *    comment_feed_join - EVEN THOUGH... our espresso_attendees custom post type is set to NOT PUBLIC
+	 *    WordPress thought it would be a good idea to display the comments for them in the RSS feeds... we think NOT
+	 *    so this little snippet of SQL taps into the comment feed query and removes comments for the
+	 *    espresso_attendees post_type
+	 *
+	 * @access    public
+	 * @param    string $SQL the JOIN clause for the comment feed query
+	 * @return    void
+	 */
+	public static function comment_feed_join($SQL)
+	{
+		global $wpdb;
+		// check for wp_posts table in JOIN clause
+		if (strpos($SQL, $wpdb->posts) !== false) {
+			add_filter('EED_Feeds__comment_feed_where__espresso_attendees', '__return_true');
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    comment_feed_where - EVEN THOUGH... our espresso_attendees custom post type is set to NOT PUBLIC
+	 *    WordPress thought it would be a good idea to display the comments for them in the RSS feeds... we think NOT
+	 *    so this little snippet of SQL taps into the comment feed query and removes comments for the
+	 *    espresso_attendees post_type
+	 *
+	 * @access    public
+	 * @param    string $SQL the WHERE clause for the comment feed query
+	 * @return    void
+	 */
+	public static function comment_feed_where($SQL)
+	{
+		global $wp_query, $wpdb;
+		if ($wp_query->is_comment_feed && apply_filters('EED_Feeds__comment_feed_where__espresso_attendees', false)) {
+			$SQL .= " AND $wpdb->posts.post_type != 'espresso_attendees'";
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    the_event_feed
+	 *
+	 * @access    public
+	 * @param    string $content
+	 * @return    void
+	 */
+	public static function the_event_feed($content)
+	{
+		if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH . 'espresso_events_feed.template.php')) {
+			global $post;
+			$template_args = array(
+				'EVT_ID'            => $post->ID,
+				'event_description' => get_option('rss_use_excerpt') ? $post->post_excerpt : $post->post_content,
+			);
+			$content = EEH_Template::display_template(
+				RSS_FEEDS_TEMPLATES_PATH . 'espresso_events_feed.template.php',
+				$template_args,
+				true
+			);
+		}
+		return $content;
+	}
+
+
+	/**
+	 *    the_event_rssjs_feed
+	 *
+	 * @access    public
+	 * @param    object $item
+	 * @return    void
+	 */
+	public static function the_event_rssjs_feed($item)
+	{
+		if (is_feed() && isset($item->description)) {
+			$item->description = EED_Feeds::the_event_feed($item->description);
+		}
+		return $item;
+	}
+
+
+	/**
+	 *    the_venue_feed
+	 *
+	 * @access    public
+	 * @param    string $content
+	 * @return    void
+	 */
+	public static function the_venue_feed($content)
+	{
+		if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH . 'espresso_venues_feed.template.php')) {
+			global $post;
+			$template_args = array(
+				'VNU_ID'            => $post->ID,
+				'venue_description' => get_option('rss_use_excerpt') ? $post->post_excerpt : $post->post_content,
+			);
+			$content = EEH_Template::display_template(
+				RSS_FEEDS_TEMPLATES_PATH . 'espresso_venues_feed.template.php',
+				$template_args,
+				true
+			);
+		}
+		return $content;
+	}
+
+
+	/**
+	 *    the_venue_rssjs_feed
+	 *
+	 * @access    public
+	 * @param    object $item
+	 * @return    void
+	 */
+	public static function the_venue_rssjs_feed($item)
+	{
+		if (is_feed() && isset($item->description)) {
+			$item->description = EED_Feeds::the_venue_feed($item->description);
+		}
+		return $item;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
         $request = self::getRequest();
         if ($request->requestParamIsSet('post_type')) {
             // define path to templates
-            define('RSS_FEEDS_TEMPLATES_PATH', str_replace('\\', '/', plugin_dir_path(__FILE__)) . 'templates/');
+            define('RSS_FEEDS_TEMPLATES_PATH', str_replace('\\', '/', plugin_dir_path(__FILE__)).'templates/');
             // what kinda post_type are we dealing with ?
             switch ($request->getRequestParam('post_type')) {
                 case 'espresso_events':
@@ -155,14 +155,14 @@ 
      */
     public static function the_event_feed($content)
     {
-        if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH . 'espresso_events_feed.template.php')) {
+        if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH.'espresso_events_feed.template.php')) {
             global $post;
             $template_args = array(
                 'EVT_ID'            => $post->ID,
                 'event_description' => get_option('rss_use_excerpt') ? $post->post_excerpt : $post->post_content,
             );
             $content = EEH_Template::display_template(
-                RSS_FEEDS_TEMPLATES_PATH . 'espresso_events_feed.template.php',
+                RSS_FEEDS_TEMPLATES_PATH.'espresso_events_feed.template.php',
                 $template_args,
                 true
             );
@@ -196,14 +196,14 @@ 
      */
     public static function the_venue_feed($content)
     {
-        if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH . 'espresso_venues_feed.template.php')) {
+        if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH.'espresso_venues_feed.template.php')) {
             global $post;
             $template_args = array(
                 'VNU_ID'            => $post->ID,
                 'venue_description' => get_option('rss_use_excerpt') ? $post->post_excerpt : $post->post_content,
             );
             $content = EEH_Template::display_template(
-                RSS_FEEDS_TEMPLATES_PATH . 'espresso_venues_feed.template.php',
+                RSS_FEEDS_TEMPLATES_PATH.'espresso_venues_feed.template.php',
                 $template_args,
                 true
             );

modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php

Spacing +15 added lines, -15 removed lines

@@ -228,7 +228,7 @@ 
      */
     public function set_submit_button_text($submit_button_text = '')
     {
-        if (! empty($submit_button_text)) {
+        if ( ! empty($submit_button_text)) {
             $this->_submit_button_text = $submit_button_text;
         } elseif ($this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
             if ($this->checkout->revisit) {
@@ -388,7 +388,7 @@ 
     public function reg_form_name()
     {
         if (empty($this->_reg_form_name)) {
-            $this->set_reg_form_name('ee-spco-' . $this->slug() . '-reg-step-form');
+            $this->set_reg_form_name('ee-spco-'.$this->slug().'-reg-step-form');
         }
         return $this->_reg_form_name;
     }
@@ -412,7 +412,7 @@ 
     public function reg_step_url($action = '')
     {
         $query_args = ['step' => $this->slug()];
-        if (! empty($action)) {
+        if ( ! empty($action)) {
             $query_args['action'] = $action;
         }
         // final step has no display
@@ -442,12 +442,12 @@ 
             return new EE_Form_Section_Proper(
                 [
                     'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                    'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
+                    'html_id'         => 'ee-'.$this->slug().'-hidden-inputs',
                     'subsections'     => [
                         'next_step' => new EE_Fixed_Hidden_Input(
                             [
                                 'html_name' => 'next_step',
-                                'html_id'   => 'spco-' . $this->slug() . '-next-step',
+                                'html_id'   => 'spco-'.$this->slug().'-next-step',
                                 'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
                                     ? $this->checkout->next_step->slug()
                                     : '',
@@ -461,12 +461,12 @@ 
         return new EE_Form_Section_Proper(
             [
                 'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
+                'html_id'         => 'ee-'.$this->slug().'-hidden-inputs',
                 'subsections'     => [
                     'action'         => new EE_Fixed_Hidden_Input(
                         [
                             'html_name' => 'action',
-                            'html_id'   => 'spco-' . $this->slug() . '-action',
+                            'html_id'   => 'spco-'.$this->slug().'-action',
                             'default'   => apply_filters(
                                 'FHEE__EE_SPCO_Reg_Step__reg_step_hidden_inputs__default_form_action',
                                 empty($this->checkout->reg_url_link)
@@ -479,7 +479,7 @@ 
                     'next_step'      => new EE_Fixed_Hidden_Input(
                         [
                             'html_name' => 'next_step',
-                            'html_id'   => 'spco-' . $this->slug() . '-next-step',
+                            'html_id'   => 'spco-'.$this->slug().'-next-step',
                             'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
                                 ? $this->checkout->next_step->slug()
                                 : '',
@@ -513,7 +513,7 @@ 
      */
     public function generate_reg_form_for_actions($actions = [])
     {
-        $actions                           = array_merge(
+        $actions = array_merge(
             [
                 'generate_reg_form',
                 'display_spco_reg_step',
@@ -556,7 +556,7 @@ 
      */
     public function reg_step_submit_button()
     {
-        if (! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
+        if ( ! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
             return '';
         }
         ob_start();
@@ -570,18 +570,18 @@ 
         // generate submit button
         $submit_btn = new EE_Submit_Input(
             [
-                'html_name'             => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
-                'html_id'               => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
+                'html_name'             => 'spco-go-to-step-'.$this->checkout->next_step->slug(),
+                'html_id'               => 'spco-go-to-step-'.$this->checkout->next_step->slug(),
                 'html_class'            => 'spco-next-step-btn',
-                'other_html_attributes' => ' rel="' . $this->slug() . '"',
+                'other_html_attributes' => ' rel="'.$this->slug().'"',
                 'default'               => $this->submit_button_text(),
             ]
         );
         $submit_btn->set_button_css_attributes(true, 'large');
         $submit_btn_html = $submit_btn->get_html_for_input();
-        $html            .= EEH_HTML::div(
+        $html .= EEH_HTML::div(
             apply_filters('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $submit_btn_html, $this),
-            'spco-' . $this->slug() . '-whats-next-buttons-dv',
+            'spco-'.$this->slug().'-whats-next-buttons-dv',
             'spco-whats-next-buttons'
         );
         return $html;

Indentation +644 added lines, -644 removed lines

@@ -14,648 +14,648 @@
 abstract class EE_SPCO_Reg_Step
 {
 
-    /**
-     *    $_completed - TRUE if this step has fully completed it's duties
-     *
-     * @access protected
-     * @type bool $_completed
-     */
-    protected $_completed = false;
-
-    /**
-     *    $_is_current_step - TRUE if this is the current step
-     *
-     * @access protected
-     * @type bool $_is_current_step
-     */
-    protected $_is_current_step = false;
-
-    /**
-     *    $_order - when the reg step should be run relative to other steps
-     *
-     * @access protected
-     * @type int $_template
-     */
-    protected $_order = 0;
-
-    /**
-     *    $_slug - URL param for this step
-     *
-     * @access protected
-     * @type string $_slug
-     */
-    protected $_slug;
-
-    /**
-     *    $_name - Step Name - translatable string
-     *
-     * @access protected
-     * @type string $_slug
-     */
-    protected $_name;
-
-    /**
-     *    $_submit_button_text - translatable string that appears on this step's submit button
-     *
-     * @access protected
-     * @type string $_slug
-     */
-    protected $_submit_button_text;
-
-    /**
-     *    $_template - template name
-     *
-     * @access protected
-     * @type string $_template
-     */
-    protected $_template;
-
-    /**
-     *    $_reg_form_name - the form input name and id attribute
-     *
-     * @access protected
-     * @var string $_reg_form_name
-     */
-    protected $_reg_form_name;
-
-    /**
-     *    $_success_message - text to display upon successful form submission
-     *
-     * @access private
-     * @var string $_success_message
-     */
-    protected $_success_message;
-
-    /**
-     *    $_instructions - a brief description of how to complete the reg step.
-     *    Usually displayed in conjunction with the previous step's success message.
-     *
-     * @access private
-     * @var string $_instructions
-     */
-    protected $_instructions;
-
-    /**
-     *    $_valid_data - the normalized and validated data for this step
-     *
-     * @access public
-     * @var array $_valid_data
-     */
-    protected $_valid_data = [];
-
-    /**
-     *    $reg_form - the registration form for this step
-     *
-     * @access public
-     * @var EE_Form_Section_Proper $reg_form
-     */
-    public $reg_form;
-
-    /**
-     *    $checkout - EE_Checkout object for handling the properties of the current checkout process
-     *
-     * @access public
-     * @var EE_Checkout $checkout
-     */
-    public $checkout;
-
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-
-    /**
-     * @return void
-     */
-    abstract public function translate_js_strings();
-
-
-    /**
-     * @return void
-     */
-    abstract public function enqueue_styles_and_scripts();
-
-
-    /**
-     * @return boolean
-     */
-    abstract public function initialize_reg_step();
-
-
-    /**
-     * @return string
-     */
-    abstract public function generate_reg_form();
-
-
-    /**
-     * @return boolean
-     */
-    abstract public function process_reg_step();
-
-
-    /**
-     * @return boolean
-     */
-    abstract public function update_reg_step();
-
-
-    /**
-     * @return boolean
-     */
-    public function completed()
-    {
-        return $this->_completed;
-    }
-
-
-    /**
-     * set_completed - toggles $_completed to TRUE
-     */
-    public function set_completed()
-    {
-        // DEBUG LOG
-        // $this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
-        $this->_completed = apply_filters('FHEE__EE_SPCO_Reg_Step__set_completed___completed', true, $this);
-    }
-
-
-    /**
-     * set_completed - toggles $_completed to FALSE
-     */
-    public function set_not_completed()
-    {
-        $this->_completed = false;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        return $this->_name;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function slug()
-    {
-        return $this->_slug;
-    }
-
-
-    /**
-     * submit_button_text
-     * the text that appears on the reg step form submit button
-     *
-     * @return string
-     */
-    public function submit_button_text()
-    {
-        return $this->_submit_button_text;
-    }
-
-
-    /**
-     * set_submit_button_text
-     * sets the text that appears on the reg step form submit button
-     *
-     * @param string $submit_button_text
-     */
-    public function set_submit_button_text($submit_button_text = '')
-    {
-        if (! empty($submit_button_text)) {
-            $this->_submit_button_text = $submit_button_text;
-        } elseif ($this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
-            if ($this->checkout->revisit) {
-                $this->_submit_button_text = sprintf(
-                    esc_html__('Update %s', 'event_espresso'),
-                    $this->checkout->current_step->name()
-                );
-            } else {
-                $this->_submit_button_text = sprintf(
-                    esc_html__('Proceed to %s', 'event_espresso'),
-                    $this->checkout->next_step->name()
-                );
-            }
-        }
-        // filters the submit button text
-        $this->_submit_button_text = apply_filters(
-            'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text',
-            $this->_submit_button_text,
-            $this->checkout
-        );
-    }
-
-
-    /**
-     * @param boolean $is_current_step
-     */
-    public function set_is_current_step($is_current_step)
-    {
-        $this->_is_current_step = $is_current_step;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function is_current_step()
-    {
-        return $this->_is_current_step;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function is_final_step()
-    {
-        return $this instanceof EE_SPCO_Reg_Step_Finalize_Registration;
-    }
-
-
-    /**
-     * @param int $order
-     */
-    public function set_order($order)
-    {
-        $this->_order = $order;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function order()
-    {
-        return $this->_order;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function template()
-    {
-        return $this->_template;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function success_message()
-    {
-        return $this->_success_message;
-    }
-
-
-    /**
-     * _set_success_message
-     *
-     * @param string $success_message
-     */
-    protected function _set_success_message($success_message)
-    {
-        $this->_success_message = $success_message;
-    }
-
-
-    /**
-     * _reset_success_message
-     *
-     * @return void
-     */
-    protected function _reset_success_message()
-    {
-        $this->_success_message = '';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function _instructions()
-    {
-        return $this->_instructions;
-    }
-
-
-    /**
-     * @param string $instructions
-     */
-    public function set_instructions($instructions)
-    {
-        $this->_instructions = apply_filters(
-            'FHEE__EE_SPCO_Reg_Step__set_instructions__instructions',
-            $instructions,
-            $this
-        );
-    }
-
-
-    /**
-     * @param array $valid_data
-     */
-    public function set_valid_data($valid_data)
-    {
-        $this->_valid_data = $valid_data;
-    }
-
-
-    /**
-     * @return array
-     * @throws EE_Error
-     * @throws EE_Error
-     */
-    public function valid_data()
-    {
-        if (empty($this->_valid_data)) {
-            $this->_valid_data = $this->reg_form->valid_data();
-        }
-        return $this->_valid_data;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function reg_form_name()
-    {
-        if (empty($this->_reg_form_name)) {
-            $this->set_reg_form_name('ee-spco-' . $this->slug() . '-reg-step-form');
-        }
-        return $this->_reg_form_name;
-    }
-
-
-    /**
-     * @param string $reg_form_name
-     */
-    protected function set_reg_form_name($reg_form_name)
-    {
-        $this->_reg_form_name = $reg_form_name;
-    }
-
-
-    /**
-     * reg_step_url
-     *
-     * @param string $action
-     * @return string
-     */
-    public function reg_step_url($action = '')
-    {
-        $query_args = ['step' => $this->slug()];
-        if (! empty($action)) {
-            $query_args['action'] = $action;
-        }
-        // final step has no display
-        if ($this instanceof EE_SPCO_Reg_Step_Finalize_Registration && $action === 'display_spco_reg_step') {
-            $query_args['action'] = 'process_reg_step';
-        }
-        if ($this->checkout->revisit) {
-            $query_args['revisit'] = true;
-        }
-        if ($this->checkout->reg_url_link) {
-            $query_args['e_reg_url_link'] = $this->checkout->reg_url_link;
-        }
-        return add_query_arg($query_args, $this->checkout->reg_page_base_url);
-    }
-
-
-    /**
-     * creates the default hidden inputs section
-     *
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     */
-    public function reg_step_hidden_inputs()
-    {
-        // hidden inputs for admin registrations
-        if ($this->checkout->admin_request) {
-            return new EE_Form_Section_Proper(
-                [
-                    'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                    'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
-                    'subsections'     => [
-                        'next_step' => new EE_Fixed_Hidden_Input(
-                            [
-                                'html_name' => 'next_step',
-                                'html_id'   => 'spco-' . $this->slug() . '-next-step',
-                                'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
-                                    ? $this->checkout->next_step->slug()
-                                    : '',
-                            ]
-                        ),
-                    ],
-                ]
-            );
-        }
-        // hidden inputs for frontend registrations
-        return new EE_Form_Section_Proper(
-            [
-                'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
-                'subsections'     => [
-                    'action'         => new EE_Fixed_Hidden_Input(
-                        [
-                            'html_name' => 'action',
-                            'html_id'   => 'spco-' . $this->slug() . '-action',
-                            'default'   => apply_filters(
-                                'FHEE__EE_SPCO_Reg_Step__reg_step_hidden_inputs__default_form_action',
-                                empty($this->checkout->reg_url_link)
-                                    ? 'process_reg_step'
-                                    : 'update_reg_step',
-                                $this
-                            ),
-                        ]
-                    ),
-                    'next_step'      => new EE_Fixed_Hidden_Input(
-                        [
-                            'html_name' => 'next_step',
-                            'html_id'   => 'spco-' . $this->slug() . '-next-step',
-                            'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
-                                ? $this->checkout->next_step->slug()
-                                : '',
-                        ]
-                    ),
-                    'e_reg_url_link' => new EE_Fixed_Hidden_Input(
-                        [
-                            'html_name' => 'e_reg_url_link',
-                            'html_id'   => 'spco-reg_url_link',
-                            'default'   => $this->checkout->reg_url_link,
-                        ]
-                    ),
-                    'revisit'        => new EE_Fixed_Hidden_Input(
-                        [
-                            'html_name' => 'revisit',
-                            'html_id'   => 'spco-revisit',
-                            'default'   => $this->checkout->revisit,
-                        ]
-                    ),
-                ],
-            ]
-        );
-    }
-
-
-    /**
-     * generate_reg_form_for_actions
-     *
-     * @param array $actions
-     * @return void
-     */
-    public function generate_reg_form_for_actions($actions = [])
-    {
-        $actions                           = array_merge(
-            [
-                'generate_reg_form',
-                'display_spco_reg_step',
-                'process_reg_step',
-                'update_reg_step',
-            ],
-            $actions
-        );
-        $this->checkout->generate_reg_form = in_array($this->checkout->action, $actions, true);
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     */
-    public function display_reg_form()
-    {
-        $html = '';
-        if ($this->reg_form instanceof EE_Form_Section_Proper) {
-            do_action('AHEE__EE_SPCO_Reg_Step__display_reg_form__reg_form', $this->reg_form, $this);
-            $html .= ! $this->checkout->admin_request ? $this->reg_form->form_open($this->reg_step_url()) : '';
-            if ($this->request->isAjax()) {
-                $this->reg_form->localize_validation_rules();
-                $this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
-            }
-            $html .= $this->reg_form->get_html();
-            $html .= ! $this->checkout->admin_request ? $this->reg_step_submit_button() : '';
-            $html .= ! $this->checkout->admin_request ? $this->reg_form->form_close() : '';
-        }
-        return $html;
-    }
-
-
-    /**
-     * div_class - returns nothing for current step, but a css class of "hidden" for others
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function reg_step_submit_button()
-    {
-        if (! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
-            return '';
-        }
-        ob_start();
-        do_action(
-            'AHEE__before_spco_whats_next_buttons',
-            $this->slug(),
-            $this->checkout->next_step->slug(),
-            $this->checkout
-        );
-        $html = ob_get_clean();
-        // generate submit button
-        $submit_btn = new EE_Submit_Input(
-            [
-                'html_name'             => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
-                'html_id'               => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
-                'html_class'            => 'spco-next-step-btn',
-                'other_html_attributes' => ' rel="' . $this->slug() . '"',
-                'default'               => $this->submit_button_text(),
-            ]
-        );
-        $submit_btn->set_button_css_attributes(true, 'large');
-        $submit_btn_html = $submit_btn->get_html_for_input();
-        $html            .= EEH_HTML::div(
-            apply_filters('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $submit_btn_html, $this),
-            'spco-' . $this->slug() . '-whats-next-buttons-dv',
-            'spco-whats-next-buttons'
-        );
-        return $html;
-    }
-
-
-    /**
-     * div_class - returns nothing for current step, but a css class of "hidden" for others
-     *
-     * @return string
-     */
-    public function div_class()
-    {
-        return $this->is_current_step() ? '' : ' hidden';
-    }
-
-
-    /**
-     * div_class - returns  a css class of "hidden" for current step, but nothing for others
-     *
-     * @return string
-     */
-    public function edit_lnk_url()
-    {
-        return add_query_arg(['step' => $this->slug()], $this->checkout->reg_page_base_url);
-    }
-
-
-    /**
-     * div_class - returns  a css class of "hidden" for current step, but nothing for others
-     *
-     * @return string
-     */
-    public function edit_link_class()
-    {
-        return $this->is_current_step() ? ' hidden' : '';
-    }
-
-
-    /**
-     * update_checkout with changes that have been made to the cart
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function update_checkout()
-    {
-        // grab the cart grand total and reset TXN total
-        $this->checkout->transaction->set_total($this->checkout->cart->get_cart_grand_total());
-        $this->checkout->stash_transaction_and_checkout();
-    }
-
-
-    /**
-     *    __sleep
-     * to conserve db space, let's remove the reg_form and the EE_Checkout object from EE_SPCO_Reg_Step objects upon
-     * serialization EE_Checkout will handle the reimplementation of itself upon waking, but we won't bother with the
-     * reg form, because if needed, it will be regenerated anyways
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        // remove the reg form and the checkout
-        return array_diff(array_keys(get_object_vars($this)), ['reg_form', 'checkout']);
-    }
-
-
-    /**
-     * @param RequestInterface $request
-     */
-    public function setRequest(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
+	/**
+	 *    $_completed - TRUE if this step has fully completed it's duties
+	 *
+	 * @access protected
+	 * @type bool $_completed
+	 */
+	protected $_completed = false;
+
+	/**
+	 *    $_is_current_step - TRUE if this is the current step
+	 *
+	 * @access protected
+	 * @type bool $_is_current_step
+	 */
+	protected $_is_current_step = false;
+
+	/**
+	 *    $_order - when the reg step should be run relative to other steps
+	 *
+	 * @access protected
+	 * @type int $_template
+	 */
+	protected $_order = 0;
+
+	/**
+	 *    $_slug - URL param for this step
+	 *
+	 * @access protected
+	 * @type string $_slug
+	 */
+	protected $_slug;
+
+	/**
+	 *    $_name - Step Name - translatable string
+	 *
+	 * @access protected
+	 * @type string $_slug
+	 */
+	protected $_name;
+
+	/**
+	 *    $_submit_button_text - translatable string that appears on this step's submit button
+	 *
+	 * @access protected
+	 * @type string $_slug
+	 */
+	protected $_submit_button_text;
+
+	/**
+	 *    $_template - template name
+	 *
+	 * @access protected
+	 * @type string $_template
+	 */
+	protected $_template;
+
+	/**
+	 *    $_reg_form_name - the form input name and id attribute
+	 *
+	 * @access protected
+	 * @var string $_reg_form_name
+	 */
+	protected $_reg_form_name;
+
+	/**
+	 *    $_success_message - text to display upon successful form submission
+	 *
+	 * @access private
+	 * @var string $_success_message
+	 */
+	protected $_success_message;
+
+	/**
+	 *    $_instructions - a brief description of how to complete the reg step.
+	 *    Usually displayed in conjunction with the previous step's success message.
+	 *
+	 * @access private
+	 * @var string $_instructions
+	 */
+	protected $_instructions;
+
+	/**
+	 *    $_valid_data - the normalized and validated data for this step
+	 *
+	 * @access public
+	 * @var array $_valid_data
+	 */
+	protected $_valid_data = [];
+
+	/**
+	 *    $reg_form - the registration form for this step
+	 *
+	 * @access public
+	 * @var EE_Form_Section_Proper $reg_form
+	 */
+	public $reg_form;
+
+	/**
+	 *    $checkout - EE_Checkout object for handling the properties of the current checkout process
+	 *
+	 * @access public
+	 * @var EE_Checkout $checkout
+	 */
+	public $checkout;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+
+	/**
+	 * @return void
+	 */
+	abstract public function translate_js_strings();
+
+
+	/**
+	 * @return void
+	 */
+	abstract public function enqueue_styles_and_scripts();
+
+
+	/**
+	 * @return boolean
+	 */
+	abstract public function initialize_reg_step();
+
+
+	/**
+	 * @return string
+	 */
+	abstract public function generate_reg_form();
+
+
+	/**
+	 * @return boolean
+	 */
+	abstract public function process_reg_step();
+
+
+	/**
+	 * @return boolean
+	 */
+	abstract public function update_reg_step();
+
+
+	/**
+	 * @return boolean
+	 */
+	public function completed()
+	{
+		return $this->_completed;
+	}
+
+
+	/**
+	 * set_completed - toggles $_completed to TRUE
+	 */
+	public function set_completed()
+	{
+		// DEBUG LOG
+		// $this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
+		$this->_completed = apply_filters('FHEE__EE_SPCO_Reg_Step__set_completed___completed', true, $this);
+	}
+
+
+	/**
+	 * set_completed - toggles $_completed to FALSE
+	 */
+	public function set_not_completed()
+	{
+		$this->_completed = false;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		return $this->_name;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function slug()
+	{
+		return $this->_slug;
+	}
+
+
+	/**
+	 * submit_button_text
+	 * the text that appears on the reg step form submit button
+	 *
+	 * @return string
+	 */
+	public function submit_button_text()
+	{
+		return $this->_submit_button_text;
+	}
+
+
+	/**
+	 * set_submit_button_text
+	 * sets the text that appears on the reg step form submit button
+	 *
+	 * @param string $submit_button_text
+	 */
+	public function set_submit_button_text($submit_button_text = '')
+	{
+		if (! empty($submit_button_text)) {
+			$this->_submit_button_text = $submit_button_text;
+		} elseif ($this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
+			if ($this->checkout->revisit) {
+				$this->_submit_button_text = sprintf(
+					esc_html__('Update %s', 'event_espresso'),
+					$this->checkout->current_step->name()
+				);
+			} else {
+				$this->_submit_button_text = sprintf(
+					esc_html__('Proceed to %s', 'event_espresso'),
+					$this->checkout->next_step->name()
+				);
+			}
+		}
+		// filters the submit button text
+		$this->_submit_button_text = apply_filters(
+			'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text',
+			$this->_submit_button_text,
+			$this->checkout
+		);
+	}
+
+
+	/**
+	 * @param boolean $is_current_step
+	 */
+	public function set_is_current_step($is_current_step)
+	{
+		$this->_is_current_step = $is_current_step;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function is_current_step()
+	{
+		return $this->_is_current_step;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function is_final_step()
+	{
+		return $this instanceof EE_SPCO_Reg_Step_Finalize_Registration;
+	}
+
+
+	/**
+	 * @param int $order
+	 */
+	public function set_order($order)
+	{
+		$this->_order = $order;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function order()
+	{
+		return $this->_order;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function template()
+	{
+		return $this->_template;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function success_message()
+	{
+		return $this->_success_message;
+	}
+
+
+	/**
+	 * _set_success_message
+	 *
+	 * @param string $success_message
+	 */
+	protected function _set_success_message($success_message)
+	{
+		$this->_success_message = $success_message;
+	}
+
+
+	/**
+	 * _reset_success_message
+	 *
+	 * @return void
+	 */
+	protected function _reset_success_message()
+	{
+		$this->_success_message = '';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function _instructions()
+	{
+		return $this->_instructions;
+	}
+
+
+	/**
+	 * @param string $instructions
+	 */
+	public function set_instructions($instructions)
+	{
+		$this->_instructions = apply_filters(
+			'FHEE__EE_SPCO_Reg_Step__set_instructions__instructions',
+			$instructions,
+			$this
+		);
+	}
+
+
+	/**
+	 * @param array $valid_data
+	 */
+	public function set_valid_data($valid_data)
+	{
+		$this->_valid_data = $valid_data;
+	}
+
+
+	/**
+	 * @return array
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 */
+	public function valid_data()
+	{
+		if (empty($this->_valid_data)) {
+			$this->_valid_data = $this->reg_form->valid_data();
+		}
+		return $this->_valid_data;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function reg_form_name()
+	{
+		if (empty($this->_reg_form_name)) {
+			$this->set_reg_form_name('ee-spco-' . $this->slug() . '-reg-step-form');
+		}
+		return $this->_reg_form_name;
+	}
+
+
+	/**
+	 * @param string $reg_form_name
+	 */
+	protected function set_reg_form_name($reg_form_name)
+	{
+		$this->_reg_form_name = $reg_form_name;
+	}
+
+
+	/**
+	 * reg_step_url
+	 *
+	 * @param string $action
+	 * @return string
+	 */
+	public function reg_step_url($action = '')
+	{
+		$query_args = ['step' => $this->slug()];
+		if (! empty($action)) {
+			$query_args['action'] = $action;
+		}
+		// final step has no display
+		if ($this instanceof EE_SPCO_Reg_Step_Finalize_Registration && $action === 'display_spco_reg_step') {
+			$query_args['action'] = 'process_reg_step';
+		}
+		if ($this->checkout->revisit) {
+			$query_args['revisit'] = true;
+		}
+		if ($this->checkout->reg_url_link) {
+			$query_args['e_reg_url_link'] = $this->checkout->reg_url_link;
+		}
+		return add_query_arg($query_args, $this->checkout->reg_page_base_url);
+	}
+
+
+	/**
+	 * creates the default hidden inputs section
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 */
+	public function reg_step_hidden_inputs()
+	{
+		// hidden inputs for admin registrations
+		if ($this->checkout->admin_request) {
+			return new EE_Form_Section_Proper(
+				[
+					'layout_strategy' => new EE_Div_Per_Section_Layout(),
+					'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
+					'subsections'     => [
+						'next_step' => new EE_Fixed_Hidden_Input(
+							[
+								'html_name' => 'next_step',
+								'html_id'   => 'spco-' . $this->slug() . '-next-step',
+								'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
+									? $this->checkout->next_step->slug()
+									: '',
+							]
+						),
+					],
+				]
+			);
+		}
+		// hidden inputs for frontend registrations
+		return new EE_Form_Section_Proper(
+			[
+				'layout_strategy' => new EE_Div_Per_Section_Layout(),
+				'html_id'         => 'ee-' . $this->slug() . '-hidden-inputs',
+				'subsections'     => [
+					'action'         => new EE_Fixed_Hidden_Input(
+						[
+							'html_name' => 'action',
+							'html_id'   => 'spco-' . $this->slug() . '-action',
+							'default'   => apply_filters(
+								'FHEE__EE_SPCO_Reg_Step__reg_step_hidden_inputs__default_form_action',
+								empty($this->checkout->reg_url_link)
+									? 'process_reg_step'
+									: 'update_reg_step',
+								$this
+							),
+						]
+					),
+					'next_step'      => new EE_Fixed_Hidden_Input(
+						[
+							'html_name' => 'next_step',
+							'html_id'   => 'spco-' . $this->slug() . '-next-step',
+							'default'   => $this->checkout->next_step instanceof EE_SPCO_Reg_Step
+								? $this->checkout->next_step->slug()
+								: '',
+						]
+					),
+					'e_reg_url_link' => new EE_Fixed_Hidden_Input(
+						[
+							'html_name' => 'e_reg_url_link',
+							'html_id'   => 'spco-reg_url_link',
+							'default'   => $this->checkout->reg_url_link,
+						]
+					),
+					'revisit'        => new EE_Fixed_Hidden_Input(
+						[
+							'html_name' => 'revisit',
+							'html_id'   => 'spco-revisit',
+							'default'   => $this->checkout->revisit,
+						]
+					),
+				],
+			]
+		);
+	}
+
+
+	/**
+	 * generate_reg_form_for_actions
+	 *
+	 * @param array $actions
+	 * @return void
+	 */
+	public function generate_reg_form_for_actions($actions = [])
+	{
+		$actions                           = array_merge(
+			[
+				'generate_reg_form',
+				'display_spco_reg_step',
+				'process_reg_step',
+				'update_reg_step',
+			],
+			$actions
+		);
+		$this->checkout->generate_reg_form = in_array($this->checkout->action, $actions, true);
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function display_reg_form()
+	{
+		$html = '';
+		if ($this->reg_form instanceof EE_Form_Section_Proper) {
+			do_action('AHEE__EE_SPCO_Reg_Step__display_reg_form__reg_form', $this->reg_form, $this);
+			$html .= ! $this->checkout->admin_request ? $this->reg_form->form_open($this->reg_step_url()) : '';
+			if ($this->request->isAjax()) {
+				$this->reg_form->localize_validation_rules();
+				$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
+			}
+			$html .= $this->reg_form->get_html();
+			$html .= ! $this->checkout->admin_request ? $this->reg_step_submit_button() : '';
+			$html .= ! $this->checkout->admin_request ? $this->reg_form->form_close() : '';
+		}
+		return $html;
+	}
+
+
+	/**
+	 * div_class - returns nothing for current step, but a css class of "hidden" for others
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function reg_step_submit_button()
+	{
+		if (! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
+			return '';
+		}
+		ob_start();
+		do_action(
+			'AHEE__before_spco_whats_next_buttons',
+			$this->slug(),
+			$this->checkout->next_step->slug(),
+			$this->checkout
+		);
+		$html = ob_get_clean();
+		// generate submit button
+		$submit_btn = new EE_Submit_Input(
+			[
+				'html_name'             => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
+				'html_id'               => 'spco-go-to-step-' . $this->checkout->next_step->slug(),
+				'html_class'            => 'spco-next-step-btn',
+				'other_html_attributes' => ' rel="' . $this->slug() . '"',
+				'default'               => $this->submit_button_text(),
+			]
+		);
+		$submit_btn->set_button_css_attributes(true, 'large');
+		$submit_btn_html = $submit_btn->get_html_for_input();
+		$html            .= EEH_HTML::div(
+			apply_filters('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $submit_btn_html, $this),
+			'spco-' . $this->slug() . '-whats-next-buttons-dv',
+			'spco-whats-next-buttons'
+		);
+		return $html;
+	}
+
+
+	/**
+	 * div_class - returns nothing for current step, but a css class of "hidden" for others
+	 *
+	 * @return string
+	 */
+	public function div_class()
+	{
+		return $this->is_current_step() ? '' : ' hidden';
+	}
+
+
+	/**
+	 * div_class - returns  a css class of "hidden" for current step, but nothing for others
+	 *
+	 * @return string
+	 */
+	public function edit_lnk_url()
+	{
+		return add_query_arg(['step' => $this->slug()], $this->checkout->reg_page_base_url);
+	}
+
+
+	/**
+	 * div_class - returns  a css class of "hidden" for current step, but nothing for others
+	 *
+	 * @return string
+	 */
+	public function edit_link_class()
+	{
+		return $this->is_current_step() ? ' hidden' : '';
+	}
+
+
+	/**
+	 * update_checkout with changes that have been made to the cart
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function update_checkout()
+	{
+		// grab the cart grand total and reset TXN total
+		$this->checkout->transaction->set_total($this->checkout->cart->get_cart_grand_total());
+		$this->checkout->stash_transaction_and_checkout();
+	}
+
+
+	/**
+	 *    __sleep
+	 * to conserve db space, let's remove the reg_form and the EE_Checkout object from EE_SPCO_Reg_Step objects upon
+	 * serialization EE_Checkout will handle the reimplementation of itself upon waking, but we won't bother with the
+	 * reg form, because if needed, it will be regenerated anyways
+	 *
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		// remove the reg form and the checkout
+		return array_diff(array_keys(get_object_vars($this)), ['reg_form', 'checkout']);
+	}
+
+
+	/**
+	 * @param RequestInterface $request
+	 */
+	public function setRequest(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
 }

core/services/container/RegistryContainer.php

Indentation +161 added lines, -161 removed lines

@@ -17,165 +17,165 @@
 class RegistryContainer implements ArrayAccess, CountableTraversableAggregate
 {
 
-    /**
-     * @var array $container
-     */
-    private $container = [];
-
-    /**
-     * RegistryContainer constructor.
-     * Container data can be seeded by passing parameters to constructor.
-     * Each parameter will become its own element in the container
-     */
-    public function __construct()
-    {
-    }
-
-
-    /**
-     * @param mixed $offset
-     * @param mixed $value
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->container[ $offset ] = $value;
-    }
-
-
-    /**
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->container[ $offset ]);
-    }
-
-
-    /**
-     * @param mixed $offset
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->container[ $offset ]);
-    }
-
-
-    /**
-     * @param mixed $offset
-     * @return mixed|null
-     */
-    public function offsetGet($offset)
-    {
-        return $this->offsetExists($offset) ? $this->container[ $offset ] : null;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->container);
-    }
-
-
-    /**
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->container);
-    }
-
-
-    /**
-     * @param $offset
-     * @param $value
-     */
-    public function __set($offset, $value)
-    {
-        $this->offsetSet($offset, $value);
-    }
-
-
-    /**
-     * @param $offset
-     * @return mixed
-     * @throws OutOfBoundsException
-     */
-    public function __get($offset)
-    {
-        if (! array_key_exists($offset, $this->container)) {
-            $trace = debug_backtrace();
-            throw new OutOfBoundsException(
-                sprintf(
-                    esc_html__('Invalid offset: %1$s %2$sCalled from %3$s on line %4$d', 'event_espresso'),
-                    $offset,
-                    '<br  />',
-                    $trace[0]['file'],
-                    $trace[0]['line']
-                )
-            );
-        }
-        return $this->offsetGet($offset);
-    }
-
-
-    /**
-     * @param $offset
-     * @return bool
-     */
-    public function __isset($offset)
-    {
-        return $this->offsetExists($offset);
-    }
-
-
-    /**
-     * @param $offset
-     */
-    public function __unset($offset)
-    {
-        $this->offsetUnset($offset);
-    }
-
-
-    /**
-     * @param $offset
-     * @param $value
-     */
-    public function add($offset, $value)
-    {
-        $this->offsetSet($offset, $value);
-    }
-
-
-    /**
-     * @param $offset
-     */
-    public function remove($offset)
-    {
-        $this->offsetUnset($offset);
-    }
-
-
-    /**
-     * @param $offset
-     * @return bool
-     */
-    public function has($offset)
-    {
-        return $this->offsetExists($offset);
-    }
-
-
-    /**
-     * @param $offset
-     * @return mixed|null
-     */
-    public function get($offset)
-    {
-        return $this->offsetGet($offset);
-    }
+	/**
+	 * @var array $container
+	 */
+	private $container = [];
+
+	/**
+	 * RegistryContainer constructor.
+	 * Container data can be seeded by passing parameters to constructor.
+	 * Each parameter will become its own element in the container
+	 */
+	public function __construct()
+	{
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$this->container[ $offset ] = $value;
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->container[ $offset ]);
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($this->container[ $offset ]);
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 * @return mixed|null
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->offsetExists($offset) ? $this->container[ $offset ] : null;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->container);
+	}
+
+
+	/**
+	 * @return ArrayIterator
+	 */
+	public function getIterator()
+	{
+		return new ArrayIterator($this->container);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @param $value
+	 */
+	public function __set($offset, $value)
+	{
+		$this->offsetSet($offset, $value);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @return mixed
+	 * @throws OutOfBoundsException
+	 */
+	public function __get($offset)
+	{
+		if (! array_key_exists($offset, $this->container)) {
+			$trace = debug_backtrace();
+			throw new OutOfBoundsException(
+				sprintf(
+					esc_html__('Invalid offset: %1$s %2$sCalled from %3$s on line %4$d', 'event_espresso'),
+					$offset,
+					'<br  />',
+					$trace[0]['file'],
+					$trace[0]['line']
+				)
+			);
+		}
+		return $this->offsetGet($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @return bool
+	 */
+	public function __isset($offset)
+	{
+		return $this->offsetExists($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 */
+	public function __unset($offset)
+	{
+		$this->offsetUnset($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @param $value
+	 */
+	public function add($offset, $value)
+	{
+		$this->offsetSet($offset, $value);
+	}
+
+
+	/**
+	 * @param $offset
+	 */
+	public function remove($offset)
+	{
+		$this->offsetUnset($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @return bool
+	 */
+	public function has($offset)
+	{
+		return $this->offsetExists($offset);
+	}
+
+
+	/**
+	 * @param $offset
+	 * @return mixed|null
+	 */
+	public function get($offset)
+	{
+		return $this->offsetGet($offset);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function offsetSet($offset, $value)
     {
-        $this->container[ $offset ] = $value;
+        $this->container[$offset] = $value;
     }
 
 
@@ -48,7 +48,7 @@ 
      */
     public function offsetExists($offset)
     {
-        return isset($this->container[ $offset ]);
+        return isset($this->container[$offset]);
     }
 
 
@@ -57,7 +57,7 @@ 
      */
     public function offsetUnset($offset)
     {
-        unset($this->container[ $offset ]);
+        unset($this->container[$offset]);
     }
 
 
@@ -67,7 +67,7 @@ 
      */
     public function offsetGet($offset)
     {
-        return $this->offsetExists($offset) ? $this->container[ $offset ] : null;
+        return $this->offsetExists($offset) ? $this->container[$offset] : null;
     }
 
 
@@ -106,7 +106,7 @@ 
      */
     public function __get($offset)
     {
-        if (! array_key_exists($offset, $this->container)) {
+        if ( ! array_key_exists($offset, $this->container)) {
             $trace = debug_backtrace();
             throw new OutOfBoundsException(
                 sprintf(

core/services/loaders/Loader.php

Indentation +123 added lines, -123 removed lines

@@ -15,127 +15,127 @@
 class Loader implements LoaderInterface
 {
 
-    /**
-     * @var LoaderDecoratorInterface $new_loader
-     */
-    private $new_loader;
-
-    /**
-     * @var LoaderDecoratorInterface $shared_loader
-     */
-    private $shared_loader;
-
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
-
-    /**
-     * Loader constructor.
-     *
-     * @param LoaderDecoratorInterface        $new_loader
-     * @param CachingLoaderDecoratorInterface $shared_loader
-     * @param ClassInterfaceCache             $class_cache
-     */
-    public function __construct(
-        LoaderDecoratorInterface $new_loader,
-        CachingLoaderDecoratorInterface $shared_loader,
-        ClassInterfaceCache $class_cache
-    ) {
-        $this->new_loader    = $new_loader;
-        $this->shared_loader = $shared_loader;
-        $this->class_cache   = $class_cache;
-    }
-
-
-    /**
-     * @return LoaderDecoratorInterface
-     */
-    public function getNewLoader()
-    {
-        return $this->new_loader;
-    }
-
-
-    /**
-     * @return CachingLoaderDecoratorInterface
-     */
-    public function getSharedLoader()
-    {
-        return $this->shared_loader;
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @param bool                      $shared
-     * @return mixed
-     */
-    public function load($fqcn, array $arguments = array(), $shared = true)
-    {
-        $fqcn = $this->class_cache->getFqn($fqcn);
-        if ($this->class_cache->hasInterface($fqcn, 'EventEspresso\core\interfaces\ReservedInstanceInterface')) {
-            $shared = true;
-        }
-        return $shared
-            ? $this->getSharedLoader()->load($fqcn, $arguments, $shared)
-            : $this->getNewLoader()->load($fqcn, $arguments, $shared);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getNew($fqcn, array $arguments = array())
-    {
-        return $this->load($fqcn, $arguments, false);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getShared($fqcn, array $arguments = array())
-    {
-        return $this->load($fqcn, $arguments);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param mixed                     $object
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function share($fqcn, $object)
-    {
-        $fqcn = $this->class_cache->getFqn($fqcn);
-        return $this->getSharedLoader()->share($fqcn, $object);
-    }
-
-
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function remove($fqcn, array $arguments = [])
-    {
-        $fqcn = $this->class_cache->getFqn($fqcn);
-        return $this->getSharedLoader()->remove($fqcn, $arguments);
-    }
-
-
-    /**
-     * calls reset() on loaders if that method exists
-     */
-    public function reset()
-    {
-        $this->shared_loader->reset();
-    }
+	/**
+	 * @var LoaderDecoratorInterface $new_loader
+	 */
+	private $new_loader;
+
+	/**
+	 * @var LoaderDecoratorInterface $shared_loader
+	 */
+	private $shared_loader;
+
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
+
+	/**
+	 * Loader constructor.
+	 *
+	 * @param LoaderDecoratorInterface        $new_loader
+	 * @param CachingLoaderDecoratorInterface $shared_loader
+	 * @param ClassInterfaceCache             $class_cache
+	 */
+	public function __construct(
+		LoaderDecoratorInterface $new_loader,
+		CachingLoaderDecoratorInterface $shared_loader,
+		ClassInterfaceCache $class_cache
+	) {
+		$this->new_loader    = $new_loader;
+		$this->shared_loader = $shared_loader;
+		$this->class_cache   = $class_cache;
+	}
+
+
+	/**
+	 * @return LoaderDecoratorInterface
+	 */
+	public function getNewLoader()
+	{
+		return $this->new_loader;
+	}
+
+
+	/**
+	 * @return CachingLoaderDecoratorInterface
+	 */
+	public function getSharedLoader()
+	{
+		return $this->shared_loader;
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @param bool                      $shared
+	 * @return mixed
+	 */
+	public function load($fqcn, array $arguments = array(), $shared = true)
+	{
+		$fqcn = $this->class_cache->getFqn($fqcn);
+		if ($this->class_cache->hasInterface($fqcn, 'EventEspresso\core\interfaces\ReservedInstanceInterface')) {
+			$shared = true;
+		}
+		return $shared
+			? $this->getSharedLoader()->load($fqcn, $arguments, $shared)
+			: $this->getNewLoader()->load($fqcn, $arguments, $shared);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getNew($fqcn, array $arguments = array())
+	{
+		return $this->load($fqcn, $arguments, false);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getShared($fqcn, array $arguments = array())
+	{
+		return $this->load($fqcn, $arguments);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param mixed                     $object
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function share($fqcn, $object)
+	{
+		$fqcn = $this->class_cache->getFqn($fqcn);
+		return $this->getSharedLoader()->share($fqcn, $object);
+	}
+
+
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function remove($fqcn, array $arguments = [])
+	{
+		$fqcn = $this->class_cache->getFqn($fqcn);
+		return $this->getSharedLoader()->remove($fqcn, $arguments);
+	}
+
+
+	/**
+	 * calls reset() on loaders if that method exists
+	 */
+	public function reset()
+	{
+		$this->shared_loader->reset();
+	}
 }

core/services/loaders/CachingLoaderDecoratorInterface.php

Indentation +14 added lines, -14 removed lines

@@ -11,20 +11,20 @@
 interface CachingLoaderDecoratorInterface extends LoaderDecoratorInterface
 {
 
-    /**
-     * @param string $fqcn
-     * @param mixed  $object
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function share($fqcn, $object);
+	/**
+	 * @param string $fqcn
+	 * @param mixed  $object
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function share($fqcn, $object);
 
 
-    /**
-     * @param string $fqcn
-     * @param array  $arguments
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function remove($fqcn, array $arguments = []);
+	/**
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function remove($fqcn, array $arguments = []);
 }

core/services/loaders/LoaderInterface.php

Indentation +43 added lines, -43 removed lines

@@ -8,57 +8,57 @@
 interface LoaderInterface
 {
 
-    /**
-     * Can be for instantiating a new instance of a class,
-     * or for getting a shared instance of a class (default)
-     *
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @param bool                      $shared
-     * @return mixed
-     */
-    public function load($fqcn, array $arguments = array(), $shared = true);
+	/**
+	 * Can be for instantiating a new instance of a class,
+	 * or for getting a shared instance of a class (default)
+	 *
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @param bool                      $shared
+	 * @return mixed
+	 */
+	public function load($fqcn, array $arguments = array(), $shared = true);
 
 
-    /**
-     * Used for instantiating a new instance of a class
-     *
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getNew($fqcn, array $arguments = array());
+	/**
+	 * Used for instantiating a new instance of a class
+	 *
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getNew($fqcn, array $arguments = array());
 
 
-    /**
-     * Used for getting a shared instance of a class
-     *
-     * @param FullyQualifiedName|string $fqcn
-     * @param array                     $arguments
-     * @return mixed
-     */
-    public function getShared($fqcn, array $arguments = array());
+	/**
+	 * Used for getting a shared instance of a class
+	 *
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param array                     $arguments
+	 * @return mixed
+	 */
+	public function getShared($fqcn, array $arguments = array());
 
 
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @param mixed                     $object
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function share($fqcn, $object);
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @param mixed                     $object
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function share($fqcn, $object);
 
 
-    /**
-     * @param FullyQualifiedName|string $fqcn
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function remove($fqcn);
+	/**
+	 * @param FullyQualifiedName|string $fqcn
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function remove($fqcn);
 
 
-    /**
-     * calls reset() on loader if method exists
-     */
-    public function reset();
+	/**
+	 * calls reset() on loader if method exists
+	 */
+	public function reset();
 }

core/services/request/files/FilesDataHandler.php

Indentation +251 added lines, -251 removed lines

@@ -40,279 +40,279 @@
  */
 class FilesDataHandler
 {
-    /**
-     * @var Request
-     */
-    protected $request;
+	/**
+	 * @var Request
+	 */
+	protected $request;
 
-    /**
-     * @var CollectionInterface | FileSubmissionInterface[]
-     */
-    protected $file_objects;
+	/**
+	 * @var CollectionInterface | FileSubmissionInterface[]
+	 */
+	protected $file_objects;
 
-    /**
-     * @var bool
-     */
-    protected $initialized = false;
+	/**
+	 * @var bool
+	 */
+	protected $initialized = false;
 
 
-    /**
-     * FilesDataHandler constructor.
-     *
-     * @param Request $request
-     */
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
+	/**
+	 * FilesDataHandler constructor.
+	 *
+	 * @param Request $request
+	 */
+	public function __construct(Request $request)
+	{
+		$this->request = $request;
+	}
 
 
-    /**
-     * @return CollectionInterface | FileSubmissionInterface[]
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     * @since 4.9.80.p
-     */
-    protected function getFileObjects()
-    {
-        $this->initialize();
-        return $this->file_objects;
-    }
+	/**
+	 * @return CollectionInterface | FileSubmissionInterface[]
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 * @since 4.9.80.p
+	 */
+	protected function getFileObjects()
+	{
+		$this->initialize();
+		return $this->file_objects;
+	}
 
 
-    /**
-     * Sets up the file objects from the request's $_FILES data.
-     *
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @since 4.9.80.p
-     */
-    protected function initialize()
-    {
-        if ($this->initialized) {
-            return;
-        }
-        $this->file_objects = new Collection(
-        // collection interface
-            'EventEspresso\core\services\request\files\FileSubmissionInterface',
-            // collection name
-            'submitted_files'
-        );
-        $files_raw_data     = $this->request->filesParams();
-        if (empty($files_raw_data)) {
-            return;
-        }
-        if ($this->isStrangeFilesArray($files_raw_data)) {
-            $data = $this->fixFilesDataArray($files_raw_data);
-        } else {
-            $data = $files_raw_data;
-        }
-        $this->createFileObjects($data);
-        $this->initialized = true;
-    }
+	/**
+	 * Sets up the file objects from the request's $_FILES data.
+	 *
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @since 4.9.80.p
+	 */
+	protected function initialize()
+	{
+		if ($this->initialized) {
+			return;
+		}
+		$this->file_objects = new Collection(
+		// collection interface
+			'EventEspresso\core\services\request\files\FileSubmissionInterface',
+			// collection name
+			'submitted_files'
+		);
+		$files_raw_data     = $this->request->filesParams();
+		if (empty($files_raw_data)) {
+			return;
+		}
+		if ($this->isStrangeFilesArray($files_raw_data)) {
+			$data = $this->fixFilesDataArray($files_raw_data);
+		} else {
+			$data = $files_raw_data;
+		}
+		$this->createFileObjects($data);
+		$this->initialized = true;
+	}
 
 
-    /**
-     * Detects if $_FILES is a weird multi-dimensional array that needs fixing or not.
-     *
-     * @param $files_data
-     * @return bool
-     * @throws UnexpectedValueException
-     * @since 4.9.80.p
-     */
-    protected function isStrangeFilesArray($files_data)
-    {
-        if (! is_array($files_data)) {
-            throw new UnexpectedValueException(
-                sprintf(
-                    esc_html__(
-                        'Unexpected PHP $_FILES data format. "%1$s" was expected to be an array.',
-                        'event_espresso'
-                    ),
-                    (string) $files_data
-                )
-            );
-        }
-        $first_value = reset($files_data);
-        if (! is_array($first_value)) {
-            throw new UnexpectedValueException(
-                sprintf(
-                    esc_html__(
-                        'Unexpected PHP $_FILES data format. "%1$s" was expected to be an array.',
-                        'event_espresso'
-                    ),
-                    (string) $first_value
-                )
-            );
-        }
-        $first_sub_array_item = reset($first_value);
-        if (is_array($first_sub_array_item)) {
-            // not just a 2d array
-            return true;
-        }
-        // yep, just 2d array
-        return false;
-    }
+	/**
+	 * Detects if $_FILES is a weird multi-dimensional array that needs fixing or not.
+	 *
+	 * @param $files_data
+	 * @return bool
+	 * @throws UnexpectedValueException
+	 * @since 4.9.80.p
+	 */
+	protected function isStrangeFilesArray($files_data)
+	{
+		if (! is_array($files_data)) {
+			throw new UnexpectedValueException(
+				sprintf(
+					esc_html__(
+						'Unexpected PHP $_FILES data format. "%1$s" was expected to be an array.',
+						'event_espresso'
+					),
+					(string) $files_data
+				)
+			);
+		}
+		$first_value = reset($files_data);
+		if (! is_array($first_value)) {
+			throw new UnexpectedValueException(
+				sprintf(
+					esc_html__(
+						'Unexpected PHP $_FILES data format. "%1$s" was expected to be an array.',
+						'event_espresso'
+					),
+					(string) $first_value
+				)
+			);
+		}
+		$first_sub_array_item = reset($first_value);
+		if (is_array($first_sub_array_item)) {
+			// not just a 2d array
+			return true;
+		}
+		// yep, just 2d array
+		return false;
+	}
 
 
-    /**
-     * Takes into account that $_FILES does a weird thing when you have hierarchical form names (eg `<input type="file"
-     * name="my[hierarchical][form]">`): it leaves the top-level form part alone, but replaces the SECOND part with
-     * "name", "size", "tmp_name", etc. So that file's data is located at "my[name][hierarchical][form]",
-     * "my[size][hierarchical][form]", "my[tmp_name][hierarchical][form]", etc. It's really weird.
-     *
-     * @param $files_data
-     * @return array
-     * @since 4.9.80.p
-     */
-    protected function fixFilesDataArray($files_data)
-    {
-        $sane_files_array = [];
-        foreach ($files_data as $top_level_name => $top_level_children) {
-            $sub_array                           = [];
-            $sane_files_array[ $top_level_name ] = [];
-            foreach ($top_level_children as $file_data_part => $second_level_children) {
-                foreach ($second_level_children as $next_level_name => $sub_values) {
-                    $sub_array[ $next_level_name ] = $this->organizeFilesData($sub_values, $file_data_part);
-                }
-                $sane_files_array[ $top_level_name ] = array_replace_recursive(
-                    $sub_array,
-                    $sane_files_array[ $top_level_name ]
-                );
-            }
-        }
-        return $sane_files_array;
-    }
+	/**
+	 * Takes into account that $_FILES does a weird thing when you have hierarchical form names (eg `<input type="file"
+	 * name="my[hierarchical][form]">`): it leaves the top-level form part alone, but replaces the SECOND part with
+	 * "name", "size", "tmp_name", etc. So that file's data is located at "my[name][hierarchical][form]",
+	 * "my[size][hierarchical][form]", "my[tmp_name][hierarchical][form]", etc. It's really weird.
+	 *
+	 * @param $files_data
+	 * @return array
+	 * @since 4.9.80.p
+	 */
+	protected function fixFilesDataArray($files_data)
+	{
+		$sane_files_array = [];
+		foreach ($files_data as $top_level_name => $top_level_children) {
+			$sub_array                           = [];
+			$sane_files_array[ $top_level_name ] = [];
+			foreach ($top_level_children as $file_data_part => $second_level_children) {
+				foreach ($second_level_children as $next_level_name => $sub_values) {
+					$sub_array[ $next_level_name ] = $this->organizeFilesData($sub_values, $file_data_part);
+				}
+				$sane_files_array[ $top_level_name ] = array_replace_recursive(
+					$sub_array,
+					$sane_files_array[ $top_level_name ]
+				);
+			}
+		}
+		return $sane_files_array;
+	}
 
 
-    /**
-     * Recursively explores the array until it finds a leaf node, and tacks `$type` as a final index in front of it.
-     *
-     * @param $data array|string
-     * @param $type 'name', 'tmp_name', 'size', or 'error'
-     * @return array
-     * @since 4.9.80.p
-     */
-    protected function organizeFilesData($data, $type)
-    {
-        if (! is_array($data)) {
-            return [
-                $type => $data,
-            ];
-        }
-        $organized_data = [];
-        foreach ($data as $input_name_part => $sub_inputs_or_value) {
-            if (is_array($sub_inputs_or_value)) {
-                $organized_data[ $input_name_part ] = $this->organizeFilesData($sub_inputs_or_value, $type);
-            } else {
-                $organized_data[ $input_name_part ][ $type ] = $sub_inputs_or_value;
-            }
-        }
-        return $organized_data;
-    }
+	/**
+	 * Recursively explores the array until it finds a leaf node, and tacks `$type` as a final index in front of it.
+	 *
+	 * @param $data array|string
+	 * @param $type 'name', 'tmp_name', 'size', or 'error'
+	 * @return array
+	 * @since 4.9.80.p
+	 */
+	protected function organizeFilesData($data, $type)
+	{
+		if (! is_array($data)) {
+			return [
+				$type => $data,
+			];
+		}
+		$organized_data = [];
+		foreach ($data as $input_name_part => $sub_inputs_or_value) {
+			if (is_array($sub_inputs_or_value)) {
+				$organized_data[ $input_name_part ] = $this->organizeFilesData($sub_inputs_or_value, $type);
+			} else {
+				$organized_data[ $input_name_part ][ $type ] = $sub_inputs_or_value;
+			}
+		}
+		return $organized_data;
+	}
 
 
-    /**
-     * Takes the organized $_FILES array (where all file info is located at the same spot as you'd expect an input
-     * to be in post data, with all the file's data located side-by-side in an array) and creates a
-     * multi-dimensional array of FileSubmissionInterface objects. Stores it in `$this->file_objects`.
-     *
-     * @param array $organized_files   $_FILES but organized like $_POST
-     * @param array $name_parts_so_far for multidimensional HTML form names,
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     * @since 4.9.80.p
-     */
-    protected function createFileObjects($organized_files, $name_parts_so_far = [])
-    {
-        if (! is_array($organized_files)) {
-            throw new UnexpectedValueException(
-                sprintf(
-                    esc_html__(
-                        'Unexpected PHP $organized_files data format. "%1$s" was expected to be an array.',
-                        'event_espresso'
-                    ),
-                    (string) $organized_files
-                )
-            );
-        }
-        foreach ($organized_files as $key => $value) {
-            $this_input_name_parts = $name_parts_so_far;
-            array_push(
-                $this_input_name_parts,
-                $key
-            );
-            if (isset($value['name'], $value['tmp_name'], $value['size'])) {
-                $html_name = $this->inputNameFromParts($this_input_name_parts);
-                $this->file_objects->add(
-                    new FileSubmission(
-                        $value['name'],
-                        $value['tmp_name'],
-                        $value['size'],
-                        $value['error']
-                    ),
-                    $html_name
-                );
-            } else {
-                $this->createFileObjects($value, $this_input_name_parts);
-            }
-        }
-    }
+	/**
+	 * Takes the organized $_FILES array (where all file info is located at the same spot as you'd expect an input
+	 * to be in post data, with all the file's data located side-by-side in an array) and creates a
+	 * multi-dimensional array of FileSubmissionInterface objects. Stores it in `$this->file_objects`.
+	 *
+	 * @param array $organized_files   $_FILES but organized like $_POST
+	 * @param array $name_parts_so_far for multidimensional HTML form names,
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 * @since 4.9.80.p
+	 */
+	protected function createFileObjects($organized_files, $name_parts_so_far = [])
+	{
+		if (! is_array($organized_files)) {
+			throw new UnexpectedValueException(
+				sprintf(
+					esc_html__(
+						'Unexpected PHP $organized_files data format. "%1$s" was expected to be an array.',
+						'event_espresso'
+					),
+					(string) $organized_files
+				)
+			);
+		}
+		foreach ($organized_files as $key => $value) {
+			$this_input_name_parts = $name_parts_so_far;
+			array_push(
+				$this_input_name_parts,
+				$key
+			);
+			if (isset($value['name'], $value['tmp_name'], $value['size'])) {
+				$html_name = $this->inputNameFromParts($this_input_name_parts);
+				$this->file_objects->add(
+					new FileSubmission(
+						$value['name'],
+						$value['tmp_name'],
+						$value['size'],
+						$value['error']
+					),
+					$html_name
+				);
+			} else {
+				$this->createFileObjects($value, $this_input_name_parts);
+			}
+		}
+	}
 
 
-    /**
-     * Takes the input name parts, like `['my', 'great', 'file', 'input1']`
-     * and returns the HTML name for it, "my[great][file][input1]"
-     *
-     * @throws UnexpectedValueException
-     * @since 4.9.80.p
-     */
-    protected function inputNameFromParts($parts)
-    {
-        if (! is_array($parts)) {
-            throw new UnexpectedValueException(esc_html__('Name parts should be an array.', 'event_espresso'));
-        }
-        $generated_string = '';
-        foreach ($parts as $part) {
-            $part = (string) $part;
-            // wrap all but the first part in []
-            $generated_string .= $generated_string === '' ? $part : '[' . $part . ']';
-        }
-        return $generated_string;
-    }
+	/**
+	 * Takes the input name parts, like `['my', 'great', 'file', 'input1']`
+	 * and returns the HTML name for it, "my[great][file][input1]"
+	 *
+	 * @throws UnexpectedValueException
+	 * @since 4.9.80.p
+	 */
+	protected function inputNameFromParts($parts)
+	{
+		if (! is_array($parts)) {
+			throw new UnexpectedValueException(esc_html__('Name parts should be an array.', 'event_espresso'));
+		}
+		$generated_string = '';
+		foreach ($parts as $part) {
+			$part = (string) $part;
+			// wrap all but the first part in []
+			$generated_string .= $generated_string === '' ? $part : '[' . $part . ']';
+		}
+		return $generated_string;
+	}
 
 
-    /**
-     * Gets the input by the indicated $name_parts.
-     * Eg if you're looking for an input named "my[great][file][input1]", $name_parts
-     * should be `['my', 'great', 'file', 'input1']`.
-     * Alternatively, you could use `FileDataHandler::getFileObject('my[great][file][input1]');`
-     *
-     * @param $name_parts
-     * @return FileSubmissionInterface
-     * @throws UnexpectedValueException
-     * @since 4.9.80.p
-     */
-    public function getFileObjectFromNameParts($name_parts)
-    {
-        return $this->getFileObjects()->get($this->inputNameFromParts($name_parts));
-    }
+	/**
+	 * Gets the input by the indicated $name_parts.
+	 * Eg if you're looking for an input named "my[great][file][input1]", $name_parts
+	 * should be `['my', 'great', 'file', 'input1']`.
+	 * Alternatively, you could use `FileDataHandler::getFileObject('my[great][file][input1]');`
+	 *
+	 * @param $name_parts
+	 * @return FileSubmissionInterface
+	 * @throws UnexpectedValueException
+	 * @since 4.9.80.p
+	 */
+	public function getFileObjectFromNameParts($name_parts)
+	{
+		return $this->getFileObjects()->get($this->inputNameFromParts($name_parts));
+	}
 
 
-    /**
-     * Gets the FileSubmissionInterface corresponding to the HTML name provided.
-     *
-     * @param $html_name
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws UnexpectedValueException
-     * @since 4.9.80.p
-     */
-    public function getFileObject($html_name)
-    {
-        return $this->getFileObjects()->get($html_name);
-    }
+	/**
+	 * Gets the FileSubmissionInterface corresponding to the HTML name provided.
+	 *
+	 * @param $html_name
+	 * @return mixed
+	 * @throws InvalidArgumentException
+	 * @throws UnexpectedValueException
+	 * @since 4.9.80.p
+	 */
+	public function getFileObject($html_name)
+	{
+		return $this->getFileObjects()->get($html_name);
+	}
 }
 // End of file FilesDataHandler.php
 // Location: EventEspresso\core\services\request\files/FilesDataHandler.php

Spacing +13 added lines, -13 removed lines

@@ -99,7 +99,7 @@ 
             // collection name
             'submitted_files'
         );
-        $files_raw_data     = $this->request->filesParams();
+        $files_raw_data = $this->request->filesParams();
         if (empty($files_raw_data)) {
             return;
         }
@@ -123,7 +123,7 @@ 
      */
     protected function isStrangeFilesArray($files_data)
     {
-        if (! is_array($files_data)) {
+        if ( ! is_array($files_data)) {
             throw new UnexpectedValueException(
                 sprintf(
                     esc_html__(
@@ -135,7 +135,7 @@ 
             );
         }
         $first_value = reset($files_data);
-        if (! is_array($first_value)) {
+        if ( ! is_array($first_value)) {
             throw new UnexpectedValueException(
                 sprintf(
                     esc_html__(
@@ -171,14 +171,14 @@ 
         $sane_files_array = [];
         foreach ($files_data as $top_level_name => $top_level_children) {
             $sub_array                           = [];
-            $sane_files_array[ $top_level_name ] = [];
+            $sane_files_array[$top_level_name] = [];
             foreach ($top_level_children as $file_data_part => $second_level_children) {
                 foreach ($second_level_children as $next_level_name => $sub_values) {
-                    $sub_array[ $next_level_name ] = $this->organizeFilesData($sub_values, $file_data_part);
+                    $sub_array[$next_level_name] = $this->organizeFilesData($sub_values, $file_data_part);
                 }
-                $sane_files_array[ $top_level_name ] = array_replace_recursive(
+                $sane_files_array[$top_level_name] = array_replace_recursive(
                     $sub_array,
-                    $sane_files_array[ $top_level_name ]
+                    $sane_files_array[$top_level_name]
                 );
             }
         }
@@ -196,7 +196,7 @@ 
      */
     protected function organizeFilesData($data, $type)
     {
-        if (! is_array($data)) {
+        if ( ! is_array($data)) {
             return [
                 $type => $data,
             ];
@@ -204,9 +204,9 @@ 
         $organized_data = [];
         foreach ($data as $input_name_part => $sub_inputs_or_value) {
             if (is_array($sub_inputs_or_value)) {
-                $organized_data[ $input_name_part ] = $this->organizeFilesData($sub_inputs_or_value, $type);
+                $organized_data[$input_name_part] = $this->organizeFilesData($sub_inputs_or_value, $type);
             } else {
-                $organized_data[ $input_name_part ][ $type ] = $sub_inputs_or_value;
+                $organized_data[$input_name_part][$type] = $sub_inputs_or_value;
             }
         }
         return $organized_data;
@@ -226,7 +226,7 @@ 
      */
     protected function createFileObjects($organized_files, $name_parts_so_far = [])
     {
-        if (! is_array($organized_files)) {
+        if ( ! is_array($organized_files)) {
             throw new UnexpectedValueException(
                 sprintf(
                     esc_html__(
@@ -270,14 +270,14 @@ 
      */
     protected function inputNameFromParts($parts)
     {
-        if (! is_array($parts)) {
+        if ( ! is_array($parts)) {
             throw new UnexpectedValueException(esc_html__('Name parts should be an array.', 'event_espresso'));
         }
         $generated_string = '';
         foreach ($parts as $part) {
             $part = (string) $part;
             // wrap all but the first part in []
-            $generated_string .= $generated_string === '' ? $part : '[' . $part . ']';
+            $generated_string .= $generated_string === '' ? $part : '['.$part.']';
         }
         return $generated_string;
     }

core/services/request/sanitizers/ServerSanitizer.php

Indentation +55 added lines, -55 removed lines

@@ -11,59 +11,59 @@
  */
 class ServerSanitizer
 {
-    /**
-     * @param string $value
-     * @return mixed|string
-     */
-    public function clean($key, $value)
-    {
-        switch ($key) {
-            case 'AUTH_TYPE':
-                $valid_types = [
-                    'Basic',
-                    'Bearer',
-                    'Digest',
-                    'HOBA',
-                    'Mutual',
-                    'Negotiate',
-                    'OAuth',
-                    'SCRAM-SHA-1',
-                    'SCRAM-SHA-256',
-                    'vapid',
-                ];
-                return in_array($value, $valid_types, true) ? $value : 'Basic';
-            case 'argc':
-            case 'HTTP_DNT':
-            case 'HTTP_UPGRADE_INSECURE_REQUESTS':
-            case 'SERVER_PORT':
-            case 'REMOTE_PORT':
-            case 'REQUEST_TIME':
-                return (int) filter_var($value, FILTER_SANITIZE_NUMBER_INT);
-            case 'REQUEST_TIME_FLOAT':
-                return (float) filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-            case 'REQUEST_METHOD':
-                $valid_types = [
-                    'CONNECT',
-                    'DELETE',
-                    'GET',
-                    'HEAD',
-                    'OPTIONS',
-                    'PATCH',
-                    'POST',
-                    'PUT',
-                    'TRACE',
-                ];
-                return in_array($value, $valid_types, true) ? $value : 'GET';
-            case 'HTTP_HOST':
-            case 'QUERY_STRING':
-            case 'REQUEST_URI':
-            case 'SCRIPT_NAME':
-            case 'SERVER_NAME':
-                return filter_var($value, FILTER_SANITIZE_URL);
-            case 'SERVER_ADMIN':
-                return filter_var($value, FILTER_SANITIZE_EMAIL);
-            default:
-                return filter_var($value, FILTER_SANITIZE_STRING);
-        }
-    }
+	/**
+	 * @param string $value
+	 * @return mixed|string
+	 */
+	public function clean($key, $value)
+	{
+		switch ($key) {
+			case 'AUTH_TYPE':
+				$valid_types = [
+					'Basic',
+					'Bearer',
+					'Digest',
+					'HOBA',
+					'Mutual',
+					'Negotiate',
+					'OAuth',
+					'SCRAM-SHA-1',
+					'SCRAM-SHA-256',
+					'vapid',
+				];
+				return in_array($value, $valid_types, true) ? $value : 'Basic';
+			case 'argc':
+			case 'HTTP_DNT':
+			case 'HTTP_UPGRADE_INSECURE_REQUESTS':
+			case 'SERVER_PORT':
+			case 'REMOTE_PORT':
+			case 'REQUEST_TIME':
+				return (int) filter_var($value, FILTER_SANITIZE_NUMBER_INT);
+			case 'REQUEST_TIME_FLOAT':
+				return (float) filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			case 'REQUEST_METHOD':
+				$valid_types = [
+					'CONNECT',
+					'DELETE',
+					'GET',
+					'HEAD',
+					'OPTIONS',
+					'PATCH',
+					'POST',
+					'PUT',
+					'TRACE',
+				];
+				return in_array($value, $valid_types, true) ? $value : 'GET';
+			case 'HTTP_HOST':
+			case 'QUERY_STRING':
+			case 'REQUEST_URI':
+			case 'SCRIPT_NAME':
+			case 'SERVER_NAME':
+				return filter_var($value, FILTER_SANITIZE_URL);
+			case 'SERVER_ADMIN':
+				return filter_var($value, FILTER_SANITIZE_EMAIL);
+			default:
+				return filter_var($value, FILTER_SANITIZE_STRING);
+		}
+	}
 }