insideout10 / wordlift-plugin

src/includes/class-wordlift-remote-image-service.php

Doc Comments +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 	 *
 	 * @param string $content_type File content type.
 	 *
-	 * @return string|bool The file extension on success and
+	 * @return string|false The file extension on success and
 	 * false on fail or if the content type is not supported.
 	 * @since 3.18.0
 	 *

Indentation +135 added lines, -135 removed lines

@@ -8,140 +8,140 @@
  */
 class Wordlift_Remote_Image_Service {
 
-	/**
-	 * Save the image with the specified URL locally.
-	 *
-	 * @param string $url The image remote URL.
-	 *
-	 * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
-	 * url, *content_type*: the image content type) or false on error.
-	 * @since 3.18.0
-	 *
-	 */
-	public static function save_from_url( $url ) {
-
-		// Required for REST API calls
-		if ( ! function_exists( 'WP_Filesystem' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/file.php' );
-		}
-		// Load `WP_Filesystem`.
-		WP_Filesystem();
-		global $wp_filesystem;
-
-		// Parse the url.
-		$parts = wp_parse_url( $url );
-
-		// Get the bare filename (filename w/o the extension).
-		$basename = str_replace( DIRECTORY_SEPARATOR, '_', rawurldecode(
-			pathinfo( $parts['path'], PATHINFO_FILENAME )
-		) );
-
-		// Get the base dir.
-		$wp_upload_dir = wp_upload_dir();
-
-		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
-
-		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
-
-		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
-
-			return false;
-		};
-
-		$response = self::get_response( $url );
-
-		// Bail if the response is not set.
-		if ( false === $response ) {
-			wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
-
-			return false;
-		}
-
-		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
-
-		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
-
-		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
-			return false;
-		}
-
-		// Complete the local filename.
-		$image_full_path .= $extension;
-		$image_full_url  .= $extension;
-
-		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
-
-		// Return the path.
-		return array(
-			'path'         => $image_full_path,
-			'url'          => $image_full_url,
-			'content_type' => $content_type,
-		);
-	}
-
-	/**
-	 * Returns the file extension using the content type.
-	 *
-	 * @param string $content_type File content type.
-	 *
-	 * @return string|bool The file extension on success and
-	 * false on fail or if the content type is not supported.
-	 * @since 3.18.0
-	 *
-	 */
-	private static function get_extension_from_content_type( $content_type ) {
-
-		// Return the extension if match.
-		switch ( $content_type ) {
-			case 'image/jpeg':
-			case 'image/jpg':
-				return '.jpg';
-			case 'image/gif':
-				return '.gif';
-			case 'image/png':
-				return '.png';
-		}
-
-		// Otherwise return false.
-		return false;
-	}
-
-	/**
-	 * Retrieve the response from url and sets the response.
-	 *
-	 * @param string $url The url to retrieve.
-	 *
-	 * @return false|array True on success and false on failure.
-	 * @since 3.18.0
-	 *
-	 */
-	private static function get_response( $url ) {
-		// Request the remote file.
-		$response = wp_remote_get( $url );
-
-		// Bail out if the response is not ok.
-		if (
-			is_wp_error( $response )
-			|| 200 !== (int) $response['response']['code']
-			|| ! isset( $response['body'] )
-		) {
-			wl_write_log( "save_image_from_url : error fetching image $url \n" );
-
-			return false;
-		}
-
-		// Set the response.
-		return $response;
-	}
+    /**
+     * Save the image with the specified URL locally.
+     *
+     * @param string $url The image remote URL.
+     *
+     * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
+     * url, *content_type*: the image content type) or false on error.
+     * @since 3.18.0
+     *
+     */
+    public static function save_from_url( $url ) {
+
+        // Required for REST API calls
+        if ( ! function_exists( 'WP_Filesystem' ) ) {
+            require_once( ABSPATH . 'wp-admin/includes/file.php' );
+        }
+        // Load `WP_Filesystem`.
+        WP_Filesystem();
+        global $wp_filesystem;
+
+        // Parse the url.
+        $parts = wp_parse_url( $url );
+
+        // Get the bare filename (filename w/o the extension).
+        $basename = str_replace( DIRECTORY_SEPARATOR, '_', rawurldecode(
+            pathinfo( $parts['path'], PATHINFO_FILENAME )
+        ) );
+
+        // Get the base dir.
+        $wp_upload_dir = wp_upload_dir();
+
+        // Set the upload directory and URL.
+        $upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
+        $upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+
+        // Get the full path to the local filename.
+        $image_full_path = $upload_dir . '/' . $basename;
+        $image_full_url  = $upload_url . '/' . $basename;
+
+        // Create custom directory and bail on failure.
+        if ( ! wp_mkdir_p( $upload_dir ) ) {
+            wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+
+            return false;
+        };
+
+        $response = self::get_response( $url );
+
+        // Bail if the response is not set.
+        if ( false === $response ) {
+            wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
+
+            return false;
+        }
+
+        // Get the content type of response.
+        $content_type = wp_remote_retrieve_header( $response, 'content-type' );
+
+        // Get the file extension.
+        $extension = self::get_extension_from_content_type( $content_type );
+
+        // Bail if the content type is not supported.
+        if ( empty( $extension ) ) {
+            return false;
+        }
+
+        // Complete the local filename.
+        $image_full_path .= $extension;
+        $image_full_url  .= $extension;
+
+        // Store the data locally.
+        $wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+
+        // Return the path.
+        return array(
+            'path'         => $image_full_path,
+            'url'          => $image_full_url,
+            'content_type' => $content_type,
+        );
+    }
+
+    /**
+     * Returns the file extension using the content type.
+     *
+     * @param string $content_type File content type.
+     *
+     * @return string|bool The file extension on success and
+     * false on fail or if the content type is not supported.
+     * @since 3.18.0
+     *
+     */
+    private static function get_extension_from_content_type( $content_type ) {
+
+        // Return the extension if match.
+        switch ( $content_type ) {
+            case 'image/jpeg':
+            case 'image/jpg':
+                return '.jpg';
+            case 'image/gif':
+                return '.gif';
+            case 'image/png':
+                return '.png';
+        }
+
+        // Otherwise return false.
+        return false;
+    }
+
+    /**
+     * Retrieve the response from url and sets the response.
+     *
+     * @param string $url The url to retrieve.
+     *
+     * @return false|array True on success and false on failure.
+     * @since 3.18.0
+     *
+     */
+    private static function get_response( $url ) {
+        // Request the remote file.
+        $response = wp_remote_get( $url );
+
+        // Bail out if the response is not ok.
+        if (
+            is_wp_error( $response )
+            || 200 !== (int) $response['response']['code']
+            || ! isset( $response['body'] )
+        ) {
+            wl_write_log( "save_image_from_url : error fetching image $url \n" );
+
+            return false;
+        }
+
+        // Set the response.
+        return $response;
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -18,59 +18,59 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	public static function save_from_url( $url ) {
+	public static function save_from_url($url) {
 
 		// Required for REST API calls
-		if ( ! function_exists( 'WP_Filesystem' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/file.php' );
+		if ( ! function_exists('WP_Filesystem')) {
+			require_once(ABSPATH.'wp-admin/includes/file.php');
 		}
 		// Load `WP_Filesystem`.
 		WP_Filesystem();
 		global $wp_filesystem;
 
 		// Parse the url.
-		$parts = wp_parse_url( $url );
+		$parts = wp_parse_url($url);
 
 		// Get the bare filename (filename w/o the extension).
-		$basename = str_replace( DIRECTORY_SEPARATOR, '_', rawurldecode(
-			pathinfo( $parts['path'], PATHINFO_FILENAME )
-		) );
+		$basename = str_replace(DIRECTORY_SEPARATOR, '_', rawurldecode(
+			pathinfo($parts['path'], PATHINFO_FILENAME)
+		));
 
 		// Get the base dir.
 		$wp_upload_dir = wp_upload_dir();
 
 		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+		$upload_dir = $wp_upload_dir['basedir'].'/wl'.$wp_upload_dir['subdir'];
+		$upload_url = $wp_upload_dir['baseurl'].'/wl'.$wp_upload_dir['subdir'];
 
 		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
+		$image_full_path = $upload_dir.'/'.$basename;
+		$image_full_url  = $upload_url.'/'.$basename;
 
 		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+		if ( ! wp_mkdir_p($upload_dir)) {
+			wl_write_log("save_image_from_url : failed creating upload dir $upload_dir \n");
 
 			return false;
 		};
 
-		$response = self::get_response( $url );
+		$response = self::get_response($url);
 
 		// Bail if the response is not set.
-		if ( false === $response ) {
-			wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
+		if (false === $response) {
+			wl_write_log("save_image_from_url : failed to fetch the response from: $url \n");
 
 			return false;
 		}
 
 		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
+		$content_type = wp_remote_retrieve_header($response, 'content-type');
 
 		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
+		$extension = self::get_extension_from_content_type($content_type);
 
 		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
+		if (empty($extension)) {
 			return false;
 		}
 
@@ -79,7 +79,7 @@ 
 		$image_full_url  .= $extension;
 
 		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+		$wp_filesystem->put_contents($image_full_path, wp_remote_retrieve_body($response));
 
 		// Return the path.
 		return array(
@@ -99,10 +99,10 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	private static function get_extension_from_content_type( $content_type ) {
+	private static function get_extension_from_content_type($content_type) {
 
 		// Return the extension if match.
-		switch ( $content_type ) {
+		switch ($content_type) {
 			case 'image/jpeg':
 			case 'image/jpg':
 				return '.jpg';
@@ -125,17 +125,17 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	private static function get_response( $url ) {
+	private static function get_response($url) {
 		// Request the remote file.
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
 		// Bail out if the response is not ok.
 		if (
-			is_wp_error( $response )
+			is_wp_error($response)
 			|| 200 !== (int) $response['response']['code']
-			|| ! isset( $response['body'] )
+			|| ! isset($response['body'])
 		) {
-			wl_write_log( "save_image_from_url : error fetching image $url \n" );
+			wl_write_log("save_image_from_url : error fetching image $url \n");
 
 			return false;
 		}

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

Indentation +331 added lines, -331 removed lines

@@ -18,157 +18,157 @@ 
  */
 class Wordlift_Vocabulary_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * The shortcode.
-	 *
-	 * @since  3.17.0
-	 */
-	const SHORTCODE = 'wl_vocabulary';
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * 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
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	public function __construct( $configuration_service ) {
-		parent::__construct();
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->configuration_service = $configuration_service;
-
-	}
-
-	/**
-	 * Check whether the requirements for this shortcode to work are available.
-	 *
-	 * @since 3.17.0
-	 * @return bool True if the requirements are satisfied otherwise false.
-	 */
-	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.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @param array $atts An array of shortcode attributes as set by the editor.
-	 *
-	 * @return string The output html code.
-	 */
-	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' );
-
-		// 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 = $this->configuration_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 );
-		}
-
-		$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';
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * 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
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    public function __construct( $configuration_service ) {
+        parent::__construct();
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->configuration_service = $configuration_service;
+
+    }
+
+    /**
+     * Check whether the requirements for this shortcode to work are available.
+     *
+     * @since 3.17.0
+     * @return bool True if the requirements are satisfied otherwise false.
+     */
+    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.
+     *
+     * @since 3.16.0
+     *
+     * @param array $atts An array of shortcode attributes as set by the editor.
+     *
+     * @return string The output html code.
+     */
+    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' );
+
+        // 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 = $this->configuration_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 );
+        }
+
+        $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 $header; ?>
@@ -178,34 +178,34 @@ 
             </div>
         </div>
 		<?php
-		$html = ob_get_clean();
-
-		return $html;
-
-	}
-
-	/**
-	 * Generate the html code for the section.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @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).
-	 */
-	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;
+
+    }
+
+    /**
+     * Generate the html code for the section.
+     *
+     * @since 3.17.0
+     *
+     * @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).
+     */
+    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">
@@ -215,127 +215,127 @@ 
 				</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.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @param array $posts An array of `$post_id => $post_title` key, value pairs.
-	 *
-	 * @return string A list.
-	 */
-	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.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @param array $atts The shortcode attributes.
-	 *
-	 * @return array An array of {@link WP_Post}s.
-	 */
-	private function get_posts( $atts ) {
-		// The default arguments for the query.
-		$args = array(
-			'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( $this->configuration_service->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.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @param array $alphabet An array of letters.
-	 * @param int   $post_id The {@link WP_Post} id.
-	 */
-	private function add_to_alphabet( &$alphabet, $post_id ) {
-
-		// Get the title without accents.
-		$title = remove_accents( 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;
-
-	}
-
-	/**
-	 * 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.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @param array  $alphabet An array of alphabet letters.
-	 * @param string $title The title to match.
-	 *
-	 * @return string The initial letter or a `#` key.
-	 */
-	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`.
-	 *
-	 * @since  3.18.3
-	 *
-	 * @return int The incremented vocabulary id.
-	 */
-	private static function get_and_increment_vocabulary_id() {
-		return self::$vocabulary_id ++;
-	}
+        );
+    }
+
+    /**
+     * Format an array post `$post_id => $post_title` as a list.
+     *
+     * @since 3.17.0
+     *
+     * @param array $posts An array of `$post_id => $post_title` key, value pairs.
+     *
+     * @return string A list.
+     */
+    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.
+     *
+     * @since 3.17.0
+     *
+     * @param array $atts The shortcode attributes.
+     *
+     * @return array An array of {@link WP_Post}s.
+     */
+    private function get_posts( $atts ) {
+        // The default arguments for the query.
+        $args = array(
+            '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( $this->configuration_service->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.
+     *
+     * @since 3.17.0
+     *
+     * @param array $alphabet An array of letters.
+     * @param int   $post_id The {@link WP_Post} id.
+     */
+    private function add_to_alphabet( &$alphabet, $post_id ) {
+
+        // Get the title without accents.
+        $title = remove_accents( 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;
+
+    }
+
+    /**
+     * 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.
+     *
+     * @since 3.17.0
+     *
+     * @param array  $alphabet An array of alphabet letters.
+     * @param string $title The title to match.
+     *
+     * @return string The initial letter or a `#` key.
+     */
+    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`.
+     *
+     * @since  3.18.3
+     *
+     * @return int The incremented vocabulary id.
+     */
+    private static function get_and_increment_vocabulary_id() {
+        return self::$vocabulary_id ++;
+    }
 
 }
 
@@ -343,41 +343,41 @@ 
  * register_block_type for Gutenberg blocks
  */
 add_action( 'init', function() {
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type('wordlift/vocabulary', array(
-		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
-			$attr_code = '';
-			foreach ($attributes as $key => $value) {
-				$attr_code .= $key.'="'.$value.'" ';
-			}
-			return '[wl_vocabulary '.$attr_code.']';
-		},
-		'attributes' => array(
-			'type' => array(
-				'type'    => 'string',
-				'default' => 'all'
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type('wordlift/vocabulary', array(
+        'editor_script' => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function($attributes){
+            $attr_code = '';
+            foreach ($attributes as $key => $value) {
+                $attr_code .= $key.'="'.$value.'" ';
+            }
+            return '[wl_vocabulary '.$attr_code.']';
+        },
+        'attributes' => array(
+            'type' => array(
+                'type'    => 'string',
+                'default' => 'all'
             ),
-			'limit' => array(
-				'type'    => 'number',
-				'default' => 100
+            'limit' => array(
+                'type'    => 'number',
+                'default' => 100
             ),
-			'orderby' => array(
-				'type'    => 'string',
-				'default' => 'post_date'
+            'orderby' => array(
+                'type'    => 'string',
+                'default' => 'post_date'
             ),
-			'order' => array(
-				'type'    => 'string',
-				'default' => 'DESC'
+            'order' => array(
+                'type'    => 'string',
+                'default' => 'DESC'
             ),
-			'cat' => array(
-				'type'    => 'string',
-				'default' => ''
+            'cat' => array(
+                'type'    => 'string',
+                'default' => ''
             ),
         )
-	));
+    ));
 } );

Spacing +49 added lines, -49 removed lines

@@ -59,10 +59,10 @@ 
 	 *
 	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 		parent::__construct();
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->configuration_service = $configuration_service;
 
@@ -76,11 +76,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');
 	}
 
 	/**
@@ -92,17 +92,17 @@ 
 	 *
 	 * @return string The output html code.
 	 */
-	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' );
+		wp_enqueue_style('wl-vocabulary-shortcode', dirname(plugin_dir_url(__FILE__)).'/public/css/wordlift-vocabulary-shortcode.css');
 
 		// Extract attributes and set default values.
 		$atts = shortcode_atts(
@@ -122,15 +122,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 = $this->configuration_service->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   = '';
@@ -140,30 +140,30 @@ 
 		$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`.
 			//
 			// Order the translations alphabetically.
 			// asort( $translations );
-			uasort( $translations, function ( $a, $b ) {
-				if ( mb_strtolower( $a ) === mb_strtolower( $b )
-				     || mb_strtoupper( $a ) === mb_strtoupper( $b ) ) {
+			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;
+				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.
@@ -197,10 +197,10 @@ 
 	 * @return string The section html code (or an empty string if the section has
 	 *                no posts).
 	 */
-	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 '';
 		}
 
@@ -214,7 +214,7 @@ 
 					</ul>
 				</div>
 			</div>
-		', $vocabulary_id, esc_attr( $letter ), esc_html( $letter ), $this->format_posts_as_list( $posts )
+		', $vocabulary_id, esc_attr($letter), esc_html($letter), $this->format_posts_as_list($posts)
 		);
 	}
 
@@ -227,11 +227,11 @@ 
 	 *
 	 * @return string A list.
 	 */
-	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]));
 		}, ''
 		);
 	}
@@ -245,20 +245,20 @@ 
 	 *
 	 * @return array An array of {@link WP_Post}s.
 	 */
-	private function get_posts( $atts ) {
+	private function get_posts($atts) {
 		// The default arguments for the query.
 		$args = array(
-			'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( $this->configuration_service->get_publisher_id() ),
+			'post__not_in'           => array($this->configuration_service->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,
@@ -268,13 +268,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));
 
 	}
 
@@ -286,16 +286,16 @@ 
 	 * @param array $alphabet An array of letters.
 	 * @param int   $post_id The {@link WP_Post} id.
 	 */
-	private function add_to_alphabet( &$alphabet, $post_id ) {
+	private function add_to_alphabet(&$alphabet, $post_id) {
 
 		// Get the title without accents.
-		$title = remove_accents( get_the_title( $post_id ) );
+		$title = remove_accents(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;
 
 	}
 
@@ -313,12 +313,12 @@ 
 	 *
 	 * @return string The initial letter or a `#` key.
 	 */
-	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;
 			}
 		}
@@ -334,7 +334,7 @@ 
 	 * @return int The incremented vocabulary id.
 	 */
 	private static function get_and_increment_vocabulary_id() {
-		return self::$vocabulary_id ++;
+		return self::$vocabulary_id++;
 	}
 
 }
@@ -342,15 +342,15 @@ 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function() {
+add_action('init', function() {
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
 	register_block_type('wordlift/vocabulary', array(
 		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
+		'render_callback' => function($attributes) {
 			$attr_code = '';
 			foreach ($attributes as $key => $value) {
 				$attr_code .= $key.'="'.$value.'" ';

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

Indentation +104 added lines, -104 removed lines

@@ -16,126 +16,126 @@
  */
 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;
-
-	/**
-	 * Create a {@link Wordlift_Related_Entities_Cloud_Shortcode} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 */
-	public function __construct( $relation_service ) {
-		parent::__construct();
-
-		$this->relation_service = $relation_service;
-
-	}
-
-	/**
-	 * {@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;
+
+    /**
+     * Create a {@link Wordlift_Related_Entities_Cloud_Shortcode} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     */
+    public function __construct( $relation_service ) {
+        parent::__construct();
+
+        $this->relation_service = $relation_service;
+
+    }
+
+    /**
+     * {@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 ) .
-		       '</div>';
-	}
-
-	/**
-	 * Find the related entities to the currently displayed post and
-	 * calculate the "tags" for them as wp_generate_tag_cloud expects to get.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return array    Array of tags. Empty array in case we re not in a context
-	 *                  of a post, or it has no related entities.
-	 */
-	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 ) .
+                '</div>';
+    }
+
+    /**
+     * Find the related entities to the currently displayed post and
+     * calculate the "tags" for them as wp_generate_tag_cloud expects to get.
+     *
+     * @since 3.11.0
+     *
+     * @return array    Array of tags. Empty array in case we re not in a context
+     *                  of a post, or it has no related entities.
+     */
+    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();
+        $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' ) );
 
-			$tags[] = (object) array(
-				'id'    => $entity_id,
-				// Used to give a unique class on the tag.
-				'name'  => get_the_title( $entity_id ),
-				// 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.
-			);
+            $tags[] = (object) array(
+                'id'    => $entity_id,
+                // Used to give a unique class on the tag.
+                'name'  => get_the_title( $entity_id ),
+                // 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;
-	}
+        return $tags;
+    }
 
 }
 /**
  * register_block_type for Gutenberg blocks
  */
 add_action( 'init', function() {
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type('wordlift/cloud', array(
-		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
-			return '[wl_cloud]';
-		}
-	));
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type('wordlift/cloud', array(
+        'editor_script' => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function($attributes){
+            return '[wl_cloud]';
+        }
+    ));
 } );

Spacing +17 added lines, -17 removed lines

@@ -37,7 +37,7 @@ 
 	 *
 	 * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
 	 */
-	public function __construct( $relation_service ) {
+	public function __construct($relation_service) {
 		parent::__construct();
 
 		$this->relation_service = $relation_service;
@@ -47,12 +47,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 '';
 		}
 
@@ -61,8 +61,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 ) .
+		return '<div class="tagcloud wl-related-entities-cloud">'.
+		       wp_generate_tag_cloud($tags).
 		       '</div>';
 	}
 
@@ -81,15 +81,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();
 		}
 
@@ -99,19 +99,19 @@ 
 		 */
 		$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'));
 
 			$tags[] = (object) array(
 				'id'    => $entity_id,
 				// Used to give a unique class on the tag.
-				'name'  => get_the_title( $entity_id ),
+				'name'  => get_the_title($entity_id),
 				// 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.
@@ -126,15 +126,15 @@ 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function() {
+add_action('init', function() {
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
 	register_block_type('wordlift/cloud', array(
 		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
+		'render_callback' => function($attributes) {
 			return '[wl_cloud]';
 		}
 	));

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-timeline-shortcode.php

Indentation +236 added lines, -236 removed lines

@@ -7,203 +7,203 @@ 
  */
 class Wordlift_Timeline_Shortcode extends Wordlift_Shortcode {
 
-	const SHORTCODE = 'wl_timeline';
-
-	/**
-	 * The list of locales supported by TimelineJS (correspond to the list of
-	 * files in the locale subfolder).
-	 *
-	 * @since 3.7.0
-	 * @var array An array of two-letters language codes.
-	 */
-	private static $supported_locales = array(
-		'ur',
-		'uk',
-		'tr',
-		'tl',
-		'th',
-		'te',
-		'ta',
-		'sv',
-		'sr',
-		'sl',
-		'sk',
-		'si',
-		'ru',
-		'ro',
-		'rm',
-		'pt',
-		'pl',
-		'no',
-		'nl',
-		'ne',
-		'ms',
-		'lv',
-		'lt',
-		'lb',
-		'ko',
-		'ka',
-		'ja',
-		'iw',
-		'it',
-		'is',
-		'id',
-		'hy',
-		'hu',
-		'hr',
-		'hi',
-		'he',
-		'gl',
-		'ga',
-		'fy',
-		'fr',
-		'fo',
-		'fi',
-		'fa',
-		'eu',
-		'et',
-		'es',
-		'eo',
-		'en',
-		'el',
-		'de',
-		'da',
-		'cz',
-		'ca',
-		'bg',
-		'be',
-		'ar',
-		'af'
-	);
-
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Create a Wordlift_Timeline_Shortcode instance.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Shortcode' );
-
-	}
-
-	public function get_timelinejs_default_options() {
-		return array(
-			'debug'                            => defined( 'WP_DEBUG' ) && WP_DEBUG,
-			'height'                           => NULL,
-			'width'                            => NULL,
-			'is_embed'                         => FALSE,
-			'hash_bookmark'                    => FALSE,
-			'default_bg_color'                 => 'white',
-			'scale_factor'                     => 2,
-			'initial_zoom'                     => NULL,
-			'zoom_sequence'                    => '[0.5, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89]',
-			'timenav_position'                 => 'bottom',
-			'optimal_tick_width'               => 100,
-			'base_class'                       => 'tl-timeline',
-			'timenav_height'                   => 150,
-			'timenav_height_percentage'        => NULL,
-			'timenav_mobile_height_percentage' => 40,
-			'timenav_height_min'               => 150,
-			'marker_height_min'                => 30,
-			'marker_width_min'                 => 100,
-			'marker_padding'                   => 5,
-			'start_at_slide'                   => 0,
-			'start_at_end'                     => FALSE,
-			'menubar_height'                   => 0,
-			'use_bc'                           => FALSE,
-			'duration'                         => 1000,
-			'ease'                             => 'TL.Ease.easeInOutQuint',
-			'slide_default_fade'               => '0%',
-			'language'                         => $this->get_locale(),
-			'ga_property_id'                   => NULL,
-			'track_events'                     => "['back_to_start','nav_next','nav_previous','zoom_in','zoom_out']"
-		);
-	}
-
-	/**
-	 * Renders the Timeline.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param array $atts An array of shortcode attributes.
-	 *
-	 * @return string The rendered HTML.
-	 */
-	public function render( $atts ) {
-
-		//extract attributes and set default values
-		$settings = shortcode_atts( array_merge($this->get_timelinejs_default_options(), array(
-			'global'                           => FALSE,
-			'display_images_as'                => 'media',
-			'excerpt_length'                   => 55
-		)), $atts );
-
-		// Load the TimelineJS stylesheets and scripts.
-		wp_enqueue_style( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/css/timeline.css' );
-		wp_enqueue_script( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/js/timeline' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '-min' : '' ) . '.js' );
-
-		// Enqueue the scripts for the timeline.
-		$this->enqueue_scripts();
-
-		// Provide the script with options.
-		wp_localize_script( 'timelinejs', 'wl_timeline_params', array(
-			'ajax_url'          => admin_url( 'admin-ajax.php' ),
-			// TODO: this parameter is already provided by WP
-			'action'            => 'wl_timeline',
-			// These settings apply to our wl_timeline AJAX endpoint.
-			'display_images_as' => $settings['display_images_as'],
-			'excerpt_length'    => $settings['excerpt_length'],
-			// These settings apply to the timeline javascript client.
-			'settings'          => array_filter( $settings, function ( $value ) {
-				// Do not set NULL values.
-				return ( NULL !== $value );
-			} )
-		) );
-
-		// Get the current post id or set null if global is set to true.
-		$post_id = ( $settings['global'] ? NULL : get_the_ID() );
-
-		// Escaping atts.
-		$style        = sprintf( 'style="%s%s"', isset( $settings['width'] ) ? "width:{$settings['width']};" : '', isset( $settings['height'] ) ? "height:{$settings['height']};" : '' );
-		$data_post_id = ( isset( $post_id ) ? "data-post-id='$post_id'" : '' );
-
-		// Generate a unique ID for this timeline.
-		$element_id = uniqid( 'wl-timeline-' );
-
-		if ( WP_DEBUG ) {
-			$this->log_service->trace( "Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]" );
-		}
-
-		// Building template.
-		return sprintf( '<div class="wl-timeline-container" %s><div class="wl-timeline" id="%s" %s></div></div>', $style, $element_id, $data_post_id );
-	}
-
-	/**
-	 * Return the locale for the TimelineJS according to WP's configured locale and
-	 * support TimelineJS locales. If WP's locale is not supported, english is used.
-	 *
-	 * @since 3.7.0
-	 * @return string The locale (2 letters code).
-	 */
-	private function get_locale() {
-
-		// Get the first 2 letters.
-		$locale = substr( get_locale(), 0, 2 );
-
-		// Check that the specified locale is supported otherwise use English.
-		return in_array( $locale, self::$supported_locales ) ? $locale : 'en';
-	}
+    const SHORTCODE = 'wl_timeline';
+
+    /**
+     * The list of locales supported by TimelineJS (correspond to the list of
+     * files in the locale subfolder).
+     *
+     * @since 3.7.0
+     * @var array An array of two-letters language codes.
+     */
+    private static $supported_locales = array(
+        'ur',
+        'uk',
+        'tr',
+        'tl',
+        'th',
+        'te',
+        'ta',
+        'sv',
+        'sr',
+        'sl',
+        'sk',
+        'si',
+        'ru',
+        'ro',
+        'rm',
+        'pt',
+        'pl',
+        'no',
+        'nl',
+        'ne',
+        'ms',
+        'lv',
+        'lt',
+        'lb',
+        'ko',
+        'ka',
+        'ja',
+        'iw',
+        'it',
+        'is',
+        'id',
+        'hy',
+        'hu',
+        'hr',
+        'hi',
+        'he',
+        'gl',
+        'ga',
+        'fy',
+        'fr',
+        'fo',
+        'fi',
+        'fa',
+        'eu',
+        'et',
+        'es',
+        'eo',
+        'en',
+        'el',
+        'de',
+        'da',
+        'cz',
+        'ca',
+        'bg',
+        'be',
+        'ar',
+        'af'
+    );
+
+    /**
+     * The Log service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Create a Wordlift_Timeline_Shortcode instance.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+        parent::__construct();
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Shortcode' );
+
+    }
+
+    public function get_timelinejs_default_options() {
+        return array(
+            'debug'                            => defined( 'WP_DEBUG' ) && WP_DEBUG,
+            'height'                           => NULL,
+            'width'                            => NULL,
+            'is_embed'                         => FALSE,
+            'hash_bookmark'                    => FALSE,
+            'default_bg_color'                 => 'white',
+            'scale_factor'                     => 2,
+            'initial_zoom'                     => NULL,
+            'zoom_sequence'                    => '[0.5, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89]',
+            'timenav_position'                 => 'bottom',
+            'optimal_tick_width'               => 100,
+            'base_class'                       => 'tl-timeline',
+            'timenav_height'                   => 150,
+            'timenav_height_percentage'        => NULL,
+            'timenav_mobile_height_percentage' => 40,
+            'timenav_height_min'               => 150,
+            'marker_height_min'                => 30,
+            'marker_width_min'                 => 100,
+            'marker_padding'                   => 5,
+            'start_at_slide'                   => 0,
+            'start_at_end'                     => FALSE,
+            'menubar_height'                   => 0,
+            'use_bc'                           => FALSE,
+            'duration'                         => 1000,
+            'ease'                             => 'TL.Ease.easeInOutQuint',
+            'slide_default_fade'               => '0%',
+            'language'                         => $this->get_locale(),
+            'ga_property_id'                   => NULL,
+            'track_events'                     => "['back_to_start','nav_next','nav_previous','zoom_in','zoom_out']"
+        );
+    }
+
+    /**
+     * Renders the Timeline.
+     *
+     * @since 3.1.0
+     *
+     * @param array $atts An array of shortcode attributes.
+     *
+     * @return string The rendered HTML.
+     */
+    public function render( $atts ) {
+
+        //extract attributes and set default values
+        $settings = shortcode_atts( array_merge($this->get_timelinejs_default_options(), array(
+            'global'                           => FALSE,
+            'display_images_as'                => 'media',
+            'excerpt_length'                   => 55
+        )), $atts );
+
+        // Load the TimelineJS stylesheets and scripts.
+        wp_enqueue_style( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/css/timeline.css' );
+        wp_enqueue_script( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/js/timeline' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '-min' : '' ) . '.js' );
+
+        // Enqueue the scripts for the timeline.
+        $this->enqueue_scripts();
+
+        // Provide the script with options.
+        wp_localize_script( 'timelinejs', 'wl_timeline_params', array(
+            'ajax_url'          => admin_url( 'admin-ajax.php' ),
+            // TODO: this parameter is already provided by WP
+            'action'            => 'wl_timeline',
+            // These settings apply to our wl_timeline AJAX endpoint.
+            'display_images_as' => $settings['display_images_as'],
+            'excerpt_length'    => $settings['excerpt_length'],
+            // These settings apply to the timeline javascript client.
+            'settings'          => array_filter( $settings, function ( $value ) {
+                // Do not set NULL values.
+                return ( NULL !== $value );
+            } )
+        ) );
+
+        // Get the current post id or set null if global is set to true.
+        $post_id = ( $settings['global'] ? NULL : get_the_ID() );
+
+        // Escaping atts.
+        $style        = sprintf( 'style="%s%s"', isset( $settings['width'] ) ? "width:{$settings['width']};" : '', isset( $settings['height'] ) ? "height:{$settings['height']};" : '' );
+        $data_post_id = ( isset( $post_id ) ? "data-post-id='$post_id'" : '' );
+
+        // Generate a unique ID for this timeline.
+        $element_id = uniqid( 'wl-timeline-' );
+
+        if ( WP_DEBUG ) {
+            $this->log_service->trace( "Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]" );
+        }
+
+        // Building template.
+        return sprintf( '<div class="wl-timeline-container" %s><div class="wl-timeline" id="%s" %s></div></div>', $style, $element_id, $data_post_id );
+    }
+
+    /**
+     * Return the locale for the TimelineJS according to WP's configured locale and
+     * support TimelineJS locales. If WP's locale is not supported, english is used.
+     *
+     * @since 3.7.0
+     * @return string The locale (2 letters code).
+     */
+    private function get_locale() {
+
+        // Get the first 2 letters.
+        $locale = substr( get_locale(), 0, 2 );
+
+        // Check that the specified locale is supported otherwise use English.
+        return in_array( $locale, self::$supported_locales ) ? $locale : 'en';
+    }
 
 }
 
@@ -211,43 +211,43 @@ 
  * register_block_type for Gutenberg blocks
  */
 add_action( 'init', function() {
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	$wordlift_timeline_shortcode = new Wordlift_Timeline_Shortcode();
-	register_block_type('wordlift/timeline', array(
-		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
-			$attr_code = '';
-			$timelinejs_options = json_decode($attributes['timelinejs_options'], true);
-			unset($attributes['timelinejs_options']);
-			$attributes_all = array_merge($attributes, $timelinejs_options);
-			foreach ($attributes_all as $key => $value) {
-				if($value && strpos($value, '[') === false && strpos($value, ']') === false) {
-					$attr_code .= $key.'="'.$value.'" ';
-				}
-			}
-			return '[wl_timeline '.$attr_code.']';
-		},
-		'attributes' => array(
-			'display_images_as' => array(
-				'type'    => 'string',
-				'default' => 'media'
-			),
-			'excerpt_length' => array(
-				'type'    => 'number',
-				'default' => 55
-			),
-			'global' => array(
-				'type'    => 'bool',
-				'default' => false
-			),
-			'timelinejs_options' => array(
-				'type'    => 'string', // https://timeline.knightlab.com/docs/options.html
-				'default' => json_encode($wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT)
-			)
-		)
-	));
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    $wordlift_timeline_shortcode = new Wordlift_Timeline_Shortcode();
+    register_block_type('wordlift/timeline', array(
+        'editor_script' => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function($attributes){
+            $attr_code = '';
+            $timelinejs_options = json_decode($attributes['timelinejs_options'], true);
+            unset($attributes['timelinejs_options']);
+            $attributes_all = array_merge($attributes, $timelinejs_options);
+            foreach ($attributes_all as $key => $value) {
+                if($value && strpos($value, '[') === false && strpos($value, ']') === false) {
+                    $attr_code .= $key.'="'.$value.'" ';
+                }
+            }
+            return '[wl_timeline '.$attr_code.']';
+        },
+        'attributes' => array(
+            'display_images_as' => array(
+                'type'    => 'string',
+                'default' => 'media'
+            ),
+            'excerpt_length' => array(
+                'type'    => 'number',
+                'default' => 55
+            ),
+            'global' => array(
+                'type'    => 'bool',
+                'default' => false
+            ),
+            'timelinejs_options' => array(
+                'type'    => 'string', // https://timeline.knightlab.com/docs/options.html
+                'default' => json_encode($wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT)
+            )
+        )
+    ));
 } );

Spacing +25 added lines, -25 removed lines

@@ -93,13 +93,13 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Shortcode' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Timeline_Shortcode');
 
 	}
 
 	public function get_timelinejs_default_options() {
 		return array(
-			'debug'                            => defined( 'WP_DEBUG' ) && WP_DEBUG,
+			'debug'                            => defined('WP_DEBUG') && WP_DEBUG,
 			'height'                           => NULL,
 			'width'                            => NULL,
 			'is_embed'                         => FALSE,
@@ -140,53 +140,53 @@ 
 	 *
 	 * @return string The rendered HTML.
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		//extract attributes and set default values
-		$settings = shortcode_atts( array_merge($this->get_timelinejs_default_options(), array(
+		$settings = shortcode_atts(array_merge($this->get_timelinejs_default_options(), array(
 			'global'                           => FALSE,
 			'display_images_as'                => 'media',
 			'excerpt_length'                   => 55
-		)), $atts );
+		)), $atts);
 
 		// Load the TimelineJS stylesheets and scripts.
-		wp_enqueue_style( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/css/timeline.css' );
-		wp_enqueue_script( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/timelinejs/js/timeline' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '-min' : '' ) . '.js' );
+		wp_enqueue_style('timelinejs', dirname(plugin_dir_url(__FILE__)).'/timelinejs/css/timeline.css');
+		wp_enqueue_script('timelinejs', dirname(plugin_dir_url(__FILE__)).'/timelinejs/js/timeline'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '-min' : '').'.js');
 
 		// Enqueue the scripts for the timeline.
 		$this->enqueue_scripts();
 
 		// Provide the script with options.
-		wp_localize_script( 'timelinejs', 'wl_timeline_params', array(
-			'ajax_url'          => admin_url( 'admin-ajax.php' ),
+		wp_localize_script('timelinejs', 'wl_timeline_params', array(
+			'ajax_url'          => admin_url('admin-ajax.php'),
 			// TODO: this parameter is already provided by WP
 			'action'            => 'wl_timeline',
 			// These settings apply to our wl_timeline AJAX endpoint.
 			'display_images_as' => $settings['display_images_as'],
 			'excerpt_length'    => $settings['excerpt_length'],
 			// These settings apply to the timeline javascript client.
-			'settings'          => array_filter( $settings, function ( $value ) {
+			'settings'          => array_filter($settings, function($value) {
 				// Do not set NULL values.
-				return ( NULL !== $value );
+				return (NULL !== $value);
 			} )
-		) );
+		));
 
 		// Get the current post id or set null if global is set to true.
-		$post_id = ( $settings['global'] ? NULL : get_the_ID() );
+		$post_id = ($settings['global'] ? NULL : get_the_ID());
 
 		// Escaping atts.
-		$style        = sprintf( 'style="%s%s"', isset( $settings['width'] ) ? "width:{$settings['width']};" : '', isset( $settings['height'] ) ? "height:{$settings['height']};" : '' );
-		$data_post_id = ( isset( $post_id ) ? "data-post-id='$post_id'" : '' );
+		$style        = sprintf('style="%s%s"', isset($settings['width']) ? "width:{$settings['width']};" : '', isset($settings['height']) ? "height:{$settings['height']};" : '');
+		$data_post_id = (isset($post_id) ? "data-post-id='$post_id'" : '');
 
 		// Generate a unique ID for this timeline.
-		$element_id = uniqid( 'wl-timeline-' );
+		$element_id = uniqid('wl-timeline-');
 
-		if ( WP_DEBUG ) {
-			$this->log_service->trace( "Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]" );
+		if (WP_DEBUG) {
+			$this->log_service->trace("Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]");
 		}
 
 		// Building template.
-		return sprintf( '<div class="wl-timeline-container" %s><div class="wl-timeline" id="%s" %s></div></div>', $style, $element_id, $data_post_id );
+		return sprintf('<div class="wl-timeline-container" %s><div class="wl-timeline" id="%s" %s></div></div>', $style, $element_id, $data_post_id);
 	}
 
 	/**
@@ -199,10 +199,10 @@ 
 	private function get_locale() {
 
 		// Get the first 2 letters.
-		$locale = substr( get_locale(), 0, 2 );
+		$locale = substr(get_locale(), 0, 2);
 
 		// Check that the specified locale is supported otherwise use English.
-		return in_array( $locale, self::$supported_locales ) ? $locale : 'en';
+		return in_array($locale, self::$supported_locales) ? $locale : 'en';
 	}
 
 }
@@ -210,22 +210,22 @@ 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function() {
+add_action('init', function() {
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
 	$wordlift_timeline_shortcode = new Wordlift_Timeline_Shortcode();
 	register_block_type('wordlift/timeline', array(
 		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
+		'render_callback' => function($attributes) {
 			$attr_code = '';
 			$timelinejs_options = json_decode($attributes['timelinejs_options'], true);
 			unset($attributes['timelinejs_options']);
 			$attributes_all = array_merge($attributes, $timelinejs_options);
 			foreach ($attributes_all as $key => $value) {
-				if($value && strpos($value, '[') === false && strpos($value, ']') === false) {
+				if ($value && strpos($value, '[') === false && strpos($value, ']') === false) {
 					$attr_code .= $key.'="'.$value.'" ';
 				}
 			}

src/shortcodes/wordlift_shortcode_navigator.php

Indentation +125 added lines, -125 removed lines

@@ -14,100 +14,100 @@ 
  */
 function wl_shortcode_navigator_data() {
 
-	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_die( 'No post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+    $current_post_id = $_GET['post_id'];
+    $current_post    = get_post( $current_post_id );
 
-	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+    // Post ID has to match an existing item
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	// prepare structures to memorize other related posts
-	$results          = array();
-	$blacklist_ids    = array( $current_post_id );
-	$related_entities = array();
+    // prepare structures to memorize other related posts
+    $results          = array();
+    $blacklist_ids    = array( $current_post_id );
+    $related_entities = array();
 
 
-	$relation_service = Wordlift_Relation_Service::get_instance();
+    $relation_service = Wordlift_Relation_Service::get_instance();
 
-	// Get the related entities, ordering them by WHO, WHAT, WHERE, WHEN
-	// TODO Replace with a single query if it is possible
-	// We select in inverse order to give priority to less used entities
-	foreach (
-		array(
-			WL_WHEN_RELATION,
-			WL_WHERE_RELATION,
-			WL_WHAT_RELATION,
-			WL_WHO_RELATION,
-		) as $predicate
-	) {
+    // Get the related entities, ordering them by WHO, WHAT, WHERE, WHEN
+    // TODO Replace with a single query if it is possible
+    // We select in inverse order to give priority to less used entities
+    foreach (
+        array(
+            WL_WHEN_RELATION,
+            WL_WHERE_RELATION,
+            WL_WHAT_RELATION,
+            WL_WHO_RELATION,
+        ) as $predicate
+    ) {
 
-		$related_entities = array_merge( $related_entities,
-			$relation_service->get_objects( $current_post_id, '*', $predicate, 'publish' )
+        $related_entities = array_merge( $related_entities,
+            $relation_service->get_objects( $current_post_id, '*', $predicate, 'publish' )
 //			wl_core_get_related_entities( $current_post_id, array(
 //					'predicate' => $predicate,
 //					'status'    => 'publish',
 //				)
-		);
-
-	}
-
-	foreach ( $related_entities as $related_entity ) {
-
-		// take the id of posts referencing the entity
-		$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects( $related_entity->ID, '*', null, 'publish' );
-
-		// loop over them and take the first one which is not already in the $related_posts
-		foreach ( $referencing_posts as $referencing_post ) {
-
-			if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
-
-				$blacklist_ids[]   = $referencing_post->ID;
-				$serialized_entity = wl_serialize_entity( $related_entity );
-
-				/**
-				 * Use the thumbnail.
-				 *
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-				 *
-				 * @since 3.19.3 We're using the medium size image.
-				 */
-				$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
-
-				if ( $thumbnail ) {
-
-					$results[] = array(
-						'post'   => array(
-							'permalink' => get_post_permalink( $referencing_post->ID ),
-							'title'     => $referencing_post->post_title,
-							'thumbnail' => $thumbnail,
-						),
-						'entity' => array(
-							'label'     => $serialized_entity['label'],
-							'mainType'  => $serialized_entity['mainType'],
-							'permalink' => get_post_permalink( $related_entity->ID ),
-						),
-					);
-
-					// Be sure no more than 1 post for entity is returned
-					break;
-				}
-			}
-		}
-	}
-
-	// Return first 4 results in json accordingly to 4 columns layout
-	return array_slice( array_reverse( $results ), 0, 4 );
+        );
+
+    }
+
+    foreach ( $related_entities as $related_entity ) {
+
+        // take the id of posts referencing the entity
+        $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects( $related_entity->ID, '*', null, 'publish' );
+
+        // loop over them and take the first one which is not already in the $related_posts
+        foreach ( $referencing_posts as $referencing_post ) {
+
+            if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
+
+                $blacklist_ids[]   = $referencing_post->ID;
+                $serialized_entity = wl_serialize_entity( $related_entity );
+
+                /**
+                 * Use the thumbnail.
+                 *
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/837
+                 *
+                 * @since 3.19.3 We're using the medium size image.
+                 */
+                $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+
+                if ( $thumbnail ) {
+
+                    $results[] = array(
+                        'post'   => array(
+                            'permalink' => get_post_permalink( $referencing_post->ID ),
+                            'title'     => $referencing_post->post_title,
+                            'thumbnail' => $thumbnail,
+                        ),
+                        'entity' => array(
+                            'label'     => $serialized_entity['label'],
+                            'mainType'  => $serialized_entity['mainType'],
+                            'permalink' => get_post_permalink( $related_entity->ID ),
+                        ),
+                    );
+
+                    // Be sure no more than 1 post for entity is returned
+                    break;
+                }
+            }
+        }
+    }
+
+    // Return first 4 results in json accordingly to 4 columns layout
+    return array_slice( array_reverse( $results ), 0, 4 );
 
 }
 
@@ -118,8 +118,8 @@ 
  */
 function wl_shortcode_navigator_ajax() {
 
-	$results = wl_shortcode_navigator_data();
-	wl_core_send_json($results);
+    $results = wl_shortcode_navigator_data();
+    wl_core_send_json($results);
 
 }
 
@@ -131,15 +131,15 @@ 
  */
 function wl_shortcode_navigator_wp_json() {
 
-	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
-	return array(
-		'items' => array(
-			array('values' => $results)
-		)
-	);
+    $results = wl_shortcode_navigator_data();
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
+    return array(
+        'items' => array(
+            array('values' => $results)
+        )
+    );
 
 }
 
@@ -147,43 +147,43 @@ 
  * Adding `rest_api_init` action for amp backend of navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
-	  'methods' => 'GET',
-	  'callback' => 'wl_shortcode_navigator_wp_json',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+        'methods' => 'GET',
+        'callback' => 'wl_shortcode_navigator_wp_json',
+    ) );
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
 add_action( 'init', function() {
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type('wordlift/navigator', array(
-		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
-			$attr_code = '';
-			foreach ($attributes as $key => $value) {
-				$attr_code .= $key.'="'.$value.'" ';
-			}
-			return '[wl_navigator '.$attr_code.']';
-		},
-		'attributes' => array(
-			'title' => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' )
-			),
-			'with_carousel' => array(
-				'type'    => 'bool',
-				'default' => true
-			),
-			'squared_thumbs' => array(
-				'type'    => 'bool',
-				'default' => false
-			)
-		)
-	));
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type('wordlift/navigator', array(
+        'editor_script' => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function($attributes){
+            $attr_code = '';
+            foreach ($attributes as $key => $value) {
+                $attr_code .= $key.'="'.$value.'" ';
+            }
+            return '[wl_navigator '.$attr_code.']';
+        },
+        'attributes' => array(
+            'title' => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' )
+            ),
+            'with_carousel' => array(
+                'type'    => 'bool',
+                'default' => true
+            ),
+            'squared_thumbs' => array(
+                'type'    => 'bool',
+                'default' => false
+            )
+        )
+    ));
 } );

Spacing +28 added lines, -28 removed lines

@@ -15,25 +15,25 @@ 
 function wl_shortcode_navigator_data() {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
 
 	// prepare structures to memorize other related posts
 	$results          = array();
-	$blacklist_ids    = array( $current_post_id );
+	$blacklist_ids    = array($current_post_id);
 	$related_entities = array();
 
 
@@ -51,8 +51,8 @@ 
 		) as $predicate
 	) {
 
-		$related_entities = array_merge( $related_entities,
-			$relation_service->get_objects( $current_post_id, '*', $predicate, 'publish' )
+		$related_entities = array_merge($related_entities,
+			$relation_service->get_objects($current_post_id, '*', $predicate, 'publish')
 //			wl_core_get_related_entities( $current_post_id, array(
 //					'predicate' => $predicate,
 //					'status'    => 'publish',
@@ -61,18 +61,18 @@ 
 
 	}
 
-	foreach ( $related_entities as $related_entity ) {
+	foreach ($related_entities as $related_entity) {
 
 		// take the id of posts referencing the entity
-		$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects( $related_entity->ID, '*', null, 'publish' );
+		$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects($related_entity->ID, '*', null, 'publish');
 
 		// loop over them and take the first one which is not already in the $related_posts
-		foreach ( $referencing_posts as $referencing_post ) {
+		foreach ($referencing_posts as $referencing_post) {
 
-			if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
+			if ( ! in_array($referencing_post->ID, $blacklist_ids)) {
 
 				$blacklist_ids[]   = $referencing_post->ID;
-				$serialized_entity = wl_serialize_entity( $related_entity );
+				$serialized_entity = wl_serialize_entity($related_entity);
 
 				/**
 				 * Use the thumbnail.
@@ -82,20 +82,20 @@ 
 				 *
 				 * @since 3.19.3 We're using the medium size image.
 				 */
-				$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+				$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
-				if ( $thumbnail ) {
+				if ($thumbnail) {
 
 					$results[] = array(
 						'post'   => array(
-							'permalink' => get_post_permalink( $referencing_post->ID ),
+							'permalink' => get_post_permalink($referencing_post->ID),
 							'title'     => $referencing_post->post_title,
 							'thumbnail' => $thumbnail,
 						),
 						'entity' => array(
 							'label'     => $serialized_entity['label'],
 							'mainType'  => $serialized_entity['mainType'],
-							'permalink' => get_post_permalink( $related_entity->ID ),
+							'permalink' => get_post_permalink($related_entity->ID),
 						),
 					);
 
@@ -107,7 +107,7 @@ 
 	}
 
 	// Return first 4 results in json accordingly to 4 columns layout
-	return array_slice( array_reverse( $results ), 0, 4 );
+	return array_slice(array_reverse($results), 0, 4);
 
 }
 
@@ -123,8 +123,8 @@ 
 
 }
 
-add_action( 'wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax' );
-add_action( 'wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax' );
+add_action('wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax');
+add_action('wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax');
 
 /**
  * wp-json call for the navigator widget
@@ -132,7 +132,7 @@ 
 function wl_shortcode_navigator_wp_json() {
 
 	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 	return array(
@@ -146,25 +146,25 @@ 
 /**
  * Adding `rest_api_init` action for amp backend of navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
 	  'methods' => 'GET',
 	  'callback' => 'wl_shortcode_navigator_wp_json',
-	) );
+	));
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function() {
+add_action('init', function() {
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
 	register_block_type('wordlift/navigator', array(
 		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
+		'render_callback' => function($attributes) {
 			$attr_code = '';
 			foreach ($attributes as $key => $value) {
 				$attr_code .= $key.'="'.$value.'" ';
@@ -174,7 +174,7 @@ 
 		'attributes' => array(
 			'title' => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' )
+				'default' => __('Related articles', 'wordlift')
 			),
 			'with_carousel' => array(
 				'type'    => 'bool',

src/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +337 added lines, -337 removed lines

@@ -16,114 +16,114 @@ 
  */
 function wl_shortcode_faceted_search_data_ajax( $http_raw_data = null ) {
 
-	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
-
-		return;
-	}
-
-	// Extract filtering conditions.
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
-
-	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
-
-	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
-
-		return;
-	}
-
-	// If the current post is an entity,
-	// the current post is used as main entity.
-	// Otherwise, current post related entities are used.
-	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
-
-	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
-
-		return;
-	}
-
-	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
-
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
-
-	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-		$entity_ids,
-		'*',
-		null,
-		'publish',
-		array( $current_post_id ),
-		$limit
-	);
-
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-	$results              = array();
-
-	if ( 'posts' === $required_type ) {
-
-		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
-
-		$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-			$referencing_posts :
-			Wordlift_Relation_Service::get_instance()->get_article_subjects(
-				wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
-				'*',
-				null,
-				null,
-				array(),
-				null,
-				$referencing_post_ids
-			);
-
-		if ( $filtered_posts ) {
-			foreach ( $filtered_posts as $post_obj ) {
-
-				/**
-				 * Use the thumbnail.
-				 *
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-				 *
-				 * @since 3.19.3 We're using the medium size image.
-				 */
-				$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-				$post_obj->thumbnail = ( $thumbnail ) ?
-					$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-				$post_obj->permalink = get_post_permalink( $post_obj->ID );
-
-				$results[] = $post_obj;
-			}
-		}
-	} else {
-
-		global $wpdb;
-
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
-
-		// Retrieve Wordlift relation instances table name.
-		$table_name = wl_core_get_relation_instances_table_name();
-
-		/*
+    // Post ID must be defined.
+    if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
+        wp_die( 'No post_id given' );
+
+        return;
+    }
+
+    // Extract filtering conditions.
+    $filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
+    $filtering_entity_uris = json_decode( $filtering_entity_uris );
+
+    $current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
+    $current_post    = get_post( $current_post_id );
+
+    // Post ID has to match an existing item.
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
+
+        return;
+    }
+
+    // If the current post is an entity,
+    // the current post is used as main entity.
+    // Otherwise, current post related entities are used.
+    $entity_service = Wordlift_Entity_Service::get_instance();
+    $entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
+        array( $current_post->ID ) :
+        wl_core_get_related_entity_ids( $current_post->ID );
+
+    // If there are no entities we cannot render the widget.
+    if ( 0 === count( $entity_ids ) ) {
+        wp_die( 'No entities available' );
+
+        return;
+    }
+
+    // Retrieve requested type
+    $required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+
+    $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+
+    $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+        $entity_ids,
+        '*',
+        null,
+        'publish',
+        array( $current_post_id ),
+        $limit
+    );
+
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+    $results              = array();
+
+    if ( 'posts' === $required_type ) {
+
+        // Required filtered posts.
+        wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+
+        $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
+            $referencing_posts :
+            Wordlift_Relation_Service::get_instance()->get_article_subjects(
+                wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+                '*',
+                null,
+                null,
+                array(),
+                null,
+                $referencing_post_ids
+            );
+
+        if ( $filtered_posts ) {
+            foreach ( $filtered_posts as $post_obj ) {
+
+                /**
+                 * Use the thumbnail.
+                 *
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/837
+                 *
+                 * @since 3.19.3 We're using the medium size image.
+                 */
+                $thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
+                $post_obj->thumbnail = ( $thumbnail ) ?
+                    $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+                $post_obj->permalink = get_post_permalink( $post_obj->ID );
+
+                $results[] = $post_obj;
+            }
+        }
+    } else {
+
+        global $wpdb;
+
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+
+        // Retrieve Wordlift relation instances table name.
+        $table_name = wl_core_get_relation_instances_table_name();
+
+        /*
 		 * Make sure we have some referenced post, otherwise the IN parts of
 		 * the SQL will produce an SQL error.
 		 */
-		if ( ! empty( $referencing_post_ids ) ) {
-			$subject_ids = implode( ',', $referencing_post_ids );
+        if ( ! empty( $referencing_post_ids ) ) {
+            $subject_ids = implode( ',', $referencing_post_ids );
 
-			$query = "
+            $query = "
 				SELECT
 					object_id AS ID,
 					count( object_id ) AS counter
@@ -135,30 +135,30 @@ 
 				LIMIT $limit;
 			";
 
-			wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+            wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
 
-			$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+            $entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
 
-			wl_write_log( 'Entities found ' . count( $entities ) );
+            wl_write_log( 'Entities found ' . count( $entities ) );
 
-			foreach ( $entities as $obj ) {
+            foreach ( $entities as $obj ) {
 
-				$entity = get_post( $obj->ID );
+                $entity = get_post( $obj->ID );
 
-				// Ensure only valid and published entities are returned.
-				if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+                // Ensure only valid and published entities are returned.
+                if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
 
-					$serialized_entity              = wl_serialize_entity( $entity );
-					$serialized_entity['counter']   = $obj->counter;
-					$serialized_entity['createdAt'] = $entity->post_date;
+                    $serialized_entity              = wl_serialize_entity( $entity );
+                    $serialized_entity['counter']   = $obj->counter;
+                    $serialized_entity['createdAt'] = $entity->post_date;
 
-					$results[] = $serialized_entity;
-				}
-			}
-		}
-	}
+                    $results[] = $serialized_entity;
+                }
+            }
+        }
+    }
 
-	return $results;
+    return $results;
 
 }
 
@@ -170,148 +170,148 @@ 
  */
 function wl_shortcode_faceted_search_data_wp_json( $http_raw_data = null ) {
 
-	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
-
-		return;
-	}
-
-	// Extract filtering conditions.
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
-
-	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
-
-	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
-
-		return;
-	}
-
-	// If the current post is an entity,
-	// the current post is used as main entity.
-	// Otherwise, current post related entities are used.
-	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
-
-	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
-
-		return;
-	}
-
-	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
-
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
-
-	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-		$entity_ids,
-		'*',
-		null,
-		'publish',
-		array( $current_post_id ),
-		$limit
-	);
-
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-	$results              = array();
-
-	if ( 'posts' === $required_type ) {
-
-		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
-
-		$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-			$referencing_posts :
-			Wordlift_Relation_Service::get_instance()->get_article_subjects(
-				wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
-				'*',
-				null,
-				null,
-				array(),
-				null,
-				$referencing_post_ids
-			);
-
-		if ( $filtered_posts ) {
-			foreach ( $filtered_posts as $i => $post_obj ) {
-
-				/**
-				 * Use the thumbnail.
-				 *
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-				 *
-				 * @since 3.19.3 We're using the medium size image.
-				 */
-				$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-				$post_obj->thumbnail = ( $thumbnail ) ?
-					$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-				$post_obj->permalink = get_post_permalink( $post_obj->ID );
-
-				$results[$i] = $post_obj;
-
-				// Get Entity URLs needed for client side filtering in amp
-				foreach( Wordlift_Relation_Service::get_instance()->get_objects( $post_obj->ID, 'ids' ) as $entity_id ){
-					$results[$i]->entities[] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
-				}
-			}
-		}
-
-		return array(
-			array('values' => $results)
-		);
-
-	} else {
-
-		global $wpdb;
-
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
-
-		// Retrieve Wordlift relation instances table name.
-		$table_name = wl_core_get_relation_instances_table_name();
-
-		// Response interface with l10n strings, grouped entities and empty data array
-		$serialized_entity_groups = array(
-			array(
-				'l10n' => $_GET['l10n'] ? $_GET['l10n']['what'] : 'what',
-				'entities' => array('thing', 'creative-work', 'recipe'),
-				'data' => array()
-			),
-			array(
-				'l10n' => $_GET['l10n'] ? $_GET['l10n']['who'] : 'who',
-				'entities' => array('person', 'organization', 'local-business'),
-				'data' => array()
-			),
-			array(
-				'l10n' => $_GET['l10n'] ? $_GET['l10n']['where'] : 'where',
-				'entities' => array('place'),
-				'data' => array()
-			),
-			array(
-				'l10n' => $_GET['l10n'] ? $_GET['l10n']['when'] : 'when',
-				'entities' => array('event'),
-				'data' => array()
-			)
-		);
-
-		/*
+    // Post ID must be defined.
+    if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
+        wp_die( 'No post_id given' );
+
+        return;
+    }
+
+    // Extract filtering conditions.
+    $filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
+    $filtering_entity_uris = json_decode( $filtering_entity_uris );
+
+    $current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
+    $current_post    = get_post( $current_post_id );
+
+    // Post ID has to match an existing item.
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
+
+        return;
+    }
+
+    // If the current post is an entity,
+    // the current post is used as main entity.
+    // Otherwise, current post related entities are used.
+    $entity_service = Wordlift_Entity_Service::get_instance();
+    $entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
+        array( $current_post->ID ) :
+        wl_core_get_related_entity_ids( $current_post->ID );
+
+    // If there are no entities we cannot render the widget.
+    if ( 0 === count( $entity_ids ) ) {
+        wp_die( 'No entities available' );
+
+        return;
+    }
+
+    // Retrieve requested type
+    $required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+
+    $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+
+    $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+        $entity_ids,
+        '*',
+        null,
+        'publish',
+        array( $current_post_id ),
+        $limit
+    );
+
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+    $results              = array();
+
+    if ( 'posts' === $required_type ) {
+
+        // Required filtered posts.
+        wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+
+        $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
+            $referencing_posts :
+            Wordlift_Relation_Service::get_instance()->get_article_subjects(
+                wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+                '*',
+                null,
+                null,
+                array(),
+                null,
+                $referencing_post_ids
+            );
+
+        if ( $filtered_posts ) {
+            foreach ( $filtered_posts as $i => $post_obj ) {
+
+                /**
+                 * Use the thumbnail.
+                 *
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/837
+                 *
+                 * @since 3.19.3 We're using the medium size image.
+                 */
+                $thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
+                $post_obj->thumbnail = ( $thumbnail ) ?
+                    $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+                $post_obj->permalink = get_post_permalink( $post_obj->ID );
+
+                $results[$i] = $post_obj;
+
+                // Get Entity URLs needed for client side filtering in amp
+                foreach( Wordlift_Relation_Service::get_instance()->get_objects( $post_obj->ID, 'ids' ) as $entity_id ){
+                    $results[$i]->entities[] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
+                }
+            }
+        }
+
+        return array(
+            array('values' => $results)
+        );
+
+    } else {
+
+        global $wpdb;
+
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+
+        // Retrieve Wordlift relation instances table name.
+        $table_name = wl_core_get_relation_instances_table_name();
+
+        // Response interface with l10n strings, grouped entities and empty data array
+        $serialized_entity_groups = array(
+            array(
+                'l10n' => $_GET['l10n'] ? $_GET['l10n']['what'] : 'what',
+                'entities' => array('thing', 'creative-work', 'recipe'),
+                'data' => array()
+            ),
+            array(
+                'l10n' => $_GET['l10n'] ? $_GET['l10n']['who'] : 'who',
+                'entities' => array('person', 'organization', 'local-business'),
+                'data' => array()
+            ),
+            array(
+                'l10n' => $_GET['l10n'] ? $_GET['l10n']['where'] : 'where',
+                'entities' => array('place'),
+                'data' => array()
+            ),
+            array(
+                'l10n' => $_GET['l10n'] ? $_GET['l10n']['when'] : 'when',
+                'entities' => array('event'),
+                'data' => array()
+            )
+        );
+
+        /*
 		 * Make sure we have some referenced post, otherwise the IN parts of
 		 * the SQL will produce an SQL error.
 		 */
-		if ( ! empty( $referencing_post_ids ) ) {
-			$subject_ids = implode( ',', $referencing_post_ids );
+        if ( ! empty( $referencing_post_ids ) ) {
+            $subject_ids = implode( ',', $referencing_post_ids );
 
-			$query = "
+            $query = "
 				SELECT
 					object_id AS ID,
 					count( object_id ) AS counter
@@ -323,45 +323,45 @@ 
 				LIMIT $limit;
 			";
 
-			wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+            wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
 
-			$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+            $entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
 
-			wl_write_log( 'Entities found ' . count( $entities ) );
+            wl_write_log( 'Entities found ' . count( $entities ) );
 
-			foreach ( $entities as $obj ) {
+            foreach ( $entities as $obj ) {
 
-				$entity = get_post( $obj->ID );
+                $entity = get_post( $obj->ID );
 
-				// Ensure only valid and published entities are returned.
-				if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+                // Ensure only valid and published entities are returned.
+                if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
 
-					$serialized_entity              = wl_serialize_entity( $entity );
-					$serialized_entity['counter']   = $obj->counter;
-					$serialized_entity['createdAt'] = $entity->post_date;
+                    $serialized_entity              = wl_serialize_entity( $entity );
+                    $serialized_entity['counter']   = $obj->counter;
+                    $serialized_entity['createdAt'] = $entity->post_date;
 
-					// Populate $serialized_entity_groups maintaining array sequence
-					foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
-						if ( in_array( $serialized_entity['mainType'], $seg_value['entities'] ) ) {
-							$serialized_entity_groups[$seg_key]['data'][] = $serialized_entity;
-						}
-					}
-				}
-			}
+                    // Populate $serialized_entity_groups maintaining array sequence
+                    foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
+                        if ( in_array( $serialized_entity['mainType'], $seg_value['entities'] ) ) {
+                            $serialized_entity_groups[$seg_key]['data'][] = $serialized_entity;
+                        }
+                    }
+                }
+            }
 
