yikesinc / yikes-inc-easy-mailchimp-extender

src/Form/FieldBuilder.php

Spacing +53 added lines, -53 removed lines

@@ -11,59 +11,59 @@ 
 
 trait FieldBuilder {
     protected function get_field_classes( $field ) {
-        $field_classes = [];
-        $label_classes = [];
+        $field_classes = [ ];
+        $label_classes = [ ];
 
-        if( $field['additional-classes'] != '' ) {
+        if ( $field[ 'additional-classes' ] != '' ) {
 
-            $field_classes = explode( ' ' , $field['additional-classes'] );
+            $field_classes = explode( ' ', $field[ 'additional-classes' ] );
 
-            if( in_array( 'field-left-half' , $field_classes ) ) {
-                $$label_classes[] = 'field-left-half';
-                $key = array_search( 'field-left-half' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'field-left-half', $field_classes ) ) {
+                $$label_classes[ ] = 'field-left-half';
+                $key = array_search( 'field-left-half', $field_classes );
+                unset( $field_classes[ $key ] );
             } // input half right
-            if( in_array( 'field-right-half' , $field_classes ) ) {
-                $$label_classes[] = 'field-right-half';
-                $key = array_search( 'field-right-half' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'field-right-half', $field_classes ) ) {
+                $$label_classes[ ] = 'field-right-half';
+                $key = array_search( 'field-right-half', $field_classes );
+                unset( $field_classes[ $key ] );
             } // input thirds (1/3 width, floated left)
-            if( in_array( 'field-third' , $field_classes ) ) {
-                $$label_classes[] = 'field-third';
-                $key = array_search( 'field-third' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'field-third', $field_classes ) ) {
+                $$label_classes[ ] = 'field-third';
+                $key = array_search( 'field-third', $field_classes );
+                unset( $field_classes[ $key ] );
             } // 2 column radio
-            if( in_array( 'option-2-col' , $field_classes ) ) {
-                $$label_classes[] = 'option-2-col';
-                $key = array_search( 'option-2-col' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'option-2-col', $field_classes ) ) {
+                $$label_classes[ ] = 'option-2-col';
+                $key = array_search( 'option-2-col', $field_classes );
+                unset( $field_classes[ $key ] );
             } // 3 column radio
-            if( in_array( 'option-3-col' , $field_classes ) ) {
-                $$label_classes[] = 'option-3-col';
-                $key = array_search( 'option-3-col' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'option-3-col', $field_classes ) ) {
+                $$label_classes[ ] = 'option-3-col';
+                $key = array_search( 'option-3-col', $field_classes );
+                unset( $field_classes[ $key ] );
             } // 4 column radio
-            if( in_array( 'option-4-col' , $field_classes ) ) {
-                $$label_classes[] = 'option-4-col';
-                $key = array_search( 'option-4-col' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'option-4-col', $field_classes ) ) {
+                $$label_classes[ ] = 'option-4-col';
+                $key = array_search( 'option-4-col', $field_classes );
+                unset( $field_classes[ $key ] );
             } // inline radio & checkboxes etc
-            if( in_array( 'option-inline' , $field_classes ) ) {
-                $$label_classes[] = 'option-inline';
-                $key = array_search( 'option-inline' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'option-inline', $field_classes ) ) {
+                $$label_classes[ ] = 'option-inline';
+                $key = array_search( 'option-inline', $field_classes );
+                unset( $field_classes[ $key ] );
             }
         }
 
         // if the form is set to inline, add the inline class to our labels
-        if( $this->form_inline ) {
-            $label_classes[] = 'label-inline';
+        if ( $this->form_inline ) {
+            $label_classes[ ] = 'label-inline';
         }
         
-        if( isset( $field['hide-label'] ) ) {
-            if( absint( $field['hide-label'] ) === 1 ) {
+        if ( isset( $field[ 'hide-label' ] ) ) {
+            if ( absint( $field[ 'hide-label' ] ) === 1 ) {
                 $this->increase_hidden_label_count();
-                $field_classes[] = 'field-no-label';
+                $field_classes[ ] = 'field-no-label';
             }
         }
 
@@ -78,37 +78,37 @@ 
     }
 
     protected function get_label( $field ) {
-        $label = [];
-        if( $field['type'] == 'email' ) {
-            $label['props']['visible'] = '';
+        $label = [ ];
+        if ( $field[ 'type' ] == 'email' ) {
+            $label[ 'props' ][ 'visible' ] = '';
         } else {
-            $label['props']['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
+            $label[ 'props' ][ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
         }
-        if ( isset( $field['hide-label'] ) ) {
-            $label['hide-label'] = true;
+        if ( isset( $field[ 'hide-label' ] ) ) {
+            $label[ 'hide-label' ] = true;
         }
-        if ( isset( $field['label'] ) ) {
-            $label['value'] = $field['label'];
+        if ( isset( $field[ 'label' ] ) ) {
+            $label[ 'value' ] = $field[ 'label' ];
         }
         return $label;
     }
 
     protected function get_value( $field ) {
         // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
-        $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+        $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
         $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
-        return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id );
+        return apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $this->form_id );
     }
 
     protected function get_placeholder( $field ) {
-        return isset( $field['placeholder'] ) ? $field['placeholder'] : '';
+        return isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : '';
     }
 
     protected function get_hidden( $field ) {
         $visible = true;
         // if both hide label and hide field are checked, we gotta hide the field!
-        if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
-            if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
+        if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) {
+            if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) {
                 $visible = false;
             }
         }
@@ -120,12 +120,12 @@ 
         $description_above = false;
         $description       = '';
 
-        if ( isset( $field['description'] ) && trim( $field['description'] ) !== '' ) {
+        if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ) {
             $show_description = true;
-            $description = $field['description'];
+            $description = $field[ 'description' ];
         }
 
-        if ( isset( $field['description_above'] ) && $field['description_above'] === '1' ) {
+        if ( isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ) {
             $description_above = true;
         }
         

src/Form/OptinForm.php

Spacing +10 added lines, -10 removed lines

@@ -86,7 +86,7 @@ 
 	 * @since %VERSION%
 	 * @var array
 	 */
-	private $submitted_data = [];
+	private $submitted_data = [ ];
 
 	/**
 	 * The validated data for this form.
@@ -94,7 +94,7 @@ 
 	 * @since %VERSION%
 	 * @var array
 	 */
-	private $valid_data = [];
+	private $valid_data = [ ];
 
 	/**
 	 * Admin CSS Class
@@ -118,7 +118,7 @@ 
 		$this->form_id           = $form_id;
 		$this->form_data         = $form_data;
 		$this->field_count       = $this->set_field_count();
-		$this->form_inline       = $form_data['form_settings']['yikes-easy-mc-inline-form'];
+		$this->form_inline       = $form_data[ 'form_settings' ][ 'yikes-easy-mc-inline-form' ];
 		$this->recaptcha         = ( new RecaptchaModel() )->setup( $attr );
 	}
 
@@ -129,7 +129,7 @@ 
 	 */
 	private function admin_class() {
 		$is_admin = is_user_logged_in() && current_user_can(
-			apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' )
+			apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' )
 		);
 		return $is_admin ? ' admin-logged-in' : '';
 	}
@@ -161,7 +161,7 @@ 
 	 * @since %VERSION%
 	 */
 	private function create_fields() {
-		$fields = [];
+		$fields = [ ];
 
 		// // Manually add the hidden nonce and referrer fields.
 		// $fields[] = new Hidden( "yikes_easy_mc_new_subscriber", wp_create_nonce( 'yikes_easy_mc_form_submit' ), $this->form_id );
@@ -177,8 +177,8 @@ 
 		// $fields[] = new Hidden( 'yikes-mailchimp-submitted-form', $this->form_id, $this->form_id );
 
 		// Add all of the active fields.
-		foreach ( $this->form_data['fields'] as $field ) {
-			if ( isset( $field['hide'] ) && (string) $field['hide'] === '1' ) {
+		foreach ( $this->form_data[ 'fields' ] as $field ) {
+			if ( isset( $field[ 'hide' ] ) && (string) $field[ 'hide' ] === '1' ) {
 				$this->reduce_field_count();
 			}
 
@@ -193,7 +193,7 @@ 
 	 *
 	 * @since %VERSION%
 	 */
-	public function render( array $context = [] ) {
+	public function render( array $context = [ ] ) {
 		foreach ( $this->fields as $field ) {
 			$field->render();
 		}
@@ -227,7 +227,7 @@ 
 	 * @since %VERSION%
 	 */
 	public function validate_submission() {
-		$valid = [];
+		$valid = [ ];
 		foreach ( $this->fields as $field ) {
 			try {
 				$submitted = array_key_exists( $field->get_id(), $this->submitted_data )
@@ -308,7 +308,7 @@ 
 		$classes     = $this->get_field_classes( $field );
 		$placeholder = $this->get_placeholder( $field );
 		$description = $this->get_description( $field );
-		$merge       = $field['merge'];
+		$merge       = $field[ 'merge' ];
 		$hidden      = $this->get_hidden( $field );
 		return [
 			new $type(

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/Field/BaseInput.php

Spacing +10 added lines, -10 removed lines

@@ -31,7 +31,7 @@ 
 	 *
 	 * @var array
 	 */
-	private $classes = [];
+	private $classes = [ ];
 
 	/**
 	 * Field placeholder.
@@ -90,11 +90,11 @@ 
 	}
 
 	public function field_classes() {
-		return $this->classes['field_classes'];
+		return $this->classes[ 'field_classes' ];
 	}
 
 	public function label_classes() {
-		return $this->classes['label_classes'];
+		return $this->classes[ 'label_classes' ];
 	}
 
 	public function get_name() {
@@ -110,9 +110,9 @@ 
 	}
 
 	public function set_description( $description ) {
-		$this->show_desc   = $description['show_description'];
-		$this->desc_above  = $description['description_above'];
-		$this->description = $description['description'];
+		$this->show_desc   = $description[ 'show_description' ];
+		$this->desc_above  = $description[ 'description_above' ];
+		$this->description = $description[ 'description' ];
 	}
 
 	/**
@@ -122,12 +122,12 @@ 
 	 */
 	public function render() {
 		?>
-		<label for="<?= esc_attr( $this->get_id() ); ?>" class="<?= esc_html( implode( ' ' , $this->label_classes() ) ); ?>" <?= esc_html( implode( ' ' , $this->label['props'] ) ); ?> >
+		<label for="<?= esc_attr( $this->get_id() ); ?>" class="<?= esc_html( implode( ' ', $this->label_classes() ) ); ?>" <?= esc_html( implode( ' ', $this->label[ 'props' ] ) ); ?> >
 
 		<!-- dictate label visibility -->
-		<?php if ( ! isset( $this->label['hide-label'] ) ) { ?>
+		<?php if ( ! isset( $this->label[ 'hide-label' ] ) ) { ?>
 			<span class="<?= esc_attr( $this->merge ) . '-label'; ?>">
-				<?= esc_html( apply_filters( 'yikes-mailchimp-'. $this->merge .'-label' , esc_attr( $this->label['value'] ), $this->form_id ) ); ?>
+				<?= esc_html( apply_filters( 'yikes-mailchimp-' . $this->merge . '-label', esc_attr( $this->label[ 'value' ] ), $this->form_id ) ); ?>
 			</span>
 		<?php }
 
@@ -142,7 +142,7 @@ 
         endif;
 		?>
 		<input type="<?= esc_attr( $this->get_type() ); ?>"
-			class="<?= esc_attr( implode( ' ' , $this->field_classes() ) ); ?>"
+			class="<?= esc_attr( implode( ' ', $this->field_classes() ) ); ?>"
 			name="<?= esc_attr( $this->get_name() ); ?>"
 			placeholder="<?= esc_attr( $this->get_placeholder() ); ?>"
 			id="<?= esc_attr( $this->get_id() ); ?>"

src/Form/FormHelper.php

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 = '';
 		}

src/Shortcode/EasyFormsShortcode.php

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() ) );

views/easy-forms-shortcode.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 	<?php do_action( 'easy_forms_do_form_description', $this ); ?>
 
 	<form method="POST"
-		id="<?= esc_attr( $form_data['form_name'] ); ?>-<?= absint( $form_id ); ?>"
+		id="<?= esc_attr( $form_data[ 'form_name' ] ); ?>-<?= absint( $form_id ); ?>"
 		class="<?= esc_attr( $form_classes ); ?>"
 		data-attr-form-id="<?= absint( $form_id ); ?>"
 	>
@@ -84,7 +84,7 @@ 
 *	for non-admins
 */
 if ( ! current_user_can( 'manage_options' ) ) {
-	$impressions = $form_data['impressions'] + 1;
+	$impressions = $form_data[ 'impressions' ] + 1;
 
 	$form_data->update_form_field( $form_id, 'impressions', $impressions );
 }