eventespresso / event-espresso-core

caffeinated/modules/recaptcha/EED_Recaptcha.module.php

Spacing +7 added lines, -7 removed lines

@@ -133,7 +133,7 @@ 
         }
         define(
             'RECAPTCHA_BASE_PATH',
-            rtrim(str_replace(array('\\', '/'), '/', plugin_dir_path(__FILE__)), '/') . '/'
+            rtrim(str_replace(array('\\', '/'), '/', plugin_dir_path(__FILE__)), '/').'/'
         );
         define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
     }
@@ -187,14 +187,14 @@ 
     {
         wp_register_script(
             'espresso_recaptcha',
-            RECAPTCHA_BASE_URL . 'scripts/espresso_recaptcha.js',
+            RECAPTCHA_BASE_URL.'scripts/espresso_recaptcha.js',
             array('single_page_checkout'),
             EVENT_ESPRESSO_VERSION,
             true
         );
         wp_register_script(
             'google_recaptcha',
-            'https://www.google.com/recaptcha/api.js?hl=' . EED_Recaptcha::$config->recaptcha_language,
+            'https://www.google.com/recaptcha/api.js?hl='.EED_Recaptcha::$config->recaptcha_language,
             array('espresso_recaptcha'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -253,7 +253,7 @@ 
         if (EED_Recaptcha::useRecaptcha() && ! EED_Recaptcha::$_not_a_robot) {
             // only display if they have NOT passed the test yet
             EEH_Template::display_template(
-                RECAPTCHA_BASE_PATH . '/templates/recaptcha.template.php',
+                RECAPTCHA_BASE_PATH.'/templates/recaptcha.template.php',
                 array(
                     'recaptcha_publickey' => EED_Recaptcha::$config->recaptcha_publickey,
                     'recaptcha_theme'     => EED_Recaptcha::$config->recaptcha_theme,
@@ -298,7 +298,7 @@ 
         $recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
         // verify recaptcha
         EED_Recaptcha::_get_recaptcha_response();
-        if (! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
+        if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
             $recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
             EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
         }
@@ -375,8 +375,8 @@ 
     private static function _process_recaptcha_response()
     {
         // verify library is loaded
-        if (! class_exists('\ReCaptcha\ReCaptcha')) {
-            require_once RECAPTCHA_BASE_PATH . '/autoload.php';
+        if ( ! class_exists('\ReCaptcha\ReCaptcha')) {
+            require_once RECAPTCHA_BASE_PATH.'/autoload.php';
         }
         // The response from reCAPTCHA
         EED_Recaptcha::_get_recaptcha_response();

Indentation +378 added lines, -378 removed lines

@@ -17,382 +17,382 @@
  */
 class EED_Recaptcha extends EED_Module
 {
-    /**
-     * @var EE_Registration_Config $config
-     */
-    private static $config;
-
-    /**
-     * @type bool $_not_a_robot
-     */
-    private static $_not_a_robot;
-
-    /**
-     * @type string $_recaptcha_response
-     */
-    private static $_recaptcha_response;
-
-
-    /**
-     * @return EED_Module|EED_Recaptcha
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function set_hooks()
-    {
-        EED_Recaptcha::$config = EE_Registry::instance()->CFG->registration;
-        // use_captcha ?
-        if (
-            EED_Recaptcha::useRecaptcha()
-            && EED_Recaptcha::notPaymentOptionsRevisit()
-        ) {
-            EED_Recaptcha::set_definitions();
-            EED_Recaptcha::enqueue_styles_and_scripts();
-            add_action('wp', array('EED_Recaptcha', 'set_late_hooks'), 1, 0);
-            add_action(
-                'AHEE__before_spco_whats_next_buttons',
-                array('EED_Recaptcha', 'display_recaptcha'),
-                10,
-                0
-            );
-            add_filter(
-                'FHEE__EED_Single_Page_Checkout__init___continue_reg',
-                array('EED_Recaptcha', 'not_a_robot')
-            );
-            add_filter(
-                'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
-                array('EED_Recaptcha', 'not_a_robot')
-            );
-            add_filter(
-                'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
-                array('EED_Recaptcha', 'recaptcha_response')
-            );
-            add_filter(
-                'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
-                array('EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method')
-            );
-        }
-    }
-
-
-    /**
-     * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function set_hooks_admin()
-    {
-        EED_Recaptcha::$config = EE_Registry::instance()->CFG->registration;
-        EED_Recaptcha::set_definitions();
-        // use_captcha ?
-        if (
-            EED_Recaptcha::useRecaptcha()
-            && EED_Recaptcha::notPaymentOptionsRevisit()
-            && EED_Recaptcha::getRequest()->getRequestParam('step', '') !== ''
-        ) {
-            EED_Recaptcha::enqueue_styles_and_scripts();
-            add_filter(
-                'FHEE__EED_Single_Page_Checkout__init___continue_reg',
-                array('EED_Recaptcha', 'not_a_robot')
-            );
-            add_filter(
-                'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
-                array('EED_Recaptcha', 'not_a_robot')
-            );
-            add_filter(
-                'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
-                array('EED_Recaptcha', 'recaptcha_response')
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function set_definitions()
-    {
-        if (is_user_logged_in()) {
-            EED_Recaptcha::$_not_a_robot = true;
-        }
-        define(
-            'RECAPTCHA_BASE_PATH',
-            rtrim(str_replace(array('\\', '/'), '/', plugin_dir_path(__FILE__)), '/') . '/'
-        );
-        define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function set_late_hooks()
-    {
-        add_filter(
-            'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit',
-            array('EED_Recaptcha', 'not_a_robot')
-        );
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public static function useRecaptcha()
-    {
-        return EED_Recaptcha::$config->use_captcha
-               && EED_Recaptcha::$config->recaptcha_theme !== 'invisible';
-    }
-
-
-    /**
-     * @return boolean
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function notPaymentOptionsRevisit()
-    {
-        $request = EED_Recaptcha::getRequest();
-        return ! (
-            $request->getRequestParam('step', '') === 'payment_options'
-            && $request->getRequestParam('revisit', false, 'bool') === true
-        );
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function enqueue_styles_and_scripts()
-    {
-        wp_register_script(
-            'espresso_recaptcha',
-            RECAPTCHA_BASE_URL . 'scripts/espresso_recaptcha.js',
-            array('single_page_checkout'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_script(
-            'google_recaptcha',
-            'https://www.google.com/recaptcha/api.js?hl=' . EED_Recaptcha::$config->recaptcha_language,
-            array('espresso_recaptcha'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        EE_Registry::$i18n_js_strings['no_SPCO_error'] = __(
-            'It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __(
-            'There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['recaptcha_fail'] = __(
-            'Please complete the anti-spam test before proceeding.',
-            'event_espresso'
-        );
-    }
-
-
-    /**
-     * @param WP $WP
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     * @return boolean
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function not_a_robot()
-    {
-        return is_bool(EED_Recaptcha::$_not_a_robot)
-            ? EED_Recaptcha::$_not_a_robot
-            : EED_Recaptcha::recaptcha_passed();
-    }
-
-
-    /**
-     * @return void
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function display_recaptcha()
-    {
-        // logged in means you have already passed a turing test of sorts
-        if (is_user_logged_in()) {
-            return;
-        }
-        // don't display if not using recaptcha or user is logged in
-        if (EED_Recaptcha::useRecaptcha() && ! EED_Recaptcha::$_not_a_robot) {
-            // only display if they have NOT passed the test yet
-            EEH_Template::display_template(
-                RECAPTCHA_BASE_PATH . '/templates/recaptcha.template.php',
-                array(
-                    'recaptcha_publickey' => EED_Recaptcha::$config->recaptcha_publickey,
-                    'recaptcha_theme'     => EED_Recaptcha::$config->recaptcha_theme,
-                    'recaptcha_type'      => EED_Recaptcha::$config->recaptcha_type,
-                )
-            );
-            wp_enqueue_script('google_recaptcha');
-        }
-    }
-
-
-    /**
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function bypass_recaptcha_for_spco_load_payment_method()
-    {
-        return array(
-            'EESID'  => EE_Registry::instance()->SSN->id(),
-            'step'   => 'payment_options',
-            'action' => 'switch_spco_billing_form',
-        );
-    }
-
-
-    /**
-     * @return boolean
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public static function recaptcha_passed()
-    {
-        // logged in means you have already passed a turing test of sorts
-        if (is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha()) {
-            return true;
-        }
-        // was test already passed?
-        $recaptcha_passed = EE_Registry::instance()->SSN->get_session_data('recaptcha_passed');
-        $recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
-        // verify recaptcha
-        EED_Recaptcha::_get_recaptcha_response();
-        if (! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
-            $recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
-            EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
-        }
-        EED_Recaptcha::$_not_a_robot = $recaptcha_passed;
-        return $recaptcha_passed;
-    }
-
-
-    /**
-     * @param array $recaptcha_response
-     * @return array
-     */
-    public static function recaptcha_response($recaptcha_response = array())
-    {
-        if (EED_Recaptcha::_bypass_recaptcha()) {
-            $recaptcha_response['bypass_recaptcha'] = true;
-            $recaptcha_response['recaptcha_passed'] = true;
-        } else {
-            $recaptcha_response['recaptcha_passed'] = EED_Recaptcha::$_not_a_robot;
-        }
-        return $recaptcha_response;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private static function _bypass_recaptcha()
-    {
-        // an array of key value pairs that must match exactly with the incoming request,
-        // in order to bypass recaptcha for the current request ONLY
-        $bypass_request_params_array = (array) apply_filters(
-            'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
-            array()
-        );
-        // does $bypass_request_params_array have any values ?
-        if (empty($bypass_request_params_array)) {
-            return false;
-        }
-        $request = EED_Recaptcha::getRequest();
-        // initially set bypass to TRUE
-        $bypass_recaptcha = true;
-        foreach ($bypass_request_params_array as $key => $value) {
-            // if $key is not found or value doesn't match exactly, then toggle bypass to FALSE,
-            // otherwise carry over it's value. This way, one missed setting results in no bypass
-            $bypass_recaptcha = $request->getRequestParam($key) === $value
-                ? $bypass_recaptcha
-                : false;
-        }
-        return $bypass_recaptcha;
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    private static function _get_recaptcha_response()
-    {
-        EED_Recaptcha::$_recaptcha_response = EED_Recaptcha::getRequest()->getRequestParam(
-            'g-recaptcha-response'
-        );
-    }
-
-
-    /**
-     * @return boolean
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    private static function _process_recaptcha_response()
-    {
-        // verify library is loaded
-        if (! class_exists('\ReCaptcha\ReCaptcha')) {
-            require_once RECAPTCHA_BASE_PATH . '/autoload.php';
-        }
-        // The response from reCAPTCHA
-        EED_Recaptcha::_get_recaptcha_response();
-        $recaptcha_response = EED_Recaptcha::$_recaptcha_response;
-        // Was there a reCAPTCHA response?
-        if ($recaptcha_response) {
-            // if allow_url_fopen is Off, then set a different request method
-            $request_method = ! ini_get('allow_url_fopen') ? new SocketPost() : null;
-            $recaptcha = new ReCaptcha(
-                EED_Recaptcha::$config->recaptcha_privatekey,
-                $request_method
-            );
-            $recaptcha_response = $recaptcha->verify(
-                EED_Recaptcha::$_recaptcha_response,
-                EED_Recaptcha::getRequest()->getServerParam('REMOTE_ADDR')
-            );
-        }
-        return $recaptcha_response instanceof Response && $recaptcha_response->isSuccess();
-    }
+	/**
+	 * @var EE_Registration_Config $config
+	 */
+	private static $config;
+
+	/**
+	 * @type bool $_not_a_robot
+	 */
+	private static $_not_a_robot;
+
+	/**
+	 * @type string $_recaptcha_response
+	 */
+	private static $_recaptcha_response;
+
+
+	/**
+	 * @return EED_Module|EED_Recaptcha
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function set_hooks()
+	{
+		EED_Recaptcha::$config = EE_Registry::instance()->CFG->registration;
+		// use_captcha ?
+		if (
+			EED_Recaptcha::useRecaptcha()
+			&& EED_Recaptcha::notPaymentOptionsRevisit()
+		) {
+			EED_Recaptcha::set_definitions();
+			EED_Recaptcha::enqueue_styles_and_scripts();
+			add_action('wp', array('EED_Recaptcha', 'set_late_hooks'), 1, 0);
+			add_action(
+				'AHEE__before_spco_whats_next_buttons',
+				array('EED_Recaptcha', 'display_recaptcha'),
+				10,
+				0
+			);
+			add_filter(
+				'FHEE__EED_Single_Page_Checkout__init___continue_reg',
+				array('EED_Recaptcha', 'not_a_robot')
+			);
+			add_filter(
+				'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
+				array('EED_Recaptcha', 'not_a_robot')
+			);
+			add_filter(
+				'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
+				array('EED_Recaptcha', 'recaptcha_response')
+			);
+			add_filter(
+				'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
+				array('EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method')
+			);
+		}
+	}
+
+
+	/**
+	 * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function set_hooks_admin()
+	{
+		EED_Recaptcha::$config = EE_Registry::instance()->CFG->registration;
+		EED_Recaptcha::set_definitions();
+		// use_captcha ?
+		if (
+			EED_Recaptcha::useRecaptcha()
+			&& EED_Recaptcha::notPaymentOptionsRevisit()
+			&& EED_Recaptcha::getRequest()->getRequestParam('step', '') !== ''
+		) {
+			EED_Recaptcha::enqueue_styles_and_scripts();
+			add_filter(
+				'FHEE__EED_Single_Page_Checkout__init___continue_reg',
+				array('EED_Recaptcha', 'not_a_robot')
+			);
+			add_filter(
+				'FHEE__EE_SPCO_Reg_Step__set_completed___completed',
+				array('EED_Recaptcha', 'not_a_robot')
+			);
+			add_filter(
+				'FHEE__EE_SPCO_JSON_Response___toString__JSON_response',
+				array('EED_Recaptcha', 'recaptcha_response')
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function set_definitions()
+	{
+		if (is_user_logged_in()) {
+			EED_Recaptcha::$_not_a_robot = true;
+		}
+		define(
+			'RECAPTCHA_BASE_PATH',
+			rtrim(str_replace(array('\\', '/'), '/', plugin_dir_path(__FILE__)), '/') . '/'
+		);
+		define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function set_late_hooks()
+	{
+		add_filter(
+			'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit',
+			array('EED_Recaptcha', 'not_a_robot')
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public static function useRecaptcha()
+	{
+		return EED_Recaptcha::$config->use_captcha
+			   && EED_Recaptcha::$config->recaptcha_theme !== 'invisible';
+	}
+
+
+	/**
+	 * @return boolean
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function notPaymentOptionsRevisit()
+	{
+		$request = EED_Recaptcha::getRequest();
+		return ! (
+			$request->getRequestParam('step', '') === 'payment_options'
+			&& $request->getRequestParam('revisit', false, 'bool') === true
+		);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function enqueue_styles_and_scripts()
+	{
+		wp_register_script(
+			'espresso_recaptcha',
+			RECAPTCHA_BASE_URL . 'scripts/espresso_recaptcha.js',
+			array('single_page_checkout'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_script(
+			'google_recaptcha',
+			'https://www.google.com/recaptcha/api.js?hl=' . EED_Recaptcha::$config->recaptcha_language,
+			array('espresso_recaptcha'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __(
+			'It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __(
+			'There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __(
+			'Please complete the anti-spam test before proceeding.',
+			'event_espresso'
+		);
+	}
+
+
+	/**
+	 * @param WP $WP
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 * @return boolean
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function not_a_robot()
+	{
+		return is_bool(EED_Recaptcha::$_not_a_robot)
+			? EED_Recaptcha::$_not_a_robot
+			: EED_Recaptcha::recaptcha_passed();
+	}
+
+
+	/**
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function display_recaptcha()
+	{
+		// logged in means you have already passed a turing test of sorts
+		if (is_user_logged_in()) {
+			return;
+		}
+		// don't display if not using recaptcha or user is logged in
+		if (EED_Recaptcha::useRecaptcha() && ! EED_Recaptcha::$_not_a_robot) {
+			// only display if they have NOT passed the test yet
+			EEH_Template::display_template(
+				RECAPTCHA_BASE_PATH . '/templates/recaptcha.template.php',
+				array(
+					'recaptcha_publickey' => EED_Recaptcha::$config->recaptcha_publickey,
+					'recaptcha_theme'     => EED_Recaptcha::$config->recaptcha_theme,
+					'recaptcha_type'      => EED_Recaptcha::$config->recaptcha_type,
+				)
+			);
+			wp_enqueue_script('google_recaptcha');
+		}
+	}
+
+
+	/**
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function bypass_recaptcha_for_spco_load_payment_method()
+	{
+		return array(
+			'EESID'  => EE_Registry::instance()->SSN->id(),
+			'step'   => 'payment_options',
+			'action' => 'switch_spco_billing_form',
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public static function recaptcha_passed()
+	{
+		// logged in means you have already passed a turing test of sorts
+		if (is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha()) {
+			return true;
+		}
+		// was test already passed?
+		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data('recaptcha_passed');
+		$recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
+		// verify recaptcha
+		EED_Recaptcha::_get_recaptcha_response();
+		if (! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
+			$recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
+			EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
+		}
+		EED_Recaptcha::$_not_a_robot = $recaptcha_passed;
+		return $recaptcha_passed;
+	}
+
+
+	/**
+	 * @param array $recaptcha_response
+	 * @return array
+	 */
+	public static function recaptcha_response($recaptcha_response = array())
+	{
+		if (EED_Recaptcha::_bypass_recaptcha()) {
+			$recaptcha_response['bypass_recaptcha'] = true;
+			$recaptcha_response['recaptcha_passed'] = true;
+		} else {
+			$recaptcha_response['recaptcha_passed'] = EED_Recaptcha::$_not_a_robot;
+		}
+		return $recaptcha_response;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private static function _bypass_recaptcha()
+	{
+		// an array of key value pairs that must match exactly with the incoming request,
+		// in order to bypass recaptcha for the current request ONLY
+		$bypass_request_params_array = (array) apply_filters(
+			'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
+			array()
+		);
+		// does $bypass_request_params_array have any values ?
+		if (empty($bypass_request_params_array)) {
+			return false;
+		}
+		$request = EED_Recaptcha::getRequest();
+		// initially set bypass to TRUE
+		$bypass_recaptcha = true;
+		foreach ($bypass_request_params_array as $key => $value) {
+			// if $key is not found or value doesn't match exactly, then toggle bypass to FALSE,
+			// otherwise carry over it's value. This way, one missed setting results in no bypass
+			$bypass_recaptcha = $request->getRequestParam($key) === $value
+				? $bypass_recaptcha
+				: false;
+		}
+		return $bypass_recaptcha;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	private static function _get_recaptcha_response()
+	{
+		EED_Recaptcha::$_recaptcha_response = EED_Recaptcha::getRequest()->getRequestParam(
+			'g-recaptcha-response'
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	private static function _process_recaptcha_response()
+	{
+		// verify library is loaded
+		if (! class_exists('\ReCaptcha\ReCaptcha')) {
+			require_once RECAPTCHA_BASE_PATH . '/autoload.php';
+		}
+		// The response from reCAPTCHA
+		EED_Recaptcha::_get_recaptcha_response();
+		$recaptcha_response = EED_Recaptcha::$_recaptcha_response;
+		// Was there a reCAPTCHA response?
+		if ($recaptcha_response) {
+			// if allow_url_fopen is Off, then set a different request method
+			$request_method = ! ini_get('allow_url_fopen') ? new SocketPost() : null;
+			$recaptcha = new ReCaptcha(
+				EED_Recaptcha::$config->recaptcha_privatekey,
+				$request_method
+			);
+			$recaptcha_response = $recaptcha->verify(
+				EED_Recaptcha::$_recaptcha_response,
+				EED_Recaptcha::getRequest()->getServerParam('REMOTE_ADDR')
+			);
+		}
+		return $recaptcha_response instanceof Response && $recaptcha_response->isSuccess();
+	}
 }

core/domain/services/graphql/connections/RootQueryStatesConnection.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         return [
             'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'State',
-            'fromFieldName'      => lcfirst($this->namespace) . 'States',
+            'toType'             => $this->namespace.'State',
+            'fromFieldName'      => lcfirst($this->namespace).'States',
             'connectionTypeName' => "{$this->namespace}RootQueryStatesConnection",
             'connectionArgs'     => self::get_connection_args(),
             'resolve'            => [$this, 'resolveConnection'],

Indentation +85 added lines, -85 removed lines

@@ -18,95 +18,95 @@
  */
 class RootQueryStatesConnection extends AbstractRootQueryConnection
 {
-    /**
-     * StateConnection constructor.
-     *
-     * @param EEM_State               $model
-     */
-    public function __construct(EEM_State $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * StateConnection constructor.
+	 *
+	 * @param EEM_State               $model
+	 */
+	public function __construct(EEM_State $model)
+	{
+		parent::__construct($model);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function config(): array
-    {
-        return [
-            'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'State',
-            'fromFieldName'      => lcfirst($this->namespace) . 'States',
-            'connectionTypeName' => "{$this->namespace}RootQueryStatesConnection",
-            'connectionArgs'     => self::get_connection_args(),
-            'resolve'            => [$this, 'resolveConnection'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function config(): array
+	{
+		return [
+			'fromType'           => 'RootQuery',
+			'toType'             => $this->namespace . 'State',
+			'fromFieldName'      => lcfirst($this->namespace) . 'States',
+			'connectionTypeName' => "{$this->namespace}RootQueryStatesConnection",
+			'connectionArgs'     => self::get_connection_args(),
+			'resolve'            => [$this, 'resolveConnection'],
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return StateConnectionResolver
-     * @throws Exception
-     */
-    public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
-    {
-        return new StateConnectionResolver($entity, $args, $context, $info);
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return StateConnectionResolver
+	 * @throws Exception
+	 */
+	public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
+	{
+		return new StateConnectionResolver($entity, $args, $context, $info);
+	}
 
-    /**
-     * Given an optional array of args, this returns the args to be used in the connection
-     *
-     * @param array $args The args to modify the defaults
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public static function get_connection_args(array $args = []): array
-    {
-        $newArgs = [
-            'orderby'      => [
-                'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
-                'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
-            ],
-            'in' => [
-                'type'        => ['list_of' => 'ID'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given state IDs.',
-                    'event_espresso'
-                ),
-            ],
-            'countryIsoIn' => [
-                'type'        => ['list_of' => 'String'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country ISOs.',
-                    'event_espresso'
-                ),
-            ],
-            'search' => [
-                'type'        => 'String',
-                'description' => esc_html__('The search keywords', 'event_espresso'),
-            ],
-            'activeOnly' => [
-                'type'        => 'Boolean',
-                'description' => esc_html__(
-                    'Limit the result to the active states.',
-                    'event_espresso'
-                ),
-            ],
-        ];
+	/**
+	 * Given an optional array of args, this returns the args to be used in the connection
+	 *
+	 * @param array $args The args to modify the defaults
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public static function get_connection_args(array $args = []): array
+	{
+		$newArgs = [
+			'orderby'      => [
+				'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
+				'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
+			],
+			'in' => [
+				'type'        => ['list_of' => 'ID'],
+				'description' => esc_html__(
+					'Limit the result to the set of given state IDs.',
+					'event_espresso'
+				),
+			],
+			'countryIsoIn' => [
+				'type'        => ['list_of' => 'String'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country ISOs.',
+					'event_espresso'
+				),
+			],
+			'search' => [
+				'type'        => 'String',
+				'description' => esc_html__('The search keywords', 'event_espresso'),
+			],
+			'activeOnly' => [
+				'type'        => 'Boolean',
+				'description' => esc_html__(
+					'Limit the result to the active states.',
+					'event_espresso'
+				),
+			],
+		];
 
-        $newArgs = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connections__state_args',
-            $newArgs,
-            $args
-        );
-        return array_merge(
-            $newArgs,
-            $args
-        );
-    }
+		$newArgs = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connections__state_args',
+			$newArgs,
+			$args
+		);
+		return array_merge(
+			$newArgs,
+			$args
+		);
+	}
 }

core/domain/services/graphql/connections/RootQueryCountriesConnection.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         return [
             'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Country',
-            'fromFieldName'      => lcfirst($this->namespace . 'Countries'),
+            'toType'             => $this->namespace.'Country',
+            'fromFieldName'      => lcfirst($this->namespace.'Countries'),
             'connectionTypeName' => "{$this->namespace}RootQueryCountriesConnection",
             'connectionArgs'     => RootQueryCountriesConnection::get_connection_args(),
             'resolve'            => [$this, 'resolveConnection'],

Indentation +95 added lines, -95 removed lines

@@ -18,105 +18,105 @@
  */
 class RootQueryCountriesConnection extends AbstractRootQueryConnection
 {
-    /**
-     * CountryConnection constructor.
-     *
-     * @param EEM_Country               $model
-     */
-    public function __construct(EEM_Country $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * CountryConnection constructor.
+	 *
+	 * @param EEM_Country               $model
+	 */
+	public function __construct(EEM_Country $model)
+	{
+		parent::__construct($model);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function config(): array
-    {
-        return [
-            'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Country',
-            'fromFieldName'      => lcfirst($this->namespace . 'Countries'),
-            'connectionTypeName' => "{$this->namespace}RootQueryCountriesConnection",
-            'connectionArgs'     => RootQueryCountriesConnection::get_connection_args(),
-            'resolve'            => [$this, 'resolveConnection'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function config(): array
+	{
+		return [
+			'fromType'           => 'RootQuery',
+			'toType'             => $this->namespace . 'Country',
+			'fromFieldName'      => lcfirst($this->namespace . 'Countries'),
+			'connectionTypeName' => "{$this->namespace}RootQueryCountriesConnection",
+			'connectionArgs'     => RootQueryCountriesConnection::get_connection_args(),
+			'resolve'            => [$this, 'resolveConnection'],
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return CountryConnectionResolver
-     * @throws Exception
-     */
-    public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
-    {
-        return new CountryConnectionResolver($entity, $args, $context, $info);
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return CountryConnectionResolver
+	 * @throws Exception
+	 */
+	public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
+	{
+		return new CountryConnectionResolver($entity, $args, $context, $info);
+	}
 
-    /**
-     * Given an optional array of args, this returns the args to be used in the connection
-     *
-     * @param array $args The args to modify the defaults
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public static function get_connection_args(array $args = []): array
-    {
-        $newArgs = [
-            'orderby'      => [
-                'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
-                'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
-            ],
-            'in' => [
-                'type'        => ['list_of' => 'ID'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country IDs.',
-                    'event_espresso'
-                ),
-            ],
-            'isoIn' => [
-                'type'        => ['list_of' => 'String'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country ISOs.',
-                    'event_espresso'
-                ),
-            ],
-            'iso3In' => [
-                'type'        => ['list_of' => 'String'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country ISO3s.',
-                    'event_espresso'
-                ),
-            ],
-            'search' => [
-                'type'        => 'String',
-                'description' => esc_html__(
-                    'Limit the result to the given search query.',
-                    'event_espresso'
-                ),
-            ],
-            'activeOnly' => [
-                'type'        => 'Boolean',
-                'description' => esc_html__(
-                    'Limit the result to the active countries.',
-                    'event_espresso'
-                ),
-            ],
-        ];
+	/**
+	 * Given an optional array of args, this returns the args to be used in the connection
+	 *
+	 * @param array $args The args to modify the defaults
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public static function get_connection_args(array $args = []): array
+	{
+		$newArgs = [
+			'orderby'      => [
+				'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
+				'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
+			],
+			'in' => [
+				'type'        => ['list_of' => 'ID'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country IDs.',
+					'event_espresso'
+				),
+			],
+			'isoIn' => [
+				'type'        => ['list_of' => 'String'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country ISOs.',
+					'event_espresso'
+				),
+			],
+			'iso3In' => [
+				'type'        => ['list_of' => 'String'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country ISO3s.',
+					'event_espresso'
+				),
+			],
+			'search' => [
+				'type'        => 'String',
+				'description' => esc_html__(
+					'Limit the result to the given search query.',
+					'event_espresso'
+				),
+			],
+			'activeOnly' => [
+				'type'        => 'Boolean',
+				'description' => esc_html__(
+					'Limit the result to the active countries.',
+					'event_espresso'
+				),
+			],
+		];
 
-        $newArgs = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connections__country_args',
-            $newArgs,
-            $args
-        );
-        return array_merge(
-            $newArgs,
-            $args
-        );
-    }
+		$newArgs = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connections__country_args',
+			$newArgs,
+			$args
+		);
+		return array_merge(
+			$newArgs,
+			$args
+		);
+	}
 }

core/domain/services/graphql/inputs/StatesConnectionOrderbyInput.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyInput');
+        $this->setName($this->namespace.'StatesConnectionOrderbyInput');
         $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
         parent::__construct();
     }
@@ -36,7 +36,7 @@ 
         return [
             new GraphQLField(
                 'field',
-                ['non_null' => $this->namespace . 'StatesConnectionOrderbyEnum']
+                ['non_null' => $this->namespace.'StatesConnectionOrderbyEnum']
             ),
             new GraphQLField(
                 'order',

Indentation +25 added lines, -25 removed lines

@@ -16,31 +16,31 @@
  */
 class StatesConnectionOrderbyInput extends InputBase
 {
-    /**
-     * StatesConnectionOrderbyInput constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyInput');
-        $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * StatesConnectionOrderbyInput constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'StatesConnectionOrderbyInput');
+		$this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    protected function getFields(): array
-    {
-        return [
-            new GraphQLField(
-                'field',
-                ['non_null' => $this->namespace . 'StatesConnectionOrderbyEnum']
-            ),
-            new GraphQLField(
-                'order',
-                'OrderEnum'
-            ),
-        ];
-    }
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	protected function getFields(): array
+	{
+		return [
+			new GraphQLField(
+				'field',
+				['non_null' => $this->namespace . 'StatesConnectionOrderbyEnum']
+			),
+			new GraphQLField(
+				'order',
+				'OrderEnum'
+			),
+		];
+	}
 }

core/domain/services/graphql/inputs/CountriesConnectionOrderbyInput.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyInput');
+        $this->setName($this->namespace.'CountriesConnectionOrderbyInput');
         $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
         parent::__construct();
     }
@@ -36,7 +36,7 @@ 
         return [
             new GraphQLField(
                 'field',
-                ['non_null' => $this->namespace . 'CountriesConnectionOrderbyEnum']
+                ['non_null' => $this->namespace.'CountriesConnectionOrderbyEnum']
             ),
             new GraphQLField(
                 'order',

Indentation +25 added lines, -25 removed lines

@@ -16,31 +16,31 @@
  */
 class CountriesConnectionOrderbyInput extends InputBase
 {
-    /**
-     * CountriesConnectionOrderbyInput constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyInput');
-        $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * CountriesConnectionOrderbyInput constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'CountriesConnectionOrderbyInput');
+		$this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    protected function getFields(): array
-    {
-        return [
-            new GraphQLField(
-                'field',
-                ['non_null' => $this->namespace . 'CountriesConnectionOrderbyEnum']
-            ),
-            new GraphQLField(
-                'order',
-                'OrderEnum'
-            ),
-        ];
-    }
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	protected function getFields(): array
+	{
+		return [
+			new GraphQLField(
+				'field',
+				['non_null' => $this->namespace . 'CountriesConnectionOrderbyEnum']
+			),
+			new GraphQLField(
+				'order',
+				'OrderEnum'
+			),
+		];
+	}
 }

core/domain/services/graphql/data/loaders/CountryLoader.php

Indentation +22 added lines, -22 removed lines

@@ -15,28 +15,28 @@
  */
 class CountryLoader extends AbstractLoader
 {
-    /**
-     * @return EEM_Base|EEM_Country
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function getQuery(): EEM_Base
-    {
-        return EEM_Country::instance();
-    }
+	/**
+	 * @return EEM_Base|EEM_Country
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function getQuery(): EEM_Base
+	{
+		return EEM_Country::instance();
+	}
 
 
-    /**
-     * @param array $keys
-     * @return array
-     */
-    protected function getWhereParams(array $keys): array
-    {
-        return [
-            'CNT_ISO' => ['IN', $keys],
-        ];
-    }
+	/**
+	 * @param array $keys
+	 * @return array
+	 */
+	protected function getWhereParams(array $keys): array
+	{
+		return [
+			'CNT_ISO' => ['IN', $keys],
+		];
+	}
 }

core/domain/services/graphql/data/loaders/StateLoader.php

Indentation +22 added lines, -22 removed lines

@@ -15,28 +15,28 @@
  */
 class StateLoader extends AbstractLoader
 {
-    /**
-     * @return EEM_Base|EEM_State
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function getQuery(): EEM_Base
-    {
-        return EEM_State::instance();
-    }
+	/**
+	 * @return EEM_Base|EEM_State
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function getQuery(): EEM_Base
+	{
+		return EEM_State::instance();
+	}
 
 
-    /**
-     * @param array $keys
-     * @return array
-     */
-    protected function getWhereParams(array $keys): array
-    {
-        return [
-            'STA_ID' => ['IN', $keys],
-        ];
-    }
+	/**
+	 * @param array $keys
+	 * @return array
+	 */
+	protected function getWhereParams(array $keys): array
+	{
+		return [
+			'STA_ID' => ['IN', $keys],
+		];
+	}
 }

core/domain/services/graphql/enums/CountriesConnectionOrderbyEnum.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyEnum');
+        $this->setName($this->namespace.'CountriesConnectionOrderbyEnum');
         $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
         parent::__construct();
     }

Indentation +29 added lines, -29 removed lines

@@ -14,35 +14,35 @@
  */
 class CountriesConnectionOrderbyEnum extends EnumBase
 {
-    /**
-     * CountriesConnectionOrderbyEnum constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyEnum');
-        $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * CountriesConnectionOrderbyEnum constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'CountriesConnectionOrderbyEnum');
+		$this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return array
-     */
-    protected function getValues(): array
-    {
-        return [
-            'NAME'     => [
-                'value'       => 'CNT_name',
-                'description' => esc_html__('Order by country name', 'event_espresso'),
-            ],
-            'ISO'     => [
-                'value'       => 'CNT_ISO',
-                'description' => esc_html__('Order by country ISO', 'event_espresso'),
-            ],
-            'CNT_ISO3'     => [
-                'value'       => 'CNT_ISO3',
-                'description' => esc_html__('Order by country ISO3', 'event_espresso'),
-            ],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getValues(): array
+	{
+		return [
+			'NAME'     => [
+				'value'       => 'CNT_name',
+				'description' => esc_html__('Order by country name', 'event_espresso'),
+			],
+			'ISO'     => [
+				'value'       => 'CNT_ISO',
+				'description' => esc_html__('Order by country ISO', 'event_espresso'),
+			],
+			'CNT_ISO3'     => [
+				'value'       => 'CNT_ISO3',
+				'description' => esc_html__('Order by country ISO3', 'event_espresso'),
+			],
+		];
+	}
 }

core/domain/services/graphql/enums/StatesConnectionOrderbyEnum.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyEnum');
+        $this->setName($this->namespace.'StatesConnectionOrderbyEnum');
         $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
         parent::__construct();
     }

Indentation +25 added lines, -25 removed lines

@@ -14,31 +14,31 @@
  */
 class StatesConnectionOrderbyEnum extends EnumBase
 {
-    /**
-     * StatesConnectionOrderbyEnum constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyEnum');
-        $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * StatesConnectionOrderbyEnum constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'StatesConnectionOrderbyEnum');
+		$this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return array
-     */
-    protected function getValues(): array
-    {
-        return [
-            'NAME'     => [
-                'value'       => 'CNT_name',
-                'description' => esc_html__('Order by state name', 'event_espresso'),
-            ],
-            'COUNTRY_ISO'     => [
-                'value'       => 'CNT_ISO',
-                'description' => esc_html__('Order by country ISO', 'event_espresso'),
-            ],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getValues(): array
+	{
+		return [
+			'NAME'     => [
+				'value'       => 'CNT_name',
+				'description' => esc_html__('Order by state name', 'event_espresso'),
+			],
+			'COUNTRY_ISO'     => [
+				'value'       => 'CNT_ISO',
+				'description' => esc_html__('Order by country ISO', 'event_espresso'),
+			],
+		];
+	}
 }