insideout10 / wordlift-plugin

src/admin/class-wordlift-admin-dashboard-v2.php

Indentation +132 added lines, -132 removed lines

@@ -4,95 +4,95 @@ 
 
 class Wordlift_Admin_Dashboard_V2 {
 
-	const TODAYS_TIP       = 'wl_todays_tip_data';
-	const AVERAGE_POSITION = 'wl_search_rankings_average_position';
-
-	/**
-	 * @var \Wordlift_Entity_Service $entity_service
-	 */
-	private $entity_service;
-
-	/**
-	 * Wordlift_Admin_Dashboard_V2 constructor.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct( $entity_service ) {
-
-		add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
-
-		// Define where to access the tip.
-		defined( 'WL_TODAYS_TIP_JSON_URL' ) || define( 'WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_IT' ) || define( 'WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_EN' ) || define( 'WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38' );
-		$this->entity_service = $entity_service;
-
-	}
-
-	/**
-	 * Set up the dashboard metabox.
-	 *
-	 * @since 3.20.0
-	 */
-	public function dashboard_setup() {
-		/**
-		 * Filter name: wl_feature__enable__wordlift-dashboard
-		 * Feature flag to enable / disable dashboard
-		 *
-		 * @since 3.30.0
-		 */
+    const TODAYS_TIP       = 'wl_todays_tip_data';
+    const AVERAGE_POSITION = 'wl_search_rankings_average_position';
+
+    /**
+     * @var \Wordlift_Entity_Service $entity_service
+     */
+    private $entity_service;
+
+    /**
+     * Wordlift_Admin_Dashboard_V2 constructor.
+     *
+     * @since 3.20.0
+     */
+    public function __construct( $entity_service ) {
+
+        add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
+
+        // Define where to access the tip.
+        defined( 'WL_TODAYS_TIP_JSON_URL' ) || define( 'WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog' );
+        defined( 'WL_TODAYS_TIP_JSON_URL_IT' ) || define( 'WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27' );
+        defined( 'WL_TODAYS_TIP_JSON_URL_EN' ) || define( 'WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38' );
+        $this->entity_service = $entity_service;
+
+    }
+
+    /**
+     * Set up the dashboard metabox.
+     *
+     * @since 3.20.0
+     */
+    public function dashboard_setup() {
+        /**
+         * Filter name: wl_feature__enable__wordlift-dashboard
+         * Feature flag to enable / disable dashboard
+         *
+         * @since 3.30.0
+         */
         // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__wordlift-dashboard', true ) ) {
-			wp_add_dashboard_widget(
-				'wl-dashboard-v2',
-				__( 'WordLift Dashboard', 'wordlift' ),
-				array( $this, 'dashboard_setup_callback' )
-			);
-		}
-
-	}
-
-	/**
-	 * The dashboard setup callback.
-	 *
-	 * @since 3.20.0
-	 */
-	public function dashboard_setup_callback() {
-
-		require_once plugin_dir_path( __DIR__ ) . 'admin/partials/wordlift-admin-dashboard-v2.php';
-
-	}
-
-	/**
-	 * Get the top entities.
-	 *
-	 * @return array|object|null An array of top entities.
-	 * @since 3.20.0
-	 */
-	private function get_top_entities() {
-		/**
-		 * @since 3.27.7
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-		 * Top entities are generated by cron now.
-		 */
-		return get_option( Top_Entities::OPTION_KEY, array() );
-	}
-
-	/**
-	 * Get the today's tip block.
-	 *
-	 * @since 3.20.0
-	 */
-	public static function get_todays_tip_block() {
+        if ( apply_filters( 'wl_feature__enable__wordlift-dashboard', true ) ) {
+            wp_add_dashboard_widget(
+                'wl-dashboard-v2',
+                __( 'WordLift Dashboard', 'wordlift' ),
+                array( $this, 'dashboard_setup_callback' )
+            );
+        }
+
+    }
+
+    /**
+     * The dashboard setup callback.
+     *
+     * @since 3.20.0
+     */
+    public function dashboard_setup_callback() {
+
+        require_once plugin_dir_path( __DIR__ ) . 'admin/partials/wordlift-admin-dashboard-v2.php';
+
+    }
+
+    /**
+     * Get the top entities.
+     *
+     * @return array|object|null An array of top entities.
+     * @since 3.20.0
+     */
+    private function get_top_entities() {
+        /**
+         * @since 3.27.7
+         * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+         * Top entities are generated by cron now.
+         */
+        return get_option( Top_Entities::OPTION_KEY, array() );
+    }
+
+    /**
+     * Get the today's tip block.
+     *
+     * @since 3.20.0
+     */
+    public static function get_todays_tip_block() {
 
         // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		$data = @self::get_todays_tip_data();
+        $data = @self::get_todays_tip_data();
 
-		// Unable to get data from the local cache, nor from the remote URL.
-		if ( false === $data ) {
-			return;
-		}
-		?>
+        // Unable to get data from the local cache, nor from the remote URL.
+        if ( false === $data ) {
+            return;
+        }
+        ?>
 
 		<div id="wl-todays-tip" class="wl-dashboard__block wl-dashboard__block--todays-tip">
 			<header>
@@ -107,52 +107,52 @@ 
 		</div>
 		<?php
 
-	}
-
-	/**
-	 * Get the today's tip data.
-	 *
-	 * @return array|false The today's tip data or false in case of error.
-	 * @since 3.20.0
-	 */
-	private static function get_todays_tip_data() {
-
-		// Return the transient.
-		if ( false !== get_transient( self::TODAYS_TIP ) ) {
-			return get_transient( self::TODAYS_TIP );
-		}
-
-		// If the transient isn't available, query the remote web site.
-		$url = WL_TODAYS_TIP_JSON_URL
-			   . ( 'it' === get_bloginfo( 'language' ) ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN );
-
-		$response = wp_remote_get( $url );
-
-		if ( is_wp_error( $response )
-			 || ! isset( $response['response']['code'] )
-			 || 2 !== (int) $response['response']['code'] / 100 ) {
-			return false;
-		}
-
-		$json = json_decode( $response['body'], true );
-
-		if ( empty( $json )
-			 || ! isset( $json[0]['title']['rendered'] )
-			 || ! isset( $json[0]['excerpt']['rendered'] )
-			 || ! isset( $json[0]['link'] ) ) {
-			return false;
-		}
-
-		$value = array(
-			'title'   => $json[0]['title']['rendered'],
-			'excerpt' => '<!-- cached -->' . $json[0]['excerpt']['rendered'],
-			'link'    => $json[0]['link'],
-		);
-
-		// Store the results for one day.
-		set_transient( self::TODAYS_TIP, $value, 86400 );
-
-		return $value;
-	}
+    }
+
+    /**
+     * Get the today's tip data.
+     *
+     * @return array|false The today's tip data or false in case of error.
+     * @since 3.20.0
+     */
+    private static function get_todays_tip_data() {
+
+        // Return the transient.
+        if ( false !== get_transient( self::TODAYS_TIP ) ) {
+            return get_transient( self::TODAYS_TIP );
+        }
+
+        // If the transient isn't available, query the remote web site.
+        $url = WL_TODAYS_TIP_JSON_URL
+                . ( 'it' === get_bloginfo( 'language' ) ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN );
+
+        $response = wp_remote_get( $url );
+
+        if ( is_wp_error( $response )
+             || ! isset( $response['response']['code'] )
+             || 2 !== (int) $response['response']['code'] / 100 ) {
+            return false;
+        }
+
+        $json = json_decode( $response['body'], true );
+
+        if ( empty( $json )
+             || ! isset( $json[0]['title']['rendered'] )
+             || ! isset( $json[0]['excerpt']['rendered'] )
+             || ! isset( $json[0]['link'] ) ) {
+            return false;
+        }
+
+        $value = array(
+            'title'   => $json[0]['title']['rendered'],
+            'excerpt' => '<!-- cached -->' . $json[0]['excerpt']['rendered'],
+            'link'    => $json[0]['link'],
+        );
+
+        // Store the results for one day.
+        set_transient( self::TODAYS_TIP, $value, 86400 );
+
+        return $value;
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -17,14 +17,14 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
-		add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
+		add_action('wp_dashboard_setup', array($this, 'dashboard_setup'));
 
 		// Define where to access the tip.
-		defined( 'WL_TODAYS_TIP_JSON_URL' ) || define( 'WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_IT' ) || define( 'WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_EN' ) || define( 'WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38' );
+		defined('WL_TODAYS_TIP_JSON_URL') || define('WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog');
+		defined('WL_TODAYS_TIP_JSON_URL_IT') || define('WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27');
+		defined('WL_TODAYS_TIP_JSON_URL_EN') || define('WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38');
 		$this->entity_service = $entity_service;
 
 	}
@@ -42,11 +42,11 @@ 
 		 * @since 3.30.0
 		 */
         // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__wordlift-dashboard', true ) ) {
+		if (apply_filters('wl_feature__enable__wordlift-dashboard', true)) {
 			wp_add_dashboard_widget(
 				'wl-dashboard-v2',
-				__( 'WordLift Dashboard', 'wordlift' ),
-				array( $this, 'dashboard_setup_callback' )
+				__('WordLift Dashboard', 'wordlift'),
+				array($this, 'dashboard_setup_callback')
 			);
 		}
 
@@ -59,7 +59,7 @@ 
 	 */
 	public function dashboard_setup_callback() {
 
-		require_once plugin_dir_path( __DIR__ ) . 'admin/partials/wordlift-admin-dashboard-v2.php';
+		require_once plugin_dir_path(__DIR__).'admin/partials/wordlift-admin-dashboard-v2.php';
 
 	}
 
@@ -75,7 +75,7 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
 		 * Top entities are generated by cron now.
 		 */
