insideout10 / wordlift-plugin

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/public/class-wordlift-public.php

Indentation +218 added lines, -218 removed lines

@@ -22,106 +22,106 @@ 
  */
 class Wordlift_Public {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @param string $plugin_name The name of the plugin.
-	 * @param string $version The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct( $plugin_name, $version ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since 3.19.3 Register the `wordlift-ui` css.
-	 * @since 3.19.2 The call to this function is commented out in `class-wordlift.php` because `wordlift-public.css`
-	 *               is empty.
-	 * @since 1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		/**
-		 * Add the `wordlift-font-awesome` unless some 3rd party sets the flag to false.
-		 *
-		 * @param bool $include Whether to include or not font-awesome (default true).
-		 *
-		 * @since 3.19.3
-		 */
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
-			: array();
-		wp_register_style( 'wordlift-font-awesome', plugin_dir_url( __DIR__ ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( __DIR__ ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
-
-		// You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/821
-		//
-		// wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		$settings = self::get_settings();
-
-		// Note that we switched the js to be loaded in footer, since it is loading
-		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
-
-		/*
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @param string $plugin_name The name of the plugin.
+     * @param string $version The version of this plugin.
+     *
+     * @since    1.0.0
+     */
+    public function __construct( $plugin_name, $version ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since 3.19.3 Register the `wordlift-ui` css.
+     * @since 3.19.2 The call to this function is commented out in `class-wordlift.php` because `wordlift-public.css`
+     *               is empty.
+     * @since 1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        /**
+         * Add the `wordlift-font-awesome` unless some 3rd party sets the flag to false.
+         *
+         * @param bool $include Whether to include or not font-awesome (default true).
+         *
+         * @since 3.19.3
+         */
+        $deps = apply_filters( 'wl_include_font_awesome', true )
+            ? array( 'wordlift-font-awesome' )
+            : array();
+        wp_register_style( 'wordlift-font-awesome', plugin_dir_url( __DIR__ ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
+        wp_register_style( 'wordlift-ui', plugin_dir_url( __DIR__ ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
+
+        // You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/821
+        //
+        // wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        $settings = self::get_settings();
+
+        // Note that we switched the js to be loaded in footer, since it is loading
+        // the json-ld representation.
+        wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
+        wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+
+        /*
 		 * Add WordLift's version.
 		 * Can be disabled via filter 'wl_disable_version_js' since 3.21.1
 		 *
@@ -130,133 +130,133 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/843.
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/926.
 		 */
-		$show_version_default = false;
-		$show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
-
-		if ( $show_version ) {
-			wp_localize_script(
-				$this->plugin_name,
-				'wordlift',
-				array(
-					'version' => $this->version,
-				)
-			);
-		}
-
-		/*
+        $show_version_default = false;
+        $show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
+
+        if ( $show_version ) {
+            wp_localize_script(
+                $this->plugin_name,
+                'wordlift',
+                array(
+                    'version' => $this->version,
+                )
+            );
+        }
+
+        /*
 		 * Register wordlift-cloud script which is shared by
 		 * Navigator, Products Navigator, Faceted Search, Context Cards
 		 *
 		 * @since 3.22.0
 		 *
 		 */
-		$deps = $this->wp_version_compare( '>=', '5.0' ) ? array( 'wp-hooks' ) : array();
+        $deps = $this->wp_version_compare( '>=', '5.0' ) ? array( 'wp-hooks' ) : array();
 
-		/*
+        /*
 		 * Added defer to wordlift-cloud
 		 *
 		 * @since 3.27.4
 		 */
-		add_filter(
-			'script_loader_tag',
-			function ( $tag, $handle ) {
-				if ( 'wordlift-cloud' !== $handle ) {
-					return $tag;
-				}
-
-				return str_replace( ' src', ' defer="defer" src', $tag );
-			},
-			10,
-			2
-		);
-		wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), $deps, Wordlift::get_instance()->get_version(), true );
-
-	}
-
-	/**
-	 * Get the settings array.
-	 *
-	 * @return array An array with the settings.
-	 * @since 3.19.1
-	 */
-	public static function get_settings() {
-
-		// Prepare a settings array for client-side functions.
-		$settings = array(
-			'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
-			'apiUrl'     => get_home_url( null, 'wl-api/' ),
-			'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' ),
-		);
-
-		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
-			$settings['postId'] = get_the_ID();
-		}
-
-		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
-			$settings['isHome'] = true;
-		}
-
-		// As of 2020-02-15, we publish the JSON-LD in the head, see Jsonld_Adaper.
-		$settings['jsonld_enabled'] = false;
-
-		// By default only enable JSON-LD on supported entity pages (includes
-		// `page`, `post` and `entity` by default) and on the home page.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/733
-		// $jsonld_enabled = is_home() || is_front_page() || Wordlift_Entity_Type_Service::is_valid_entity_post_type( get_post_type() );
-
-		// Add the JSON-LD enabled flag, when set to false, the JSON-LD won't
-		// be loaded.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/642.
-		// $settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', $jsonld_enabled );
-
-		return $settings;
-	}
-
-	/**
-	 * Get the public JavaScript URL.
-	 *
-	 * Using this function is encouraged, since the public JavaScript is also used by the {@link Wordlift_WpRocket_Adapter}
-	 * in order to avoid breaking optimizations.
-	 *
-	 * @return string The URL to the public JavaScript.
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/842.
-	 *
-	 * @since 3.19.4
-	 */
-	public static function get_public_js_url() {
-
-		return plugin_dir_url( __DIR__ ) . 'js/dist/bundle.js';
-	}
-
-	/**
-	 * Get the Cloud JavaScript URL.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/971
-	 * @since 3.23.0
-	 * @return string The URL to the Cloud JavaScript.
-	 */
-	public static function get_cloud_js_url() {
-
-		return plugin_dir_url( __DIR__ ) . 'js/dist/wordlift-cloud.js';
-	}
-
-	/**
-	 * Helper function to check WP version
-	 *
-	 * @since 3.26.0
-	 *
-	 * @param string $operator
-	 * @param string $version
-	 *
-	 * @return mixed
-	 */
-	private function wp_version_compare( $operator = '>', $version = '5.0' ) {
-		global $wp_version;
-
-		return version_compare( $wp_version, $version, $operator );
-	}
+        add_filter(
+            'script_loader_tag',
+            function ( $tag, $handle ) {
+                if ( 'wordlift-cloud' !== $handle ) {
+                    return $tag;
+                }
+
+                return str_replace( ' src', ' defer="defer" src', $tag );
+            },
+            10,
+            2
+        );
+        wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), $deps, Wordlift::get_instance()->get_version(), true );
+
+    }
+
+    /**
+     * Get the settings array.
+     *
+     * @return array An array with the settings.
+     * @since 3.19.1
+     */
+    public static function get_settings() {
+
+        // Prepare a settings array for client-side functions.
+        $settings = array(
+            'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
+            'apiUrl'     => get_home_url( null, 'wl-api/' ),
+            'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' ),
+        );
+
+        // If we're in a single page, then print out the post id.
+        if ( is_singular() ) {
+            $settings['postId'] = get_the_ID();
+        }
+
+        // Add flag that we are on home/blog page.
+        if ( is_home() || is_front_page() ) {
+            $settings['isHome'] = true;
+        }
+
+        // As of 2020-02-15, we publish the JSON-LD in the head, see Jsonld_Adaper.
+        $settings['jsonld_enabled'] = false;
+
+        // By default only enable JSON-LD on supported entity pages (includes
+        // `page`, `post` and `entity` by default) and on the home page.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/733
+        // $jsonld_enabled = is_home() || is_front_page() || Wordlift_Entity_Type_Service::is_valid_entity_post_type( get_post_type() );
+
+        // Add the JSON-LD enabled flag, when set to false, the JSON-LD won't
+        // be loaded.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/642.
+        // $settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', $jsonld_enabled );
+
+        return $settings;
+    }
+
+    /**
+     * Get the public JavaScript URL.
+     *
+     * Using this function is encouraged, since the public JavaScript is also used by the {@link Wordlift_WpRocket_Adapter}
+     * in order to avoid breaking optimizations.
+     *
+     * @return string The URL to the public JavaScript.
+     * @see https://github.com/insideout10/wordlift-plugin/issues/842.
+     *
+     * @since 3.19.4
+     */
+    public static function get_public_js_url() {
+
+        return plugin_dir_url( __DIR__ ) . 'js/dist/bundle.js';
+    }
+
+    /**
+     * Get the Cloud JavaScript URL.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/971
+     * @since 3.23.0
+     * @return string The URL to the Cloud JavaScript.
+     */
+    public static function get_cloud_js_url() {
+
+        return plugin_dir_url( __DIR__ ) . 'js/dist/wordlift-cloud.js';
+    }
+
+    /**
+     * Helper function to check WP version
+     *
+     * @since 3.26.0
+     *
+     * @param string $operator
+     * @param string $version
+     *
+     * @return mixed
+     */
+    private function wp_version_compare( $operator = '>', $version = '5.0' ) {
+        global $wp_version;
+
+        return version_compare( $wp_version, $version, $operator );
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -48,7 +48,7 @@ 
 	 *
 	 * @since    1.0.0
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -82,11 +82,11 @@ 
 		 *
 		 * @since 3.19.3
 		 */
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
+		$deps = apply_filters('wl_include_font_awesome', true)
+			? array('wordlift-font-awesome')
 			: array();
-		wp_register_style( 'wordlift-font-awesome', plugin_dir_url( __DIR__ ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( __DIR__ ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
+		wp_register_style('wordlift-font-awesome', plugin_dir_url(__DIR__).'css/wordlift-font-awesome'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', array(), $this->version, 'all');
+		wp_register_style('wordlift-ui', plugin_dir_url(__DIR__).'css/wordlift-ui'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', $deps, $this->version, 'all');
 
 		// You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
 		//
@@ -118,8 +118,8 @@ 
 
 		// Note that we switched the js to be loaded in footer, since it is loading
 		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+		wp_enqueue_script($this->plugin_name, self::get_public_js_url(), array(), $this->version, true);
+		wp_localize_script($this->plugin_name, 'wlSettings', $settings);
 
 		/*
 		 * Add WordLift's version.
@@ -131,9 +131,9 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/926.
 		 */
 		$show_version_default = false;
-		$show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
+		$show_version         = apply_filters('wl_disable_version_js', $show_version_default);
 
-		if ( $show_version ) {
+		if ($show_version) {
 			wp_localize_script(
 				$this->plugin_name,
 				'wordlift',
@@ -150,7 +150,7 @@ 
 		 * @since 3.22.0
 		 *
 		 */
-		$deps = $this->wp_version_compare( '>=', '5.0' ) ? array( 'wp-hooks' ) : array();
+		$deps = $this->wp_version_compare('>=', '5.0') ? array('wp-hooks') : array();
 
 		/*
 		 * Added defer to wordlift-cloud
@@ -159,17 +159,17 @@ 
 		 */
 		add_filter(
 			'script_loader_tag',
-			function ( $tag, $handle ) {
-				if ( 'wordlift-cloud' !== $handle ) {
+			function($tag, $handle) {
+				if ('wordlift-cloud' !== $handle) {
 					return $tag;
 				}
 
-				return str_replace( ' src', ' defer="defer" src', $tag );
+				return str_replace(' src', ' defer="defer" src', $tag);
 			},
 			10,
 			2
 		);
-		wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), $deps, Wordlift::get_instance()->get_version(), true );
+		wp_register_script('wordlift-cloud', self::get_cloud_js_url(), $deps, Wordlift::get_instance()->get_version(), true);
 
 	}
 
@@ -183,18 +183,18 @@ 
 
 		// Prepare a settings array for client-side functions.
 		$settings = array(
-			'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
-			'apiUrl'     => get_home_url( null, 'wl-api/' ),
-			'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' ),
+			'ajaxUrl'    => admin_url('admin-ajax.php'),
+			'apiUrl'     => get_home_url(null, 'wl-api/'),
+			'jsonld_url' => rest_url('/wordlift/v1/jsonld/'),
 		);
 
 		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
+		if (is_singular()) {
 			$settings['postId'] = get_the_ID();
 		}
 
 		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
+		if (is_home() || is_front_page()) {
 			$settings['isHome'] = true;
 		}
 
@@ -229,7 +229,7 @@ 
 	 */
 	public static function get_public_js_url() {
 
-		return plugin_dir_url( __DIR__ ) . 'js/dist/bundle.js';
+		return plugin_dir_url(__DIR__).'js/dist/bundle.js';
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 */
 	public static function get_cloud_js_url() {
 
-		return plugin_dir_url( __DIR__ ) . 'js/dist/wordlift-cloud.js';
+		return plugin_dir_url(__DIR__).'js/dist/wordlift-cloud.js';
 	}
 
 	/**
@@ -254,9 +254,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	private function wp_version_compare( $operator = '>', $version = '5.0' ) {
+	private function wp_version_compare($operator = '>', $version = '5.0') {
 		global $wp_version;
 
-		return version_compare( $wp_version, $version, $operator );
+		return version_compare($wp_version, $version, $operator);
 	}
 }

src/public/class-wordlift-navigator-shortcode.php

Indentation +207 added lines, -207 removed lines

@@ -17,134 +17,134 @@ 
  */
 class Wordlift_Navigator_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_navigator';
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_navigator';
 
-	public function __construct() {
-		parent::__construct();
-		$this->register_block_type();
-	}
+    public function __construct() {
+        parent::__construct();
+        $this->register_block_type();
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
+        return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
+            : $this->web_shortcode( $atts );
+    }
 
-	private function register_block_type() {
+    private function register_block_type() {
 
-		$scope = $this;
+        $scope = $this;
 
-		add_action(
-			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
-					// Gutenberg is not active.
-					return;
-				}
+        add_action(
+            'init',
+            function () use ( $scope ) {
+                if ( ! function_exists( 'register_block_type' ) ) {
+                    // Gutenberg is not active.
+                    return;
+                }
 
-				register_block_type(
-					'wordlift/navigator',
-					array(
-						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
-							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-							}
+                register_block_type(
+                    'wordlift/navigator',
+                    array(
+                        'editor_script'   => 'wl-block-editor',
+                        'render_callback' => function ( $attributes ) use ( $scope ) {
+                            $attr_code = '';
+                            foreach ( $attributes as $key => $value ) {
+                                $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                            }
 
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-						},
-						'attributes'      => $scope->get_navigator_block_attributes(),
-					)
-				);
-			}
-		);
-	}
+                            return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                        },
+                        'attributes'      => $scope->get_navigator_block_attributes(),
+                    )
+                );
+            }
+        );
+    }
 
-	/**
-	 * Shared function used by web_shortcode and amp_shortcode
-	 * Bootstrap logic for attributes extraction and boolean filtering
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return array $shortcode_atts
-	 * @since      3.20.0
-	 */
-	private function make_shortcode_atts( $atts ) {
+    /**
+     * Shared function used by web_shortcode and amp_shortcode
+     * Bootstrap logic for attributes extraction and boolean filtering
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return array $shortcode_atts
+     * @since      3.20.0
+     */
+    private function make_shortcode_atts( $atts ) {
 
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts(
-			array(
-				'title'       => __( 'Related articles', 'wordlift' ),
-				'limit'       => 4,
-				'offset'      => 0,
-				'template_id' => '',
-				'post_id'     => '',
-				'uniqid'      => uniqid( 'wl-navigator-widget-' ),
-				'order_by'    => 'ID DESC',
-				'post_types'  => '',
-			),
-			$atts
-		);
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts(
+            array(
+                'title'       => __( 'Related articles', 'wordlift' ),
+                'limit'       => 4,
+                'offset'      => 0,
+                'template_id' => '',
+                'post_id'     => '',
+                'uniqid'      => uniqid( 'wl-navigator-widget-' ),
+                'order_by'    => 'ID DESC',
+                'post_types'  => '',
+            ),
+            $atts
+        );
 
-		return $shortcode_atts;
-	}
+        return $shortcode_atts;
+    }
 
-	/**
-	 * Function in charge of displaying the [wl-navigator] in web mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for web
-	 * @since 3.20.0
-	 */
-	private function web_shortcode( $atts ) {
+    /**
+     * Function in charge of displaying the [wl-navigator] in web mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for web
+     * @since 3.20.0
+     */
+    private function web_shortcode( $atts ) {
 
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
 
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
-			return;
-		}
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+            return;
+        }
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+        $title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
+        $template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
+        $limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
+        $offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
+        $sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
+        $navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
 
-		$rest_url = $post ? admin_url(
-			'admin-ajax.php?' . build_query(
-				array(
-					'action'     => 'wl_navigator',
-					'uniqid'     => $navigator_id,
-					'post_id'    => $post->ID,
-					'limit'      => $limit,
-					'offset'     => $offset,
-					'sort'       => $sort,
-					'post_types' => $shortcode_atts['post_types'],
-					'_wpnonce'   => wp_create_nonce( 'wl_navigator' ),
-				)
-			)
-		) : false;
+        $rest_url = $post ? admin_url(
+            'admin-ajax.php?' . build_query(
+                array(
+                    'action'     => 'wl_navigator',
+                    'uniqid'     => $navigator_id,
+                    'post_id'    => $post->ID,
+                    'limit'      => $limit,
+                    'offset'     => $offset,
+                    'sort'       => $sort,
+                    'post_types' => $shortcode_atts['post_types'],
+                    '_wpnonce'   => wp_create_nonce( 'wl_navigator' ),
+                )
+            )
+        ) : false;
 
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		$template_url = get_rest_url( null, '/wordlift/v1/navigator/template' );
+        wp_enqueue_script( 'wordlift-cloud' );
+        $template_url = get_rest_url( null, '/wordlift/v1/navigator/template' );
 
-		return <<<HTML
+        return <<<HTML
 			<!-- Navigator {$navigator_id} -->
 			<div id="{$navigator_id}" 
 				 class="wl-navigator" 
@@ -155,63 +155,63 @@ 
 				 data-limit="{$limit}"></div>
 			<!-- /Navigator {$navigator_id} -->
 HTML;
-	}
+    }
 
-	/**
-	 * Function in charge of diplaying the [wl-faceted-search] in amp mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for amp
-	 * @since 3.20.0
-	 */
-	private function amp_shortcode( $atts ) {
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+    /**
+     * Function in charge of diplaying the [wl-faceted-search] in amp mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for amp
+     * @since 3.20.0
+     */
+    private function amp_shortcode( $atts ) {
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
 
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
-			return;
-		}
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+            return;
+        }
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
+        $title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
+        $template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
+        $limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
+        $offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
+        $sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
+        $navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/navigator' . $delimiter . build_query(
-				array(
-					'uniqid'   => $navigator_id,
-					'post_id'  => $post->ID,
-					'limit'    => $limit,
-					'offset'   => $offset,
-					'sort'     => $sort,
-					'_wpnonce' => wp_create_nonce( 'wl_navigator' ),
-				)
-			)
-		) : false;
+        $permalink_structure = get_option( 'permalink_structure' );
+        $delimiter           = empty( $permalink_structure ) ? '&' : '?';
+        $rest_url            = $post ? rest_url(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE . '/navigator' . $delimiter . build_query(
+                array(
+                    'uniqid'   => $navigator_id,
+                    'post_id'  => $post->ID,
+                    'limit'    => $limit,
+                    'offset'   => $offset,
+                    'sort'     => $sort,
+                    '_wpnonce' => wp_create_nonce( 'wl_navigator' ),
+                )
+            )
+        ) : false;
 
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
 