-			// Clean-up $serialized_entity_groups by removing empty items and entities
-			foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
-				if( empty($seg_value['data']) ) {
-					unset($serialized_entity_groups[$seg_key]);
-				}
-				unset($serialized_entity_groups[$seg_key]['entities']);
-			}
+            // Clean-up $serialized_entity_groups by removing empty items and entities
+            foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
+                if( empty($seg_value['data']) ) {
+                    unset($serialized_entity_groups[$seg_key]);
+                }
+                unset($serialized_entity_groups[$seg_key]['entities']);
+            }
 
-			$results = $serialized_entity_groups;
-		}
+            $results = $serialized_entity_groups;
+        }
 
-		return $results;
-	}
+        return $results;
+    }
 
 }
 
@@ -370,8 +370,8 @@ 
  */
 function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
 
-	$results = wl_shortcode_faceted_search_data_ajax( $http_raw_data );
-	wl_core_send_json( $results );
+    $results = wl_shortcode_faceted_search_data_ajax( $http_raw_data );
+    wl_core_send_json( $results );
 
 }
 
@@ -386,13 +386,13 @@ 
  */
 function wl_shortcode_faceted_search_wp_json( $http_raw_data = null ) {
 
-	$results = wl_shortcode_faceted_search_data_wp_json( $http_raw_data );
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
-	return array(
-		'items' => $results
-	);
+    $results = wl_shortcode_faceted_search_data_wp_json( $http_raw_data );
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
+    return array(
+        'items' => $results
+    );
 
 }
 