-		return get_option( Top_Entities::OPTION_KEY, array() );
+		return get_option(Top_Entities::OPTION_KEY, array());
 	}
 
 	/**
@@ -89,20 +89,20 @@ 
 		$data = @self::get_todays_tip_data();
 
 		// Unable to get data from the local cache, nor from the remote URL.
-		if ( false === $data ) {
+		if (false === $data) {
 			return;
 		}
 		?>
 
 		<div id="wl-todays-tip" class="wl-dashboard__block wl-dashboard__block--todays-tip">
 			<header>
-				<h3><?php esc_html_e( "Today's Tip", 'wordlift' ); ?></h3>
+				<h3><?php esc_html_e("Today's Tip", 'wordlift'); ?></h3>
 			</header>
 			<article>
-				<p><strong><?php echo esc_html( wp_strip_all_tags( $data['title'] ) ); ?></strong>
-					<?php echo esc_html( wp_strip_all_tags( $data['excerpt'] ) ); ?>
+				<p><strong><?php echo esc_html(wp_strip_all_tags($data['title'])); ?></strong>
+					<?php echo esc_html(wp_strip_all_tags($data['excerpt'])); ?>
 					<a target="_blank"
-					   href="<?php echo esc_attr( $data['link'] ); ?>"><?php echo esc_html( __( 'Read more', 'wordlift' ) ); ?></a>
+					   href="<?php echo esc_attr($data['link']); ?>"><?php echo esc_html(__('Read more', 'wordlift')); ?></a>
 				</p>
 		</div>
 		<?php
@@ -118,39 +118,39 @@ 
 	private static function get_todays_tip_data() {
 
 		// Return the transient.
-		if ( false !== get_transient( self::TODAYS_TIP ) ) {
-			return get_transient( self::TODAYS_TIP );
+		if (false !== get_transient(self::TODAYS_TIP)) {
+			return get_transient(self::TODAYS_TIP);
 		}
 
 		// If the transient isn't available, query the remote web site.
 		$url = WL_TODAYS_TIP_JSON_URL
-			   . ( 'it' === get_bloginfo( 'language' ) ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN );
+			   . ('it' === get_bloginfo('language') ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN);
 
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
-		if ( is_wp_error( $response )
-			 || ! isset( $response['response']['code'] )
-			 || 2 !== (int) $response['response']['code'] / 100 ) {
+		if (is_wp_error($response)
+			 || ! isset($response['response']['code'])
+			 || 2 !== (int) $response['response']['code'] / 100) {
 			return false;
 		}
 
-		$json = json_decode( $response['body'], true );
+		$json = json_decode($response['body'], true);
 
-		if ( empty( $json )
-			 || ! isset( $json[0]['title']['rendered'] )
-			 || ! isset( $json[0]['excerpt']['rendered'] )
-			 || ! isset( $json[0]['link'] ) ) {
+		if (empty($json)
+			 || ! isset($json[0]['title']['rendered'])
+			 || ! isset($json[0]['excerpt']['rendered'])
+			 || ! isset($json[0]['link'])) {
 			return false;
 		}
 
 		$value = array(
 			'title'   => $json[0]['title']['rendered'],
-			'excerpt' => '<!-- cached -->' . $json[0]['excerpt']['rendered'],
+			'excerpt' => '<!-- cached -->'.$json[0]['excerpt']['rendered'],
 			'link'    => $json[0]['link'],
 		);
 
 		// Store the results for one day.
-		set_transient( self::TODAYS_TIP, $value, 86400 );
+		set_transient(self::TODAYS_TIP, $value, 86400);
 
 		return $value;
 	}

src/shortcodes/wordlift-shortcode-field.php

Indentation +27 added lines, -27 removed lines

@@ -11,36 +11,36 @@
  */
 function wl_shortcode_field( $atts ) {
 
-	// Extract attributes and set default values.
-	$field_atts = shortcode_atts(
-		array(
-			'id'   => null,
-			'name' => null,
-		),
-		$atts
-	);
-
-	// Get id of the post
-	$entity_id = $field_atts['id'];
-	if ( $field_atts['id'] === null || ! is_numeric( $field_atts['id'] ) ) {
-		$entity_id = get_the_ID();
-	}
-
-	$property_name = $field_atts['name'];
-	if ( $property_name !== null ) {
-		$values = wl_schema_get_value( $entity_id, $property_name );
-	}
-
-	// Return
-	if ( is_array( $values ) ) {
-		return implode( ', ', $values );
-	} else {
-		return null;
-	}
+    // Extract attributes and set default values.
+    $field_atts = shortcode_atts(
+        array(
+            'id'   => null,
+            'name' => null,
+        ),
+        $atts
+    );
+
+    // Get id of the post
+    $entity_id = $field_atts['id'];
+    if ( $field_atts['id'] === null || ! is_numeric( $field_atts['id'] ) ) {
+        $entity_id = get_the_ID();
+    }
+
+    $property_name = $field_atts['name'];
+    if ( $property_name !== null ) {
+        $values = wl_schema_get_value( $entity_id, $property_name );
+    }
+
+    // Return
+    if ( is_array( $values ) ) {
+        return implode( ', ', $values );
+    } else {
+        return null;
+    }
 }
 
 function wl_register_shortcode_field() {
-	add_shortcode( 'wl_field', 'wl_shortcode_field' );
+    add_shortcode( 'wl_field', 'wl_shortcode_field' );
 }
 
 add_action( 'init', 'wl_register_shortcode_field' );

Spacing +8 added lines, -8 removed lines

@@ -9,7 +9,7 @@ 
  * @param array $atts An array of shortcode attributes.
  * @return string A dom element with requested property value(s).
  */
