insideout10 / wordlift-plugin

src/wordlift/images-licenses/class-image-license-scheduler.php

Indentation +34 added lines, -34 removed lines

@@ -14,50 +14,50 @@
 
 class Image_License_Scheduler {
 
-	const ACTION_NAME = 'wl_image_license_scheduler__run';
+    const ACTION_NAME = 'wl_image_license_scheduler__run';
 
-	/**
-	 * @var Image_License_Service
-	 */
-	private $image_license_service;
-	/**
-	 * @var Ttl_Cache
-	 */
-	private $cache_service;
+    /**
+     * @var Image_License_Service
+     */
+    private $image_license_service;
+    /**
+     * @var Ttl_Cache
+     */
+    private $cache_service;
 
-	/**
-	 * @param Image_License_Service $image_license_service
-	 * @param Ttl_Cache $cache_service
-	 */
-	public function __construct( $image_license_service, $cache_service ) {
+    /**
+     * @param Image_License_Service $image_license_service
+     * @param Ttl_Cache $cache_service
+     */
+    public function __construct( $image_license_service, $cache_service ) {
 
-		$this->image_license_service = $image_license_service;
-		$this->cache_service         = $cache_service;
+        $this->image_license_service = $image_license_service;
+        $this->cache_service         = $cache_service;
 
-		// Do not bother to configure scheduled tasks while running on the front-end.
-		add_action( 'wp_ajax_' . self::ACTION_NAME, array( $this, 'run' ) );
-		add_action( self::ACTION_NAME, array( $this, 'run' ) );
+        // Do not bother to configure scheduled tasks while running on the front-end.
+        add_action( 'wp_ajax_' . self::ACTION_NAME, array( $this, 'run' ) );
+        add_action( self::ACTION_NAME, array( $this, 'run' ) );
 
-		if ( is_admin() && ! wp_next_scheduled( self::ACTION_NAME ) ) {
-			wp_schedule_event( time(), 'weekly', self::ACTION_NAME );
-		}
+        if ( is_admin() && ! wp_next_scheduled( self::ACTION_NAME ) ) {
+            wp_schedule_event( time(), 'weekly', self::ACTION_NAME );
+        }
 
-	}
+    }
 
-	public function run() {
+    public function run() {
 
-		// Get and save the domains.
-		$data = $this->image_license_service->get_non_public_domain_images();
+        // Get and save the domains.
+        $data = $this->image_license_service->get_non_public_domain_images();
 
-		// Update the cache.
-		$this->cache_service->put( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES, $data );
+        // Update the cache.
+        $this->cache_service->put( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES, $data );
 
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) &&
-		     ( self::ACTION_NAME === filter_input( INPUT_GET, 'action' )
-		       || self::ACTION_NAME === filter_input( INPUT_POST, 'action' ) ) ) {
-			wp_send_json_success( $data );
-		}
+        if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) &&
+             ( self::ACTION_NAME === filter_input( INPUT_GET, 'action' )
+               || self::ACTION_NAME === filter_input( INPUT_POST, 'action' ) ) ) {
+            wp_send_json_success( $data );
+        }
 
-	}
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -29,17 +29,17 @@ 
 	 * @param Image_License_Service $image_license_service
 	 * @param Ttl_Cache $cache_service
 	 */
-	public function __construct( $image_license_service, $cache_service ) {
+	public function __construct($image_license_service, $cache_service) {
 
 		$this->image_license_service = $image_license_service;
 		$this->cache_service         = $cache_service;
 
 		// Do not bother to configure scheduled tasks while running on the front-end.
-		add_action( 'wp_ajax_' . self::ACTION_NAME, array( $this, 'run' ) );
-		add_action( self::ACTION_NAME, array( $this, 'run' ) );
+		add_action('wp_ajax_'.self::ACTION_NAME, array($this, 'run'));
+		add_action(self::ACTION_NAME, array($this, 'run'));
 
-		if ( is_admin() && ! wp_next_scheduled( self::ACTION_NAME ) ) {
-			wp_schedule_event( time(), 'weekly', self::ACTION_NAME );
+		if (is_admin() && ! wp_next_scheduled(self::ACTION_NAME)) {
+			wp_schedule_event(time(), 'weekly', self::ACTION_NAME);
 		}
 
 	}
@@ -50,12 +50,12 @@ 
 		$data = $this->image_license_service->get_non_public_domain_images();
 
 		// Update the cache.
-		$this->cache_service->put( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES, $data );
+		$this->cache_service->put(Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES, $data);
 
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) &&
-		     ( self::ACTION_NAME === filter_input( INPUT_GET, 'action' )
-		       || self::ACTION_NAME === filter_input( INPUT_POST, 'action' ) ) ) {
-			wp_send_json_success( $data );
+		if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX) &&
+		     (self::ACTION_NAME === filter_input(INPUT_GET, 'action')
+		       || self::ACTION_NAME === filter_input(INPUT_POST, 'action'))) {
+			wp_send_json_success($data);
 		}
 
 	}

src/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +235 added lines, -235 removed lines

@@ -18,30 +18,30 @@ 
  */
 function wl_shortcode_faceted_search( $request ) {
 
-	// Create the cache key.
-	$cache_key = array(
-		'request_params' => $_GET,
-	);
+    // Create the cache key.
+    $cache_key = array(
+        'request_params' => $_GET,
+    );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "faceted-search", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "faceted-search", 8 * 60 * 60 ); // 8 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
-		wl_core_send_json( $cache_results );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
+        wl_core_send_json( $cache_results );
 
-		return;
-	}
+        return;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = wl_shortcode_faceted_search_origin( $request );
+    $results = wl_shortcode_faceted_search_origin( $request );
 
-	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+    // Put the result before sending the json to the client, since sending the json will terminate us.
+    $cache->put( $cache_key, $results );
 
-	wl_core_send_json( $results );
+    wl_core_send_json( $results );
 
 }
 
@@ -52,134 +52,134 @@ 
  * @since        3.26.0
  */
 function wl_shortcode_faceted_search_origin( $request ) {
-	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
-
-		return;
-	}
-
-	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
-
-	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
-
-		return;
-	}
-
-	// If the current post is an entity,
-	// the current post is used as main entity.
-	// Otherwise, current post related entities are used.
-	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		$entity_service->get_related_entities( $current_post->ID );
-
-	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		/**
-		 * If this function is not called from ajax
-		 * then this should not throw an error.
-		 * Note: Used in scripbox longtail project on json endpoint.
-		 */
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die( 'No entities available' );
-		}
-
-	}
-
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4;  // WPCS: input var ok; CSRF ok.
-	$amp   = ( isset( $_GET['amp'] ) ) ? true : false;
-
-
-	/**
-	 * see https://github.com/insideout10/wordlift-plugin/issues/1181
-	 * The ordering should be descending by date on default.
-	 */
-	$order_by = 'DESC';
-	if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
-		$order_by = (string) $_GET['sort'];
-	}
-
-	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-		$entity_ids,
-		'*',
-		null,
-		'publish',
-		array( $current_post_id ),
-		$limit,
-		null,
-		$order_by
-	);
-
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-
-	$post_results   = array();
-	$entity_results = array();
-
-	// Populate $post_results
-
-	$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-		$referencing_posts :
-		Wordlift_Relation_Service::get_instance()->get_article_subjects(
-			wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
-			'*',
-			null,
-			null,
-			array(),
-			null,
-			$referencing_post_ids
-		);
-
-	if ( $filtered_posts ) {
-		foreach ( $filtered_posts as $post_obj ) {
-
-			/**
-			 * Use the thumbnail.
-			 *
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-			 *
-			 * @since 3.19.3 We're using the medium size image.
-			 */
-			$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ?
-				$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->permalink = get_permalink( $post_obj->ID );
-
-			$result         = $post_obj;
-			$post_results[] = $result;
-		}
-	}
-
-	// Add filler posts if needed
-
-	$filler_count         = $limit - count( $post_results );
-	$filler_posts         = wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids );
-	$post_results         = array_merge( $post_results, $filler_posts );
-	$referencing_post_ids = array_map( function ( $post ) {
-		return $post->ID;
-	}, $post_results );
-
-	// Populate $entity_results
-
-	global $wpdb;
-
-	// Retrieve Wordlift relation instances table name.
-	$table_name = wl_core_get_relation_instances_table_name();
-
-	/*
+    // Post ID must be defined.
+    if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
+        wp_die( 'No post_id given' );
+
+        return;
+    }
+
+    $current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
+    $current_post    = get_post( $current_post_id );
+
+    // Post ID has to match an existing item.
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
+
+        return;
+    }
+
+    // If the current post is an entity,
+    // the current post is used as main entity.
+    // Otherwise, current post related entities are used.
+    $entity_service = Wordlift_Entity_Service::get_instance();
+    $entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
+        array( $current_post->ID ) :
+        $entity_service->get_related_entities( $current_post->ID );
+
+    // If there are no entities we cannot render the widget.
+    if ( 0 === count( $entity_ids ) ) {
+        /**
+         * If this function is not called from ajax
+         * then this should not throw an error.
+         * Note: Used in scripbox longtail project on json endpoint.
+         */
+        if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+            wp_die( 'No entities available' );
+        }
+
+    }
+
+    $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4;  // WPCS: input var ok; CSRF ok.
+    $amp   = ( isset( $_GET['amp'] ) ) ? true : false;
+
+
+    /**
+     * see https://github.com/insideout10/wordlift-plugin/issues/1181
+     * The ordering should be descending by date on default.
+     */
+    $order_by = 'DESC';
+    if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
+        $order_by = (string) $_GET['sort'];
+    }
+
+    $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+        $entity_ids,
+        '*',
+        null,
+        'publish',
+        array( $current_post_id ),
+        $limit,
+        null,
+        $order_by
+    );
+
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+
+    $post_results   = array();
+    $entity_results = array();
+
+    // Populate $post_results
+
+    $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
+        $referencing_posts :
+        Wordlift_Relation_Service::get_instance()->get_article_subjects(
+            wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+            '*',
+            null,
+            null,
+            array(),
+            null,
+            $referencing_post_ids
+        );
+
+    if ( $filtered_posts ) {
+        foreach ( $filtered_posts as $post_obj ) {
+
+            /**
+             * Use the thumbnail.
+             *
+             * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+             * @see https://github.com/insideout10/wordlift-plugin/issues/837
+             *
+             * @since 3.19.3 We're using the medium size image.
+             */
+            $thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
+            $post_obj->thumbnail = ( $thumbnail ) ?
+                $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+            $post_obj->permalink = get_permalink( $post_obj->ID );
+
+            $result         = $post_obj;
+            $post_results[] = $result;
+        }
+    }
+
+    // Add filler posts if needed
+
+    $filler_count         = $limit - count( $post_results );
+    $filler_posts         = wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids );
+    $post_results         = array_merge( $post_results, $filler_posts );
+    $referencing_post_ids = array_map( function ( $post ) {
+        return $post->ID;
+    }, $post_results );
+
+    // Populate $entity_results
+
+    global $wpdb;
+
+    // Retrieve Wordlift relation instances table name.
+    $table_name = wl_core_get_relation_instances_table_name();
+
+    /*
 	 * Make sure we have some referenced post, otherwise the IN parts of
 	 * the SQL will produce an SQL error.
 	 */
-	if ( ! empty( $referencing_post_ids ) ) {
-		$subject_ids = implode( ',', $referencing_post_ids );
+    if ( ! empty( $referencing_post_ids ) ) {
+        $subject_ids = implode( ',', $referencing_post_ids );
 
-		$query = "
+        $query = "
 				SELECT
 					object_id AS ID,
 					count( object_id ) AS counter
@@ -191,116 +191,116 @@ 
 				LIMIT $limit;
 			";
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
 
-		$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+        $entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
 
-		wl_write_log( 'Entities found ' . count( $entities ) );
+        wl_write_log( 'Entities found ' . count( $entities ) );
 
-		foreach ( $entities as $obj ) {
+        foreach ( $entities as $obj ) {
 
-			$entity = get_post( $obj->ID );
+            $entity = get_post( $obj->ID );
 
-			// Ensure only valid and published entities are returned.
-			if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+            // Ensure only valid and published entities are returned.
+            if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
 
-				$serialized_entity                    = wl_serialize_entity( $entity );
-				$serialized_entity['label']           = wl_shortcode_faceted_search_get_the_title( $obj->ID );
-				$serialized_entity['counter']         = $obj->counter;
-				$serialized_entity['createdAt']       = $entity->post_date;
-				$serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-					$obj->ID,
-					'ids',
-					null,
-					null,
-					array(),
-					null,
-					$referencing_post_ids
-				);
-				$entity_results[]                     = $serialized_entity;
-			}
-		}
-	}
+                $serialized_entity                    = wl_serialize_entity( $entity );
+                $serialized_entity['label']           = wl_shortcode_faceted_search_get_the_title( $obj->ID );
+                $serialized_entity['counter']         = $obj->counter;
+                $serialized_entity['createdAt']       = $entity->post_date;
+                $serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+                    $obj->ID,
+                    'ids',
+                    null,
+                    null,
+                    array(),
+                    null,
+                    $referencing_post_ids
+                );
+                $entity_results[]                     = $serialized_entity;
+            }
+        }
+    }
 
-	return array(
-		'posts'    => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
-		'entities' => $entity_results
-	);
+    return array(
+        'posts'    => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
+        'entities' => $entity_results
+    );
 
 }
 
 function wl_shortcode_faceted_search_get_the_title( $post_id ) {
 
-	$title = get_the_title( $post_id );
+    $title = get_the_title( $post_id );
 
-	if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
+    if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
+        $alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
 
-		if ( count( $alternative_labels ) > 0 ) {
-			$title = $alternative_labels[0];
-		}
-	}
+        if ( count( $alternative_labels ) > 0 ) {
+            $title = $alternative_labels[0];
+        }
+    }
 
-	return remove_accents( $title );
+    return remove_accents( $title );
 
 }
 
 function wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids ) {
 
-	$filler_posts = array();
-
-	// First add latest posts from same categories as the current post
-	if ( $filler_count > 0 ) {
-
-		$current_post_categories = wp_get_post_categories( $current_post_id );
-
-		$args = array(
-			'meta_query'          => array(
-				array(
-					'key' => '_thumbnail_id'
-				)
-			),
-			'category__in'        => $current_post_categories,
-			'numberposts'         => $filler_count,
-			'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids ),
-			'ignore_sticky_posts' => 1
-		);
-
-		$filler_posts = get_posts( $args );
-	}
-
-	$filler_count    = $filler_count - count( $filler_posts );
-	$filler_post_ids = array_map( function ( $post ) {
-		return $post->ID;
-	}, $filler_posts );
-
-	// If that does not fill, add latest posts irrespective of category
-	if ( $filler_count > 0 ) {
-
-		$args = array(
-			'meta_query'          => array(
-				array(
-					'key' => '_thumbnail_id'
-				)
-			),
-			'numberposts'         => $filler_count,
-			'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids, $filler_post_ids ),
-			'ignore_sticky_posts' => 1
-		);
-
-		$filler_posts = array_merge( $filler_posts, get_posts( $args ) );
-
-	}
-
-	// Add thumbnail and permalink to filler posts
-	foreach ( $filler_posts as $post_obj ) {
-		$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-		$post_obj->thumbnail = ( $thumbnail ) ?
-			$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-		$post_obj->permalink = get_permalink( $post_obj->ID );
-	}
-
-	return $filler_posts;
+    $filler_posts = array();
+
+    // First add latest posts from same categories as the current post
+    if ( $filler_count > 0 ) {
+
+        $current_post_categories = wp_get_post_categories( $current_post_id );
+
+        $args = array(
+            'meta_query'          => array(
+                array(
+                    'key' => '_thumbnail_id'
+                )
+            ),
+            'category__in'        => $current_post_categories,
+            'numberposts'         => $filler_count,
+            'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids ),
+            'ignore_sticky_posts' => 1
+        );
+
+        $filler_posts = get_posts( $args );
+    }
+
+    $filler_count    = $filler_count - count( $filler_posts );
+    $filler_post_ids = array_map( function ( $post ) {
+        return $post->ID;
+    }, $filler_posts );
+
+    // If that does not fill, add latest posts irrespective of category
+    if ( $filler_count > 0 ) {
+
+        $args = array(
+            'meta_query'          => array(
+                array(
+                    'key' => '_thumbnail_id'
+                )
+            ),
+            'numberposts'         => $filler_count,
+            'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids, $filler_post_ids ),
+            'ignore_sticky_posts' => 1
+        );
+
+        $filler_posts = array_merge( $filler_posts, get_posts( $args ) );
+
+    }
+
+    // Add thumbnail and permalink to filler posts
+    foreach ( $filler_posts as $post_obj ) {
+        $thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
+        $post_obj->thumbnail = ( $thumbnail ) ?
+            $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+        $post_obj->permalink = get_permalink( $post_obj->ID );
+    }
+
+    return $filler_posts;
 
 }
 
@@ -308,8 +308,8 @@ 
  * Adding `rest_api_init` action for network faceted-search
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
-		'methods'  => 'GET',
-		'callback' => 'wl_shortcode_faceted_search',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
+        'methods'  => 'GET',
+        'callback' => 'wl_shortcode_faceted_search',
+    ) );
 } );

Spacing +76 added lines, -78 removed lines

@@ -16,7 +16,7 @@ 
  * @since 3.21.4 fix the cache key by also using the request body.
  * @since 3.21.2 add a caching layer.
  */
