insideout10 / wordlift-plugin

src/includes/linked-data/storage/class-wordlift-post-property-storage.php

Indentation +70 added lines, -70 removed lines

@@ -18,75 +18,75 @@
  */
 class Wordlift_Post_Property_Storage extends Wordlift_Storage {
 
-	/**
-	 * The `post_title` property.
-	 */
-	const TITLE = 'title';
-
-	/**
-	 * The `post_content` property stripped of tags and shortcodes.
-	 */
-	const DESCRIPTION_NO_TAGS_NO_SHORTCODES = 'description_no_tags_no_shortcodes';
-
-	/**
-	 * The `post_author` property.
-	 */
-	const AUTHOR = 'author';
-
-	/**
-	 * The {@link WP_Post} property to retrieve.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var string $property The {@link WP_Post} property to retrieve.
-	 */
-	private $property;
-
-	/**
-	 * Create a {@link Wordlift_Post_Property_Storage} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $property A post property.
-	 */
-	public function __construct( $property ) {
-
-		$this->property = $property;
-
-	}
-
-	/**
-	 * Get the property value.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return array|string|null A single string, or an array of values or null
-	 *                           if the property isn't recognized.
-	 */
-	public function get( $post_id ) {
-
-		// Get the post.
-		$post = get_post( $post_id );
-
-		// Switch according to the selected property.
-		switch ( $this->property ) {
-
-			// Title.
-			case self::TITLE:
-				return $post->post_title;
-
-			// Description.
-			case self::DESCRIPTION_NO_TAGS_NO_SHORTCODES:
-				return wp_strip_all_tags( preg_replace( '/\[[^]]+\]/', '', do_shortcode( $post->post_content ) ) );
-
-			// Author.
-			case self::AUTHOR:
-				return $post->post_author;
-		}
-
-		return null;
-	}
+    /**
+     * The `post_title` property.
+     */
+    const TITLE = 'title';
+
+    /**
+     * The `post_content` property stripped of tags and shortcodes.
+     */
+    const DESCRIPTION_NO_TAGS_NO_SHORTCODES = 'description_no_tags_no_shortcodes';
+
+    /**
+     * The `post_author` property.
+     */
+    const AUTHOR = 'author';
+
+    /**
+     * The {@link WP_Post} property to retrieve.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var string $property The {@link WP_Post} property to retrieve.
+     */
+    private $property;
+
+    /**
+     * Create a {@link Wordlift_Post_Property_Storage} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param string $property A post property.
+     */
+    public function __construct( $property ) {
+
+        $this->property = $property;
+
+    }
+
+    /**
+     * Get the property value.
+     *
+     * @since 3.15.0
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return array|string|null A single string, or an array of values or null
+     *                           if the property isn't recognized.
+     */
+    public function get( $post_id ) {
+
+        // Get the post.
+        $post = get_post( $post_id );
+
+        // Switch according to the selected property.
+        switch ( $this->property ) {
+
+            // Title.
+            case self::TITLE:
+                return $post->post_title;
+
+            // Description.
+            case self::DESCRIPTION_NO_TAGS_NO_SHORTCODES:
+                return wp_strip_all_tags( preg_replace( '/\[[^]]+\]/', '', do_shortcode( $post->post_content ) ) );
+
+            // Author.
+            case self::AUTHOR:
+                return $post->post_author;
+        }
+
+        return null;
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 	 *
 	 * @param string $property A post property.
 	 */
-	public function __construct( $property ) {
+	public function __construct($property) {
 
 		$this->property = $property;
 
@@ -65,13 +65,13 @@ 
 	 * @return array|string|null A single string, or an array of values or null
 	 *                           if the property isn't recognized.
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
 		// Get the post.
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
 		// Switch according to the selected property.
-		switch ( $this->property ) {
+		switch ($this->property) {
 
 			// Title.
 			case self::TITLE:
@@ -79,7 +79,7 @@ 
 
 			// Description.
 			case self::DESCRIPTION_NO_TAGS_NO_SHORTCODES:
-				return wp_strip_all_tags( preg_replace( '/\[[^]]+\]/', '', do_shortcode( $post->post_content ) ) );
+				return wp_strip_all_tags(preg_replace('/\[[^]]+\]/', '', do_shortcode($post->post_content)));
 
 			// Author.
 			case self::AUTHOR:

src/admin/elements/class-wordlift-admin-input-element.php

Spacing +12 added lines, -12 removed lines

@@ -44,35 +44,35 @@
 	 *
 	 * @return $this|Wordlift_Admin_Element
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		/*
 		 * Parse the arguments and merge with default values.
 		 * Name intentionally do not have a default as it has to be in SyncEvent
 		 * with form handling code
 		 */
-		$pre_params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
+		$pre_params = wp_parse_args($args, array(
+			'id'          => uniqid('wl-input-'),
 			'value'       => '',
 			'readonly'    => false,
 			'css_class'   => '',
 			'description' => '',
-		) );
-		$params     = apply_filters( 'wl_admin_input_element_params', $pre_params );
+		));
+		$params = apply_filters('wl_admin_input_element_params', $pre_params);
 
 		// Set the readonly and class attributes and the description.
 		$readonly    = $params['readonly'] ? ' readonly="readonly"' : '';
-		$css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
-		$description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+		$css_class   = ! empty($params['css_class']) ? ' class="'.esc_attr($params['css_class']).'"' : '';
+		$description = ! empty($params['description']) ? '<p>'.wp_kses($params['description'], array('a' => array('href' => array()))).'</p>' : '';
 
 		// allow different types of input - default to 'text'.
-		$input_type = ! empty( $params['type'] ) ? $params['type'] : 'text';
+		$input_type = ! empty($params['type']) ? $params['type'] : 'text';
 		?>
 
-		<input type="<?php echo esc_attr( $input_type ); ?>"
-		       id="<?php echo esc_attr( $params['id'] ); ?>"
-		       name="<?php echo esc_attr( $params['name'] ); ?>"
-		       value="<?php echo esc_attr( $params['value'] ); ?>"
+		<input type="<?php echo esc_attr($input_type); ?>"
+		       id="<?php echo esc_attr($params['id']); ?>"
+		       name="<?php echo esc_attr($params['name']); ?>"
+		       value="<?php echo esc_attr($params['value']); ?>"
 			<?php echo $readonly; ?>
 			<?php echo $css_class; ?>
 		/>

Indentation +45 added lines, -45 removed lines

@@ -18,56 +18,56 @@ 
  */
 class Wordlift_Admin_Input_Element implements Wordlift_Admin_Element {
 
-	/**
-	 * Output the HTML for an input box type settings_page
-	 *
-	 * @param array $args An array with the following keys:
-	 *                    Parameters controlling the result.
-	 *
-	 * @type string name The name attribute of the input element. Mandatory.
-	 *
-	 * @type string id    The id attribute of the input element. Optional.
-	 * @type string id    The id attribute of the input element.
-	 *                            Optional, randomly generated one is used if not supplied.
-	 * @type string value    The value of the input element.
-	 *                            Optional, defaults to empty string.
-	 * @type bool readonly    Indicates whether the input is read only.
-	 *                            Optional, defaults to read-write
-	 * @type string css_class    The class attribute for the input element.
-	 *                            If empty string no class attribute will be added.
-	 *                            Optional, defaults to empty string.
-	 * @type string description    The descriptio text to be displayed below the element.
-	 *                            Can include some HTML element.
-	 *                            If empty string no description will be displayed.
-	 *                            Optional, defaults to empty string.
-	 * @since 3.21.0 added the ability to use a $type arg.
-	 *
-	 * @return $this|Wordlift_Admin_Element
-	 */
-	public function render( $args ) {
+    /**
+     * Output the HTML for an input box type settings_page
+     *
+     * @param array $args An array with the following keys:
+     *                    Parameters controlling the result.
+     *
+     * @type string name The name attribute of the input element. Mandatory.
+     *
+     * @type string id    The id attribute of the input element. Optional.
+     * @type string id    The id attribute of the input element.
+     *                            Optional, randomly generated one is used if not supplied.
+     * @type string value    The value of the input element.
+     *                            Optional, defaults to empty string.
+     * @type bool readonly    Indicates whether the input is read only.
+     *                            Optional, defaults to read-write
+     * @type string css_class    The class attribute for the input element.
+     *                            If empty string no class attribute will be added.
+     *                            Optional, defaults to empty string.
+     * @type string description    The descriptio text to be displayed below the element.
+     *                            Can include some HTML element.
+     *                            If empty string no description will be displayed.
+     *                            Optional, defaults to empty string.
+     * @since 3.21.0 added the ability to use a $type arg.
+     *
+     * @return $this|Wordlift_Admin_Element
+     */
+    public function render( $args ) {
 
-		/*
+        /*
 		 * Parse the arguments and merge with default values.
 		 * Name intentionally do not have a default as it has to be in SyncEvent
 		 * with form handling code
 		 */
-		$pre_params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
-			'value'       => '',
-			'readonly'    => false,
-			'css_class'   => '',
-			'description' => '',
-		) );
-		$params     = apply_filters( 'wl_admin_input_element_params', $pre_params );
+        $pre_params = wp_parse_args( $args, array(
+            'id'          => uniqid( 'wl-input-' ),
+            'value'       => '',
+            'readonly'    => false,
+            'css_class'   => '',
+            'description' => '',
+        ) );
+        $params     = apply_filters( 'wl_admin_input_element_params', $pre_params );
 
-		// Set the readonly and class attributes and the description.
-		$readonly    = $params['readonly'] ? ' readonly="readonly"' : '';
-		$css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
-		$description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+        // Set the readonly and class attributes and the description.
+        $readonly    = $params['readonly'] ? ' readonly="readonly"' : '';
+        $css_class   = ! empty( $params['css_class'] ) ? ' class="' . esc_attr( $params['css_class'] ) . '"' : '';
+        $description = ! empty( $params['description'] ) ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
 
-		// allow different types of input - default to 'text'.
-		$input_type = ! empty( $params['type'] ) ? $params['type'] : 'text';
-		?>
+        // allow different types of input - default to 'text'.
+        $input_type = ! empty( $params['type'] ) ? $params['type'] : 'text';
+        ?>
 
 		<input type="<?php echo esc_attr( $input_type ); ?>"
 		       id="<?php echo esc_attr( $params['id'] ); ?>"
@@ -80,7 +80,7 @@ 
 
 		<?php
 
-		return $this;
-	}
+        return $this;
+    }
 
 }

src/admin/class-wordlift-admin-settings-analytics-page-action-link.php

Indentation +41 added lines, -41 removed lines

@@ -19,52 +19,52 @@
  */
 class Wordlift_Admin_Settings_Analytics_Page_Action_Link {
 
-	/**
-	 * The {@link Wordlift_Admin_Settings_Analytics_Page} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Settings_Analytics_Page $settings_page The {@link Wordlift_Admin_Settings_Analytics_Page} instance.
-	 */
-	private $settings_page;
+    /**
+     * The {@link Wordlift_Admin_Settings_Analytics_Page} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Settings_Analytics_Page $settings_page The {@link Wordlift_Admin_Settings_Analytics_Page} instance.
+     */
+    private $settings_page;
 
-	/**
-	 * Create a {@link Wordlift_Admin_Settings_Analytics_Page_Action_Link} instance.
-	 *
-	 * @since  3.11.0
-	 *
-	 * @param \Wordlift_Admin_Settings_Analytics_Page $settings_page The {@link Wordlift_Admin_Settings_Analytics_Page} instance.
-	 */
-	public function __construct( $settings_page ) {
+    /**
+     * Create a {@link Wordlift_Admin_Settings_Analytics_Page_Action_Link} instance.
+     *
+     * @since  3.11.0
+     *
+     * @param \Wordlift_Admin_Settings_Analytics_Page $settings_page The {@link Wordlift_Admin_Settings_Analytics_Page} instance.
+     */
+    public function __construct( $settings_page ) {
 
-		$this->settings_page = $settings_page;
+        $this->settings_page = $settings_page;
 
-	}
+    }
 
-	/**
-	 * Create a link to the WordLift settings page.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $links An array of links.
-	 *
-	 * @return array An array of links including those added by the plugin.
-	 */
-	public function action_links( $links ) {
+    /**
+     * Create a link to the WordLift settings page.
+     *
+     * @since 3.11.0
+     *
+     * @param array $links An array of links.
+     *
+     * @return array An array of links including those added by the plugin.
+     */
+    public function action_links( $links ) {
 
-		// Get the menu slug from the page, then prepare the path, hence the url.
-		$menu_slug = $this->settings_page->get_menu_slug();
-		$path      = "admin.php?page=$menu_slug";
-		$url       = get_admin_url( null, $path );
+        // Get the menu slug from the page, then prepare the path, hence the url.
+        $menu_slug = $this->settings_page->get_menu_slug();
+        $path      = "admin.php?page=$menu_slug";
+        $url       = get_admin_url( null, $path );
 
-		// Add our own link to the list of links.
-		return array_merge( $links, array(
-			sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url( $url ),
-				esc_html__( 'Analytics Settings', 'wordlift' )
-			),
-		) );
-	}
+        // Add our own link to the list of links.
+        return array_merge( $links, array(
+            sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url( $url ),
+                esc_html__( 'Analytics Settings', 'wordlift' )
+            ),
+        ) );
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
 	 *
 	 * @param \Wordlift_Admin_Settings_Analytics_Page $settings_page The {@link Wordlift_Admin_Settings_Analytics_Page} instance.
 	 */
-	public function __construct( $settings_page ) {
+	public function __construct($settings_page) {
 
 		$this->settings_page = $settings_page;
 
@@ -50,21 +50,21 @@ 
 	 *
 	 * @return array An array of links including those added by the plugin.
 	 */
-	public function action_links( $links ) {
+	public function action_links($links) {
 
 		// Get the menu slug from the page, then prepare the path, hence the url.
 		$menu_slug = $this->settings_page->get_menu_slug();
 		$path      = "admin.php?page=$menu_slug";
-		$url       = get_admin_url( null, $path );
+		$url       = get_admin_url(null, $path);
 
 		// Add our own link to the list of links.
-		return array_merge( $links, array(
+		return array_merge($links, array(
 			sprintf(
 				'<a href="%1$s">%2$s</a>',
-				esc_url( $url ),
-				esc_html__( 'Analytics Settings', 'wordlift' )
+				esc_url($url),
+				esc_html__('Analytics Settings', 'wordlift')
 			),
-		) );
+		));
 	}
 
 }

src/includes/linked-data/storage/class-wordlift-post-meta-uri-storage.php

Indentation +39 added lines, -39 removed lines

@@ -18,50 +18,50 @@
  */
 class Wordlift_Post_Meta_Uri_Storage extends Wordlift_Post_Meta_Storage {
 
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
 
-	/**
-	 * Create a {@link Wordlift_Post_Meta_Uri_Storage} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string                   $meta_key       The meta key to read data from.
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	public function __construct( $meta_key, $entity_service ) {
-		parent::__construct( $meta_key );
+    /**
+     * Create a {@link Wordlift_Post_Meta_Uri_Storage} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param string                   $meta_key       The meta key to read data from.
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    public function __construct( $meta_key, $entity_service ) {
+        parent::__construct( $meta_key );
 
-		$this->entity_service = $entity_service;
+        $this->entity_service = $entity_service;
 
-	}
+    }
 
-	/**
-	 * Get the value for the specified meta key.
-	 *
-	 * The value is expected to be an entity post, for which the URI is loaded
-	 * and returned.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return array An array of URIs (or an empty array if nothing is set).
-	 */
-	public function get( $post_id ) {
-		$values = parent::get( $post_id );
+    /**
+     * Get the value for the specified meta key.
+     *
+     * The value is expected to be an entity post, for which the URI is loaded
+     * and returned.
+     *
+     * @since 3.15.0
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return array An array of URIs (or an empty array if nothing is set).
+     */
+    public function get( $post_id ) {
+        $values = parent::get( $post_id );
 
-		$entity_service = $this->entity_service;
+        $entity_service = $this->entity_service;
 
-		return array_map( function ( $item ) use ( $entity_service ) {
-			return $entity_service->get_uri( $item );
-		}, $values );
-	}
+        return array_map( function ( $item ) use ( $entity_service ) {
+            return $entity_service->get_uri( $item );
+        }, $values );
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -35,8 +35,8 @@ 
 	 * @param string                   $meta_key       The meta key to read data from.
 	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
 	 */
-	public function __construct( $meta_key, $entity_service ) {
-		parent::__construct( $meta_key );
+	public function __construct($meta_key, $entity_service) {
+		parent::__construct($meta_key);
 
 		$this->entity_service = $entity_service;
 
@@ -54,14 +54,14 @@ 
 	 *
 	 * @return array An array of URIs (or an empty array if nothing is set).
 	 */
-	public function get( $post_id ) {
-		$values = parent::get( $post_id );
+	public function get($post_id) {
+		$values = parent::get($post_id);
 
 		$entity_service = $this->entity_service;
 
-		return array_map( function ( $item ) use ( $entity_service ) {
-			return $entity_service->get_uri( $item );
-		}, $values );
+		return array_map(function($item) use ($entity_service) {
+			return $entity_service->get_uri($item);
+		}, $values);
 	}
 
 }

src/admin/partials/wordlift-admin-settings-analytics-page.php

Indentation +84 added lines, -84 removed lines

@@ -11,10 +11,10 @@ 
 	<?php settings_errors(); ?>
 	<form action="options.php" method="post">
 		<?php
-		settings_fields( 'wl_analytics_settings' );
-		do_settings_sections( 'wl_analytics_settings' );
-		submit_button();
-		?>
+        settings_fields( 'wl_analytics_settings' );
+        do_settings_sections( 'wl_analytics_settings' );
+        submit_button();
+        ?>
 	</form>
 	<div class="info">
 		<b><?php esc_html_e( 'For Google Tag Manager there is additional setup steps needed in the GTM interface. These are the general instructions:', 'wordlift' ); ?></b>
@@ -22,12 +22,12 @@ 
 			<li><?php esc_html_e( 'You should already have a configuration variable setup to pass data along to your provider. This is assumed to be Google Analytics and a google analytics configuration object. If you don\'t have this setup then set it up now.', 'wordlift' ); ?></li>
 			<li>
 				<?php
-				printf(
-					esc_html__( 'Visit the GTM dashboard and head to the %1$s menu. Add a new user-defined variable of type %2$s for each of the following items:', 'wordlift' ),
-					'<b>Variables</b>',
-					'<i>Data Layer Variable</i>'
-				);
-				?>
+                printf(
+                    esc_html__( 'Visit the GTM dashboard and head to the %1$s menu. Add a new user-defined variable of type %2$s for each of the following items:', 'wordlift' ),
+                    '<b>Variables</b>',
+                    '<i>Data Layer Variable</i>'
+                );
+                ?>
 				<ol>
 					<li><i>event</i></li>
 					<li><i>wl_event_action</i></li>
@@ -43,51 +43,51 @@ 
 			</li>
 			<li>
 				<?php
-				printf(
-					esc_html__( 'Create another variable to pass along the 2 custom dimensions with the type %1$s. For each of the 2 items set the following:', 'wordlift' ),
-					'<i>Google Analytics Settings</i>'
-				);
-				?>
+                printf(
+                    esc_html__( 'Create another variable to pass along the 2 custom dimensions with the type %1$s. For each of the 2 items set the following:', 'wordlift' ),
+                    '<i>Google Analytics Settings</i>'
+                );
+                ?>
 				<ol>
 					<li><?php esc_html_e( 'Set the index to the index of the custom event you want to push this into at Google Analytics, this will usually be a number between 1 and 9.', 'wordlift' ); ?></li>
 					<li>
 						<?php
-						printf(
-							esc_html__( 'Set the values of each one to the %1$s and the %2$s respectively.', 'wordlift' ),
-							'<i>wl_index_uri</i> - <i>wl_event_uri</i>',
-							'<i>wl_index_type</i> - <i>wl_event_type</i>'
-						);
-						?>
+                        printf(
+                            esc_html__( 'Set the values of each one to the %1$s and the %2$s respectively.', 'wordlift' ),
+                            '<i>wl_index_uri</i> - <i>wl_event_uri</i>',
+                            '<i>wl_index_type</i> - <i>wl_event_type</i>'
+                        );
+                        ?>
 					</li>
 				</ol>
 			</li>
 			<li>
 				<?php
-				printf(
-					esc_html__( 'Go to the %1$s menu and create a new trigger of the type: %2$s.', 'wordlift' ),
-					'<b>Triggers</b>',
-					'<i>Custom Event</i>'
-				);
-				?>
+                printf(
+                    esc_html__( 'Go to the %1$s menu and create a new trigger of the type: %2$s.', 'wordlift' ),
+                    '<b>Triggers</b>',
+                    '<i>Custom Event</i>'
+                );
+                ?>
 				<ol>
 					<li>
 
 						<?php
-						printf(
-							esc_html__( 'In the %1$s field input %2$s.', 'wordlift' ),
-							'<i>Event name</i>',
-							'<i>Mentions</i>'
-						);
-						?>
+                        printf(
+                            esc_html__( 'In the %1$s field input %2$s.', 'wordlift' ),
+                            '<i>Event name</i>',
+                            '<i>Mentions</i>'
+                        );
+                        ?>
 					</li>
 					<li>
 
 						<?php
-						printf(
-							esc_html__( 'Set this to fire on %1$s and in the filter set:', 'wordlift' ),
-							'<i>Some Custom Events</i>'
-						);
-						?>
+                        printf(
+                            esc_html__( 'Set this to fire on %1$s and in the filter set:', 'wordlift' ),
+                            '<i>Some Custom Events</i>'
+                        );
+                        ?>
 						<ol>
 							<li><i>event_action</i> - <i>equals</i> - <i>Mentions</i>.</li>
 						</ol>
@@ -96,77 +96,77 @@ 
 			</li>
 			<li>
 				<?php
-				printf(
-					esc_html__( 'Go to the %1$s menu and create a new tag.', 'wordlift' ),
-					'<b>Tags</b>'
-				);
-				?>
+                printf(
+                    esc_html__( 'Go to the %1$s menu and create a new tag.', 'wordlift' ),
+                    '<b>Tags</b>'
+                );
+                ?>
 				<ol>
 					<li>
 
 						<?php
-						printf(
-							esc_html__( 'In the tag configuration section choose %1$s. Assuming you have used variable names that match those mentioned enter:', 'wordlift' ),
-							'<i>Google Analytics - Universal Analytics</i>'
-						);
-						?>
+                        printf(
+                            esc_html__( 'In the tag configuration section choose %1$s. Assuming you have used variable names that match those mentioned enter:', 'wordlift' ),
+                            '<i>Google Analytics - Universal Analytics</i>'
+                        );
+                        ?>
 						<ol>
 							<li>
 								<?php
-								printf(
-									esc_html__( 'Set the %1$s to %2$s.', 'wordlift' ),
-									'Track Type',
-									'<i>Event</i>'
-								);
-								?>
+                                printf(
+                                    esc_html__( 'Set the %1$s to %2$s.', 'wordlift' ),
+                                    'Track Type',
+                                    '<i>Event</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-									esc_html__( 'Set Category to %1$s.', 'wordlift' ),
-									'<i>{{wl_event_category}}</i>'
-								);
-								?>
+                                printf(
+                                    esc_html__( 'Set Category to %1$s.', 'wordlift' ),
+                                    '<i>{{wl_event_category}}</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-									esc_html__( 'Set Action to %1$s.', 'wordlift' ),
-									'<i>{{wl_event_action}}</i>'
-								);
-								?>
+                                printf(
+                                    esc_html__( 'Set Action to %1$s.', 'wordlift' ),
+                                    '<i>{{wl_event_action}}</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-									esc_html__( 'Set Label to %1$s.', 'wordlift' ),
-									'<i>{{wl_event_label}}</i>'
-								);
-								?>
+                                printf(
+                                    esc_html__( 'Set Label to %1$s.', 'wordlift' ),
+                                    '<i>{{wl_event_label}}</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-									esc_html__( 'Set Value to %1$s.', 'wordlift' ),
-									'<i>{{wl_event_value}}</i>'
-								);
-								?>
+                                printf(
+                                    esc_html__( 'Set Value to %1$s.', 'wordlift' ),
+                                    '<i>{{wl_event_value}}</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-									esc_html__( 'Set Non-Interaction Hit to %1$s.', 'wordlift' ),
-									'<i>True</i>'
-								);
-								?>
+                                printf(
+                                    esc_html__( 'Set Non-Interaction Hit to %1$s.', 'wordlift' ),
+                                    '<i>True</i>'
+                                );
+                                ?>
 							</li>
 							<li>
 								<?php
-								printf(
-									esc_html__( 'Set the %1$s dropdown to the settings object for the Google Analytics tracking.', 'wordlift' ),
-									'<i>Google Analytics Settings</i>'
-								);
-								?>
+                                printf(
+                                    esc_html__( 'Set the %1$s dropdown to the settings object for the Google Analytics tracking.', 'wordlift' ),
+                                    '<i>Google Analytics Settings</i>'
+                                );
+                                ?>
 							</li>
 						</ol>
 					</li>

Spacing +25 added lines, -25 removed lines

@@ -11,19 +11,19 @@ 
 	<?php settings_errors(); ?>
 	<form action="options.php" method="post">
 		<?php
-		settings_fields( 'wl_analytics_settings' );
-		do_settings_sections( 'wl_analytics_settings' );
+		settings_fields('wl_analytics_settings');
+		do_settings_sections('wl_analytics_settings');
 		submit_button();
 		?>
 	</form>
 	<div class="info">
-		<b><?php esc_html_e( 'For Google Tag Manager there is additional setup steps needed in the GTM interface. These are the general instructions:', 'wordlift' ); ?></b>
+		<b><?php esc_html_e('For Google Tag Manager there is additional setup steps needed in the GTM interface. These are the general instructions:', 'wordlift'); ?></b>
 		<ol>
-			<li><?php esc_html_e( 'You should already have a configuration variable setup to pass data along to your provider. This is assumed to be Google Analytics and a google analytics configuration object. If you don\'t have this setup then set it up now.', 'wordlift' ); ?></li>
+			<li><?php esc_html_e('You should already have a configuration variable setup to pass data along to your provider. This is assumed to be Google Analytics and a google analytics configuration object. If you don\'t have this setup then set it up now.', 'wordlift'); ?></li>
 			<li>
 				<?php
 				printf(
-					esc_html__( 'Visit the GTM dashboard and head to the %1$s menu. Add a new user-defined variable of type %2$s for each of the following items:', 'wordlift' ),
+					esc_html__('Visit the GTM dashboard and head to the %1$s menu. Add a new user-defined variable of type %2$s for each of the following items:', 'wordlift'),
 					'<b>Variables</b>',
 					'<i>Data Layer Variable</i>'
 				);
@@ -34,26 +34,26 @@ 
 					<li><i>wl_event_category</i></li>
 					<li><i>wl_event_label</i></li>
 					<li><i>wl_event_value</i></li>
-					<li><i>wl_event_uri</i> <?php esc_html_e( '(which is the first custom dimension number the plugin offers)', 'wordlift' ); ?></li>
-					<li><i>wl_index_uri</i> <?php esc_html_e( '(this is the index number sent to use as the custom dimention for uri)', 'wordlift' ); ?></li>
-					<li><i>wl_event_type</i> <?php esc_html_e( '(which is the second custom dimension number the plugin offers)', 'wordlift' ); ?></li>
-					<li><i>wl_index_type</i> <?php esc_html_e( '(this is the index number sent to use as the custom dimention for type)', 'wordlift' ); ?></li>
+					<li><i>wl_event_uri</i> <?php esc_html_e('(which is the first custom dimension number the plugin offers)', 'wordlift'); ?></li>
+					<li><i>wl_index_uri</i> <?php esc_html_e('(this is the index number sent to use as the custom dimention for uri)', 'wordlift'); ?></li>
+					<li><i>wl_event_type</i> <?php esc_html_e('(which is the second custom dimension number the plugin offers)', 'wordlift'); ?></li>
+					<li><i>wl_index_type</i> <?php esc_html_e('(this is the index number sent to use as the custom dimention for type)', 'wordlift'); ?></li>
 
 				</ol>
 			</li>
 			<li>
 				<?php
 				printf(
-					esc_html__( 'Create another variable to pass along the 2 custom dimensions with the type %1$s. For each of the 2 items set the following:', 'wordlift' ),
+					esc_html__('Create another variable to pass along the 2 custom dimensions with the type %1$s. For each of the 2 items set the following:', 'wordlift'),
 					'<i>Google Analytics Settings</i>'
 				);
 				?>
 				<ol>
-					<li><?php esc_html_e( 'Set the index to the index of the custom event you want to push this into at Google Analytics, this will usually be a number between 1 and 9.', 'wordlift' ); ?></li>
+					<li><?php esc_html_e('Set the index to the index of the custom event you want to push this into at Google Analytics, this will usually be a number between 1 and 9.', 'wordlift'); ?></li>
 					<li>
 						<?php
 						printf(
-							esc_html__( 'Set the values of each one to the %1$s and the %2$s respectively.', 'wordlift' ),
+							esc_html__('Set the values of each one to the %1$s and the %2$s respectively.', 'wordlift'),
 							'<i>wl_index_uri</i> - <i>wl_event_uri</i>',
 							'<i>wl_index_type</i> - <i>wl_event_type</i>'
 						);
@@ -64,7 +64,7 @@ 
 			<li>
 				<?php
 				printf(
-					esc_html__( 'Go to the %1$s menu and create a new trigger of the type: %2$s.', 'wordlift' ),
+					esc_html__('Go to the %1$s menu and create a new trigger of the type: %2$s.', 'wordlift'),
 					'<b>Triggers</b>',
 					'<i>Custom Event</i>'
 				);
@@ -74,7 +74,7 @@ 
 
 						<?php
 						printf(
-							esc_html__( 'In the %1$s field input %2$s.', 'wordlift' ),
+							esc_html__('In the %1$s field input %2$s.', 'wordlift'),
 							'<i>Event name</i>',
 							'<i>Mentions</i>'
 						);
@@ -84,7 +84,7 @@ 
 
 						<?php
 						printf(
-							esc_html__( 'Set this to fire on %1$s and in the filter set:', 'wordlift' ),
+							esc_html__('Set this to fire on %1$s and in the filter set:', 'wordlift'),
 							'<i>Some Custom Events</i>'
 						);
 						?>
@@ -97,7 +97,7 @@ 
 			<li>
 				<?php
 				printf(
-					esc_html__( 'Go to the %1$s menu and create a new tag.', 'wordlift' ),
+					esc_html__('Go to the %1$s menu and create a new tag.', 'wordlift'),
 					'<b>Tags</b>'
 				);
 				?>
@@ -106,7 +106,7 @@ 
 
 						<?php
 						printf(
-							esc_html__( 'In the tag configuration section choose %1$s. Assuming you have used variable names that match those mentioned enter:', 'wordlift' ),
+							esc_html__('In the tag configuration section choose %1$s. Assuming you have used variable names that match those mentioned enter:', 'wordlift'),
 							'<i>Google Analytics - Universal Analytics</i>'
 						);
 						?>
@@ -114,7 +114,7 @@ 
 							<li>
 								<?php
 								printf(
-									esc_html__( 'Set the %1$s to %2$s.', 'wordlift' ),
+									esc_html__('Set the %1$s to %2$s.', 'wordlift'),
 									'Track Type',
 									'<i>Event</i>'
 								);
@@ -123,7 +123,7 @@ 
 							<li>
 								<?php
 								printf(
-									esc_html__( 'Set Category to %1$s.', 'wordlift' ),
+									esc_html__('Set Category to %1$s.', 'wordlift'),
 									'<i>{{wl_event_category}}</i>'
 								);
 								?>
@@ -131,7 +131,7 @@ 
 							<li>
 								<?php
 								printf(
-									esc_html__( 'Set Action to %1$s.', 'wordlift' ),
+									esc_html__('Set Action to %1$s.', 'wordlift'),
 									'<i>{{wl_event_action}}</i>'
 								);
 								?>
@@ -139,7 +139,7 @@ 
 							<li>
 								<?php
 								printf(
-									esc_html__( 'Set Label to %1$s.', 'wordlift' ),
+									esc_html__('Set Label to %1$s.', 'wordlift'),
 									'<i>{{wl_event_label}}</i>'
 								);
 								?>
@@ -147,7 +147,7 @@ 
 							<li>
 								<?php
 								printf(
-									esc_html__( 'Set Value to %1$s.', 'wordlift' ),
+									esc_html__('Set Value to %1$s.', 'wordlift'),
 									'<i>{{wl_event_value}}</i>'
 								);
 								?>
@@ -155,7 +155,7 @@ 
 							<li>
 								<?php
 								printf(
-									esc_html__( 'Set Non-Interaction Hit to %1$s.', 'wordlift' ),
+									esc_html__('Set Non-Interaction Hit to %1$s.', 'wordlift'),
 									'<i>True</i>'
 								);
 								?>
@@ -163,14 +163,14 @@ 
 							<li>
 								<?php
 								printf(
-									esc_html__( 'Set the %1$s dropdown to the settings object for the Google Analytics tracking.', 'wordlift' ),
+									esc_html__('Set the %1$s dropdown to the settings object for the Google Analytics tracking.', 'wordlift'),
 									'<i>Google Analytics Settings</i>'
 								);
 								?>
 							</li>
 						</ol>
 					</li>
-					<li><?php esc_html_e( 'In the triggering tag select the firing trigger you created previously.', 'wordlift' ); ?></li>
+					<li><?php esc_html_e('In the triggering tag select the firing trigger you created previously.', 'wordlift'); ?></li>
 				</ol>
 			</li>
 		</ol>

src/public/class-wordlift-sharethis-service.php

Indentation +111 added lines, -111 removed lines

@@ -17,116 +17,116 @@
  */
 class Wordlift_ShareThis_Service {
 
-	/**
-	 * The ShareThis function which prints the buttons.
-	 *
-	 * @since 3.2.0
-	 */
-	const ADD_WIDGET_FUNCTION_NAME = 'st_add_widget';
-
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Create an instance of the ShareThis service.
-	 *
-	 * @since 3.2.0
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_ShareThis_Service' );
-
-	}
-
-	/**
-	 * Receive <em>the_content</em> filter calls from WordPress.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $content The post content.
-	 *
-	 * @return string The updated post content.
-	 */
-	public function the_content( $content ) {
-
-		return $this->call_sharethis( 'the_content', $content );
-	}
-
-	/**
-	 * Receive <em>the_excerpt</em> filter calls from WordPress.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $content The post excerpt.
-	 *
-	 * @return string The updated post excerpt.
-	 */
-	public function the_excerpt( $content ) {
-
-		return $this->call_sharethis( 'the_excerpt', $content );
-	}
-
-	/**
-	 * Call the ShareThis function.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $tag The filter tag.
-	 * @param string $content The post content.
-	 *
-	 * @return string The updated post content.
-	 */
-	private function call_sharethis( $tag, $content ) {
-
-		// Get the current post.
-		global $post;
-
-		// Bail out if the global $post instance isn't set.
-		if ( !isset( $post ) ) {
-			return $content;
-		}
-
-		// Bail out if the current entity is a post/page since this is already handled by ShareThis.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/819
-		if ( 'post' === $post->post_type || 'page' === $post->post_type ) {
-			return $content;
-		}
-
-		// If it's not the entity type, return.
-		$entity_service = Wordlift_Entity_Service::get_instance();
-		if ( null === $post || ! $entity_service->is_entity( get_the_ID() ) ) {
-			return $content;
-		}
-
-		// If the ShareThis function doesn't exist, return.
-		if ( ! function_exists( self::ADD_WIDGET_FUNCTION_NAME ) ) {
-			return $content;
-		}
-
-		// If ShareThis hasn't been added as a filter, return.
-		if ( ! has_filter( $tag, self::ADD_WIDGET_FUNCTION_NAME ) ) {
-			return $content;
-		}
-
-		// Temporary pop the post type and replace it with post.
-		$post_type       = $post->post_type;
-		$post->post_type = 'post';
-
-		// Call ShareThis (disguised as a post).
-		$content = call_user_func_array( self::ADD_WIDGET_FUNCTION_NAME, array( $content ) );
-
-		// Restore our post type.
-		$post->post_type = $post_type;
-
-		// Finally return the content.
-		return $content;
-	}
+    /**
+     * The ShareThis function which prints the buttons.
+     *
+     * @since 3.2.0
+     */
+    const ADD_WIDGET_FUNCTION_NAME = 'st_add_widget';
+
+    /**
+     * The Log service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Create an instance of the ShareThis service.
+     *
+     * @since 3.2.0
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_ShareThis_Service' );
+
+    }
+
+    /**
+     * Receive <em>the_content</em> filter calls from WordPress.
+     *
+     * @since 3.2.0
+     *
+     * @param string $content The post content.
+     *
+     * @return string The updated post content.
+     */
+    public function the_content( $content ) {
+
+        return $this->call_sharethis( 'the_content', $content );
+    }
+
+    /**
+     * Receive <em>the_excerpt</em> filter calls from WordPress.
+     *
+     * @since 3.2.0
+     *
+     * @param string $content The post excerpt.
+     *
+     * @return string The updated post excerpt.
+     */
+    public function the_excerpt( $content ) {
+
+        return $this->call_sharethis( 'the_excerpt', $content );
+    }
+
+    /**
+     * Call the ShareThis function.
+     *
+     * @since 3.2.0
+     *
+     * @param string $tag The filter tag.
+     * @param string $content The post content.
+     *
+     * @return string The updated post content.
+     */
+    private function call_sharethis( $tag, $content ) {
+
+        // Get the current post.
+        global $post;
+
+        // Bail out if the global $post instance isn't set.
+        if ( !isset( $post ) ) {
+            return $content;
+        }
+
+        // Bail out if the current entity is a post/page since this is already handled by ShareThis.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/819
+        if ( 'post' === $post->post_type || 'page' === $post->post_type ) {
+            return $content;
+        }
+
+        // If it's not the entity type, return.
+        $entity_service = Wordlift_Entity_Service::get_instance();
+        if ( null === $post || ! $entity_service->is_entity( get_the_ID() ) ) {
+            return $content;
+        }
+
+        // If the ShareThis function doesn't exist, return.
+        if ( ! function_exists( self::ADD_WIDGET_FUNCTION_NAME ) ) {
+            return $content;
+        }
+
+        // If ShareThis hasn't been added as a filter, return.
+        if ( ! has_filter( $tag, self::ADD_WIDGET_FUNCTION_NAME ) ) {
+            return $content;
+        }
+
+        // Temporary pop the post type and replace it with post.
+        $post_type       = $post->post_type;
+        $post->post_type = 'post';
+
+        // Call ShareThis (disguised as a post).
+        $content = call_user_func_array( self::ADD_WIDGET_FUNCTION_NAME, array( $content ) );
+
+        // Restore our post type.
+        $post->post_type = $post_type;
+
+        // Finally return the content.
+        return $content;
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_ShareThis_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_ShareThis_Service');
 
 	}
 
@@ -53,9 +53,9 @@ 
 	 *
 	 * @return string The updated post content.
 	 */
-	public function the_content( $content ) {
+	public function the_content($content) {
 
-		return $this->call_sharethis( 'the_content', $content );
+		return $this->call_sharethis('the_content', $content);
 	}
 
 	/**
@@ -67,9 +67,9 @@ 
 	 *
 	 * @return string The updated post excerpt.
 	 */
-	public function the_excerpt( $content ) {
+	public function the_excerpt($content) {
 
-		return $this->call_sharethis( 'the_excerpt', $content );
+		return $this->call_sharethis('the_excerpt', $content);
 	}
 
 	/**
@@ -82,36 +82,36 @@ 
 	 *
 	 * @return string The updated post content.
 	 */
-	private function call_sharethis( $tag, $content ) {
+	private function call_sharethis($tag, $content) {
 
 		// Get the current post.
 		global $post;
 
 		// Bail out if the global $post instance isn't set.
-		if ( !isset( $post ) ) {
+		if ( ! isset($post)) {
 			return $content;
 		}
 
 		// Bail out if the current entity is a post/page since this is already handled by ShareThis.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/819
-		if ( 'post' === $post->post_type || 'page' === $post->post_type ) {
+		if ('post' === $post->post_type || 'page' === $post->post_type) {
 			return $content;
 		}
 
 		// If it's not the entity type, return.
 		$entity_service = Wordlift_Entity_Service::get_instance();
-		if ( null === $post || ! $entity_service->is_entity( get_the_ID() ) ) {
+		if (null === $post || ! $entity_service->is_entity(get_the_ID())) {
 			return $content;
 		}
 
 		// If the ShareThis function doesn't exist, return.
-		if ( ! function_exists( self::ADD_WIDGET_FUNCTION_NAME ) ) {
+		if ( ! function_exists(self::ADD_WIDGET_FUNCTION_NAME)) {
 			return $content;
 		}
 
 		// If ShareThis hasn't been added as a filter, return.
-		if ( ! has_filter( $tag, self::ADD_WIDGET_FUNCTION_NAME ) ) {
+		if ( ! has_filter($tag, self::ADD_WIDGET_FUNCTION_NAME)) {
 			return $content;
 		}
 
@@ -120,7 +120,7 @@ 
 		$post->post_type = 'post';
 
 		// Call ShareThis (disguised as a post).
-		$content = call_user_func_array( self::ADD_WIDGET_FUNCTION_NAME, array( $content ) );
+		$content = call_user_func_array(self::ADD_WIDGET_FUNCTION_NAME, array($content));
 
 		// Restore our post type.
 		$post->post_type = $post_type;

src/admin/partials/wordlift-admin-deactivation-feedback-popup.php

Indentation +68 added lines, -68 removed lines

@@ -1,62 +1,62 @@ 
 <?php
 $too_complicate_reason_label = sprintf(
-	'<a target="_blank" href="%s">%s</a>',
-	/* translators: the link https://wordlift.io/contact-us/ should be changed to language version of the page */
-	esc_attr__( 'https://wordlift.io/contact-us/', 'wordlift' ),
-	esc_html__( 'Contact Us', 'wordlift' )
+    '<a target="_blank" href="%s">%s</a>',
+    /* translators: the link https://wordlift.io/contact-us/ should be changed to language version of the page */
+    esc_attr__( 'https://wordlift.io/contact-us/', 'wordlift' ),
+    esc_html__( 'Contact Us', 'wordlift' )
 );
 
 $reasons = array(
-	array(
-		'id'      => 'TOO_COMPLICATED',
-		'text'    => esc_html__( 'It was too complicated and unclear to me', 'wordlift' ),
-		'message' => array(
-			'text' => sprintf(
-				esc_html__( 'Need help? We are ready to answer your questions. %s', 'wordlift' ),
-				$too_complicate_reason_label
-			),
-		),
-	),
-	array(
-		'id'      => 'NOT_ENOUGH_FEATURES',
-		'text'    => esc_html__( 'It misses some important feature to me', 'wordlift' ),
-		'message' => array(
-			'field' => 'text',
-			'text'  => esc_html__( 'Tell us what this feature is.', 'wordlift' ),
-		),
-	),
-	array(
-		'id'      => 'COSTS_TOO_MUCH',
-		'text'    => esc_html__( 'It costs too much', 'wordlift' ),
-		'message' => array(
-			'field' => 'text',
-			'text'  => esc_html__( 'How much you would like to pay?', 'wordlift' ),
-		),
-	),
-	array(
-		'id'      => 'FOUND_ANOTHER_TOOL',
-		'text'    => esc_html__( 'I found another tool that I like better', 'wordlift' ),
-		'message' => array(
-			'field' => 'text',
-			'text'  => esc_html__( 'Please tell us some more details.', 'wordlift' ),
-		),
-	),
-	array(
-		'id'   => 'I_DONT_USE_IT',
-		'text' => esc_html__( 'I\'m not using it right now', 'wordlift' ),
-	),
-	array(
-		'id'   => 'SOMETHING_DIDNT_WORK',
-		'text' => esc_html__( 'Something didn\'t work right', 'wordlift' ),
-	),
-	array(
-		'id'      => 'ANOTHER_REASON',
-		'text'    => esc_html__( 'Another reason', 'wordlift' ),
-		'message' => array(
-			'field' => 'textarea',
-			'text'  => esc_html__( 'Please tell us the reason so we can improve it.', 'wordlift' ),
-		),
-	),
+    array(
+        'id'      => 'TOO_COMPLICATED',
+        'text'    => esc_html__( 'It was too complicated and unclear to me', 'wordlift' ),
+        'message' => array(
+            'text' => sprintf(
+                esc_html__( 'Need help? We are ready to answer your questions. %s', 'wordlift' ),
+                $too_complicate_reason_label
+            ),
+        ),
+    ),
+    array(
+        'id'      => 'NOT_ENOUGH_FEATURES',
+        'text'    => esc_html__( 'It misses some important feature to me', 'wordlift' ),
+        'message' => array(
+            'field' => 'text',
+            'text'  => esc_html__( 'Tell us what this feature is.', 'wordlift' ),
+        ),
+    ),
+    array(
+        'id'      => 'COSTS_TOO_MUCH',
+        'text'    => esc_html__( 'It costs too much', 'wordlift' ),
+        'message' => array(
+            'field' => 'text',
+            'text'  => esc_html__( 'How much you would like to pay?', 'wordlift' ),
+        ),
+    ),
+    array(
+        'id'      => 'FOUND_ANOTHER_TOOL',
+        'text'    => esc_html__( 'I found another tool that I like better', 'wordlift' ),
+        'message' => array(
+            'field' => 'text',
+            'text'  => esc_html__( 'Please tell us some more details.', 'wordlift' ),
+        ),
+    ),
+    array(
+        'id'   => 'I_DONT_USE_IT',
+        'text' => esc_html__( 'I\'m not using it right now', 'wordlift' ),
+    ),
+    array(
+        'id'   => 'SOMETHING_DIDNT_WORK',
+        'text' => esc_html__( 'Something didn\'t work right', 'wordlift' ),
+    ),
+    array(
+        'id'      => 'ANOTHER_REASON',
+        'text'    => esc_html__( 'Another reason', 'wordlift' ),
+        'message' => array(
+            'field' => 'textarea',
+            'text'  => esc_html__( 'Please tell us the reason so we can improve it.', 'wordlift' ),
+        ),
+    ),
 );
 ?>
 <div class="wl-modal-deactivation-feedback" style="display: none">
@@ -91,15 +91,15 @@ 
 							<?php if ( ! empty( $reason['message'] ) ) : ?>
 								<div class="additional-info <?php echo ( ! empty( $reason['message']['field'] ) ) ? 'has-field' : ''; ?>">
 									<?php
-									if ( ! empty( $reason['message']['field'] ) ) {
-										if ( $reason['message']['field'] === 'text' ) {
-											echo '<input type="text" name="wl-details" class="wl-details"/>';
-										} else {
-											echo '<textarea name="wl-details" class="wl-details"></textarea>';
-										}
-									}
-									echo wpautop( $reason['message']['text'] )
-									?>
+                                    if ( ! empty( $reason['message']['field'] ) ) {
+                                        if ( $reason['message']['field'] === 'text' ) {
+                                            echo '<input type="text" name="wl-details" class="wl-details"/>';
+                                        } else {
+                                            echo '<textarea name="wl-details" class="wl-details"></textarea>';
+                                        }
+                                    }
+                                    echo wpautop( $reason['message']['text'] )
+                                    ?>
 								</div>
 							<?php endif ?>
 						</li>
@@ -110,11 +110,11 @@ 
 			<div class="notes">
 				<p>
 					<?php
-					printf(
-						__( 'Important notice: Uninstalling the plugin will delete your vocabulary.<br>Maybe you would like to <a href="%s" target="_blank">download your data</a> first.', 'wordlift' ),
-						add_query_arg( array( 'page' => 'wl_download_your_data' ), admin_url( 'admin.php' ) )
-					);
-					?>
+                    printf(
+                        __( 'Important notice: Uninstalling the plugin will delete your vocabulary.<br>Maybe you would like to <a href="%s" target="_blank">download your data</a> first.', 'wordlift' ),
+                        add_query_arg( array( 'page' => 'wl_download_your_data' ), admin_url( 'admin.php' ) )
+                    );
+                    ?>
 				</p>
 			</div>
 

Spacing +31 added lines, -31 removed lines

@@ -2,59 +2,59 @@ 
 $too_complicate_reason_label = sprintf(
 	'<a target="_blank" href="%s">%s</a>',
 	/* translators: the link https://wordlift.io/contact-us/ should be changed to language version of the page */
-	esc_attr__( 'https://wordlift.io/contact-us/', 'wordlift' ),
-	esc_html__( 'Contact Us', 'wordlift' )
+	esc_attr__('https://wordlift.io/contact-us/', 'wordlift'),
+	esc_html__('Contact Us', 'wordlift')
 );
 
 $reasons = array(
 	array(
 		'id'      => 'TOO_COMPLICATED',
-		'text'    => esc_html__( 'It was too complicated and unclear to me', 'wordlift' ),
+		'text'    => esc_html__('It was too complicated and unclear to me', 'wordlift'),
 		'message' => array(
 			'text' => sprintf(
-				esc_html__( 'Need help? We are ready to answer your questions. %s', 'wordlift' ),
+				esc_html__('Need help? We are ready to answer your questions. %s', 'wordlift'),
 				$too_complicate_reason_label
 			),
 		),
 	),
 	array(
 		'id'      => 'NOT_ENOUGH_FEATURES',
-		'text'    => esc_html__( 'It misses some important feature to me', 'wordlift' ),
+		'text'    => esc_html__('It misses some important feature to me', 'wordlift'),
 		'message' => array(
 			'field' => 'text',
-			'text'  => esc_html__( 'Tell us what this feature is.', 'wordlift' ),
+			'text'  => esc_html__('Tell us what this feature is.', 'wordlift'),
 		),
 	),
 	array(
 		'id'      => 'COSTS_TOO_MUCH',
-		'text'    => esc_html__( 'It costs too much', 'wordlift' ),
+		'text'    => esc_html__('It costs too much', 'wordlift'),
 		'message' => array(
 			'field' => 'text',
-			'text'  => esc_html__( 'How much you would like to pay?', 'wordlift' ),
+			'text'  => esc_html__('How much you would like to pay?', 'wordlift'),
 		),
 	),
 	array(
 		'id'      => 'FOUND_ANOTHER_TOOL',
-		'text'    => esc_html__( 'I found another tool that I like better', 'wordlift' ),
+		'text'    => esc_html__('I found another tool that I like better', 'wordlift'),
 		'message' => array(
 			'field' => 'text',
-			'text'  => esc_html__( 'Please tell us some more details.', 'wordlift' ),
+			'text'  => esc_html__('Please tell us some more details.', 'wordlift'),
 		),
 	),
 	array(
 		'id'   => 'I_DONT_USE_IT',
-		'text' => esc_html__( 'I\'m not using it right now', 'wordlift' ),
+		'text' => esc_html__('I\'m not using it right now', 'wordlift'),
 	),
 	array(
 		'id'   => 'SOMETHING_DIDNT_WORK',
-		'text' => esc_html__( 'Something didn\'t work right', 'wordlift' ),
+		'text' => esc_html__('Something didn\'t work right', 'wordlift'),
 	),
 	array(
 		'id'      => 'ANOTHER_REASON',
-		'text'    => esc_html__( 'Another reason', 'wordlift' ),
+		'text'    => esc_html__('Another reason', 'wordlift'),
 		'message' => array(
 			'field' => 'textarea',
-			'text'  => esc_html__( 'Please tell us the reason so we can improve it.', 'wordlift' ),
+			'text'  => esc_html__('Please tell us the reason so we can improve it.', 'wordlift'),
 		),
 	),
 );
@@ -63,42 +63,42 @@ 
 	<div class="wl-modal">
 		<div class="wl-modal-body">
 			<h2>
-				<?php _e( 'We\'re sorry to see you go!', 'wordlift' ); ?>
+				<?php _e('We\'re sorry to see you go!', 'wordlift'); ?>
 			</h2>
 
 			<div class="wl-modal-panel active">
 				<h4>
-					<?php _e( 'If you have a moment, please let us know why you are deactivating', 'wordlift' ); ?>:
+					<?php _e('If you have a moment, please let us know why you are deactivating', 'wordlift'); ?>:
 				</h4>
 
 				<ul>
-					<?php foreach ( $reasons as $reason ) : ?>
-						<li class="wl-reason-item <?php echo ( $reason['id'] == 'I_DONT_USE_IT' ) ? 'selected' : ''; ?>">
+					<?php foreach ($reasons as $reason) : ?>
+						<li class="wl-reason-item <?php echo ($reason['id'] == 'I_DONT_USE_IT') ? 'selected' : ''; ?>">
 							<label>
 								<input
 									type="radio"
 									name="wl-code"
 									class="wl-code"
-									<?php checked( 'I_DONT_USE_IT', $reason['id'], true ); ?>
-									value="<?php echo esc_attr( $reason['id'] ); ?>"
+									<?php checked('I_DONT_USE_IT', $reason['id'], true); ?>
+									value="<?php echo esc_attr($reason['id']); ?>"
 								/>
 
 								<span class="description">
-									<?php echo esc_html( $reason['text'] ); ?>
+									<?php echo esc_html($reason['text']); ?>
 								</span>
 							</label>
 
-							<?php if ( ! empty( $reason['message'] ) ) : ?>
-								<div class="additional-info <?php echo ( ! empty( $reason['message']['field'] ) ) ? 'has-field' : ''; ?>">
+							<?php if ( ! empty($reason['message'])) : ?>
+								<div class="additional-info <?php echo ( ! empty($reason['message']['field'])) ? 'has-field' : ''; ?>">
 									<?php
-									if ( ! empty( $reason['message']['field'] ) ) {
-										if ( $reason['message']['field'] === 'text' ) {
+									if ( ! empty($reason['message']['field'])) {
+										if ($reason['message']['field'] === 'text') {
 											echo '<input type="text" name="wl-details" class="wl-details"/>';
 										} else {
 											echo '<textarea name="wl-details" class="wl-details"></textarea>';
 										}
 									}
-									echo wpautop( $reason['message']['text'] )
+									echo wpautop($reason['message']['text'])
 									?>
 								</div>
 							<?php endif ?>
@@ -111,8 +111,8 @@ 
 				<p>
 					<?php
 					printf(
-						__( 'Important notice: Uninstalling the plugin will delete your vocabulary.<br>Maybe you would like to <a href="%s" target="_blank">download your data</a> first.', 'wordlift' ),
-						add_query_arg( array( 'page' => 'wl_download_your_data' ), admin_url( 'admin.php' ) )
+						__('Important notice: Uninstalling the plugin will delete your vocabulary.<br>Maybe you would like to <a href="%s" target="_blank">download your data</a> first.', 'wordlift'),
+						add_query_arg(array('page' => 'wl_download_your_data'), admin_url('admin.php'))
 					);
 					?>
 				</p>
@@ -123,11 +123,11 @@ 
 
 		<div class="wl-modal-footer">
 			<a href="#" class="button button-secondary wl-modal-button-close">
-				<?php esc_html_e( 'Cancel', 'wordlift' ); ?>
+				<?php esc_html_e('Cancel', 'wordlift'); ?>
 			</a>
 
 			<a href="#" class="button button-primary wl-modal-button-deactivate">
-				<?php esc_html_e( 'Deactivate', 'wordlift' ); ?>
+				<?php esc_html_e('Deactivate', 'wordlift'); ?>
 			</a>
 			<div class="clear"></div>
 		</div>
@@ -136,7 +136,7 @@ 
 			type="hidden"
 			name="wl_deactivation_feedback_nonce"
 			class="wl_deactivation_feedback_nonce"
-			value="<?php echo esc_attr( wp_create_nonce( 'wl_deactivation_feedback_nonce' ) ); ?>"
+			value="<?php echo esc_attr(wp_create_nonce('wl_deactivation_feedback_nonce')); ?>"
 		>
 	</div>
 </div>

src/includes/mapping/class-wordlift-mapping-service.php

Indentation +200 added lines, -200 removed lines

@@ -14,205 +14,205 @@
  */
 class Wordlift_Mapping_Service {
 
-	/**
-	 * The mapping's options.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var array $options The mapping's options.
-	 */
-	private $options;
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Mapping_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a {@link Wordlift_Mapping_Service} instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	public function __construct( $entity_type_service ) {
-
-		// Set the entity type service instance.
-		$this->entity_type_service = $entity_type_service;
-
-		// Load the options.
-		$this->options = get_option( 'wl_mappings', array() );
-
-		// Hook to `wl_valid_entity_post_types` and to `wl_default_entity_types_for_post_type`.
-		add_filter( 'wl_valid_entity_post_types', array( $this, 'valid_entity_post_types', ), 9 );
-		add_filter( 'wl_default_entity_types_for_post_type', array(
-			$this,
-			'default_entity_types_for_post_type',
-		), 9, 2 );
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @return \Wordlift_Mapping_Service The singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Save the options.
-	 *
-	 * @since 3.20.0
-	 */
-	private function save_options() {
-
-		update_option( 'wl_mappings', $this->options, true );
-
-	}
-
-	/**
-	 * Set the default entity types for a post type.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type Post type.
-	 * @param array  $entity_types An array of entity types slugs.
-	 */
-	public function set_entity_types_for_post_type( $post_type, $entity_types ) {
-
-		$this->options[ $post_type ] = $entity_types;
-		$this->save_options();
-
-	}
-
-	/**
-	 * Hook to `wl_valid_entity_post_types` to declare schema.org support for the configured post types.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $post_types The default post types.
-	 *
-	 * @return array The supported post types.
-	 */
-	public function valid_entity_post_types( $post_types ) {
-
-		return array_merge( $post_types, array_keys( $this->options ) );
-	}
-
-	/**
-	 * Hook to `wl_default_entity_types_for_post_type` to declare the entity types for a post type.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array  $default The default entity types.
-	 * @param string $post_type The post type.
-	 *
-	 * @return array The default entity types.
-	 */
-	public function default_entity_types_for_post_type( $default, $post_type ) {
-
-		return isset( $this->options[ $post_type ] ) ? $this->options[ $post_type ] : $default;
-	}
-
-	/**
-	 * Update the post type with the entity types, starting at the specified offset.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type The post type.
-	 * @param array  $entity_types The entity types.
-	 * @param int    $offset The offset (0 by default).
-	 *
-	 * @return array {
-	 * The result array.
-	 *
-	 * @type int     $current The current offset.
-	 * @type int     $next The next offset.
-	 * @type int     $count The total element count.
-	 * }
-	 */
-	public function update( $post_type, $entity_types, $offset = 0 ) {
-
-		$entity_type_service = $this->entity_type_service;
-		$tax_query           = $this->get_tax_query( $entity_types );
-
-		return Wordlift_Batch_Action::process( $post_type, $offset, $tax_query, function ( $post_id ) use ( $entity_type_service, $entity_types ) {
-			foreach ( $entity_types as $entity_type ) {
-				$entity_type_service->set( $post_id, $entity_type, false );
-			}
-		} );
-	}
-
-	/**
-	 * Count the number of posts that need to be assigned with the entity types.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type The post type.
-	 * @param array  $entity_types An array of entity types.
-	 *
-	 * @return int The number of posts to be assigned with entity types.
-	 */
-	public function count( $post_type, $entity_types ) {
-
-		$tax_query = $this->get_tax_query( $entity_types );
-
-		return Wordlift_Batch_Action::count( $post_type, $tax_query );
-	}
-
-	/**
-	 * Get the taxonomy query for the specified entity types.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $entity_types The entity types.
-	 *
-	 * @return array The tax query.
-	 */
-	private function get_tax_query( $entity_types ) {
-
-		$entity_type_service = $this->entity_type_service;
-		$entity_types_terms  = array_filter( array_map( function ( $item ) use ( $entity_type_service ) {
-			return $entity_type_service->get_term_by_uri( $item );
-		}, $entity_types ) );
-
-		$entity_types_terms_ids = array_map( function ( $term ) {
-			return $term->term_id;
-		}, $entity_types_terms );
-
-		$tax_query = array(
-			'tax_query' => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'term_id',
-					'terms'    => $entity_types_terms_ids,
-					'operator' => 'NOT IN',
-				),
-			),
-		);
-
-		return $tax_query;
-	}
+    /**
+     * The mapping's options.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var array $options The mapping's options.
+     */
+    private $options;
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The singleton instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Mapping_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a {@link Wordlift_Mapping_Service} instance.
+     *
+     * @since 3.20.0
+     *
+     * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    public function __construct( $entity_type_service ) {
+
+        // Set the entity type service instance.
+        $this->entity_type_service = $entity_type_service;
+
+        // Load the options.
+        $this->options = get_option( 'wl_mappings', array() );
+
+        // Hook to `wl_valid_entity_post_types` and to `wl_default_entity_types_for_post_type`.
+        add_filter( 'wl_valid_entity_post_types', array( $this, 'valid_entity_post_types', ), 9 );
+        add_filter( 'wl_default_entity_types_for_post_type', array(
+            $this,
+            'default_entity_types_for_post_type',
+        ), 9, 2 );
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.20.0
+     *
+     * @return \Wordlift_Mapping_Service The singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Save the options.
+     *
+     * @since 3.20.0
+     */
+    private function save_options() {
+
+        update_option( 'wl_mappings', $this->options, true );
+
+    }
+
+    /**
+     * Set the default entity types for a post type.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type Post type.
+     * @param array  $entity_types An array of entity types slugs.
+     */
+    public function set_entity_types_for_post_type( $post_type, $entity_types ) {
+
+        $this->options[ $post_type ] = $entity_types;
+        $this->save_options();
+
+    }
+
+    /**
+     * Hook to `wl_valid_entity_post_types` to declare schema.org support for the configured post types.
+     *
+     * @since 3.20.0
+     *
+     * @param array $post_types The default post types.
+     *
+     * @return array The supported post types.
+     */
+    public function valid_entity_post_types( $post_types ) {
+
+        return array_merge( $post_types, array_keys( $this->options ) );
+    }
+
+    /**
+     * Hook to `wl_default_entity_types_for_post_type` to declare the entity types for a post type.
+     *
+     * @since 3.20.0
+     *
+     * @param array  $default The default entity types.
+     * @param string $post_type The post type.
+     *
+     * @return array The default entity types.
+     */
+    public function default_entity_types_for_post_type( $default, $post_type ) {
+
+        return isset( $this->options[ $post_type ] ) ? $this->options[ $post_type ] : $default;
+    }
+
+    /**
+     * Update the post type with the entity types, starting at the specified offset.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type The post type.
+     * @param array  $entity_types The entity types.
+     * @param int    $offset The offset (0 by default).
+     *
+     * @return array {
+     * The result array.
+     *
+     * @type int     $current The current offset.
+     * @type int     $next The next offset.
+     * @type int     $count The total element count.
+     * }
+     */
+    public function update( $post_type, $entity_types, $offset = 0 ) {
+
+        $entity_type_service = $this->entity_type_service;
+        $tax_query           = $this->get_tax_query( $entity_types );
+
+        return Wordlift_Batch_Action::process( $post_type, $offset, $tax_query, function ( $post_id ) use ( $entity_type_service, $entity_types ) {
+            foreach ( $entity_types as $entity_type ) {
+                $entity_type_service->set( $post_id, $entity_type, false );
+            }
+        } );
+    }
+
+    /**
+     * Count the number of posts that need to be assigned with the entity types.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type The post type.
+     * @param array  $entity_types An array of entity types.
+     *
+     * @return int The number of posts to be assigned with entity types.
+     */
+    public function count( $post_type, $entity_types ) {
+
+        $tax_query = $this->get_tax_query( $entity_types );
+
+        return Wordlift_Batch_Action::count( $post_type, $tax_query );
+    }
+
+    /**
+     * Get the taxonomy query for the specified entity types.
+     *
+     * @since 3.20.0
+     *
+     * @param array $entity_types The entity types.
+     *
+     * @return array The tax query.
+     */
+    private function get_tax_query( $entity_types ) {
+
+        $entity_type_service = $this->entity_type_service;
+        $entity_types_terms  = array_filter( array_map( function ( $item ) use ( $entity_type_service ) {
+            return $entity_type_service->get_term_by_uri( $item );
+        }, $entity_types ) );
+
+        $entity_types_terms_ids = array_map( function ( $term ) {
+            return $term->term_id;
+        }, $entity_types_terms );
+
+        $tax_query = array(
+            'tax_query' => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'term_id',
+                    'terms'    => $entity_types_terms_ids,
+                    'operator' => 'NOT IN',
+                ),
+            ),
+        );
+
+        return $tax_query;
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -48,20 +48,20 @@ 
 	 *
 	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
 	 */
-	public function __construct( $entity_type_service ) {
+	public function __construct($entity_type_service) {
 
 		// Set the entity type service instance.
 		$this->entity_type_service = $entity_type_service;
 
 		// Load the options.
-		$this->options = get_option( 'wl_mappings', array() );
+		$this->options = get_option('wl_mappings', array());
 
 		// Hook to `wl_valid_entity_post_types` and to `wl_default_entity_types_for_post_type`.
-		add_filter( 'wl_valid_entity_post_types', array( $this, 'valid_entity_post_types', ), 9 );
-		add_filter( 'wl_default_entity_types_for_post_type', array(
+		add_filter('wl_valid_entity_post_types', array($this, 'valid_entity_post_types',), 9);
+		add_filter('wl_default_entity_types_for_post_type', array(
 			$this,
 			'default_entity_types_for_post_type',
-		), 9, 2 );
+		), 9, 2);
 
 		// Set the singleton instance.
 		self::$instance = $this;
@@ -87,7 +87,7 @@ 
 	 */
 	private function save_options() {
 
-		update_option( 'wl_mappings', $this->options, true );
+		update_option('wl_mappings', $this->options, true);
 
 	}
 
@@ -99,9 +99,9 @@ 
 	 * @param string $post_type Post type.
 	 * @param array  $entity_types An array of entity types slugs.
 	 */
-	public function set_entity_types_for_post_type( $post_type, $entity_types ) {
+	public function set_entity_types_for_post_type($post_type, $entity_types) {
 
-		$this->options[ $post_type ] = $entity_types;
+		$this->options[$post_type] = $entity_types;
 		$this->save_options();
 
 	}
@@ -115,9 +115,9 @@ 
 	 *
 	 * @return array The supported post types.
 	 */
-	public function valid_entity_post_types( $post_types ) {
+	public function valid_entity_post_types($post_types) {
 
-		return array_merge( $post_types, array_keys( $this->options ) );
+		return array_merge($post_types, array_keys($this->options));
 	}
 
 	/**
@@ -130,9 +130,9 @@ 
 	 *
 	 * @return array The default entity types.
 	 */
-	public function default_entity_types_for_post_type( $default, $post_type ) {
+	public function default_entity_types_for_post_type($default, $post_type) {
 
-		return isset( $this->options[ $post_type ] ) ? $this->options[ $post_type ] : $default;
+		return isset($this->options[$post_type]) ? $this->options[$post_type] : $default;
 	}
 
 	/**
@@ -152,14 +152,14 @@ 
 	 * @type int     $count The total element count.
 	 * }
 	 */
-	public function update( $post_type, $entity_types, $offset = 0 ) {
+	public function update($post_type, $entity_types, $offset = 0) {
 
 		$entity_type_service = $this->entity_type_service;
-		$tax_query           = $this->get_tax_query( $entity_types );
+		$tax_query           = $this->get_tax_query($entity_types);
 
-		return Wordlift_Batch_Action::process( $post_type, $offset, $tax_query, function ( $post_id ) use ( $entity_type_service, $entity_types ) {
-			foreach ( $entity_types as $entity_type ) {
-				$entity_type_service->set( $post_id, $entity_type, false );
+		return Wordlift_Batch_Action::process($post_type, $offset, $tax_query, function($post_id) use ($entity_type_service, $entity_types) {
+			foreach ($entity_types as $entity_type) {
+				$entity_type_service->set($post_id, $entity_type, false);
 			}
 		} );
 	}
@@ -174,11 +174,11 @@ 
 	 *
 	 * @return int The number of posts to be assigned with entity types.
 	 */
-	public function count( $post_type, $entity_types ) {
+	public function count($post_type, $entity_types) {
 
-		$tax_query = $this->get_tax_query( $entity_types );
+		$tax_query = $this->get_tax_query($entity_types);
 
-		return Wordlift_Batch_Action::count( $post_type, $tax_query );
+		return Wordlift_Batch_Action::count($post_type, $tax_query);
 	}
 
 	/**
@@ -190,16 +190,16 @@ 
 	 *
 	 * @return array The tax query.
 	 */
-	private function get_tax_query( $entity_types ) {
+	private function get_tax_query($entity_types) {
 
 		$entity_type_service = $this->entity_type_service;
-		$entity_types_terms  = array_filter( array_map( function ( $item ) use ( $entity_type_service ) {
-			return $entity_type_service->get_term_by_uri( $item );
-		}, $entity_types ) );
+		$entity_types_terms  = array_filter(array_map(function($item) use ($entity_type_service) {
+			return $entity_type_service->get_term_by_uri($item);
+		}, $entity_types));
 
-		$entity_types_terms_ids = array_map( function ( $term ) {
+		$entity_types_terms_ids = array_map(function($term) {
 			return $term->term_id;
-		}, $entity_types_terms );
+		}, $entity_types_terms);
 
 		$tax_query = array(
 			'tax_query' => array(

src/admin/class-wordlift-entity-types-taxonomy-walker-5-3.php

Indentation +109 added lines, -109 removed lines

@@ -10,7 +10,7 @@ 
  * @subpackage Wordlift/includes
  */
 if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/template.php' );
+    require_once( ABSPATH . 'wp-admin/includes/template.php' );
 }
 
 /**
@@ -23,113 +23,113 @@ 
  */
 class Wordlift_Entity_Types_Taxonomy_Walker extends Walker_Category_Checklist {
 
-	/**
-	 * Entity taxonomy metabox must show exclusive options, no checkboxes.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param       $args     {
-	 *                        An array of arguments.
-	 *
-	 * @type string $taxonomy The taxonomy name.
-	 *              }
-	 *
-	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
-	 */
-	function terms_checklist_args( $args ) {
-
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			return $args;
-		}
-
-		// We override the way WP prints the taxonomy metabox HTML.
-		$args['walker']        = $this;
-		$args['checked_ontop'] = false;
-
-		return $args;
-
-	}
-
-	/**
-	 * Change checkboxes to radios.
-	 *
-	 * $max_depth = -1 means flatly display every element.
-	 * $max_depth = 0 means display all levels.
-	 * $max_depth > 0 specifies the number of display levels.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param array $elements  An array of elements.
-	 * @param int   $max_depth The maximum hierarchical depth.
-	 *
-	 * @param array $args      Additional arguments.
-	 *
-	 * @return string The hierarchical item output.
-	 */
-	public function walk( $elements, $max_depth, ...$args ) {
-
-		// `max_depth` force to -1 to display a flat taxonomy.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/305
-		$output = parent::walk( $elements, - 1, ...$args );
-
-		$output = str_replace(
-			array( "type=\"checkbox\"", "type='checkbox'" ),
-			array( "type=\"radio\"", "type='radio'" ),
-			$output
-		);
-
-		return $output;
-	}
-
-	/**
-	 * Start the element output, output nothing in case of article term.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 * @param int    $id       ID of the current term.
-	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		global $post;
-
-		if ( ! isset( $post ) ) {
-			return;
-		}
-
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
-		     || 'article' !== $category->slug
-		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::start_el( $output, $category, $depth, $args, $id );
-		}
-	}
-
-	/**
-	 * End the element output, output nothing in case of article term.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
-		global $post;
-
-		if ( ! isset( $post ) ) {
-			return;
-		}
-
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
-		     || 'article' !== $category->slug
-		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::end_el( $output, $category, $depth, $args );
-		}
-
-	}
+    /**
+     * Entity taxonomy metabox must show exclusive options, no checkboxes.
+     *
+     * @since 3.1.0
+     *
+     * @param       $args     {
+     *                        An array of arguments.
+     *
+     * @type string $taxonomy The taxonomy name.
+     *              }
+     *
+     * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
+     */
+    function terms_checklist_args( $args ) {
+
+        if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            return $args;
+        }
+
+        // We override the way WP prints the taxonomy metabox HTML.
+        $args['walker']        = $this;
+        $args['checked_ontop'] = false;
+
+        return $args;
+
+    }
+
+    /**
+     * Change checkboxes to radios.
+     *
+     * $max_depth = -1 means flatly display every element.
+     * $max_depth = 0 means display all levels.
+     * $max_depth > 0 specifies the number of display levels.
+     *
+     * @since 3.1.0
+     *
+     * @param array $elements  An array of elements.
+     * @param int   $max_depth The maximum hierarchical depth.
+     *
+     * @param array $args      Additional arguments.
+     *
+     * @return string The hierarchical item output.
+     */
+    public function walk( $elements, $max_depth, ...$args ) {
+
+        // `max_depth` force to -1 to display a flat taxonomy.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/305
+        $output = parent::walk( $elements, - 1, ...$args );
+
+        $output = str_replace(
+            array( "type=\"checkbox\"", "type='checkbox'" ),
+            array( "type=\"radio\"", "type='radio'" ),
+            $output
+        );
+
+        return $output;
+    }
+
+    /**
+     * Start the element output, output nothing in case of article term.
+     *
+     * @since 3.15.0
+     *
+     * @param string $output   Passed by reference. Used to append additional content.
+     * @param object $category The current term object.
+     * @param int    $depth    Depth of the term in reference to parents. Default 0.
+     * @param array  $args     An array of arguments. @see wp_terms_checklist()
+     * @param int    $id       ID of the current term.
+     */
+    public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+        global $post;
+
+        if ( ! isset( $post ) ) {
+            return;
+        }
+
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+             || 'article' !== $category->slug
+             || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            parent::start_el( $output, $category, $depth, $args, $id );
+        }
+    }
+
+    /**
+     * End the element output, output nothing in case of article term.
+     *
+     * @since 3.15.0
+     *
+     * @param string $output   Passed by reference. Used to append additional content.
+     * @param object $category The current term object.
+     * @param int    $depth    Depth of the term in reference to parents. Default 0.
+     * @param array  $args     An array of arguments. @see wp_terms_checklist()
+     */
+    public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+        global $post;
+
+        if ( ! isset( $post ) ) {
+            return;
+        }
+
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+             || 'article' !== $category->slug
+             || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            parent::end_el( $output, $category, $depth, $args );
+        }
+
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -9,8 +9,8 @@ 
  * @package    Wordlift
  * @subpackage Wordlift/includes
  */
-if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/template.php' );
+if ( ! class_exists('Walker_Category_Checklist')) {
+	require_once(ABSPATH.'wp-admin/includes/template.php');
 }
 
 /**
@@ -36,9 +36,9 @@ 
 	 *
 	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
 	 */
-	function terms_checklist_args( $args ) {
+	function terms_checklist_args($args) {
 
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+		if ( ! isset($args['taxonomy']) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
 			return $args;
 		}
 
@@ -66,16 +66,16 @@ 
 	 *
 	 * @return string The hierarchical item output.
 	 */
-	public function walk( $elements, $max_depth, ...$args ) {
+	public function walk($elements, $max_depth, ...$args) {
 
 		// `max_depth` force to -1 to display a flat taxonomy.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/305
-		$output = parent::walk( $elements, - 1, ...$args );
+		$output = parent::walk($elements, - 1, ...$args);
 
 		$output = str_replace(
-			array( "type=\"checkbox\"", "type='checkbox'" ),
-			array( "type=\"radio\"", "type='radio'" ),
+			array("type=\"checkbox\"", "type='checkbox'"),
+			array("type=\"radio\"", "type='radio'"),
 			$output
 		);
 
@@ -93,17 +93,17 @@ 
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 * @param int    $id       ID of the current term.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
 		global $post;
 
-		if ( ! isset( $post ) ) {
+		if ( ! isset($post)) {
 			return;
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+		if (Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
 		     || 'article' !== $category->slug
-		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::start_el( $output, $category, $depth, $args, $id );
+		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
+			parent::start_el($output, $category, $depth, $args, $id);
 		}
 	}
 
@@ -117,17 +117,17 @@ 
 	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+	public function end_el(&$output, $category, $depth = 0, $args = array()) {
 		global $post;
 
-		if ( ! isset( $post ) ) {
+		if ( ! isset($post)) {
 			return;
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+		if (Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
 		     || 'article' !== $category->slug
-		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::end_el( $output, $category, $depth, $args );
+		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
+			parent::end_el($output, $category, $depth, $args);
 		}
 
 	}