-		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
-		// This is a hackish way, but this works for http and https URLs
-		$rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
+        // Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
+        // This is a hackish way, but this works for http and https URLs
+        $rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
 
-		if ( empty( $template_id ) ) {
-			$template_id = 'template-' . $navigator_id;
-			wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
-		}
+        if ( empty( $template_id ) ) {
+            $template_id = 'template-' . $navigator_id;
+            wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
+        }
 
-		return <<<HTML
+        return <<<HTML
 		<div id="{$navigator_id}" class="wl-amp-navigator" style="width: 100%">
 			<h3 class="wl-headline">{$title}</h3>
 			<amp-list 
@@ -244,54 +244,54 @@ 
 			</div>
 		</template>
 HTML;
-	}
+    }
 
-	/**
-	 * @return array
-	 */
-	public function get_navigator_block_attributes() {
-		return array(
-			'title'       => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
-			),
-			'limit'       => array(
-				'type'    => 'number',
-				'default' => 4,
-			),
-			'template_id' => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'post_id'     => array(
-				'type'    => 'number',
-				'default' => '',
-			),
-			'offset'      => array(
-				'type'    => 'number',
-				'default' => 0,
-			),
-			'uniqid'      => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'order_by'    => array(
-				'type'    => 'string',
-				'default' => 'ID DESC',
-			),
-			'preview'     => array(
-				'type'    => 'boolean',
-				'default' => false,
-			),
-			'preview_src' => array(
-				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/navigator.png',
-			),
-			'post_types'  => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-		);
-	}
+    /**
+     * @return array
+     */
+    public function get_navigator_block_attributes() {
+        return array(
+            'title'       => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' ),
+            ),
+            'limit'       => array(
+                'type'    => 'number',
+                'default' => 4,
+            ),
+            'template_id' => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'post_id'     => array(
+                'type'    => 'number',
+                'default' => '',
+            ),
+            'offset'      => array(
+                'type'    => 'number',
+                'default' => 0,
+            ),
+            'uniqid'      => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'order_by'    => array(
+                'type'    => 'string',
+                'default' => 'ID DESC',
+            ),
+            'preview'     => array(
+                'type'    => 'boolean',
+                'default' => false,
+            ),
+            'preview_src' => array(
+                'type'    => 'string',
+                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/navigator.png',
+            ),
+            'post_types'  => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+        );
+    }
 
 }

Spacing +48 added lines, -48 removed lines