@@ -400,51 +400,51 @@ 
  * Adding `rest_api_init` action for amp backend of faceted-search
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
-	  'methods' => 'GET',
-	  'callback' => 'wl_shortcode_faceted_search_wp_json',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
+        'methods' => 'GET',
+        'callback' => 'wl_shortcode_faceted_search_wp_json',
+    ) );
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
 add_action( 'init', function() {
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type('wordlift/faceted-search', array(
-		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
-			$attr_code = '';
-			foreach ($attributes as $key => $value) {
-				$attr_code .= $key.'="'.$value.'" ';
-			}
-			return '[wl_faceted_search '.$attr_code.']';
-		},
-		'attributes' => array(
-			'title' => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' )
-			),
-			'show_facets' => array(
-				'type'    => 'bool',
-				'default' => true
-			),
-			'with_carousel' => array(
-				'type'    => 'bool',
-				'default' => true
-			),
-			'squared_thumbs' => array(
-				'type'    => 'bool',
-				'default' => false
-			),
-			'limit' => array(
-				'type'    => 'number',
-				'default' => 20
-			)
-		)
-	));
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type('wordlift/faceted-search', array(
+        'editor_script' => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function($attributes){
+            $attr_code = '';
+            foreach ($attributes as $key => $value) {
+                $attr_code .= $key.'="'.$value.'" ';
+            }
+            return '[wl_faceted_search '.$attr_code.']';
+        },
+        'attributes' => array(
+            'title' => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' )
+            ),
+            'show_facets' => array(
+                'type'    => 'bool',
+                'default' => true
+            ),
+            'with_carousel' => array(
+                'type'    => 'bool',
+                'default' => true
+            ),
+            'squared_thumbs' => array(
+                'type'    => 'bool',
+                'default' => false
+            ),
+            'limit' => array(
+                'type'    => 'number',
+                'default' => 20
+            )
+        )
+    ));
 } );

