yikesinc / yikes-inc-easy-mailchimp-extender

src/Recaptcha/Recaptcha.php

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 use YIKES\EasyForms\Assets\AssetsAwareness;
 use YIKES\EasyForms\Assets\ScriptAsset;
 use YIKES\EasyForms\Service;
-use YIKES\EasyForms\View\View;
 use YIKES\EasyForms\Model\Recaptcha as RecaptchaModel;
 
 /**

Indentation +42 added lines, -42 removed lines

@@ -23,42 +23,42 @@ 
  */
 final class Recaptcha implements Service, AssetsAware {
 
-    use AssetsAwareness;
+	 use AssetsAwareness;
 
-    const VIEW_URI        = 'views/recaptcha-box';
-    const JS_HANDLE       = 'google-recaptcha-js';
-    const JS_URI          = 'https://www.google.com/recaptcha/api.js';
-    const JS_DEPENDENCIES = [ 'jquery', 'form-submission-helpers' ];
-    const JS_VERSION      = '1.0.0';
+	 const VIEW_URI        = 'views/recaptcha-box';
+	 const JS_HANDLE       = 'google-recaptcha-js';
+	 const JS_URI          = 'https://www.google.com/recaptcha/api.js';
+	 const JS_DEPENDENCIES = [ 'jquery', 'form-submission-helpers' ];
+	 const JS_VERSION      = '1.0.0';
 
-    public function register() {
-        $this->register_assets();
+	 public function register() {
+		  $this->register_assets();
 
-        add_action( 'easy_forms_do_recaptcha_box', function( $view ) {
-            $this->enqueue_assets();
-            echo $view->render_partial( static::VIEW_URI ); // phpcs:ignore WordPress.Security.EscapeOutput
-        } );
-    }
+		  add_action( 'easy_forms_do_recaptcha_box', function( $view ) {
+				$this->enqueue_assets();
+				echo $view->render_partial( static::VIEW_URI ); // phpcs:ignore WordPress.Security.EscapeOutput
+		  } );
+	 }
 
-     /**
-	 * Get the context to pass onto the view.
-	 *
-	 * Override to provide data to the view.
-	 *
-	 * @since %VERSION%
-	 *
-	 * @return array Context to pass onto view.
-	 */
+	  /**
+	   * Get the context to pass onto the view.
+	   *
+	   * Override to provide data to the view.
+	   *
+	   * @since %VERSION%
+	   *
+	   * @return array Context to pass onto view.
+	   */
 	protected function get_context() {
 		return $this->recaptcha['recaptcha_options'];
-    }
+	 }
     
-    private function get_script_params() {
-        $recaptcha_options = ( new RecaptchaModel() )->setup();
-        return $recaptcha_options['script_params'];
-    }
+	 private function get_script_params() {
+		  $recaptcha_options = ( new RecaptchaModel() )->setup();
+		  return $recaptcha_options['script_params'];
+	 }
 
-    public function __get( $name ) {
+	 public function __get( $name ) {
 		switch ( $name ) {
 			case 'script_params':
 				return $this->get_script_params();
@@ -66,23 +66,23 @@ 
 			default:
 				return null;
 		}
-    }
+	 }
 
-    /**
-	 * Load asset objects for use.
-	 *
-	 * @since %SINCE%
-	 */
+	 /**
+	  * Load asset objects for use.
+	  *
+	  * @since %SINCE%
+	  */
 	protected function load_assets() {  
 		$this->assets= [
 			new ScriptAsset(
-                self::JS_HANDLE,
-                self::JS_URI . $this->script_params,
-                self::JS_DEPENDENCIES,
-                self::JS_VERSION,
-                ScriptAsset::ENQUEUE_HEADER,
-                true
-            ),
+					 self::JS_HANDLE,
+					 self::JS_URI . $this->script_params,
+					 self::JS_DEPENDENCIES,
+					 self::JS_VERSION,
+					 ScriptAsset::ENQUEUE_HEADER,
+					 true
+				),
 		];