-function wl_shortcode_field( $atts ) {
+function wl_shortcode_field($atts) {
 
 	// Extract attributes and set default values.
 	$field_atts = shortcode_atts(
@@ -22,26 +22,26 @@ 
 
 	// Get id of the post
 	$entity_id = $field_atts['id'];
-	if ( $field_atts['id'] === null || ! is_numeric( $field_atts['id'] ) ) {
+	if ($field_atts['id'] === null || ! is_numeric($field_atts['id'])) {
 		$entity_id = get_the_ID();
 	}
 
 	$property_name = $field_atts['name'];
-	if ( $property_name !== null ) {
-		$values = wl_schema_get_value( $entity_id, $property_name );
+	if ($property_name !== null) {
+		$values = wl_schema_get_value($entity_id, $property_name);
 	}
 
 	// Return
-	if ( is_array( $values ) ) {
-		return implode( ', ', $values );
+	if (is_array($values)) {
+		return implode(', ', $values);
 	} else {
 		return null;
 	}
 }
 
 function wl_register_shortcode_field() {
-	add_shortcode( 'wl_field', 'wl_shortcode_field' );
+	add_shortcode('wl_field', 'wl_shortcode_field');
 }
 
-add_action( 'init', 'wl_register_shortcode_field' );
+add_action('init', 'wl_register_shortcode_field');
 

src/shortcodes/class-wordlift-shortcode-rest.php

Indentation +125 added lines, -125 removed lines

@@ -10,131 +10,131 @@
  */
 abstract class Wordlift_Shortcode_REST {
 
-	/**
-	 * The cache_ttl, set by extending classes.
-	 */
-	const CACHE_TTL = 86400; // 24 hours
-
-	public function __construct( $endpoint, $args ) {
-
-		$scope          = $this;
-		$this->endpoint = $endpoint;
-		$this->args     = $args;
-
-		// Register rest route with callback
-		add_action(
-			'rest_api_init',
-			function () use ( $scope ) {
-				register_rest_route(
-					WL_REST_ROUTE_DEFAULT_NAMESPACE,
-					$scope->endpoint,
-					array(
-						'methods'             => WP_REST_Server::READABLE,
-						'permission_callback' => '__return_true',
-						'callback'            => array( $scope, 'rest_callback' ),
-						'args'                => $scope->args,
-					)
-				);
-			}
-		);
-
-		// Optimizations: disable unneeded plugins on this specific REST call. WPSeo is slowing down the responses quite a bit.
-		add_action(
-			'plugins_loaded',
-			function () use ( $scope ) {
-
-				if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
-					return;
-				}
-
-				remove_action( 'plugins_loaded', 'rocket_init' );
-				remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-				remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-			},
-			0
-		);
-
-		add_action(
-			'init',
-			function () use ( $scope ) {
-
-				if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
-					return;
-				}
-
-				remove_action( 'init', 'wp_widgets_init', 1 );
-				remove_action( 'init', 'gglcptch_init' );
-			},
-			0
-		);
-
-	}
-
-	abstract public function get_data( $request );
-
-	public function rest_callback( WP_REST_Request $request ) {
-
-		// Respond from origin if TTL is 0
-		if ( static::CACHE_TTL === 0 ) {
-
-			$data     = $this->get_data( $request );
-			$response = rest_ensure_response( $data );
-			if ( is_wp_error( $data ) ) {
-				return $response;
-			}
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'MISS' );
-
-			return $response;
-		}
-
-		// Create the cache key.
-		$cache_key_params = $request->get_params();
-		unset( $cache_key_params['uniqid'] );
-		unset( $cache_key_params['rest_route'] );
-		$cache_key = array( 'request_params' => $cache_key_params );
-
-		// Create the TTL cache and try to get the results.
-		$cache         = new Ttl_Cache( $this->endpoint, static::CACHE_TTL );
-		$cache_results = $cache->get( $cache_key );
-
-		if ( isset( $cache_results ) ) {
-
-			$response = rest_ensure_response( $cache_results );
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'HIT' );
-
-			return $response;
-		}
-
-		$data     = $this->get_data( $request );
-		$response = rest_ensure_response( $data );
-		if ( is_wp_error( $data ) ) {
-			return $response;
-		}
-		$response->header( 'Access-Control-Allow-Origin', '*' );
-		$response->header( 'X-WordLift-Cache', 'MISS' );
-
-		// Put the result before sending the json to the client, since sending the json will terminate us.
-		$cache->put( $cache_key, $data );
-
-		return $response;
-
-	}
-
-	private function is_endpoint() {
-		$compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint;
-
-		// Directly accessing $_SERVER['REQUEST_URI'] or $_GET['rest_route'] here as it's too early to use global $wp reliably
-
-		if ( isset( $_SERVER['REQUEST_URI'] ) && strpos( esc_url_raw( wp_unslash( (string) $_SERVER['REQUEST_URI'] ) ), $compare_route ) ) {
-			return true;
-		}
-		if ( ! empty( $_GET['rest_route'] ) && strpos( esc_url_raw( wp_unslash( (string) $_GET['rest_route'] ) ), $compare_route ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			return true;
-		}
+    /**
+     * The cache_ttl, set by extending classes.
+     */
+    const CACHE_TTL = 86400; // 24 hours
+
+    public function __construct( $endpoint, $args ) {
+
+        $scope          = $this;
+        $this->endpoint = $endpoint;
+        $this->args     = $args;
+
+        // Register rest route with callback
+        add_action(
+            'rest_api_init',
+            function () use ( $scope ) {
+                register_rest_route(
+                    WL_REST_ROUTE_DEFAULT_NAMESPACE,
+                    $scope->endpoint,
+                    array(
+                        'methods'             => WP_REST_Server::READABLE,
+                        'permission_callback' => '__return_true',
+                        'callback'            => array( $scope, 'rest_callback' ),
+                        'args'                => $scope->args,
+                    )
+                );
+            }
+        );
+
+        // Optimizations: disable unneeded plugins on this specific REST call. WPSeo is slowing down the responses quite a bit.
+        add_action(
+            'plugins_loaded',
+            function () use ( $scope ) {
+
+                if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+                    return;
+                }
+
+                remove_action( 'plugins_loaded', 'rocket_init' );
+                remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
+                remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+            },
+            0
+        );
+
+        add_action(
+            'init',
+            function () use ( $scope ) {
+
+                if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+                    return;
+                }
+
+                remove_action( 'init', 'wp_widgets_init', 1 );
+                remove_action( 'init', 'gglcptch_init' );
+            },
+            0
+        );
+
+    }
+
+    abstract public function get_data( $request );
+
+    public function rest_callback( WP_REST_Request $request ) {
+
+        // Respond from origin if TTL is 0
+        if ( static::CACHE_TTL === 0 ) {
+
+            $data     = $this->get_data( $request );
+            $response = rest_ensure_response( $data );
+            if ( is_wp_error( $data ) ) {
+                return $response;
+            }
+            $response->header( 'Access-Control-Allow-Origin', '*' );
+            $response->header( 'X-WordLift-Cache', 'MISS' );
+
+            return $response;
+        }
+
+        // Create the cache key.
+        $cache_key_params = $request->get_params();
+        unset( $cache_key_params['uniqid'] );
+        unset( $cache_key_params['rest_route'] );
+        $cache_key = array( 'request_params' => $cache_key_params );
+
+        // Create the TTL cache and try to get the results.
+        $cache         = new Ttl_Cache( $this->endpoint, static::CACHE_TTL );
+        $cache_results = $cache->get( $cache_key );
+
+        if ( isset( $cache_results ) ) {
+
+            $response = rest_ensure_response( $cache_results );
+            $response->header( 'Access-Control-Allow-Origin', '*' );
+            $response->header( 'X-WordLift-Cache', 'HIT' );
+
+            return $response;
+        }
+
+        $data     = $this->get_data( $request );
+        $response = rest_ensure_response( $data );
+        if ( is_wp_error( $data ) ) {
+            return $response;
+        }
+        $response->header( 'Access-Control-Allow-Origin', '*' );
+        $response->header( 'X-WordLift-Cache', 'MISS' );
+
+        // Put the result before sending the json to the client, since sending the json will terminate us.
+        $cache->put( $cache_key, $data );
+
+        return $response;
+
+    }
+
+    private function is_endpoint() {
+        $compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint;
+
+        // Directly accessing $_SERVER['REQUEST_URI'] or $_GET['rest_route'] here as it's too early to use global $wp reliably
+
+        if ( isset( $_SERVER['REQUEST_URI'] ) && strpos( esc_url_raw( wp_unslash( (string) $_SERVER['REQUEST_URI'] ) ), $compare_route ) ) {
+            return true;
+        }
+        if ( ! empty( $_GET['rest_route'] ) && strpos( esc_url_raw( wp_unslash( (string) $_GET['rest_route'] ) ), $compare_route ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }

Spacing +38 added lines, -38 removed lines

@@ -15,7 +15,7 @@ 
 	 */
 	const CACHE_TTL = 86400; // 24 hours
 
-	public function __construct( $endpoint, $args ) {
+	public function __construct($endpoint, $args) {
 
 		$scope          = $this;
 		$this->endpoint = $endpoint;
@@ -24,14 +24,14 @@ 
 		// Register rest route with callback
 		add_action(
 			'rest_api_init',
-			function () use ( $scope ) {
+			function() use ($scope) {
 				register_rest_route(
 					WL_REST_ROUTE_DEFAULT_NAMESPACE,
 					$scope->endpoint,
 					array(
 						'methods'             => WP_REST_Server::READABLE,
 						'permission_callback' => '__return_true',
-						'callback'            => array( $scope, 'rest_callback' ),
+						'callback'            => array($scope, 'rest_callback'),
 						'args'                => $scope->args,
 					)
 				);
@@ -41,96 +41,96 @@ 
 		// Optimizations: disable unneeded plugins on this specific REST call. WPSeo is slowing down the responses quite a bit.
 		add_action(
 			'plugins_loaded',
-			function () use ( $scope ) {
+			function() use ($scope) {
 
-				if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+				if ( ! defined('REST_REQUEST') || ! REST_REQUEST || ! $scope->is_endpoint()) {
 					return;
 				}
 
-				remove_action( 'plugins_loaded', 'rocket_init' );
-				remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-				remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+				remove_action('plugins_loaded', 'rocket_init');
+				remove_action('plugins_loaded', 'wpseo_premium_init', 14);
+				remove_action('plugins_loaded', 'wpseo_init', 14);
 			},
 			0
 		);
 
 		add_action(
 			'init',
-			function () use ( $scope ) {
+			function() use ($scope) {
 
-				if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+				if ( ! defined('REST_REQUEST') || ! REST_REQUEST || ! $scope->is_endpoint()) {
 					return;
 				}
 
-				remove_action( 'init', 'wp_widgets_init', 1 );
-				remove_action( 'init', 'gglcptch_init' );
+				remove_action('init', 'wp_widgets_init', 1);
+				remove_action('init', 'gglcptch_init');
 			},
 			0
 		);
 
 	}
 
-	abstract public function get_data( $request );
+	abstract public function get_data($request);
 
-	public function rest_callback( WP_REST_Request $request ) {
+	public function rest_callback(WP_REST_Request $request) {
 
 		// Respond from origin if TTL is 0
-		if ( static::CACHE_TTL === 0 ) {
+		if (static::CACHE_TTL === 0) {
 
-			$data     = $this->get_data( $request );
-			$response = rest_ensure_response( $data );
-			if ( is_wp_error( $data ) ) {
+			$data     = $this->get_data($request);
+			$response = rest_ensure_response($data);
+			if (is_wp_error($data)) {
 				return $response;
 			}
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'MISS' );
+			$response->header('Access-Control-Allow-Origin', '*');
+			$response->header('X-WordLift-Cache', 'MISS');
 
 			return $response;
 		}
 
 		// Create the cache key.
 		$cache_key_params = $request->get_params();
-		unset( $cache_key_params['uniqid'] );
-		unset( $cache_key_params['rest_route'] );
-		$cache_key = array( 'request_params' => $cache_key_params );
+		unset($cache_key_params['uniqid']);
+		unset($cache_key_params['rest_route']);
+		$cache_key = array('request_params' => $cache_key_params);
 
 		// Create the TTL cache and try to get the results.
-		$cache         = new Ttl_Cache( $this->endpoint, static::CACHE_TTL );
-		$cache_results = $cache->get( $cache_key );
+		$cache         = new Ttl_Cache($this->endpoint, static::CACHE_TTL);
+		$cache_results = $cache->get($cache_key);
 
-		if ( isset( $cache_results ) ) {
+		if (isset($cache_results)) {
 
-			$response = rest_ensure_response( $cache_results );
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'HIT' );
+			$response = rest_ensure_response($cache_results);
+			$response->header('Access-Control-Allow-Origin', '*');
+			$response->header('X-WordLift-Cache', 'HIT');
 
 			return $response;
 		}
 
-		$data     = $this->get_data( $request );
-		$response = rest_ensure_response( $data );
-		if ( is_wp_error( $data ) ) {
+		$data     = $this->get_data($request);
+		$response = rest_ensure_response($data);
+		if (is_wp_error($data)) {
 			return $response;
 		}
-		$response->header( 'Access-Control-Allow-Origin', '*' );
-		$response->header( 'X-WordLift-Cache', 'MISS' );
+		$response->header('Access-Control-Allow-Origin', '*');
+		$response->header('X-WordLift-Cache', 'MISS');
 
 		// Put the result before sending the json to the client, since sending the json will terminate us.
-		$cache->put( $cache_key, $data );
+		$cache->put($cache_key, $data);
 
 		return $response;
 
 	}
 
 	private function is_endpoint() {
-		$compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint;
+		$compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE.$this->endpoint;
 
 		// Directly accessing $_SERVER['REQUEST_URI'] or $_GET['rest_route'] here as it's too early to use global $wp reliably
 
-		if ( isset( $_SERVER['REQUEST_URI'] ) && strpos( esc_url_raw( wp_unslash( (string) $_SERVER['REQUEST_URI'] ) ), $compare_route ) ) {
+		if (isset($_SERVER['REQUEST_URI']) && strpos(esc_url_raw(wp_unslash((string) $_SERVER['REQUEST_URI'])), $compare_route)) {
 			return true;
 		}
-		if ( ! empty( $_GET['rest_route'] ) && strpos( esc_url_raw( wp_unslash( (string) $_GET['rest_route'] ) ), $compare_route ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if ( ! empty($_GET['rest_route']) && strpos(esc_url_raw(wp_unslash((string) $_GET['rest_route'])), $compare_route)) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return true;
 		}
 

src/shortcodes/wordlift-shortcode-geomap.php

Indentation +103 added lines, -103 removed lines

@@ -11,46 +11,46 @@ 
  * Print both global or post related places in json. It's executed via Ajax
  */
 function wl_shortcode_geomap_ajax() {
-	check_ajax_referer( 'wl_geomap' );
-	// Get the post Id.
-	$post_id = isset( $_REQUEST['post_id'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_id'] ) ) : null;
+    check_ajax_referer( 'wl_geomap' );
+    // Get the post Id.
+    $post_id = isset( $_REQUEST['post_id'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_id'] ) ) : null;
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( (int) $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+    $map_data = ( is_numeric( $post_id )
+        ? wl_shortcode_geomap_ajax_single_post( (int) $post_id )
+        : wl_shortcode_geomap_ajax_all_posts() );
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+    wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
 
 }
 
 function wl_shortcode_geomap_ajax_all_posts() {
-	global $wpdb;
-
-	return $wpdb->get_results(
-		$wpdb->prepare(
-			'SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude'
-			. " FROM {$wpdb->posts} p1 "
-			. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
-			. '  ON ri.object_id = p1.ID AND ri.predicate = %s'
-			. " INNER JOIN {$wpdb->postmeta} pm1"
-			. "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
-			. " INNER JOIN {$wpdb->postmeta} pm2"
-			. "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
-			. ' WHERE p1.post_status = %s',
-			'where',
-			'wl_geo_latitude',
-			'wl_geo_longitude',
-			'publish'
-		)
-	);
+    global $wpdb;
+
+    return $wpdb->get_results(
+        $wpdb->prepare(
+            'SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude'
+            . " FROM {$wpdb->posts} p1 "
+            . " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
+            . '  ON ri.object_id = p1.ID AND ri.predicate = %s'
+            . " INNER JOIN {$wpdb->postmeta} pm1"
+            . "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
+            . " INNER JOIN {$wpdb->postmeta} pm2"
+            . "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
+            . ' WHERE p1.post_status = %s',
+            'where',
+            'wl_geo_latitude',
+            'wl_geo_longitude',
+            'publish'
+        )
+    );
 }
 
 function wl_shortcode_geomap_ajax_single_post( $post_id ) {
-	global $wpdb;
+    global $wpdb;
 
-	return $wpdb->get_results(
-		$wpdb->prepare(
-			"
+    return $wpdb->get_results(
+        $wpdb->prepare(
+            "
 		SELECT p2.ID, p2.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude
 		 FROM {$wpdb->prefix}wl_relation_instances ri
 		 INNER JOIN {$wpdb->posts} p2
@@ -69,87 +69,87 @@ 
 		  ON pm2.post_id = p.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value
 		 WHERE p.ID = %s
 		",
-			'publish',
-			'wl_geo_latitude',
-			'wl_geo_longitude',
-			$post_id,
-			'where',
-			// UNION
-			'wl_geo_latitude',
-			'wl_geo_longitude',
-			$post_id
-		)
-	);
+            'publish',
+            'wl_geo_latitude',
+            'wl_geo_longitude',
+            $post_id,
+            'where',
+            // UNION
+            'wl_geo_latitude',
+            'wl_geo_longitude',
+            $post_id
+        )
+    );
 }
 
 function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
 
-	global $wpdb;
-
-	return $wpdb->get_results(
-		$wpdb->prepare(
-			'SELECT p.ID, p.post_title'
-			. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-			" INNER JOIN {$wpdb->posts} p" .
-			'  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d' .
-			' WHERE ri.object_id = %d AND ri.predicate = %s',
-			'publish',
-			$exclude_post_id,
-			$post_id,
-			'where'
-		)
-	);
+    global $wpdb;
+
+    return $wpdb->get_results(
+        $wpdb->prepare(
+            'SELECT p.ID, p.post_title'
+            . " FROM {$wpdb->prefix}wl_relation_instances ri" .
+            " INNER JOIN {$wpdb->posts} p" .
+            '  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d' .
+            ' WHERE ri.object_id = %d AND ri.predicate = %s',
+            'publish',
+            $exclude_post_id,
+            $post_id,
+            'where'
+        )
+    );
 }
 
 function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
 
-	$boundaries = array();
-	$features   = array_map(
-		function ( $item ) use ( &$boundaries, $post_id ) {
-
-			$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-			$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
-
-			// Related posts.
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
-			$subjects_inner_html = array_reduce(
-				$subjects,
-				function ( $carry, $subject ) {
-
-					$permalink = get_permalink( $subject->ID );
-
-					return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
-				},
-				''
-			);
-			$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
-
-			$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-			$latitude      = floatval( $item->latitude );
-			$longitude     = floatval( $item->longitude );
-			$coordinates   = array( $latitude, $longitude );
-			$geometry      = array(
-				'type'        => 'Point',
-				'coordinates' => $coordinates,
-			);
-
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			$boundaries[] = array( $longitude, $latitude );
-
-			return array(
-				'type'       => 'Feature',
-				'properties' => array( 'popupContent' => $popup_content ),
-				'geometry'   => $geometry,
-			);
-		},
-		$results
-	);
-
-	return array(
-		'features'   => $features,
-		'boundaries' => $boundaries,
-	);
+    $boundaries = array();
+    $features   = array_map(
+        function ( $item ) use ( &$boundaries, $post_id ) {
+
+            $thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
+            $thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+
+            // Related posts.
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+            $subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
+            $subjects_inner_html = array_reduce(
+                $subjects,
+                function ( $carry, $subject ) {
+
+                    $permalink = get_permalink( $subject->ID );
+
+                    return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
+                },
+                ''
+            );
+            $subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+
+            $popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
+            $latitude      = floatval( $item->latitude );
+            $longitude     = floatval( $item->longitude );
+            $coordinates   = array( $latitude, $longitude );
+            $geometry      = array(
+                'type'        => 'Point',
+                'coordinates' => $coordinates,
+            );
+
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+            $boundaries[] = array( $longitude, $latitude );
+
+            return array(
+                'type'       => 'Feature',
+                'properties' => array( 'popupContent' => $popup_content ),
+                'geometry'   => $geometry,
+            );
+        },
+        $results
+    );
+
+    return array(
+        'features'   => $features,
+        'boundaries' => $boundaries,
+    );
 }
 
 add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );

Spacing +28 added lines, -28 removed lines

@@ -11,15 +11,15 @@ 
  * Print both global or post related places in json. It's executed via Ajax
  */
 function wl_shortcode_geomap_ajax() {
-	check_ajax_referer( 'wl_geomap' );
+	check_ajax_referer('wl_geomap');
 	// Get the post Id.
-	$post_id = isset( $_REQUEST['post_id'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_id'] ) ) : null;
+	$post_id = isset($_REQUEST['post_id']) ? sanitize_text_field(wp_unslash($_REQUEST['post_id'])) : null;
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( (int) $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+	$map_data = (is_numeric($post_id)
+		? wl_shortcode_geomap_ajax_single_post((int) $post_id)
+		: wl_shortcode_geomap_ajax_all_posts());
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+	wl_core_send_json(wl_shortcode_geomap_format_results($map_data, $post_id));
 
 }
 
@@ -45,7 +45,7 @@ 
 	);
 }
 
-function wl_shortcode_geomap_ajax_single_post( $post_id ) {
+function wl_shortcode_geomap_ajax_single_post($post_id) {
 	global $wpdb;
 
 	return $wpdb->get_results(
@@ -82,16 +82,16 @@ 
 	);
 }
 
-function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
+function wl_shortcode_geomap_get_subjects($post_id, $exclude_post_id) {
 
 	global $wpdb;
 
 	return $wpdb->get_results(
 		$wpdb->prepare(
 			'SELECT p.ID, p.post_title'
-			. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-			" INNER JOIN {$wpdb->posts} p" .
-			'  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d' .
+			. " FROM {$wpdb->prefix}wl_relation_instances ri".
+			" INNER JOIN {$wpdb->posts} p".
+			'  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d'.
 			' WHERE ri.object_id = %d AND ri.predicate = %s',
 			'publish',
 			$exclude_post_id,
@@ -101,45 +101,45 @@ 
 	);
 }
 
-function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
+function wl_shortcode_geomap_format_results($results, $post_id = null) {
 
 	$boundaries = array();
 	$features   = array_map(
-		function ( $item ) use ( &$boundaries, $post_id ) {
+		function($item) use (&$boundaries, $post_id) {
 
-			$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-			$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+			$thumbnail_url  = get_the_post_thumbnail_url($item->ID);
+			$thumbnail_html = ($thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '');
 
 			// Related posts.
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
+			$subjects            = wl_shortcode_geomap_get_subjects($item->ID, $post_id);
 			$subjects_inner_html = array_reduce(
 				$subjects,
-				function ( $carry, $subject ) {
+				function($carry, $subject) {
 
-					$permalink = get_permalink( $subject->ID );
+					$permalink = get_permalink($subject->ID);
 
-					return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
+					return $carry.sprintf('<li><a href="%s">%s</a></li>', $permalink, esc_html($subject->post_title));
 				},
 				''
 			);
-			$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+			$subjects_html = ( ! empty($subjects_inner_html) ? '<ul>'.$subjects_inner_html.'</ul>' : '');
 
-			$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-			$latitude      = floatval( $item->latitude );
-			$longitude     = floatval( $item->longitude );
-			$coordinates   = array( $latitude, $longitude );
+			$popup_content = sprintf('<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink($item->ID), $thumbnail_html, esc_html($item->post_title), $subjects_html);
+			$latitude      = floatval($item->latitude);
+			$longitude     = floatval($item->longitude);
+			$coordinates   = array($latitude, $longitude);
 			$geometry      = array(
 				'type'        => 'Point',
 				'coordinates' => $coordinates,
 			);
 
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-			$boundaries[] = array( $longitude, $latitude );
+			$boundaries[] = array($longitude, $latitude);
 
 			return array(
 				'type'       => 'Feature',
-				'properties' => array( 'popupContent' => $popup_content ),
+				'properties' => array('popupContent' => $popup_content),
 				'geometry'   => $geometry,
 			);
 		},
@@ -152,5 +152,5 @@ 
 	);
 }
 
-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');

src/shortcodes/class-wordlift-products-navigator-shortcode-rest.php

Indentation +287 added lines, -287 removed lines

@@ -4,243 +4,243 @@ 
 
 class Wordlift_Products_Navigator_Shortcode_REST extends Wordlift_Shortcode_REST {
 
-	const CACHE_TTL = 3600; // 1 hour
-
-	public function __construct() {
-		parent::__construct(
-			'/products-navigator',
-			array(
-				'post_id' => array(
-					'description' => __( 'Post ID for which Navigator has to be queried', 'wordlift' ),
-					'type'        => 'integer',
-					'required'    => true,
-				),
-				'uniqid'  => array(
-					'description' => __( 'Navigator uniqueid', 'wordlift' ),
-					'type'        => 'string',
-					'required'    => true,
-				),
-				'limit'   => array(
-					'default'           => 4,
-					'type'              => 'integer',
-					'sanitize_callback' => 'absint',
-				),
-				'offset'  => array(
-					'default'           => 0,
-					'type'              => 'integer',
-					'sanitize_callback' => 'absint',
-				),
-				'sort'    => array(
-					'default'           => 'ID DESC',
-					'sanitize_callback' => 'sanitize_sql_orderby',
-				),
-				'amp'     => array(
-					'sanitize_callback' => 'rest_sanitize_boolean',
-				),
-			)
-		);
-	}
-
-	public function get_data( $request ) {
-
-		// Sanitize and set defaults
-		$navigator_length = $request['limit'];
-		$navigator_offset = $request['offset'];
-		$order_by         = $request['sort'];
-		$post_id          = $request['post_id'];
-		$navigator_id     = $request['uniqid'];
-		$amp              = $request['amp'];
-
-		$post = get_post( $post_id );
-
-		// Post ID has to match an existing item
-		if ( null === $post ) {
-			return new WP_Error( 'rest_invalid_post_id', __( 'Invalid post_id', 'wordlift' ), array( 'status' => 404 ) );
-		}
-
-		// Determine navigator type and call respective get_*_results
-		if ( get_post_type( $post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
-			$referencing_posts = $this->get_entity_results(
-				$post_id,
-				array(
-					'ID',
-					'post_title',
-				),
-				$order_by,
-				$navigator_length,
-				$navigator_offset
-			);
-		} else {
-			$referencing_posts = $this->get_post_results(
-				$post_id,
-				array(
-					'ID',
-					'post_title',
-				),
-				$order_by,
-				$navigator_length,
-				$navigator_offset
-			);
-		}
-
-		// Fetch directly referencing posts excluding referencing posts via entities
-		$directly_referencing_posts = $this->get_directly_referencing_posts(
-			$post_id,
-			array_map(
-				function ( $referencing_post ) {
-					return $referencing_post->ID;
-				},
-				$referencing_posts
-			)
-		);
-
-		// Combine directly referencing posts and referencing posts via entities
-		$referencing_posts = array_merge( $directly_referencing_posts, $referencing_posts );
-
-		// loop over them and take the first one which is not already in the $related_posts
-		$results = array();
-		foreach ( $referencing_posts as $referencing_post ) {
-			$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-			$product           = wc_get_product( $referencing_post->ID );
-
-			$result = array(
-				'product' => array(
-					'id'              => $referencing_post->ID,
-					'permalink'       => get_permalink( $referencing_post->ID ),
-					'title'           => $referencing_post->post_title,
-					'thumbnail'       => get_the_post_thumbnail_url( $referencing_post, 'medium' ),
-					'regular_price'   => $product->get_regular_price(),
-					'sale_price'      => $product->get_sale_price(),
-					'price'           => $product->get_price(),
-					'currency_symbol' => get_woocommerce_currency_symbol(),
-					'discount_pc'     => ( $product->get_sale_price() && ( $product->get_regular_price() > 0 ) ) ? round( 1 - ( $product->get_sale_price() / $product->get_regular_price() ), 2 ) * 100 : 0,
-					'average_rating'  => $product->get_average_rating(),
-					'rating_count'    => $product->get_rating_count(),
-					'rating_html'     => wc_get_rating_html( $product->get_average_rating(), $product->get_rating_count() ),
-				),
-				'entity'  => array(
-					'id'        => $referencing_post->entity_id,
-					'label'     => $serialized_entity['label'],
-					'mainType'  => $serialized_entity['mainType'],
-					'permalink' => get_permalink( $referencing_post->entity_id ),
-				),
-			);
-
-			$results[] = $result;
-
-		}
-
-		if ( count( $results ) < $navigator_length ) {
-			$results = apply_filters( 'wl_products_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-		}
-
-		// Add filler posts if needed
-		$filler_count = $navigator_length - count( $results );
-		if ( $filler_count > 0 ) {
-			$referencing_post_ids = array_map(
-				function ( $p ) {
-					return $p->ID;
-				},
-				$referencing_posts
-			);
-			/**
-			 * @since 3.28.0
-			 * Filler posts are fetched using this util.
-			 */
-			$filler_posts_util       = new Filler_Posts_Util( $post_id, 'product' );
-			$post_ids_to_be_excluded = array_merge( array( $post_id ), $referencing_post_ids );
-			$filler_posts            = $filler_posts_util->get_product_navigator_response( $filler_count, $post_ids_to_be_excluded );
-			$results                 = array_merge( $results, $filler_posts );
-		}
-
-		// Apply filters after fillers are added
-		foreach ( $results as $result_index => $result ) {
-			$results[ $result_index ]['product'] = apply_filters( 'wl_products_navigator_data_post', $result['product'], intval( $result['product']['id'] ), $navigator_id );
-			$results[ $result_index ]['entity']  = apply_filters( 'wl_products_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
-		}
-
-		$results = apply_filters( 'wl_products_navigator_results', $results, $navigator_id );
-
-		return $amp ? array(
-			'items' => array(
-				array( 'values' => $results ),
-			),
-		) : $results;
-
-	}
-
-	private function get_directly_referencing_posts( $post_id, $referencing_post_ids ) {
-
-		$directly_referencing_post_ids = Wordlift_Entity_Service::get_instance()->get_related_entities( $post_id );
-
-		$post__in = array_diff( $directly_referencing_post_ids, $referencing_post_ids );
-
-		$directly_referencing_posts = get_posts(
-			array(
-				'meta_query'          => array(
-					array(
-						'key' => '_thumbnail_id',
-					),
-					array(
-						'key'   => '_stock_status',
-						'value' => 'instock',
-					),
-				),
-				'post__in'            => $post__in,
-				'post_type'           => 'product',
-				'ignore_sticky_posts' => 1,
-			)
-		);
-
-		$results = array();
-
-		foreach ( $directly_referencing_posts as $post ) {
-			$result             = new stdClass();
-			$result->ID         = $post->ID;
-			$result->post_title = $post->post_title;
-			$result->entity_id  = $post->ID;
-			$results[]          = $result;
-		}
-
-		return $results;
-	}
-
-	private function get_entity_results(
-		$post_id,
-		$fields = array(
-			'ID',
-			'post_title',
-		),
-		$order_by = 'ID DESC',
-		$limit = 10,
-		$offset = 0
-	) {
-		global $wpdb;
-
-		$select = implode(
-			', ',
-			array_map(
-				function ( $item ) {
-					return "p.$item AS $item";
-				},
-				(array) $fields
-			)
-		);
-
-		$order_by = implode(
-			', ',
-			array_map(
-				function ( $item ) {
-					return "p.$item";
-				},
-				(array) $order_by
-			)
-		);
+    const CACHE_TTL = 3600; // 1 hour
+
+    public function __construct() {
+        parent::__construct(
+            '/products-navigator',
+            array(
+                'post_id' => array(
+                    'description' => __( 'Post ID for which Navigator has to be queried', 'wordlift' ),
+                    'type'        => 'integer',
+                    'required'    => true,
+                ),
+                'uniqid'  => array(
+                    'description' => __( 'Navigator uniqueid', 'wordlift' ),
+                    'type'        => 'string',
+                    'required'    => true,
+                ),
+                'limit'   => array(
+                    'default'           => 4,
+                    'type'              => 'integer',
+                    'sanitize_callback' => 'absint',
+                ),
+                'offset'  => array(
+                    'default'           => 0,
+                    'type'              => 'integer',
+                    'sanitize_callback' => 'absint',
+                ),
+                'sort'    => array(
+                    'default'           => 'ID DESC',
+                    'sanitize_callback' => 'sanitize_sql_orderby',
+                ),
+                'amp'     => array(
+                    'sanitize_callback' => 'rest_sanitize_boolean',
+                ),
+            )
+        );
+    }
+
+    public function get_data( $request ) {
+
+        // Sanitize and set defaults
+        $navigator_length = $request['limit'];
+        $navigator_offset = $request['offset'];
+        $order_by         = $request['sort'];
+        $post_id          = $request['post_id'];
+        $navigator_id     = $request['uniqid'];
+        $amp              = $request['amp'];
+
+        $post = get_post( $post_id );
+
+        // Post ID has to match an existing item
+        if ( null === $post ) {
+            return new WP_Error( 'rest_invalid_post_id', __( 'Invalid post_id', 'wordlift' ), array( 'status' => 404 ) );
+        }
+
+        // Determine navigator type and call respective get_*_results
+        if ( get_post_type( $post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
+            $referencing_posts = $this->get_entity_results(
+                $post_id,
+                array(
+                    'ID',
+                    'post_title',
+                ),
+                $order_by,
+                $navigator_length,
+                $navigator_offset
+            );
+        } else {
+            $referencing_posts = $this->get_post_results(
+                $post_id,
+                array(
+                    'ID',
+                    'post_title',
+                ),
+                $order_by,
+                $navigator_length,
+                $navigator_offset
+            );
+        }
+
+        // Fetch directly referencing posts excluding referencing posts via entities
+        $directly_referencing_posts = $this->get_directly_referencing_posts(
+            $post_id,
+            array_map(
+                function ( $referencing_post ) {
+                    return $referencing_post->ID;
+                },
+                $referencing_posts
+            )
+        );
+
+        // Combine directly referencing posts and referencing posts via entities
+        $referencing_posts = array_merge( $directly_referencing_posts, $referencing_posts );
+
+        // loop over them and take the first one which is not already in the $related_posts
+        $results = array();
+        foreach ( $referencing_posts as $referencing_post ) {
+            $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+            $product           = wc_get_product( $referencing_post->ID );
+
+            $result = array(
+                'product' => array(
+                    'id'              => $referencing_post->ID,
+                    'permalink'       => get_permalink( $referencing_post->ID ),
+                    'title'           => $referencing_post->post_title,
+                    'thumbnail'       => get_the_post_thumbnail_url( $referencing_post, 'medium' ),
+                    'regular_price'   => $product->get_regular_price(),
+                    'sale_price'      => $product->get_sale_price(),
+                    'price'           => $product->get_price(),
+                    'currency_symbol' => get_woocommerce_currency_symbol(),
+                    'discount_pc'     => ( $product->get_sale_price() && ( $product->get_regular_price() > 0 ) ) ? round( 1 - ( $product->get_sale_price() / $product->get_regular_price() ), 2 ) * 100 : 0,
+                    'average_rating'  => $product->get_average_rating(),
+                    'rating_count'    => $product->get_rating_count(),
+                    'rating_html'     => wc_get_rating_html( $product->get_average_rating(), $product->get_rating_count() ),
+                ),
+                'entity'  => array(
+                    'id'        => $referencing_post->entity_id,
+                    'label'     => $serialized_entity['label'],
+                    'mainType'  => $serialized_entity['mainType'],
+                    'permalink' => get_permalink( $referencing_post->entity_id ),
+                ),
+            );
+
+            $results[] = $result;
+
+        }
+
+        if ( count( $results ) < $navigator_length ) {
+            $results = apply_filters( 'wl_products_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+        }
+
+        // Add filler posts if needed
+        $filler_count = $navigator_length - count( $results );
+        if ( $filler_count > 0 ) {
+            $referencing_post_ids = array_map(
+                function ( $p ) {
+                    return $p->ID;
+                },
+                $referencing_posts
+            );
+            /**
+             * @since 3.28.0
+             * Filler posts are fetched using this util.
+             */
+            $filler_posts_util       = new Filler_Posts_Util( $post_id, 'product' );
+            $post_ids_to_be_excluded = array_merge( array( $post_id ), $referencing_post_ids );
+            $filler_posts            = $filler_posts_util->get_product_navigator_response( $filler_count, $post_ids_to_be_excluded );
+            $results                 = array_merge( $results, $filler_posts );
+        }
+
+        // Apply filters after fillers are added
+        foreach ( $results as $result_index => $result ) {
+            $results[ $result_index ]['product'] = apply_filters( 'wl_products_navigator_data_post', $result['product'], intval( $result['product']['id'] ), $navigator_id );
+            $results[ $result_index ]['entity']  = apply_filters( 'wl_products_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+        }
+
+        $results = apply_filters( 'wl_products_navigator_results', $results, $navigator_id );
+
+        return $amp ? array(
+            'items' => array(
+                array( 'values' => $results ),
+            ),
+        ) : $results;
+
+    }
+
+    private function get_directly_referencing_posts( $post_id, $referencing_post_ids ) {
+
+        $directly_referencing_post_ids = Wordlift_Entity_Service::get_instance()->get_related_entities( $post_id );
+
+        $post__in = array_diff( $directly_referencing_post_ids, $referencing_post_ids );
+
+        $directly_referencing_posts = get_posts(
+            array(
+                'meta_query'          => array(
+                    array(
+                        'key' => '_thumbnail_id',
+                    ),
+                    array(
+                        'key'   => '_stock_status',
+                        'value' => 'instock',
+                    ),
+                ),
+                'post__in'            => $post__in,
+                'post_type'           => 'product',
+                'ignore_sticky_posts' => 1,
+            )
+        );
+
+        $results = array();
+
+        foreach ( $directly_referencing_posts as $post ) {
+            $result             = new stdClass();
+            $result->ID         = $post->ID;
+            $result->post_title = $post->post_title;
+            $result->entity_id  = $post->ID;
+            $results[]          = $result;
+        }
+
+        return $results;
+    }
+
+    private function get_entity_results(
+        $post_id,
+        $fields = array(
+            'ID',
+            'post_title',
+        ),
+        $order_by = 'ID DESC',
+        $limit = 10,
+        $offset = 0
+    ) {
+        global $wpdb;
+
+        $select = implode(
+            ', ',
+            array_map(
+                function ( $item ) {
+                    return "p.$item AS $item";
+                },
+                (array) $fields
+            )
+        );
+
+        $order_by = implode(
+            ', ',
+            array_map(
+                function ( $item ) {
+                    return "p.$item";
+                },
+                (array) $order_by
+            )
+        );
 // phpcs:disable WordPress.DB.PreparedSQLPlaceholders.UnquotedComplexPlaceholder
-		/** @noinspection SqlNoDataSourceInspection */
-		return $wpdb->get_results(
-			$wpdb->prepare(
-				"
+        /** @noinspection SqlNoDataSourceInspection */
+        return $wpdb->get_results(
+            $wpdb->prepare(
+                "
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -273,51 +273,51 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 ",
-				$post_id,
-				$limit,
-				$offset,
-				$select,
-				$order_by
-			)
-		);
-	}
+                $post_id,
+                $limit,
+                $offset,
+                $select,
+                $order_by
+            )
+        );
+    }
 // phpcs:enable
-	private function get_post_results(
-		$post_id,
-		$fields = array(
-			'ID',
-			'post_title',
-		),
-		$order_by = 'ID DESC',
-		$limit = 10,
-		$offset = 0
-	) {
-		global $wpdb;
-
-		$select = implode(
-			', ',
-			array_map(
-				function ( $item ) {
-					return "p.$item AS $item";
-				},
-				(array) $fields
-			)
-		);
-
-		$order_by = implode(
-			', ',
-			array_map(
-				function ( $item ) {
-					return "p.$item";
-				},
-				(array) $order_by
-			)
-		);
+    private function get_post_results(
+        $post_id,
+        $fields = array(
+            'ID',
+            'post_title',
+        ),
+        $order_by = 'ID DESC',
+        $limit = 10,
+        $offset = 0
+    ) {
+        global $wpdb;
+
+        $select = implode(
+            ', ',
+            array_map(
+                function ( $item ) {
+                    return "p.$item AS $item";
+                },
+                (array) $fields
+            )
+        );
+
+        $order_by = implode(
+            ', ',
+            array_map(
+                function ( $item ) {
+                    return "p.$item";
+                },
+                (array) $order_by
+            )
+        );
 // phpcs:disable WordPress.DB.PreparedSQLPlaceholders.UnquotedComplexPlaceholder,WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber
-		/** @noinspection SqlNoDataSourceInspection */
-		return $wpdb->get_results(
-			$wpdb->prepare(
-				"
+        /** @noinspection SqlNoDataSourceInspection */
+        return $wpdb->get_results(
+            $wpdb->prepare(
+                "
 SELECT %4\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
     INNER JOIN {$wpdb->prefix}wl_relation_instances r2
@@ -353,13 +353,13 @@ 
  LIMIT %2\$d
  OFFSET %3\$d
 ",
-				$post_id,
-				$limit,
-				$offset,
-				$select,
-				$order_by
-			)
-		);
-	}
+                $post_id,
+                $limit,
+                $offset,
+                $select,
+                $order_by
+            )
+        );
+    }
 // phpcs:enable
 }

Spacing +39 added lines, -39 removed lines

@@ -11,12 +11,12 @@ 
 			'/products-navigator',
 			array(
 				'post_id' => array(
-					'description' => __( 'Post ID for which Navigator has to be queried', 'wordlift' ),
+					'description' => __('Post ID for which Navigator has to be queried', 'wordlift'),
 					'type'        => 'integer',
 					'required'    => true,
 				),
 				'uniqid'  => array(
-					'description' => __( 'Navigator uniqueid', 'wordlift' ),
+					'description' => __('Navigator uniqueid', 'wordlift'),
 					'type'        => 'string',
 					'required'    => true,
 				),
@@ -41,7 +41,7 @@ 
 		);
 	}
 
-	public function get_data( $request ) {
+	public function get_data($request) {
 
 		// Sanitize and set defaults
 		$navigator_length = $request['limit'];
@@ -51,15 +51,15 @@ 
 		$navigator_id     = $request['uniqid'];
 		$amp              = $request['amp'];
 
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
 		// Post ID has to match an existing item
-		if ( null === $post ) {
-			return new WP_Error( 'rest_invalid_post_id', __( 'Invalid post_id', 'wordlift' ), array( 'status' => 404 ) );
+		if (null === $post) {
+			return new WP_Error('rest_invalid_post_id', __('Invalid post_id', 'wordlift'), array('status' => 404));
 		}
 
 		// Determine navigator type and call respective get_*_results
-		if ( get_post_type( $post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
+		if (get_post_type($post_id) === Wordlift_Entity_Service::TYPE_NAME) {
 			$referencing_posts = $this->get_entity_results(
 				$post_id,
 				array(
@@ -87,7 +87,7 @@ 
 		$directly_referencing_posts = $this->get_directly_referencing_posts(
 			$post_id,
 			array_map(
-				function ( $referencing_post ) {
+				function($referencing_post) {
 					return $referencing_post->ID;
 				},
 				$referencing_posts
@@ -95,34 +95,34 @@ 
 		);
 
 		// Combine directly referencing posts and referencing posts via entities
-		$referencing_posts = array_merge( $directly_referencing_posts, $referencing_posts );
+		$referencing_posts = array_merge($directly_referencing_posts, $referencing_posts);
 
 		// loop over them and take the first one which is not already in the $related_posts
 		$results = array();
-		foreach ( $referencing_posts as $referencing_post ) {
-			$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-			$product           = wc_get_product( $referencing_post->ID );
+		foreach ($referencing_posts as $referencing_post) {
+			$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
+			$product           = wc_get_product($referencing_post->ID);
 
 			$result = array(
 				'product' => array(
 					'id'              => $referencing_post->ID,
-					'permalink'       => get_permalink( $referencing_post->ID ),
+					'permalink'       => get_permalink($referencing_post->ID),
 					'title'           => $referencing_post->post_title,
-					'thumbnail'       => get_the_post_thumbnail_url( $referencing_post, 'medium' ),
+					'thumbnail'       => get_the_post_thumbnail_url($referencing_post, 'medium'),
 					'regular_price'   => $product->get_regular_price(),
 					'sale_price'      => $product->get_sale_price(),
 					'price'           => $product->get_price(),
 					'currency_symbol' => get_woocommerce_currency_symbol(),
-					'discount_pc'     => ( $product->get_sale_price() && ( $product->get_regular_price() > 0 ) ) ? round( 1 - ( $product->get_sale_price() / $product->get_regular_price() ), 2 ) * 100 : 0,
+					'discount_pc'     => ($product->get_sale_price() && ($product->get_regular_price() > 0)) ? round(1 - ($product->get_sale_price() / $product->get_regular_price()), 2) * 100 : 0,
 					'average_rating'  => $product->get_average_rating(),
 					'rating_count'    => $product->get_rating_count(),
-					'rating_html'     => wc_get_rating_html( $product->get_average_rating(), $product->get_rating_count() ),
+					'rating_html'     => wc_get_rating_html($product->get_average_rating(), $product->get_rating_count()),
 				),
 				'entity'  => array(
 					'id'        => $referencing_post->entity_id,
 					'label'     => $serialized_entity['label'],
 					'mainType'  => $serialized_entity['mainType'],
-					'permalink' => get_permalink( $referencing_post->entity_id ),
+					'permalink' => get_permalink($referencing_post->entity_id),
 				),
 			);
 
@@ -130,15 +130,15 @@ 
 
 		}
 
-		if ( count( $results ) < $navigator_length ) {
-			$results = apply_filters( 'wl_products_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+		if (count($results) < $navigator_length) {
+			$results = apply_filters('wl_products_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
 		}
 
 		// Add filler posts if needed
-		$filler_count = $navigator_length - count( $results );
-		if ( $filler_count > 0 ) {
+		$filler_count = $navigator_length - count($results);
+		if ($filler_count > 0) {
 			$referencing_post_ids = array_map(
-				function ( $p ) {
+				function($p) {
 					return $p->ID;
 				},
 				$referencing_posts
@@ -147,33 +147,33 @@ 
 			 * @since 3.28.0
 			 * Filler posts are fetched using this util.
 			 */
-			$filler_posts_util       = new Filler_Posts_Util( $post_id, 'product' );
-			$post_ids_to_be_excluded = array_merge( array( $post_id ), $referencing_post_ids );
-			$filler_posts            = $filler_posts_util->get_product_navigator_response( $filler_count, $post_ids_to_be_excluded );
-			$results                 = array_merge( $results, $filler_posts );
+			$filler_posts_util       = new Filler_Posts_Util($post_id, 'product');
+			$post_ids_to_be_excluded = array_merge(array($post_id), $referencing_post_ids);
+			$filler_posts            = $filler_posts_util->get_product_navigator_response($filler_count, $post_ids_to_be_excluded);
+			$results                 = array_merge($results, $filler_posts);
 		}
 
 		// Apply filters after fillers are added
-		foreach ( $results as $result_index => $result ) {
-			$results[ $result_index ]['product'] = apply_filters( 'wl_products_navigator_data_post', $result['product'], intval( $result['product']['id'] ), $navigator_id );
-			$results[ $result_index ]['entity']  = apply_filters( 'wl_products_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+		foreach ($results as $result_index => $result) {
+			$results[$result_index]['product'] = apply_filters('wl_products_navigator_data_post', $result['product'], intval($result['product']['id']), $navigator_id);
+			$results[$result_index]['entity']  = apply_filters('wl_products_navigator_data_entity', $result['entity'], intval($result['entity']['id']), $navigator_id);
 		}
 
-		$results = apply_filters( 'wl_products_navigator_results', $results, $navigator_id );
+		$results = apply_filters('wl_products_navigator_results', $results, $navigator_id);
 
 		return $amp ? array(
 			'items' => array(
-				array( 'values' => $results ),
+				array('values' => $results),
 			),
 		) : $results;
 
 	}
 
-	private function get_directly_referencing_posts( $post_id, $referencing_post_ids ) {
+	private function get_directly_referencing_posts($post_id, $referencing_post_ids) {
 
-		$directly_referencing_post_ids = Wordlift_Entity_Service::get_instance()->get_related_entities( $post_id );
+		$directly_referencing_post_ids = Wordlift_Entity_Service::get_instance()->get_related_entities($post_id);
 
-		$post__in = array_diff( $directly_referencing_post_ids, $referencing_post_ids );
+		$post__in = array_diff($directly_referencing_post_ids, $referencing_post_ids);
 
 		$directly_referencing_posts = get_posts(
 			array(
@@ -194,7 +194,7 @@ 
 
 		$results = array();
 
-		foreach ( $directly_referencing_posts as $post ) {
+		foreach ($directly_referencing_posts as $post) {
 			$result             = new stdClass();
 			$result->ID         = $post->ID;
 			$result->post_title = $post->post_title;
@@ -220,7 +220,7 @@ 
 		$select = implode(
 			', ',
 			array_map(
-				function ( $item ) {
+				function($item) {
 					return "p.$item AS $item";
 				},
 				(array) $fields
@@ -230,7 +230,7 @@ 
 		$order_by = implode(
 			', ',
 			array_map(
-				function ( $item ) {
+				function($item) {
 					return "p.$item";
 				},
 				(array) $order_by
@@ -297,7 +297,7 @@ 
 		$select = implode(
 			', ',
 			array_map(
-				function ( $item ) {
+				function($item) {
 					return "p.$item AS $item";
 				},
 				(array) $fields
@@ -307,7 +307,7 @@ 
 		$order_by = implode(
 			', ',
 			array_map(
-				function ( $item ) {
+				function($item) {
 					return "p.$item";
 				},
 				(array) $order_by

src/shortcodes/wordlift-shortcode-chord.php

Indentation +164 added lines, -164 removed lines

@@ -15,47 +15,47 @@ 
  * @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 ( count( $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 ( count( $famous_entities ) >= 1 ) {
+        return key( $famous_entities );
+    } else {
+        return $post_ids[0];
+    }
 
 }
 
@@ -72,66 +72,66 @@ 
  */
 function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
 
-	if ( $related !== null ) {
-		if ( 0 === $depth ) {
-			return $related;
-		}
-	}
-
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( $related === null ? 'yes' : 'no' ) . ' ]' );
-
-	// Create a related array which will hold entities and relations.
-	if ( $related === null ) {
-		$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',
-		)
-	);
-
-	// 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 ) );
-
-	// 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 ) {
-
-		if ( count( $related['entities'] ) >= $max_size ) {
-			return $related;
-		}
-
-		$related['relations'][] = array( $entity_id, $related_id );
-
-		if ( ! in_array( $related_id, $related['entities'], true ) ) {
-			// Found new related entity!
-			$related['entities'][] = $related_id;
-
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
-		}
-	}
-
-	// End condition 2: no more entities to search for.
-	return $related;
+    if ( $related !== null ) {
+        if ( 0 === $depth ) {
+            return $related;
+        }
+    }
+
+    wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( $related === null ? 'yes' : 'no' ) . ' ]' );
+
+    // Create a related array which will hold entities and relations.
+    if ( $related === null ) {
+        $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',
+        )
+    );
+
+    // 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 ) );
+
+    // 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 ) {
+
+        if ( count( $related['entities'] ) >= $max_size ) {
+            return $related;
+        }
+
+        $related['relations'][] = array( $entity_id, $related_id );
+
+        if ( ! in_array( $related_id, $related['entities'], true ) ) {
+            // Found new related entity!
+            $related['entities'][] = $related_id;
+
+            $related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+        }
+    }
+
+    // End condition 2: no more entities to search for.
+    return $related;
 }
 
 /**
@@ -145,63 +145,63 @@ 
  */
 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 ( $post === null ) {
-				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 && 0 !== $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 ( $post === null ) {
+                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 && 0 !== $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;
 }
 
 /**
@@ -212,15 +212,15 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	check_ajax_referer( 'wl_chord', 'wl_chord_nonce' );
+    check_ajax_referer( 'wl_chord', 'wl_chord_nonce' );
 
-	$post_id = isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
-	$depth   = isset( $_REQUEST['depth'] ) ? (int) $_REQUEST['depth'] : 2;
+    $post_id = isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
+    $depth   = isset( $_REQUEST['depth'] ) ? (int) $_REQUEST['depth'] : 2;
 
-	$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' );

Spacing +49 added lines, -50 removed lines

@@ -40,19 +40,19 @@ 
 		)
 	);
 
-	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 ( count( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
+	$famous_entities = array_count_values($entities);
+	arsort($famous_entities);
+	if (count($famous_entities) >= 1) {
+		return key($famous_entities);
 	} else {
 		return $post_ids[0];
 	}
@@ -70,20 +70,20 @@ 
  * @return array
  * @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 ( $related !== null ) {
-		if ( 0 === $depth ) {
+	if ($related !== null) {
+		if (0 === $depth) {
 			return $related;
 		}
 	}
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( $related === null ? 'yes' : 'no' ) . ' ]' );
+	wl_write_log("wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: ".($related === null ? 'yes' : 'no').' ]');
 
 	// Create a related array which will hold entities and relations.
-	if ( $related === null ) {
+	if ($related === null) {
 		$related = array(
-			'entities'  => array( $entity_id ),
+			'entities'  => array($entity_id),
 			'relations' => array(),
 		);
 	}
@@ -97,36 +97,35 @@ 
 	);
 
 	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-												 ->is_entity( $entity_id ) ) ?
+	$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'], true ) ) {
+		if ( ! in_array($related_id, $related['entities'], true)) {
 			// 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);
 		}
 	}
 
@@ -143,44 +142,44 @@ 
  *
  * @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 );
+		function(&$item) {
+			$post = get_post($item);
 
 			// Skip non-existing posts.
-			if ( $post === null ) {
-				wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+			if ($post === null) {
+				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 && 0 !== $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 && 0 !== $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;
@@ -190,10 +189,10 @@ 
 	// Refactor the relations.
 	array_walk(
 		$data['relations'],
-		function ( &$item ) {
+		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;
@@ -212,16 +211,16 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	check_ajax_referer( 'wl_chord', 'wl_chord_nonce' );
+	check_ajax_referer('wl_chord', 'wl_chord_nonce');
 
-	$post_id = isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
-	$depth   = isset( $_REQUEST['depth'] ) ? (int) $_REQUEST['depth'] : 2;
+	$post_id = isset($_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : 0;
+	$depth   = isset($_REQUEST['depth']) ? (int) $_REQUEST['depth'] : 2;
 
-	$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');

src/wordlift-editor.php

Indentation +25 added lines, -25 removed lines

@@ -9,32 +9,32 @@ 
  */
 function wordlift_mce_css( $mce_css ) {
 
-	/*
+    /*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
 	 *
 	 * @since 3.20.3
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
-		return $mce_css;
-	}
-
-	if ( ! empty( $mce_css ) ) {
-		$mce_css .= ',';
-	}
-
-	/**
-	 * Replacing the legacy `wordlift-reloaded.min.css` with tiny-mce.css.
-	 *
-	 * tiny-mce.css is generated using the new webpack project and its rules are shared with Gutenberg.
-	 *
-	 * @author David Riccitelli <david@wordlift.io>
-	 * @since 3.23.0
-	 */
-	$mce_css .= plugin_dir_url( __FILE__ ) . 'js/dist/tiny-mce.css';
-
-	return $mce_css;
+    if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+        return $mce_css;
+    }
+
+    if ( ! empty( $mce_css ) ) {
+        $mce_css .= ',';
+    }
+
+    /**
+     * Replacing the legacy `wordlift-reloaded.min.css` with tiny-mce.css.
+     *
+     * tiny-mce.css is generated using the new webpack project and its rules are shared with Gutenberg.
+     *
+     * @author David Riccitelli <david@wordlift.io>
+     * @since 3.23.0
+     */
+    $mce_css .= plugin_dir_url( __FILE__ ) . 'js/dist/tiny-mce.css';
+
+    return $mce_css;
 }
 
 // hook the TinyMCE custom styles function.
@@ -49,13 +49,13 @@ 
  */
 function wordlift_filter_tiny_mce_before_init( $options ) {
 
-	if ( ! isset( $options['extended_valid_elements'] ) ) {
-		$options['extended_valid_elements'] = '';
-	}
+    if ( ! isset( $options['extended_valid_elements'] ) ) {
+        $options['extended_valid_elements'] = '';
+    }
 
-	$options['extended_valid_elements'] .= ',span[*]';
+    $options['extended_valid_elements'] .= ',span[*]';
 
-	return $options;
+    return $options;
 }
 
 add_filter( 'tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init', PHP_INT_MAX );

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
  *
  * @return string The updated list of styles, including the custom style provided by WordLift.
  */
-function wordlift_mce_css( $mce_css ) {
+function wordlift_mce_css($mce_css) {
 
 	/*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
@@ -16,11 +16,11 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+	if ( ! apply_filters('wl_can_see_classification_box', true)) {
 		return $mce_css;
 	}
 
-	if ( ! empty( $mce_css ) ) {
+	if ( ! empty($mce_css)) {
 		$mce_css .= ',';
 	}
 
@@ -32,13 +32,13 @@ 
 	 * @author David Riccitelli <david@wordlift.io>
 	 * @since 3.23.0
 	 */
-	$mce_css .= plugin_dir_url( __FILE__ ) . 'js/dist/tiny-mce.css';
+	$mce_css .= plugin_dir_url(__FILE__).'js/dist/tiny-mce.css';
 
 	return $mce_css;
 }
 
 // hook the TinyMCE custom styles function.
-add_filter( 'mce_css', 'wordlift_mce_css' );
+add_filter('mce_css', 'wordlift_mce_css');
 
 /**
  * Set TinyMCE options, in particular enable microdata tagging.
@@ -47,9 +47,9 @@ 
  *
  * @return mixed
  */
-function wordlift_filter_tiny_mce_before_init( $options ) {
+function wordlift_filter_tiny_mce_before_init($options) {
 
-	if ( ! isset( $options['extended_valid_elements'] ) ) {
+	if ( ! isset($options['extended_valid_elements'])) {
 		$options['extended_valid_elements'] = '';
 	}
 
@@ -58,4 +58,4 @@ 
 	return $options;
 }
 
-add_filter( 'tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init', PHP_INT_MAX );
+add_filter('tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init', PHP_INT_MAX);

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

Indentation +60 added lines, -60 removed lines

@@ -21,76 +21,76 @@
  */
 class Wordlift_AMP_Service {
 
-	/**
-	 * The {@link \Wordlift_Jsonld_Service} instance.
-	 *
-	 * @since 3.19.1
-	 * @access private
-	 * @var \Wordlift_Jsonld_Service $jsonld_service The {@link \Wordlift_Jsonld_Service} instance.
-	 */
-	private $jsonld_service;
+    /**
+     * The {@link \Wordlift_Jsonld_Service} instance.
+     *
+     * @since 3.19.1
+     * @access private
+     * @var \Wordlift_Jsonld_Service $jsonld_service The {@link \Wordlift_Jsonld_Service} instance.
+     */
+    private $jsonld_service;
 
-	/**
-	 * Create a {@link Wordlift_AMP_Service} instance.
-	 *
-	 * @since 3.19.1
-	 *
-	 * @param \Wordlift_Jsonld_Service $jsonld_service
-	 */
-	public function __construct( $jsonld_service ) {
+    /**
+     * Create a {@link Wordlift_AMP_Service} instance.
+     *
+     * @since 3.19.1
+     *
+     * @param \Wordlift_Jsonld_Service $jsonld_service
+     */
+    public function __construct( $jsonld_service ) {
 
-		$this->jsonld_service = $jsonld_service;
+        $this->jsonld_service = $jsonld_service;
 
-		add_action( 'amp_init', array( $this, 'register_entity_cpt_with_amp_plugin' ) );
-		add_filter( 'amp_post_template_metadata', array( $this, 'amp_post_template_metadata' ), 99, 2 );
+        add_action( 'amp_init', array( $this, 'register_entity_cpt_with_amp_plugin' ) );
+        add_filter( 'amp_post_template_metadata', array( $this, 'amp_post_template_metadata' ), 99, 2 );
 
-	}
+    }
 
-	/**
-	 * Register the `entity` post type with the AMP plugin.
-	 *
-	 * @since 3.12.0
-	 */
-	public function register_entity_cpt_with_amp_plugin() {
+    /**
+     * Register the `entity` post type with the AMP plugin.
+     *
+     * @since 3.12.0
+     */
+    public function register_entity_cpt_with_amp_plugin() {
 
-		if ( ! defined( 'AMP_QUERY_VAR' ) ) {
-			return;
-		}
+        if ( ! defined( 'AMP_QUERY_VAR' ) ) {
+            return;
+        }
 
-		foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $post_type ) {
-			// Do not change anything for posts and pages.
-			if ( 'post' === $post_type || 'page' === $post_type ) {
-				continue;
-			}
-			add_post_type_support( $post_type, AMP_QUERY_VAR );
-		}
+        foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $post_type ) {
+            // Do not change anything for posts and pages.
+            if ( 'post' === $post_type || 'page' === $post_type ) {
+                continue;
+            }
+            add_post_type_support( $post_type, AMP_QUERY_VAR );
+        }
 
-	}
+    }
 
-	/**
-	 * Filters Schema.org metadata for a post.
-	 *
-	 * @since 3.19.1
-	 *
-	 * @param array   $metadata Metadata.
-	 * @param WP_Post $post Post.
-	 *
-	 * @return array Return WordLift's generated JSON-LD.
-	 */
-	public function amp_post_template_metadata( $metadata, $post ) {
+    /**
+     * Filters Schema.org metadata for a post.
+     *
+     * @since 3.19.1
+     *
+     * @param array   $metadata Metadata.
+     * @param WP_Post $post Post.
+     *
+     * @return array Return WordLift's generated JSON-LD.
+     */
+    public function amp_post_template_metadata( $metadata, $post ) {
 
-		return $this->jsonld_service->get_jsonld( false, $post->ID );
-	}
+        return $this->jsonld_service->get_jsonld( false, $post->ID );
+    }
 
-	/**
-	 * Check if current page is amp endpoint.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @return bool
-	 */
-	public static function is_amp_endpoint() {
-		return function_exists( 'is_amp_endpoint' ) && is_amp_endpoint();
-	}
+    /**
+     * Check if current page is amp endpoint.
+     *
+     * @since 3.20.0
+     *
+     * @return bool
+     */
+    public static function is_amp_endpoint() {
+        return function_exists( 'is_amp_endpoint' ) && is_amp_endpoint();
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -37,12 +37,12 @@ 
 	 *
 	 * @param \Wordlift_Jsonld_Service $jsonld_service
 	 */
-	public function __construct( $jsonld_service ) {
+	public function __construct($jsonld_service) {
 
 		$this->jsonld_service = $jsonld_service;
 
-		add_action( 'amp_init', array( $this, 'register_entity_cpt_with_amp_plugin' ) );
-		add_filter( 'amp_post_template_metadata', array( $this, 'amp_post_template_metadata' ), 99, 2 );
+		add_action('amp_init', array($this, 'register_entity_cpt_with_amp_plugin'));
+		add_filter('amp_post_template_metadata', array($this, 'amp_post_template_metadata'), 99, 2);
 
 	}
 
@@ -53,16 +53,16 @@ 
 	 */
 	public function register_entity_cpt_with_amp_plugin() {
 
-		if ( ! defined( 'AMP_QUERY_VAR' ) ) {
+		if ( ! defined('AMP_QUERY_VAR')) {
 			return;
 		}
 
-		foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $post_type ) {
+		foreach (Wordlift_Entity_Service::valid_entity_post_types() as $post_type) {
 			// Do not change anything for posts and pages.
-			if ( 'post' === $post_type || 'page' === $post_type ) {
+			if ('post' === $post_type || 'page' === $post_type) {
 				continue;
 			}
-			add_post_type_support( $post_type, AMP_QUERY_VAR );
+			add_post_type_support($post_type, AMP_QUERY_VAR);
 		}
 
 	}
@@ -77,9 +77,9 @@ 
 	 *
 	 * @return array Return WordLift's generated JSON-LD.
 	 */
-	public function amp_post_template_metadata( $metadata, $post ) {
+	public function amp_post_template_metadata($metadata, $post) {
 
-		return $this->jsonld_service->get_jsonld( false, $post->ID );
+		return $this->jsonld_service->get_jsonld(false, $post->ID);
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 * @return bool
 	 */
 	public static function is_amp_endpoint() {
-		return function_exists( 'is_amp_endpoint' ) && is_amp_endpoint();
+		return function_exists('is_amp_endpoint') && is_amp_endpoint();
 	}
 
 }

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;