Spacing +95 added lines, -99 removed lines

@@ -14,25 +14,25 @@ 
  * @since		3.20.0
  * @return array $results
  */
-function wl_shortcode_faceted_search_data_ajax( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_data_ajax($http_raw_data = null) {
 
 	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) { // WPCS: input var ok; CSRF ok.
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	// Extract filtering conditions.
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+	$filtering_entity_uris = (null == $http_raw_data) ? file_get_contents('php://input') : $http_raw_data;
+	$filtering_entity_uris = json_decode($filtering_entity_uris);
 
 	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
@@ -41,45 +41,43 @@ 
 	// the current post is used as main entity.
 	// Otherwise, current post related entities are used.
 	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
+	if (0 === count($entity_ids)) {
+		wp_die('No entities available');
 
 		return;
 	}
 
 	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+	$required_type = (isset($_GET['type'])) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+	$limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 20; // WPCS: input var ok; CSRF ok.
 
 	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
 		$entity_ids,
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit
 	);
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 	$results              = array();
 
-	if ( 'posts' === $required_type ) {
+	if ('posts' === $required_type) {
 
 		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related posts for the current post [ post ID :: $current_post_id ]");
 
-		$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-			$referencing_posts :
-			Wordlift_Relation_Service::get_instance()->get_article_subjects(
-				wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+		$filtered_posts = (empty($filtering_entity_uris)) ?
+			$referencing_posts : Wordlift_Relation_Service::get_instance()->get_article_subjects(
+				wl_get_entity_post_ids_by_uris($filtering_entity_uris),
 				'*',
 				null,
 				null,
@@ -88,8 +86,8 @@ 
 				$referencing_post_ids
 			);
 
-		if ( $filtered_posts ) {
-			foreach ( $filtered_posts as $post_obj ) {
+		if ($filtered_posts) {
+			foreach ($filtered_posts as $post_obj) {
 
 				/**
 				 * Use the thumbnail.
@@ -99,10 +97,10 @@ 
 				 *
 				 * @since 3.19.3 We're using the medium size image.
 				 */
-				$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-				$post_obj->thumbnail = ( $thumbnail ) ?
+				$thumbnail           = get_the_post_thumbnail_url($post_obj, 'medium');
+				$post_obj->thumbnail = ($thumbnail) ?
 					$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-				$post_obj->permalink = get_post_permalink( $post_obj->ID );
+				$post_obj->permalink = get_post_permalink($post_obj->ID);
 
 				$results[] = $post_obj;
 			}
@@ -111,7 +109,7 @@ 
 
 		global $wpdb;
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ]");
 
 		// Retrieve Wordlift relation instances table name.
 		$table_name = wl_core_get_relation_instances_table_name();
@@ -120,8 +118,8 @@ 
 		 * Make sure we have some referenced post, otherwise the IN parts of
 		 * the SQL will produce an SQL error.
 		 */
-		if ( ! empty( $referencing_post_ids ) ) {
-			$subject_ids = implode( ',', $referencing_post_ids );
+		if ( ! empty($referencing_post_ids)) {
+			$subject_ids = implode(',', $referencing_post_ids);
 
 			$query = "
 				SELECT
@@ -135,20 +133,20 @@ 
 				LIMIT $limit;
 			";
 
-			wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+			wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]");
 
-			$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+			$entities = $wpdb->get_results($query, OBJECT); // No cache ok.
 
-			wl_write_log( 'Entities found ' . count( $entities ) );
+			wl_write_log('Entities found '.count($entities));
 
-			foreach ( $entities as $obj ) {
+			foreach ($entities as $obj) {
 
-				$entity = get_post( $obj->ID );
+				$entity = get_post($obj->ID);
 
 				// Ensure only valid and published entities are returned.
-				if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+				if ((null !== $entity) && ('publish' === $entity->post_status)) {
 
-					$serialized_entity              = wl_serialize_entity( $entity );
+					$serialized_entity              = wl_serialize_entity($entity);
 					$serialized_entity['counter']   = $obj->counter;
 					$serialized_entity['createdAt'] = $entity->post_date;
 
@@ -168,25 +166,25 @@ 
  * @since		3.20.0
  * @return array $results
  */
-function wl_shortcode_faceted_search_data_wp_json( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_data_wp_json($http_raw_data = null) {
 
 	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) { // WPCS: input var ok; CSRF ok.
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	// Extract filtering conditions.
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+	$filtering_entity_uris = (null == $http_raw_data) ? file_get_contents('php://input') : $http_raw_data;
+	$filtering_entity_uris = json_decode($filtering_entity_uris);
 
 	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
@@ -195,45 +193,43 @@ 
 	// the current post is used as main entity.
 	// Otherwise, current post related entities are used.
 	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
+	if (0 === count($entity_ids)) {
+		wp_die('No entities available');
 
 		return;
 	}
 
 	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+	$required_type = (isset($_GET['type'])) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+	$limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 20; // WPCS: input var ok; CSRF ok.
 
 	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
 		$entity_ids,
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit
 	);
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 	$results              = array();
 
-	if ( 'posts' === $required_type ) {
+	if ('posts' === $required_type) {
 
 		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related posts for the current post [ post ID :: $current_post_id ]");
 
-		$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-			$referencing_posts :
-			Wordlift_Relation_Service::get_instance()->get_article_subjects(
-				wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+		$filtered_posts = (empty($filtering_entity_uris)) ?
+			$referencing_posts : Wordlift_Relation_Service::get_instance()->get_article_subjects(
+				wl_get_entity_post_ids_by_uris($filtering_entity_uris),
 				'*',
 				null,
 				null,
@@ -242,8 +238,8 @@ 
 				$referencing_post_ids
 			);
 
-		if ( $filtered_posts ) {
-			foreach ( $filtered_posts as $i => $post_obj ) {
+		if ($filtered_posts) {
+			foreach ($filtered_posts as $i => $post_obj) {
 
 				/**
 				 * Use the thumbnail.
@@ -253,16 +249,16 @@ 
 				 *
 				 * @since 3.19.3 We're using the medium size image.
 				 */
-				$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-				$post_obj->thumbnail = ( $thumbnail ) ?
+				$thumbnail           = get_the_post_thumbnail_url($post_obj, 'medium');
+				$post_obj->thumbnail = ($thumbnail) ?
 					$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-				$post_obj->permalink = get_post_permalink( $post_obj->ID );
+				$post_obj->permalink = get_post_permalink($post_obj->ID);
 
 				$results[$i] = $post_obj;
 
 				// Get Entity URLs needed for client side filtering in amp
-				foreach( Wordlift_Relation_Service::get_instance()->get_objects( $post_obj->ID, 'ids' ) as $entity_id ){
-					$results[$i]->entities[] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
+				foreach (Wordlift_Relation_Service::get_instance()->get_objects($post_obj->ID, 'ids') as $entity_id) {
+					$results[$i]->entities[] = Wordlift_Entity_Service::get_instance()->get_uri($entity_id);
 				}
 			}
 		}
@@ -275,7 +271,7 @@ 
 
 		global $wpdb;
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ]");
 
 		// Retrieve Wordlift relation instances table name.
 		$table_name = wl_core_get_relation_instances_table_name();
@@ -308,8 +304,8 @@ 
 		 * Make sure we have some referenced post, otherwise the IN parts of
 		 * the SQL will produce an SQL error.
 		 */
-		if ( ! empty( $referencing_post_ids ) ) {
-			$subject_ids = implode( ',', $referencing_post_ids );
+		if ( ! empty($referencing_post_ids)) {
+			$subject_ids = implode(',', $referencing_post_ids);
 
 			$query = "
 				SELECT
@@ -323,26 +319,26 @@ 
 				LIMIT $limit;
 			";
 
-			wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+			wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]");
 
-			$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+			$entities = $wpdb->get_results($query, OBJECT); // No cache ok.
 
-			wl_write_log( 'Entities found ' . count( $entities ) );
+			wl_write_log('Entities found '.count($entities));
 
-			foreach ( $entities as $obj ) {
+			foreach ($entities as $obj) {
 
-				$entity = get_post( $obj->ID );
+				$entity = get_post($obj->ID);
 
 				// Ensure only valid and published entities are returned.
-				if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+				if ((null !== $entity) && ('publish' === $entity->post_status)) {
 
-					$serialized_entity              = wl_serialize_entity( $entity );
+					$serialized_entity              = wl_serialize_entity($entity);
 					$serialized_entity['counter']   = $obj->counter;
 					$serialized_entity['createdAt'] = $entity->post_date;
 
 					// Populate $serialized_entity_groups maintaining array sequence
-					foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
-						if ( in_array( $serialized_entity['mainType'], $seg_value['entities'] ) ) {
+					foreach ($serialized_entity_groups as $seg_key => $seg_value) {
+						if (in_array($serialized_entity['mainType'], $seg_value['entities'])) {
 							$serialized_entity_groups[$seg_key]['data'][] = $serialized_entity;
 						}
 					}
@@ -350,8 +346,8 @@ 
 			}
 
 			// Clean-up $serialized_entity_groups by removing empty items and entities
-			foreach ( $serialized_entity_groups as $seg_key => $seg_value ) {
-				if( empty($seg_value['data']) ) {
+			foreach ($serialized_entity_groups as $seg_key => $seg_value) {
+				if (empty($seg_value['data'])) {
 					unset($serialized_entity_groups[$seg_key]);
 				}
 				unset($serialized_entity_groups[$seg_key]['entities']);
@@ -368,26 +364,26 @@ 
 /**
  * Ajax call for the faceted search widget
  */
-function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_ajax($http_raw_data = null) {
 
-	$results = wl_shortcode_faceted_search_data_ajax( $http_raw_data );
-	wl_core_send_json( $results );
+	$results = wl_shortcode_faceted_search_data_ajax($http_raw_data);
+	wl_core_send_json($results);
 
 }
 
 /**
  * Adding `wp_ajax` and `wp_ajax_nopriv` action for web backend of faceted-search
  */
-add_action( 'wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
-add_action( 'wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
+add_action('wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');
+add_action('wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');
 
 /**
  * wp-json call for the faceted search widget
  */
-function wl_shortcode_faceted_search_wp_json( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_wp_json($http_raw_data = null) {
 
-	$results = wl_shortcode_faceted_search_data_wp_json( $http_raw_data );
-	if ( ob_get_contents() ) {
+	$results = wl_shortcode_faceted_search_data_wp_json($http_raw_data);
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 	return array(
@@ -399,25 +395,25 @@ 
 /**
  * Adding `rest_api_init` action for amp backend of faceted-search
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
 	  'methods' => 'GET',
 	  'callback' => 'wl_shortcode_faceted_search_wp_json',
-	) );
+	));
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function() {
+add_action('init', function() {
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
 	register_block_type('wordlift/faceted-search', array(
 		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
+		'render_callback' => function($attributes) {
 			$attr_code = '';
 			foreach ($attributes as $key => $value) {
 				$attr_code .= $key.'="'.$value.'" ';
@@ -427,7 +423,7 @@ 
 		'attributes' => array(
 			'title' => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' )
+				'default' => __('Related articles', 'wordlift')
 			),
 			'show_facets' => array(
 				'type'    => 'bool',

src/shortcodes/wordlift_shortcode_geomap.php

Indentation +152 added lines, -152 removed lines

@@ -18,58 +18,58 @@ 
  */
 function wl_shortcode_geomap_get_places( $post_id = null ) {
 
-	// If $post_id is null or is not numeric it means this is a global geomap
-	$is_global = is_null( $post_id ) || ! is_numeric( $post_id );
+    // If $post_id is null or is not numeric it means this is a global geomap
+    $is_global = is_null( $post_id ) || ! is_numeric( $post_id );
 
-	// If the current one is not a global geomap, retrieve related entities ids
-	if ( $is_global ) {
-		$related_ids = array();
-	} else {
-		$related_ids = wl_core_get_related_entity_ids( $post_id, array(
-			'status' => 'publish',
-		) );
+    // If the current one is not a global geomap, retrieve related entities ids
+    if ( $is_global ) {
+        $related_ids = array();
+    } else {
+        $related_ids = wl_core_get_related_entity_ids( $post_id, array(
+            'status' => 'publish',
+        ) );
 
-		// Also include current entity
-		if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
-			$related_ids[] = $post_id;
-		}
-	}
+        // Also include current entity
+        if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+            $related_ids[] = $post_id;
+        }
+    }
 
-	// If is not a global geomap, an empty $related_ids means that no entities are related to the post
-	// An empty array can be returned in this case
-	if ( ! $is_global && empty( $related_ids ) ) {
-		return array();
-	}
+    // If is not a global geomap, an empty $related_ids means that no entities are related to the post
+    // An empty array can be returned in this case
+    if ( ! $is_global && empty( $related_ids ) ) {
+        return array();
+    }
 
-	// Retrieve all 'published' places with geo coordinates defined
-	// If $related_ids is not empty, it's used to limit query results to the current post related places
-	// Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
-	return get_posts( array(
-		'post__in'    => $related_ids,
-		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-		'nopaging'    => true,
-		'post_status' => 'publish',
-		'meta_query'  => array(
-			'relation' => 'AND',
-			array(
-				'key'     => Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
-				'value'   => null,
-				'compare' => '!=',
-			),
-			array(
-				'key'     => Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
-				'value'   => null,
-				'compare' => '!=',
-			),
-		),
-		'tax_query'   => array(
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'field'    => 'slug',
-				'terms'    => 'place',
-			),
-		),
-	) );
+    // Retrieve all 'published' places with geo coordinates defined
+    // If $related_ids is not empty, it's used to limit query results to the current post related places
+    // Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
+    return get_posts( array(
+        'post__in'    => $related_ids,
+        'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+        'nopaging'    => true,
+        'post_status' => 'publish',
+        'meta_query'  => array(
+            'relation' => 'AND',
+            array(
+                'key'     => Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
+                'value'   => null,
+                'compare' => '!=',
+            ),
+            array(
+                'key'     => Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
+                'value'   => null,
+                'compare' => '!=',
+            ),
+        ),
+        'tax_query'   => array(
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'field'    => 'slug',
+                'terms'    => 'place',
+            ),
+        ),
+    ) );
 }
 
 /**
@@ -84,91 +84,91 @@ 
  */
 function wl_shortcode_geomap_prepare_map( $places ) {
 
-	// Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
-	$min_latitude  = PHP_INT_MAX;
-	$min_longitude = PHP_INT_MAX;
-	$max_latitude  = ~PHP_INT_MAX;
-	$max_longitude = ~PHP_INT_MAX;
+    // Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
+    $min_latitude  = PHP_INT_MAX;
+    $min_longitude = PHP_INT_MAX;
+    $max_latitude  = ~PHP_INT_MAX;
+    $max_longitude = ~PHP_INT_MAX;
 
-	// Prepare an empty array of POIs in geoJSON format.
-	$pois = array();
-	// And store list of points to allow Leaflet compute the optimal bounding box.
-	// The main reason for this is that geoJSON has swapped coordinates (lon. lat)
-	$boundaries = array();
+    // Prepare an empty array of POIs in geoJSON format.
+    $pois = array();
+    // And store list of points to allow Leaflet compute the optimal bounding box.
+    // The main reason for this is that geoJSON has swapped coordinates (lon. lat)
+    $boundaries = array();
 
-	// Add a POI for each entity that has coordinates.
-	foreach ( $places as $entity ) {
+    // Add a POI for each entity that has coordinates.
+    foreach ( $places as $entity ) {
 
-		// Get the coordinates.
-		$coordinates = wl_get_coordinates( $entity->ID );
+        // Get the coordinates.
+        $coordinates = wl_get_coordinates( $entity->ID );
 
-		// Don't show the widget if the coordinates aren't set.
-		if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
-			continue;
-		}
+        // Don't show the widget if the coordinates aren't set.
+        if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
+            continue;
+        }
 
-		// TODO Map html rendering should be delegated to the wordlift js ui layer
-		// This function should be focused on returning pure data instead
+        // TODO Map html rendering should be delegated to the wordlift js ui layer
+        // This function should be focused on returning pure data instead
 
-		// Get the title, URL and thumb of the entity.
-		$title = esc_attr( $entity->post_title );
-		$link  = esc_attr( get_permalink( $entity->ID ) );
-		if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
-		     false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
-		) {
-			$img_src = esc_attr( $attachment[0] );
-		}
+        // Get the title, URL and thumb of the entity.
+        $title = esc_attr( $entity->post_title );
+        $link  = esc_attr( get_permalink( $entity->ID ) );
+        if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
+             false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+        ) {
+            $img_src = esc_attr( $attachment[0] );
+        }
 
-		// Build HTML popup. TODO: move thumb width in css
-		$content = "<a href=$link><h6>$title</h6>";
-		if ( isset( $img_src ) ) {
-			$content = $content . "<img src=$img_src style='width:100%'/>";
-		}
-		$content = $content . "</a><ul>";
-		// Get the related posts (published) and print them in the popup.
-		$related_posts = wl_core_get_related_post_ids( $entity->ID, array(
-			'status' => 'publish',
-		) );
-		foreach ( $related_posts as $rp_id ) {
+        // Build HTML popup. TODO: move thumb width in css
+        $content = "<a href=$link><h6>$title</h6>";
+        if ( isset( $img_src ) ) {
+            $content = $content . "<img src=$img_src style='width:100%'/>";
+        }
+        $content = $content . "</a><ul>";
+        // Get the related posts (published) and print them in the popup.
+        $related_posts = wl_core_get_related_post_ids( $entity->ID, array(
+            'status' => 'publish',
+        ) );
+        foreach ( $related_posts as $rp_id ) {
 
-			$rp      = get_post( $rp_id );
-			$title   = esc_attr( $rp->post_title );
-			$link    = esc_attr( get_permalink( $rp->ID ) );
-			$content = $content . "<li><a href=$link>$title</a></li>";
-		}
-		$content = $content . "</ul>";
+            $rp      = get_post( $rp_id );
+            $title   = esc_attr( $rp->post_title );
+            $link    = esc_attr( get_permalink( $rp->ID ) );
+            $content = $content . "<li><a href=$link>$title</a></li>";
+        }
+        $content = $content . "</ul>";
 
-		// Formatting POI in geoJSON.
-		// http://leafletjs.com/examples/geojson.html
-		$poi = array(
-			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $content ),
-			'geometry'   => array(
-				'type'        => 'Point',
-				'coordinates' => array(
-					// Leaflet geoJSON wants them swapped
-					$coordinates['longitude'],
-					$coordinates['latitude'],
-				),
-			),
-		);
+        // Formatting POI in geoJSON.
+        // http://leafletjs.com/examples/geojson.html
+        $poi = array(
+            'type'       => 'Feature',
+            'properties' => array( 'popupContent' => $content ),
+            'geometry'   => array(
+                'type'        => 'Point',
+                'coordinates' => array(
+                    // Leaflet geoJSON wants them swapped
+                    $coordinates['longitude'],
+                    $coordinates['latitude'],
+                ),
+            ),
+        );
 
-		$pois[] = $poi;
+        $pois[] = $poi;
 
-		// Formatting boundaries in a Leaflet-like format (see LatLngBounds).
-		// http://leafletjs.com/reference.html#latlngbounds
-		$boundaries[] = array(
-			$coordinates['latitude'],
-			$coordinates['longitude'],
-		);
+        // Formatting boundaries in a Leaflet-like format (see LatLngBounds).
+        // http://leafletjs.com/reference.html#latlngbounds
+        $boundaries[] = array(
+            $coordinates['latitude'],
+            $coordinates['longitude'],
+        );
 
-	}
+    }
 
-	$map_data               = array();
-	$map_data['features']   = $pois;
-	$map_data['boundaries'] = $boundaries;
+    $map_data               = array();
+    $map_data['features']   = $pois;
+    $map_data['boundaries'] = $boundaries;
 
-	return $map_data;
+    return $map_data;
 }
 
 /**
@@ -182,13 +182,13 @@ 
  * @return array An array of place posts.
  */
 function wl_shortcode_geomap_ajax() {
-	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+    // Get the post Id.
+    $post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
 
-	$places   = wl_shortcode_geomap_get_places( $post_id );
-	$map_data = wl_shortcode_geomap_prepare_map( $places );
+    $places   = wl_shortcode_geomap_get_places( $post_id );
+    $map_data = wl_shortcode_geomap_prepare_map( $places );
 
-	wl_core_send_json( $map_data );
+    wl_core_send_json( $map_data );
 }
 
 add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
@@ -199,35 +199,35 @@ 
  */
 add_action( 'init', function() {
 
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
 
-	register_block_type('wordlift/geomap', array(
-		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
-			$attr_code = '';
-			foreach ($attributes as $key => $value) {
-				$attr_code .= $key.'="'.$value.'" ';
-			}
-			return '[wl_geomap '.$attr_code.']';
-		},
-		'attributes' => array(
-			'width' => array(
-				'type'    => 'string',
-				'default' => '100%'
-			),
-			'height' => array(
-				'type'    => 'string',
-				'default' => '300px'
-			),
-			'global' => array(
-				'type'    => 'bool',
-				'default' => false
-			),
-		)
-	));
+    register_block_type('wordlift/geomap', array(
+        'editor_script' => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function($attributes){
+            $attr_code = '';
+            foreach ($attributes as $key => $value) {
+                $attr_code .= $key.'="'.$value.'" ';
+            }
+            return '[wl_geomap '.$attr_code.']';
+        },
+        'attributes' => array(
+            'width' => array(
+                'type'    => 'string',
+                'default' => '100%'
+            ),
+            'height' => array(
+                'type'    => 'string',
+                'default' => '300px'
+            ),
+            'global' => array(
+                'type'    => 'bool',
+                'default' => false
+            ),
+        )
+    ));
 } );
 
 ///**

Spacing +39 added lines, -39 removed lines

@@ -16,35 +16,35 @@ 
  *
  * @return array An array of place posts.
  */
-function wl_shortcode_geomap_get_places( $post_id = null ) {
+function wl_shortcode_geomap_get_places($post_id = null) {
 
 	// If $post_id is null or is not numeric it means this is a global geomap
-	$is_global = is_null( $post_id ) || ! is_numeric( $post_id );
+	$is_global = is_null($post_id) || ! is_numeric($post_id);
 
 	// If the current one is not a global geomap, retrieve related entities ids
-	if ( $is_global ) {
+	if ($is_global) {
 		$related_ids = array();
 	} else {
-		$related_ids = wl_core_get_related_entity_ids( $post_id, array(
+		$related_ids = wl_core_get_related_entity_ids($post_id, array(
 			'status' => 'publish',
-		) );
+		));
 
 		// Also include current entity
-		if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+		if (Wordlift_Entity_Service::get_instance()->is_entity($post_id)) {
 			$related_ids[] = $post_id;
 		}
 	}
 
 	// If is not a global geomap, an empty $related_ids means that no entities are related to the post
 	// An empty array can be returned in this case
-	if ( ! $is_global && empty( $related_ids ) ) {
+	if ( ! $is_global && empty($related_ids)) {
 		return array();
 	}
 
 	// Retrieve all 'published' places with geo coordinates defined
 	// If $related_ids is not empty, it's used to limit query results to the current post related places
 	// Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
-	return get_posts( array(
+	return get_posts(array(
 		'post__in'    => $related_ids,
 		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
 		'nopaging'    => true,
@@ -69,7 +69,7 @@ 
 				'terms'    => 'place',
 			),
 		),
-	) );
+	));
 }
 
 /**
@@ -82,7 +82,7 @@ 
  *
  * @return array An array of markers and boundaries for Leaflet.
  */
-function wl_shortcode_geomap_prepare_map( $places ) {
+function wl_shortcode_geomap_prepare_map($places) {
 
 	// Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
 	$min_latitude  = PHP_INT_MAX;
@@ -97,13 +97,13 @@ 
 	$boundaries = array();
 
 	// Add a POI for each entity that has coordinates.
-	foreach ( $places as $entity ) {
+	foreach ($places as $entity) {
 
 		// Get the coordinates.
-		$coordinates = wl_get_coordinates( $entity->ID );
+		$coordinates = wl_get_coordinates($entity->ID);
 
 		// Don't show the widget if the coordinates aren't set.
-		if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
+		if ($coordinates['latitude'] == 0 || $coordinates['longitude'] == 0) {
 			continue;
 		}
 
@@ -111,38 +111,38 @@ 
 		// This function should be focused on returning pure data instead
 
 		// Get the title, URL and thumb of the entity.
-		$title = esc_attr( $entity->post_title );
-		$link  = esc_attr( get_permalink( $entity->ID ) );
-		if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
-		     false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+		$title = esc_attr($entity->post_title);
+		$link  = esc_attr(get_permalink($entity->ID));
+		if ('' !== ($thumbnail_id = get_post_thumbnail_id($entity->ID)) &&
+		     false !== ($attachment = wp_get_attachment_image_src($thumbnail_id))
 		) {
-			$img_src = esc_attr( $attachment[0] );
+			$img_src = esc_attr($attachment[0]);
 		}
 
 		// Build HTML popup. TODO: move thumb width in css
 		$content = "<a href=$link><h6>$title</h6>";
-		if ( isset( $img_src ) ) {
-			$content = $content . "<img src=$img_src style='width:100%'/>";
+		if (isset($img_src)) {
+			$content = $content."<img src=$img_src style='width:100%'/>";
 		}
-		$content = $content . "</a><ul>";
+		$content = $content."</a><ul>";
 		// Get the related posts (published) and print them in the popup.
-		$related_posts = wl_core_get_related_post_ids( $entity->ID, array(
+		$related_posts = wl_core_get_related_post_ids($entity->ID, array(
 			'status' => 'publish',
-		) );
-		foreach ( $related_posts as $rp_id ) {
+		));
+		foreach ($related_posts as $rp_id) {
 
-			$rp      = get_post( $rp_id );
-			$title   = esc_attr( $rp->post_title );
-			$link    = esc_attr( get_permalink( $rp->ID ) );
-			$content = $content . "<li><a href=$link>$title</a></li>";
+			$rp      = get_post($rp_id);
+			$title   = esc_attr($rp->post_title);
+			$link    = esc_attr(get_permalink($rp->ID));
+			$content = $content."<li><a href=$link>$title</a></li>";
 		}
-		$content = $content . "</ul>";
+		$content = $content."</ul>";
 
 		// Formatting POI in geoJSON.
 		// http://leafletjs.com/examples/geojson.html
 		$poi = array(
 			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $content ),
+			'properties' => array('popupContent' => $content),
 			'geometry'   => array(
 				'type'        => 'Point',
 				'coordinates' => array(
@@ -183,30 +183,30 @@ 
  */
 function wl_shortcode_geomap_ajax() {
 	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+	$post_id = (isset($_REQUEST['post_id']) ? $_REQUEST['post_id'] : null);
 
-	$places   = wl_shortcode_geomap_get_places( $post_id );
-	$map_data = wl_shortcode_geomap_prepare_map( $places );
+	$places   = wl_shortcode_geomap_get_places($post_id);
+	$map_data = wl_shortcode_geomap_prepare_map($places);
 
-	wl_core_send_json( $map_data );
+	wl_core_send_json($map_data);
 }
 
-add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
-add_action( 'wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax' );
+add_action('wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax');
+add_action('wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax');
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function() {
+add_action('init', function() {
 
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
 	register_block_type('wordlift/geomap', array(
 		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
+		'render_callback' => function($attributes) {
 			$attr_code = '';
 			foreach ($attributes as $key => $value) {
 				$attr_code .= $key.'="'.$value.'" ';

src/shortcodes/wordlift_shortcode_chord.php

Indentation +175 added lines, -175 removed lines

@@ -15,45 +15,45 @@ 
  * @return mixed
  */
 function wl_shortcode_chord_most_referenced_entity_id() {
-	// Get the last 20 articles by post date.
-	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
-		'numberposts' => 20,
-		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-		'fields'      => 'ids', // Only get post IDs.
-		'post_status' => 'publish',
-		'tax_query'   => array(
-			'relation' => 'OR',
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'operator' => 'NOT EXISTS',
-			),
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'field'    => 'slug',
-				'terms'    => 'article',
-			),
-		),
-		'orderby'     => 'post_date',
-		'order'       => 'DESC',
-	) );
-
-	if ( empty( $post_ids ) ) {
-		return null;
-	}
-
-	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
-	}
-
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
-	} else {
-		return $post_ids[0];
-	}
+    // Get the last 20 articles by post date.
+    // For each article get the entities they reference.
+    $post_ids = get_posts( array(
+        'numberposts' => 20,
+        'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+        'fields'      => 'ids', // Only get post IDs.
+        'post_status' => 'publish',
+        'tax_query'   => array(
+            'relation' => 'OR',
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'operator' => 'NOT EXISTS',
+            ),
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'field'    => 'slug',
+                'terms'    => 'article',
+            ),
+        ),
+        'orderby'     => 'post_date',
+        'order'       => 'DESC',
+    ) );
+
+    if ( empty( $post_ids ) ) {
+        return null;
+    }
+
+    $entities = array();
+    foreach ( $post_ids as $id ) {
+        $entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+    }
+
+    $famous_entities = array_count_values( $entities );
+    arsort( $famous_entities );
+    if ( sizeof( $famous_entities ) >= 1 ) {
+        return key( $famous_entities );
+    } else {
+        return $post_ids[0];
+    }
 
 }
 
@@ -71,60 +71,60 @@ 
  */
 function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
-			return $related;
-		}
-	}
+    if ( ! is_null( $related ) ) {
+        if ( 0 === $depth ) {
+            return $related;
+        }
+    }
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+    wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
 
-	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
-		$related = array(
-			'entities'  => array( $entity_id ),
-			'relations' => array(),
-		);
-	}
+    // Create a related array which will hold entities and relations.
+    if ( is_null( $related ) ) {
+        $related = array(
+            'entities'  => array( $entity_id ),
+            'relations' => array(),
+        );
+    }
 
-	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
-		'status' => 'publish',
-	) );
+    // Get related entities
+    $related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+        'status' => 'publish',
+    ) );
 
-	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
-			'status' => 'publish',
-		) ) :
-		array();
+    // If the current node is an entity, add related posts too
+    $related_post_ids = ( Wordlift_Entity_Service::get_instance()
+                                                    ->is_entity( $entity_id ) ) ?
+        wl_core_get_related_post_ids( $entity_id, array(
+            'status' => 'publish',
+        ) ) :
+        array();
 
-	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+    // Merge results and remove duplicated entries
+    $related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
 
-	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+    // TODO: List of entities ($rel) should be ordered by interest factors.
+    shuffle( $related_ids );
 
-	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+    // Now we have all the related IDs.
+    foreach ( $related_ids as $related_id ) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
-			return $related;
-		}
+        if ( count( $related['entities'] ) >= $max_size ) {
+            return $related;
+        }
 
-		$related['relations'][] = array( $entity_id, $related_id );
+        $related['relations'][] = array( $entity_id, $related_id );
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
-			// Found new related entity!
-			$related['entities'][] = $related_id;
+        if ( ! in_array( $related_id, $related['entities'] ) ) {
+            // Found new related entity!
+            $related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
-		}
-	}
+            $related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+        }
+    }
 
-	// End condition 2: no more entities to search for.
-	return $related;
+    // End condition 2: no more entities to search for.
+    return $related;
 }
 
 /**
@@ -138,57 +138,57 @@ 
  */
 function wl_shortcode_chord_get_graph( $data ) {
 
-	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
-
-		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
-
-			return $item;
-		}
-
-		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
-
-		// The following log may create a circular loop.
-		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
-
-		// TODO: get all images
-		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
-			}
-		}
-
-		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
-			'label'      => $post->post_title,
-			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
-		);
-
-		$item = $entity;
-	} );
-
-	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
-		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
-		);
-
-		$item = $relation;
-	} );
-
-	// Return the JSON representation.
-	return $data;
+    // Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
+    array_walk( $data['entities'], function ( &$item ) {
+        $post = get_post( $item );
+
+        // Skip non-existing posts.
+        if ( is_null( $post ) ) {
+            wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+
+            return $item;
+        }
+
+        // Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
+        $term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+
+        // The following log may create a circular loop.
+        // wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
+
+        // TODO: get all images
+        $thumbnail    = null;
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id ) {
+            $attachment = wp_get_attachment_image_src( $thumbnail_id );
+            if ( false !== $attachment ) {
+                $thumbnail = esc_attr( $attachment[0] );
+            }
+        }
+
+        $entity = array(
+            'uri'        => wl_get_entity_uri( $item ),
+            'url'        => get_permalink( $item ),
+            'label'      => $post->post_title,
+            'type'       => $post->post_type,
+            'thumbnails' => array( $thumbnail ),
+            'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+        );
+
+        $item = $entity;
+    } );
+
+    // Refactor the relations.
+    array_walk( $data['relations'], function ( &$item ) {
+        $relation = array(
+            's' => wl_get_entity_uri( $item[0] ),
+            'o' => wl_get_entity_uri( $item[1] ),
+        );
+
+        $item = $relation;
+    } );
+
+    // Return the JSON representation.
+    return $data;
 }
 
 /**
@@ -199,13 +199,13 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	$post_id = $_REQUEST['post_id'];
-	$depth   = $_REQUEST['depth'];
+    $post_id = $_REQUEST['post_id'];
+    $depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+    $relations = wl_shortcode_chord_get_relations( $post_id, $depth );
+    $graph     = wl_shortcode_chord_get_graph( $relations );
 
-	wl_core_send_json( $graph );
+    wl_core_send_json( $graph );
 }
 
 add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
@@ -216,42 +216,42 @@ 
  */
 add_action( 'init', function () {
 
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type( 'wordlift/chord', array(
-		'editor_script'   => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function ( $attributes ) {
-			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
-			}
-
-			return '[wl_chord ' . $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'    => 'bool',
-				'default' => false,
-			),
-		),
-	) );
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type( 'wordlift/chord', array(
+        'editor_script'   => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function ( $attributes ) {
+            $attr_code = '';
+            foreach ( $attributes as $key => $value ) {
+                $attr_code .= $key . '="' . $value . '" ';
+            }
+
+            return '[wl_chord ' . $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'    => 'bool',
+                'default' => false,
+            ),
+        ),
+    ) );
 } );

Spacing +59 added lines, -60 removed lines

@@ -17,7 +17,7 @@ 
 function wl_shortcode_chord_most_referenced_entity_id() {
 	// Get the last 20 articles by post date.
 	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
+	$post_ids = get_posts(array(
 		'numberposts' => 20,
 		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
 		'fields'      => 'ids', // Only get post IDs.
@@ -36,21 +36,21 @@ 
 		),
 		'orderby'     => 'post_date',
 		'order'       => 'DESC',
-	) );
+	));
 