@@ -30,9 +30,9 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
+	public function render($atts) {
+		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode($atts)
+			: $this->web_shortcode($atts);
 	}
 
 	private function register_block_type() {
@@ -41,8 +41,8 @@ 
 
 		add_action(
 			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
+			function() use ($scope) {
+				if ( ! function_exists('register_block_type')) {
 					// Gutenberg is not active.
 					return;
 				}
@@ -51,13 +51,13 @@ 
 					'wordlift/navigator',
 					array(
 						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
+						'render_callback' => function($attributes) use ($scope) {
 							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+							foreach ($attributes as $key => $value) {
+								$attr_code .= $key.'="'.htmlentities($value).'" ';
 							}
 
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+							return '['.$scope::SHORTCODE.' '.$attr_code.']';
 						},
 						'attributes'      => $scope->get_navigator_block_attributes(),
 					)
@@ -75,17 +75,17 @@ 
 	 * @return array $shortcode_atts
 	 * @since      3.20.0
 	 */
-	private function make_shortcode_atts( $atts ) {
+	private function make_shortcode_atts($atts) {
 
 		// Extract attributes and set default values.
 		$shortcode_atts = shortcode_atts(
 			array(
-				'title'       => __( 'Related articles', 'wordlift' ),
+				'title'       => __('Related articles', 'wordlift'),
 				'limit'       => 4,
 				'offset'      => 0,
 				'template_id' => '',
 				'post_id'     => '',
-				'uniqid'      => uniqid( 'wl-navigator-widget-' ),
+				'uniqid'      => uniqid('wl-navigator-widget-'),
 				'order_by'    => 'ID DESC',
 				'post_types'  => '',
 			),
@@ -103,26 +103,26 @@ 
 	 * @return string Shortcode HTML for web
 	 * @since 3.20.0
 	 */
-	private function web_shortcode( $atts ) {
+	private function web_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
+		$title        = esc_attr(sanitize_text_field($shortcode_atts['title']));
+		$template_id  = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
+		$limit        = esc_attr(sanitize_text_field($shortcode_atts['limit']));
+		$offset       = esc_attr(sanitize_text_field($shortcode_atts['offset']));
+		$sort         = esc_attr(sanitize_sql_orderby(sanitize_text_field($shortcode_atts['order_by'])));
+		$navigator_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-navigator-widget-');
 
 		$rest_url = $post ? admin_url(
-			'admin-ajax.php?' . build_query(
+			'admin-ajax.php?'.build_query(
 				array(
 					'action'     => 'wl_navigator',
 					'uniqid'     => $navigator_id,
@@ -131,18 +131,18 @@ 
 					'offset'     => $offset,
 					'sort'       => $sort,
 					'post_types' => $shortcode_atts['post_types'],
-					'_wpnonce'   => wp_create_nonce( 'wl_navigator' ),
+					'_wpnonce'   => wp_create_nonce('wl_navigator'),
 				)
 			)
 		) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		$template_url = get_rest_url( null, '/wordlift/v1/navigator/template' );
+		wp_enqueue_script('wordlift-cloud');
+		$template_url = get_rest_url(null, '/wordlift/v1/navigator/template');
 
 		return <<<HTML
 			<!-- Navigator {$navigator_id} -->
@@ -165,50 +165,50 @@ 
 	 * @return string Shortcode HTML for amp
 	 * @since 3.20.0
 	 */
-	private function amp_shortcode( $atts ) {
+	private function amp_shortcode($atts) {
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( $shortcode_atts['post_id'] ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-navigator-widget-' );
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
+		$title        = esc_attr(sanitize_text_field($shortcode_atts['title']));
+		$template_id  = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
+		$limit        = esc_attr(sanitize_text_field($shortcode_atts['limit']));
+		$offset       = esc_attr(sanitize_text_field($shortcode_atts['offset']));
+		$sort         = esc_attr(sanitize_sql_orderby(sanitize_text_field($shortcode_atts['order_by'])));
+		$navigator_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-navigator-widget-');
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
+		$permalink_structure = get_option('permalink_structure');
+		$delimiter           = empty($permalink_structure) ? '&' : '?';
 		$rest_url            = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/navigator' . $delimiter . build_query(
+			WL_REST_ROUTE_DEFAULT_NAMESPACE.'/navigator'.$delimiter.build_query(
 				array(
 					'uniqid'   => $navigator_id,
 					'post_id'  => $post->ID,
 					'limit'    => $limit,
 					'offset'   => $offset,
 					'sort'     => $sort,
-					'_wpnonce' => wp_create_nonce( 'wl_navigator' ),
+					'_wpnonce' => wp_create_nonce('wl_navigator'),
 				)
 			)
 		) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
 		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
 		// This is a hackish way, but this works for http and https URLs
-		$rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
+		$rest_url = str_replace(array('http:', 'https:'), '', $rest_url);
 
-		if ( empty( $template_id ) ) {
-			$template_id = 'template-' . $navigator_id;
-			wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
+		if (empty($template_id)) {
+			$template_id = 'template-'.$navigator_id;
+			wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(__DIR__).'/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION);
 		}
 
 		return <<<HTML
@@ -253,7 +253,7 @@ 
 		return array(
 			'title'       => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
+				'default' => __('Related articles', 'wordlift'),
 			),
 			'limit'       => array(
 				'type'    => 'number',
@@ -285,7 +285,7 @@ 
 			),
 			'preview_src' => array(
 				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/navigator.png',
+				'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/navigator.png',
 			),
 			'post_types'  => array(
 				'type'    => 'string',

src/public/class-wordlift-related-entities-cloud-shortcode.php

Indentation +156 added lines, -156 removed lines

@@ -16,168 +16,168 @@
  */
 class Wordlift_Related_Entities_Cloud_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_cloud';
-
-	/**
-	 * The {@link Wordlift_Relation_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 */
-	private $relation_service;
-	/**
-	 * @var Wordlift_Entity_Service
-	 */
-	private $entity_service;
-
-	/**
-	 * Create a {@link Wordlift_Related_Entities_Cloud_Shortcode} instance.
-	 *
-	 * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 * @param \Wordlift_Entity_Service   $entity_service
-	 *
-	 * @since 3.15.0
-	 */
-	public function __construct( $relation_service, $entity_service ) {
-		parent::__construct();
-
-		$this->relation_service = $relation_service;
-
-		$this->entity_service = $entity_service;
-
-		$this->register_block_type();
-
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
-
-		$tags = $this->get_related_entities_tags();
-
-		// Bail out if there are no associated entities.
-		if ( empty( $tags ) ) {
-			return '';
-		}
-
-		/*
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_cloud';
+
+    /**
+     * The {@link Wordlift_Relation_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     */
+    private $relation_service;
+    /**
+     * @var Wordlift_Entity_Service
+     */
+    private $entity_service;
+
+    /**
+     * Create a {@link Wordlift_Related_Entities_Cloud_Shortcode} instance.
+     *
+     * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     * @param \Wordlift_Entity_Service   $entity_service
+     *
+     * @since 3.15.0
+     */
+    public function __construct( $relation_service, $entity_service ) {
+        parent::__construct();
+
+        $this->relation_service = $relation_service;
+
+        $this->entity_service = $entity_service;
+
+        $this->register_block_type();
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
+
+        $tags = $this->get_related_entities_tags();
+
+        // Bail out if there are no associated entities.
+        if ( empty( $tags ) ) {
+            return '';
+        }
+
+        /*
 		 * Since the output is use in the widget as well, we need to have the
 		 * same class as the core tagcloud widget, to easily inherit its styling.
 		 */
 
-		return '<div class="tagcloud wl-related-entities-cloud">' .
-			   wp_generate_tag_cloud( $tags, $atts ) .
-			   '</div>';
-	}
-
-	private function register_block_type() {
-
-		$scope = $this;
-
-		add_action(
-			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
-					// Gutenberg is not active.
-					return;
-				}
-
-				register_block_type(
-					'wordlift/cloud',
-					array(
-						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
-							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-							}
-
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-						},
-						'attributes'      => array(
-							'preview'     => array(
-								'type'    => 'boolean',
-								'default' => false,
-							),
-							'preview_src' => array(
-								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/cloud.png',
-							),
-						),
-					)
-				);
-			}
-		);
-	}
-
-	/**
-	 * Find the related entities to the currently displayed post and
-	 * calculate the "tags" for them as wp_generate_tag_cloud expects to get.
-	 *
-	 * @return array    Array of tags. Empty array in case we re not in a context
-	 *                  of a post, or it has no related entities.
-	 * @since 3.11.0
-	 */
-	public function get_related_entities_tags() {
-
-		// Define the supported types list.
-		$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
-
-		// Show nothing if not on a post or entity page.
-		if ( ! is_singular( $supported_types ) ) {
-			return array();
-		}
-
-		// Get the IDs of entities related to current post.
-		$related_entities = wl_core_get_related_entity_ids( get_the_ID(), array( 'status' => 'publish' ) );
-
-		// Bail out if there are no associated entities.
-		if ( empty( $related_entities ) ) {
-			return array();
-		}
-
-		/*
+        return '<div class="tagcloud wl-related-entities-cloud">' .
+                wp_generate_tag_cloud( $tags, $atts ) .
+                '</div>';
+    }
+
+    private function register_block_type() {
+
+        $scope = $this;
+
+        add_action(
+            'init',
+            function () use ( $scope ) {
+                if ( ! function_exists( 'register_block_type' ) ) {
+                    // Gutenberg is not active.
+                    return;
+                }
+
+                register_block_type(
+                    'wordlift/cloud',
+                    array(
+                        'editor_script'   => 'wl-block-editor',
+                        'render_callback' => function ( $attributes ) use ( $scope ) {
+                            $attr_code = '';
+                            foreach ( $attributes as $key => $value ) {
+                                $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                            }
+
+                            return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                        },
+                        'attributes'      => array(
+                            'preview'     => array(
+                                'type'    => 'boolean',
+                                'default' => false,
+                            ),
+                            'preview_src' => array(
+                                'type'    => 'string',
+                                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/cloud.png',
+                            ),
+                        ),
+                    )
+                );
+            }
+        );
+    }
+
+    /**
+     * Find the related entities to the currently displayed post and
+     * calculate the "tags" for them as wp_generate_tag_cloud expects to get.
+     *
+     * @return array    Array of tags. Empty array in case we re not in a context
+     *                  of a post, or it has no related entities.
+     * @since 3.11.0
+     */
+    public function get_related_entities_tags() {
+
+        // Define the supported types list.
+        $supported_types = Wordlift_Entity_Service::valid_entity_post_types();
+
+        // Show nothing if not on a post or entity page.
+        if ( ! is_singular( $supported_types ) ) {
+            return array();
+        }
+
+        // Get the IDs of entities related to current post.
+        $related_entities = wl_core_get_related_entity_ids( get_the_ID(), array( 'status' => 'publish' ) );
+
+        // Bail out if there are no associated entities.
+        if ( empty( $related_entities ) ) {
+            return array();
+        }
+
+        /*
 		 * Create an array of "tags" to feed to wp_generate_tag_cloud.
 		 * Use the number of posts and entities connected to the entity as a weight.
 		 */
-		$tags = array();
-
-		foreach ( array_unique( $related_entities ) as $entity_id ) {
-
-			$connected_entities = count( wl_core_get_related_entity_ids( $entity_id, array( 'status' => 'publish' ) ) );
-			$connected_posts    = count( $this->relation_service->get_article_subjects( $entity_id, '*', null, 'publish' ) );
-			/**
-			 * @since 3.31.5
-			 * if synonym exists, use it instead of entity name.
-			 */
-			$synonyms    = $this->get_synonyms( $entity_id );
-			$entity_name = count( $synonyms ) > 0 ? $synonyms[0] : get_the_title( $entity_id );
-
-			$tags[] = (object) array(
-				'id'    => $entity_id,
-				// Used to give a unique class on the tag.
-				'name'  => $entity_name,
-				// The text of the tag.
-				'slug'  => get_the_title( $entity_id ),
-				// Required but not seem to be relevant
-				'link'  => get_permalink( $entity_id ),
-				// the url the tag links to.
-				'count' => $connected_entities + $connected_posts,
-				// The weight.
-			);
-
-		}
-
-		return $tags;
-	}
-
-	private function get_synonyms( $entity_id ) {
-		return $this->entity_service->get_alternative_labels( $entity_id );
-	}
+        $tags = array();
+
+        foreach ( array_unique( $related_entities ) as $entity_id ) {
+
+            $connected_entities = count( wl_core_get_related_entity_ids( $entity_id, array( 'status' => 'publish' ) ) );
+            $connected_posts    = count( $this->relation_service->get_article_subjects( $entity_id, '*', null, 'publish' ) );
+            /**
+             * @since 3.31.5
+             * if synonym exists, use it instead of entity name.
+             */
+            $synonyms    = $this->get_synonyms( $entity_id );
+            $entity_name = count( $synonyms ) > 0 ? $synonyms[0] : get_the_title( $entity_id );
+
+            $tags[] = (object) array(
+                'id'    => $entity_id,
+                // Used to give a unique class on the tag.
+                'name'  => $entity_name,
+                // The text of the tag.
+                'slug'  => get_the_title( $entity_id ),
+                // Required but not seem to be relevant
+                'link'  => get_permalink( $entity_id ),
+                // the url the tag links to.
+                'count' => $connected_entities + $connected_posts,
+                // The weight.
+            );
+
+        }
+
+        return $tags;
+    }
+
+    private function get_synonyms( $entity_id ) {
+        return $this->entity_service->get_alternative_labels( $entity_id );
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -42,7 +42,7 @@ 
 	 *
 	 * @since 3.15.0
 	 */
-	public function __construct( $relation_service, $entity_service ) {
+	public function __construct($relation_service, $entity_service) {
 		parent::__construct();
 
 		$this->relation_service = $relation_service;
@@ -56,12 +56,12 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		$tags = $this->get_related_entities_tags();
 
 		// Bail out if there are no associated entities.
-		if ( empty( $tags ) ) {
+		if (empty($tags)) {
 			return '';
 		}
 
@@ -70,8 +70,8 @@ 
 		 * same class as the core tagcloud widget, to easily inherit its styling.
 		 */
 
-		return '<div class="tagcloud wl-related-entities-cloud">' .
-			   wp_generate_tag_cloud( $tags, $atts ) .
+		return '<div class="tagcloud wl-related-entities-cloud">'.
+			   wp_generate_tag_cloud($tags, $atts).
 			   '</div>';
 	}
 
@@ -81,8 +81,8 @@ 
 
 		add_action(
 			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
+			function() use ($scope) {
+				if ( ! function_exists('register_block_type')) {
 					// Gutenberg is not active.
 					return;
 				}
@@ -91,13 +91,13 @@ 
 					'wordlift/cloud',
 					array(
 						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
+						'render_callback' => function($attributes) use ($scope) {
 							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+							foreach ($attributes as $key => $value) {
+								$attr_code .= $key.'="'.htmlentities($value).'" ';
 							}
 
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+							return '['.$scope::SHORTCODE.' '.$attr_code.']';
 						},
 						'attributes'      => array(
 							'preview'     => array(
@@ -106,7 +106,7 @@ 
 							),
 							'preview_src' => array(
 								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/cloud.png',
+								'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/cloud.png',
 							),
 						),
 					)
@@ -129,15 +129,15 @@ 
 		$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
 
 		// Show nothing if not on a post or entity page.
-		if ( ! is_singular( $supported_types ) ) {
+		if ( ! is_singular($supported_types)) {
 			return array();
 		}
 
 		// Get the IDs of entities related to current post.
-		$related_entities = wl_core_get_related_entity_ids( get_the_ID(), array( 'status' => 'publish' ) );
+		$related_entities = wl_core_get_related_entity_ids(get_the_ID(), array('status' => 'publish'));
 
 		// Bail out if there are no associated entities.
-		if ( empty( $related_entities ) ) {
+		if (empty($related_entities)) {
 			return array();
 		}
 
@@ -147,25 +147,25 @@ 
 		 */
 		$tags = array();
 
-		foreach ( array_unique( $related_entities ) as $entity_id ) {
+		foreach (array_unique($related_entities) as $entity_id) {
 
-			$connected_entities = count( wl_core_get_related_entity_ids( $entity_id, array( 'status' => 'publish' ) ) );
-			$connected_posts    = count( $this->relation_service->get_article_subjects( $entity_id, '*', null, 'publish' ) );
+			$connected_entities = count(wl_core_get_related_entity_ids($entity_id, array('status' => 'publish')));
+			$connected_posts    = count($this->relation_service->get_article_subjects($entity_id, '*', null, 'publish'));
 			/**
 			 * @since 3.31.5
 			 * if synonym exists, use it instead of entity name.
 			 */
-			$synonyms    = $this->get_synonyms( $entity_id );
-			$entity_name = count( $synonyms ) > 0 ? $synonyms[0] : get_the_title( $entity_id );
+			$synonyms    = $this->get_synonyms($entity_id);
+			$entity_name = count($synonyms) > 0 ? $synonyms[0] : get_the_title($entity_id);
 
 			$tags[] = (object) array(
 				'id'    => $entity_id,
 				// Used to give a unique class on the tag.
 				'name'  => $entity_name,
 				// The text of the tag.
-				'slug'  => get_the_title( $entity_id ),
+				'slug'  => get_the_title($entity_id),
 				// Required but not seem to be relevant
-				'link'  => get_permalink( $entity_id ),
+				'link'  => get_permalink($entity_id),
 				// the url the tag links to.
 				'count' => $connected_entities + $connected_posts,
 				// The weight.
@@ -176,8 +176,8 @@ 
 		return $tags;
 	}
 
-	private function get_synonyms( $entity_id ) {
-		return $this->entity_service->get_alternative_labels( $entity_id );
+	private function get_synonyms($entity_id) {
+		return $this->entity_service->get_alternative_labels($entity_id);
 	}
 
 }

src/public/class-wordlift-products-navigator-shortcode.php

Indentation +194 added lines, -194 removed lines

@@ -17,169 +17,169 @@ 
  */
 class Wordlift_Products_Navigator_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_products_navigator';
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_products_navigator';
 
-	public function __construct() {
-		parent::__construct();
-		$this->register_block_type();
-	}
+    public function __construct() {
+        parent::__construct();
+        $this->register_block_type();
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
 
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
-	}
+        return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
+            : $this->web_shortcode( $atts );
+    }
 
-	private function register_block_type() {
+    private function register_block_type() {
 
-		$scope = $this;
+        $scope = $this;
 
-		add_action(
-			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
-					// Gutenberg is not active.
-					return;
-				}
+        add_action(
+            'init',
+            function () use ( $scope ) {
+                if ( ! function_exists( 'register_block_type' ) ) {
+                    // Gutenberg is not active.
+                    return;
+                }
 
-				register_block_type(
-					'wordlift/products-navigator',
-					array(
-						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
-							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-							}
+                register_block_type(
+                    'wordlift/products-navigator',
+                    array(
+                        'editor_script'   => 'wl-block-editor',
+                        'render_callback' => function ( $attributes ) use ( $scope ) {
+                            $attr_code = '';
+                            foreach ( $attributes as $key => $value ) {
+                                $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                            }
 
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-						},
-						'attributes'      => array(
-							'title'       => array(
-								'type'    => 'string',
-								'default' => __( 'Related products', 'wordlift' ),
-							),
-							'limit'       => array(
-								'type'    => 'number',
-								'default' => 4,
-							),
-							'template_id' => array(
-								'type'    => 'string',
-								'default' => '',
-							),
-							'post_id'     => array(
-								'type'    => 'number',
-								'default' => '',
-							),
-							'offset'      => array(
-								'type'    => 'number',
-								'default' => 0,
-							),
-							'uniqid'      => array(
-								'type'    => 'string',
-								'default' => '',
-							),
-							'order_by'    => array(
-								'type'    => 'string',
-								'default' => 'ID DESC',
-							),
-							'preview'     => array(
-								'type'    => 'boolean',
-								'default' => false,
-							),
-							'preview_src' => array(
-								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/products-navigator.png',
-							),
-						),
-					)
-				);
-			}
-		);
-	}
+                            return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                        },
+                        'attributes'      => array(
+                            'title'       => array(
+                                'type'    => 'string',
+                                'default' => __( 'Related products', 'wordlift' ),
+                            ),
+                            'limit'       => array(
+                                'type'    => 'number',
+                                'default' => 4,
+                            ),
+                            'template_id' => array(
+                                'type'    => 'string',
+                                'default' => '',
+                            ),
+                            'post_id'     => array(
+                                'type'    => 'number',
+                                'default' => '',
+                            ),
+                            'offset'      => array(
+                                'type'    => 'number',
+                                'default' => 0,
+                            ),
+                            'uniqid'      => array(
+                                'type'    => 'string',
+                                'default' => '',
+                            ),
+                            'order_by'    => array(
+                                'type'    => 'string',
+                                'default' => 'ID DESC',
+                            ),
+                            'preview'     => array(
+                                'type'    => 'boolean',
+                                'default' => false,
+                            ),
+                            'preview_src' => array(
+                                'type'    => 'string',
+                                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/products-navigator.png',
+                            ),
+                        ),
+                    )
+                );
+            }
+        );
+    }
 
-	/**
-	 * Shared function used by web_shortcode and amp_shortcode
-	 * Bootstrap logic for attributes extraction and boolean filtering
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return array $shortcode_atts
-	 * @since      3.27.0
-	 */
-	private function make_shortcode_atts( $atts ) {
+    /**
+     * Shared function used by web_shortcode and amp_shortcode
+     * Bootstrap logic for attributes extraction and boolean filtering
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return array $shortcode_atts
+     * @since      3.27.0
+     */
+    private function make_shortcode_atts( $atts ) {
 
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts(
-			array(
-				'title'       => __( 'Related products', 'wordlift' ),
-				'limit'       => 4,
-				'offset'      => 0,
-				'template_id' => '',
-				'post_id'     => '',
-				'uniqid'      => uniqid( 'wl-products-navigator-widget-' ),
-				'order_by'    => 'ID DESC',
-			),
-			$atts
-		);
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts(
+            array(
+                'title'       => __( 'Related products', 'wordlift' ),
+                'limit'       => 4,
+                'offset'      => 0,
+                'template_id' => '',
+                'post_id'     => '',
+                'uniqid'      => uniqid( 'wl-products-navigator-widget-' ),
+                'order_by'    => 'ID DESC',
+            ),
+            $atts
+        );
 
-		return $shortcode_atts;
-	}
+        return $shortcode_atts;
+    }
 
-	/**
-	 * Function in charge of diplaying the [wl_products_navigator] in web mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for web
-	 * @since 3.20.0
-	 */
-	private function web_shortcode( $atts ) {
+    /**
+     * Function in charge of diplaying the [wl_products_navigator] in web mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for web
+     * @since 3.20.0
+     */
+    private function web_shortcode( $atts ) {
 
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
 
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
-			return;
-		}
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+            return;
+        }
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-products-navigator-widget-' );
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
+        $title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
+        $template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
+        $limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
+        $offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
+        $sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
+        $navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-products-navigator-widget-' );
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/products-navigator' . $delimiter . build_query(
-				array(
-					'uniqid'  => $navigator_id,
-					'post_id' => $post->ID,
-					'limit'   => $limit,
-					'offset'  => $offset,
-					'sort'    => $sort,
-				)
-			)
-		) : false;
+        $permalink_structure = get_option( 'permalink_structure' );
+        $delimiter           = empty( $permalink_structure ) ? '&' : '?';
+        $rest_url            = $post ? rest_url(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE . '/products-navigator' . $delimiter . build_query(
+                array(
+                    'uniqid'  => $navigator_id,
+                    'post_id' => $post->ID,
+                    'limit'   => $limit,
+                    'offset'  => $offset,
+                    'sort'    => $sort,
+                )
+            )
+        ) : false;
 
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
 
-		wp_enqueue_script( 'wordlift-cloud' );
+        wp_enqueue_script( 'wordlift-cloud' );
 
-		return <<<HTML
+        return <<<HTML
 			<!-- Products Navigator {$navigator_id} -->
 			<div id="{$navigator_id}" 
 				 class="wl-products-navigator" 
@@ -189,64 +189,64 @@ 
 				 data-limit="{$limit}"></div>
 			<!-- /Products Navigator {$navigator_id} -->
 HTML;
-	}
+    }
 
-	/**
-	 * Function in charge of diplaying the [wl_products_navigator] in amp mode.
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for amp
-	 * @since 3.20.0
-	 */
-	private function amp_shortcode( $atts ) {
+    /**
+     * Function in charge of diplaying the [wl_products_navigator] in amp mode.
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for amp
+     * @since 3.20.0
+     */
+    private function amp_shortcode( $atts ) {
 
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
 
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
-			return;
-		}
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+            return;
+        }
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-products-navigator-widget-' );
+        $post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
+        $title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
+        $template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
+        $limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
+        $offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
+        $sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
+        $navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-products-navigator-widget-' );
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/products-navigator' . $delimiter . build_query(
-				array(
-					'amp'     => true,
-					'uniqid'  => $navigator_id,
-					'post_id' => $post->ID,
-					'limit'   => $limit,
-					'offset'  => $offset,
-					'sort'    => $sort,
-				)
-			)
-		) : false;
+        $permalink_structure = get_option( 'permalink_structure' );
+        $delimiter           = empty( $permalink_structure ) ? '&' : '?';
+        $rest_url            = $post ? rest_url(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE . '/products-navigator' . $delimiter . build_query(
+                array(
+                    'amp'     => true,
+                    'uniqid'  => $navigator_id,
+                    'post_id' => $post->ID,
+                    'limit'   => $limit,
+                    'offset'  => $offset,
+                    'sort'    => $sort,
+                )
+            )
+        ) : false;
 
-		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
-			return;
-		}
+        // avoid building the widget when no valid $rest_url
+        if ( ! $rest_url ) {
+            return;
+        }
 
-		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
-		// This is a hackish way, but this works for http and https URLs
-		$rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
+        // Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
+        // This is a hackish way, but this works for http and https URLs
+        $rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
 
-		if ( empty( $template_id ) ) {
-			$template_id = 'template-' . $navigator_id;
-			wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
-		}
+        if ( empty( $template_id ) ) {
+            $template_id = 'template-' . $navigator_id;
+            wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
+        }
 
-		return <<<HTML
+        return <<<HTML
 		<div id="{$navigator_id}" class="wl-amp-products-navigator">
 			<h3 class="wl-headline">{$title}</h3>
 			<section class="cards">
@@ -348,6 +348,6 @@ 
 			</section>
 		</div>
 HTML;
-	}
+    }
 
 }

Spacing +47 added lines, -47 removed lines

@@ -30,10 +30,10 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
+		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode($atts)
+			: $this->web_shortcode($atts);
 	}
 
 	private function register_block_type() {
@@ -42,8 +42,8 @@ 
 
 		add_action(
 			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
+			function() use ($scope) {
+				if ( ! function_exists('register_block_type')) {
 					// Gutenberg is not active.
 					return;
 				}
@@ -52,18 +52,18 @@ 
 					'wordlift/products-navigator',
 					array(
 						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
+						'render_callback' => function($attributes) use ($scope) {
 							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+							foreach ($attributes as $key => $value) {
+								$attr_code .= $key.'="'.htmlentities($value).'" ';
 							}
 
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+							return '['.$scope::SHORTCODE.' '.$attr_code.']';
 						},
 						'attributes'      => array(
 							'title'       => array(
 								'type'    => 'string',
-								'default' => __( 'Related products', 'wordlift' ),
+								'default' => __('Related products', 'wordlift'),
 							),
 							'limit'       => array(
 								'type'    => 'number',
@@ -95,7 +95,7 @@ 
 							),
 							'preview_src' => array(
 								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/products-navigator.png',
+								'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/products-navigator.png',
 							),
 						),
 					)
@@ -113,17 +113,17 @@ 
 	 * @return array $shortcode_atts
 	 * @since      3.27.0
 	 */
-	private function make_shortcode_atts( $atts ) {
+	private function make_shortcode_atts($atts) {
 
 		// Extract attributes and set default values.
 		$shortcode_atts = shortcode_atts(
 			array(
-				'title'       => __( 'Related products', 'wordlift' ),
+				'title'       => __('Related products', 'wordlift'),
 				'limit'       => 4,
 				'offset'      => 0,
 				'template_id' => '',
 				'post_id'     => '',
-				'uniqid'      => uniqid( 'wl-products-navigator-widget-' ),
+				'uniqid'      => uniqid('wl-products-navigator-widget-'),
 				'order_by'    => 'ID DESC',
 			),
 			$atts
@@ -140,28 +140,28 @@ 
 	 * @return string Shortcode HTML for web
 	 * @since 3.20.0
 	 */
-	private function web_shortcode( $atts ) {
+	private function web_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-products-navigator-widget-' );
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval(sanitize_text_field($shortcode_atts['post_id']))) : get_post();
+		$title        = esc_attr(sanitize_text_field($shortcode_atts['title']));
+		$template_id  = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
+		$limit        = esc_attr(sanitize_text_field($shortcode_atts['limit']));
+		$offset       = esc_attr(sanitize_text_field($shortcode_atts['offset']));
+		$sort         = esc_attr(sanitize_sql_orderby(sanitize_text_field($shortcode_atts['order_by'])));
+		$navigator_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-products-navigator-widget-');
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
+		$permalink_structure = get_option('permalink_structure');
+		$delimiter           = empty($permalink_structure) ? '&' : '?';
 		$rest_url            = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/products-navigator' . $delimiter . build_query(
+			WL_REST_ROUTE_DEFAULT_NAMESPACE.'/products-navigator'.$delimiter.build_query(
 				array(
 					'uniqid'  => $navigator_id,
 					'post_id' => $post->ID,
@@ -173,11 +173,11 @@ 
 		) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
-		wp_enqueue_script( 'wordlift-cloud' );
+		wp_enqueue_script('wordlift-cloud');
 
 		return <<<HTML
 			<!-- Products Navigator {$navigator_id} -->
@@ -199,28 +199,28 @@ 
 	 * @return string Shortcode HTML for amp
 	 * @since 3.20.0
 	 */
-	private function amp_shortcode( $atts ) {
+	private function amp_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty( $shortcode_atts['post_id'] ) && ! is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post         = ! empty( $shortcode_atts['post_id'] ) ? get_post( intval( sanitize_text_field( $shortcode_atts['post_id'] ) ) ) : get_post();
-		$title        = esc_attr( sanitize_text_field( $shortcode_atts['title'] ) );
-		$template_id  = esc_attr( sanitize_text_field( $shortcode_atts['template_id'] ) );
-		$limit        = esc_attr( sanitize_text_field( $shortcode_atts['limit'] ) );
-		$offset       = esc_attr( sanitize_text_field( $shortcode_atts['offset'] ) );
-		$sort         = esc_attr( sanitize_sql_orderby( sanitize_text_field( $shortcode_atts['order_by'] ) ) );
-		$navigator_id = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-products-navigator-widget-' );
+		$post         = ! empty($shortcode_atts['post_id']) ? get_post(intval(sanitize_text_field($shortcode_atts['post_id']))) : get_post();
+		$title        = esc_attr(sanitize_text_field($shortcode_atts['title']));
+		$template_id  = esc_attr(sanitize_text_field($shortcode_atts['template_id']));
+		$limit        = esc_attr(sanitize_text_field($shortcode_atts['limit']));
+		$offset       = esc_attr(sanitize_text_field($shortcode_atts['offset']));
+		$sort         = esc_attr(sanitize_sql_orderby(sanitize_text_field($shortcode_atts['order_by'])));
+		$navigator_id = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-products-navigator-widget-');
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
+		$permalink_structure = get_option('permalink_structure');
+		$delimiter           = empty($permalink_structure) ? '&' : '?';
 		$rest_url            = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/products-navigator' . $delimiter . build_query(
+			WL_REST_ROUTE_DEFAULT_NAMESPACE.'/products-navigator'.$delimiter.build_query(
 				array(
 					'amp'     => true,
 					'uniqid'  => $navigator_id,
@@ -233,17 +233,17 @@ 
 		) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( ! $rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
 		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
 		// This is a hackish way, but this works for http and https URLs
-		$rest_url = str_replace( array( 'http:', 'https:' ), '', $rest_url );
+		$rest_url = str_replace(array('http:', 'https:'), '', $rest_url);
 
-		if ( empty( $template_id ) ) {
-			$template_id = 'template-' . $navigator_id;
-			wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
+		if (empty($template_id)) {
+			$template_id = 'template-'.$navigator_id;
+			wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(__DIR__).'/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION);
 		}
 
 		return <<<HTML

src/public/class-wordlift-context-cards-service.php

Indentation +48 added lines, -48 removed lines

@@ -9,68 +9,68 @@
 
 class Wordlift_Context_Cards_Service {
 
-	public function enqueue_scripts() {
+    public function enqueue_scripts() {
 
-		$show_context_cards     = apply_filters( 'wl_context_cards_show', true );
-		$context_cards_base_url = apply_filters( 'wl_context_cards_base_url', get_rest_url( null, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/jsonld' ) );
+        $show_context_cards     = apply_filters( 'wl_context_cards_show', true );
+        $context_cards_base_url = apply_filters( 'wl_context_cards_base_url', get_rest_url( null, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/jsonld' ) );
 
-		/*
+        /*
 		 * Do not load wordlift-cloud on a non-static home page
 		 *
 		 * @since 3.27.4
 		 */
-		if ( is_front_page() && is_home() ) {
-			// Default homepage - force hide
-			$show_context_cards = false;
-		} elseif ( is_home() ) {
-			// Blog page - force hide
-			$show_context_cards = false;
-		}
+        if ( is_front_page() && is_home() ) {
+            // Default homepage - force hide
+            $show_context_cards = false;
+        } elseif ( is_home() ) {
+            // Blog page - force hide
+            $show_context_cards = false;
+        }
 
-		if ( $show_context_cards ) {
-			wp_enqueue_script( 'wordlift-cloud' );
-			wp_localize_script(
-				'wordlift-cloud',
-				'_wlCloudSettings',
-				array(
-					'selector' => 'a.wl-entity-page-link',
-					'url'      => $context_cards_base_url,
-				)
-			);
-		}
+        if ( $show_context_cards ) {
+            wp_enqueue_script( 'wordlift-cloud' );
+            wp_localize_script(
+                'wordlift-cloud',
+                '_wlCloudSettings',
+                array(
+                    'selector' => 'a.wl-entity-page-link',
+                    'url'      => $context_cards_base_url,
+                )
+            );
+        }
 
-		add_filter( 'wl_anchor_data_attributes', array( $this, 'anchor_data_attributes' ), 10, 2 );
-	}
+        add_filter( 'wl_anchor_data_attributes', array( $this, 'anchor_data_attributes' ), 10, 2 );
+    }
 
-	public function anchor_data_attributes( $attributes, $post_id ) {
+    public function anchor_data_attributes( $attributes, $post_id ) {
 
-		$supported_types   = Wordlift_Entity_Service::valid_entity_post_types();
-		$post_type         = get_post_type( $post_id );
-		$enabled_templates = apply_filters( 'wl_context_cards_enabled_templates', array( 'product' ) );
+        $supported_types   = Wordlift_Entity_Service::valid_entity_post_types();
+        $post_type         = get_post_type( $post_id );
+        $enabled_templates = apply_filters( 'wl_context_cards_enabled_templates', array( 'product' ) );
 
-		if ( in_array( $post_type, $supported_types, true ) && in_array( $post_type, $enabled_templates, true ) ) {
+        if ( in_array( $post_type, $supported_types, true ) && in_array( $post_type, $enabled_templates, true ) ) {
 
-			$additional_attributes = array( 'post-type-template' => $post_type );
+            $additional_attributes = array( 'post-type-template' => $post_type );
 
-			switch ( $post_type ) {
-				case 'product':
-					$product                                   = wc_get_product( $post_id );
-					$additional_attributes['template-payload'] = wp_json_encode(
-						array(
-							'regular_price'   => $product->get_regular_price(),
-							'currency_symbol' => get_woocommerce_currency_symbol(),
-							'discount_pc'     => ( $product->get_sale_price() && ( $product->get_regular_price() > 0 ) ) ? round( 1 - ( $product->get_sale_price() / $product->get_regular_price() ), 2 ) * 100 : 0,
-							'average_rating'  => $product->get_average_rating(),
-							'rating_count'    => $product->get_rating_count(),
-							'rating_html'     => wc_get_rating_html( $product->get_average_rating(), $product->get_rating_count() ),
-						)
-					);
-			}
+            switch ( $post_type ) {
+                case 'product':
+                    $product                                   = wc_get_product( $post_id );
+                    $additional_attributes['template-payload'] = wp_json_encode(
+                        array(
+                            'regular_price'   => $product->get_regular_price(),
+                            'currency_symbol' => get_woocommerce_currency_symbol(),
+                            'discount_pc'     => ( $product->get_sale_price() && ( $product->get_regular_price() > 0 ) ) ? round( 1 - ( $product->get_sale_price() / $product->get_regular_price() ), 2 ) * 100 : 0,
+                            'average_rating'  => $product->get_average_rating(),
+                            'rating_count'    => $product->get_rating_count(),
+                            'rating_html'     => wc_get_rating_html( $product->get_average_rating(), $product->get_rating_count() ),
+                        )
+                    );
+            }
 
-			return $attributes + $additional_attributes;
-		}
+            return $attributes + $additional_attributes;
+        }
 
-		return $attributes;
-	}
+        return $attributes;
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -11,24 +11,24 @@ 
 
 	public function enqueue_scripts() {
 
-		$show_context_cards     = apply_filters( 'wl_context_cards_show', true );
-		$context_cards_base_url = apply_filters( 'wl_context_cards_base_url', get_rest_url( null, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/jsonld' ) );
+		$show_context_cards     = apply_filters('wl_context_cards_show', true);
+		$context_cards_base_url = apply_filters('wl_context_cards_base_url', get_rest_url(null, WL_REST_ROUTE_DEFAULT_NAMESPACE.'/jsonld'));
 
 		/*
 		 * Do not load wordlift-cloud on a non-static home page
 		 *
 		 * @since 3.27.4
 		 */
-		if ( is_front_page() && is_home() ) {
+		if (is_front_page() && is_home()) {
 			// Default homepage - force hide
 			$show_context_cards = false;
-		} elseif ( is_home() ) {
+		} elseif (is_home()) {
 			// Blog page - force hide
 			$show_context_cards = false;
 		}
 
-		if ( $show_context_cards ) {
-			wp_enqueue_script( 'wordlift-cloud' );
+		if ($show_context_cards) {
+			wp_enqueue_script('wordlift-cloud');
 			wp_localize_script(
 				'wordlift-cloud',
 				'_wlCloudSettings',
@@ -39,30 +39,30 @@ 
 			);
 		}
 
-		add_filter( 'wl_anchor_data_attributes', array( $this, 'anchor_data_attributes' ), 10, 2 );
+		add_filter('wl_anchor_data_attributes', array($this, 'anchor_data_attributes'), 10, 2);
 	}
 
-	public function anchor_data_attributes( $attributes, $post_id ) {
+	public function anchor_data_attributes($attributes, $post_id) {
 
 		$supported_types   = Wordlift_Entity_Service::valid_entity_post_types();
-		$post_type         = get_post_type( $post_id );
-		$enabled_templates = apply_filters( 'wl_context_cards_enabled_templates', array( 'product' ) );
+		$post_type         = get_post_type($post_id);
+		$enabled_templates = apply_filters('wl_context_cards_enabled_templates', array('product'));
 
-		if ( in_array( $post_type, $supported_types, true ) && in_array( $post_type, $enabled_templates, true ) ) {
+		if (in_array($post_type, $supported_types, true) && in_array($post_type, $enabled_templates, true)) {
 
-			$additional_attributes = array( 'post-type-template' => $post_type );
+			$additional_attributes = array('post-type-template' => $post_type);
 
-			switch ( $post_type ) {
+			switch ($post_type) {
 				case 'product':
-					$product                                   = wc_get_product( $post_id );
+					$product                                   = wc_get_product($post_id);
 					$additional_attributes['template-payload'] = wp_json_encode(
 						array(
 							'regular_price'   => $product->get_regular_price(),
 							'currency_symbol' => get_woocommerce_currency_symbol(),
-							'discount_pc'     => ( $product->get_sale_price() && ( $product->get_regular_price() > 0 ) ) ? round( 1 - ( $product->get_sale_price() / $product->get_regular_price() ), 2 ) * 100 : 0,
+							'discount_pc'     => ($product->get_sale_price() && ($product->get_regular_price() > 0)) ? round(1 - ($product->get_sale_price() / $product->get_regular_price()), 2) * 100 : 0,
 							'average_rating'  => $product->get_average_rating(),
 							'rating_count'    => $product->get_rating_count(),
-							'rating_html'     => wc_get_rating_html( $product->get_average_rating(), $product->get_rating_count() ),
+							'rating_html'     => wc_get_rating_html($product->get_average_rating(), $product->get_rating_count()),
 						)
 					);
 			}

src/public/class-wordlift-chord-shortcode.php

Indentation +171 added lines, -171 removed lines

@@ -16,104 +16,104 @@ 
  */
 class Wordlift_Chord_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_chord';
-
-	/**
-	 * Create a {@link Wordlift_Chord_Shortcode} instance.
-	 *
-	 * @since      3.5.4
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
-		// rendering.
-		add_action(
-			'amp_post_template_css',
-			array(
-				$this,
-				'amp_post_template_css',
-			)
-		);
-		$this->register_block_type();
-
-	}
-
-	/**
-	 * Render shordcode.
-	 *
-	 * @param array $atts shortcode attributes.
-	 *
-	 * @return string The HTML output.
-	 */
-	public function render( $atts ) {
-
-		// extract attributes and set default values.
-		$chord_atts = shortcode_atts(
-			array(
-				'width'      => '100%',
-				'height'     => '500px',
-				'main_color' => '000',
-				'depth'      => 2,
-				'global'     => false,
-			),
-			$atts
-		);
-
-		if ( $chord_atts['global'] ) {
-
-			$post_id = wl_shortcode_chord_most_referenced_entity_id();
-
-			if ( null === $post_id ) {
-				return 'WordLift Chord: no entities found.';
-			}
-
-			// Use the provided height if any, otherwise use a default of 200px.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/443.
-			$chord_atts['height'] = isset( $chord_atts['height'] ) ? $chord_atts['height'] : '200px';
-
-		} else {
-			$post_id = get_the_ID();
-		}
-
-		// Use the registered style which define an optional dependency to font-awesome.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/699
-		// wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
-
-		// Adding javascript code.
-		wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js', array(), WORDLIFT_VERSION, false );
-
-		$this->enqueue_scripts();
-
-		wp_localize_script(
-			'wordlift-ui',
-			'wl_chord_params',
-			array(
-				'ajax_url'       => admin_url( 'admin-ajax.php' ),
-				'action'         => 'wl_chord',
-				'wl_chord_nonce' => wp_create_nonce( 'wl_chord' ),
-			)
-		);
-
-		// Escaping atts.
-		$esc_class  = esc_attr( 'wl-chord' );
-		$esc_id     = esc_attr( uniqid( 'wl-chord-' ) );
-		$esc_width  = esc_attr( $chord_atts['width'] );
-		$esc_height = esc_attr( $chord_atts['height'] );
-
-		$esc_post_id    = esc_attr( $post_id );
-		$esc_depth      = esc_attr( $chord_atts['depth'] );
-		$esc_main_color = esc_attr( $chord_atts['main_color'] );
-
-		// Building template.
-		// TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
-		return "
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_chord';
+
+    /**
+     * Create a {@link Wordlift_Chord_Shortcode} instance.
+     *
+     * @since      3.5.4
+     */
+    public function __construct() {
+        parent::__construct();
+
+        // Hook to the `amp_post_template_css` to hide ourselves when in AMP
+        // rendering.
+        add_action(
+            'amp_post_template_css',
+            array(
+                $this,
+                'amp_post_template_css',
+            )
+        );
+        $this->register_block_type();
+
+    }
+
+    /**
+     * Render shordcode.
+     *
+     * @param array $atts shortcode attributes.
+     *
+     * @return string The HTML output.
+     */
+    public function render( $atts ) {
+
+        // extract attributes and set default values.
+        $chord_atts = shortcode_atts(
+            array(
+                'width'      => '100%',
+                'height'     => '500px',
+                'main_color' => '000',
+                'depth'      => 2,
+                'global'     => false,
+            ),
+            $atts
+        );
+
+        if ( $chord_atts['global'] ) {
+
+            $post_id = wl_shortcode_chord_most_referenced_entity_id();
+
+            if ( null === $post_id ) {
+                return 'WordLift Chord: no entities found.';
+            }
+
+            // Use the provided height if any, otherwise use a default of 200px.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/443.
+            $chord_atts['height'] = isset( $chord_atts['height'] ) ? $chord_atts['height'] : '200px';
+
+        } else {
+            $post_id = get_the_ID();
+        }
+
+        // Use the registered style which define an optional dependency to font-awesome.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/699
+        // wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        wp_enqueue_style( 'wordlift-ui' );
+
+        // Adding javascript code.
+        wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js', array(), WORDLIFT_VERSION, false );
+
+        $this->enqueue_scripts();
+
+        wp_localize_script(
+            'wordlift-ui',
+            'wl_chord_params',
+            array(
+                'ajax_url'       => admin_url( 'admin-ajax.php' ),
+                'action'         => 'wl_chord',
+                'wl_chord_nonce' => wp_create_nonce( 'wl_chord' ),
+            )
+        );
+
+        // Escaping atts.
+        $esc_class  = esc_attr( 'wl-chord' );
+        $esc_id     = esc_attr( uniqid( 'wl-chord-' ) );
+        $esc_width  = esc_attr( $chord_atts['width'] );
+        $esc_height = esc_attr( $chord_atts['height'] );
+
+        $esc_post_id    = esc_attr( $post_id );
+        $esc_depth      = esc_attr( $chord_atts['depth'] );
+        $esc_main_color = esc_attr( $chord_atts['main_color'] );
+
+        // Building template.
+        // TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
+        return "
 <div class='$esc_class' 
 	id='$esc_id'
 	data-post-id='$esc_post_id'
@@ -126,82 +126,82 @@ 
         margin-bottom:10px'>
 </div>
 ";
-	}
-
-	private function register_block_type() {
-
-		$scope = $this;
-
-		add_action(
-			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
-					// Gutenberg is not active.
-					return;
-				}
-
-				register_block_type(
-					'wordlift/chord',
-					array(
-						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
-							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-							}
-
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-						},
-						'attributes'      => array(
-							'width'       => array(
-								'type'    => 'string',
-								'default' => '100%',
-							),
-							'height'      => array(
-								'type'    => 'string',
-								'default' => '500px',
-							),
-							'main_color'  => array(
-								'type'    => 'string',
-								'default' => '000',
-							),
-							'depth'       => array(
-								'type'    => 'number',
-								'default' => 2,
-							),
-							'global'      => array(
-								'type'    => 'boolean',
-								'default' => false,
-							),
-							'preview'     => array(
-								'type'    => 'boolean',
-								'default' => false,
-							),
-							'preview_src' => array(
-								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/chord.png',
-							),
-						),
-					)
-				);
-			}
-		);
-	}
-
-	/**
-	 * Customize the CSS when in AMP.
-	 *
-	 * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
-	 *
-	 * @since 3.14.0
-	 */
+    }
+
+    private function register_block_type() {
+
+        $scope = $this;
+
+        add_action(
+            'init',
+            function () use ( $scope ) {
+                if ( ! function_exists( 'register_block_type' ) ) {
+                    // Gutenberg is not active.
+                    return;
+                }
+
+                register_block_type(
+                    'wordlift/chord',
+                    array(
+                        'editor_script'   => 'wl-block-editor',
+                        'render_callback' => function ( $attributes ) use ( $scope ) {
+                            $attr_code = '';
+                            foreach ( $attributes as $key => $value ) {
+                                $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                            }
+
+                            return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                        },
+                        'attributes'      => array(
+                            'width'       => array(
+                                'type'    => 'string',
+                                'default' => '100%',
+                            ),
+                            'height'      => array(
+                                'type'    => 'string',
+                                'default' => '500px',
+                            ),
+                            'main_color'  => array(
+                                'type'    => 'string',
+                                'default' => '000',
+                            ),
+                            'depth'       => array(
+                                'type'    => 'number',
+                                'default' => 2,
+                            ),
+                            'global'      => array(
+                                'type'    => 'boolean',
+                                'default' => false,
+                            ),
+                            'preview'     => array(
+                                'type'    => 'boolean',
+                                'default' => false,
+                            ),
+                            'preview_src' => array(
+                                'type'    => 'string',
+                                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/chord.png',
+                            ),
+                        ),
+                    )
+                );
+            }
+        );
+    }
+
+    /**
+     * Customize the CSS when in AMP.
+     *
+     * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
+     *
+     * @since 3.14.0
+     */
     // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function amp_post_template_css( $amp_template ) {
+    public function amp_post_template_css( $amp_template ) {
 
-		// Hide the `wl-chord` when in AMP.
-		?>
+        // Hide the `wl-chord` when in AMP.
+        ?>
 		.wl-chord { display: none; }
 		<?php
-	}
+    }
 
 }

Spacing +23 added lines, -23 removed lines

@@ -49,7 +49,7 @@ 
 	 *
 	 * @return string The HTML output.
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// extract attributes and set default values.
 		$chord_atts = shortcode_atts(
@@ -63,18 +63,18 @@ 
 			$atts
 		);
 
-		if ( $chord_atts['global'] ) {
+		if ($chord_atts['global']) {
 
 			$post_id = wl_shortcode_chord_most_referenced_entity_id();
 
-			if ( null === $post_id ) {
+			if (null === $post_id) {
 				return 'WordLift Chord: no entities found.';
 			}
 
 			// Use the provided height if any, otherwise use a default of 200px.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/443.
-			$chord_atts['height'] = isset( $chord_atts['height'] ) ? $chord_atts['height'] : '200px';
+			$chord_atts['height'] = isset($chord_atts['height']) ? $chord_atts['height'] : '200px';
 
 		} else {
 			$post_id = get_the_ID();
@@ -84,10 +84,10 @@ 
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/699
 		// wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
+		wp_enqueue_style('wordlift-ui');
 
 		// Adding javascript code.
-		wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js', array(), WORDLIFT_VERSION, false );
+		wp_enqueue_script('d3', dirname(plugin_dir_url(__FILE__)).'/bower_components/d3/d3.min.js', array(), WORDLIFT_VERSION, false);
 
 		$this->enqueue_scripts();
 
@@ -95,21 +95,21 @@ 
 			'wordlift-ui',
 			'wl_chord_params',
 			array(
-				'ajax_url'       => admin_url( 'admin-ajax.php' ),
+				'ajax_url'       => admin_url('admin-ajax.php'),
 				'action'         => 'wl_chord',
-				'wl_chord_nonce' => wp_create_nonce( 'wl_chord' ),
+				'wl_chord_nonce' => wp_create_nonce('wl_chord'),
 			)
 		);
 
 		// Escaping atts.
-		$esc_class  = esc_attr( 'wl-chord' );
-		$esc_id     = esc_attr( uniqid( 'wl-chord-' ) );
-		$esc_width  = esc_attr( $chord_atts['width'] );
-		$esc_height = esc_attr( $chord_atts['height'] );
+		$esc_class  = esc_attr('wl-chord');
+		$esc_id     = esc_attr(uniqid('wl-chord-'));
+		$esc_width  = esc_attr($chord_atts['width']);
+		$esc_height = esc_attr($chord_atts['height']);
 
-		$esc_post_id    = esc_attr( $post_id );
-		$esc_depth      = esc_attr( $chord_atts['depth'] );
-		$esc_main_color = esc_attr( $chord_atts['main_color'] );
+		$esc_post_id    = esc_attr($post_id);
+		$esc_depth      = esc_attr($chord_atts['depth']);
+		$esc_main_color = esc_attr($chord_atts['main_color']);
 
 		// Building template.
 		// TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
@@ -134,8 +134,8 @@ 
 
 		add_action(
 			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
+			function() use ($scope) {
+				if ( ! function_exists('register_block_type')) {
 					// Gutenberg is not active.
 					return;
 				}
@@ -144,13 +144,13 @@ 
 					'wordlift/chord',
 					array(
 						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
+						'render_callback' => function($attributes) use ($scope) {
 							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+							foreach ($attributes as $key => $value) {
+								$attr_code .= $key.'="'.htmlentities($value).'" ';
 							}
 
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+							return '['.$scope::SHORTCODE.' '.$attr_code.']';
 						},
 						'attributes'      => array(
 							'width'       => array(
@@ -179,7 +179,7 @@ 
 							),
 							'preview_src' => array(
 								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/chord.png',
+								'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/chord.png',
 							),
 						),
 					)
@@ -196,7 +196,7 @@ 
 	 * @since 3.14.0
 	 */
     // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function amp_post_template_css( $amp_template ) {
+	public function amp_post_template_css($amp_template) {
 
 		// Hide the `wl-chord` when in AMP.
 		?>

src/public/class-wordlift-geomap-shortcode.php

Indentation +144 added lines, -144 removed lines

@@ -18,157 +18,157 @@
  */
 class Wordlift_Geomap_Shortcode extends Wordlift_Shortcode {
 
-	const SHORTCODE = 'wl_geomap';
-
-	/**
-	 * Create a {@link Wordlift_Geomap_Shortcode} instance.
-	 *
-	 * @since 3.5.4
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
-		// rendering.
-		add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css' ) );
-		$this->register_block_type();
-
-	}
-
-	/**
-	 * Render the shortcode.
-	 *
-	 * @param array $atts An array of shortcode attributes as set by the editor.
-	 *
-	 * @return string The output html code.
-	 * @since 3.5.4
-	 */
-	public function render( $atts ) {
-
-		// Extract attributes and set default values.
-		$geomap_atts = shortcode_atts(
-			array(
-				'width'  => '100%',
-				'height' => '300px',
-				'global' => false,
-			),
-			$atts
-		);
-
-		// Get id of the post
-		$post_id = get_the_ID();
-
-		if ( $geomap_atts['global'] || $post_id === null ) {
-			// Global geomap
-			$geomap_id = 'wl_geomap_global';
-			$post_id   = null;
-		} else {
-			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
-		}
-
-		wl_enqueue_leaflet( true );
-
-		// Use the registered style which define an optional dependency to font-awesome.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/699
-		// wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
-
-		$this->enqueue_scripts();
-
-		wp_localize_script(
-			'wordlift-ui',
-			'wl_geomap_params',
-			array(
-				'ajax_url'        => admin_url( 'admin-ajax.php' ),    // Global param
-				'action'          => 'wl_geomap',            // Global param
-				'wl_geomap_nonce' => wp_create_nonce( 'wl_geomap' ),
-			)
-		);
-
-		// Escaping atts.
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
-
-		// Return HTML template.
-		return "
+    const SHORTCODE = 'wl_geomap';
+
+    /**
+     * Create a {@link Wordlift_Geomap_Shortcode} instance.
+     *
+     * @since 3.5.4
+     */
+    public function __construct() {
+        parent::__construct();
+
+        // Hook to the `amp_post_template_css` to hide ourselves when in AMP
+        // rendering.
+        add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css' ) );
+        $this->register_block_type();
+
+    }
+
+    /**
+     * Render the shortcode.
+     *
+     * @param array $atts An array of shortcode attributes as set by the editor.
+     *
+     * @return string The output html code.
+     * @since 3.5.4
+     */
+    public function render( $atts ) {
+
+        // Extract attributes and set default values.
+        $geomap_atts = shortcode_atts(
+            array(
+                'width'  => '100%',
+                'height' => '300px',
+                'global' => false,
+            ),
+            $atts
+        );
+
+        // Get id of the post
+        $post_id = get_the_ID();
+
+        if ( $geomap_atts['global'] || $post_id === null ) {
+            // Global geomap
+            $geomap_id = 'wl_geomap_global';
+            $post_id   = null;
+        } else {
+            // Post-specific geomap
+            $geomap_id = 'wl_geomap_' . $post_id;
+        }
+
+        wl_enqueue_leaflet( true );
+
+        // Use the registered style which define an optional dependency to font-awesome.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/699
+        // wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        wp_enqueue_style( 'wordlift-ui' );
+
+        $this->enqueue_scripts();
+
+        wp_localize_script(
+            'wordlift-ui',
+            'wl_geomap_params',
+            array(
+                'ajax_url'        => admin_url( 'admin-ajax.php' ),    // Global param
+                'action'          => 'wl_geomap',            // Global param
+                'wl_geomap_nonce' => wp_create_nonce( 'wl_geomap' ),
+            )
+        );
+
+        // Escaping atts.
+        $esc_id      = esc_attr( $geomap_id );
+        $esc_width   = esc_attr( $geomap_atts['width'] );
+        $esc_height  = esc_attr( $geomap_atts['height'] );
+        $esc_post_id = esc_attr( $post_id );
+
+        // Return HTML template.
+        return "
 <div class='wl-geomap'  id='$esc_id' data-post-id='$esc_post_id'
 	style='width:$esc_width; height:$esc_height; background-color: gray;'>
 </div>
 ";
-	}
-
-	private function register_block_type() {
-
-		$scope = $this;
-
-		add_action(
-			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
-					// Gutenberg is not active.
-					return;
-				}
-
-				register_block_type(
-					'wordlift/geomap',
-					array(
-						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
-							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-							}
-
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-						},
-						'attributes'      => array(
-							'width'       => array(
-								'type'    => 'string',
-								'default' => '100%',
-							),
-							'height'      => array(
-								'type'    => 'string',
-								'default' => '300px',
-							),
-							'global'      => array(
-								'type'    => 'boolean',
-								'default' => false,
-							),
-							'preview'     => array(
-								'type'    => 'boolean',
-								'default' => false,
-							),
-							'preview_src' => array(
-								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/geomap.png',
-							),
-						),
-					)
-				);
-			}
-		);
-	}
-
-	/**
-	 * Customize the CSS when in AMP.
-	 *
-	 * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
-	 *
-	 * @param object $amp_template The template.
-	 *
-	 * @since 3.13.0
-	 */
+    }
+
+    private function register_block_type() {
+
+        $scope = $this;
+
+        add_action(
+            'init',
+            function () use ( $scope ) {
+                if ( ! function_exists( 'register_block_type' ) ) {
+                    // Gutenberg is not active.
+                    return;
+                }
+
+                register_block_type(
+                    'wordlift/geomap',
+                    array(
+                        'editor_script'   => 'wl-block-editor',
+                        'render_callback' => function ( $attributes ) use ( $scope ) {
+                            $attr_code = '';
+                            foreach ( $attributes as $key => $value ) {
+                                $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                            }
+
+                            return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                        },
+                        'attributes'      => array(
+                            'width'       => array(
+                                'type'    => 'string',
+                                'default' => '100%',
+                            ),
+                            'height'      => array(
+                                'type'    => 'string',
+                                'default' => '300px',
+                            ),
+                            'global'      => array(
+                                'type'    => 'boolean',
+                                'default' => false,
+                            ),
+                            'preview'     => array(
+                                'type'    => 'boolean',
+                                'default' => false,
+                            ),
+                            'preview_src' => array(
+                                'type'    => 'string',
+                                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/geomap.png',
+                            ),
+                        ),
+                    )
+                );
+            }
+        );
+    }
+
+    /**
+     * Customize the CSS when in AMP.
+     *
+     * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
+     *
+     * @param object $amp_template The template.
+     *
+     * @since 3.13.0
+     */
     // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function amp_post_template_css( $amp_template ) {
+    public function amp_post_template_css( $amp_template ) {
 
-		// Hide the `wl-geomap` when in AMP.
-		?>
+        // Hide the `wl-geomap` when in AMP.
+        ?>
 		.wl-geomap { display: none; }
 		<?php
-	}
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -30,7 +30,7 @@ 
 
 		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
 		// rendering.
-		add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css' ) );
+		add_action('amp_post_template_css', array($this, 'amp_post_template_css'));
 		$this->register_block_type();
 
 	}
@@ -43,7 +43,7 @@ 
 	 * @return string The output html code.
 	 * @since 3.5.4
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// Extract attributes and set default values.
 		$geomap_atts = shortcode_atts(
@@ -58,22 +58,22 @@ 
 		// Get id of the post
 		$post_id = get_the_ID();
 
-		if ( $geomap_atts['global'] || $post_id === null ) {
+		if ($geomap_atts['global'] || $post_id === null) {
 			// Global geomap
 			$geomap_id = 'wl_geomap_global';
 			$post_id   = null;
 		} else {
 			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
+			$geomap_id = 'wl_geomap_'.$post_id;
 		}
 
-		wl_enqueue_leaflet( true );
+		wl_enqueue_leaflet(true);
 
 		// Use the registered style which define an optional dependency to font-awesome.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/699
 		// wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
+		wp_enqueue_style('wordlift-ui');
 
 		$this->enqueue_scripts();
 
@@ -81,17 +81,17 @@ 
 			'wordlift-ui',
 			'wl_geomap_params',
 			array(
-				'ajax_url'        => admin_url( 'admin-ajax.php' ),    // Global param
-				'action'          => 'wl_geomap',            // Global param
-				'wl_geomap_nonce' => wp_create_nonce( 'wl_geomap' ),
+				'ajax_url'        => admin_url('admin-ajax.php'), // Global param
+				'action'          => 'wl_geomap', // Global param
+				'wl_geomap_nonce' => wp_create_nonce('wl_geomap'),
 			)
 		);
 
 		// Escaping atts.
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
+		$esc_id      = esc_attr($geomap_id);
+		$esc_width   = esc_attr($geomap_atts['width']);
+		$esc_height  = esc_attr($geomap_atts['height']);
+		$esc_post_id = esc_attr($post_id);
 
 		// Return HTML template.
 		return "
@@ -107,8 +107,8 @@ 
 
 		add_action(
 			'init',
-			function () use ( $scope ) {
-				if ( ! function_exists( 'register_block_type' ) ) {
+			function() use ($scope) {
+				if ( ! function_exists('register_block_type')) {
 					// Gutenberg is not active.
 					return;
 				}
@@ -117,13 +117,13 @@ 
 					'wordlift/geomap',
 					array(
 						'editor_script'   => 'wl-block-editor',
-						'render_callback' => function ( $attributes ) use ( $scope ) {
+						'render_callback' => function($attributes) use ($scope) {
 							$attr_code = '';
-							foreach ( $attributes as $key => $value ) {
-								$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+							foreach ($attributes as $key => $value) {
+								$attr_code .= $key.'="'.htmlentities($value).'" ';
 							}
 
-							return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+							return '['.$scope::SHORTCODE.' '.$attr_code.']';
 						},
 						'attributes'      => array(
 							'width'       => array(
@@ -144,7 +144,7 @@ 
 							),
 							'preview_src' => array(
 								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/geomap.png',
+								'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/geomap.png',
 							),
 						),
 					)
@@ -163,7 +163,7 @@ 
 	 * @since 3.13.0
 	 */
     // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function amp_post_template_css( $amp_template ) {
+	public function amp_post_template_css($amp_template) {
 
 		// Hide the `wl-geomap` when in AMP.
 		?>

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

Indentation +48 added lines, -48 removed lines

@@ -21,68 +21,68 @@
  */
 class Wordlift_Seo_Service {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function __construct() {
+    /**
+     * @inheritdoc
+     */
+    public function __construct() {
 
-		// If we are not on the admin, run the get_term filter for entity type terms.
-		add_filter(
-			'get_wl_entity_type',
-			array(
-				$this,
-				'get_wl_entity_type',
-			),
-			10
-		);
+        // If we are not on the admin, run the get_term filter for entity type terms.
+        add_filter(
+            'get_wl_entity_type',
+            array(
+                $this,
+                'get_wl_entity_type',
+            ),
+            10
+        );
 
-	}
+    }
 
-	/**
-	 * Filter the entity term object, and when not in admin context replace title
-	 * and description with whatever was set in the entity settings page.
-	 *
-	 * @param WP_Term $term The term to filters.
-	 *
-	 * @return WP_Term The {@link WP_Term} with fields changed.
-	 * @since    3.11
-	 */
-	public function get_wl_entity_type( $term ) {
+    /**
+     * Filter the entity term object, and when not in admin context replace title
+     * and description with whatever was set in the entity settings page.
+     *
+     * @param WP_Term $term The term to filters.
+     *
+     * @return WP_Term The {@link WP_Term} with fields changed.
+     * @since    3.11
+     */
+    public function get_wl_entity_type( $term ) {
 
-		// Do nothing when in admin.
-		if ( is_admin() ) {
-			return $term;
-		}
+        // Do nothing when in admin.
+        if ( is_admin() ) {
+            return $term;
+        }
 
-		// Get the terms' settings.
-		$entity_settings = get_option( 'wl_entity_type_settings', array() );
+        // Get the terms' settings.
+        $entity_settings = get_option( 'wl_entity_type_settings', array() );
 
-		// If we have no settings for the specified term, then return the original
-		// term.
-		if ( ! isset( $entity_settings[ $term->term_id ] ) ) {
+        // If we have no settings for the specified term, then return the original
+        // term.
+        if ( ! isset( $entity_settings[ $term->term_id ] ) ) {
 
-			return $term;
-		}
+            return $term;
+        }
 
-		// Get the settings for the specified term.
-		$settings = $entity_settings[ $term->term_id ];
+        // Get the settings for the specified term.
+        $settings = $entity_settings[ $term->term_id ];
 
-		// Update the name.
-		if ( ! empty( $settings['title'] ) ) {
+        // Update the name.
+        if ( ! empty( $settings['title'] ) ) {
 
-			$term->name = $settings['title'];
+            $term->name = $settings['title'];
 
-		}
+        }
 
-		// Update the description.
-		if ( ! empty( $settings['description'] ) ) {
+        // Update the description.
+        if ( ! empty( $settings['description'] ) ) {
 
-			$term->description = $settings['description'];
+            $term->description = $settings['description'];
 
-		}
+        }
 
-		// Return the updated term.
-		return $term;
-	}
+        // Return the updated term.
+        return $term;
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -47,35 +47,35 @@
 	 * @return WP_Term The {@link WP_Term} with fields changed.
 	 * @since    3.11
 	 */
-	public function get_wl_entity_type( $term ) {
+	public function get_wl_entity_type($term) {
 
 		// Do nothing when in admin.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			return $term;
 		}
 
 		// Get the terms' settings.
-		$entity_settings = get_option( 'wl_entity_type_settings', array() );
+		$entity_settings = get_option('wl_entity_type_settings', array());
 
 		// If we have no settings for the specified term, then return the original
 		// term.
-		if ( ! isset( $entity_settings[ $term->term_id ] ) ) {
+		if ( ! isset($entity_settings[$term->term_id])) {
 
 			return $term;
 		}
 
 		// Get the settings for the specified term.
-		$settings = $entity_settings[ $term->term_id ];
+		$settings = $entity_settings[$term->term_id];
 
 		// Update the name.
-		if ( ! empty( $settings['title'] ) ) {
+		if ( ! empty($settings['title'])) {
 
 			$term->name = $settings['title'];
 
 		}
 
 		// Update the description.
-		if ( ! empty( $settings['description'] ) ) {
+		if ( ! empty($settings['description'])) {
 
 			$term->description = $settings['description'];