insideout10 / wordlift-plugin

src/includes/class-wordlift-wprocket-adapter.php

Indentation +63 added lines, -63 removed lines

@@ -20,80 +20,80 @@
  */
 class Wordlift_WpRocket_Adapter {
 
-	/**
-	 * Create a {@link Wordlift_WpRocket_Adapter} instance.
-	 *
-	 * @since 3.19.4
-	 */
-	public function __construct() {
+    /**
+     * Create a {@link Wordlift_WpRocket_Adapter} instance.
+     *
+     * @since 3.19.4
+     */
+    public function __construct() {
 
-		add_filter( 'rocket_exclude_js', array( $this, 'exclude_js' ) );
-		add_filter( 'rocket_excluded_inline_js_content', array( $this, 'excluded_inline_js_content' ) );
+        add_filter( 'rocket_exclude_js', array( $this, 'exclude_js' ) );
+        add_filter( 'rocket_excluded_inline_js_content', array( $this, 'excluded_inline_js_content' ) );
 
-	}
+    }
 
-	/**
-	 * Get the absolute path for the specified URL.
-	 *
-	 * @param string $url The full URL.
-	 *
-	 * @return string The absolute path.
-	 */
-	private function get_absolute_path( $url ) {
+    /**
+     * Get the absolute path for the specified URL.
+     *
+     * @param string $url The full URL.
+     *
+     * @return string The absolute path.
+     */
+    private function get_absolute_path( $url ) {
 
-		if ( 1 !== preg_match( '|https?://[^/]+(/.*)$|', $url, $matches ) ) {
-			return $url;
-		}
+        if ( 1 !== preg_match( '|https?://[^/]+(/.*)$|', $url, $matches ) ) {
+            return $url;
+        }
 
-		return $matches[1];
-	}
+        return $matches[1];
+    }
 
-	/**
-	 * Hook to `rocket_exclude_defer_js` filter.
-	 *
-	 * @param array $excluded_js The preset excluded files.
-	 *
-	 * @return array The updated excluded files array.
-	 *
-	 * @since 3.25.0 We realized that WP Rocket has an issue with these path: while it seems to expect a path relative
-	 *               to home_url, it is actually looking for a path relative to the root. We leave both exclusions so
-	 *               that we'll be compatible in case WP Rocket fixes its implementation.
-	 * @since 3.23.0 add the Cloud js.
-	 * @since 3.20.0 hook to `rocket_exclude_js`.
-	 * @since 3.19.4
-	 */
-	public function exclude_js( $excluded_js = array() ) {
+    /**
+     * Hook to `rocket_exclude_defer_js` filter.
+     *
+     * @param array $excluded_js The preset excluded files.
+     *
+     * @return array The updated excluded files array.
+     *
+     * @since 3.25.0 We realized that WP Rocket has an issue with these path: while it seems to expect a path relative
+     *               to home_url, it is actually looking for a path relative to the root. We leave both exclusions so
+     *               that we'll be compatible in case WP Rocket fixes its implementation.
+     * @since 3.23.0 add the Cloud js.
+     * @since 3.20.0 hook to `rocket_exclude_js`.
+     * @since 3.19.4
+     */
+    public function exclude_js( $excluded_js = array() ) {
 
-		// Exclude our own public JS.
-		$excluded_js[] = $this->get_absolute_path( Wordlift_Public::get_public_js_url() );
-		$excluded_js[] = $this->get_absolute_path( Wordlift_Public::get_cloud_js_url() );
+        // Exclude our own public JS.
+        $excluded_js[] = $this->get_absolute_path( Wordlift_Public::get_public_js_url() );
+        $excluded_js[] = $this->get_absolute_path( Wordlift_Public::get_cloud_js_url() );
 
-		$excluded_js[] = str_replace( home_url(), '', plugin_dir_url( __DIR__ ) . '/js/dist/bundle.js' );
-		$excluded_js[] = str_replace( home_url(), '', plugin_dir_url( __DIR__ ) . '/js/dist/wordlift-cloud.js' );
+        $excluded_js[] = str_replace( home_url(), '', plugin_dir_url( __DIR__ ) . '/js/dist/bundle.js' );
+        $excluded_js[] = str_replace( home_url(), '', plugin_dir_url( __DIR__ ) . '/js/dist/wordlift-cloud.js' );
 
-		return $excluded_js;
-	}
+        return $excluded_js;
+    }
 
-	/**
-	 * Filters inline JS excluded from being combined
-	 *
-	 * @link https://github.com/insideout10/wordlift-plugin/issues/868
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $pattern Patterns to match.
-	 *
-	 * @return array Patterns to match.
-	 */
-	public function excluded_inline_js_content( $pattern = array() ) {
+    /**
+     * Filters inline JS excluded from being combined
+     *
+     * @link https://github.com/insideout10/wordlift-plugin/issues/868
+     *
+     * @since 3.20.0
+     *
+     * @param array $pattern Patterns to match.
+     *
+     * @return array Patterns to match.
+     */
+    public function excluded_inline_js_content( $pattern = array() ) {
 
-		$pattern[] = 'wlSettings';
-		$pattern[] = 'wlNavigators';
-		$pattern[] = '_wlCloudSettings';
-		$pattern[] = 'wlProductsNavigators';
-		$pattern[] = 'wlFaceteds';
+        $pattern[] = 'wlSettings';
+        $pattern[] = 'wlNavigators';
+        $pattern[] = '_wlCloudSettings';
+        $pattern[] = 'wlProductsNavigators';
+        $pattern[] = 'wlFaceteds';
 
-		return $pattern;
-	}
+        return $pattern;
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -27,8 +27,8 @@ 
 	 */
 	public function __construct() {
 
-		add_filter( 'rocket_exclude_js', array( $this, 'exclude_js' ) );
-		add_filter( 'rocket_excluded_inline_js_content', array( $this, 'excluded_inline_js_content' ) );
+		add_filter('rocket_exclude_js', array($this, 'exclude_js'));
+		add_filter('rocket_excluded_inline_js_content', array($this, 'excluded_inline_js_content'));
 
 	}
 
@@ -39,9 +39,9 @@ 
 	 *
 	 * @return string The absolute path.
 	 */
-	private function get_absolute_path( $url ) {
+	private function get_absolute_path($url) {
 
-		if ( 1 !== preg_match( '|https?://[^/]+(/.*)$|', $url, $matches ) ) {
+		if (1 !== preg_match('|https?://[^/]+(/.*)$|', $url, $matches)) {
 			return $url;
 		}
 
@@ -62,14 +62,14 @@ 
 	 * @since 3.20.0 hook to `rocket_exclude_js`.
 	 * @since 3.19.4
 	 */
-	public function exclude_js( $excluded_js = array() ) {
+	public function exclude_js($excluded_js = array()) {
 
 		// Exclude our own public JS.
-		$excluded_js[] = $this->get_absolute_path( Wordlift_Public::get_public_js_url() );
-		$excluded_js[] = $this->get_absolute_path( Wordlift_Public::get_cloud_js_url() );
+		$excluded_js[] = $this->get_absolute_path(Wordlift_Public::get_public_js_url());
+		$excluded_js[] = $this->get_absolute_path(Wordlift_Public::get_cloud_js_url());
 
-		$excluded_js[] = str_replace( home_url(), '', plugin_dir_url( __DIR__ ) . '/js/dist/bundle.js' );
-		$excluded_js[] = str_replace( home_url(), '', plugin_dir_url( __DIR__ ) . '/js/dist/wordlift-cloud.js' );
+		$excluded_js[] = str_replace(home_url(), '', plugin_dir_url(__DIR__).'/js/dist/bundle.js');
+		$excluded_js[] = str_replace(home_url(), '', plugin_dir_url(__DIR__).'/js/dist/wordlift-cloud.js');
 
 		return $excluded_js;
 	}
@@ -85,7 +85,7 @@ 
 	 *
 	 * @return array Patterns to match.
 	 */
-	public function excluded_inline_js_content( $pattern = array() ) {
+	public function excluded_inline_js_content($pattern = array()) {
 
 		$pattern[] = 'wlSettings';
 		$pattern[] = 'wlNavigators';

src/public/class-wordlift-faceted-search-shortcode.php

Indentation +250 added lines, -250 removed lines

@@ -17,124 +17,124 @@ 
  */
 class Wordlift_Faceted_Search_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_faceted_search';
-
-	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 );
-	}
-
-	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/faceted-search',
-					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_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 ) {
-
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts(
-			array(
-				'title'       => __( 'Related articles', 'wordlift' ),
-				'limit'       => apply_filters( 'wl_faceted_search_default_limit', 10 ),
-				'post_id'     => '',
-				'template_id' => '',
-				'uniqid'      => uniqid( 'wl-faceted-widget-' ),
-				'post_types'  => '',
-			),
-			$atts
-		);
-
-		return $shortcode_atts;
-	}
-
-	/**
-	 * Function in charge of diplaying the [wl-faceted-search] 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 );
-
-		// 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'] ) );
-		$faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
-
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $this->get_rest_url( $post, $delimiter, $limit, $shortcode_atts['post_types'] );
-		$rest_url            = esc_attr( $rest_url );
-
-		// 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/faceted-search/template' );
-
-		return wp_kses(
-			sprintf(
-				'
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_faceted_search';
+
+    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 );
+    }
+
+    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/faceted-search',
+                    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_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 ) {
+
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts(
+            array(
+                'title'       => __( 'Related articles', 'wordlift' ),
+                'limit'       => apply_filters( 'wl_faceted_search_default_limit', 10 ),
+                'post_id'     => '',
+                'template_id' => '',
+                'uniqid'      => uniqid( 'wl-faceted-widget-' ),
+                'post_types'  => '',
+            ),
+            $atts
+        );
+
+        return $shortcode_atts;
+    }
+
+    /**
+     * Function in charge of diplaying the [wl-faceted-search] 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 );
+
+        // 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'] ) );
+        $faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
+
+        $permalink_structure = get_option( 'permalink_structure' );
+        $delimiter           = empty( $permalink_structure ) ? '&' : '?';
+        $rest_url            = $this->get_rest_url( $post, $delimiter, $limit, $shortcode_atts['post_types'] );
+        $rest_url            = esc_attr( $rest_url );
+
+        // 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/faceted-search/template' );
+
+        return wp_kses(
+            sprintf(
+                '
 			<div id="%s" 
 				 class="wl-faceted" 
 				 data-rest-url="%s" 
@@ -142,77 +142,77 @@ 
 				 data-template-id="%s"
 				 data-template-url="%s"></div>
 			',
-				esc_attr( $faceted_id ),
-				esc_url( $rest_url ),
-				esc_attr( $title ),
-				esc_attr( $template_id ),
-				esc_url( $template_url )
-			),
-			array(
-				'div' => array(
-					'id'                => array(),
-					'class'             => array(),
-					'data-rest-url'     => array(),
-					'data-title'        => array(),
-					'data-template-id'  => array(),
-					'data-template-url' => array(),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * 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;
-		}
-
-		$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'] ) );
-		$faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
-
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query(
-				array(
-					'amp'     => 1,
-					'post_id' => $post->ID,
-					'limit'   => $limit,
-				)
-			)
-		) : false;
-
-		// 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 );
-
-		if ( empty( $template_id ) ) {
-			$template_id = 'template-' . $faceted_id;
-			wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
-		}
-
-		return <<<HTML
+                esc_attr( $faceted_id ),
+                esc_url( $rest_url ),
+                esc_attr( $title ),
+                esc_attr( $template_id ),
+                esc_url( $template_url )
+            ),
+            array(
+                'div' => array(
+                    'id'                => array(),
+                    'class'             => array(),
+                    'data-rest-url'     => array(),
+                    'data-title'        => array(),
+                    'data-template-id'  => array(),
+                    'data-template-url' => array(),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * 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;
+        }
+
+        $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'] ) );
+        $faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-widget-' );
+
+        $permalink_structure = get_option( 'permalink_structure' );
+        $delimiter           = empty( $permalink_structure ) ? '&' : '?';
+        $rest_url            = $post ? rest_url(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query(
+                array(
+                    'amp'     => 1,
+                    'post_id' => $post->ID,
+                    'limit'   => $limit,
+                )
+            )
+        ) : false;
+
+        // 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 );
+
+        if ( empty( $template_id ) ) {
+            $template_id = 'template-' . $faceted_id;
+            wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( __DIR__ ) . '/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION );
+        }
+
+        return <<<HTML
 		<div id="{$faceted_id}" class="wl-amp-faceted">
 			<h2 class="wl-headline">{$title}</h2>
 			<amp-state id="referencedPosts">
@@ -278,66 +278,66 @@ 
 			</section>
 		</div>
 HTML;
-	}
-
-	public function get_block_attributes() {
-		return array(
-			'title'       => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
-			),
-			'template_id' => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'post_id'     => array(
-				'type'    => 'number',
-				'default' => '',
-			),
-			'uniqid'      => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-			'limit'       => array(
-				'type'    => 'number',
-				'default' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
-			),
-			'preview'     => array(
-				'type'    => 'boolean',
-				'default' => false,
-			),
-			'preview_src' => array(
-				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/faceted-search.png',
-			),
-			'post_types'  => array(
-				'type'    => 'string',
-				'default' => '',
-			),
-		);
-	}
-
-	/**
-	 * @param $post
-	 * @param $delimiter
-	 * @param $limit
-	 *
-	 * @param $post_types
-	 *
-	 * @return bool|string
-	 */
-	public function get_rest_url( $post, $delimiter, $limit, $post_types ) {
-		$rest_url = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query(
-				array(
-					'post_id'    => $post->ID,
-					'limit'      => $limit,
-					'post_types' => $post_types,
-				)
-			)
-		) : false;
-
-		return $rest_url;
-	}
+    }
+
+    public function get_block_attributes() {
+        return array(
+            'title'       => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' ),
+            ),
+            'template_id' => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'post_id'     => array(
+                'type'    => 'number',
+                'default' => '',
+            ),
+            'uniqid'      => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+            'limit'       => array(
+                'type'    => 'number',
+                'default' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
+            ),
+            'preview'     => array(
+                'type'    => 'boolean',
+                'default' => false,
+            ),
+            'preview_src' => array(
+                'type'    => 'string',
+                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/faceted-search.png',
+            ),
+            'post_types'  => array(
+                'type'    => 'string',
+                'default' => '',
+            ),
+        );
+    }
+
+    /**
+     * @param $post
+     * @param $delimiter
+     * @param $limit
+     *
+     * @param $post_types
+     *
+     * @return bool|string
+     */
+    public function get_rest_url( $post, $delimiter, $limit, $post_types ) {
+        $rest_url = $post ? rest_url(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query(
+                array(
+                    'post_id'    => $post->ID,
+                    'limit'      => $limit,
+                    'post_types' => $post_types,
+                )
+            )
+        ) : false;
+
+        return $rest_url;
+    }
 
 }

Spacing +54 added lines, -54 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,13 +52,13 @@ 
 					'wordlift/faceted-search',
 					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_block_attributes(),
@@ -77,16 +77,16 @@ 
 	 * @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' ),
-				'limit'       => apply_filters( 'wl_faceted_search_default_limit', 10 ),
+				'title'       => __('Related articles', 'wordlift'),
+				'limit'       => apply_filters('wl_faceted_search_default_limit', 10),
 				'post_id'     => '',
 				'template_id' => '',
-				'uniqid'      => uniqid( 'wl-faceted-widget-' ),
+				'uniqid'      => uniqid('wl-faceted-widget-'),
 				'post_types'  => '',
 			),
 			$atts