-	if ( empty( $post_ids ) ) {
+	if (empty($post_ids)) {
 		return null;
 	}
 
 	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+	foreach ($post_ids as $id) {
+		$entities = array_merge($entities, wl_core_get_related_entity_ids($id));
 	}
 
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
+	$famous_entities = array_count_values($entities);
+	arsort($famous_entities);
+	if (sizeof($famous_entities) >= 1) {
+		return key($famous_entities);
 	} else {
 		return $post_ids[0];
 	}
@@ -69,57 +69,56 @@ 
  * @uses wl_core_get_related_post_ids() to get the list of post ids that reference an entity.
  *
  */
-function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
+function wl_shortcode_chord_get_relations($entity_id, $depth = 2, $related = null, $max_size = 9) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
+	if ( ! is_null($related)) {
+		if (0 === $depth) {
 			return $related;
 		}
 	}
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+	wl_write_log("wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: ".(is_null($related) ? 'yes' : 'no')." ]");
 
 	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
+	if (is_null($related)) {
 		$related = array(
-			'entities'  => array( $entity_id ),
+			'entities'  => array($entity_id),
 			'relations' => array(),
 		);
 	}
 
 	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+	$related_entity_ids = wl_core_get_related_entity_ids($entity_id, array(
 		'status' => 'publish',
-	) );
+	));
 
 	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