-function wl_shortcode_faceted_search( $request ) {
+function wl_shortcode_faceted_search($request) {
 
 	// Create the cache key.
 	$cache_key = array(
@@ -24,24 +24,24 @@ 
 	);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "faceted-search", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("faceted-search", 8 * 60 * 60); // 8 hours.
+	$cache_results = $cache->get($cache_key);
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
-		wl_core_send_json( $cache_results );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
+		wl_core_send_json($cache_results);
 
 		return;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
-	$results = wl_shortcode_faceted_search_origin( $request );
+	$results = wl_shortcode_faceted_search_origin($request);
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
@@ -51,20 +51,20 @@ 
  * @return array $results
  * @since        3.26.0
  */
-function wl_shortcode_faceted_search_origin( $request ) {
+function wl_shortcode_faceted_search_origin($request) {
 	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) { // WPCS: input var ok; CSRF ok.
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
@@ -73,25 +73,24 @@ 
 	// the current post is used as main entity.
 	// Otherwise, current post related entities are used.
 	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		$entity_service->get_related_entities( $current_post->ID );
+	$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : $entity_service->get_related_entities($current_post->ID);
 
 	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
+	if (0 === count($entity_ids)) {
 		/**
 		 * If this function is not called from ajax
 		 * then this should not throw an error.
 		 * Note: Used in scripbox longtail project on json endpoint.
 		 */
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die( 'No entities available' );
+		if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX)) {
+			wp_die('No entities available');
 		}
 
 	}
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4;  // WPCS: input var ok; CSRF ok.
-	$amp   = ( isset( $_GET['amp'] ) ) ? true : false;
+	$limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 4; // WPCS: input var ok; CSRF ok.
+	$amp   = (isset($_GET['amp'])) ? true : false;
 
 
 	/**
@@ -99,7 +98,7 @@ 
 	 * The ordering should be descending by date on default.
 	 */
 	$order_by = 'DESC';
-	if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
+	if (isset($_GET['sort']) && is_string($_GET['sort'])) {
 		$order_by = (string) $_GET['sort'];
 	}
 
@@ -108,25 +107,24 @@ 
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit,
 		null,
 		$order_by
 	);
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 
 	$post_results   = array();
 	$entity_results = array();
 
 	// Populate $post_results
 
-	$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-		$referencing_posts :
-		Wordlift_Relation_Service::get_instance()->get_article_subjects(
-			wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+	$filtered_posts = (empty($filtering_entity_uris)) ?
+		$referencing_posts : Wordlift_Relation_Service::get_instance()->get_article_subjects(
+			wl_get_entity_post_ids_by_uris($filtering_entity_uris),
 			'*',
 			null,
 			null,
@@ -135,8 +133,8 @@ 
 			$referencing_post_ids
 		);
 
-	if ( $filtered_posts ) {
-		foreach ( $filtered_posts as $post_obj ) {
+	if ($filtered_posts) {
+		foreach ($filtered_posts as $post_obj) {
 
 			/**
 			 * Use the thumbnail.
@@ -146,10 +144,10 @@ 
 			 *
 			 * @since 3.19.3 We're using the medium size image.
 			 */
-			$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ?
+			$thumbnail           = get_the_post_thumbnail_url($post_obj, 'medium');
+			$post_obj->thumbnail = ($thumbnail) ?
 				$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->permalink = get_permalink( $post_obj->ID );
+			$post_obj->permalink = get_permalink($post_obj->ID);
 
 			$result         = $post_obj;
 			$post_results[] = $result;
@@ -158,12 +156,12 @@ 
 
 	// Add filler posts if needed
 
-	$filler_count         = $limit - count( $post_results );
-	$filler_posts         = wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids );
-	$post_results         = array_merge( $post_results, $filler_posts );
-	$referencing_post_ids = array_map( function ( $post ) {
+	$filler_count         = $limit - count($post_results);
+	$filler_posts         = wl_shortcode_faceted_search_filler_posts($filler_count, $current_post_id, $referencing_post_ids);
+	$post_results         = array_merge($post_results, $filler_posts);
+	$referencing_post_ids = array_map(function($post) {
 		return $post->ID;
-	}, $post_results );
+	}, $post_results);
 
 	// Populate $entity_results
 
@@ -176,8 +174,8 @@ 
 	 * Make sure we have some referenced post, otherwise the IN parts of
 	 * the SQL will produce an SQL error.
 	 */
-	if ( ! empty( $referencing_post_ids ) ) {
-		$subject_ids = implode( ',', $referencing_post_ids );
+	if ( ! empty($referencing_post_ids)) {
+		$subject_ids = implode(',', $referencing_post_ids);
 
 		$query = "
 				SELECT
@@ -191,21 +189,21 @@ 
 				LIMIT $limit;
 			";
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]");
 
-		$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+		$entities = $wpdb->get_results($query, OBJECT); // No cache ok.
 
-		wl_write_log( 'Entities found ' . count( $entities ) );
+		wl_write_log('Entities found '.count($entities));
 
-		foreach ( $entities as $obj ) {
+		foreach ($entities as $obj) {
 
-			$entity = get_post( $obj->ID );
+			$entity = get_post($obj->ID);
 
 			// Ensure only valid and published entities are returned.
-			if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+			if ((null !== $entity) && ('publish' === $entity->post_status)) {
 
-				$serialized_entity                    = wl_serialize_entity( $entity );
-				$serialized_entity['label']           = wl_shortcode_faceted_search_get_the_title( $obj->ID );
+				$serialized_entity                    = wl_serialize_entity($entity);
+				$serialized_entity['label']           = wl_shortcode_faceted_search_get_the_title($obj->ID);
 				$serialized_entity['counter']         = $obj->counter;
 				$serialized_entity['createdAt']       = $entity->post_date;
 				$serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
@@ -217,42 +215,42 @@ 
 					null,
 					$referencing_post_ids
 				);
-				$entity_results[]                     = $serialized_entity;
+				$entity_results[] = $serialized_entity;
 			}
 		}
 	}
 
 	return array(
-		'posts'    => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
+		'posts'    => $amp ? array(array('values' => $post_results)) : $post_results,
 		'entities' => $entity_results
 	);
 
 }
 
-function wl_shortcode_faceted_search_get_the_title( $post_id ) {
+function wl_shortcode_faceted_search_get_the_title($post_id) {
 
-	$title = get_the_title( $post_id );
+	$title = get_the_title($post_id);
 
-	if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
+	if (get_post_type($post_id) !== Wordlift_Entity_Service::TYPE_NAME) {
+		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels($post_id);
 
-		if ( count( $alternative_labels ) > 0 ) {
+		if (count($alternative_labels) > 0) {
 			$title = $alternative_labels[0];
 		}
 	}
 
-	return remove_accents( $title );
+	return remove_accents($title);
 
 }
 
-function wl_shortcode_faceted_search_filler_posts( $filler_count, $current_post_id, $referencing_post_ids ) {
+function wl_shortcode_faceted_search_filler_posts($filler_count, $current_post_id, $referencing_post_ids) {
 
 	$filler_posts = array();
 
 	// First add latest posts from same categories as the current post
-	if ( $filler_count > 0 ) {
+	if ($filler_count > 0) {
 
-		$current_post_categories = wp_get_post_categories( $current_post_id );
+		$current_post_categories = wp_get_post_categories($current_post_id);
 
 		$args = array(
 			'meta_query'          => array(
@@ -262,20 +260,20 @@ 
 			),
 			'category__in'        => $current_post_categories,
 			'numberposts'         => $filler_count,
-			'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids ),
+			'post__not_in'        => array_merge(array($current_post_id), $referencing_post_ids),
 			'ignore_sticky_posts' => 1
 		);
 
-		$filler_posts = get_posts( $args );
+		$filler_posts = get_posts($args);
 	}
 
-	$filler_count    = $filler_count - count( $filler_posts );
-	$filler_post_ids = array_map( function ( $post ) {
+	$filler_count    = $filler_count - count($filler_posts);
+	$filler_post_ids = array_map(function($post) {
 		return $post->ID;
-	}, $filler_posts );
+	}, $filler_posts);
 
 	// If that does not fill, add latest posts irrespective of category
-	if ( $filler_count > 0 ) {
+	if ($filler_count > 0) {
 
 		$args = array(
 			'meta_query'          => array(
@@ -284,20 +282,20 @@ 
 				)
 			),
 			'numberposts'         => $filler_count,
-			'post__not_in'        => array_merge( array( $current_post_id ), $referencing_post_ids, $filler_post_ids ),
+			'post__not_in'        => array_merge(array($current_post_id), $referencing_post_ids, $filler_post_ids),
 			'ignore_sticky_posts' => 1
 		);
 
-		$filler_posts = array_merge( $filler_posts, get_posts( $args ) );
+		$filler_posts = array_merge($filler_posts, get_posts($args));
 
 	}
 
 	// Add thumbnail and permalink to filler posts
-	foreach ( $filler_posts as $post_obj ) {
-		$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-		$post_obj->thumbnail = ( $thumbnail ) ?
+	foreach ($filler_posts as $post_obj) {
+		$thumbnail           = get_the_post_thumbnail_url($post_obj, 'medium');
+		$post_obj->thumbnail = ($thumbnail) ?
 			$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-		$post_obj->permalink = get_permalink( $post_obj->ID );
+		$post_obj->permalink = get_permalink($post_obj->ID);
 	}
 
 	return $filler_posts;
@@ -307,9 +305,9 @@ 
 /**
  * Adding `rest_api_init` action for network faceted-search
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
 		'methods'  => 'GET',
 		'callback' => 'wl_shortcode_faceted_search',
-	) );
+	));
 } );

src/admin/class-wordlift-admin-setup.php

Indentation +274 added lines, -274 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -28,140 +28,140 @@ 
  */
 class Wordlift_Admin_Setup {
 
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Configuration_Service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Key_Validation_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Key_Validation_Service A {@link Wordlift_Key_Validation_Service} instance.
-	 */
-	private $key_validation_service;
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.20.0
-	 * @access private
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	private $language_select_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 *
-	 * @since  3.20.0
-	 * @access private
-	 * @var \Wordlift_Admin_Country_Select_Element $country_select_element A {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 */
-	private $country_select_element;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 * @param \Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
-	 * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 * @param \Wordlift_Admin_Country_Select_Element $country_select_element A {@link Wordlift_Admin_Country_Select_Element} element renderer.
-	 *
-	 * @since    3.9.0
-	 *
-	 */
-	public function __construct( $configuration_service, $key_validation_service, $entity_service, $language_select_element, $country_select_element ) {
-
-		// Set a reference to the configuration service.
-		$this->configuration_service = $configuration_service;
-
-		// Set a reference to the key validation service.
-		$this->key_validation_service = $key_validation_service;
-
-		// Set a reference to the entity service.
-		$this->entity_service = $entity_service;
-
-		// Set a reference to the UI elements language and country.
-		$this->language_select_element = $language_select_element;
-		$this->country_select_element  = $country_select_element;
-
-		// Hook to some WP's events:
-		// When WP is loaded check whether the user decided to skip the set-up, i.e. don't show us even if WL is not set up.
-		add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
-
-		// Hook to `admin_menu` in order to add our own setup wizard page.
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-
-		// Triggered when the user accesses the admin area, we decide whether to show our own wizard.
-		add_action( 'admin_init', array( $this, 'show_page' ) );
-
-		/**
-		 * Filter: wl_feature__enable__notices.
-		 *
-		 * @param bool whether the notices needs to be enabled or not.
-		 *
-		 * @return bool
-		 * @since 3.27.6
-		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			// Hook to `admin_notices` to display our notices.
-			add_action( 'admin_notices', array( $this, 'admin_notices' ) );
-		}
-	}
-
-	/**
-	 * Hook to `admin_init` and redirect to WordLift's setup page if the `_wl_activation_redirect` transient flag is set.
-	 *
-	 * @since 3.9.0
-	 */
-	public function admin_init() {
-
-		// If the `_wl_activation_redirect` is set, the redirect to the setup page.
-		if ( get_transient( '_wl_activation_redirect' ) ) {
-			delete_transient( '_wl_activation_redirect' );
-
-			// If the user asked to skip the wizard then comply.
-			if ( $this->configuration_service->is_skip_wizard() ) {
-				return;
-			}
-
-			// If we're already on the page or the user doesn't have permissions, return.
-			if ( ( ! empty( $_GET['page'] ) && 'wl-setup' === $_GET['page'] ) || is_network_admin() || isset( $_GET['activate-multi'] ) || ! current_user_can( 'manage_options' ) ) {
-				return;
-			}
-
-			// Finally redirect to the setup page.
-			wp_safe_redirect( admin_url( 'index.php?page=wl-setup' ) );
-
-			exit;
-		}
-
-	}
-
-	/**
-	 * Generate an admin notice suggesting to start the wizard if there is no configuration.
-	 *
-	 * @since    3.9.0
-	 */
-	public function admin_notices() {
-
-		// Use `wl_configuration_get_key` to check whether WL's key is set and that the user didn't disable the wizard.
-		if ( '' === $this->configuration_service->get_key() && ! $this->configuration_service->is_skip_wizard() ) { ?>
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Configuration_Service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Key_Validation_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Key_Validation_Service A {@link Wordlift_Key_Validation_Service} instance.
+     */
+    private $key_validation_service;
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.20.0
+     * @access private
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    private $language_select_element;
+
+    /**
+     * A {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     *
+     * @since  3.20.0
+     * @access private
+     * @var \Wordlift_Admin_Country_Select_Element $country_select_element A {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     */
+    private $country_select_element;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     * @param \Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
+     * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     * @param \Wordlift_Admin_Country_Select_Element $country_select_element A {@link Wordlift_Admin_Country_Select_Element} element renderer.
+     *
+     * @since    3.9.0
+     *
+     */
+    public function __construct( $configuration_service, $key_validation_service, $entity_service, $language_select_element, $country_select_element ) {
+
+        // Set a reference to the configuration service.
+        $this->configuration_service = $configuration_service;
+
+        // Set a reference to the key validation service.
+        $this->key_validation_service = $key_validation_service;
+
+        // Set a reference to the entity service.
+        $this->entity_service = $entity_service;
+
+        // Set a reference to the UI elements language and country.
+        $this->language_select_element = $language_select_element;
+        $this->country_select_element  = $country_select_element;
+
+        // Hook to some WP's events:
+        // When WP is loaded check whether the user decided to skip the set-up, i.e. don't show us even if WL is not set up.
+        add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
+
+        // Hook to `admin_menu` in order to add our own setup wizard page.
+        add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+
+        // Triggered when the user accesses the admin area, we decide whether to show our own wizard.
+        add_action( 'admin_init', array( $this, 'show_page' ) );
+
+        /**
+         * Filter: wl_feature__enable__notices.
+         *
+         * @param bool whether the notices needs to be enabled or not.
+         *
+         * @return bool
+         * @since 3.27.6
+         */
+        if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+            // Hook to `admin_notices` to display our notices.
+            add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+        }
+    }
+
+    /**
+     * Hook to `admin_init` and redirect to WordLift's setup page if the `_wl_activation_redirect` transient flag is set.
+     *
+     * @since 3.9.0
+     */
+    public function admin_init() {
+
+        // If the `_wl_activation_redirect` is set, the redirect to the setup page.
+        if ( get_transient( '_wl_activation_redirect' ) ) {
+            delete_transient( '_wl_activation_redirect' );
+
+            // If the user asked to skip the wizard then comply.
+            if ( $this->configuration_service->is_skip_wizard() ) {
+                return;
+            }
+
+            // If we're already on the page or the user doesn't have permissions, return.
+            if ( ( ! empty( $_GET['page'] ) && 'wl-setup' === $_GET['page'] ) || is_network_admin() || isset( $_GET['activate-multi'] ) || ! current_user_can( 'manage_options' ) ) {
+                return;
+            }
+
+            // Finally redirect to the setup page.
+            wp_safe_redirect( admin_url( 'index.php?page=wl-setup' ) );
+
+            exit;
+        }
+
+    }
+
+    /**
+     * Generate an admin notice suggesting to start the wizard if there is no configuration.
+     *
+     * @since    3.9.0
+     */
+    public function admin_notices() {
+
+        // Use `wl_configuration_get_key` to check whether WL's key is set and that the user didn't disable the wizard.
+        if ( '' === $this->configuration_service->get_key() && ! $this->configuration_service->is_skip_wizard() ) { ?>
             <div id="wl-message" class="updated">
                 <p><?php esc_html_e( 'Welcome to WordLift &#8211; You&lsquo;re almost ready to start', 'wordlift' ); ?></p>
                 <p class="submit">
@@ -173,144 +173,144 @@ 
             </div>
 		<?php }
 
-	}
-
-	/**
-	 * Handle hiding the wizard notices by user request.
-	 *
-	 * @since    3.9.0
-	 */
-	public function hide_notices() {
-
-		// If it's not a `wl-hide-notice` or the nonce is not set, return.
-		if ( ! isset( $_GET['wl-hide-notice'], $_GET['_wl_notice_nonce'] ) ) {
-			return;
-		}
-
-		// If the nonce is invalid, return an error.
-		if ( ! wp_verify_nonce( $_GET['_wl_notice_nonce'], 'wordlift_hide_notices_nonce' ) ) {
-			wp_die( __( 'Action failed. Please refresh the page and retry.', 'wordlift' ) );
-		}
-
-		// If the user doesn't have the right privileges, return an error.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( __( 'Cheatin&#8217; huh?', 'wordlift' ) );
-		}
-
-		// Store a flag telling to skip the wizard.
-		$this->configuration_service->set_skip_wizard( true );
-
-	}
-
-	/**
-	 * Register the wizard page to be able to access it.
-	 *
-	 * @since    3.9.0
-	 */
-	public function admin_menu() {
-		/**
-		 * Filter: wl_feature__enable__screens.
-		 *
-		 * @param bool whether the screens needed to be registered, defaults to true.
-		 *
-		 * @return bool
-		 * @since 3.27.6
-		 */
-		if ( apply_filters( 'wl_feature__enable__screens', true ) ) {
-			// @todo: find another way to do this, since this is adding an empty space in WP's dashboard menu.
-			add_dashboard_page( '', '', 'manage_options', 'wl-setup', '' );
-		}
-	}
-
-	/**
-	 * Displays the wizard page.
-	 *
-	 * @since    3.9.0
-	 */
-	public function show_page() {
-
-		// First check if we are in the wizard page at all, if not do nothing.
-		if ( empty( $_GET['page'] ) || 'wl-setup' !== $_GET['page'] ) {
-			return;
-		}
-
-		// If it's a POST and the `wl-save-configuration` action is set, save the configuration.
-		if ( isset( $_POST['action'] ) && 'wl-save-configuration' === $_POST['action'] ) {
-
-			// Check the nonce and the user capabilities.
-			check_admin_referer( 'wl-save-configuration' );
-
-			// Check if the user has the right privileges.
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'Sorry, you do not have a permission to save the settings', 'wordlift' ) );
-			}
-
-			// Save the configuration.
-			$this->save_configuration( $_POST );
-
-			// Redirect to the admin's page.
-			wp_redirect( admin_url() );
-
-			exit;
-		}
-
-		$language_select = $this->language_select_element;
-		$country_select  = $this->country_select_element;
-
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-setup.php';
-
-		exit;
-	}
-
-	/**
-	 * Save WordLift's configuration using the provided parameters.
-	 *
-	 * @param array $params An array of configuration parameters.
-	 *
-	 * @since 3.9.0
-	 *
-	 */
-	private function save_configuration( $params ) {
-
-		// We have the following parameters:
-		// `key`, holding WL's key,
-		// `vocabulary`, holding the vocabulary path,
-		// `language`, with the language code (e.g. `en`),
-		// `send_diagnostic`, the user preferences about sharing data with us.
-		// `user_type`, the user type either `personal` or `company`,
-		// `name`, with the `personal` or `company`'s name,
-		// `logo`, the attachment id for the `personal` or `company` entity.
-
-		// Store the key:
-		$this->configuration_service->set_key( $params['key'] );
-
-		// Store the vocabulary path:
-		$this->configuration_service->set_entity_base_path( $params['vocabulary'] );
-
-		// Store the site's language:
-		$this->configuration_service->set_language_code( $params['wl-site-language'] );
-
-		// Store the site's country:
-		$this->configuration_service->set_country_code( $params['wl-country-code'] );
-
-		// Store the preferences in variable, because if the checkbox is not checked
-		// the `share-diagnostic` will not exists in `$params` array.
-		$share_diagnostic_preferences = empty( $params['share-diagnostic'] ) ? 'no' : 'yes';
-
-		// Store the diagnostic preferences:
-		$this->configuration_service->set_diagnostic_preferences( $share_diagnostic_preferences );
-
-		// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-		$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $params['user_type'] ? 'Organization' : 'Person' );
-
-		// Create an entity for the publisher.
-		$publisher_post_id = $this->entity_service->create( $params['name'], $type_uri, $params['logo'], 'publish' );
-
-		// Store the publisher entity post id in the configuration.
-		$this->configuration_service->set_publisher_id( $publisher_post_id );
-
-		flush_rewrite_rules(); // Needed because of possible change to the entity base path.
-
-	}
+    }
+
+    /**
+     * Handle hiding the wizard notices by user request.
+     *
+     * @since    3.9.0
+     */
+    public function hide_notices() {
+
+        // If it's not a `wl-hide-notice` or the nonce is not set, return.
+        if ( ! isset( $_GET['wl-hide-notice'], $_GET['_wl_notice_nonce'] ) ) {
+            return;
+        }
+
+        // If the nonce is invalid, return an error.
+        if ( ! wp_verify_nonce( $_GET['_wl_notice_nonce'], 'wordlift_hide_notices_nonce' ) ) {
+            wp_die( __( 'Action failed. Please refresh the page and retry.', 'wordlift' ) );
+        }
+
+        // If the user doesn't have the right privileges, return an error.
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_die( __( 'Cheatin&#8217; huh?', 'wordlift' ) );
+        }
+
+        // Store a flag telling to skip the wizard.
+        $this->configuration_service->set_skip_wizard( true );
+
+    }
+
+    /**
+     * Register the wizard page to be able to access it.
+     *
+     * @since    3.9.0
+     */
+    public function admin_menu() {
+        /**
+         * Filter: wl_feature__enable__screens.
+         *
+         * @param bool whether the screens needed to be registered, defaults to true.
+         *
+         * @return bool
+         * @since 3.27.6
+         */
+        if ( apply_filters( 'wl_feature__enable__screens', true ) ) {
+            // @todo: find another way to do this, since this is adding an empty space in WP's dashboard menu.
+            add_dashboard_page( '', '', 'manage_options', 'wl-setup', '' );
+        }
+    }
+
+    /**
+     * Displays the wizard page.
+     *
+     * @since    3.9.0
+     */
+    public function show_page() {
+
+        // First check if we are in the wizard page at all, if not do nothing.
+        if ( empty( $_GET['page'] ) || 'wl-setup' !== $_GET['page'] ) {
+            return;
+        }
+
+        // If it's a POST and the `wl-save-configuration` action is set, save the configuration.
+        if ( isset( $_POST['action'] ) && 'wl-save-configuration' === $_POST['action'] ) {
+
+            // Check the nonce and the user capabilities.
+            check_admin_referer( 'wl-save-configuration' );
+
+            // Check if the user has the right privileges.
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'Sorry, you do not have a permission to save the settings', 'wordlift' ) );
+            }
+
+            // Save the configuration.
+            $this->save_configuration( $_POST );
+
+            // Redirect to the admin's page.
+            wp_redirect( admin_url() );
+
+            exit;
+        }
+
+        $language_select = $this->language_select_element;
+        $country_select  = $this->country_select_element;
+
+        include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-setup.php';
+
+        exit;
+    }
+
+    /**
+     * Save WordLift's configuration using the provided parameters.
+     *
+     * @param array $params An array of configuration parameters.
+     *
+     * @since 3.9.0
+     *
+     */
+    private function save_configuration( $params ) {
+
+        // We have the following parameters:
+        // `key`, holding WL's key,
+        // `vocabulary`, holding the vocabulary path,
+        // `language`, with the language code (e.g. `en`),
+        // `send_diagnostic`, the user preferences about sharing data with us.
+        // `user_type`, the user type either `personal` or `company`,
+        // `name`, with the `personal` or `company`'s name,
+        // `logo`, the attachment id for the `personal` or `company` entity.
+
+        // Store the key:
+        $this->configuration_service->set_key( $params['key'] );
+
+        // Store the vocabulary path:
+        $this->configuration_service->set_entity_base_path( $params['vocabulary'] );
+
+        // Store the site's language:
+        $this->configuration_service->set_language_code( $params['wl-site-language'] );
+
+        // Store the site's country:
+        $this->configuration_service->set_country_code( $params['wl-country-code'] );
+
+        // Store the preferences in variable, because if the checkbox is not checked
+        // the `share-diagnostic` will not exists in `$params` array.
+        $share_diagnostic_preferences = empty( $params['share-diagnostic'] ) ? 'no' : 'yes';
+
+        // Store the diagnostic preferences:
+        $this->configuration_service->set_diagnostic_preferences( $share_diagnostic_preferences );
+
+        // Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
+        $type_uri = sprintf( 'http://schema.org/%s', 'organization' === $params['user_type'] ? 'Organization' : 'Person' );
+
+        // Create an entity for the publisher.
+        $publisher_post_id = $this->entity_service->create( $params['name'], $type_uri, $params['logo'], 'publish' );
+
+        // Store the publisher entity post id in the configuration.
+        $this->configuration_service->set_publisher_id( $publisher_post_id );
+
+        flush_rewrite_rules(); // Needed because of possible change to the entity base path.
+
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -12,7 +12,7 @@ 
  * @since      3.9.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -85,7 +85,7 @@ 
 	 * @since    3.9.0
 	 *
 	 */
-	public function __construct( $configuration_service, $key_validation_service, $entity_service, $language_select_element, $country_select_element ) {
+	public function __construct($configuration_service, $key_validation_service, $entity_service, $language_select_element, $country_select_element) {
 
 		// Set a reference to the configuration service.
 		$this->configuration_service = $configuration_service;
@@ -102,13 +102,13 @@ 
 
 		// Hook to some WP's events:
 		// When WP is loaded check whether the user decided to skip the set-up, i.e. don't show us even if WL is not set up.
-		add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
+		add_action('wp_loaded', array($this, 'hide_notices'));
 
 		// Hook to `admin_menu` in order to add our own setup wizard page.
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+		add_action('admin_menu', array($this, 'admin_menu'));
 
 		// Triggered when the user accesses the admin area, we decide whether to show our own wizard.
-		add_action( 'admin_init', array( $this, 'show_page' ) );
+		add_action('admin_init', array($this, 'show_page'));
 
 		/**
 		 * Filter: wl_feature__enable__notices.
@@ -118,9 +118,9 @@ 
 		 * @return bool
 		 * @since 3.27.6
 		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+		if (apply_filters('wl_feature__enable__notices', true)) {
 			// Hook to `admin_notices` to display our notices.
-			add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+			add_action('admin_notices', array($this, 'admin_notices'));
 		}
 	}
 
@@ -132,21 +132,21 @@ 
 	public function admin_init() {
 
 		// If the `_wl_activation_redirect` is set, the redirect to the setup page.
-		if ( get_transient( '_wl_activation_redirect' ) ) {
-			delete_transient( '_wl_activation_redirect' );
+		if (get_transient('_wl_activation_redirect')) {
+			delete_transient('_wl_activation_redirect');
 
 			// If the user asked to skip the wizard then comply.
-			if ( $this->configuration_service->is_skip_wizard() ) {
+			if ($this->configuration_service->is_skip_wizard()) {
 				return;
 			}
 
 			// If we're already on the page or the user doesn't have permissions, return.
-			if ( ( ! empty( $_GET['page'] ) && 'wl-setup' === $_GET['page'] ) || is_network_admin() || isset( $_GET['activate-multi'] ) || ! current_user_can( 'manage_options' ) ) {
+			if (( ! empty($_GET['page']) && 'wl-setup' === $_GET['page']) || is_network_admin() || isset($_GET['activate-multi']) || ! current_user_can('manage_options')) {
 				return;
 			}
 
 			// Finally redirect to the setup page.
-			wp_safe_redirect( admin_url( 'index.php?page=wl-setup' ) );
+			wp_safe_redirect(admin_url('index.php?page=wl-setup'));
 
 			exit;
 		}
@@ -161,14 +161,14 @@ 
 	public function admin_notices() {
 
 		// Use `wl_configuration_get_key` to check whether WL's key is set and that the user didn't disable the wizard.
-		if ( '' === $this->configuration_service->get_key() && ! $this->configuration_service->is_skip_wizard() ) { ?>
+		if ('' === $this->configuration_service->get_key() && ! $this->configuration_service->is_skip_wizard()) { ?>
             <div id="wl-message" class="updated">
-                <p><?php esc_html_e( 'Welcome to WordLift &#8211; You&lsquo;re almost ready to start', 'wordlift' ); ?></p>
+                <p><?php esc_html_e('Welcome to WordLift &#8211; You&lsquo;re almost ready to start', 'wordlift'); ?></p>
                 <p class="submit">
-                    <a href="<?php echo esc_url( admin_url( 'admin.php?page=wl-setup' ) ); ?>"
-                       class="button-primary"><?php esc_html_e( 'Run the Setup Wizard', 'wordlift' ); ?></a>
+                    <a href="<?php echo esc_url(admin_url('admin.php?page=wl-setup')); ?>"
+                       class="button-primary"><?php esc_html_e('Run the Setup Wizard', 'wordlift'); ?></a>
                     <a class="button-secondary skip"
-                       href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wl-hide-notice', 'install' ), 'wordlift_hide_notices_nonce', '_wl_notice_nonce' ) ); ?>"><?php esc_html_e( 'Skip Setup', 'wordlift' ); ?></a>
+                       href="<?php echo esc_url(wp_nonce_url(add_query_arg('wl-hide-notice', 'install'), 'wordlift_hide_notices_nonce', '_wl_notice_nonce')); ?>"><?php esc_html_e('Skip Setup', 'wordlift'); ?></a>
                 </p>
             </div>
 		<?php }
@@ -183,22 +183,22 @@ 
 	public function hide_notices() {
 
 		// If it's not a `wl-hide-notice` or the nonce is not set, return.
-		if ( ! isset( $_GET['wl-hide-notice'], $_GET['_wl_notice_nonce'] ) ) {
+		if ( ! isset($_GET['wl-hide-notice'], $_GET['_wl_notice_nonce'])) {
 			return;
 		}
 
 		// If the nonce is invalid, return an error.
-		if ( ! wp_verify_nonce( $_GET['_wl_notice_nonce'], 'wordlift_hide_notices_nonce' ) ) {
-			wp_die( __( 'Action failed. Please refresh the page and retry.', 'wordlift' ) );
+		if ( ! wp_verify_nonce($_GET['_wl_notice_nonce'], 'wordlift_hide_notices_nonce')) {
+			wp_die(__('Action failed. Please refresh the page and retry.', 'wordlift'));
 		}
 
 		// If the user doesn't have the right privileges, return an error.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( __( 'Cheatin&#8217; huh?', 'wordlift' ) );
+		if ( ! current_user_can('manage_options')) {
+			wp_die(__('Cheatin&#8217; huh?', 'wordlift'));
 		}
 
 		// Store a flag telling to skip the wizard.
-		$this->configuration_service->set_skip_wizard( true );
+		$this->configuration_service->set_skip_wizard(true);
 
 	}
 
@@ -216,9 +216,9 @@ 
 		 * @return bool
 		 * @since 3.27.6
 		 */
-		if ( apply_filters( 'wl_feature__enable__screens', true ) ) {
+		if (apply_filters('wl_feature__enable__screens', true)) {
 			// @todo: find another way to do this, since this is adding an empty space in WP's dashboard menu.
-			add_dashboard_page( '', '', 'manage_options', 'wl-setup', '' );
+			add_dashboard_page('', '', 'manage_options', 'wl-setup', '');
 		}
 	}
 
@@ -230,26 +230,26 @@ 
 	public function show_page() {
 
 		// First check if we are in the wizard page at all, if not do nothing.
-		if ( empty( $_GET['page'] ) || 'wl-setup' !== $_GET['page'] ) {
+		if (empty($_GET['page']) || 'wl-setup' !== $_GET['page']) {
 			return;
 		}
 
 		// If it's a POST and the `wl-save-configuration` action is set, save the configuration.
-		if ( isset( $_POST['action'] ) && 'wl-save-configuration' === $_POST['action'] ) {
+		if (isset($_POST['action']) && 'wl-save-configuration' === $_POST['action']) {
 
 			// Check the nonce and the user capabilities.
-			check_admin_referer( 'wl-save-configuration' );
+			check_admin_referer('wl-save-configuration');
 
 			// Check if the user has the right privileges.
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'Sorry, you do not have a permission to save the settings', 'wordlift' ) );
+			if ( ! current_user_can('manage_options')) {
+				wp_die(__('Sorry, you do not have a permission to save the settings', 'wordlift'));
 			}
 
 			// Save the configuration.
-			$this->save_configuration( $_POST );
+			$this->save_configuration($_POST);
 
 			// Redirect to the admin's page.
-			wp_redirect( admin_url() );
+			wp_redirect(admin_url());
 
 			exit;
 		}
@@ -257,7 +257,7 @@ 
 		$language_select = $this->language_select_element;
 		$country_select  = $this->country_select_element;
 
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-setup.php';
+		include plugin_dir_path(dirname(__FILE__)).'admin/partials/wordlift-admin-setup.php';
 
 		exit;
 	}
@@ -270,7 +270,7 @@ 
 	 * @since 3.9.0
 	 *
 	 */
-	private function save_configuration( $params ) {
+	private function save_configuration($params) {
 
 		// We have the following parameters:
 		// `key`, holding WL's key,
@@ -282,32 +282,32 @@ 
 		// `logo`, the attachment id for the `personal` or `company` entity.
 
 		// Store the key:
-		$this->configuration_service->set_key( $params['key'] );
+		$this->configuration_service->set_key($params['key']);
 
 		// Store the vocabulary path:
-		$this->configuration_service->set_entity_base_path( $params['vocabulary'] );
+		$this->configuration_service->set_entity_base_path($params['vocabulary']);
 
 		// Store the site's language:
-		$this->configuration_service->set_language_code( $params['wl-site-language'] );
+		$this->configuration_service->set_language_code($params['wl-site-language']);
 
 		// Store the site's country:
-		$this->configuration_service->set_country_code( $params['wl-country-code'] );
+		$this->configuration_service->set_country_code($params['wl-country-code']);
 
 		// Store the preferences in variable, because if the checkbox is not checked
 		// the `share-diagnostic` will not exists in `$params` array.
-		$share_diagnostic_preferences = empty( $params['share-diagnostic'] ) ? 'no' : 'yes';
+		$share_diagnostic_preferences = empty($params['share-diagnostic']) ? 'no' : 'yes';
 
 		// Store the diagnostic preferences:
-		$this->configuration_service->set_diagnostic_preferences( $share_diagnostic_preferences );
+		$this->configuration_service->set_diagnostic_preferences($share_diagnostic_preferences);
 
 		// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-		$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $params['user_type'] ? 'Organization' : 'Person' );
+		$type_uri = sprintf('http://schema.org/%s', 'organization' === $params['user_type'] ? 'Organization' : 'Person');
 
 		// Create an entity for the publisher.
-		$publisher_post_id = $this->entity_service->create( $params['name'], $type_uri, $params['logo'], 'publish' );
+		$publisher_post_id = $this->entity_service->create($params['name'], $type_uri, $params['logo'], 'publish');
 
 		// Store the publisher entity post id in the configuration.
-		$this->configuration_service->set_publisher_id( $publisher_post_id );
+		$this->configuration_service->set_publisher_id($publisher_post_id);
 
 		flush_rewrite_rules(); // Needed because of possible change to the entity base path.
 

src/modules/analyzer/wordlift_analyzer.php

Indentation +49 added lines, -49 removed lines

@@ -9,15 +9,15 @@ 
  * @since 3.27.6
  */
 function wl_ajax_analyze_disabled_action() {
-	// adding the below header for debugging purpose.
-	if ( ! headers_sent() ) {
-		header( 'X-WordLift-Analysis: OFF' );
-	}
-	wp_send_json_success( array(
-		'entities'    => array(),
-		'annotations' => array(),
-		'topics'      => array()
-	) );
+    // adding the below header for debugging purpose.
+    if ( ! headers_sent() ) {
+        header( 'X-WordLift-Analysis: OFF' );
+    }
+    wp_send_json_success( array(
+        'entities'    => array(),
+        'annotations' => array(),
+        'topics'      => array()
+    ) );
 }
 
 /**
@@ -31,11 +31,11 @@ 
  */
 function wl_ajax_analyze_action() {
 
-	check_admin_referer( 'wl_analyze' );
+    check_admin_referer( 'wl_analyze' );
 
-	$data = filter_input( INPUT_POST, 'data' );
+    $data = filter_input( INPUT_POST, 'data' );
 
-	wp_send_json_success( wl_analyze_content( $data, 'application/json; charset=' . strtolower( get_bloginfo( 'charset' ) ) ) );
+    wp_send_json_success( wl_analyze_content( $data, 'application/json; charset=' . strtolower( get_bloginfo( 'charset' ) ) ) );
 
 }
 
@@ -57,59 +57,59 @@ 
  */
 function wl_analyze_content( $data, $content_type ) {
 
-	$default_response = json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' );
-	$request_body = json_decode( $data, true );
+    $default_response = json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' );
+    $request_body = json_decode( $data, true );
 
-	// If dataset is not enabled, return a locally prepared response without analysis API.
-	if ( ! apply_filters( 'wl_features__enable__dataset', true ) ) {
+    // If dataset is not enabled, return a locally prepared response without analysis API.
+    if ( ! apply_filters( 'wl_features__enable__dataset', true ) ) {
 
-		return Analysis_Response_Ops_Factory::get_instance()
-		                                    ->create( $default_response )
-		                                    ->make_entities_local()
-		                                    ->add_occurrences( $request_body['content'] )
-		                                    ->add_local_entities()
-		                                    ->get_json();
-	}
+        return Analysis_Response_Ops_Factory::get_instance()
+                                            ->create( $default_response )
+                                            ->make_entities_local()
+                                            ->add_occurrences( $request_body['content'] )
+                                            ->add_local_entities()
+                                            ->get_json();
+    }
 
-	add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
-	$json = Wordlift_Api_Service::get_instance()
-	                            ->post_custom_content_type( 'analysis/single', $data, $content_type );
-	remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+    add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+    $json = Wordlift_Api_Service::get_instance()
+                                ->post_custom_content_type( 'analysis/single', $data, $content_type );
+    remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
 
-	// If it's an error log it.
-	if ( is_wp_error( $json ) ) {
+    // If it's an error log it.
+    if ( is_wp_error( $json ) ) {
 
-		return Analysis_Response_Ops_Factory::get_instance()
-		                                    ->create( $default_response )
-		                                    ->make_entities_local()
-		                                    ->add_occurrences( $request_body['content'] )
-		                                    ->get_json();
-	}
+        return Analysis_Response_Ops_Factory::get_instance()
+                                            ->create( $default_response )
+                                            ->make_entities_local()
+                                            ->add_occurrences( $request_body['content'] )
+                                            ->get_json();
+    }
 
-	/*
+    /*
 	 * We pass the response to the Analysis_Response_Ops to ensure that we make remote entities local.
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/944
 	 * @since 3.21.5
 	 */
 
-	// Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
-	// the occurrences for the local entities.
-	if ( 0 === strpos( $content_type, 'application/json' ) ) {
-		$request_content = $request_body['content'];
-	} else {
-		$request_content = $data;
-	}
+    // Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
+    // the occurrences for the local entities.
+    if ( 0 === strpos( $content_type, 'application/json' ) ) {
+        $request_content = $request_body['content'];
+    } else {
+        $request_content = $data;
+    }
 
-	return Analysis_Response_Ops_Factory::get_instance()
-	                                    ->create( $json )
-	                                    ->make_entities_local()
-	                                    ->add_occurrences( $request_content )
-	                                    ->get_json();
+    return Analysis_Response_Ops_Factory::get_instance()
+                                        ->create( $json )
+                                        ->make_entities_local()
+                                        ->add_occurrences( $request_content )
+                                        ->get_json();
 
 }
 
 function wl_use_analysis_on_api_wordlift_io( $value ) {
 
-	return preg_replace( '|https://api\.wordlift\.it/|', apply_filters( 'wl_api_base_url', 'https://api.wordlift.io' ) . '/', $value );
+    return preg_replace( '|https://api\.wordlift\.it/|', apply_filters( 'wl_api_base_url', 'https://api.wordlift.io' ) . '/', $value );
 }

Spacing +24 added lines, -24 removed lines

@@ -10,14 +10,14 @@ 
  */
 function wl_ajax_analyze_disabled_action() {
 	// adding the below header for debugging purpose.
-	if ( ! headers_sent() ) {
-		header( 'X-WordLift-Analysis: OFF' );
+	if ( ! headers_sent()) {
+		header('X-WordLift-Analysis: OFF');
 	}
-	wp_send_json_success( array(
+	wp_send_json_success(array(
 		'entities'    => array(),
 		'annotations' => array(),
 		'topics'      => array()
-	) );
+	));
 }
 
 /**
@@ -31,11 +31,11 @@ 
  */
 function wl_ajax_analyze_action() {
 
-	check_admin_referer( 'wl_analyze' );
+	check_admin_referer('wl_analyze');
 
-	$data = filter_input( INPUT_POST, 'data' );
+	$data = filter_input(INPUT_POST, 'data');
 
-	wp_send_json_success( wl_analyze_content( $data, 'application/json; charset=' . strtolower( get_bloginfo( 'charset' ) ) ) );
+	wp_send_json_success(wl_analyze_content($data, 'application/json; charset='.strtolower(get_bloginfo('charset'))));
 
 }
 
@@ -55,34 +55,34 @@ 
  * @since 3.24.2 We don't return an error anymore, but an empty analysis response. This is required to allow the editor
  *   to manage entities or to manually add them even when analysis isn't available.
  */
-function wl_analyze_content( $data, $content_type ) {
+function wl_analyze_content($data, $content_type) {
 
-	$default_response = json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' );
-	$request_body = json_decode( $data, true );
+	$default_response = json_decode('{ "entities": {}, "annotations": {}, "topics": {} }');
+	$request_body = json_decode($data, true);
 
 	// If dataset is not enabled, return a locally prepared response without analysis API.
-	if ( ! apply_filters( 'wl_features__enable__dataset', true ) ) {
+	if ( ! apply_filters('wl_features__enable__dataset', true)) {
 
 		return Analysis_Response_Ops_Factory::get_instance()
-		                                    ->create( $default_response )
+		                                    ->create($default_response)
 		                                    ->make_entities_local()
-		                                    ->add_occurrences( $request_body['content'] )
+		                                    ->add_occurrences($request_body['content'])
 		                                    ->add_local_entities()
 		                                    ->get_json();
 	}
 
-	add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+	add_filter('wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io');
 	$json = Wordlift_Api_Service::get_instance()
-	                            ->post_custom_content_type( 'analysis/single', $data, $content_type );
-	remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+	                            ->post_custom_content_type('analysis/single', $data, $content_type);
+	remove_filter('wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io');
 
 	// If it's an error log it.
-	if ( is_wp_error( $json ) ) {
+	if (is_wp_error($json)) {
 
 		return Analysis_Response_Ops_Factory::get_instance()
-		                                    ->create( $default_response )
+		                                    ->create($default_response)
 		                                    ->make_entities_local()
-		                                    ->add_occurrences( $request_body['content'] )
+		                                    ->add_occurrences($request_body['content'])
 		                                    ->get_json();
 	}
 
@@ -95,21 +95,21 @@ 
 
 	// Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
 	// the occurrences for the local entities.
-	if ( 0 === strpos( $content_type, 'application/json' ) ) {
+	if (0 === strpos($content_type, 'application/json')) {
 		$request_content = $request_body['content'];
 	} else {
 		$request_content = $data;
 	}
 
 	return Analysis_Response_Ops_Factory::get_instance()
-	                                    ->create( $json )
+	                                    ->create($json)
 	                                    ->make_entities_local()
-	                                    ->add_occurrences( $request_content )
+	                                    ->add_occurrences($request_content)
 	                                    ->get_json();
 
 }
 
-function wl_use_analysis_on_api_wordlift_io( $value ) {
+function wl_use_analysis_on_api_wordlift_io($value) {
 
-	return preg_replace( '|https://api\.wordlift\.it/|', apply_filters( 'wl_api_base_url', 'https://api.wordlift.io' ) . '/', $value );
+	return preg_replace('|https://api\.wordlift\.it/|', apply_filters('wl_api_base_url', 'https://api.wordlift.io').'/', $value);
 }

src/includes/class-wordlift-entity-uri-service.php

Indentation +275 added lines, -275 removed lines

@@ -17,280 +17,280 @@
  */
 class Wordlift_Entity_Uri_Service {
 
-	/**
-	 * Holds the {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since 3.21.5
-	 * @access private
-	 * @var Wordlift_Entity_Uri_Service $instance The {@link Wordlift_Entity_Uri_Service} singleton.
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * An array of URIs to post ID valid for the current request.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var array $uri_to_post An array of URIs to post ID valid for the current request.
-	 */
-	protected $uri_to_post;
-
-	/**
-	 * Create a {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	public function __construct( $configuration_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->configuration_service = $configuration_service;
-
-		// Add a filter to the `rest_post_dispatch` filter to add the wl_entity_url meta as `wl:entity_url`.
-		add_filter( 'rest_post_dispatch', array( $this, 'rest_post_dispatch' ) );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton.
-	 *
-	 * @return Wordlift_Entity_Uri_Service The singleton instance.
-	 * @since 3.21.5
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Preload the provided URIs in the local cache.
-	 *
-	 * This function will populate the local `$uri_to_post` array by running a
-	 * single query with all the URIs and returning the mappings in the array.
-	 *
-	 * @param array $uris An array of URIs.
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	public function preload_uris( $uris ) {
-
-		// Bail out if there are no URIs.
-		if ( 0 === count( $uris ) ) {
-			return;
-		}
-
-		$this->log->trace( 'Preloading ' . count( $uris ) . ' URI(s)...' );
-
-		$that          = $this;
-		$external_uris = array_filter( $uris, function ( $item ) use ( $that ) {
-			return ! $that->is_internal( $item );
-		} );
-
-		$query_args = array(
-			// See https://github.com/insideout10/wordlift-plugin/issues/654.
-			'ignore_sticky_posts' => 1,
-			'cache_results'       => false,
-			'numberposts'         => - 1,
-			'post_status'         => 'any',
-			'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
-			'meta_query'          => array(
-				array(
-					'key'     => WL_ENTITY_URL_META_NAME,
-					'value'   => $uris,
-					'compare' => 'IN',
-				),
-			),
-		);
-
-		// Only if the current uri is not an internal uri, entity search is
-		// performed also looking at sameAs values.
-		//
-		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( 0 < count( $external_uris ) ) {
-
-			$query_args['meta_query']['relation'] = 'OR';
-			$query_args['meta_query'][]           = array(
-				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-				'value'   => $external_uris,
-				'compare' => 'IN',
-			);
-
-		}
-
-		// Get the posts.
-		$posts = get_posts( $query_args );
-
-		// Populate the array. We reinitialize the array on purpose because
-		// we don't want these data to long live.
-		$this->uri_to_post = array_reduce( $posts, function ( $carry, $item ) use ( $that ) {
-			$uris = array_merge(
-				get_post_meta( $item->ID, WL_ENTITY_URL_META_NAME ),
-				get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_SAME_AS )
-			);
-
-			return $carry
-			       // Get the URI related to the post and fill them with the item id.
-			       + array_fill_keys( $uris, $item );
-		}, array() );
-
-		// Add the not found URIs.
-		$this->uri_to_post += array_fill_keys( $uris, null );
-
-		$this->log->debug( count( $this->uri_to_post ) . " URI(s) preloaded." );
-
-	}
-
-	/**
-	 * Reset the URI to post local cache.
-	 *
-	 * @since 3.16.3
-	 */
-	public function reset_uris() {
-
-		$this->uri_to_post = array();
-
-	}
-
-	/**
-	 * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
-	 *
-	 * @param string $uri The entity URI.
-	 *
-	 * @return WP_Post|null A WP_Post instance or null if not found.
-	 * @since 3.2.0
-	 *
-	 */
-	public function get_entity( $uri ) {
-
-		$this->log->trace( "Getting an entity post for URI $uri..." );
-
-		// Check if we've been provided with a value otherwise return null.
-		if ( empty( $uri ) ) {
-			return null;
-		}
-
-		$this->log->debug( "Querying post for $uri..." );
-
-		$query_args = array(
-			// See https://github.com/insideout10/wordlift-plugin/issues/654.
-			'ignore_sticky_posts' => 1,
-			'posts_per_page'      => 1,
-			'post_status'         => 'any',
-			'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
-			'meta_query'          => array(
-				array(
-					'key'     => WL_ENTITY_URL_META_NAME,
-					'value'   => $uri,
-					'compare' => '=',
-				),
-			),
-		);
-
-		// Only if the current uri is not an internal uri, entity search is
-		// performed also looking at sameAs values.
-		//
-		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( ! $this->is_internal( $uri ) ) {
-
-			$query_args['meta_query']['relation'] = 'OR';
-			$query_args['meta_query'][]           = array(
-				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-				'value'   => $uri,
-				'compare' => '=',
-			);
-		}
-
-		$posts = get_posts( $query_args );
-
-		// Attempt to find post by URI (only for local entity URLs)
-		if ( empty( $posts ) ) {
-
-			$this->log->debug( "Finding post by $uri..." );
-			$postid = url_to_postid( $uri );
-			if ( $postid !== 0 ) {
-				$this->log->trace( "Found post $postid by URL" );
-
-				return get_post( $postid );
-			}
-
-		}
-
-		// Return null if no post is found.
-		if ( empty( $posts ) ) {
-			$this->log->warn( "No post for URI $uri." );
-
-			return null;
-		}
-
-		// Return the found post.
-		return current( $posts );
-	}
-
-	/**
-	 * Determines whether a given uri is an internal uri or not.
-	 *
-	 * @param string $uri An uri.
-	 *
-	 * @return true if the uri internal to the current dataset otherwise false.
-	 * @since 3.16.3
-	 *
-	 */
-	public function is_internal( $uri ) {
-
-		return ( 0 === strrpos( $uri, (string) $this->configuration_service->get_dataset_uri() ) );
-	}
-
-	/**
-	 * Hook to `rest_post_dispatch` to alter the response and add the `wl_entity_url` post meta as `wl:entity_url`.
-	 *
-	 * We're using this filter instead of the well known `register_meta` / `register_rest_field` because we still need
-	 * to provide full compatibility with WordPress 4.4+.
-	 *
-	 * @param WP_HTTP_Response $result Result to send to the client. Usually a WP_REST_Response.
-	 *
-	 * @return WP_HTTP_Response The result to send to the client.
-	 *
-	 * @since 3.23.0
-	 */
-	public function rest_post_dispatch( $result ) {
-
-		// Get a reference to the actual data.
-		$data = &$result->data;
-
-		// Bail out if we don't have the required parameters, or if the type is not a valid entity.
-		if ( ! is_array( $data ) || ! isset( $data['id'] ) || ! isset( $data['type'] )
-		     || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $data['type'] ) ) {
-			return $result;
-		}
-
-		// Add the `wl:entity_url`.
-		$data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri( $data['id'] );
-
-		return $result;
-	}
+    /**
+     * Holds the {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since 3.21.5
+     * @access private
+     * @var Wordlift_Entity_Uri_Service $instance The {@link Wordlift_Entity_Uri_Service} singleton.
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * An array of URIs to post ID valid for the current request.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var array $uri_to_post An array of URIs to post ID valid for the current request.
+     */
+    protected $uri_to_post;
+
+    /**
+     * Create a {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since 3.16.3
+     *
+     */
+    public function __construct( $configuration_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->configuration_service = $configuration_service;
+
+        // Add a filter to the `rest_post_dispatch` filter to add the wl_entity_url meta as `wl:entity_url`.
+        add_filter( 'rest_post_dispatch', array( $this, 'rest_post_dispatch' ) );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton.
+     *
+     * @return Wordlift_Entity_Uri_Service The singleton instance.
+     * @since 3.21.5
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Preload the provided URIs in the local cache.
+     *
+     * This function will populate the local `$uri_to_post` array by running a
+     * single query with all the URIs and returning the mappings in the array.
+     *
+     * @param array $uris An array of URIs.
+     *
+     * @since 3.16.3
+     *
+     */
+    public function preload_uris( $uris ) {
+
+        // Bail out if there are no URIs.
+        if ( 0 === count( $uris ) ) {
+            return;
+        }
+
+        $this->log->trace( 'Preloading ' . count( $uris ) . ' URI(s)...' );
+
+        $that          = $this;
+        $external_uris = array_filter( $uris, function ( $item ) use ( $that ) {
+            return ! $that->is_internal( $item );
+        } );
+
+        $query_args = array(
+            // See https://github.com/insideout10/wordlift-plugin/issues/654.
+            'ignore_sticky_posts' => 1,
+            'cache_results'       => false,
+            'numberposts'         => - 1,
+            'post_status'         => 'any',
+            'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
+            'meta_query'          => array(
+                array(
+                    'key'     => WL_ENTITY_URL_META_NAME,
+                    'value'   => $uris,
+                    'compare' => 'IN',
+                ),
+            ),
+        );
+
+        // Only if the current uri is not an internal uri, entity search is
+        // performed also looking at sameAs values.
+        //
+        // This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
+        if ( 0 < count( $external_uris ) ) {
+
+            $query_args['meta_query']['relation'] = 'OR';
+            $query_args['meta_query'][]           = array(
+                'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                'value'   => $external_uris,
+                'compare' => 'IN',
+            );
+
+        }
+
+        // Get the posts.
+        $posts = get_posts( $query_args );
+
+        // Populate the array. We reinitialize the array on purpose because
+        // we don't want these data to long live.
+        $this->uri_to_post = array_reduce( $posts, function ( $carry, $item ) use ( $that ) {
+            $uris = array_merge(
+                get_post_meta( $item->ID, WL_ENTITY_URL_META_NAME ),
+                get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_SAME_AS )
+            );
+
+            return $carry
+                    // Get the URI related to the post and fill them with the item id.
+                   + array_fill_keys( $uris, $item );
+        }, array() );
+
+        // Add the not found URIs.
+        $this->uri_to_post += array_fill_keys( $uris, null );
+
+        $this->log->debug( count( $this->uri_to_post ) . " URI(s) preloaded." );
+
+    }
+
+    /**
+     * Reset the URI to post local cache.
+     *
+     * @since 3.16.3
+     */
+    public function reset_uris() {
+
+        $this->uri_to_post = array();
+
+    }
+
+    /**
+     * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
+     *
+     * @param string $uri The entity URI.
+     *
+     * @return WP_Post|null A WP_Post instance or null if not found.
+     * @since 3.2.0
+     *
+     */
+    public function get_entity( $uri ) {
+
+        $this->log->trace( "Getting an entity post for URI $uri..." );
+
+        // Check if we've been provided with a value otherwise return null.
+        if ( empty( $uri ) ) {
+            return null;
+        }
+
+        $this->log->debug( "Querying post for $uri..." );
+
+        $query_args = array(
+            // See https://github.com/insideout10/wordlift-plugin/issues/654.
+            'ignore_sticky_posts' => 1,
+            'posts_per_page'      => 1,
+            'post_status'         => 'any',
+            'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
+            'meta_query'          => array(
+                array(
+                    'key'     => WL_ENTITY_URL_META_NAME,
+                    'value'   => $uri,
+                    'compare' => '=',
+                ),
+            ),
+        );
+
+        // Only if the current uri is not an internal uri, entity search is
+        // performed also looking at sameAs values.
+        //
+        // This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
+        if ( ! $this->is_internal( $uri ) ) {
+
+            $query_args['meta_query']['relation'] = 'OR';
+            $query_args['meta_query'][]           = array(
+                'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                'value'   => $uri,
+                'compare' => '=',
+            );
+        }
+
+        $posts = get_posts( $query_args );
+
+        // Attempt to find post by URI (only for local entity URLs)
+        if ( empty( $posts ) ) {
+
+            $this->log->debug( "Finding post by $uri..." );
+            $postid = url_to_postid( $uri );
+            if ( $postid !== 0 ) {
+                $this->log->trace( "Found post $postid by URL" );
+
+                return get_post( $postid );
+            }
+
+        }
+
+        // Return null if no post is found.
+        if ( empty( $posts ) ) {
+            $this->log->warn( "No post for URI $uri." );
+
+            return null;
+        }
+
+        // Return the found post.
+        return current( $posts );
+    }
+
+    /**
+     * Determines whether a given uri is an internal uri or not.
+     *
+     * @param string $uri An uri.
+     *
+     * @return true if the uri internal to the current dataset otherwise false.
+     * @since 3.16.3
+     *
+     */
+    public function is_internal( $uri ) {
+
+        return ( 0 === strrpos( $uri, (string) $this->configuration_service->get_dataset_uri() ) );
+    }
+
+    /**
+     * Hook to `rest_post_dispatch` to alter the response and add the `wl_entity_url` post meta as `wl:entity_url`.
+     *
+     * We're using this filter instead of the well known `register_meta` / `register_rest_field` because we still need
+     * to provide full compatibility with WordPress 4.4+.
+     *
+     * @param WP_HTTP_Response $result Result to send to the client. Usually a WP_REST_Response.
+     *
+     * @return WP_HTTP_Response The result to send to the client.
+     *
+     * @since 3.23.0
+     */
+    public function rest_post_dispatch( $result ) {
+
+        // Get a reference to the actual data.
+        $data = &$result->data;
+
+        // Bail out if we don't have the required parameters, or if the type is not a valid entity.
+        if ( ! is_array( $data ) || ! isset( $data['id'] ) || ! isset( $data['type'] )
+             || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $data['type'] ) ) {
+            return $result;
+        }
+
+        // Add the `wl:entity_url`.
+        $data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri( $data['id'] );
+
+        return $result;
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -61,14 +61,14 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->configuration_service = $configuration_service;
 
 		// Add a filter to the `rest_post_dispatch` filter to add the wl_entity_url meta as `wl:entity_url`.
-		add_filter( 'rest_post_dispatch', array( $this, 'rest_post_dispatch' ) );
+		add_filter('rest_post_dispatch', array($this, 'rest_post_dispatch'));
 
 		self::$instance = $this;
 
@@ -96,25 +96,25 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function preload_uris( $uris ) {
+	public function preload_uris($uris) {
 
 		// Bail out if there are no URIs.
-		if ( 0 === count( $uris ) ) {
+		if (0 === count($uris)) {
 			return;
 		}
 
-		$this->log->trace( 'Preloading ' . count( $uris ) . ' URI(s)...' );
+		$this->log->trace('Preloading '.count($uris).' URI(s)...');
 
 		$that          = $this;
-		$external_uris = array_filter( $uris, function ( $item ) use ( $that ) {
-			return ! $that->is_internal( $item );
+		$external_uris = array_filter($uris, function($item) use ($that) {
+			return ! $that->is_internal($item);
 		} );
 
 		$query_args = array(
 			// See https://github.com/insideout10/wordlift-plugin/issues/654.
 			'ignore_sticky_posts' => 1,
 			'cache_results'       => false,
-			'numberposts'         => - 1,
+			'numberposts'         => -1,
 			'post_status'         => 'any',
 			'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
 			'meta_query'          => array(
@@ -130,7 +130,7 @@ 
 		// performed also looking at sameAs values.
 		//
 		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( 0 < count( $external_uris ) ) {
+		if (0 < count($external_uris)) {
 
 			$query_args['meta_query']['relation'] = 'OR';
 			$query_args['meta_query'][]           = array(
@@ -142,25 +142,25 @@ 
 		}
 
 		// Get the posts.
-		$posts = get_posts( $query_args );
+		$posts = get_posts($query_args);
 
 		// Populate the array. We reinitialize the array on purpose because
 		// we don't want these data to long live.
-		$this->uri_to_post = array_reduce( $posts, function ( $carry, $item ) use ( $that ) {
+		$this->uri_to_post = array_reduce($posts, function($carry, $item) use ($that) {
 			$uris = array_merge(
-				get_post_meta( $item->ID, WL_ENTITY_URL_META_NAME ),
-				get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_SAME_AS )
+				get_post_meta($item->ID, WL_ENTITY_URL_META_NAME),
+				get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_SAME_AS)
 			);
 
 			return $carry
 			       // Get the URI related to the post and fill them with the item id.
-			       + array_fill_keys( $uris, $item );
-		}, array() );
+			       + array_fill_keys($uris, $item);
+		}, array());
 
 		// Add the not found URIs.
-		$this->uri_to_post += array_fill_keys( $uris, null );
+		$this->uri_to_post += array_fill_keys($uris, null);
 
-		$this->log->debug( count( $this->uri_to_post ) . " URI(s) preloaded." );
+		$this->log->debug(count($this->uri_to_post)." URI(s) preloaded.");
 
 	}
 
@@ -184,16 +184,16 @@ 
 	 * @since 3.2.0
 	 *
 	 */
-	public function get_entity( $uri ) {
+	public function get_entity($uri) {
 
-		$this->log->trace( "Getting an entity post for URI $uri..." );
+		$this->log->trace("Getting an entity post for URI $uri...");
 
 		// Check if we've been provided with a value otherwise return null.
-		if ( empty( $uri ) ) {
+		if (empty($uri)) {
 			return null;
 		}
 
-		$this->log->debug( "Querying post for $uri..." );
+		$this->log->debug("Querying post for $uri...");
 
 		$query_args = array(
 			// See https://github.com/insideout10/wordlift-plugin/issues/654.
@@ -214,7 +214,7 @@ 
 		// performed also looking at sameAs values.
 		//
 		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( ! $this->is_internal( $uri ) ) {
+		if ( ! $this->is_internal($uri)) {
 
 			$query_args['meta_query']['relation'] = 'OR';
 			$query_args['meta_query'][]           = array(
@@ -224,30 +224,30 @@ 
 			);
 		}
 
-		$posts = get_posts( $query_args );
+		$posts = get_posts($query_args);
 
 		// Attempt to find post by URI (only for local entity URLs)
-		if ( empty( $posts ) ) {
+		if (empty($posts)) {
 
-			$this->log->debug( "Finding post by $uri..." );
-			$postid = url_to_postid( $uri );
-			if ( $postid !== 0 ) {
-				$this->log->trace( "Found post $postid by URL" );
+			$this->log->debug("Finding post by $uri...");
+			$postid = url_to_postid($uri);
+			if ($postid !== 0) {
+				$this->log->trace("Found post $postid by URL");
 
-				return get_post( $postid );
+				return get_post($postid);
 			}
 
 		}
 
 		// Return null if no post is found.
-		if ( empty( $posts ) ) {
-			$this->log->warn( "No post for URI $uri." );
+		if (empty($posts)) {
+			$this->log->warn("No post for URI $uri.");
 
 			return null;
 		}
 
 		// Return the found post.
-		return current( $posts );
+		return current($posts);
 	}
 
 	/**
@@ -259,9 +259,9 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function is_internal( $uri ) {
+	public function is_internal($uri) {
 
-		return ( 0 === strrpos( $uri, (string) $this->configuration_service->get_dataset_uri() ) );
+		return (0 === strrpos($uri, (string) $this->configuration_service->get_dataset_uri()));
 	}
 
 	/**
@@ -276,19 +276,19 @@ 
 	 *
 	 * @since 3.23.0
 	 */
-	public function rest_post_dispatch( $result ) {
+	public function rest_post_dispatch($result) {
 
 		// Get a reference to the actual data.
 		$data = &$result->data;
 
 		// Bail out if we don't have the required parameters, or if the type is not a valid entity.
-		if ( ! is_array( $data ) || ! isset( $data['id'] ) || ! isset( $data['type'] )
-		     || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $data['type'] ) ) {
+		if ( ! is_array($data) || ! isset($data['id']) || ! isset($data['type'])
+		     || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type($data['type'])) {
 			return $result;
 		}
 
 		// Add the `wl:entity_url`.
-		$data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri( $data['id'] );
+		$data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri($data['id']);
 
 		return $result;
 	}

src/vendor/composer/InstalledVersions.php

Indentation +18 added lines, -18 removed lines

@@ -12,8 +12,8 @@ 
 class InstalledVersions
 {
 private static $installed = array (
-  'root' => 
-  array (
+    'root' => 
+    array (
     'pretty_version' => 'dev-develop',
     'version' => 'dev-develop',
     'aliases' => 
@@ -21,28 +21,28 @@ 
     ),
     'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
     'name' => '__root__',
-  ),
-  'versions' => 
-  array (
+    ),
+    'versions' => 
+    array (
     '__root__' => 
     array (
-      'pretty_version' => 'dev-develop',
-      'version' => 'dev-develop',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
+        'pretty_version' => 'dev-develop',
+        'version' => 'dev-develop',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
     ),
     'deliciousbrains/wp-background-processing' => 
     array (
-      'pretty_version' => '1.0.2',
-      'version' => '1.0.2.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '2cbee1abd1b49e1133cd8f611df4d4fc5a8b9800',
+        'pretty_version' => '1.0.2',
+        'version' => '1.0.2.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '2cbee1abd1b49e1133cd8f611df4d4fc5a8b9800',
+    ),
     ),
-  ),
 );
 
 

Spacing +19 added lines, -19 removed lines

@@ -11,34 +11,34 @@ 
 
 class InstalledVersions
 {
-private static $installed = array (
+private static $installed = array(
   'root' => 
-  array (
+  array(
     'pretty_version' => 'dev-develop',
     'version' => 'dev-develop',
     'aliases' => 
-    array (
+    array(
     ),
     'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
     'name' => '__root__',
   ),
   'versions' => 
-  array (
+  array(
     '__root__' => 
-    array (
+    array(
       'pretty_version' => 'dev-develop',
       'version' => 'dev-develop',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
     ),
     'deliciousbrains/wp-background-processing' => 
-    array (
+    array(
       'pretty_version' => '1.0.2',
       'version' => '1.0.2.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '2cbee1abd1b49e1133cd8f611df4d4fc5a8b9800',
     ),
@@ -101,8 +101,8 @@ 
 
 public static function getVersionRanges($packageName)
 {
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+if ( ! isset(self::$installed['versions'][$packageName])) {
+throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
 }
 
 $ranges = array();
@@ -128,11 +128,11 @@ 
 
 public static function getVersion($packageName)
 {
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+if ( ! isset(self::$installed['versions'][$packageName])) {
+throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
 }
 
-if (!isset(self::$installed['versions'][$packageName]['version'])) {
+if ( ! isset(self::$installed['versions'][$packageName]['version'])) {
 return null;
 }
 
@@ -145,11 +145,11 @@ 
 
 public static function getPrettyVersion($packageName)
 {
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+if ( ! isset(self::$installed['versions'][$packageName])) {
+throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
 }
 
-if (!isset(self::$installed['versions'][$packageName]['pretty_version'])) {
+if ( ! isset(self::$installed['versions'][$packageName]['pretty_version'])) {
 return null;
 }
 
@@ -162,11 +162,11 @@ 
 
 public static function getReference($packageName)
 {
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+if ( ! isset(self::$installed['versions'][$packageName])) {
+throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
 }
 
-if (!isset(self::$installed['versions'][$packageName]['reference'])) {
+if ( ! isset(self::$installed['versions'][$packageName]['reference'])) {
 return null;
 }
 

src/vendor/composer/installed.php

Indentation +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php return array (
-  'root' => 
-  array (
+    'root' => 
+    array (
     'pretty_version' => 'dev-develop',
     'version' => 'dev-develop',
     'aliases' => 
@@ -8,26 +8,26 @@ 
     ),
     'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
     'name' => '__root__',
-  ),
-  'versions' => 
-  array (
+    ),
+    'versions' => 
+    array (
     '__root__' => 
     array (
-      'pretty_version' => 'dev-develop',
-      'version' => 'dev-develop',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
+        'pretty_version' => 'dev-develop',
+        'version' => 'dev-develop',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
     ),
     'deliciousbrains/wp-background-processing' => 
     array (
-      'pretty_version' => '1.0.2',
-      'version' => '1.0.2.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '2cbee1abd1b49e1133cd8f611df4d4fc5a8b9800',
+        'pretty_version' => '1.0.2',
+        'version' => '1.0.2.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '2cbee1abd1b49e1133cd8f611df4d4fc5a8b9800',
+    ),
     ),
-  ),
 );

Spacing +8 added lines, -8 removed lines

@@ -1,31 +1,31 @@
-<?php return array (
+<?php return array(
   'root' => 
-  array (
+  array(
     'pretty_version' => 'dev-develop',
     'version' => 'dev-develop',
     'aliases' => 
-    array (
+    array(
     ),
     'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
     'name' => '__root__',
   ),
   'versions' => 
-  array (
+  array(
     '__root__' => 
-    array (
+    array(
       'pretty_version' => 'dev-develop',
       'version' => 'dev-develop',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '795b4ba4abfb8776e40f340700694718875f006f',
     ),
     'deliciousbrains/wp-background-processing' => 
-    array (
+    array(
       'pretty_version' => '1.0.2',
       'version' => '1.0.2.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '2cbee1abd1b49e1133cd8f611df4d4fc5a8b9800',
     ),

src/includes/class-wordlift-linked-data-service.php

Indentation +327 added lines, -327 removed lines

@@ -18,336 +18,336 @@
  */
 class Wordlift_Linked_Data_Service {
 
-	//<editor-fold desc="## FIELDS">
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The {@link Wordlift_Schema_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 */
-	private $schema_service;
-
-	/**
-	 * The {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
-	 */
-	private $sparql_service;
-
-	/**
-	 * The {@link Wordlift_Linked_Data_Service} singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Linked_Data_Service $instance The {@link Wordlift_Linked_Data_Service} singleton instance.
-	 */
-	private static $instance;
-	//</editor-fold>
-
-	/**
-	 * Create a {@link Wordlift_Linked_Data_Service} instance.
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 */
-	public function __construct( $entity_service, $entity_type_service, $schema_service, $sparql_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Linked_Data_Service' );
-
-		$this->entity_service      = $entity_service;
-		$this->entity_type_service = $entity_type_service;
-		$this->schema_service      = $schema_service;
-		$this->sparql_service      = $sparql_service;
-
-		/*
+    //<editor-fold desc="## FIELDS">
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The {@link Wordlift_Schema_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     */
+    private $schema_service;
+
+    /**
+     * The {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
+     */
+    private $sparql_service;
+
+    /**
+     * The {@link Wordlift_Linked_Data_Service} singleton instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Linked_Data_Service $instance The {@link Wordlift_Linked_Data_Service} singleton instance.
+     */
+    private static $instance;
+    //</editor-fold>
+
+    /**
+     * Create a {@link Wordlift_Linked_Data_Service} instance.
+     *
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     * @param \Wordlift_Sparql_Service $sparql_service The {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since 3.15.0
+     *
+     */
+    public function __construct( $entity_service, $entity_type_service, $schema_service, $sparql_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Linked_Data_Service' );
+
+        $this->entity_service      = $entity_service;
+        $this->entity_type_service = $entity_type_service;
+        $this->schema_service      = $schema_service;
+        $this->sparql_service      = $sparql_service;
+
+        /*
 		 * Allow callers to call the `push` and `remove` methods using WordPress' hooks.
 		 *
 		 * @since 3.27.6
 		 */
-		add_action( 'wl_legacy_linked_data__push', array( $this, 'push' ) );
-		add_action( 'wl_legacy_linked_data__remove', array( $this, 'remove' ) );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of {@link Wordlift_Linked_Data_Service}.
-	 *
-	 * @return Wordlift_Linked_Data_Service The singleton instance of <a href='psi_element://Wordlift_Linked_Data_Service'>Wordlift_Linked_Data_Service</a>.
-	 * @since 3.15.0
-	 *
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	//<editor-fold desc="## FUNCTIONS">
-
-	/**
-	 * Push a {@link WP_Post} to the Linked Data store.
-	 *
-	 * If the {@link WP_Post} is an entity and it's not of the `Article` type,
-	 * then it is pushed to the remote Linked Data store.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @since 3.15.0
-	 *
-	 */
-	public function push( $post_id ) {
-
-		$this->log->debug( "Pushing post $post_id..." );
-
-		// @since 3.18.0 we don't check anymore if the post is an entity, i.e.
-		// we removed the following:
-		//		if ( ! $this->entity_service->is_entity( $post_id ) ) {
-		//			$this->log->debug( "Post $post_id is not an entity." );
-		//
-		//			return;
-		//		}
-
-		// Get the post and push it to the Linked Data store.
-		$this->do_push( $post_id );
-
-		// Reindex the triple store if buffering is turned off.
-		if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
-			wordlift_reindex_triple_store();
-		}
-
-	}
-
-	/**
-	 * Push an entity to the Linked Data store.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @since 3.15.0
-	 *
-	 */
-	private function do_push( $post_id ) {
-		$this->log->debug( "Doing post $post_id push..." );
-
-		// Get the post.
-		$post = get_post( $post_id );
-
-		// Bail out if the post isn't found.
-		if ( null === $post ) {
-			$this->log->warn( "Post $post_id not found." );
-
-			return;
-		}
-
-		// Bail out if the post isn't published.
-		if ( 'publish' !== $post->post_status ) {
-			$this->log->info( "Post $post_id not published." );
-
-			return;
-		}
-
-		// Bail out if the URI isn't valid.
-		if ( ! $this->has_valid_uri( $post_id ) ) {
-			$this->log->warn( "Post $post_id URI invalid." );
-
-			return;
-		}
-
-		// First remove the post data.
-		$this->remove( $post_id );
-
-		// Then execute the insert query.
-		$this->insert( $post_id );
-	}
-
-	/**
-	 * Check if an entity's {@link WP_Post} has a valid URI.
-	 *
-	 * @param int $post_id The entity's {@link WP_Post}'s id.
-	 *
-	 * @return bool True if the URI is valid otherwise false.
-	 * @since 3.15.0
-	 *
-	 */
-	private function has_valid_uri( $post_id ) {
-
-		// Get the entity's URI.
-		$uri = $this->entity_service->get_uri( $post_id );
-
-		// If the URI isn't found, return false.
-		if ( null === $uri ) {
-			return false;
-		}
-
-		// If the URI ends with a trailing slash, return false.
-		if ( '/' === substr( $uri, - 1 ) ) {
-			return false;
-		}
-
-		// URI is valid.
-		return true;
-	}
-
-	/**
-	 * Remove the specified {@link WP_Post} from the Linked Data.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @since 3.18.0
-	 *
-	 */
-	public function remove( $post_id ) {
-		$delete_query = '';
-
-		// Get the delete statements.
-		$triples = $this->get_delete_triples( $post_id );
-
-		// Loop through all triples and add the statement to delete query.
-		foreach ( $triples as $item ) {
-			$delete_query .= "DELETE { $item } WHERE { $item }; \n";
-		}
-
-		$this->log->trace( "Delete Query generated [ $delete_query ]." );
-
-		$this->sparql_service->execute( $delete_query );
-	}
-
-	/**
-	 * Insert the specific {@link WP_Post} to Linked Data store.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @since 3.18.0
-	 *
-	 */
-	private function insert( $post_id ) {
-		// Get the insert statements.
-		$insert_triples = $this->get_insert_triples( $post_id );
-
-		// Convert all statements to single string.
-		$insert_query_body = implode( "\n", $insert_triples );
-
-		// Build the insert query.
-		$insert_query = "INSERT DATA { $insert_query_body };";
-
-		$this->log->trace( "Insert Query generated [ $insert_query ]." );
-
-		$this->sparql_service->execute( $insert_query );
-	}
-
-	/**
-	 * Get the delete statements.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return array An array of delete statements.
-	 * @since 3.18.0
-	 *
-	 */
-	private function get_delete_triples( $post_id ) {
-		$delete_triples = array();
-
-		// Loop through all renditions and get the triples.
-		foreach ( $this->schema_service->get_renditions() as $rendition ) {
-			// Push the rendition delete triple to $delete_triples.
-			$delete_triples = array_merge(
-				$delete_triples,
-				(array) $rendition->get_delete_triples( $post_id )
-			);
-		}
-
-		/**
-		 * Filter: 'wl_delete_triples' - Allow third parties to hook and add additional delete triples.
-		 *
-		 * @param array $delete_triples Delete triples.
-		 * @param int $post_id The current post ID.
-		 *
-		 * @since 3.18.0
-		 *
-		 */
-		return apply_filters( 'wl_delete_triples', array_unique( $delete_triples ), $post_id );
-	}
-
-	/**
-	 * Get the SPARQL insert triples ( ?s ?p ?o ) for the specified {@link WP_Post}.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return array An array of insert triples.
-	 * @since 3.15.0
-	 *
-	 */
-	private function get_insert_triples( $post_id ) {
-
-		// Get the entity type.
-		$type = $this->entity_type_service->get( $post_id );
-
-		// Get the `linked_data` parameter.
-		$properties = $type['linked_data'];
-
-		// Accumulate the triples.
-		$triples = array();
-
-		/** @var Wordlift_Default_Sparql_Tuple_Rendition $property A {@link Wordlift_Sparql_Tuple_Rendition} instance. */
-		foreach ( $properties as $property ) {
-			foreach ( $property->get_insert_triples( $post_id ) as $triple ) {
-				$triples[] = $triple;
-			}
-		}
-
-		$this->log->trace( count( $properties ) . ' properties and ' . count( $triples ) . " triples found for post $post_id." );
-
-		/**
-		 * Get the INSERT triples properties.
-		 *
-		 * The `wl_insert_triples` filter allows 3rd parties to extend
-		 * the list of triples for SPARQL INSERT statements.
-		 *
-		 * @param array $linked_data A {@link Wordlift_Sparql_Tuple_Rendition} instances.
-		 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-		 * @param int $post_id The {@link WP_Post}'s id.
-		 *
-		 * @since 3.18.0 The hook has been renamed from `wl_insert_tuples_properties` to `wl_insert_triples`.
-		 *
-		 * @since 3.17.0
-		 */
-		return apply_filters( 'wl_insert_triples', $triples, $this->entity_service, $post_id );
-	}
-	//</editor-fold>
+        add_action( 'wl_legacy_linked_data__push', array( $this, 'push' ) );
+        add_action( 'wl_legacy_linked_data__remove', array( $this, 'remove' ) );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of {@link Wordlift_Linked_Data_Service}.
+     *
+     * @return Wordlift_Linked_Data_Service The singleton instance of <a href='psi_element://Wordlift_Linked_Data_Service'>Wordlift_Linked_Data_Service</a>.
+     * @since 3.15.0
+     *
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    //<editor-fold desc="## FUNCTIONS">
+
+    /**
+     * Push a {@link WP_Post} to the Linked Data store.
+     *
+     * If the {@link WP_Post} is an entity and it's not of the `Article` type,
+     * then it is pushed to the remote Linked Data store.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @since 3.15.0
+     *
+     */
+    public function push( $post_id ) {
+
+        $this->log->debug( "Pushing post $post_id..." );
+
+        // @since 3.18.0 we don't check anymore if the post is an entity, i.e.
+        // we removed the following:
+        //		if ( ! $this->entity_service->is_entity( $post_id ) ) {
+        //			$this->log->debug( "Post $post_id is not an entity." );
+        //
+        //			return;
+        //		}
+
+        // Get the post and push it to the Linked Data store.
+        $this->do_push( $post_id );
+
+        // Reindex the triple store if buffering is turned off.
+        if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+            wordlift_reindex_triple_store();
+        }
+
+    }
+
+    /**
+     * Push an entity to the Linked Data store.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @since 3.15.0
+     *
+     */
+    private function do_push( $post_id ) {
+        $this->log->debug( "Doing post $post_id push..." );
+
+        // Get the post.
+        $post = get_post( $post_id );
+
+        // Bail out if the post isn't found.
+        if ( null === $post ) {
+            $this->log->warn( "Post $post_id not found." );
+
+            return;
+        }
+
+        // Bail out if the post isn't published.
+        if ( 'publish' !== $post->post_status ) {
+            $this->log->info( "Post $post_id not published." );
+
+            return;
+        }
+
+        // Bail out if the URI isn't valid.
+        if ( ! $this->has_valid_uri( $post_id ) ) {
+            $this->log->warn( "Post $post_id URI invalid." );
+
+            return;
+        }
+
+        // First remove the post data.
+        $this->remove( $post_id );
+
+        // Then execute the insert query.
+        $this->insert( $post_id );
+    }
+
+    /**
+     * Check if an entity's {@link WP_Post} has a valid URI.
+     *
+     * @param int $post_id The entity's {@link WP_Post}'s id.
+     *
+     * @return bool True if the URI is valid otherwise false.
+     * @since 3.15.0
+     *
+     */
+    private function has_valid_uri( $post_id ) {
+
+        // Get the entity's URI.
+        $uri = $this->entity_service->get_uri( $post_id );
+
+        // If the URI isn't found, return false.
+        if ( null === $uri ) {
+            return false;
+        }
+
+        // If the URI ends with a trailing slash, return false.
+        if ( '/' === substr( $uri, - 1 ) ) {
+            return false;
+        }
+
+        // URI is valid.
+        return true;
+    }
+
+    /**
+     * Remove the specified {@link WP_Post} from the Linked Data.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @since 3.18.0
+     *
+     */
+    public function remove( $post_id ) {
+        $delete_query = '';
+
+        // Get the delete statements.
+        $triples = $this->get_delete_triples( $post_id );
+
+        // Loop through all triples and add the statement to delete query.
+        foreach ( $triples as $item ) {
+            $delete_query .= "DELETE { $item } WHERE { $item }; \n";
+        }
+
+        $this->log->trace( "Delete Query generated [ $delete_query ]." );
+
+        $this->sparql_service->execute( $delete_query );
+    }
+
+    /**
+     * Insert the specific {@link WP_Post} to Linked Data store.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @since 3.18.0
+     *
+     */
+    private function insert( $post_id ) {
+        // Get the insert statements.
+        $insert_triples = $this->get_insert_triples( $post_id );
+
+        // Convert all statements to single string.
+        $insert_query_body = implode( "\n", $insert_triples );
+
+        // Build the insert query.
+        $insert_query = "INSERT DATA { $insert_query_body };";
+
+        $this->log->trace( "Insert Query generated [ $insert_query ]." );
+
+        $this->sparql_service->execute( $insert_query );
+    }
+
+    /**
+     * Get the delete statements.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return array An array of delete statements.
+     * @since 3.18.0
+     *
+     */
+    private function get_delete_triples( $post_id ) {
+        $delete_triples = array();
+
+        // Loop through all renditions and get the triples.
+        foreach ( $this->schema_service->get_renditions() as $rendition ) {
+            // Push the rendition delete triple to $delete_triples.
+            $delete_triples = array_merge(
+                $delete_triples,
+                (array) $rendition->get_delete_triples( $post_id )
+            );
+        }
+
+        /**
+         * Filter: 'wl_delete_triples' - Allow third parties to hook and add additional delete triples.
+         *
+         * @param array $delete_triples Delete triples.
+         * @param int $post_id The current post ID.
+         *
+         * @since 3.18.0
+         *
+         */
+        return apply_filters( 'wl_delete_triples', array_unique( $delete_triples ), $post_id );
+    }
+
+    /**
+     * Get the SPARQL insert triples ( ?s ?p ?o ) for the specified {@link WP_Post}.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return array An array of insert triples.
+     * @since 3.15.0
+     *
+     */
+    private function get_insert_triples( $post_id ) {
+
+        // Get the entity type.
+        $type = $this->entity_type_service->get( $post_id );
+
+        // Get the `linked_data` parameter.
+        $properties = $type['linked_data'];
+
+        // Accumulate the triples.
+        $triples = array();
+
+        /** @var Wordlift_Default_Sparql_Tuple_Rendition $property A {@link Wordlift_Sparql_Tuple_Rendition} instance. */
+        foreach ( $properties as $property ) {
+            foreach ( $property->get_insert_triples( $post_id ) as $triple ) {
+                $triples[] = $triple;
+            }
+        }
+
+        $this->log->trace( count( $properties ) . ' properties and ' . count( $triples ) . " triples found for post $post_id." );
+
+        /**
+         * Get the INSERT triples properties.
+         *
+         * The `wl_insert_triples` filter allows 3rd parties to extend
+         * the list of triples for SPARQL INSERT statements.
+         *
+         * @param array $linked_data A {@link Wordlift_Sparql_Tuple_Rendition} instances.
+         * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+         * @param int $post_id The {@link WP_Post}'s id.
+         *
+         * @since 3.18.0 The hook has been renamed from `wl_insert_tuples_properties` to `wl_insert_triples`.
+         *
+         * @since 3.17.0
+         */
+        return apply_filters( 'wl_insert_triples', $triples, $this->entity_service, $post_id );
+    }
+    //</editor-fold>
 
 }

Spacing +43 added lines, -43 removed lines

@@ -85,9 +85,9 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public function __construct( $entity_service, $entity_type_service, $schema_service, $sparql_service ) {
+	public function __construct($entity_service, $entity_type_service, $schema_service, $sparql_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Linked_Data_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Linked_Data_Service');
 
 		$this->entity_service      = $entity_service;
 		$this->entity_type_service = $entity_type_service;
@@ -99,8 +99,8 @@ 
 		 *
 		 * @since 3.27.6
 		 */
-		add_action( 'wl_legacy_linked_data__push', array( $this, 'push' ) );
-		add_action( 'wl_legacy_linked_data__remove', array( $this, 'remove' ) );
+		add_action('wl_legacy_linked_data__push', array($this, 'push'));
+		add_action('wl_legacy_linked_data__remove', array($this, 'remove'));
 
 		self::$instance = $this;
 
@@ -131,9 +131,9 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public function push( $post_id ) {
+	public function push($post_id) {
 
-		$this->log->debug( "Pushing post $post_id..." );
+		$this->log->debug("Pushing post $post_id...");
 
 		// @since 3.18.0 we don't check anymore if the post is an entity, i.e.
 		// we removed the following:
@@ -144,10 +144,10 @@ 
 		//		}
 
 		// Get the post and push it to the Linked Data store.
-		$this->do_push( $post_id );
+		$this->do_push($post_id);
 
 		// Reindex the triple store if buffering is turned off.
-		if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+		if (false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING) {
 			wordlift_reindex_triple_store();
 		}
 
@@ -161,38 +161,38 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	private function do_push( $post_id ) {
-		$this->log->debug( "Doing post $post_id push..." );
+	private function do_push($post_id) {
+		$this->log->debug("Doing post $post_id push...");
 
 		// Get the post.
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
 		// Bail out if the post isn't found.
-		if ( null === $post ) {
-			$this->log->warn( "Post $post_id not found." );
+		if (null === $post) {
+			$this->log->warn("Post $post_id not found.");
 
 			return;
 		}
 
 		// Bail out if the post isn't published.
-		if ( 'publish' !== $post->post_status ) {
-			$this->log->info( "Post $post_id not published." );
+		if ('publish' !== $post->post_status) {
+			$this->log->info("Post $post_id not published.");
 
 			return;
 		}
 
 		// Bail out if the URI isn't valid.
-		if ( ! $this->has_valid_uri( $post_id ) ) {
-			$this->log->warn( "Post $post_id URI invalid." );
+		if ( ! $this->has_valid_uri($post_id)) {
+			$this->log->warn("Post $post_id URI invalid.");
 
 			return;
 		}
 
 		// First remove the post data.
-		$this->remove( $post_id );
+		$this->remove($post_id);
 
 		// Then execute the insert query.
-		$this->insert( $post_id );
+		$this->insert($post_id);
 	}
 
 	/**
@@ -204,18 +204,18 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	private function has_valid_uri( $post_id ) {
+	private function has_valid_uri($post_id) {
 
 		// Get the entity's URI.
-		$uri = $this->entity_service->get_uri( $post_id );
+		$uri = $this->entity_service->get_uri($post_id);
 
 		// If the URI isn't found, return false.
-		if ( null === $uri ) {
+		if (null === $uri) {
 			return false;
 		}
 
 		// If the URI ends with a trailing slash, return false.
-		if ( '/' === substr( $uri, - 1 ) ) {
+		if ('/' === substr($uri, - 1)) {
 			return false;
 		}
 
@@ -231,20 +231,20 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	public function remove( $post_id ) {
+	public function remove($post_id) {
 		$delete_query = '';
 
 		// Get the delete statements.
-		$triples = $this->get_delete_triples( $post_id );
+		$triples = $this->get_delete_triples($post_id);
 
 		// Loop through all triples and add the statement to delete query.
-		foreach ( $triples as $item ) {
+		foreach ($triples as $item) {
 			$delete_query .= "DELETE { $item } WHERE { $item }; \n";
 		}
 
-		$this->log->trace( "Delete Query generated [ $delete_query ]." );
+		$this->log->trace("Delete Query generated [ $delete_query ].");
 
-		$this->sparql_service->execute( $delete_query );
+		$this->sparql_service->execute($delete_query);
 	}
 
 	/**
@@ -255,19 +255,19 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	private function insert( $post_id ) {
+	private function insert($post_id) {
 		// Get the insert statements.
-		$insert_triples = $this->get_insert_triples( $post_id );
+		$insert_triples = $this->get_insert_triples($post_id);
 
 		// Convert all statements to single string.
-		$insert_query_body = implode( "\n", $insert_triples );
+		$insert_query_body = implode("\n", $insert_triples);
 
 		// Build the insert query.
 		$insert_query = "INSERT DATA { $insert_query_body };";
 
-		$this->log->trace( "Insert Query generated [ $insert_query ]." );
+		$this->log->trace("Insert Query generated [ $insert_query ].");
 
-		$this->sparql_service->execute( $insert_query );
+		$this->sparql_service->execute($insert_query);
 	}
 
 	/**
@@ -279,15 +279,15 @@ 
 	 * @since 3.18.0
 	 *
 	 */
-	private function get_delete_triples( $post_id ) {
+	private function get_delete_triples($post_id) {
 		$delete_triples = array();
 
 		// Loop through all renditions and get the triples.
-		foreach ( $this->schema_service->get_renditions() as $rendition ) {
+		foreach ($this->schema_service->get_renditions() as $rendition) {
 			// Push the rendition delete triple to $delete_triples.
 			$delete_triples = array_merge(
 				$delete_triples,
-				(array) $rendition->get_delete_triples( $post_id )
+				(array) $rendition->get_delete_triples($post_id)
 			);
 		}
 
@@ -300,7 +300,7 @@ 
 		 * @since 3.18.0
 		 *
 		 */
-		return apply_filters( 'wl_delete_triples', array_unique( $delete_triples ), $post_id );
+		return apply_filters('wl_delete_triples', array_unique($delete_triples), $post_id);
 	}
 
 	/**
@@ -312,10 +312,10 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	private function get_insert_triples( $post_id ) {
+	private function get_insert_triples($post_id) {
 
 		// Get the entity type.
-		$type = $this->entity_type_service->get( $post_id );
+		$type = $this->entity_type_service->get($post_id);
 
 		// Get the `linked_data` parameter.
 		$properties = $type['linked_data'];
@@ -324,13 +324,13 @@ 
 		$triples = array();
 
 		/** @var Wordlift_Default_Sparql_Tuple_Rendition $property A {@link Wordlift_Sparql_Tuple_Rendition} instance. */
-		foreach ( $properties as $property ) {
-			foreach ( $property->get_insert_triples( $post_id ) as $triple ) {
+		foreach ($properties as $property) {
+			foreach ($property->get_insert_triples($post_id) as $triple) {
 				$triples[] = $triple;
 			}
 		}
 
-		$this->log->trace( count( $properties ) . ' properties and ' . count( $triples ) . " triples found for post $post_id." );
+		$this->log->trace(count($properties).' properties and '.count($triples)." triples found for post $post_id.");
 
 		/**
 		 * Get the INSERT triples properties.
@@ -346,7 +346,7 @@ 
 		 *
 		 * @since 3.17.0
 		 */
-		return apply_filters( 'wl_insert_triples', $triples, $this->entity_service, $post_id );
+		return apply_filters('wl_insert_triples', $triples, $this->entity_service, $post_id);
 	}
 	//</editor-fold>
 

src/wordlift.php

Indentation +216 added lines, -216 removed lines

@@ -48,16 +48,16 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 if ( apply_filters( 'wl_features__enable__dataset', false ) ) {
-	/*
+    /*
 	 * Add Composer Autoload with Mozart support.
 	 *
 	 * @since 3.27.6
 	 */
-	require __DIR__ . '/vendor/autoload.php';
+    require __DIR__ . '/vendor/autoload.php';
 }
 
 // Include WordLift constants.
@@ -78,7 +78,7 @@ 
  */
 function wl_write_log( $log ) {
 
-	Wordlift_Log_Service::get_instance()->debug( $log );
+    Wordlift_Log_Service::get_instance()->debug( $log );
 
 }
 
@@ -95,7 +95,7 @@ 
  */
 function wl_write_log_hide_key( $text ) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+    return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
 }
 
 /**
@@ -103,21 +103,21 @@ 
  * see http://vip.wordpress.com/documentation/register-additional-html-attributes-for-tinymce-and-wp-kses/
  */
 function wordlift_allowed_post_tags() {
-	global $allowedposttags;
-
-	$tags           = array( 'span' );
-	$new_attributes = array(
-		'itemscope' => array(),
-		'itemtype'  => array(),
-		'itemprop'  => array(),
-		'itemid'    => array(),
-	);
-
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
-		}
-	}
+    global $allowedposttags;
+
+    $tags           = array( 'span' );
+    $new_attributes = array(
+        'itemscope' => array(),
+        'itemtype'  => array(),
+        'itemprop'  => array(),
+        'itemid'    => array(),
+    );
+
+    foreach ( $tags as $tag ) {
+        if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
+            $allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+        }
+    }
 }
 
 // add allowed post tags.
@@ -128,18 +128,18 @@ 
  */
 function wordlift_admin_enqueue_scripts() {
 
-	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+    // Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
+    wp_enqueue_script( 'wpdialogs' );
+    wp_enqueue_style( 'wp-jquery-ui-dialog' );
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+    wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
+    wp_enqueue_script( 'jquery-ui-autocomplete' );
 
-	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
-	}
+    // Disable auto-save for custom entity posts only
+    if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
+        wp_dequeue_script( 'autosave' );
+    }
 
 }
 
@@ -155,18 +155,18 @@ 
  */
 function wordlift_allowed_html( $allowedtags, $context ) {
 
-	if ( 'post' !== $context ) {
-		return $allowedtags;
-	}
-
-	return array_merge_recursive( $allowedtags, array(
-		'span' => array(
-			'itemscope' => true,
-			'itemtype'  => true,
-			'itemid'    => true,
-			'itemprop'  => true,
-		),
-	) );
+    if ( 'post' !== $context ) {
+        return $allowedtags;
+    }
+
+    return array_merge_recursive( $allowedtags, array(
+        'span' => array(
+            'itemscope' => true,
+            'itemtype'  => true,
+            'itemid'    => true,
+            'itemprop'  => true,
+        ),
+    ) );
 }
 
 add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
@@ -180,16 +180,16 @@ 
  */
 function wl_get_coordinates( $post_id ) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+    $latitude  = wl_schema_get_value( $post_id, 'latitude' );
+    $longitude = wl_schema_get_value( $post_id, 'longitude' );
 
-	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
-	// place on the globe:"The zero/zero point of this system is located in the
-	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
-	);
+    // DO NOT set latitude/longitude to 0/0 as default values. It's a specific
+    // place on the globe:"The zero/zero point of this system is located in the
+    // Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
+    return array(
+        'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
+        'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+    );
 }
 
 /**
@@ -203,9 +203,9 @@ 
  */
 function wl_get_image_urls( $post_id ) {
 
-	return Wordlift_Storage_Factory::get_instance()
-	                               ->post_images()
-	                               ->get( $post_id );
+    return Wordlift_Storage_Factory::get_instance()
+                                    ->post_images()
+                                    ->get( $post_id );
 
 }
 
@@ -219,24 +219,24 @@ 
  */
 function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
 
-	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
+    // wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
-		'post_type'      => 'attachment',
-		'posts_per_page' => 1,
-		'post_status'    => 'any',
-		'post_parent'    => $parent_post_id,
-		'meta_key'       => 'wl_source_url',
-		'meta_value'     => $source_url,
-	) );
+    $posts = get_posts( array(
+        'post_type'      => 'attachment',
+        'posts_per_page' => 1,
+        'post_status'    => 'any',
+        'post_parent'    => $parent_post_id,
+        'meta_key'       => 'wl_source_url',
+        'meta_value'     => $source_url,
+    ) );
 
-	// Return the found post.
-	if ( 1 === count( $posts ) ) {
-		return $posts[0];
-	}
+    // Return the found post.
+    if ( 1 === count( $posts ) ) {
+        return $posts[0];
+    }
 
-	// Return null.
-	return null;
+    // Return null.
+    return null;
 }
 
 /**
@@ -247,8 +247,8 @@ 
  */
 function wl_set_source_url( $post_id, $source_url ) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+    delete_post_meta( $post_id, 'wl_source_url' );
+    add_post_meta( $post_id, 'wl_source_url', $source_url );
 }
 
 /**
@@ -265,7 +265,7 @@ 
  */
 function wl_sanitize_uri_path( $path, $char = '_' ) {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+    return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
 }
 
 /**
@@ -277,47 +277,47 @@ 
  */
 function wl_replace_item_id_with_uri( $content ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
-	$log->trace( 'Replacing item IDs with URIs...' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
+    $log->trace( 'Replacing item IDs with URIs...' );
 
-	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+    // Strip slashes, see https://core.trac.wordpress.org/ticket/21767
+    $content = stripslashes( $content );
 
-	// If any match are found.
-	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+    // If any match are found.
+    $matches = array();
+    if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
 
-		foreach ( $matches as $match ) {
+        foreach ( $matches as $match ) {
 
-			// Get the item ID.
-			$item_id = $match[1];
+            // Get the item ID.
+            $item_id = $match[1];
 
-			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+            // Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
+            $post = Wordlift_Entity_Service::get_instance()
+                                            ->get_entity_post_by_uri( $item_id );
 
-			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
-				continue;
-			}
+            // If no entity is found, continue to the next one.
+            if ( null === $post ) {
+                continue;
+            }
 
-			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+            // Get the URI for that post.
+            $uri = wl_get_entity_uri( $post->ID );
 
-			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
+            // wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
-			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
-			}
-		}
-	}
+            // If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
+            if ( $item_id !== $uri ) {
+                $uri_e   = esc_html( $uri );
+                $content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+            }
+        }
+    }
 
-	// Reapply slashes.
-	$content = addslashes( $content );
+    // Reapply slashes.
+    $content = addslashes( $content );
 
-	return $content;
+    return $content;
 }
 
 add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
@@ -380,24 +380,24 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+    $log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
 
-	$log->info( 'Activating WordLift...' );
+    $log->info( 'Activating WordLift...' );
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
-	Wordlift_Activator::activate();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+    Wordlift_Activator::activate();
 
-	/**
-	 * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
-	 * @since 3.19.2
-	 */
-	Wordlift_Http_Api::activate();
+    /**
+     * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
+     * @since 3.19.2
+     */
+    Wordlift_Http_Api::activate();
 
-	// Ensure the post type is registered before flushing the rewrite rules.
-	Wordlift_Entity_Post_Type_Service::get_instance()->register();
-	flush_rewrite_rules();
+    // Ensure the post type is registered before flushing the rewrite rules.
+    Wordlift_Entity_Post_Type_Service::get_instance()->register();
+    flush_rewrite_rules();
 }
 
 /**
@@ -406,11 +406,11 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
-	Wordlift_Http_Api::deactivate();
-	Ttl_Cache_Cleaner::deactivate();
-	flush_rewrite_rules();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
+    Wordlift_Http_Api::deactivate();
+    Ttl_Cache_Cleaner::deactivate();
+    flush_rewrite_rules();
 
 }
 
@@ -433,93 +433,93 @@ 
  * @since    1.0.0
  */
 function run_wordlift() {
-	/**
-	 * Filter: wl_feature__enable__widgets.
-	 *
-	 * @param bool whether the widgets needed to be registered, defaults to true.
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
-	}
-	add_filter( 'widget_text', 'do_shortcode' );
-
-
-	/**
-	 * Filter: wl_feature__enable__analysis
-	 *
-	 * @param bool Whether to send api request to analysis or not
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
-	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
-	}
-
-	/*
+    /**
+     * Filter: wl_feature__enable__widgets.
+     *
+     * @param bool whether the widgets needed to be registered, defaults to true.
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
+        add_action( 'widgets_init', 'wl_register_chord_widget' );
+        add_action( 'widgets_init', 'wl_register_geo_widget' );
+        add_action( 'widgets_init', 'wl_register_timeline_widget' );
+    }
+    add_filter( 'widget_text', 'do_shortcode' );
+
+
+    /**
+     * Filter: wl_feature__enable__analysis
+     *
+     * @param bool Whether to send api request to analysis or not
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+    } else {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+    }
+
+    /*
 	 * We introduce the WordLift autoloader, since we start using classes in namespaces, i.e. Wordlift\Http.
 	 *
 	 * @since 3.21.2
 	 */
-	wordlift_plugin_autoload_register();
+    wordlift_plugin_autoload_register();
 
-	$plugin = new Wordlift();
-	$plugin->run();
+    $plugin = new Wordlift();
+    $plugin->run();
 
-	// Initialize the TTL Cache Cleaner.
-	new Ttl_Cache_Cleaner();
+    // Initialize the TTL Cache Cleaner.
+    new Ttl_Cache_Cleaner();
 
-	// Load the new Post Adapter.
-	new Post_Adapter();
+    // Load the new Post Adapter.
+    new Post_Adapter();
 
-	// Load the API Data Hooks.
-	new Api_Data_Hooks();
+    // Load the API Data Hooks.
+    new Api_Data_Hooks();
 
-	add_action( 'plugins_loaded', function () use ( $plugin ) {
-		// Licenses Images.
-		$user_agent                   = User_Agent::get_user_agent();
-		$wordlift_key                 = Wordlift_Configuration_Service::get_instance()->get_key();
-		$api_service                  = new Default_Api_Service( apply_filters( 'wl_api_base_url', 'https://api.wordlift.io' ), 60, $user_agent, $wordlift_key );
-		$image_license_factory        = new Image_License_Factory();
-		$image_license_service        = new Image_License_Service( $api_service, $image_license_factory );
-		$image_license_cache          = new Ttl_Cache( 'image-license', 86400 * 30 ); // 30 days.
-		$cached_image_license_service = new Cached_Image_License_Service( $image_license_service, $image_license_cache );
+    add_action( 'plugins_loaded', function () use ( $plugin ) {
+        // Licenses Images.
+        $user_agent                   = User_Agent::get_user_agent();
+        $wordlift_key                 = Wordlift_Configuration_Service::get_instance()->get_key();
+        $api_service                  = new Default_Api_Service( apply_filters( 'wl_api_base_url', 'https://api.wordlift.io' ), 60, $user_agent, $wordlift_key );
+        $image_license_factory        = new Image_License_Factory();
+        $image_license_service        = new Image_License_Service( $api_service, $image_license_factory );
+        $image_license_cache          = new Ttl_Cache( 'image-license', 86400 * 30 ); // 30 days.
+        $cached_image_license_service = new Cached_Image_License_Service( $image_license_service, $image_license_cache );
 
-		$image_license_scheduler       = new Image_License_Scheduler( $image_license_service, $image_license_cache );
-		$image_license_cleanup_service = new Image_License_Cleanup_Service();
+        $image_license_scheduler       = new Image_License_Scheduler( $image_license_service, $image_license_cache );
+        $image_license_cleanup_service = new Image_License_Cleanup_Service();
 
-		// Get the cached data. If we have cached data, we load the notifier.
-		$image_license_data = $image_license_cache->get( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES );
-		if ( null !== $image_license_data ) {
-			$image_license_page = new Image_License_Page( $image_license_data, Wordlift::get_instance()->get_version() );
-			new Image_License_Notifier( $image_license_data, $image_license_page );
-		}
+        // Get the cached data. If we have cached data, we load the notifier.
+        $image_license_data = $image_license_cache->get( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES );
+        if ( null !== $image_license_data ) {
+            $image_license_page = new Image_License_Page( $image_license_data, Wordlift::get_instance()->get_version() );
+            new Image_License_Notifier( $image_license_data, $image_license_page );
+        }
 
-		$remove_all_images_task         = new Remove_All_Images_Task( $cached_image_license_service );
-		$remove_all_images_task_adapter = new Task_Ajax_Adapter( $remove_all_images_task );
+        $remove_all_images_task         = new Remove_All_Images_Task( $cached_image_license_service );
+        $remove_all_images_task_adapter = new Task_Ajax_Adapter( $remove_all_images_task );
 
-		$reload_data_task         = new Reload_Data_Task();
-		$reload_data_task_adapter = new Task_Ajax_Adapter( $reload_data_task );
+        $reload_data_task         = new Reload_Data_Task();
+        $reload_data_task_adapter = new Task_Ajax_Adapter( $reload_data_task );
 
-		$add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task( $cached_image_license_service );
-		$add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter( $add_license_caption_or_remove_task );
+        $add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task( $cached_image_license_service );
+        $add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter( $add_license_caption_or_remove_task );
 
-		$remove_all_images_task_page             = new Remove_All_Images_Page( new Task_Ajax_Adapters_Registry( $remove_all_images_task_adapter ), $plugin->get_version() );
-		$reload_data_task_page                   = new Reload_Data_Page( new Task_Ajax_Adapters_Registry( $reload_data_task_adapter ), $plugin->get_version() );
-		$add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page( new Task_Ajax_Adapters_Registry( $add_license_caption_or_remove_task_adapter ), $plugin->get_version() );
+        $remove_all_images_task_page             = new Remove_All_Images_Page( new Task_Ajax_Adapters_Registry( $remove_all_images_task_adapter ), $plugin->get_version() );
+        $reload_data_task_page                   = new Reload_Data_Page( new Task_Ajax_Adapters_Registry( $reload_data_task_adapter ), $plugin->get_version() );
+        $add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page( new Task_Ajax_Adapters_Registry( $add_license_caption_or_remove_task_adapter ), $plugin->get_version() );
 
-		new Wordlift_Products_Navigator_Shortcode_REST();
+        new Wordlift_Products_Navigator_Shortcode_REST();
 
-		// Register the Dataset module, requires `$api_service`.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
-	} );
+        // Register the Dataset module, requires `$api_service`.
+        require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
+    } );
 
 }
 
@@ -533,45 +533,45 @@ 
  */
 function wordlift_plugin_autoload_register() {
 
-	spl_autoload_register( function ( $class_name ) {
+    spl_autoload_register( function ( $class_name ) {
 
-		// Bail out if these are not our classes.
-		if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
-			return false;
-		}
+        // Bail out if these are not our classes.
+        if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+            return false;
+        }
 
-		$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+        $class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
 
-		preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+        preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
 
-		$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-		$file = 'class-' . $matches[2] . '.php';
+        $path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
+        $file = 'class-' . $matches[2] . '.php';
 
-		$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+        $full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
 
-		if ( ! file_exists( $full_path ) ) {
-			echo( "Class $class_name not found at $full_path." );
+        if ( ! file_exists( $full_path ) ) {
+            echo( "Class $class_name not found at $full_path." );
 
-			return false;
-		}
+            return false;
+        }
 
-		require_once $full_path;
+        require_once $full_path;
 
-		return true;
-	} );
+        return true;
+    } );
 
 }
 
 function wl_block_categories( $categories, $post ) {
-	return array_merge(
-		$categories,
-		array(
-			array(
-				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
-			),
-		)
-	);
+    return array_merge(
+        $categories,
+        array(
+            array(
+                'slug'  => 'wordlift',
+                'title' => __( 'WordLift', 'wordlift' ),
+            ),
+        )
+    );
 }
 
 add_filter( 'block_categories', 'wl_block_categories', 10, 2 );

Spacing +128 added lines, -128 removed lines

@@ -47,24 +47,24 @@ 
 use Wordlift\Tasks\Task_Ajax_Adapters_Registry;
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
-if ( apply_filters( 'wl_features__enable__dataset', false ) ) {
+if (apply_filters('wl_features__enable__dataset', false)) {
 	/*
 	 * Add Composer Autoload with Mozart support.
 	 *
 	 * @since 3.27.6
 	 */
-	require __DIR__ . '/vendor/autoload.php';
+	require __DIR__.'/vendor/autoload.php';
 }
 
 // Include WordLift constants.
-require_once( 'wordlift_constants.php' );
+require_once('wordlift_constants.php');
 
 // Load modules.
-require_once( 'modules/core/wordlift_core.php' );
+require_once('modules/core/wordlift_core.php');
 
 /**
  * Log to the debug.log file.
@@ -76,9 +76,9 @@ 
  * @deprecated use Wordlift_Log_Service::get_instance()->info( $log );
  *
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	Wordlift_Log_Service::get_instance()->debug( $log );
+	Wordlift_Log_Service::get_instance()->debug($log);
 
 }
 
@@ -93,9 +93,9 @@ 
  * @since 3.0.0
  *
  */
-function wl_write_log_hide_key( $text ) {
+function wl_write_log_hide_key($text) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+	return str_ireplace(wl_configuration_get_key(), '<hidden>', $text);
 }
 
 /**
@@ -105,7 +105,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -113,15 +113,15 @@ 
 		'itemid'    => array(),
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
 
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 /**
  * Register additional scripts for the admin UI.
@@ -129,21 +129,21 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
+	wp_enqueue_script('jquery-ui-autocomplete');
 
 	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
+	if (Wordlift_Entity_Service::TYPE_NAME === get_post_type()) {
+		wp_dequeue_script('autosave');
 	}
 
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 /**
  * Hooked to *wp_kses_allowed_html* filter, adds microdata attributes.
@@ -153,23 +153,23 @@ 
  *
  * @return array An array which contains allowed microdata attributes.
  */
-function wordlift_allowed_html( $allowedtags, $context ) {
+function wordlift_allowed_html($allowedtags, $context) {
 
-	if ( 'post' !== $context ) {
+	if ('post' !== $context) {
 		return $allowedtags;
 	}
 
-	return array_merge_recursive( $allowedtags, array(
+	return array_merge_recursive($allowedtags, array(
 		'span' => array(
 			'itemscope' => true,
 			'itemtype'  => true,
 			'itemid'    => true,
 			'itemprop'  => true,
 		),
-	) );
+	));
 }
 
-add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
+add_filter('wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2);
 
 /**
  * Get the coordinates for the specified post ID.
@@ -178,17 +178,17 @@ 
  *
  * @return array|null An array of coordinates or null.
  */
-function wl_get_coordinates( $post_id ) {
+function wl_get_coordinates($post_id) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+	$latitude  = wl_schema_get_value($post_id, 'latitude');
+	$longitude = wl_schema_get_value($post_id, 'longitude');
 
 	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
 	// place on the globe:"The zero/zero point of this system is located in the
 	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
 	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+		'latitude'  => isset($latitude[0]) && is_numeric($latitude[0]) ? $latitude[0] : '',
+		'longitude' => isset($longitude[0]) && is_numeric($longitude[0]) ? $longitude[0] : '',
 	);
 }
 
@@ -201,11 +201,11 @@ 
  * @deprecated use Wordlift_Storage_Factory::get_instance()->post_images()->get( $post_id )
  *
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 	return Wordlift_Storage_Factory::get_instance()
 	                               ->post_images()
-	                               ->get( $post_id );
+	                               ->get($post_id);
 
 }
 
@@ -217,21 +217,21 @@ 
  *
  * @return WP_Post|null A post instance or null if not found.
  */
-function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
+function wl_get_attachment_for_source_url($parent_post_id, $source_url) {
 
 	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'attachment',
 		'posts_per_page' => 1,
 		'post_status'    => 'any',
 		'post_parent'    => $parent_post_id,
 		'meta_key'       => 'wl_source_url',
 		'meta_value'     => $source_url,
-	) );
+	));
 
 	// Return the found post.
-	if ( 1 === count( $posts ) ) {
+	if (1 === count($posts)) {
 		return $posts[0];
 	}
 
@@ -245,10 +245,10 @@ 
  * @param int $post_id The post ID.
  * @param string $source_url The source URL.
  */
-function wl_set_source_url( $post_id, $source_url ) {
+function wl_set_source_url($post_id, $source_url) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+	delete_post_meta($post_id, 'wl_source_url');
+	add_post_meta($post_id, 'wl_source_url', $source_url);
 }
 
 /**
@@ -263,9 +263,9 @@ 
  * @see        https://codex.wordpress.org/Function_Reference/sanitize_title
  *
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+	return Wordlift_Uri_Service::get_instance()->sanitize_path($path, $char);
 }
 
 /**
@@ -275,104 +275,104 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
-	$log->trace( 'Replacing item IDs with URIs...' );
+	$log = Wordlift_Log_Service::get_logger('wl_replace_item_id_with_uri');
+	$log->trace('Replacing item IDs with URIs...');
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
 			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+			                               ->get_entity_post_by_uri($item_id);
 
 			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ($item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
+require_once('wordlift_entity_type.php');
 
 // add callbacks on post save to notify data changes from wp to redlink triple store
-require_once( 'wordlift_to_redlink_data_push_callbacks.php' );
+require_once('wordlift_to_redlink_data_push_callbacks.php');
 
-require_once( 'modules/configuration/wordlift_configuration_settings.php' );
+require_once('modules/configuration/wordlift_configuration_settings.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/prefixes/wordlift_prefixes.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
 
 // Shortcodes
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/class-wordlift-shortcode-rest.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
-require_once( 'shortcodes/class-wordlift-products-navigator-shortcode-rest.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/class-wordlift-shortcode-rest.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
+require_once('shortcodes/class-wordlift-products-navigator-shortcode-rest.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/class-wordlift-chord-widget.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/class-wordlift-chord-widget.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_redlink.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');
 
 /**
  * The code that runs during plugin activation.
@@ -380,11 +380,11 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+	$log = Wordlift_Log_Service::get_logger('activate_wordlift');
 
-	$log->info( 'Activating WordLift...' );
+	$log->info('Activating WordLift...');
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 
 	/**
@@ -406,7 +406,7 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 	Wordlift_Http_Api::deactivate();
 	Ttl_Cache_Cleaner::deactivate();
@@ -414,14 +414,14 @@ 
 
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.
@@ -441,12 +441,12 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
+	if (apply_filters('wl_feature__enable__widgets', true)) {
+		add_action('widgets_init', 'wl_register_chord_widget');
+		add_action('widgets_init', 'wl_register_geo_widget');
+		add_action('widgets_init', 'wl_register_timeline_widget');
 	}
-	add_filter( 'widget_text', 'do_shortcode' );
+	add_filter('widget_text', 'do_shortcode');
 
 
 	/**
@@ -457,10 +457,10 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+	if (apply_filters('wl_feature__enable__analysis', true)) {
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_action');
 	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action');
 	}
 
 	/*
@@ -482,43 +482,43 @@ 
 	// Load the API Data Hooks.
 	new Api_Data_Hooks();
 
-	add_action( 'plugins_loaded', function () use ( $plugin ) {
+	add_action('plugins_loaded', function() use ($plugin) {
 		// Licenses Images.
 		$user_agent                   = User_Agent::get_user_agent();
 		$wordlift_key                 = Wordlift_Configuration_Service::get_instance()->get_key();
-		$api_service                  = new Default_Api_Service( apply_filters( 'wl_api_base_url', 'https://api.wordlift.io' ), 60, $user_agent, $wordlift_key );
+		$api_service                  = new Default_Api_Service(apply_filters('wl_api_base_url', 'https://api.wordlift.io'), 60, $user_agent, $wordlift_key);
 		$image_license_factory        = new Image_License_Factory();
-		$image_license_service        = new Image_License_Service( $api_service, $image_license_factory );
-		$image_license_cache          = new Ttl_Cache( 'image-license', 86400 * 30 ); // 30 days.
-		$cached_image_license_service = new Cached_Image_License_Service( $image_license_service, $image_license_cache );
+		$image_license_service        = new Image_License_Service($api_service, $image_license_factory);
+		$image_license_cache          = new Ttl_Cache('image-license', 86400 * 30); // 30 days.
+		$cached_image_license_service = new Cached_Image_License_Service($image_license_service, $image_license_cache);
 
-		$image_license_scheduler       = new Image_License_Scheduler( $image_license_service, $image_license_cache );
+		$image_license_scheduler       = new Image_License_Scheduler($image_license_service, $image_license_cache);
 		$image_license_cleanup_service = new Image_License_Cleanup_Service();
 
 		// Get the cached data. If we have cached data, we load the notifier.
-		$image_license_data = $image_license_cache->get( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES );
-		if ( null !== $image_license_data ) {
-			$image_license_page = new Image_License_Page( $image_license_data, Wordlift::get_instance()->get_version() );
-			new Image_License_Notifier( $image_license_data, $image_license_page );
+		$image_license_data = $image_license_cache->get(Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES);
+		if (null !== $image_license_data) {
+			$image_license_page = new Image_License_Page($image_license_data, Wordlift::get_instance()->get_version());
+			new Image_License_Notifier($image_license_data, $image_license_page);
 		}
 
-		$remove_all_images_task         = new Remove_All_Images_Task( $cached_image_license_service );
-		$remove_all_images_task_adapter = new Task_Ajax_Adapter( $remove_all_images_task );
+		$remove_all_images_task         = new Remove_All_Images_Task($cached_image_license_service);
+		$remove_all_images_task_adapter = new Task_Ajax_Adapter($remove_all_images_task);
 
 		$reload_data_task         = new Reload_Data_Task();
-		$reload_data_task_adapter = new Task_Ajax_Adapter( $reload_data_task );
+		$reload_data_task_adapter = new Task_Ajax_Adapter($reload_data_task);
 
-		$add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task( $cached_image_license_service );
-		$add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter( $add_license_caption_or_remove_task );
+		$add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task($cached_image_license_service);
+		$add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter($add_license_caption_or_remove_task);
 
-		$remove_all_images_task_page             = new Remove_All_Images_Page( new Task_Ajax_Adapters_Registry( $remove_all_images_task_adapter ), $plugin->get_version() );
-		$reload_data_task_page                   = new Reload_Data_Page( new Task_Ajax_Adapters_Registry( $reload_data_task_adapter ), $plugin->get_version() );
-		$add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page( new Task_Ajax_Adapters_Registry( $add_license_caption_or_remove_task_adapter ), $plugin->get_version() );
+		$remove_all_images_task_page             = new Remove_All_Images_Page(new Task_Ajax_Adapters_Registry($remove_all_images_task_adapter), $plugin->get_version());
+		$reload_data_task_page                   = new Reload_Data_Page(new Task_Ajax_Adapters_Registry($reload_data_task_adapter), $plugin->get_version());
+		$add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page(new Task_Ajax_Adapters_Registry($add_license_caption_or_remove_task_adapter), $plugin->get_version());
 
 		new Wordlift_Products_Navigator_Shortcode_REST();
 
 		// Register the Dataset module, requires `$api_service`.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
+		require_once plugin_dir_path(__FILE__).'wordlift/dataset/index.php';
 	} );
 
 }
@@ -533,24 +533,24 @@ 
  */
 function wordlift_plugin_autoload_register() {
 
-	spl_autoload_register( function ( $class_name ) {
+	spl_autoload_register(function($class_name) {
 
 		// Bail out if these are not our classes.
-		if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+		if (0 !== strpos($class_name, 'Wordlift\\')) {
 			return false;
 		}
 
-		$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+		$class_name_lc = strtolower(str_replace('_', '-', $class_name));
 
-		preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+		preg_match('|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches);
 
-		$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-		$file = 'class-' . $matches[2] . '.php';
+		$path = str_replace('\\', DIRECTORY_SEPARATOR, $matches[1]);
+		$file = 'class-'.$matches[2].'.php';
 
-		$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+		$full_path = plugin_dir_path(__FILE__).$path.DIRECTORY_SEPARATOR.$file;
 
-		if ( ! file_exists( $full_path ) ) {
-			echo( "Class $class_name not found at $full_path." );
+		if ( ! file_exists($full_path)) {
+			echo("Class $class_name not found at $full_path.");
 
 			return false;
 		}
@@ -562,16 +562,16 @@ 
 
 }
 
-function wl_block_categories( $categories, $post ) {
+function wl_block_categories($categories, $post) {
 	return array_merge(
 		$categories,
 		array(
 			array(
 				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
+				'title' => __('WordLift', 'wordlift'),
 			),
 		)
 	);
 }
 
-add_filter( 'block_categories', 'wl_block_categories', 10, 2 );
+add_filter('block_categories', 'wl_block_categories', 10, 2);