@@ -103,34 +103,34 @@ 
 	 * @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'] ) );
-		$faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-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']));
+		$faceted_id  = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-faceted-widget-');
 
-		$permalink_structure = get_option( 'permalink_structure' );
-		$delimiter           = empty( $permalink_structure ) ? '&' : '?';
-		$rest_url            = $this->get_rest_url( $post, $delimiter, $limit, $shortcode_atts['post_types'] );
-		$rest_url            = esc_attr( $rest_url );
+		$permalink_structure = get_option('permalink_structure');
+		$delimiter           = empty($permalink_structure) ? '&' : '?';
+		$rest_url            = $this->get_rest_url($post, $delimiter, $limit, $shortcode_atts['post_types']);
+		$rest_url            = esc_attr($rest_url);
 
 		// 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/faceted-search/template' );
+		wp_enqueue_script('wordlift-cloud');
+		$template_url = get_rest_url(null, '/wordlift/v1/faceted-search/template');
 
 		return wp_kses(
 			sprintf(
@@ -142,11 +142,11 @@ 
 				 data-template-id="%s"
 				 data-template-url="%s"></div>
 			',
-				esc_attr( $faceted_id ),
-				esc_url( $rest_url ),
-				esc_attr( $title ),
-				esc_attr( $template_id ),
-				esc_url( $template_url )
+				esc_attr($faceted_id),
+				esc_url($rest_url),
+				esc_attr($title),
+				esc_attr($template_id),
+				esc_url($template_url)
 			),
 			array(
 				'div' => array(
@@ -170,26 +170,26 @@ 
 	 * @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'] ) );
-		$faceted_id  = ! empty( $shortcode_atts['uniqid'] ) ? esc_attr( sanitize_text_field( $shortcode_atts['uniqid'] ) ) : uniqid( 'wl-faceted-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']));
+		$faceted_id  = ! empty($shortcode_atts['uniqid']) ? esc_attr(sanitize_text_field($shortcode_atts['uniqid'])) : uniqid('wl-faceted-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 . '/faceted-search' . $delimiter . build_query(
+			WL_REST_ROUTE_DEFAULT_NAMESPACE.'/faceted-search'.$delimiter.build_query(
 				array(
 					'amp'     => 1,
 					'post_id' => $post->ID,
@@ -199,17 +199,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-' . $faceted_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-'.$faceted_id;
+			wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(__DIR__).'/css/wordlift-amp-custom.min.css', array(), WORDLIFT_VERSION);
 		}
 
 		return <<<HTML
@@ -284,7 +284,7 @@ 
 		return array(
 			'title'       => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' ),
+				'default' => __('Related articles', 'wordlift'),
 			),
 			'template_id' => array(
 				'type'    => 'string',
@@ -300,7 +300,7 @@ 
 			),
 			'limit'       => array(
 				'type'    => 'number',
-				'default' => apply_filters( 'wl_faceted_search_default_limit', 10 ),
+				'default' => apply_filters('wl_faceted_search_default_limit', 10),
 			),
 			'preview'     => array(
 				'type'    => 'boolean',
@@ -308,7 +308,7 @@ 
 			),
 			'preview_src' => array(
 				'type'    => 'string',
-				'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/faceted-search.png',
+				'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/faceted-search.png',
 			),
 			'post_types'  => array(
 				'type'    => 'string',
@@ -326,9 +326,9 @@ 
 	 *
 	 * @return bool|string
 	 */
-	public function get_rest_url( $post, $delimiter, $limit, $post_types ) {
+	public function get_rest_url($post, $delimiter, $limit, $post_types) {
 		$rest_url = $post ? rest_url(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faceted-search' . $delimiter . build_query(
+			WL_REST_ROUTE_DEFAULT_NAMESPACE.'/faceted-search'.$delimiter.build_query(
 				array(
 					'post_id'    => $post->ID,
 					'limit'      => $limit,

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

Indentation +79 added lines, -79 removed lines

@@ -16,35 +16,35 @@ 
  */
 class Wordlift_Related_Entities_Cloud_Widget extends Wordlift_Widget {
 
-	/**
-	 * Create an {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 *
-	 * @since 3.11.0
-	 */
-	public function __construct() {
-		parent::__construct(
-			'wl_related_entities_cloud',
-			__( 'WordLift Entities Cloud', 'wordlift' ),
-			array(
-				'classname'   => 'wl_related_entities_cloud',
-				'description' => __( 'Display entities related to the current post/entity in a tag cloud.', 'wordlift' ),
-			)
-		);
-
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function form( $instance ) {
-		$title_id          = $this->get_field_id( 'title' );
-		$instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
-		?>
+    /**
+     * Create an {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     *
+     * @since 3.11.0
+     */
+    public function __construct() {
+        parent::__construct(
+            'wl_related_entities_cloud',
+            __( 'WordLift Entities Cloud', 'wordlift' ),
+            array(
+                'classname'   => 'wl_related_entities_cloud',
+                'description' => __( 'Display entities related to the current post/entity in a tag cloud.', 'wordlift' ),
+            )
+        );
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function form( $instance ) {
+        $title_id          = $this->get_field_id( 'title' );
+        $instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+        ?>
 
 		<p><label for="<?php echo esc_attr( $title_id ); ?>">
 				<?php
-				esc_html_e( 'Title:', 'wordlift' );
-				?>
+                esc_html_e( 'Title:', 'wordlift' );
+                ?>
 			</label>
 			<input type="text" class="widefat"
 				   id="<?php echo esc_attr( $title_id ); ?>"
@@ -54,65 +54,65 @@ 
 
 		<?php
 
-		return 'wl_related_entities_cloud_form';
-	}
+        return 'wl_related_entities_cloud_form';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function update( $new_instance, $old_instance ) {
+    /**
+     * @inheritdoc
+     */
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function update( $new_instance, $old_instance ) {
 
-		return array( 'title' => sanitize_text_field( $new_instance['title'] ) );
-	}
+        return array( 'title' => sanitize_text_field( $new_instance['title'] ) );
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function widget( $args, $instance ) {
+    /**
+     * @inheritdoc
+     */
+    public function widget( $args, $instance ) {
 
-		/*
+        /*
 		 * Use the shortcode to calculate the HTML required to show the cloud
 		 * if there is no such html do not render the widget at all.
 		 */
-		$cloud_html = do_shortcode( '[wl_cloud]' );
-		if ( empty( $cloud_html ) ) {
-			return false;
-		}
-
-		// The widget title.
-		$title = empty( $instance['title'] ) ? __( 'Related Entities', 'wordlift' ) : $instance['title'];
-
-		// Standard filter all widgets should apply
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
-
-		echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-
-		if ( $title ) {
-			echo $args['before_title'] . esc_html( $title ) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}
-
-		echo wp_kses(
-			$cloud_html,
-			array(
-				'div'  => array( 'class' => array() ),
-				'span' => array( 'class' => array() ),
-				'a'    => array(
-					'href'       => array(),
-					'class'      => array(),
-					'style'      => array(),
-					'aria-label' => array(),
-				),
-				'ul'   => array(
-					'class' => array(),
-					'role'  => array(),
-				),
-				'li'   => array(),
-			)
-		);
-
-		echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-
-	}
+        $cloud_html = do_shortcode( '[wl_cloud]' );
+        if ( empty( $cloud_html ) ) {
+            return false;
+        }
+
+        // The widget title.
+        $title = empty( $instance['title'] ) ? __( 'Related Entities', 'wordlift' ) : $instance['title'];
+
+        // Standard filter all widgets should apply
+        $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+
+        echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+
+        if ( $title ) {
+            echo $args['before_title'] . esc_html( $title ) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+        }
+
+        echo wp_kses(
+            $cloud_html,
+            array(
+                'div'  => array( 'class' => array() ),
+                'span' => array( 'class' => array() ),
+                'a'    => array(
+                    'href'       => array(),
+                    'class'      => array(),
+                    'style'      => array(),
+                    'aria-label' => array(),
+                ),
+                'ul'   => array(
+                    'class' => array(),
+                    'role'  => array(),
+                ),
+                'li'   => array(),
+            )
+        );
+
+        echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -24,10 +24,10 @@ 
 	public function __construct() {
 		parent::__construct(
 			'wl_related_entities_cloud',
-			__( 'WordLift Entities Cloud', 'wordlift' ),
+			__('WordLift Entities Cloud', 'wordlift'),
 			array(
 				'classname'   => 'wl_related_entities_cloud',
-				'description' => __( 'Display entities related to the current post/entity in a tag cloud.', 'wordlift' ),
+				'description' => __('Display entities related to the current post/entity in a tag cloud.', 'wordlift'),
 			)
 		);
 
@@ -36,20 +36,20 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function form( $instance ) {
-		$title_id          = $this->get_field_id( 'title' );
-		$instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+	public function form($instance) {
+		$title_id          = $this->get_field_id('title');
+		$instance['title'] = ! empty($instance['title']) ? esc_attr($instance['title']) : '';
 		?>
 
-		<p><label for="<?php echo esc_attr( $title_id ); ?>">
+		<p><label for="<?php echo esc_attr($title_id); ?>">
 				<?php
-				esc_html_e( 'Title:', 'wordlift' );
+				esc_html_e('Title:', 'wordlift');
 				?>
 			</label>
 			<input type="text" class="widefat"
-				   id="<?php echo esc_attr( $title_id ); ?>"
-				   name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>"
-				   value="<?php echo esc_attr( $instance['title'] ); ?>"/>
+				   id="<?php echo esc_attr($title_id); ?>"
+				   name="<?php echo esc_attr($this->get_field_name('title')); ?>"
+				   value="<?php echo esc_attr($instance['title']); ?>"/>
 		</p>
 
 		<?php
@@ -61,42 +61,42 @@ 
 	 * @inheritdoc
 	 */
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
-		return array( 'title' => sanitize_text_field( $new_instance['title'] ) );
+		return array('title' => sanitize_text_field($new_instance['title']));
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		/*
 		 * Use the shortcode to calculate the HTML required to show the cloud
 		 * if there is no such html do not render the widget at all.
 		 */
-		$cloud_html = do_shortcode( '[wl_cloud]' );
-		if ( empty( $cloud_html ) ) {
+		$cloud_html = do_shortcode('[wl_cloud]');
+		if (empty($cloud_html)) {
 			return false;
 		}
 
 		// The widget title.
-		$title = empty( $instance['title'] ) ? __( 'Related Entities', 'wordlift' ) : $instance['title'];
+		$title = empty($instance['title']) ? __('Related Entities', 'wordlift') : $instance['title'];
 
 		// Standard filter all widgets should apply
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
 
 		echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
-		if ( $title ) {
-			echo $args['before_title'] . esc_html( $title ) . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		if ($title) {
+			echo $args['before_title'].esc_html($title).$args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
 
 		echo wp_kses(
 			$cloud_html,
 			array(
-				'div'  => array( 'class' => array() ),
-				'span' => array( 'class' => array() ),
+				'div'  => array('class' => array()),
+				'span' => array('class' => array()),
 				'a'    => array(
 					'href'       => array(),
 					'class'      => array(),

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

Indentation +404 added lines, -404 removed lines

@@ -18,267 +18,267 @@ 
  */
 class Wordlift_Vocabulary_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * The shortcode.
-	 *
-	 * @since  3.17.0
-	 */
-	const SHORTCODE = 'wl_vocabulary';
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.17.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The vocabulary id
-	 *
-	 * @since  3.18.3
-	 * @access private
-	 * @var int $vocabulary_id The vocabulary unique id.
-	 */
-	private static $vocabulary_id = 0;
-
-	/**
-	 * Create a {@link Wordlift_Glossary_Shortcode} instance.
-	 *
-	 * @since 3.16.0
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->register_block_type();
-
-	}
-
-	/**
-	 * Check whether the requirements for this shortcode to work are available.
-	 *
-	 * @return bool True if the requirements are satisfied otherwise false.
-	 * @since 3.17.0
-	 */
-	private static function are_requirements_satisfied() {
-
-		return function_exists( 'mb_strlen' ) &&
-			   function_exists( 'mb_substr' ) &&
-			   function_exists( 'mb_strtolower' ) &&
-			   function_exists( 'mb_strtoupper' ) &&
-			   function_exists( 'mb_convert_case' );
-	}
-
-	/**
-	 * Render the shortcode.
-	 *
-	 * @param array $atts An array of shortcode attributes as set by the editor.
-	 *
-	 * @return string The output html code.
-	 * @since 3.16.0
-	 */
-	public function render( $atts ) {
-
-		// Bail out if the requirements aren't satisfied: we need mbstring for
-		// the vocabulary widget to work.
-		if ( ! self::are_requirements_satisfied() ) {
-			$this->log->warn( "The vocabulary widget cannot be displayed because this WordPress installation doesn't satisfy its requirements." );
-
-			return '';
-		}
-
-		wp_enqueue_style( 'wl-vocabulary-shortcode', dirname( plugin_dir_url( __FILE__ ) ) . '/public/css/wordlift-vocabulary-shortcode.css', array(), WORDLIFT_VERSION );
-
-		// Extract attributes and set default values.
-		$atts = shortcode_atts(
-			array(
-				// The entity type, such as `person`, `organization`, ...
-				'type'    => 'all',
-				// Limit the number of posts to 100 by default. Use -1 to remove the limit.
-				'limit'   => 100,
-				// Sort by title.
-				'orderby' => 'post_date',
-				// Sort DESC.
-				'order'   => 'DESC',
-				// Allow to specify the category ID.
-				'cat'     => '',
-			),
-			$atts
-		);
-
-		// Get the posts. Note that if a `type` is specified before, then the
-		// `tax_query` from the `add_criterias` call isn't added.
-		$posts = $this->get_posts( $atts );
-
-		// Get the alphabet.
-		$language_code = Wordlift_Configuration_Service::get_instance()->get_language_code();
-		$alphabet      = Wordlift_Alphabet_Service::get( $language_code );
-
-		// Add posts to the alphabet.
-		foreach ( $posts as $post ) {
-			$this->add_to_alphabet( $alphabet, $post->ID );
-		}
-
-		$header   = '';
-		$sections = '';
-
-		// Get unique id for each vocabulary shortcode.
-		$vocabulary_id = self::get_and_increment_vocabulary_id();
-
-		// Generate the header.
-		foreach ( $alphabet as $item => $translations ) {
-			$template = ( empty( $translations )
-				? '<span class="wl-vocabulary-widget-disabled">%s</span>'
-				: '<a href="#wl-vocabulary-%3$d-%2$s">%1$s</a>' );
-
-			$header .= sprintf( $template, esc_html( $item ), esc_attr( $item ), $vocabulary_id );
-		}
-
-		// Generate the sections.
-		foreach ( $alphabet as $item => $translations ) {
-			// @since 3.19.3 we use `mb_strtolower` and `mb_strtoupper` with a custom function to handle sorting,
-			// since we had `AB` being placed before `Aa` with `asort`.
-			//
-			// Order the translations alphabetically.
-			// asort( $translations );
-			uasort(
-				$translations,
-				function ( $a, $b ) {
-					if ( mb_strtolower( $a ) === mb_strtolower( $b )
-						 || mb_strtoupper( $a ) === mb_strtoupper( $b ) ) {
-						return 0;
-					}
-
-					return ( mb_strtolower( $a ) < mb_strtolower( $b ) ) ? - 1 : 1;
-				}
-			);
-			$sections .= $this->get_section( $item, $translations, $vocabulary_id );
-		}
-
-		// Return HTML template.
-		ob_start();
-		?>
+    /**
+     * The shortcode.
+     *
+     * @since  3.17.0
+     */
+    const SHORTCODE = 'wl_vocabulary';
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.17.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The vocabulary id
+     *
+     * @since  3.18.3
+     * @access private
+     * @var int $vocabulary_id The vocabulary unique id.
+     */
+    private static $vocabulary_id = 0;
+
+    /**
+     * Create a {@link Wordlift_Glossary_Shortcode} instance.
+     *
+     * @since 3.16.0
+     */
+    public function __construct() {
+        parent::__construct();
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->register_block_type();
+
+    }
+
+    /**
+     * Check whether the requirements for this shortcode to work are available.
+     *
+     * @return bool True if the requirements are satisfied otherwise false.
+     * @since 3.17.0
+     */
+    private static function are_requirements_satisfied() {
+
+        return function_exists( 'mb_strlen' ) &&
+               function_exists( 'mb_substr' ) &&
+               function_exists( 'mb_strtolower' ) &&
+               function_exists( 'mb_strtoupper' ) &&
+               function_exists( 'mb_convert_case' );
+    }
+
+    /**
+     * Render the shortcode.
+     *
+     * @param array $atts An array of shortcode attributes as set by the editor.
+     *
+     * @return string The output html code.
+     * @since 3.16.0
+     */
+    public function render( $atts ) {
+
+        // Bail out if the requirements aren't satisfied: we need mbstring for
+        // the vocabulary widget to work.
+        if ( ! self::are_requirements_satisfied() ) {
+            $this->log->warn( "The vocabulary widget cannot be displayed because this WordPress installation doesn't satisfy its requirements." );
+
+            return '';
+        }
+
+        wp_enqueue_style( 'wl-vocabulary-shortcode', dirname( plugin_dir_url( __FILE__ ) ) . '/public/css/wordlift-vocabulary-shortcode.css', array(), WORDLIFT_VERSION );
+
+        // Extract attributes and set default values.
+        $atts = shortcode_atts(
+            array(
+                // The entity type, such as `person`, `organization`, ...
+                'type'    => 'all',
+                // Limit the number of posts to 100 by default. Use -1 to remove the limit.
+                'limit'   => 100,
+                // Sort by title.
+                'orderby' => 'post_date',
+                // Sort DESC.
+                'order'   => 'DESC',
+                // Allow to specify the category ID.
+                'cat'     => '',
+            ),
+            $atts
+        );
+
+        // Get the posts. Note that if a `type` is specified before, then the
+        // `tax_query` from the `add_criterias` call isn't added.
+        $posts = $this->get_posts( $atts );
+
+        // Get the alphabet.
+        $language_code = Wordlift_Configuration_Service::get_instance()->get_language_code();
+        $alphabet      = Wordlift_Alphabet_Service::get( $language_code );
+
+        // Add posts to the alphabet.
+        foreach ( $posts as $post ) {
+            $this->add_to_alphabet( $alphabet, $post->ID );
+        }
+
+        $header   = '';
+        $sections = '';
+
+        // Get unique id for each vocabulary shortcode.
+        $vocabulary_id = self::get_and_increment_vocabulary_id();
+
+        // Generate the header.
+        foreach ( $alphabet as $item => $translations ) {
+            $template = ( empty( $translations )
+                ? '<span class="wl-vocabulary-widget-disabled">%s</span>'
+                : '<a href="#wl-vocabulary-%3$d-%2$s">%1$s</a>' );
+
+            $header .= sprintf( $template, esc_html( $item ), esc_attr( $item ), $vocabulary_id );
+        }
+
+        // Generate the sections.
+        foreach ( $alphabet as $item => $translations ) {
+            // @since 3.19.3 we use `mb_strtolower` and `mb_strtoupper` with a custom function to handle sorting,
+            // since we had `AB` being placed before `Aa` with `asort`.
+            //
+            // Order the translations alphabetically.
+            // asort( $translations );
+            uasort(
+                $translations,
+                function ( $a, $b ) {
+                    if ( mb_strtolower( $a ) === mb_strtolower( $b )
+                         || mb_strtoupper( $a ) === mb_strtoupper( $b ) ) {
+                        return 0;
+                    }
+
+                    return ( mb_strtolower( $a ) < mb_strtolower( $b ) ) ? - 1 : 1;
+                }
+            );
+            $sections .= $this->get_section( $item, $translations, $vocabulary_id );
+        }
+
+        // Return HTML template.
+        ob_start();
+        ?>
 		<div class='wl-vocabulary'>
 			<nav class='wl-vocabulary-alphabet-nav'>
 				<?php
-				echo wp_kses(
-					$header,
-					array(
-						'span' => array( 'class' => array() ),
-						'a'    => array( 'href' => array() ),
-					)
-				);
-				?>
+                echo wp_kses(
+                    $header,
+                    array(
+                        'span' => array( 'class' => array() ),
+                        'a'    => array( 'href' => array() ),
+                    )
+                );
+                ?>
 			</nav>
 			<div class='wl-vocabulary-grid'>
 				<?php
-				echo wp_kses(
-					$sections,
-					array(
-						'div'   => array(
-							'class' => array(),
-							'id'    => array(),
-						),
-						'aside' => array( 'class' => array() ),
-						'ul'    => array( 'class' => array() ),
-						'li'    => array(),
-						'a'     => array( 'href' => array() ),
-					)
-				);
-				?>
+                echo wp_kses(
+                    $sections,
+                    array(
+                        'div'   => array(
+                            'class' => array(),
+                            'id'    => array(),
+                        ),
+                        'aside' => array( 'class' => array() ),
+                        'ul'    => array( 'class' => array() ),
+                        'li'    => array(),
+                        'a'     => array( 'href' => array() ),
+                    )
+                );
+                ?>
 			</div>
 		</div>
 		<?php
-		$html = ob_get_clean();
-
-		return $html;
-
-	}
-
-	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/vocabulary',
-					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(
-							'type'        => array(
-								'type'    => 'string',
-								'default' => 'all',
-							),
-							'limit'       => array(
-								'type'    => 'number',
-								'default' => 100,
-							),
-							'orderby'     => array(
-								'type'    => 'string',
-								'default' => 'post_date',
-							),
-							'order'       => array(
-								'type'    => 'string',
-								'default' => 'DESC',
-							),
-							'cat'         => array(
-								'type'    => 'string',
-								'default' => '',
-							),
-							'preview'     => array(
-								'type'    => 'boolean',
-								'default' => false,
-							),
-							'preview_src' => array(
-								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/vocabulary.png',
-							),
-						),
-					)
-				);
-			}
-		);
-	}
-
-	/**
-	 * Generate the html code for the section.
-	 *
-	 * @param string $letter The section's letter.
-	 * @param array  $posts An array of `$post_id => $post_title` associated with
-	 *                                the section.
-	 * @param int    $vocabulary_id Unique vocabulary id.
-	 *
-	 * @return string The section html code (or an empty string if the section has
-	 *                no posts).
-	 * @since 3.17.0
-	 */
-	private function get_section( $letter, $posts, $vocabulary_id ) {
-
-		// Return an empty string if there are no posts.
-		if ( 0 === count( $posts ) ) {
-			return '';
-		}
-
-		return sprintf(
-			'
+        $html = ob_get_clean();
+
+        return $html;
+
+    }
+
+    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/vocabulary',
+                    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(
+                            'type'        => array(
+                                'type'    => 'string',
+                                'default' => 'all',
+                            ),
+                            'limit'       => array(
+                                'type'    => 'number',
+                                'default' => 100,
+                            ),
+                            'orderby'     => array(
+                                'type'    => 'string',
+                                'default' => 'post_date',
+                            ),
+                            'order'       => array(
+                                'type'    => 'string',
+                                'default' => 'DESC',
+                            ),
+                            'cat'         => array(
+                                'type'    => 'string',
+                                'default' => '',
+                            ),
+                            'preview'     => array(
+                                'type'    => 'boolean',
+                                'default' => false,
+                            ),
+                            'preview_src' => array(
+                                'type'    => 'string',
+                                'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/vocabulary.png',
+                            ),
+                        ),
+                    )
+                );
+            }
+        );
+    }
+
+    /**
+     * Generate the html code for the section.
+     *
+     * @param string $letter The section's letter.
+     * @param array  $posts An array of `$post_id => $post_title` associated with
+     *                                the section.
+     * @param int    $vocabulary_id Unique vocabulary id.
+     *
+     * @return string The section html code (or an empty string if the section has
+     *                no posts).
+     * @since 3.17.0
+     */
+    private function get_section( $letter, $posts, $vocabulary_id ) {
+
+        // Return an empty string if there are no posts.
+        if ( 0 === count( $posts ) ) {
+            return '';
+        }
+
+        return sprintf(
+            '
 			<div class="wl-vocabulary-letter-block" id="wl-vocabulary-%d-%s">
 				<aside class="wl-vocabulary-left-column">%s</aside>
 				<div class="wl-vocabulary-right-column">
@@ -288,157 +288,157 @@ 
 				</div>
 			</div>
 		',
-			$vocabulary_id,
-			esc_attr( $letter ),
-			esc_html( $letter ),
-			$this->format_posts_as_list( $posts )
-		);
-	}
-
-	/**
-	 * Format an array post `$post_id => $post_title` as a list.
-	 *
-	 * @param array $posts An array of `$post_id => $post_title` key, value pairs.
-	 *
-	 * @return string A list.
-	 * @since 3.17.0
-	 */
-	private function format_posts_as_list( $posts ) {
-
-		return array_reduce(
-			array_keys( $posts ),
-			function ( $carry, $item ) use ( $posts ) {
-				return $carry . sprintf( '<li><a href="%s">%s</a></li>', esc_attr( get_permalink( $item ) ), esc_html( $posts[ $item ] ) );
-			},
-			''
-		);
-	}
-
-	/**
-	 * Get the posts from WordPress using the provided attributes.
-	 *
-	 * @param array $atts The shortcode attributes.
-	 *
-	 * @return array An array of {@link WP_Post}s.
-	 * @since 3.17.0
-	 */
-	private function get_posts( $atts ) {
-		// The default arguments for the query.
-		$args = array(
-			// phpcs:ignore WordPress.WP.PostsPerPage.posts_per_page_posts_per_page
-			'posts_per_page'         => intval( $atts['limit'] ),
-			'update_post_meta_cache' => false,
-			'update_post_term_cache' => false,
-			'orderby'                => $atts['orderby'],
-			'order'                  => $atts['order'],
-			// Exclude the publisher.
-			'post__not_in'           => array( Wordlift_Configuration_Service::get_instance()->get_publisher_id() ),
-		);
-
-		// Limit the based entity type if needed.
-		if ( 'all' !== $atts['type'] ) {
-			$args['tax_query'] = array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => $atts['type'],
-				),
-			);
-		}
-
-		if ( ! empty( $atts['cat'] ) ) {
-			$args['cat'] = $atts['cat'];
-		}
-
-		// Get the posts. Note that if a `type` is specified before, then the
-		// `tax_query` from the `add_criterias` call isn't added.
-		return get_posts( Wordlift_Entity_Service::add_criterias( $args ) );
-
-	}
-
-	/**
-	 * Populate the alphabet with posts.
-	 *
-	 * @param array $alphabet An array of letters.
-	 * @param int   $post_id The {@link WP_Post} id.
-	 *
-	 * @since 3.17.0
-	 */
-	private function add_to_alphabet( &$alphabet, $post_id ) {
-
-		// Get the title without accents.
-		$title = $this->get_the_title( $post_id );
-
-		// Get the initial letter.
-		$letter = $this->get_first_letter_in_alphabet_or_hash( $alphabet, $title );
-
-		// Add the post.
-		$alphabet[ $letter ][ $post_id ] = $title;
-
-	}
-
-	/**
-	 * Get the title without accents.
-	 * If the post is not of type `entity`, use first synonym if synonyms exists.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1096
-	 *
-	 * @since 3.27.0
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 *
-	 * @return string
-	 */
-	private function get_the_title( $post_id ) {
-
-		$title = get_the_title( $post_id );
-
-		if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
-			$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
-
-			if ( count( $alternative_labels ) > 0 ) {
-				$title = $alternative_labels[0];
-			}
-		}
-
-		return remove_accents( $title );
-
-	}
-
-	/**
-	 * Find the first letter in the alphabet.
-	 *
-	 * In some alphabets a letter is a compound of letters, therefore this function
-	 * will look for groups of 2 or 3 letters in the alphabet before looking for a
-	 * single letter. In case the letter is not found a # (hash) key is returned.
-	 *
-	 * @param array  $alphabet An array of alphabet letters.
-	 * @param string $title The title to match.
-	 *
-	 * @return string The initial letter or a `#` key.
-	 * @since 3.17.0
-	 */
-	private function get_first_letter_in_alphabet_or_hash( $alphabet, $title ) {
-
-		// Need to handle letters which consist of 3 and 2 characters.
-		for ( $i = 3; $i > 0; $i -- ) {
-			$letter = mb_convert_case( mb_substr( $title, 0, $i ), MB_CASE_UPPER );
-			if ( isset( $alphabet[ $letter ] ) ) {
-				return $letter;
-			}
-		}
-
-		return '#';
-	}
-
-	/**
-	 * Get and increment the `$vocabulary_id`.
-	 *
-	 * @return int The incremented vocabulary id.
-	 * @since  3.18.3
-	 */
-	private static function get_and_increment_vocabulary_id() {
-		return self::$vocabulary_id ++;
-	}
+            $vocabulary_id,
+            esc_attr( $letter ),
+            esc_html( $letter ),
+            $this->format_posts_as_list( $posts )
+        );
+    }
+
+    /**
+     * Format an array post `$post_id => $post_title` as a list.
+     *
+     * @param array $posts An array of `$post_id => $post_title` key, value pairs.
+     *
+     * @return string A list.
+     * @since 3.17.0
+     */
+    private function format_posts_as_list( $posts ) {
+
+        return array_reduce(
+            array_keys( $posts ),
+            function ( $carry, $item ) use ( $posts ) {
+                return $carry . sprintf( '<li><a href="%s">%s</a></li>', esc_attr( get_permalink( $item ) ), esc_html( $posts[ $item ] ) );
+            },
+            ''
+        );
+    }
+
+    /**
+     * Get the posts from WordPress using the provided attributes.
+     *
+     * @param array $atts The shortcode attributes.
+     *
+     * @return array An array of {@link WP_Post}s.
+     * @since 3.17.0
+     */
+    private function get_posts( $atts ) {
+        // The default arguments for the query.
+        $args = array(
+            // phpcs:ignore WordPress.WP.PostsPerPage.posts_per_page_posts_per_page
+            'posts_per_page'         => intval( $atts['limit'] ),
+            'update_post_meta_cache' => false,
+            'update_post_term_cache' => false,
+            'orderby'                => $atts['orderby'],
+            'order'                  => $atts['order'],
+            // Exclude the publisher.
+            'post__not_in'           => array( Wordlift_Configuration_Service::get_instance()->get_publisher_id() ),
+        );
+
+        // Limit the based entity type if needed.
+        if ( 'all' !== $atts['type'] ) {
+            $args['tax_query'] = array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => $atts['type'],
+                ),
+            );
+        }
+
+        if ( ! empty( $atts['cat'] ) ) {
+            $args['cat'] = $atts['cat'];
+        }
+
+        // Get the posts. Note that if a `type` is specified before, then the
+        // `tax_query` from the `add_criterias` call isn't added.
+        return get_posts( Wordlift_Entity_Service::add_criterias( $args ) );
+
+    }
+
+    /**
+     * Populate the alphabet with posts.
+     *
+     * @param array $alphabet An array of letters.
+     * @param int   $post_id The {@link WP_Post} id.
+     *
+     * @since 3.17.0
+     */
+    private function add_to_alphabet( &$alphabet, $post_id ) {
+
+        // Get the title without accents.
+        $title = $this->get_the_title( $post_id );
+
+        // Get the initial letter.
+        $letter = $this->get_first_letter_in_alphabet_or_hash( $alphabet, $title );
+
+        // Add the post.
+        $alphabet[ $letter ][ $post_id ] = $title;
+
+    }
+
+    /**
+     * Get the title without accents.
+     * If the post is not of type `entity`, use first synonym if synonyms exists.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1096
+     *
+     * @since 3.27.0
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     *
+     * @return string
+     */
+    private function get_the_title( $post_id ) {
+
+        $title = get_the_title( $post_id );
+
+        if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
+            $alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
+
+            if ( count( $alternative_labels ) > 0 ) {
+                $title = $alternative_labels[0];
+            }
+        }
+
+        return remove_accents( $title );
+
+    }
+
+    /**
+     * Find the first letter in the alphabet.
+     *
+     * In some alphabets a letter is a compound of letters, therefore this function
+     * will look for groups of 2 or 3 letters in the alphabet before looking for a
+     * single letter. In case the letter is not found a # (hash) key is returned.
+     *
+     * @param array  $alphabet An array of alphabet letters.
+     * @param string $title The title to match.
+     *
+     * @return string The initial letter or a `#` key.
+     * @since 3.17.0
+     */
+    private function get_first_letter_in_alphabet_or_hash( $alphabet, $title ) {
+
+        // Need to handle letters which consist of 3 and 2 characters.
+        for ( $i = 3; $i > 0; $i -- ) {
+            $letter = mb_convert_case( mb_substr( $title, 0, $i ), MB_CASE_UPPER );
+            if ( isset( $alphabet[ $letter ] ) ) {
+                return $letter;
+            }
+        }
+
+        return '#';
+    }
+
+    /**
+     * Get and increment the `$vocabulary_id`.
+     *
+     * @return int The incremented vocabulary id.
+     * @since  3.18.3
+     */
+    private static function get_and_increment_vocabulary_id() {
+        return self::$vocabulary_id ++;
+    }
 
 }

Spacing +66 added lines, -66 removed lines

@@ -51,7 +51,7 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->register_block_type();
 
@@ -65,11 +65,11 @@ 
 	 */
 	private static function are_requirements_satisfied() {
 
-		return function_exists( 'mb_strlen' ) &&
-			   function_exists( 'mb_substr' ) &&
-			   function_exists( 'mb_strtolower' ) &&
-			   function_exists( 'mb_strtoupper' ) &&
-			   function_exists( 'mb_convert_case' );
+		return function_exists('mb_strlen') &&
+			   function_exists('mb_substr') &&
+			   function_exists('mb_strtolower') &&
+			   function_exists('mb_strtoupper') &&
+			   function_exists('mb_convert_case');
 	}
 
 	/**
@@ -80,17 +80,17 @@ 
 	 * @return string The output html code.
 	 * @since 3.16.0
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// Bail out if the requirements aren't satisfied: we need mbstring for
 		// the vocabulary widget to work.
-		if ( ! self::are_requirements_satisfied() ) {
-			$this->log->warn( "The vocabulary widget cannot be displayed because this WordPress installation doesn't satisfy its requirements." );
+		if ( ! self::are_requirements_satisfied()) {
+			$this->log->warn("The vocabulary widget cannot be displayed because this WordPress installation doesn't satisfy its requirements.");
 
 			return '';
 		}
 
-		wp_enqueue_style( 'wl-vocabulary-shortcode', dirname( plugin_dir_url( __FILE__ ) ) . '/public/css/wordlift-vocabulary-shortcode.css', array(), WORDLIFT_VERSION );
+		wp_enqueue_style('wl-vocabulary-shortcode', dirname(plugin_dir_url(__FILE__)).'/public/css/wordlift-vocabulary-shortcode.css', array(), WORDLIFT_VERSION);
 
 		// Extract attributes and set default values.
 		$atts = shortcode_atts(
@@ -111,15 +111,15 @@ 
 
 		// Get the posts. Note that if a `type` is specified before, then the
 		// `tax_query` from the `add_criterias` call isn't added.
-		$posts = $this->get_posts( $atts );
+		$posts = $this->get_posts($atts);
 
 		// Get the alphabet.
 		$language_code = Wordlift_Configuration_Service::get_instance()->get_language_code();
-		$alphabet      = Wordlift_Alphabet_Service::get( $language_code );
+		$alphabet      = Wordlift_Alphabet_Service::get($language_code);
 
 		// Add posts to the alphabet.
-		foreach ( $posts as $post ) {
-			$this->add_to_alphabet( $alphabet, $post->ID );
+		foreach ($posts as $post) {
+			$this->add_to_alphabet($alphabet, $post->ID);
 		}
 
 		$header   = '';
@@ -129,16 +129,16 @@ 
 		$vocabulary_id = self::get_and_increment_vocabulary_id();
 
 		// Generate the header.
-		foreach ( $alphabet as $item => $translations ) {
-			$template = ( empty( $translations )
+		foreach ($alphabet as $item => $translations) {
+			$template = (empty($translations)
 				? '<span class="wl-vocabulary-widget-disabled">%s</span>'
-				: '<a href="#wl-vocabulary-%3$d-%2$s">%1$s</a>' );
+				: '<a href="#wl-vocabulary-%3$d-%2$s">%1$s</a>');
 
-			$header .= sprintf( $template, esc_html( $item ), esc_attr( $item ), $vocabulary_id );
+			$header .= sprintf($template, esc_html($item), esc_attr($item), $vocabulary_id);
 		}
 
 		// Generate the sections.
-		foreach ( $alphabet as $item => $translations ) {
+		foreach ($alphabet as $item => $translations) {
 			// @since 3.19.3 we use `mb_strtolower` and `mb_strtoupper` with a custom function to handle sorting,
 			// since we had `AB` being placed before `Aa` with `asort`.
 			//
@@ -146,16 +146,16 @@ 
 			// asort( $translations );
 			uasort(
 				$translations,
-				function ( $a, $b ) {
-					if ( mb_strtolower( $a ) === mb_strtolower( $b )
-						 || mb_strtoupper( $a ) === mb_strtoupper( $b ) ) {
+				function($a, $b) {
+					if (mb_strtolower($a) === mb_strtolower($b)
+						 || mb_strtoupper($a) === mb_strtoupper($b)) {
 						return 0;
 					}
 
-					return ( mb_strtolower( $a ) < mb_strtolower( $b ) ) ? - 1 : 1;
+					return (mb_strtolower($a) < mb_strtolower($b)) ? -1 : 1;
 				}
 			);
-			$sections .= $this->get_section( $item, $translations, $vocabulary_id );
+			$sections .= $this->get_section($item, $translations, $vocabulary_id);
 		}
 
 		// Return HTML template.
@@ -167,8 +167,8 @@ 
 				echo wp_kses(
 					$header,
 					array(
-						'span' => array( 'class' => array() ),
-						'a'    => array( 'href' => array() ),
+						'span' => array('class' => array()),
+						'a'    => array('href' => array()),
 					)
 				);
 				?>
@@ -182,10 +182,10 @@ 
 							'class' => array(),
 							'id'    => array(),
 						),
-						'aside' => array( 'class' => array() ),
-						'ul'    => array( 'class' => array() ),
+						'aside' => array('class' => array()),
+						'ul'    => array('class' => array()),
 						'li'    => array(),
-						'a'     => array( 'href' => array() ),
+						'a'     => array('href' => array()),
 					)
 				);
 				?>
@@ -204,8 +204,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;
 				}
@@ -214,13 +214,13 @@ 
 					'wordlift/vocabulary',
 					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(
 							'type'        => array(
@@ -249,7 +249,7 @@ 
 							),
 							'preview_src' => array(
 								'type'    => 'string',
-								'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/vocabulary.png',
+								'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/vocabulary.png',
 							),
 						),
 					)
@@ -270,10 +270,10 @@ 
 	 *                no posts).
 	 * @since 3.17.0
 	 */
-	private function get_section( $letter, $posts, $vocabulary_id ) {
+	private function get_section($letter, $posts, $vocabulary_id) {
 
 		// Return an empty string if there are no posts.
-		if ( 0 === count( $posts ) ) {
+		if (0 === count($posts)) {
 			return '';
 		}
 
@@ -289,9 +289,9 @@ 
 			</div>
 		',
 			$vocabulary_id,
-			esc_attr( $letter ),
-			esc_html( $letter ),
-			$this->format_posts_as_list( $posts )
+			esc_attr($letter),
+			esc_html($letter),
+			$this->format_posts_as_list($posts)
 		);
 	}
 
@@ -303,12 +303,12 @@ 
 	 * @return string A list.
 	 * @since 3.17.0
 	 */
-	private function format_posts_as_list( $posts ) {
+	private function format_posts_as_list($posts) {
 
 		return array_reduce(
-			array_keys( $posts ),
-			function ( $carry, $item ) use ( $posts ) {
-				return $carry . sprintf( '<li><a href="%s">%s</a></li>', esc_attr( get_permalink( $item ) ), esc_html( $posts[ $item ] ) );
+			array_keys($posts),
+			function($carry, $item) use ($posts) {
+				return $carry.sprintf('<li><a href="%s">%s</a></li>', esc_attr(get_permalink($item)), esc_html($posts[$item]));
 			},
 			''
 		);
@@ -322,21 +322,21 @@ 
 	 * @return array An array of {@link WP_Post}s.
 	 * @since 3.17.0
 	 */
-	private function get_posts( $atts ) {
+	private function get_posts($atts) {
 		// The default arguments for the query.
 		$args = array(
 			// phpcs:ignore WordPress.WP.PostsPerPage.posts_per_page_posts_per_page
-			'posts_per_page'         => intval( $atts['limit'] ),
+			'posts_per_page'         => intval($atts['limit']),
 			'update_post_meta_cache' => false,
 			'update_post_term_cache' => false,
 			'orderby'                => $atts['orderby'],
 			'order'                  => $atts['order'],
 			// Exclude the publisher.
-			'post__not_in'           => array( Wordlift_Configuration_Service::get_instance()->get_publisher_id() ),
+			'post__not_in'           => array(Wordlift_Configuration_Service::get_instance()->get_publisher_id()),
 		);
 
 		// Limit the based entity type if needed.
-		if ( 'all' !== $atts['type'] ) {
+		if ('all' !== $atts['type']) {
 			$args['tax_query'] = array(
 				array(
 					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
@@ -346,13 +346,13 @@ 
 			);
 		}
 
-		if ( ! empty( $atts['cat'] ) ) {
+		if ( ! empty($atts['cat'])) {
 			$args['cat'] = $atts['cat'];
 		}
 
 		// Get the posts. Note that if a `type` is specified before, then the
 		// `tax_query` from the `add_criterias` call isn't added.
-		return get_posts( Wordlift_Entity_Service::add_criterias( $args ) );
+		return get_posts(Wordlift_Entity_Service::add_criterias($args));
 
 	}
 
@@ -364,16 +364,16 @@ 
 	 *
 	 * @since 3.17.0
 	 */
-	private function add_to_alphabet( &$alphabet, $post_id ) {
+	private function add_to_alphabet(&$alphabet, $post_id) {
 
 		// Get the title without accents.
-		$title = $this->get_the_title( $post_id );
+		$title = $this->get_the_title($post_id);
 
 		// Get the initial letter.
-		$letter = $this->get_first_letter_in_alphabet_or_hash( $alphabet, $title );
+		$letter = $this->get_first_letter_in_alphabet_or_hash($alphabet, $title);
 
 		// Add the post.
-		$alphabet[ $letter ][ $post_id ] = $title;
+		$alphabet[$letter][$post_id] = $title;
 
 	}
 
@@ -389,19 +389,19 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_the_title( $post_id ) {
+	private function get_the_title($post_id) {
 
-		$title = get_the_title( $post_id );
+		$title = get_the_title($post_id);
 
-		if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
-			$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
+		if (get_post_type($post_id) !== Wordlift_Entity_Service::TYPE_NAME) {
+			$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels($post_id);
 
-			if ( count( $alternative_labels ) > 0 ) {
+			if (count($alternative_labels) > 0) {
 				$title = $alternative_labels[0];
 			}
 		}
 
-		return remove_accents( $title );
+		return remove_accents($title);
 
 	}
 
@@ -418,12 +418,12 @@ 
 	 * @return string The initial letter or a `#` key.
 	 * @since 3.17.0
 	 */
-	private function get_first_letter_in_alphabet_or_hash( $alphabet, $title ) {
+	private function get_first_letter_in_alphabet_or_hash($alphabet, $title) {
 
 		// Need to handle letters which consist of 3 and 2 characters.
-		for ( $i = 3; $i > 0; $i -- ) {
-			$letter = mb_convert_case( mb_substr( $title, 0, $i ), MB_CASE_UPPER );
-			if ( isset( $alphabet[ $letter ] ) ) {
+		for ($i = 3; $i > 0; $i--) {
+			$letter = mb_convert_case(mb_substr($title, 0, $i), MB_CASE_UPPER);
+			if (isset($alphabet[$letter])) {
 				return $letter;
 			}
 		}
@@ -438,7 +438,7 @@ 
 	 * @since  3.18.3
 	 */
 	private static function get_and_increment_vocabulary_id() {
-		return self::$vocabulary_id ++;
+		return self::$vocabulary_id++;
 	}
 
 }