+	$related_post_ids = (Wordlift_Entity_Service::get_instance()
+	                                             ->is_entity($entity_id)) ?
+		wl_core_get_related_post_ids($entity_id, array(
 			'status' => 'publish',
-		) ) :
-		array();
+		)) : array();
 
 	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+	$related_ids = array_unique(array_merge($related_post_ids, $related_entity_ids));
 
 	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+	shuffle($related_ids);
 
 	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+	foreach ($related_ids as $related_id) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
+		if (count($related['entities']) >= $max_size) {
 			return $related;
 		}
 
-		$related['relations'][] = array( $entity_id, $related_id );
+		$related['relations'][] = array($entity_id, $related_id);
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
+		if ( ! in_array($related_id, $related['entities'])) {
 			// Found new related entity!
 			$related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+			$related = wl_shortcode_chord_get_relations($related_id, ($depth - 1), $related, $max_size);
 		}
 	}
 
@@ -136,52 +135,52 @@ 
  *
  * @return mixed|string
  */
-function wl_shortcode_chord_get_graph( $data ) {
+function wl_shortcode_chord_get_graph($data) {
 
 	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
+	array_walk($data['entities'], function(&$item) {
+		$post = get_post($item);
 
 		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+		if (is_null($post)) {
+			wl_write_log("wl_shortcode_chord_get_graph : post not found [ post id :: $item ]");
 
 			return $item;
 		}
 
 		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+		$term = Wordlift_Entity_Type_Service::get_instance()->get($item);
 
 		// The following log may create a circular loop.
 		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
 
 		// TODO: get all images
 		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id) {
+			$attachment = wp_get_attachment_image_src($thumbnail_id);
+			if (false !== $attachment) {
+				$thumbnail = esc_attr($attachment[0]);
 			}
 		}
 
 		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
+			'uri'        => wl_get_entity_uri($item),
+			'url'        => get_permalink($item),
 			'label'      => $post->post_title,
 			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+			'thumbnails' => array($thumbnail),
+			'css_class'  => (isset($term['css_class']) ? $term['css_class'] : ''),
 		);
 
 		$item = $entity;
 	} );
 
 	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