-    }
+	 }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -50,12 +50,12 @@ 
 	 * @return array Context to pass onto view.
 	 */
 	protected function get_context() {
-		return $this->recaptcha['recaptcha_options'];
+		return $this->recaptcha[ 'recaptcha_options' ];
     }
     
     private function get_script_params() {
         $recaptcha_options = ( new RecaptchaModel() )->setup();
-        return $recaptcha_options['script_params'];
+        return $recaptcha_options[ 'script_params' ];
     }
 
     public function __get( $name ) {
@@ -74,7 +74,7 @@ 
 	 * @since %SINCE%
 	 */
 	protected function load_assets() {  
-		$this->assets= [
+		$this->assets = [
 			new ScriptAsset(
                 self::JS_HANDLE,
                 self::JS_URI . $this->script_params,

Braces +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 *
 	 * @since %SINCE%
 	 */
-	protected function load_assets() {  
+	protected function load_assets() {
 		$this->assets= [
 			new ScriptAsset(
                 self::JS_HANDLE,

src/Shortcode/EasyFormsShortcode.php

Doc Comments +1 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 	 *
 	 * @since %VERSION%
 	 *
-	 * @param array $atts Array of shortcode attributes.
+	 * @param array $attr Array of shortcode attributes.
 	 *
 	 * @return array Context to pass onto view.
 	 * @throws InvalidPostID When the post ID is not valid.
@@ -199,7 +199,6 @@ 
 	 *
 	 * @param int              $form_id       The ID for the form.
 	 * @param EasyFormsModel   $form_data  The form Object.
-	 * @param array            $field_classes The classes for fields in the form.
 	 *
 	 * @return EasyForm
 	 */

Unused Use Statements -1 removed lines

@@ -17,7 +17,6 @@
 use YIKES\EasyForms\Model\Subscriber;
 use YIKES\EasyForms\Model\SubscriberRepository;
 use YIKES\EasyForms\Model\OptinForm as EasyFormsModel;
-use YIKES\EasyForms\Model\Recaptcha as RecaptchaModel;
 
 /**
  * Class EasyFormsShortcode

Indentation +54 added lines, -54 removed lines

@@ -28,7 +28,7 @@ 
 
 final class EasyFormsShortcode extends BaseShortcode {
 
-    const TAG           = 'yikes-mailchimp';
+	 const TAG           = 'yikes-mailchimp';
 	const VIEW_URI      = 'views/easy-forms-shortcode';
 	const SUBMITTED_URI = 'views/easy-forms-shortcode-completed';
 	const DESC_URI      = 'views/easy-forms-shortcode-description';
@@ -50,14 +50,14 @@ 
 	 * @since %VERSION%
 	 * @var string
 	 */
-    private $view_uri = self::VIEW_URI;
+	 private $view_uri = self::VIEW_URI;
     
-    /**
-	 * Get the default array of attributes for the shortcode.
-	 *
-	 * @since %VERSION%
-	 * @return array
-	 */
+	 /**
+	  * Get the default array of attributes for the shortcode.
+	  *
+	  * @since %VERSION%
+	  * @return array
+	  */
 	public function get_default_atts() {
 		return [
 			'form'                       => '',
@@ -147,7 +147,7 @@ 
 		}
 	}
     
-   /**
+	/**
 	 * Get the View URI to use for rendering the shortcode.
 	 *
 	 * @since %VERSION%
@@ -156,15 +156,15 @@ 
 	 */
 	protected function get_view_uri() {
 		return $this->view_uri;
-    }
+	 }
     
-    /**
-	 * Set the view URI.
-	 *
-	 * @since %VERSION%
-	 *
-	 * @param string $uri The URI to use.
-	 */
+	 /**
+	  * Set the view URI.
+	  *
+	  * @since %VERSION%
+	  *
+	  * @param string $uri The URI to use.
+	  */
 	private function set_view_uri( $uri ) {
 		$this->view_uri = $uri;
 	}
@@ -179,15 +179,15 @@ 
 		return ! empty( $_POST );
 	}
     
-    /**
-	 * Render the current Renderable.
-	 *
-	 * @since %VERSION%
-	 *
-	 * @param array $context Context in which to render.
-	 *
-	 * @return string Rendered HTML.
-	 */
+	 /**
+	  * Render the current Renderable.
+	  *
+	  * @since %VERSION%
+	  *
+	  * @param array $context Context in which to render.
+	  *
+	  * @return string Rendered HTML.
+	  */
 	public function render( array $context = [] ) {
 		try {
 			$this->enqueue_assets();
@@ -238,15 +238,15 @@ 
 		return isset( $subscriber ) ? $subscriber : null;
 	}
     
-    /**
-	 * Convert an exception to a string.
-	 *
-	 * @since %VERSION%
-	 *
-	 * @param \Exception $e The exception object.
-	 *
-	 * @return string
-	 */
+	 /**
+	  * Convert an exception to a string.
+	  *
+	  * @since %VERSION%
+	  *
+	  * @param \Exception $e The exception object.
+	  *
+	  * @return string
+	  */
 	private function exception_to_string( \Exception $e ) {
 		return sprintf(
 			/* translators: %s refers to the error message */
@@ -257,14 +257,14 @@ 
 
 	public function load_assets() {
 		$submission_helper = new ScriptAsset(
-            'form-submission-helpers',
-            'assets/js/dev/form-submission-helpers',
-            [ 'jquery' ],
-            '1.0.0',
-            ScriptAsset::ENQUEUE_HEADER
-        );
+				'form-submission-helpers',
+				'assets/js/dev/form-submission-helpers',
+				[ 'jquery' ],
+				'1.0.0',
+				ScriptAsset::ENQUEUE_HEADER
+		  );
 
-        $submission_helper->add_localization( 'form_submission_helpers', array(
+		  $submission_helper->add_localization( 'form_submission_helpers', array(
 			'ajax_url'           => esc_url( admin_url( 'admin-ajax.php' ) ),
 			'preloader_url'      => apply_filters( 'yikes-mailchimp-preloader', esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) ),
 			'countries_with_zip' => $this->countries_with_zip(),
@@ -277,19 +277,19 @@ 
 	}
 
 	public function countries_with_zip() {
-        return [
-            'US' => 'US', 'GB' => 'GB', 'CA' => 'CA', 
-            'IE' => 'IE', 'CN' => 'CN', 'IN' => 'IN', 
-            'AU' => 'AU', 'BR' => 'BR', 'MX' => 'MX',
-            'IT' => 'IT', 'NZ' => 'NZ', 'JP' => 'JP',
-            'FR' => 'FR', 'GR' => 'GR', 'DE' => 'DE',
-            'NL' => 'NL', 'PT' => 'PT', 'ES' => 'ES'
-        ];
-    }
+		  return [
+				'US' => 'US', 'GB' => 'GB', 'CA' => 'CA', 
+				'IE' => 'IE', 'CN' => 'CN', 'IN' => 'IN', 
+				'AU' => 'AU', 'BR' => 'BR', 'MX' => 'MX',
+				'IT' => 'IT', 'NZ' => 'NZ', 'JP' => 'JP',
+				'FR' => 'FR', 'GR' => 'GR', 'DE' => 'DE',
+				'NL' => 'NL', 'PT' => 'PT', 'ES' => 'ES'
+		  ];
+	 }
 
-    public function page_data() {
-        global $post;
+	 public function page_data() {
+		  global $post;
 		$page_data = isset( $post->ID ) ? $post->ID : 0;
 		return apply_filters( 'yikes-mailchimp-page-data', $page_data );
-    }
+	 }
 }

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
 
 final class EasyFormsShortcode extends BaseShortcode {
 
-    const TAG           = 'yikes-mailchimp';
+    const TAG = 'yikes-mailchimp';
 	const VIEW_URI      = 'views/easy-forms-shortcode';
 	const SUBMITTED_URI = 'views/easy-forms-shortcode-completed';
 	const DESC_URI      = 'views/easy-forms-shortcode-description';
@@ -97,28 +97,28 @@ 
 	 * @throws InvalidPostID When the post ID is not valid.
 	 */
 	protected function get_context( array $attr ) {
-		$form_id   = $attr['form'] ? $attr['form'] : '1';
+		$form_id   = $attr[ 'form' ] ? $attr[ 'form' ] : '1';
 		$form_data = ( new EasyFormsModel() )->find( $form_id );
 
 		$this->is_submitted = $this->is_submitting_form();
 
 		// Set up the form object.
 		$form = $this->get_optin_form( $form_id, $form_data, $attr );
-		$description = $form->form_description( $attr['description'], $attr['custom_description'] );
+		$description = $form->form_description( $attr[ 'description' ], $attr[ 'custom_description' ] );
 		
 		add_action( 'easy_forms_do_form_description', function( $view ) {
 			echo $view->render_partial( static::DESC_URI ); // phpcs:ignore WordPress.Security.EscapeOutput
 		} );
 
 		return [
-			'title'                 => $form->form_title( $attr['title'], $attr['custom_title'], $form_data['form_name'] ),
+			'title'                 => $form->form_title( $attr[ 'title' ], $attr[ 'custom_title' ], $form_data[ 'form_name' ] ),
 			'description'           => $description,
 			'form_classes'          => $form->form_classes( $this->is_submitted ),
 			'edit_form_link'        => $form->edit_form_link(),
 			'submit_button_classes' => $form->submit_button_classes(),
-			'submit_button_text'    => $form->submit_button_text( $attr['submit'] ),
-			'ajax'                  => $attr['ajax'],
-			'form_settings'         => $form_data['form_settings'],
+			'submit_button_text'    => $form->submit_button_text( $attr[ 'submit' ] ),
+			'ajax'                  => $attr[ 'ajax' ],
+			'form_settings'         => $form_data[ 'form_settings' ],
 			'form_data'             => $form_data,
 			'form'                  => $form,
 			'form_id'               => $form_id,
@@ -188,7 +188,7 @@ 
 	 *
 	 * @return string Rendered HTML.
 	 */
-	public function render( array $context = [] ) {
+	public function render( array $context = [ ] ) {
 		try {
 			$this->enqueue_assets();
 			$view = new FormEscapedView( new NoOverrideLocationView( $this->get_view_uri() ) );

src/Util/Debugger.php

Indentation +28 added lines, -28 removed lines

@@ -6,32 +6,32 @@
 
 class Debugger implements Service {
 
-    const LOG_NAME = 'freddie_log';
-
-    public function register() {
-        $this->register_log();
-    }
-
-    public function register_log() :void {
-        if ( ! get_option( self::LOG_NAME ) ) {
-            add_option( self::LOG_NAME, [] );
-        }
-    }
-
-    public function get_log() {
-        return get_option( self::LOG_NAME, [] );
-    }
-
-   public function pretty_log() {
-       $log = $this->get_log();
-       return $this->pretty_debug( 'Pretty Log', $log );
-   }
-
-    public function pretty_debug( $label, $value ) {
-            $res = "<strong>{$label}</strong>";
-            $res .= "<pre>";
-            $res .= esc_html( json_encode( $value, JSON_PRETTY_PRINT ) );
-            $res .= "</pre>";
-            echo $res;
-    }
+	 const LOG_NAME = 'freddie_log';
+
+	 public function register() {
+		  $this->register_log();
+	 }
+
+	 public function register_log() :void {
+		  if ( ! get_option( self::LOG_NAME ) ) {
+				add_option( self::LOG_NAME, [] );
+		  }
+	 }
+
+	 public function get_log() {
+		  return get_option( self::LOG_NAME, [] );
+	 }
+
+	public function pretty_log() {
+		 $log = $this->get_log();
+		 return $this->pretty_debug( 'Pretty Log', $log );
+	}
+
+	 public function pretty_debug( $label, $value ) {
+				$res = "<strong>{$label}</strong>";
+				$res .= "<pre>";
+				$res .= esc_html( json_encode( $value, JSON_PRETTY_PRINT ) );
+				$res .= "</pre>";
+				echo $res;
+	 }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -14,12 +14,12 @@
 
     public function register_log() :void {
         if ( ! get_option( self::LOG_NAME ) ) {
-            add_option( self::LOG_NAME, [] );
+            add_option( self::LOG_NAME, [ ] );
         }
     }
 
     public function get_log() {
-        return get_option( self::LOG_NAME, [] );
+        return get_option( self::LOG_NAME, [ ] );
     }
 
    public function pretty_log() {

src/Model/OptinMeta.php

Indentation +21 added lines, -21 removed lines

@@ -13,31 +13,31 @@
 
 interface OptinMeta {
 
-    const EMAIL     = 'email';
-    const TEXT      = 'text';
-    const NUMBER    = 'number';
-    const URL       = 'url';
-    const IMAGE_URL = 'imageurl';
-    const PHONE     = 'phone';
-    const ZIP       = 'zip';
-    const ADDRESS   = 'address';
-    const DATE      = 'date';
-    const BIRTHDAY  = 'birthday';
-    const DROPDOWN  = 'dropdown';
-    const RADIO     = 'radio';
-    const CHECKBOX  = 'checkbox';
+	 const EMAIL     = 'email';
+	 const TEXT      = 'text';
+	 const NUMBER    = 'number';
+	 const URL       = 'url';
+	 const IMAGE_URL = 'imageurl';
+	 const PHONE     = 'phone';
+	 const ZIP       = 'zip';
+	 const ADDRESS   = 'address';
+	 const DATE      = 'date';
+	 const BIRTHDAY  = 'birthday';
+	 const DROPDOWN  = 'dropdown';
+	 const RADIO     = 'radio';
+	 const CHECKBOX  = 'checkbox';
 
-    const FIELD_MAP = [
+	 const FIELD_MAP = [
 		self::EMAIL     => Types::EMAIL,
 		self::TEXT      => Types::TEXT,
 		self::NUMBER    => Types::NUMBER,
 		self::URL       => Types::URL,
-        self::IMAGE_URL => Types::IMAGE_URL,
-        self::PHONE     => Types::PHONE,
-        self::ZIP       => Types::ZIP,
-        self::ADDRESS   => Types::ADDRESS,
-        self::DATE      => Types::DATE,
-        self::BIRTHDAY  => Types::BIRTHDAY,
-        self::CHECKBOX  => Types::CHECKBOX,
+		  self::IMAGE_URL => Types::IMAGE_URL,
+		  self::PHONE     => Types::PHONE,
+		  self::ZIP       => Types::ZIP,
+		  self::ADDRESS   => Types::ADDRESS,
+		  self::DATE      => Types::DATE,
+		  self::BIRTHDAY  => Types::BIRTHDAY,
+		  self::CHECKBOX  => Types::CHECKBOX,
 	];
 }

src/Model/Recaptcha.php

Indentation +57 added lines, -57 removed lines

@@ -6,70 +6,70 @@
 
 final class Recaptcha {
 
-    public $recaptcha_options;
-    public $site_key;
-    public $secret_key;
+	 public $recaptcha_options;
+	 public $site_key;
+	 public $secret_key;
 
-    const STATUS     = 'yikes-mc-recaptcha-status';
-    const SITE_KEY   = 'yikes-mc-recaptcha-site-key';
-    const SECRET_KEY = 'yikes-mc-recaptcha-secret-key';
+	 const STATUS     = 'yikes-mc-recaptcha-status';
+	 const SITE_KEY   = 'yikes-mc-recaptcha-site-key';
+	 const SECRET_KEY = 'yikes-mc-recaptcha-secret-key';
 
-    public function setup( $recaptcha_options = [] ) {
-        if ( ! $this->has_recaptcha() ) {
-            return false;
-        }
-        return $this->get_options( $recaptcha_options );
-    }
+	 public function setup( $recaptcha_options = [] ) {
+		  if ( ! $this->has_recaptcha() ) {
+				return false;
+		  }
+		  return $this->get_options( $recaptcha_options );
+	 }
 
-    private function has_recaptcha() {
-        if ( get_option( static::STATUS, '' ) == '1' ) {
-            return true;
-        }
-        return false;
-    }
+	 private function has_recaptcha() {
+		  if ( get_option( static::STATUS, '' ) == '1' ) {
+				return true;
+		  }
+		  return false;
+	 }
 
-    private function get_site_key() {
-        $site_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
-        if ( ! $site_key ) {
-            throw InvalidRecaptcha::from_site_key();
-        }
-        return $site_key;
-    }
+	 private function get_site_key() {
+		  $site_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
+		  if ( ! $site_key ) {
+				throw InvalidRecaptcha::from_site_key();
+		  }
+		  return $site_key;
+	 }
 
-    private function get_secret_key() {
-        $secret_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
-        if ( ! $secret_key ) {
-            throw InvalidRecaptcha::from_secret_key();
-        }
-        return $secret_key;
-    }
+	 private function get_secret_key() {
+		  $secret_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
+		  if ( ! $secret_key ) {
+				throw InvalidRecaptcha::from_secret_key();
+		  }
+		  return $secret_key;
+	 }
 
-    private function get_options( $defaults ) {
-        // Store the site language (to load recaptcha in a specific language).
-        $locale       = get_locale();
-        $locale_split = explode( '_', $locale );
+	 private function get_options( $defaults ) {
+		  // Store the site language (to load recaptcha in a specific language).
+		  $locale       = get_locale();
+		  $locale_split = explode( '_', $locale );
 
-        // Setup reCAPTCHA parameters.
-        $lang       = ! empty( $locale_split ) ? $locale_split[0] : $locale;
-        $lang       = ! empty( $defaults['recaptcha_lang'] ) ? $defaults['recaptcha_lang'] : $lang;
-        $type       = ! empty( $defaults['recaptcha_type'] ) ? strtolower( $defaults['recaptcha_type'] ) : 'image'; // setup recaptcha type
-        $theme      = ! empty( $defaults['recaptcha_theme'] ) ? strtolower( $defaults['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
-        $size       = ! empty( $defaults['recaptcha_size'] ) ? strtolower( $defaults['recaptcha_size'] ) : 'normal'; // setup recaptcha size
-        $data_cb    = ! empty( $defaults['recaptcha_data_callback'] ) ? $defaults['recaptcha_data_callback'] : false; // setup recaptcha size
-        $expired_cb = ! empty( $defaults['recaptcha_expired_callback'] ) ? $defaults['recaptcha_expired_callback'] : false; // setup recaptcha size
+		  // Setup reCAPTCHA parameters.
+		  $lang       = ! empty( $locale_split ) ? $locale_split[0] : $locale;
+		  $lang       = ! empty( $defaults['recaptcha_lang'] ) ? $defaults['recaptcha_lang'] : $lang;
+		  $type       = ! empty( $defaults['recaptcha_type'] ) ? strtolower( $defaults['recaptcha_type'] ) : 'image'; // setup recaptcha type
+		  $theme      = ! empty( $defaults['recaptcha_theme'] ) ? strtolower( $defaults['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
+		  $size       = ! empty( $defaults['recaptcha_size'] ) ? strtolower( $defaults['recaptcha_size'] ) : 'normal'; // setup recaptcha size
+		  $data_cb    = ! empty( $defaults['recaptcha_data_callback'] ) ? $defaults['recaptcha_data_callback'] : false; // setup recaptcha size
+		  $expired_cb = ! empty( $defaults['recaptcha_expired_callback'] ) ? $defaults['recaptcha_expired_callback'] : false; // setup recaptcha size
 
-        $script_params = '?hl=' . $lang . '&onload=renderReCaptchaCallback&render=explicit';
+		  $script_params = '?hl=' . $lang . '&onload=renderReCaptchaCallback&render=explicit';
 
-        return [
-            'language'         => $lang,
-            'theme'            => $theme,
-            'type'             => $type,
-            'size'             => $size,
-            'success_callback' => $data_cb,
-            'expired_callback' => $expired_cb,
-            'script_params'    => $script_params,
-            'site_key'         => $this->get_site_key(),
-            'secret_key'       => $this->get_secret_key(),
-        ];
-    }
+		  return [
+				'language'         => $lang,
+				'theme'            => $theme,
+				'type'             => $type,
+				'size'             => $size,
+				'success_callback' => $data_cb,
+				'expired_callback' => $expired_cb,
+				'script_params'    => $script_params,
+				'site_key'         => $this->get_site_key(),
+				'secret_key'       => $this->get_secret_key(),
+		  ];
+	 }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -14,7 +14,7 @@ 
     const SITE_KEY   = 'yikes-mc-recaptcha-site-key';
     const SECRET_KEY = 'yikes-mc-recaptcha-secret-key';
 
-    public function setup( $recaptcha_options = [] ) {
+    public function setup( $recaptcha_options = [ ] ) {
         if ( ! $this->has_recaptcha() ) {
             return false;
         }
@@ -29,7 +29,7 @@ 
     }
 
     private function get_site_key() {
-        $site_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
+        $site_key = get_option( 'yikes-mc-recaptcha-secret-key', '' );
         if ( ! $site_key ) {
             throw InvalidRecaptcha::from_site_key();
         }
@@ -37,7 +37,7 @@ 
     }
 
     private function get_secret_key() {
-        $secret_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
+        $secret_key = get_option( 'yikes-mc-recaptcha-secret-key', '' );
         if ( ! $secret_key ) {
             throw InvalidRecaptcha::from_secret_key();
         }
@@ -50,13 +50,13 @@ 
         $locale_split = explode( '_', $locale );
 
         // Setup reCAPTCHA parameters.
-        $lang       = ! empty( $locale_split ) ? $locale_split[0] : $locale;
-        $lang       = ! empty( $defaults['recaptcha_lang'] ) ? $defaults['recaptcha_lang'] : $lang;
-        $type       = ! empty( $defaults['recaptcha_type'] ) ? strtolower( $defaults['recaptcha_type'] ) : 'image'; // setup recaptcha type
-        $theme      = ! empty( $defaults['recaptcha_theme'] ) ? strtolower( $defaults['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
-        $size       = ! empty( $defaults['recaptcha_size'] ) ? strtolower( $defaults['recaptcha_size'] ) : 'normal'; // setup recaptcha size
-        $data_cb    = ! empty( $defaults['recaptcha_data_callback'] ) ? $defaults['recaptcha_data_callback'] : false; // setup recaptcha size
-        $expired_cb = ! empty( $defaults['recaptcha_expired_callback'] ) ? $defaults['recaptcha_expired_callback'] : false; // setup recaptcha size
+        $lang       = ! empty( $locale_split ) ? $locale_split[ 0 ] : $locale;
+        $lang       = ! empty( $defaults[ 'recaptcha_lang' ] ) ? $defaults[ 'recaptcha_lang' ] : $lang;
+        $type       = ! empty( $defaults[ 'recaptcha_type' ] ) ? strtolower( $defaults[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type
+        $theme      = ! empty( $defaults[ 'recaptcha_theme' ] ) ? strtolower( $defaults[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme
+        $size       = ! empty( $defaults[ 'recaptcha_size' ] ) ? strtolower( $defaults[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size
+        $data_cb    = ! empty( $defaults[ 'recaptcha_data_callback' ] ) ? $defaults[ 'recaptcha_data_callback' ] : false; // setup recaptcha size
+        $expired_cb = ! empty( $defaults[ 'recaptcha_expired_callback' ] ) ? $defaults[ 'recaptcha_expired_callback' ] : false; // setup recaptcha size
 
         $script_params = '?hl=' . $lang . '&onload=renderReCaptchaCallback&render=explicit';
 

src/Form/SubmitButton.php

Indentation +24 added lines, -24 removed lines

@@ -4,31 +4,31 @@
 
 trait SubmitButton {
 
-    public function submit_button_classes() {
-        $submit_button_classes = 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-';
-        $submit_button_classes .= $this->form_id;
-        $submit_button_classes .= ' btn btn-primary';
-        // Adding additional space in front of these classes.
-        $submit_button_classes .= ' ' . $this->form_data['form_settings']['yikes-easy-mc-submit-button-classes'];
-        $submit_button_classes .= $this->admin_class;
-        return apply_filters( 'yikes-mailchimp-form-submit-button-classes', $submit_button_classes, $this->form_id );
-    }
+	 public function submit_button_classes() {
+		  $submit_button_classes = 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-';
+		  $submit_button_classes .= $this->form_id;
+		  $submit_button_classes .= ' btn btn-primary';
+		  // Adding additional space in front of these classes.
+		  $submit_button_classes .= ' ' . $this->form_data['form_settings']['yikes-easy-mc-submit-button-classes'];
+		  $submit_button_classes .= $this->admin_class;
+		  return apply_filters( 'yikes-mailchimp-form-submit-button-classes', $submit_button_classes, $this->form_id );
+	 }
 
-    public function submit_button_text( $shortcode_prop ) {
-        $submit_button_text = '';
-        switch( true ) {
-            case ! empty( $shortcode_prop ):
-                $submit_button_text = $shortcode_prop;
-            break;
+	 public function submit_button_text( $shortcode_prop ) {
+		  $submit_button_text = '';
+		  switch( true ) {
+				case ! empty( $shortcode_prop ):
+					 $submit_button_text = $shortcode_prop;
+				break;
 
-            case $this->form_data['form_settings']['yikes-easy-mc-submit-button-text']:
-                $submit_button_text = $this->form_data['form_settings']['yikes-easy-mc-submit-button-text'];
-            break;
+				case $this->form_data['form_settings']['yikes-easy-mc-submit-button-text']:
+					 $submit_button_text = $this->form_data['form_settings']['yikes-easy-mc-submit-button-text'];
+				break;
 
-            default:
-                $submit_button_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
-            break;
-        }
-        return apply_filters( 'yikes-mailchimp-form-submit-button-text', $submit_button_text, $this->form_id );
-    }
+				default:
+					 $submit_button_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
+				break;
+		  }
+		  return apply_filters( 'yikes-mailchimp-form-submit-button-text', $submit_button_text, $this->form_id );
+	 }
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -9,20 +9,20 @@
         $submit_button_classes .= $this->form_id;
         $submit_button_classes .= ' btn btn-primary';
         // Adding additional space in front of these classes.
-        $submit_button_classes .= ' ' . $this->form_data['form_settings']['yikes-easy-mc-submit-button-classes'];
+        $submit_button_classes .= ' ' . $this->form_data[ 'form_settings' ][ 'yikes-easy-mc-submit-button-classes' ];
         $submit_button_classes .= $this->admin_class;
         return apply_filters( 'yikes-mailchimp-form-submit-button-classes', $submit_button_classes, $this->form_id );
     }
 
     public function submit_button_text( $shortcode_prop ) {
         $submit_button_text = '';
-        switch( true ) {
+        switch ( true ) {
             case ! empty( $shortcode_prop ):
                 $submit_button_text = $shortcode_prop;
             break;
 
-            case $this->form_data['form_settings']['yikes-easy-mc-submit-button-text']:
-                $submit_button_text = $this->form_data['form_settings']['yikes-easy-mc-submit-button-text'];
+            case $this->form_data[ 'form_settings' ][ 'yikes-easy-mc-submit-button-text' ]:
+                $submit_button_text = $this->form_data[ 'form_settings' ][ 'yikes-easy-mc-submit-button-text' ];
             break;
 
             default:

src/Assets/ScriptAsset.php

Spacing +5 added lines, -5 removed lines

@@ -73,7 +73,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected $localizations = [];
+	protected $localizations = [ ];
 
 	/**
 	 * Instantiate a ScriptAsset object.
@@ -91,7 +91,7 @@ 
 	public function __construct(
 		$handle,
 		$source,
-		$dependencies = [],
+		$dependencies = [ ],
 		$version = self::VERSION,
 		$in_footer = self::ENQUEUE_HEADER,
 		$external = false
@@ -127,7 +127,7 @@ 
 	 * @return Closure
 	 */
 	protected function get_register_closure() {
-		return function () {
+		return function() {
 			if ( wp_script_is( $this->handle, 'registered' ) ) {
 				return;
 			}
@@ -150,7 +150,7 @@ 
 	 * @return Closure
 	 */
 	protected function get_enqueue_closure() {
-		return function () {
+		return function() {
 			if ( ! wp_script_is( $this->handle, 'registered' ) ) {
 				throw FailedToRegister::asset_not_registered( $this->handle );
 			}
@@ -171,7 +171,7 @@ 
 	 * @return Closure
 	 */
 	protected function get_dequeue_closure() {
-		return function () {
+		return function() {
 			wp_dequeue_script( $this->handle );
 		};
 	}

views/recaptcha-box.php

Spacing +6 added lines, -6 removed lines

@@ -18,10 +18,10 @@
 
 <div
     class="g-recaptcha"
-    data-sitekey="<?= esc_attr( $this->form->recaptcha['site_key'] ); ?>"
-    data-theme="<?= esc_attr( $this->form->recaptcha['theme'] ); ?>"
-    data-type="<?= esc_attr( $this->form->recaptcha['type'] ); ?>"
-    data-size="<?= esc_attr( $this->form->recaptcha['size'] ); ?>"
-    data-callback="<?= esc_attr( $this->form->recaptcha['success_callback'] ); ?>"
-    data-expired-callback="<?= esc_attr( $this->form->recaptcha['expired_callback'] ); ?>"
+    data-sitekey="<?= esc_attr( $this->form->recaptcha[ 'site_key' ] ); ?>"
+    data-theme="<?= esc_attr( $this->form->recaptcha[ 'theme' ] ); ?>"
+    data-type="<?= esc_attr( $this->form->recaptcha[ 'type' ] ); ?>"
+    data-size="<?= esc_attr( $this->form->recaptcha[ 'size' ] ); ?>"
+    data-callback="<?= esc_attr( $this->form->recaptcha[ 'success_callback' ] ); ?>"
+    data-expired-callback="<?= esc_attr( $this->form->recaptcha[ 'expired_callback' ] ); ?>"
 ></div>
\ No newline at end of file

src/Form/FormHelper.php

Indentation +32 added lines, -32 removed lines

@@ -3,25 +3,25 @@ 
 namespace YIKES\EasyForms\Form;
 
 trait FormHelper {
-    public function form_title( $title, $custom_title, $form_name ) {
-        $form_title = '';
-        switch( true ) {
-            case ! empty( $custom_title ) && isset( $custom_title ):
-                $form_title = $custom_title;
-            break;
-            case ! empty( $title ) && isset( $title ):
-                $form_title = $title;
-            break;
-            default:
-                $form_title = $form_name;
-            break;
-        }
+	 public function form_title( $title, $custom_title, $form_name ) {
+		  $form_title = '';
+		  switch( true ) {
+				case ! empty( $custom_title ) && isset( $custom_title ):
+					 $form_title = $custom_title;
+				break;
+				case ! empty( $title ) && isset( $title ):
+					 $form_title = $title;
+				break;
+				default:
+					 $form_title = $form_name;
+				break;
+		  }
 
-        return apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_title ), $this->form_id );
-    }
+		  return apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_title ), $this->form_id );
+	 }
 
-    public function form_description( $description, $custom_description ) {
-        if ( $description ) {
+	 public function form_description( $description, $custom_description ) {
+		  if ( $description ) {
 			if ( ! empty( $custom_description ) ) {
 				/**
 				 * Filter the description that is displayed through the shortcode.
@@ -34,11 +34,11 @@ 
 				return apply_filters( 'yikes-mailchimp-form-description', $this->form_data['form_description'], $this->form_id );
 			}
 		} else {
-            return false;
-        }
-    }
+				return false;
+		  }
+	 }
 
-    protected function reduce_field_count() {
+	 protected function reduce_field_count() {
 		$this->field_count = $this->field_count --;
 	}
 
@@ -47,24 +47,24 @@ 
 	}
 
 	public function form_classes( bool $is_submitted ) {
-        $form_classes = 'yikes-easy-mc-form yikes-easy-mc-form-' . $this->form_id;
-        if ( isset( $this->form_inline ) && $this->form_inline != 0 ) {
-            $form_classes .= ' yikes-mailchimp-form-inline';
-        }
+		  $form_classes = 'yikes-easy-mc-form yikes-easy-mc-form-' . $this->form_id;
+		  if ( isset( $this->form_inline ) && $this->form_inline != 0 ) {
+				$form_classes .= ' yikes-mailchimp-form-inline';
+		  }
 
-        if ( $is_submitted && $this->form_data['submission_settings']['hide_form_post_signup'] == 1 ) {
-            $form_classes .=  ' yikes-easy-mc-display-none';
-        }
+		  if ( $is_submitted && $this->form_data['submission_settings']['hide_form_post_signup'] == 1 ) {
+				$form_classes .=  ' yikes-easy-mc-display-none';
+		  }
 
-        $form_classes .= $this->form_data['form_settings']['yikes-easy-mc-form-class-names'];
-        return apply_filters( 'yikes-mailchimp-form-class', $form_classes, $this->form_id );
+		  $form_classes .= $this->form_data['form_settings']['yikes-easy-mc-form-class-names'];
+		  return apply_filters( 'yikes-mailchimp-form-class', $form_classes, $this->form_id );
 	}
 
 	public function inline_form_override() {
 		return isset( $this->has_recaptcha ) || ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'eu-opt-in-compliance-for-mailchimp/yikes-inc-easy-mailchimp-eu-law-compliance-extension.php' ) );
 	}
     
-    public function edit_form_link() {
+	 public function edit_form_link() {
 		if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
 			$edit_form_link = '<span class="edit-link">';
 			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $this->form_id ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $this->form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
@@ -74,5 +74,5 @@ 
 			$edit_form_link = '';
 		}
 		return $edit_form_link;
-    }
+	 }
 }

Spacing +10 added lines, -10 removed lines

@@ -5,7 +5,7 @@ 
 trait FormHelper {
     public function form_title( $title, $custom_title, $form_name ) {
         $form_title = '';
-        switch( true ) {
+        switch ( true ) {
             case ! empty( $custom_title ) && isset( $custom_title ):
                 $form_title = $custom_title;
             break;
@@ -31,7 +31,7 @@ 
 				 */
 				return apply_filters( 'yikes-mailchimp-form-description', $custom_description, $this->form_id );
 			} else {
-				return apply_filters( 'yikes-mailchimp-form-description', $this->form_data['form_description'], $this->form_id );
+				return apply_filters( 'yikes-mailchimp-form-description', $this->form_data[ 'form_description' ], $this->form_id );
 			}
 		} else {
             return false;
@@ -39,11 +39,11 @@ 
     }
 
     protected function reduce_field_count() {
-		$this->field_count = $this->field_count --;
+		$this->field_count = $this->field_count--;
 	}
 
 	protected function set_field_count() {
-		return isset( $this->form_data['fields'] ) ? count( $this->form_data['fields'] ) : 0;
+		return isset( $this->form_data[ 'fields' ] ) ? count( $this->form_data[ 'fields' ] ) : 0;
 	}
 
 	public function form_classes( bool $is_submitted ) {
@@ -52,11 +52,11 @@ 
             $form_classes .= ' yikes-mailchimp-form-inline';
         }
 
-        if ( $is_submitted && $this->form_data['submission_settings']['hide_form_post_signup'] == 1 ) {
-            $form_classes .=  ' yikes-easy-mc-display-none';
+        if ( $is_submitted && $this->form_data[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) {
+            $form_classes .= ' yikes-easy-mc-display-none';
         }
 
-        $form_classes .= $this->form_data['form_settings']['yikes-easy-mc-form-class-names'];
+        $form_classes .= $this->form_data[ 'form_settings' ][ 'yikes-easy-mc-form-class-names' ];
         return apply_filters( 'yikes-mailchimp-form-class', $form_classes, $this->form_id );
 	}
 
@@ -65,11 +65,11 @@ 
 	}
     
     public function edit_form_link() {
-		if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+		if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 			$edit_form_link = '<span class="edit-link">';
-			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $this->form_id ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $this->form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $this->form_id ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $this->form_data[ 'form_name' ] ) . '">' . __( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 			$edit_form_link .= '</span>';
-			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $this->form_id, ucwords( $this->form_data['form_name'] ) );
+			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $this->form_id, ucwords( $this->form_data[ 'form_name' ] ) );
 		} else {
 			$edit_form_link = '';
 		}