+	array_walk($data['relations'], function(&$item) {
 		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
+			's' => wl_get_entity_uri($item[0]),
+			'o' => wl_get_entity_uri($item[1]),
 		);
 
 		$item = $relation;
@@ -202,34 +201,34 @@ 
 	$post_id = $_REQUEST['post_id'];
 	$depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+	$relations = wl_shortcode_chord_get_relations($post_id, $depth);
+	$graph     = wl_shortcode_chord_get_graph($relations);
 
-	wl_core_send_json( $graph );
+	wl_core_send_json($graph);
 }
 
-add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
-add_action( 'wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax' );
+add_action('wp_ajax_wl_chord', 'wl_shortcode_chord_ajax');
+add_action('wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax');
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function () {
+add_action('init', function() {
 
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
-	register_block_type( 'wordlift/chord', array(
+	register_block_type('wordlift/chord', array(
 		'editor_script'   => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function ( $attributes ) {
+		'render_callback' => function($attributes) {
 			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
+			foreach ($attributes as $key => $value) {
+				$attr_code .= $key.'="'.$value.'" ';
 			}
 
-			return '[wl_chord ' . $attr_code . ']';
+			return '[wl_chord '.$attr_code.']';
 		},
 		'attributes'      => array(
 			'width'      => array(
@@ -253,5 +252,5 @@ 
 				'default' => false,
 			),
 		),
-	) );
+	));
 } );