insideout10 / wordlift-plugin

src/includes/rebuild/class-wordlift-reference-rebuild-service.php

Doc Comments +1 added lines

@@ -33,6 +33,7 @@
 	 *
 	 * @param \Wordlift_Entity_Service       $entity_service       The {@link Wordlift_Entity_Service} instance.
 	 * @param \Wordlift_Linked_Data_Service  $linked_data_service  The {@link Wordlift_Linked_Data_Service} instance.
+	 * @param Wordlift_Relation_Service $relation_service
 	 */
 	public function __construct( $linked_data_service, $entity_service, $relation_service ) {
 

Indentation +109 added lines, -109 removed lines

@@ -2,119 +2,119 @@
 
 class Wordlift_Reference_Rebuild_Service extends Wordlift_Rebuild_Service {
 
-	/**
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Linked_Data_Service $log A {@link Wordlift_Linked_Data_Service} instance.
-	 */
-	private $linked_data_service;
-
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-
-	/**
-	 * Wordlift_Reference_Rebuild_Service constructor.
-	 *
-	 * @param \Wordlift_Entity_Service       $entity_service       The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Linked_Data_Service  $linked_data_service  The {@link Wordlift_Linked_Data_Service} instance.
-	 */
-	public function __construct( $linked_data_service, $entity_service, $relation_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Reference_Rebuild_Service' );
-
-		$this->linked_data_service = $linked_data_service;
-		$this->entity_service      = $entity_service;
-	}
-
-	public function rebuild() {
-		set_time_limit( 21600 ); // 6 hours
-
-		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
-
-		// We start at 0 by default and get to max.
-		$offset = $_GET['offset'] ?: 0;
-		$limit  = $_GET['limit'] ?: 1;
-		$max    = $offset + $limit;
-
-		$this->log->debug( 'Processing references...' );
-
-		// Go through the list of published entities and posts and call the (legacy)
-		// `wl_linked_data_save_post` function for each one. We're using the `process`
-		// function which is provided by the parent `Wordlift_Listable` abstract class
-		// and will cycle through all the posts w/ a very small memory footprint
-		// in order to avoid memory errors.
-
-		$count               = 0;
-		$log                 = $this->log;
-		$entity_service      = $this->entity_service;
-		$linked_data_service = $this->linked_data_service;
-
-		$this->process(
-			function ( $post_id ) use ( &$count, $log, $entity_service, $linked_data_service ) {
-				$count ++;
-
-				if ( $entity_service->is_entity( $post_id ) ) {
-					$log->trace( "Post $post_id is an entity, skipping..." );
-					return;
-				}
-
-				$log->trace( "Going to save post $count, ID $post_id..." );
-				$linked_data_service->push( $post_id );
-			},
-			array(),
-			$offset,
-			$max
-		);
-
-		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$url = admin_url( 'admin-ajax.php?action=wl_rebuild_references&offset=' . ( $offset + $limit ) . '&limit=' . $limit );
-			$this->redirect( $url );
-		}
-
-		$this->log->info( "Rebuild complete" );
-		echo( "Rebuild complete" );
-
-		// If we're being called as AJAX, die here.
-		if ( DOING_AJAX ) {
-			wp_die();
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
-		global $wpdb;
-
-		return $wpdb->get_col( $wpdb->prepare(
-			"
+    /**
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Linked_Data_Service $log A {@link Wordlift_Linked_Data_Service} instance.
+     */
+    private $linked_data_service;
+
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+
+    /**
+     * Wordlift_Reference_Rebuild_Service constructor.
+     *
+     * @param \Wordlift_Entity_Service       $entity_service       The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Linked_Data_Service  $linked_data_service  The {@link Wordlift_Linked_Data_Service} instance.
+     */
+    public function __construct( $linked_data_service, $entity_service, $relation_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Reference_Rebuild_Service' );
+
+        $this->linked_data_service = $linked_data_service;
+        $this->entity_service      = $entity_service;
+    }
+
+    public function rebuild() {
+        set_time_limit( 21600 ); // 6 hours
+
+        // Send textual output.
+        header( 'Content-type: text/plain; charset=utf-8' );
+
+        // We start at 0 by default and get to max.
+        $offset = $_GET['offset'] ?: 0;
+        $limit  = $_GET['limit'] ?: 1;
+        $max    = $offset + $limit;
+
+        $this->log->debug( 'Processing references...' );
+
+        // Go through the list of published entities and posts and call the (legacy)
+        // `wl_linked_data_save_post` function for each one. We're using the `process`
+        // function which is provided by the parent `Wordlift_Listable` abstract class
+        // and will cycle through all the posts w/ a very small memory footprint
+        // in order to avoid memory errors.
+
+        $count               = 0;
+        $log                 = $this->log;
+        $entity_service      = $this->entity_service;
+        $linked_data_service = $this->linked_data_service;
+
+        $this->process(
+            function ( $post_id ) use ( &$count, $log, $entity_service, $linked_data_service ) {
+                $count ++;
+
+                if ( $entity_service->is_entity( $post_id ) ) {
+                    $log->trace( "Post $post_id is an entity, skipping..." );
+                    return;
+                }
+
+                $log->trace( "Going to save post $count, ID $post_id..." );
+                $linked_data_service->push( $post_id );
+            },
+            array(),
+            $offset,
+            $max
+        );
+
+        // Redirect to the next chunk.
+        if ( $count == $limit ) {
+            $log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
+            $url = admin_url( 'admin-ajax.php?action=wl_rebuild_references&offset=' . ( $offset + $limit ) . '&limit=' . $limit );
+            $this->redirect( $url );
+        }
+
+        $this->log->info( "Rebuild complete" );
+        echo( "Rebuild complete" );
+
+        // If we're being called as AJAX, die here.
+        if ( DOING_AJAX ) {
+            wp_die();
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function find( $offset = 0, $limit = 10, $args = array() ) {
+        global $wpdb;
+
+        return $wpdb->get_col( $wpdb->prepare(
+            "
 			SELECT DISTINCT subject_id AS id
 			FROM {$wpdb->prefix}wl_relation_instances
 			LIMIT %d OFFSET %d
 			",
-			$limit,
-			$offset
-		) );
+            $limit,
+            $offset
+        ) );
 
-	}
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -34,26 +34,26 @@ 
 	 * @param \Wordlift_Entity_Service       $entity_service       The {@link Wordlift_Entity_Service} instance.
 	 * @param \Wordlift_Linked_Data_Service  $linked_data_service  The {@link Wordlift_Linked_Data_Service} instance.
 	 */
-	public function __construct( $linked_data_service, $entity_service, $relation_service ) {
+	public function __construct($linked_data_service, $entity_service, $relation_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Reference_Rebuild_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Reference_Rebuild_Service');
 
 		$this->linked_data_service = $linked_data_service;
 		$this->entity_service      = $entity_service;
 	}
 
 	public function rebuild() {
-		set_time_limit( 21600 ); // 6 hours
+		set_time_limit(21600); // 6 hours
 
 		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
+		header('Content-type: text/plain; charset=utf-8');
 
 		// We start at 0 by default and get to max.
 		$offset = $_GET['offset'] ?: 0;
 		$limit  = $_GET['limit'] ?: 1;
 		$max    = $offset + $limit;
 
-		$this->log->debug( 'Processing references...' );
+		$this->log->debug('Processing references...');
 
 		// Go through the list of published entities and posts and call the (legacy)
 		// `wl_linked_data_save_post` function for each one. We're using the `process`
@@ -67,16 +67,16 @@ 
 		$linked_data_service = $this->linked_data_service;
 
 		$this->process(
-			function ( $post_id ) use ( &$count, $log, $entity_service, $linked_data_service ) {
-				$count ++;
+			function($post_id) use (&$count, $log, $entity_service, $linked_data_service) {
+				$count++;
 
-				if ( $entity_service->is_entity( $post_id ) ) {
-					$log->trace( "Post $post_id is an entity, skipping..." );
+				if ($entity_service->is_entity($post_id)) {
+					$log->trace("Post $post_id is an entity, skipping...");
 					return;
 				}
 
-				$log->trace( "Going to save post $count, ID $post_id..." );
-				$linked_data_service->push( $post_id );
+				$log->trace("Going to save post $count, ID $post_id...");
+				$linked_data_service->push($post_id);
 			},
 			array(),
 			$offset,
@@ -84,17 +84,17 @@ 
 		);
 
 		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$url = admin_url( 'admin-ajax.php?action=wl_rebuild_references&offset=' . ( $offset + $limit ) . '&limit=' . $limit );
-			$this->redirect( $url );
+		if ($count == $limit) {
+			$log->trace('Redirecting to post #'.($offset + 1).'...');
+			$url = admin_url('admin-ajax.php?action=wl_rebuild_references&offset='.($offset + $limit).'&limit='.$limit);
+			$this->redirect($url);
 		}
 
-		$this->log->info( "Rebuild complete" );
-		echo( "Rebuild complete" );
+		$this->log->info("Rebuild complete");
+		echo("Rebuild complete");
 
 		// If we're being called as AJAX, die here.
-		if ( DOING_AJAX ) {
+		if (DOING_AJAX) {
 			wp_die();
 		}
 	}
@@ -102,10 +102,10 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
+	function find($offset = 0, $limit = 10, $args = array()) {
 		global $wpdb;
 
-		return $wpdb->get_col( $wpdb->prepare(
+		return $wpdb->get_col($wpdb->prepare(
 			"
 			SELECT DISTINCT subject_id AS id
 			FROM {$wpdb->prefix}wl_relation_instances
@@ -113,7 +113,7 @@ 
 			",
 			$limit,
 			$offset
-		) );
+		));
 
 	}
 

src/includes/rebuild/class-wordlift-relation-rebuild-service.php

Indentation +85 added lines, -85 removed lines

@@ -2,133 +2,133 @@
 
 class Wordlift_Relation_Rebuild_Service extends Wordlift_Listable {
 
-	/**
-	 * @var Wordlift_Content_Filter_Service
-	 */
-	private $content_filter_service;
+    /**
+     * @var Wordlift_Content_Filter_Service
+     */
+    private $content_filter_service;
 
-	/**
-	 * @var Wordlift_Entity_Service
-	 */
-	private $entity_service;
+    /**
+     * @var Wordlift_Entity_Service
+     */
+    private $entity_service;
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.14.3
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.14.3
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
 
-	/**
-	 * Wordlift_Relation_Rebuild_Service constructor.
-	 *
-	 * @param \Wordlift_Content_Filter_Service $content_filter_service
-	 * @param \Wordlift_Entity_Service         $entity_service
-	 */
-	public function __construct( $content_filter_service, $entity_service ) {
+    /**
+     * Wordlift_Relation_Rebuild_Service constructor.
+     *
+     * @param \Wordlift_Content_Filter_Service $content_filter_service
+     * @param \Wordlift_Entity_Service         $entity_service
+     */
+    public function __construct( $content_filter_service, $entity_service ) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Relation_Rebuild_Service' );
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Relation_Rebuild_Service' );
 
-		$this->content_filter_service = $content_filter_service;
-		$this->entity_service         = $entity_service;
+        $this->content_filter_service = $content_filter_service;
+        $this->entity_service         = $entity_service;
 
-	}
+    }
 
-	public function process_all() {
-		global $wpdb;
+    public function process_all() {
+        global $wpdb;
 
-		set_time_limit( 21600 ); // 6 hours
+        set_time_limit( 21600 ); // 6 hours
 
-		$this->log->debug( 'Deleting all existing relations...' );
+        $this->log->debug( 'Deleting all existing relations...' );
 
-		// Delete existing data.
-		$wpdb->query( "TRUNCATE TABLE {$wpdb->prefix}wl_relation_instances" );
+        // Delete existing data.
+        $wpdb->query( "TRUNCATE TABLE {$wpdb->prefix}wl_relation_instances" );
 
-		$this->log->debug( 'Processing contents...' );
+        $this->log->debug( 'Processing contents...' );
 
-		$this->process( array( $this, 'process_single' ) );
+        $this->process( array( $this, 'process_single' ) );
 
-	}
+    }
 
-	public function process_single( $post_id ) {
+    public function process_single( $post_id ) {
 
-		$this->log->debug( "Processing post $post_id..." );
+        $this->log->debug( "Processing post $post_id..." );
 
-		// Bail out if the post is not found.
-		$post = get_post( $post_id );
+        // Bail out if the post is not found.
+        $post = get_post( $post_id );
 
-		if ( null === $post ) {
-			$this->log->error( "Post $post_id not found." );
+        if ( null === $post ) {
+            $this->log->error( "Post $post_id not found." );
 
-			return;
-		}
+            return;
+        }
 
-		// Get the URIs from the post content.
-		$uris = $this->content_filter_service->get_entity_uris( $post->post_content );
+        // Get the URIs from the post content.
+        $uris = $this->content_filter_service->get_entity_uris( $post->post_content );
 
-		// Map the URIs to post IDs.
-		$ids = $this->uri_to_post_id( $uris );
+        // Map the URIs to post IDs.
+        $ids = $this->uri_to_post_id( $uris );
 
-		$this->log->info( 'Found ' . count( $uris ) . ' annotation(s) and ' . count( $ids ) . ' unique relation(s).' );
+        $this->log->info( 'Found ' . count( $uris ) . ' annotation(s) and ' . count( $ids ) . ' unique relation(s).' );
 
-		// Create the relations.
-		$this->create_relations( $post_id, $ids );
+        // Create the relations.
+        $this->create_relations( $post_id, $ids );
 
-	}
+    }
 
-	private function create_relations( $subject_id, $object_ids ) {
+    private function create_relations( $subject_id, $object_ids ) {
 
-		$this->log->info( "Creating relations for post $subject_id..." );
+        $this->log->info( "Creating relations for post $subject_id..." );
 
-		$entity_service = $this->entity_service;
+        $entity_service = $this->entity_service;
 
-		array_walk( $object_ids, function ( $item ) use ( $subject_id, $entity_service ) {
-			wl_core_add_relation_instance(
-				$subject_id,
-				$entity_service->get_classification_scope_for( $item ),
-				$item
-			);
-		} );
+        array_walk( $object_ids, function ( $item ) use ( $subject_id, $entity_service ) {
+            wl_core_add_relation_instance(
+                $subject_id,
+                $entity_service->get_classification_scope_for( $item ),
+                $item
+            );
+        } );
 
-	}
+    }
 
-	private function uri_to_post_id( $uris ) {
+    private function uri_to_post_id( $uris ) {
 
-		$entity_service = $this->entity_service;
+        $entity_service = $this->entity_service;
 
-		$ids = array_unique( array_map( function ( $item ) use ( $entity_service ) {
-			$post = $entity_service->get_entity_post_by_uri( $item );
+        $ids = array_unique( array_map( function ( $item ) use ( $entity_service ) {
+            $post = $entity_service->get_entity_post_by_uri( $item );
 
-			return null === $post ? null : $post->ID;
-		}, (array) $uris ) );
+            return null === $post ? null : $post->ID;
+        }, (array) $uris ) );
 
-		return array_filter( $ids, function ( $item ) {
-			return null !== $item;
-		} );
-	}
+        return array_filter( $ids, function ( $item ) {
+            return null !== $item;
+        } );
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
-		global $wpdb;
+    /**
+     * @inheritdoc
+     */
+    function find( $offset = 0, $limit = 10, $args = array() ) {
+        global $wpdb;
 
-		return $wpdb->get_col( $wpdb->prepare(
-			"
+        return $wpdb->get_col( $wpdb->prepare(
+            "
 			SELECT id
 			FROM $wpdb->posts
 			WHERE post_type NOT IN ( 'attachment', 'revision' )
 				AND post_content REGEXP %s
 			LIMIT %d OFFSET %d
 			",
-			'<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">',
-			$limit,
-			$offset
-		) );
+            '<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">',
+            $limit,
+            $offset
+        ) );
 
-	}
+    }
 
 }

Spacing +28 added lines, -28 removed lines

@@ -27,9 +27,9 @@ 
 	 * @param \Wordlift_Content_Filter_Service $content_filter_service
 	 * @param \Wordlift_Entity_Service         $entity_service
 	 */
-	public function __construct( $content_filter_service, $entity_service ) {
+	public function __construct($content_filter_service, $entity_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Relation_Rebuild_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Relation_Rebuild_Service');
 
 		$this->content_filter_service = $content_filter_service;
 		$this->entity_service         = $entity_service;
@@ -39,72 +39,72 @@ 
 	public function process_all() {
 		global $wpdb;
 
-		set_time_limit( 21600 ); // 6 hours
+		set_time_limit(21600); // 6 hours
 
-		$this->log->debug( 'Deleting all existing relations...' );
+		$this->log->debug('Deleting all existing relations...');
 
 		// Delete existing data.
-		$wpdb->query( "TRUNCATE TABLE {$wpdb->prefix}wl_relation_instances" );
+		$wpdb->query("TRUNCATE TABLE {$wpdb->prefix}wl_relation_instances");
 
-		$this->log->debug( 'Processing contents...' );
+		$this->log->debug('Processing contents...');
 
-		$this->process( array( $this, 'process_single' ) );
+		$this->process(array($this, 'process_single'));
 
 	}
 
-	public function process_single( $post_id ) {
+	public function process_single($post_id) {
 
-		$this->log->debug( "Processing post $post_id..." );
+		$this->log->debug("Processing post $post_id...");
 
 		// Bail out if the post is not found.
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		if ( null === $post ) {
-			$this->log->error( "Post $post_id not found." );
+		if (null === $post) {
+			$this->log->error("Post $post_id not found.");
 
 			return;
 		}
 
 		// Get the URIs from the post content.
-		$uris = $this->content_filter_service->get_entity_uris( $post->post_content );
+		$uris = $this->content_filter_service->get_entity_uris($post->post_content);
 
 		// Map the URIs to post IDs.
-		$ids = $this->uri_to_post_id( $uris );
+		$ids = $this->uri_to_post_id($uris);
 
-		$this->log->info( 'Found ' . count( $uris ) . ' annotation(s) and ' . count( $ids ) . ' unique relation(s).' );
+		$this->log->info('Found '.count($uris).' annotation(s) and '.count($ids).' unique relation(s).');
 
 		// Create the relations.
-		$this->create_relations( $post_id, $ids );
+		$this->create_relations($post_id, $ids);
 
 	}
 
-	private function create_relations( $subject_id, $object_ids ) {
+	private function create_relations($subject_id, $object_ids) {
 
-		$this->log->info( "Creating relations for post $subject_id..." );
+		$this->log->info("Creating relations for post $subject_id...");
 
 		$entity_service = $this->entity_service;
 
-		array_walk( $object_ids, function ( $item ) use ( $subject_id, $entity_service ) {
+		array_walk($object_ids, function($item) use ($subject_id, $entity_service) {
 			wl_core_add_relation_instance(
 				$subject_id,
-				$entity_service->get_classification_scope_for( $item ),
+				$entity_service->get_classification_scope_for($item),
 				$item
 			);
 		} );
 
 	}
 
-	private function uri_to_post_id( $uris ) {
+	private function uri_to_post_id($uris) {
 
 		$entity_service = $this->entity_service;
 
-		$ids = array_unique( array_map( function ( $item ) use ( $entity_service ) {
-			$post = $entity_service->get_entity_post_by_uri( $item );
+		$ids = array_unique(array_map(function($item) use ($entity_service) {
+			$post = $entity_service->get_entity_post_by_uri($item);
 
 			return null === $post ? null : $post->ID;
-		}, (array) $uris ) );
+		}, (array) $uris));
 
-		return array_filter( $ids, function ( $item ) {
+		return array_filter($ids, function($item) {
 			return null !== $item;
 		} );
 	}
@@ -112,10 +112,10 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
+	function find($offset = 0, $limit = 10, $args = array()) {
 		global $wpdb;
 
-		return $wpdb->get_col( $wpdb->prepare(
+		return $wpdb->get_col($wpdb->prepare(
 			"
 			SELECT id
 			FROM $wpdb->posts
@@ -126,7 +126,7 @@ 
 			'<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">',
 			$limit,
 			$offset
-		) );
+		));
 
 	}
 

src/includes/rebuild/class-wordlift-listable.php

Indentation +49 added lines, -49 removed lines

@@ -4,54 +4,54 @@
  */
 abstract class Wordlift_Listable {
 
-	private $count = 0;
-
-	/**
-	 * List the items starting at the specified offset and up to the specified limit.
-	 *
-	 * @param int   $offset The start offset.
-	 * @param int   $limit  The maximum number of items to return.
-	 * @param array $args   Additional arguments.
-	 *
-	 * @return array A array of items (or an empty array if no items are found).
-	 */
-	abstract function find( $offset = 0, $limit = 10, $args = array() );
-
-	/**
-	 * @param callable $callback
-	 * @param array    $args
-	 * @param int      $offset
-	 * @param int      $max
-	 */
-	public function process( $callback, $args = array(), $offset = 0, $max = PHP_INT_MAX ) {
-
-		// We process chunks in order to avoid using too much memory,
-		// starting at offset 0.
-		while ( 0 < sizeof( $items = $this->find( $offset, 1, $args ) ) && $offset < $max ) {
-
-			// Cycle through items and call the callback function.
-			foreach ( $items as $item ) {
-				call_user_func_array( $callback, array( $item ) );
-			}
-
-			// Remove the flush of the cache.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/686.
-			// Clean the cache to avoid memory errors.
-			// wp_cache_flush();
-
-			// Move to the next offset.
-			$offset += 1;
-
-			$this->count ++;
-
-		}
-
-	}
-
-	public function get_count() {
-
-		return $this->count;
-	}
+    private $count = 0;
+
+    /**
+     * List the items starting at the specified offset and up to the specified limit.
+     *
+     * @param int   $offset The start offset.
+     * @param int   $limit  The maximum number of items to return.
+     * @param array $args   Additional arguments.
+     *
+     * @return array A array of items (or an empty array if no items are found).
+     */
+    abstract function find( $offset = 0, $limit = 10, $args = array() );
+
+    /**
+     * @param callable $callback
+     * @param array    $args
+     * @param int      $offset
+     * @param int      $max
+     */
+    public function process( $callback, $args = array(), $offset = 0, $max = PHP_INT_MAX ) {
+
+        // We process chunks in order to avoid using too much memory,
+        // starting at offset 0.
+        while ( 0 < sizeof( $items = $this->find( $offset, 1, $args ) ) && $offset < $max ) {
+
+            // Cycle through items and call the callback function.
+            foreach ( $items as $item ) {
+                call_user_func_array( $callback, array( $item ) );
+            }
+
+            // Remove the flush of the cache.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/686.
+            // Clean the cache to avoid memory errors.
+            // wp_cache_flush();
+
+            // Move to the next offset.
+            $offset += 1;
+
+            $this->count ++;
+
+        }
+
+    }
+
+    public function get_count() {
+
+        return $this->count;
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
 	 *
 	 * @return array A array of items (or an empty array if no items are found).
 	 */
-	abstract function find( $offset = 0, $limit = 10, $args = array() );
+	abstract function find($offset = 0, $limit = 10, $args = array());
 
 	/**
 	 * @param callable $callback
@@ -23,15 +23,15 @@ 
 	 * @param int      $offset
 	 * @param int      $max
 	 */
-	public function process( $callback, $args = array(), $offset = 0, $max = PHP_INT_MAX ) {
+	public function process($callback, $args = array(), $offset = 0, $max = PHP_INT_MAX) {
 
 		// We process chunks in order to avoid using too much memory,
 		// starting at offset 0.
-		while ( 0 < sizeof( $items = $this->find( $offset, 1, $args ) ) && $offset < $max ) {
+		while (0 < sizeof($items = $this->find($offset, 1, $args)) && $offset < $max) {
 
 			// Cycle through items and call the callback function.
-			foreach ( $items as $item ) {
-				call_user_func_array( $callback, array( $item ) );
+			foreach ($items as $item) {
+				call_user_func_array($callback, array($item));
 			}
 
 			// Remove the flush of the cache.
@@ -43,7 +43,7 @@ 
 			// Move to the next offset.
 			$offset += 1;
 
-			$this->count ++;
+			$this->count++;
 
 		}
 

src/includes/rebuild/class-wordlift-relation-rebuild-adapter.php

Indentation +19 added lines, -19 removed lines

@@ -1,31 +1,31 @@
 <?php
 
 class Wordlift_Relation_Rebuild_Adapter {
-	/**
-	 * @var Wordlift_Relation_Rebuild_Service
-	 */
-	private $relation_rebuild_service;
+    /**
+     * @var Wordlift_Relation_Rebuild_Service
+     */
+    private $relation_rebuild_service;
 
 
-	/**
-	 * Wordlift_Relation_Rebuild_Adapter constructor.
-	 *
-	 * @param \Wordlift_Relation_Rebuild_Service $relation_rebuild_service
-	 */
-	public function __construct( $relation_rebuild_service ) {
-		$this->relation_rebuild_service = $relation_rebuild_service;
-	}
+    /**
+     * Wordlift_Relation_Rebuild_Adapter constructor.
+     *
+     * @param \Wordlift_Relation_Rebuild_Service $relation_rebuild_service
+     */
+    public function __construct( $relation_rebuild_service ) {
+        $this->relation_rebuild_service = $relation_rebuild_service;
+    }
 
-	public function process_all() {
+    public function process_all() {
 
-		$this->relation_rebuild_service->process_all();
+        $this->relation_rebuild_service->process_all();
 
-		ob_clean();
+        ob_clean();
 
-		wp_send_json_success( array(
-			'count' => $this->relation_rebuild_service->get_count(),
-		) );
+        wp_send_json_success( array(
+            'count' => $this->relation_rebuild_service->get_count(),
+        ) );
 
-	}
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 	 *
 	 * @param \Wordlift_Relation_Rebuild_Service $relation_rebuild_service
 	 */
-	public function __construct( $relation_rebuild_service ) {
+	public function __construct($relation_rebuild_service) {
 		$this->relation_rebuild_service = $relation_rebuild_service;
 	}
 
@@ -22,9 +22,9 @@ 
 
 		ob_clean();
 
-		wp_send_json_success( array(
+		wp_send_json_success(array(
 			'count' => $this->relation_rebuild_service->get_count(),
-		) );
+		));
 
 	}
 

src/includes/batch-analysis/class-wordlift-batch-analysis-sql-helper.php

Indentation +177 added lines, -177 removed lines

@@ -11,25 +11,25 @@ 
 
 class Wordlift_Batch_Analysis_Sql_Helper {
 
-	/**
-	 * Get the base SQL statement to submit a post for Batch Analysis.
-	 *
-	 * Functions may use this base SQL and add their own filters. This function
-	 * should be `private` and only used by the {@link Wordlift_Batch_Analysis_Service}
-	 * `submit` function. But since we want to maintain compatibility with PHP 5.3
-	 * and we couldn't use traits to hide the function from the Wordlift_Batch_Analysis_Service
-	 * we used a Helper function.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param array $args An array of parameters, see {@link submit}.
-	 *
-	 * @return string The base SQL.
-	 */
-	public static function get_sql( $args ) {
-		global $wpdb;
-
-		/*
+    /**
+     * Get the base SQL statement to submit a post for Batch Analysis.
+     *
+     * Functions may use this base SQL and add their own filters. This function
+     * should be `private` and only used by the {@link Wordlift_Batch_Analysis_Service}
+     * `submit` function. But since we want to maintain compatibility with PHP 5.3
+     * and we couldn't use traits to hide the function from the Wordlift_Batch_Analysis_Service
+     * we used a Helper function.
+     *
+     * @since 3.14.2
+     *
+     * @param array $args An array of parameters, see {@link submit}.
+     *
+     * @return string The base SQL.
+     */
+    public static function get_sql( $args ) {
+        global $wpdb;
+
+        /*
 		Prepare the statement:
 			1. Insert into `postmeta` the meta keys and values:
 				a) state meta, with value of SUBMIT (0),
@@ -45,21 +45,21 @@ 
 			9. Filter by `post_id` where `exclude` is the posts id to exclude.
 		*/
 
-		// @codingStandardsIgnoreStart, Ignore phpcs sanitation errors.
-		return "SELECT p.ID FROM $wpdb->posts p"
-			   . " WHERE p.post_type IN ('" . join( "', '", array_map( 'esc_sql', (array) $args['post_type'] ) ) . "')"
-			   . "  AND p.post_status = 'publish'"
-			   . Wordlift_Batch_Analysis_Sql_Helper::and_include_annotated( $args['include_annotated'] )
-			   . Wordlift_Batch_Analysis_Sql_Helper::and_post_date_from( $args['from'] )
-			   . Wordlift_Batch_Analysis_Sql_Helper::and_post_date_to( $args['to'] )
-			   . Wordlift_Batch_Analysis_Sql_Helper::and_exclude_posts( $args['exclude'] );
-		// @codingStandardsIgnoreEnd
-	}
-
-	public static function get_sql_for_ids( $args ) {
-		global $wpdb;
-
-		/*
+        // @codingStandardsIgnoreStart, Ignore phpcs sanitation errors.
+        return "SELECT p.ID FROM $wpdb->posts p"
+                . " WHERE p.post_type IN ('" . join( "', '", array_map( 'esc_sql', (array) $args['post_type'] ) ) . "')"
+                . "  AND p.post_status = 'publish'"
+                . Wordlift_Batch_Analysis_Sql_Helper::and_include_annotated( $args['include_annotated'] )
+                . Wordlift_Batch_Analysis_Sql_Helper::and_post_date_from( $args['from'] )
+                . Wordlift_Batch_Analysis_Sql_Helper::and_post_date_to( $args['to'] )
+                . Wordlift_Batch_Analysis_Sql_Helper::and_exclude_posts( $args['exclude'] );
+        // @codingStandardsIgnoreEnd
+    }
+
+    public static function get_sql_for_ids( $args ) {
+        global $wpdb;
+
+        /*
 		Prepare the statement:
 			1. Insert into `postmeta` the meta keys and values:
 				a) state meta, with value of SUBMIT (0),
@@ -75,148 +75,148 @@ 
 			9. Filter by `post_id` where `exclude` is the posts id to exclude.
 		*/
 
-		// @codingStandardsIgnoreStart, Ignore phpcs sanitation errors.
-
-		return "SELECT p.ID FROM $wpdb->posts p WHERE p.id IN (" . implode( ', ', wp_parse_id_list( $args['ids'] ) ) . ")";
-		// @codingStandardsIgnoreEnd
-	}
-
-	/**
-	 * Add a clause to analyze all auto selected posts, i.e. non annotated posts.
-	 *
-	 * @param bool $include Whether to include annotated posts in selection.
-	 *
-	 * @since  3.17.0
-	 *
-	 * @return string The `post_content` clause.
-	 */
-	private static function and_include_annotated( $include ) {
-
-		// Bail out with an empty string if we include all the posts.
-		if ( true === $include ) {
-			return '';
-		}
-
-		// Filter out already annotated posts.
-		return " AND p.post_content NOT REGEXP '<[a-z]+ id=\"urn:[^\"]+\" class=\"[^\"]+\" itemid=\"[^\"]+\">'";
-	}
-
-	/**
-	 * Add the start date clause.
-	 *
-	 * @param  DateTime|null $value The date where the analysis should start.
-	 *
-	 * @since  3.17.0
-	 *
-	 * @return string The start `post_date_gmt` clause
-	 */
-	private static function and_post_date_from( $value ) {
-
-		// Bail out if the `from` isn't specified.
-		if ( null === $value ) {
-			return '';
-		}
-
-		// Try to convert the value to a date, GMT timezone.
-		$date = self::get_mysql_date_string( $value );
-
-		// Return the clause.
-		return " AND p.post_date_gmt >= '$date'";
-	}
-
-	/**
-	 * Add the `to` date clause.
-	 *
-	 * @param  DateTime|null $value The `to` date clause.
-	 *
-	 * @since  3.17.0
-	 *
-	 * @return string The end `post_date_gmt` clause
-	 */
-	private static function and_post_date_to( $value ) {
-
-		// Bail out if the `from` isn't specified.
-		if ( null === $value ) {
-			return '';
-		}
-
-		// Try to convert the value to a date, GMT timezone.
-		$date = self::get_mysql_date_string( $value );
-
-		// Return the clause.
-		return " AND p.post_date_gmt <= '$date'";
-	}
-
-	/**
-	 * Include specific posts by their id in the analysis.
-	 *
-	 * @param array $include Array of post ids to include.
-	 *
-	 * @since  3.17.0
-	 *
-	 * @return string The posts IN clause.
-	 */
-	private static function and_include_posts( $include ) {
-
-		// Bail if the param is not set.
-		if ( empty( $include ) ) {
-			return '';
-		}
-
-		return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( $include ) ) . ' )';
-	}
-
-	/**
-	 * Exclude specific posts by ids.
-	 *
-	 * @param array $exclude Array of post ids to exclude.
-	 *
-	 * @since  3.17.0
-	 *
-	 * @return string The posts NOT IN clause.
-	 */
-	private static function and_exclude_posts( $exclude ) {
-
-		// Bail if the param is not set.
-		if ( empty( $exclude ) ) {
-			return '';
-		}
-
-		return ' AND p.ID NOT IN ( ' . implode( ',', wp_parse_id_list( $exclude ) ) . ' )';
-	}
-
-
-	/**
-	 * Convert a `Y-m-d'T'H:i:sT` string representation of a date to a MySQL
-	 * date string, taking into consideration the time zone.
-	 *
-	 * If the date string cannot be converted, the processing is stopped.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @param string $value A date represented as `Y-m-d'T'H:i:sT`.
-	 *
-	 * @return string A MySQL string representation of the date.
-	 */
-	private static function get_mysql_date_string( $value ) {
-
-		// Try to convert the value to a date, GMT timezone.
-		$date = date_create_from_format( 'Y-m-d\TH:i:sT', $value );
-
-		if ( false === $date ) {
-			wp_die( "Invalid date format, use `Y-m-d'T'H:i:sT`." );
-		}
-
-		// Convert the DateTime timezone to `GMT`.
-		$date->setTimezone( timezone_open( 'GMT' ) );
-
-		// Stop if the conversion failed.
-		if ( false === $date ) {
-			wp_die( "Invalid date format, date must be in Y-m-d'T'H:i:sT format." );
-		}
-
-		// Return the clause.
-		return $date->format( 'Y-m-d H:i:s' );
-	}
+        // @codingStandardsIgnoreStart, Ignore phpcs sanitation errors.
+
+        return "SELECT p.ID FROM $wpdb->posts p WHERE p.id IN (" . implode( ', ', wp_parse_id_list( $args['ids'] ) ) . ")";
+        // @codingStandardsIgnoreEnd
+    }
+
+    /**
+     * Add a clause to analyze all auto selected posts, i.e. non annotated posts.
+     *
+     * @param bool $include Whether to include annotated posts in selection.
+     *
+     * @since  3.17.0
+     *
+     * @return string The `post_content` clause.
+     */
+    private static function and_include_annotated( $include ) {
+
+        // Bail out with an empty string if we include all the posts.
+        if ( true === $include ) {
+            return '';
+        }
+
+        // Filter out already annotated posts.
+        return " AND p.post_content NOT REGEXP '<[a-z]+ id=\"urn:[^\"]+\" class=\"[^\"]+\" itemid=\"[^\"]+\">'";
+    }
+
+    /**
+     * Add the start date clause.
+     *
+     * @param  DateTime|null $value The date where the analysis should start.
+     *
+     * @since  3.17.0
+     *
+     * @return string The start `post_date_gmt` clause
+     */
+    private static function and_post_date_from( $value ) {
+
+        // Bail out if the `from` isn't specified.
+        if ( null === $value ) {
+            return '';
+        }
+
+        // Try to convert the value to a date, GMT timezone.
+        $date = self::get_mysql_date_string( $value );
+
+        // Return the clause.
+        return " AND p.post_date_gmt >= '$date'";
+    }
+
+    /**
+     * Add the `to` date clause.
+     *
+     * @param  DateTime|null $value The `to` date clause.
+     *
+     * @since  3.17.0
+     *
+     * @return string The end `post_date_gmt` clause
+     */
+    private static function and_post_date_to( $value ) {
+
+        // Bail out if the `from` isn't specified.
+        if ( null === $value ) {
+            return '';
+        }
+
+        // Try to convert the value to a date, GMT timezone.
+        $date = self::get_mysql_date_string( $value );
+
+        // Return the clause.
+        return " AND p.post_date_gmt <= '$date'";
+    }
+
+    /**
+     * Include specific posts by their id in the analysis.
+     *
+     * @param array $include Array of post ids to include.
+     *
+     * @since  3.17.0
+     *
+     * @return string The posts IN clause.
+     */
+    private static function and_include_posts( $include ) {
+
+        // Bail if the param is not set.
+        if ( empty( $include ) ) {
+            return '';
+        }
+
+        return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( $include ) ) . ' )';
+    }
+
+    /**
+     * Exclude specific posts by ids.
+     *
+     * @param array $exclude Array of post ids to exclude.
+     *
+     * @since  3.17.0
+     *
+     * @return string The posts NOT IN clause.
+     */
+    private static function and_exclude_posts( $exclude ) {
+
+        // Bail if the param is not set.
+        if ( empty( $exclude ) ) {
+            return '';
+        }
+
+        return ' AND p.ID NOT IN ( ' . implode( ',', wp_parse_id_list( $exclude ) ) . ' )';
+    }
+
+
+    /**
+     * Convert a `Y-m-d'T'H:i:sT` string representation of a date to a MySQL
+     * date string, taking into consideration the time zone.
+     *
+     * If the date string cannot be converted, the processing is stopped.
+     *
+     * @since 3.17.0
+     *
+     * @param string $value A date represented as `Y-m-d'T'H:i:sT`.
+     *
+     * @return string A MySQL string representation of the date.
+     */
+    private static function get_mysql_date_string( $value ) {
+
+        // Try to convert the value to a date, GMT timezone.
+        $date = date_create_from_format( 'Y-m-d\TH:i:sT', $value );
+
+        if ( false === $date ) {
+            wp_die( "Invalid date format, use `Y-m-d'T'H:i:sT`." );
+        }
+
+        // Convert the DateTime timezone to `GMT`.
+        $date->setTimezone( timezone_open( 'GMT' ) );
+
+        // Stop if the conversion failed.
+        if ( false === $date ) {
+            wp_die( "Invalid date format, date must be in Y-m-d'T'H:i:sT format." );
+        }
+
+        // Return the clause.
+        return $date->format( 'Y-m-d H:i:s' );
+    }
 
 }

Spacing +30 added lines, -30 removed lines

@@ -26,7 +26,7 @@ 
 	 *
 	 * @return string The base SQL.
 	 */
-	public static function get_sql( $args ) {
+	public static function get_sql($args) {
 		global $wpdb;
 
 		/*
@@ -47,16 +47,16 @@ 
 
 		// @codingStandardsIgnoreStart, Ignore phpcs sanitation errors.
 		return "SELECT p.ID FROM $wpdb->posts p"
-			   . " WHERE p.post_type IN ('" . join( "', '", array_map( 'esc_sql', (array) $args['post_type'] ) ) . "')"
+			   . " WHERE p.post_type IN ('".join("', '", array_map('esc_sql', (array) $args['post_type']))."')"
 			   . "  AND p.post_status = 'publish'"
-			   . Wordlift_Batch_Analysis_Sql_Helper::and_include_annotated( $args['include_annotated'] )
-			   . Wordlift_Batch_Analysis_Sql_Helper::and_post_date_from( $args['from'] )
-			   . Wordlift_Batch_Analysis_Sql_Helper::and_post_date_to( $args['to'] )
-			   . Wordlift_Batch_Analysis_Sql_Helper::and_exclude_posts( $args['exclude'] );
+			   . Wordlift_Batch_Analysis_Sql_Helper::and_include_annotated($args['include_annotated'])
+			   . Wordlift_Batch_Analysis_Sql_Helper::and_post_date_from($args['from'])
+			   . Wordlift_Batch_Analysis_Sql_Helper::and_post_date_to($args['to'])
+			   . Wordlift_Batch_Analysis_Sql_Helper::and_exclude_posts($args['exclude']);
 		// @codingStandardsIgnoreEnd
 	}
 
-	public static function get_sql_for_ids( $args ) {
+	public static function get_sql_for_ids($args) {
 		global $wpdb;
 
 		/*
@@ -77,7 +77,7 @@ 
 
 		// @codingStandardsIgnoreStart, Ignore phpcs sanitation errors.
 
-		return "SELECT p.ID FROM $wpdb->posts p WHERE p.id IN (" . implode( ', ', wp_parse_id_list( $args['ids'] ) ) . ")";
+		return "SELECT p.ID FROM $wpdb->posts p WHERE p.id IN (".implode(', ', wp_parse_id_list($args['ids'])).")";
 		// @codingStandardsIgnoreEnd
 	}
 
@@ -90,10 +90,10 @@ 
 	 *
 	 * @return string The `post_content` clause.
 	 */
-	private static function and_include_annotated( $include ) {
+	private static function and_include_annotated($include) {
 
 		// Bail out with an empty string if we include all the posts.
-		if ( true === $include ) {
+		if (true === $include) {
 			return '';
 		}
 
@@ -110,15 +110,15 @@ 
 	 *
 	 * @return string The start `post_date_gmt` clause
 	 */
-	private static function and_post_date_from( $value ) {
+	private static function and_post_date_from($value) {
 
 		// Bail out if the `from` isn't specified.
-		if ( null === $value ) {
+		if (null === $value) {
 			return '';
 		}
 
 		// Try to convert the value to a date, GMT timezone.
-		$date = self::get_mysql_date_string( $value );
+		$date = self::get_mysql_date_string($value);
 
 		// Return the clause.
 		return " AND p.post_date_gmt >= '$date'";
@@ -133,15 +133,15 @@ 
 	 *
 	 * @return string The end `post_date_gmt` clause
 	 */
-	private static function and_post_date_to( $value ) {
+	private static function and_post_date_to($value) {
 
 		// Bail out if the `from` isn't specified.
-		if ( null === $value ) {
+		if (null === $value) {
 			return '';
 		}
 
 		// Try to convert the value to a date, GMT timezone.
-		$date = self::get_mysql_date_string( $value );
+		$date = self::get_mysql_date_string($value);
 
 		// Return the clause.
 		return " AND p.post_date_gmt <= '$date'";
@@ -156,14 +156,14 @@ 
 	 *
 	 * @return string The posts IN clause.
 	 */
-	private static function and_include_posts( $include ) {
+	private static function and_include_posts($include) {
 
 		// Bail if the param is not set.
-		if ( empty( $include ) ) {
+		if (empty($include)) {
 			return '';
 		}
 
-		return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( $include ) ) . ' )';
+		return ' AND p.ID IN ( '.implode(',', wp_parse_id_list($include)).' )';
 	}
 
 	/**
@@ -175,14 +175,14 @@ 
 	 *
 	 * @return string The posts NOT IN clause.
 	 */
-	private static function and_exclude_posts( $exclude ) {
+	private static function and_exclude_posts($exclude) {
 
 		// Bail if the param is not set.
-		if ( empty( $exclude ) ) {
+		if (empty($exclude)) {
 			return '';
 		}
 
-		return ' AND p.ID NOT IN ( ' . implode( ',', wp_parse_id_list( $exclude ) ) . ' )';
+		return ' AND p.ID NOT IN ( '.implode(',', wp_parse_id_list($exclude)).' )';
 	}
 
 
@@ -198,25 +198,25 @@ 
 	 *
 	 * @return string A MySQL string representation of the date.
 	 */
-	private static function get_mysql_date_string( $value ) {
+	private static function get_mysql_date_string($value) {
 
 		// Try to convert the value to a date, GMT timezone.
-		$date = date_create_from_format( 'Y-m-d\TH:i:sT', $value );
+		$date = date_create_from_format('Y-m-d\TH:i:sT', $value);
 
-		if ( false === $date ) {
-			wp_die( "Invalid date format, use `Y-m-d'T'H:i:sT`." );
+		if (false === $date) {
+			wp_die("Invalid date format, use `Y-m-d'T'H:i:sT`.");
 		}
 
 		// Convert the DateTime timezone to `GMT`.
-		$date->setTimezone( timezone_open( 'GMT' ) );
+		$date->setTimezone(timezone_open('GMT'));
 
 		// Stop if the conversion failed.
-		if ( false === $date ) {
-			wp_die( "Invalid date format, date must be in Y-m-d'T'H:i:sT format." );
+		if (false === $date) {
+			wp_die("Invalid date format, date must be in Y-m-d'T'H:i:sT format.");
 		}
 
 		// Return the clause.
-		return $date->format( 'Y-m-d H:i:s' );
+		return $date->format('Y-m-d H:i:s');
 	}
 
 }

src/includes/batch-analysis/class-wordlift-batch-analysis-service.php

Indentation +751 added lines, -751 removed lines

@@ -51,558 +51,558 @@ 
  */
 class Wordlift_Batch_Analysis_Service {
 
-	/**
-	 * The list of states for the Batch Analysis:
-	 *  - STATE_META_KEY: the batch analysis state meta key,
-	 *  - STATE_SUBMIT: a post/page has been submitted for analysis,
-	 *  - STATE_REQUEST: the plugin requested an analysis for the submitted
-	 *      post/page,
-	 *  - STATE_SUCCESS: the analysis has completed successfully,
-	 *  - STATE_ERROR: the analysis returned an error.
-	 *
-	 * @since 3.14.2
-	 */
-	const STATE_META_KEY = '_wl_batch_analysis_state';
-	const STATE_SUBMIT = 0;
-	const STATE_REQUEST = 1;
-	// ### COMPLETE states.
-	const STATE_SUCCESS = 2;
-	const STATE_ERROR = 2;
-
-	/**
-	 * The submit timestamp meta key. A post may have more than one timestamp.
-	 *
-	 * @since 3.14.2
-	 */
-	const SUBMIT_TIMESTAMP_META_KEY = '_wl_batch_analysis_submit_timestamp';
-
-	/**
-	 * The request timestamp meta key. A post may have more than one timestamp.
-	 *
-	 * @since 3.14.2
-	 */
-	const REQUEST_TIMESTAMP_META_KEY = '_wl_batch_analysis_request_timestamp';
-
-	/**
-	 * The complete (success or error) timestamp meta key. A post may have more
-	 * than one timestamp.
-	 *
-	 * @since 3.14.2
-	 */
-	const COMPLETE_TIMESTAMP_META_KEY = '_wl_batch_analysis_complete_timestamp';
-
-	/**
-	 * The options setting meta key. A post may have more than one setting.
-	 *
-	 * @since 3.14.2
-	 */
-	const BATCH_ANALYSIS_OPTIONS_META_KEY = '_wl_batch_analysis_options';
-
-	/**
-	 * The warning timestamp meta key. A post has only zero/one value.
-	 *
-	 * @since 3.14.2
-	 */
-	const WARNING_META_KEY = '_wl_batch_analysis_warning';
-
-	/**
-	 * Option name.
-	 *
-	 * @since  3.14.0
-	 */
-	const OPTION_NAME = 'wl_analyze_batch';
-
-	/**
-	 * Name of waiting to be processed queue array inside the option.
-	 *
-	 * @since  3.14.0
-	 */
-	const ANALYZE_QUEUE = 'queue';
-
-	/**
-	 * Name of waiting for response queue array inside the option.
-	 *
-	 * @since  3.14.0
-	 */
-	const RESPONSE_QUEUE = 'processing';
-
-	/**
-	 * Regular expressions that match interpolation errors.
-	 *
-	 * @since  3.17.0
-	 */
-	private static $interpolation_patterns = array(
-		// Matches word before the annotation.
-		'~(\w)<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">(.*?)<\/[a-z]+>~',
-		// Matches word after the annotation.
-		'~<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">(.*?)<\/[a-z]+>(\w)~',
-		// Matches space in the beginning of annotation name.
-		'~<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">(\s)(.*?)<\/[a-z]+>~',
-	);
-
-	/**
-	 * The {@link Wordlift} plugin instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	private $plugin;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_Cache_Service} instance.
-	 *
-	 * @since  3.17.0
-	 * @access protected
-	 * @var \Wordlift_Cache_Service $cache_service The {@link Wordlift_Cache_Service} instance.
-	 */
-	private $cache_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.14.2
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Class_Wordlift_Batch_Analys_Service} instance.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param \Wordlift                       $plugin                The {@link Wordlift} plugin instance.
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 * @param \Wordlift_Cache_Service         $cache_service         The {@link Wordlift_Cache_Service} instance.
-	 */
-	public function __construct( $plugin, $configuration_service, $cache_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Batch_Analysis_Service' );
-
-		$this->plugin                = $plugin;
-		$this->configuration_service = $configuration_service;
-		$this->cache_service         = $cache_service;
-
-		add_action( 'wl_async_wl_batch_analysis_request', array(
-			$this,
-			'request',
-		) );
-		add_action( 'wl_async_wl_batch_analysis_complete', array(
-			$this,
-			'complete',
-		) );
-
-	}
-
-	/**
-	 * Submit posts for Batch Analysis.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param array       $args               {
-	 *                                        A list of options for the Batch Analysis.
-	 *
-	 * @type string       $link               Either `default`, `no` or `yes` (`default` is used if not specified):
-	 *                                        * `default` doesn't set the link option - entities
-	 *                                           will be linked if configured so in WordLift settings.
-	 *                                        * `yes` links the entities.
-	 *                                        * `no` doesn't link the entities.
-	 *                                        This value is forwarded to WLS' Batch Analysis end-point.
-	 * @type int          $min_occurrences    The minimum number of occurrences to select
-	 *                                        an entity. Default `1`.
-	 * @type bool         $include_annotated  Whether to include annotated posts in selection.
-	 *                                        Default `false`.
-	 * @type array|int    $include            Explicitly include the specified {@link WP_Post}s.
-	 * @type array|int    $exclude            Explicitly exclude the specified {@link WP_Post}s.
-	 * @type string|null  $from               An optional date from filter (used in `post_date_gmt`).
-	 * @type string|null  $to                 An optional date from filter (used in `post_date_gmt`).
-	 * @type array|string $post_type          Specify the post type(s), by default only `post`.
-	 *                      }
-	 *
-	 * @return int The number of submitted {@link WP_Post}s or false on error.
-	 */
-	public function submit( $args ) {
-		// Parse the parameters.
-		$params = wp_parse_args( $args, array(
-			'links'             => 'default',
-			'min_occurrences'   => 1,
-			'include_annotated' => false,
-			'exclude'           => array(),
-			'from'              => null,
-			'to'                => null,
-			'post_type'         => 'post',
-		) );
-
-		// Validation.
-		if ( ! in_array( $params['links'], array( 'default', 'yes', 'no' ) ) ) {
-			wp_die( '`link` must be one of the following: `default`, `yes` or `no`.' );
-		}
-
-		if ( ! is_numeric( $params['min_occurrences'] ) || 1 > $params['min_occurrences'] ) {
-			wp_die( '`min_occurrences` must greater or equal 1.' );
-		}
-
-		// Get the sql query.
-		$query = Wordlift_Batch_Analysis_Sql_Helper::get_sql( $params );
-
-		// Set the post metas and get the value of the posts.
-		$submitted_posts = $this->update_posts_meta( $params, $query );
-
-		// Request Batch Analysis (the operation is handled asynchronously).
-		do_action( 'wl_batch_analysis_request' );
-
-		// Return the count of the posts.
-		return $submitted_posts;
-	}
-
-	/**
-	 * Submit one or more {@link WP_Posts} for Batch Analysis.
-	 *
-	 * @param array    $args            {
-	 *                                  An array of arguments.
-	 *
-	 * @type string    $link            The link option: `default`, `yes` or
-	 *                                  `no`. If not set `default`.
-	 * @type int       $min_occurrences The minimum number of occurrences. If
-	 *                                  not set `1`.
-	 * @type array|int $ids             An array of {@link WP_Post}s' ids or one
-	 *                                  single numeric {@link WP_Post} id.
-	 *                    }
-	 *
-	 * @return float|int
-	 */
-	public function submit_posts( $args ) {
-		// Parse the parameters.
-		$params = wp_parse_args( $args, array(
-			'links'           => 'default',
-			'min_occurrences' => 1,
-			'ids'             => array(),
-		) );
-
-		// Validation.
-		if ( empty( $params['ids'] ) ) {
-			wp_die( '`ids` cannot be empty.' );
-		}
-
-		// Get the query,
-		$query = Wordlift_Batch_Analysis_Sql_Helper::get_sql_for_ids( $params );
-
-		// Set the post metas and get the value of the posts.
-		$submitted_posts = $this->update_posts_meta( $params, $query );
-
-		// Request Batch Analysis (the operation is handled asynchronously).
-		do_action( 'wl_batch_analysis_request' );
-
-		// Return the count of the posts.
-		return $submitted_posts;
-	}
-
-	/**
-	 * Add metas to the posts that should be analysed.
-	 *
-	 * @param array  $params The request params.
-	 * @param string $query  The mysql query.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return int The number of posts found/submitted.
-	 */
-	public function update_posts_meta( $params, $query ) {
-		global $wpdb;
-
-		// Get the link options.
-		$link_options = array(
-			'links'           => $params['links'],
-			'min_occurrences' => $params['min_occurrences'],
-		);
-
-		// Get the posts that should be submitted for analysis.
-		$posts = $wpdb->get_results( $query ); // WPCS: cache ok, db call ok.
-
-		// Bail if there are no posts found.
-		if ( empty( $posts ) ) {
-			return 0;
-		}
-
-		// Add the post metas.
-		foreach ( $posts as $p ) {
-			add_post_meta( $p->ID, self::STATE_META_KEY, 0 );
-			add_post_meta( $p->ID, self::SUBMIT_TIMESTAMP_META_KEY, gmdate( 'Y-m-d H:i:s' ) );
-			add_post_meta( $p->ID, self::BATCH_ANALYSIS_OPTIONS_META_KEY, $link_options );
-		}
-
-		// Finally return the posts count.
-		return count( $posts );
-	}
-
-	/**
-	 * Cancel the Batch Analysis request for the specified {@link WP_Post}s.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param int|array $post_ids A single {@link WP_Post}'s id or an array of
-	 *                            {@link WP_Post}s' ids.
-	 *
-	 * @return false|int The number of cancelled {@link WP_Post}s or false on
-	 *                   error.
-	 */
-	public function cancel( $post_ids ) {
-		global $wpdb;
-
-		return $wpdb->query( $wpdb->prepare(
-			"
+    /**
+     * The list of states for the Batch Analysis:
+     *  - STATE_META_KEY: the batch analysis state meta key,
+     *  - STATE_SUBMIT: a post/page has been submitted for analysis,
+     *  - STATE_REQUEST: the plugin requested an analysis for the submitted
+     *      post/page,
+     *  - STATE_SUCCESS: the analysis has completed successfully,
+     *  - STATE_ERROR: the analysis returned an error.
+     *
+     * @since 3.14.2
+     */
+    const STATE_META_KEY = '_wl_batch_analysis_state';
+    const STATE_SUBMIT = 0;
+    const STATE_REQUEST = 1;
+    // ### COMPLETE states.
+    const STATE_SUCCESS = 2;
+    const STATE_ERROR = 2;
+
+    /**
+     * The submit timestamp meta key. A post may have more than one timestamp.
+     *
+     * @since 3.14.2
+     */
+    const SUBMIT_TIMESTAMP_META_KEY = '_wl_batch_analysis_submit_timestamp';
+
+    /**
+     * The request timestamp meta key. A post may have more than one timestamp.
+     *
+     * @since 3.14.2
+     */
+    const REQUEST_TIMESTAMP_META_KEY = '_wl_batch_analysis_request_timestamp';
+
+    /**
+     * The complete (success or error) timestamp meta key. A post may have more
+     * than one timestamp.
+     *
+     * @since 3.14.2
+     */
+    const COMPLETE_TIMESTAMP_META_KEY = '_wl_batch_analysis_complete_timestamp';
+
+    /**
+     * The options setting meta key. A post may have more than one setting.
+     *
+     * @since 3.14.2
+     */
+    const BATCH_ANALYSIS_OPTIONS_META_KEY = '_wl_batch_analysis_options';
+
+    /**
+     * The warning timestamp meta key. A post has only zero/one value.
+     *
+     * @since 3.14.2
+     */
+    const WARNING_META_KEY = '_wl_batch_analysis_warning';
+
+    /**
+     * Option name.
+     *
+     * @since  3.14.0
+     */
+    const OPTION_NAME = 'wl_analyze_batch';
+
+    /**
+     * Name of waiting to be processed queue array inside the option.
+     *
+     * @since  3.14.0
+     */
+    const ANALYZE_QUEUE = 'queue';
+
+    /**
+     * Name of waiting for response queue array inside the option.
+     *
+     * @since  3.14.0
+     */
+    const RESPONSE_QUEUE = 'processing';
+
+    /**
+     * Regular expressions that match interpolation errors.
+     *
+     * @since  3.17.0
+     */
+    private static $interpolation_patterns = array(
+        // Matches word before the annotation.
+        '~(\w)<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">(.*?)<\/[a-z]+>~',
+        // Matches word after the annotation.
+        '~<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">(.*?)<\/[a-z]+>(\w)~',
+        // Matches space in the beginning of annotation name.
+        '~<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">(\s)(.*?)<\/[a-z]+>~',
+    );
+
+    /**
+     * The {@link Wordlift} plugin instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    private $plugin;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_Cache_Service} instance.
+     *
+     * @since  3.17.0
+     * @access protected
+     * @var \Wordlift_Cache_Service $cache_service The {@link Wordlift_Cache_Service} instance.
+     */
+    private $cache_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.14.2
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Class_Wordlift_Batch_Analys_Service} instance.
+     *
+     * @since 3.14.0
+     *
+     * @param \Wordlift                       $plugin                The {@link Wordlift} plugin instance.
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     * @param \Wordlift_Cache_Service         $cache_service         The {@link Wordlift_Cache_Service} instance.
+     */
+    public function __construct( $plugin, $configuration_service, $cache_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Batch_Analysis_Service' );
+
+        $this->plugin                = $plugin;
+        $this->configuration_service = $configuration_service;
+        $this->cache_service         = $cache_service;
+
+        add_action( 'wl_async_wl_batch_analysis_request', array(
+            $this,
+            'request',
+        ) );
+        add_action( 'wl_async_wl_batch_analysis_complete', array(
+            $this,
+            'complete',
+        ) );
+
+    }
+
+    /**
+     * Submit posts for Batch Analysis.
+     *
+     * @since 3.14.2
+     *
+     * @param array       $args               {
+     *                                        A list of options for the Batch Analysis.
+     *
+     * @type string       $link               Either `default`, `no` or `yes` (`default` is used if not specified):
+     *                                        * `default` doesn't set the link option - entities
+     *                                           will be linked if configured so in WordLift settings.
+     *                                        * `yes` links the entities.
+     *                                        * `no` doesn't link the entities.
+     *                                        This value is forwarded to WLS' Batch Analysis end-point.
+     * @type int          $min_occurrences    The minimum number of occurrences to select
+     *                                        an entity. Default `1`.
+     * @type bool         $include_annotated  Whether to include annotated posts in selection.
+     *                                        Default `false`.
+     * @type array|int    $include            Explicitly include the specified {@link WP_Post}s.
+     * @type array|int    $exclude            Explicitly exclude the specified {@link WP_Post}s.
+     * @type string|null  $from               An optional date from filter (used in `post_date_gmt`).
+     * @type string|null  $to                 An optional date from filter (used in `post_date_gmt`).
+     * @type array|string $post_type          Specify the post type(s), by default only `post`.
+     *                      }
+     *
+     * @return int The number of submitted {@link WP_Post}s or false on error.
+     */
+    public function submit( $args ) {
+        // Parse the parameters.
+        $params = wp_parse_args( $args, array(
+            'links'             => 'default',
+            'min_occurrences'   => 1,
+            'include_annotated' => false,
+            'exclude'           => array(),
+            'from'              => null,
+            'to'                => null,
+            'post_type'         => 'post',
+        ) );
+
+        // Validation.
+        if ( ! in_array( $params['links'], array( 'default', 'yes', 'no' ) ) ) {
+            wp_die( '`link` must be one of the following: `default`, `yes` or `no`.' );
+        }
+
+        if ( ! is_numeric( $params['min_occurrences'] ) || 1 > $params['min_occurrences'] ) {
+            wp_die( '`min_occurrences` must greater or equal 1.' );
+        }
+
+        // Get the sql query.
+        $query = Wordlift_Batch_Analysis_Sql_Helper::get_sql( $params );
+
+        // Set the post metas and get the value of the posts.
+        $submitted_posts = $this->update_posts_meta( $params, $query );
+
+        // Request Batch Analysis (the operation is handled asynchronously).
+        do_action( 'wl_batch_analysis_request' );
+
+        // Return the count of the posts.
+        return $submitted_posts;
+    }
+
+    /**
+     * Submit one or more {@link WP_Posts} for Batch Analysis.
+     *
+     * @param array    $args            {
+     *                                  An array of arguments.
+     *
+     * @type string    $link            The link option: `default`, `yes` or
+     *                                  `no`. If not set `default`.
+     * @type int       $min_occurrences The minimum number of occurrences. If
+     *                                  not set `1`.
+     * @type array|int $ids             An array of {@link WP_Post}s' ids or one
+     *                                  single numeric {@link WP_Post} id.
+     *                    }
+     *
+     * @return float|int
+     */
+    public function submit_posts( $args ) {
+        // Parse the parameters.
+        $params = wp_parse_args( $args, array(
+            'links'           => 'default',
+            'min_occurrences' => 1,
+            'ids'             => array(),
+        ) );
+
+        // Validation.
+        if ( empty( $params['ids'] ) ) {
+            wp_die( '`ids` cannot be empty.' );
+        }
+
+        // Get the query,
+        $query = Wordlift_Batch_Analysis_Sql_Helper::get_sql_for_ids( $params );
+
+        // Set the post metas and get the value of the posts.
+        $submitted_posts = $this->update_posts_meta( $params, $query );
+
+        // Request Batch Analysis (the operation is handled asynchronously).
+        do_action( 'wl_batch_analysis_request' );
+
+        // Return the count of the posts.
+        return $submitted_posts;
+    }
+
+    /**
+     * Add metas to the posts that should be analysed.
+     *
+     * @param array  $params The request params.
+     * @param string $query  The mysql query.
+     *
+     * @since 3.18.0
+     *
+     * @return int The number of posts found/submitted.
+     */
+    public function update_posts_meta( $params, $query ) {
+        global $wpdb;
+
+        // Get the link options.
+        $link_options = array(
+            'links'           => $params['links'],
+            'min_occurrences' => $params['min_occurrences'],
+        );
+
+        // Get the posts that should be submitted for analysis.
+        $posts = $wpdb->get_results( $query ); // WPCS: cache ok, db call ok.
+
+        // Bail if there are no posts found.
+        if ( empty( $posts ) ) {
+            return 0;
+        }
+
+        // Add the post metas.
+        foreach ( $posts as $p ) {
+            add_post_meta( $p->ID, self::STATE_META_KEY, 0 );
+            add_post_meta( $p->ID, self::SUBMIT_TIMESTAMP_META_KEY, gmdate( 'Y-m-d H:i:s' ) );
+            add_post_meta( $p->ID, self::BATCH_ANALYSIS_OPTIONS_META_KEY, $link_options );
+        }
+
+        // Finally return the posts count.
+        return count( $posts );
+    }
+
+    /**
+     * Cancel the Batch Analysis request for the specified {@link WP_Post}s.
+     *
+     * @since 3.14.2
+     *
+     * @param int|array $post_ids A single {@link WP_Post}'s id or an array of
+     *                            {@link WP_Post}s' ids.
+     *
+     * @return false|int The number of cancelled {@link WP_Post}s or false on
+     *                   error.
+     */
+    public function cancel( $post_ids ) {
+        global $wpdb;
+
+        return $wpdb->query( $wpdb->prepare(
+            "
 			DELETE FROM $wpdb->postmeta
 			WHERE meta_key = %s
 				AND meta_value IN ( %d, %d )
 				AND post_id IN( " . implode( ',', wp_parse_id_list( $post_ids ) ) . " )
 			",
-			self::STATE_META_KEY,
-			self::STATE_SUBMIT,
-			self::STATE_REQUEST
-		) ); // WPCS: cache ok, db call ok.
+            self::STATE_META_KEY,
+            self::STATE_SUBMIT,
+            self::STATE_REQUEST
+        ) ); // WPCS: cache ok, db call ok.
 
-	}
+    }
 
-	/**
-	 * Request the batch analysis for submitted posts.
-	 *
-	 * @since 3.14.2
-	 */
-	public function request() {
+    /**
+     * Request the batch analysis for submitted posts.
+     *
+     * @since 3.14.2
+     */
+    public function request() {
 
-		$this->log->debug( 'Requesting analysis...' );
+        $this->log->debug( 'Requesting analysis...' );
 
-		// By default 5 posts of any post type are returned.
-		$posts = get_posts( array(
-			'fields'     => 'ids',
-			'meta_key'   => self::STATE_META_KEY,
-			'meta_value' => self::STATE_SUBMIT,
-			'orderby'    => 'ID',
-			'post_type'  => 'any',
-		) );
+        // By default 5 posts of any post type are returned.
+        $posts = get_posts( array(
+            'fields'     => 'ids',
+            'meta_key'   => self::STATE_META_KEY,
+            'meta_value' => self::STATE_SUBMIT,
+            'orderby'    => 'ID',
+            'post_type'  => 'any',
+        ) );
 
-		// Bail out if there are no submitted posts.
-		if ( empty( $posts ) ) {
-			$this->log->debug( 'No posts to submit found, checking for completed requests...' );
-
-			do_action( 'wl_batch_analysis_complete' );
+        // Bail out if there are no submitted posts.
+        if ( empty( $posts ) ) {
+            $this->log->debug( 'No posts to submit found, checking for completed requests...' );
+
+            do_action( 'wl_batch_analysis_complete' );
 
-			return;
-		}
+            return;
+        }
 
-		// Send a request for each post.
-		foreach ( $posts as $id ) {
+        // Send a request for each post.
+        foreach ( $posts as $id ) {
 
-			$this->log->debug( "Requesting analysis for post $id..." );
+            $this->log->debug( "Requesting analysis for post $id..." );
 
-			// Send the actual request to the remote service.
-			$result = $this->do_request( $id );
+            // Send the actual request to the remote service.
+            $result = $this->do_request( $id );
 
-			// Set an error if we received an error.
-			if ( is_wp_error( $result ) ) {
-				$this->log->error( "An error occurred while requesting a batch analysis for post $id: " . $result->get_error_message() );
+            // Set an error if we received an error.
+            if ( is_wp_error( $result ) ) {
+                $this->log->error( "An error occurred while requesting a batch analysis for post $id: " . $result->get_error_message() );
 
-				$this->set_state( $id, self::STATE_ERROR );
-			}
+                $this->set_state( $id, self::STATE_ERROR );
+            }
 
-		}
+        }
 
-		// Call the `wl_batch_analysis_request` action again. This is going
-		// to be handled by the async task.
-		do_action( 'wl_batch_analysis_request' );
+        // Call the `wl_batch_analysis_request` action again. This is going
+        // to be handled by the async task.
+        do_action( 'wl_batch_analysis_request' );
 
-	}
+    }
 
-	/**
-	 * Get the results for the Batch Analysis.
-	 *
-	 * @since 3.14.2
-	 */
-	public function complete() {
-
-		$this->log->debug( 'Requesting results...' );
+    /**
+     * Get the results for the Batch Analysis.
+     *
+     * @since 3.14.2
+     */
+    public function complete() {
+
+        $this->log->debug( 'Requesting results...' );
 
-		// By default 5 posts of any post type are returned.
-		$posts = get_posts( array(
-			'fields'     => 'ids',
-			'meta_key'   => self::STATE_META_KEY,
-			'meta_value' => self::STATE_REQUEST,
-			'orderby'    => 'ID',
-			'post_type'  => 'any',
-		) );
+        // By default 5 posts of any post type are returned.
+        $posts = get_posts( array(
+            'fields'     => 'ids',
+            'meta_key'   => self::STATE_META_KEY,
+            'meta_value' => self::STATE_REQUEST,
+            'orderby'    => 'ID',
+            'post_type'  => 'any',
+        ) );
 
-		// Bail out if there are no submitted posts.
-		if ( empty( $posts ) ) {
-			$this->log->debug( 'No posts in request state found.' );
+        // Bail out if there are no submitted posts.
+        if ( empty( $posts ) ) {
+            $this->log->debug( 'No posts in request state found.' );
 
-			return;
-		}
+            return;
+        }
 
-		// Send a request for each post.
-		foreach ( $posts as $id ) {
-			$this->log->debug( "Requesting results for post $id..." );
+        // Send a request for each post.
+        foreach ( $posts as $id ) {
+            $this->log->debug( "Requesting results for post $id..." );
 
-			// Send the actual request to the remote service.
-			$response = $this->do_complete( $id );
-
-			// Move to the next item if we don't have a reply for this one.
-			if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] || ! isset( $response['body'] ) ) {
-				continue;
-			}
-
-			$this->log->debug( "Results received for post $id." );
-
-			// Save the returned content as new revision.
-			$json = json_decode( $response['body'] );
-
-			// Continue if the content isn't set.
-			if ( empty( $json->content ) ) {
-				// The post content is empty, so is should be marked as completed.
-				$this->log->error( "An error occurred while decoding the batch analysis response for post $id: {$response['body']}" );
+            // Send the actual request to the remote service.
+            $response = $this->do_complete( $id );
+
+            // Move to the next item if we don't have a reply for this one.
+            if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] || ! isset( $response['body'] ) ) {
+                continue;
+            }
+
+            $this->log->debug( "Results received for post $id." );
+
+            // Save the returned content as new revision.
+            $json = json_decode( $response['body'] );
+
+            // Continue if the content isn't set.
+            if ( empty( $json->content ) ) {
+                // The post content is empty, so is should be marked as completed.
+                $this->log->error( "An error occurred while decoding the batch analysis response for post $id: {$response['body']}" );
 
-				$this->set_state( $id, self::STATE_ERROR );
-				continue;
-			}
-
-			// Set the warning flag if needed.
-			$this->set_warning_based_on_content( $json->content, $id );
-
-			// Get the content, cleaned up if there are interpolation errors.
-			$pre_content = $this->fix_interpolation_errors( $json->content, $id );
-
-			/**
-			 * Filter: 'wl_batch_analysis_update_post_content' - Allow third
-			 * parties to perform additional actions when the post content is
-			 * updated.
-			 *
-			 * @since  3.17.0
-			 * @api    string $data The {@link WP_Post}'s content.
-			 * @api    int    $id   The {@link WP_Post}'s id.
-			 */
-			$content = apply_filters( 'wl_batch_analysis_update_post_content', $pre_content, $id );
+                $this->set_state( $id, self::STATE_ERROR );
+                continue;
+            }
+
+            // Set the warning flag if needed.
+            $this->set_warning_based_on_content( $json->content, $id );
+
+            // Get the content, cleaned up if there are interpolation errors.
+            $pre_content = $this->fix_interpolation_errors( $json->content, $id );
+
+            /**
+             * Filter: 'wl_batch_analysis_update_post_content' - Allow third
+             * parties to perform additional actions when the post content is
+             * updated.
+             *
+             * @since  3.17.0
+             * @api    string $data The {@link WP_Post}'s content.
+             * @api    int    $id   The {@link WP_Post}'s id.
+             */
+            $content = apply_filters( 'wl_batch_analysis_update_post_content', $pre_content, $id );
 
-			// Update the post content.
-			wp_update_post( array(
-				'ID'           => $id,
-				'post_content' => wp_slash( $content ),
-			) );
-
-			// Update the status.
-			$this->set_state( $id, self::STATE_SUCCESS );
-
-			// Invalidating the cache for the current post.
-			$this->cache_service->delete_cache( $id );
-
-			$this->log->debug( "Post $id updated with batch analysis results." );
-
-			// Set default entity type term for posts that didn't have any.
-			$this->maybe_set_default_term( $id );
-
-			// @todo: implement a kind of timeout that sets an error if the
-			// results haven't been received after a long time.
-		}
-
-		// Call the `wl_batch_analysis_request` action again. This is going
-		// to be handled by the async task.
-		do_action( 'wl_batch_analysis_complete' );
-
-	}
-
-	/**
-	 * Set a warning flag on the {@link WP_Post} if its content has suspicious
-	 * interpolations.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param string $content The {@link WP_Post}'s content.
-	 * @param int    $post_id The {@link WP_Post}'s id.
-	 */
-	protected function set_warning_based_on_content( $content, $post_id ) {
-
-		// Check for suspicious interpolations.
-		$is_warning = $this->has_interpolation_errors( $content );
-
-		// Set the warning flag accordingly.
-		$this->set_warning( $post_id, $is_warning );
-
-	}
-
-	private function has_interpolation_errors( $content ) {
-		$matches = array();
-
-		// eg:
-		// r-pro<span id="urn:local-text-annotation-oxbgy6139gnjgk1n0oxnq9zg62py29pf" class="textannotation disambiguated wl-thing" itemid="http://data.wordlift.it/be2/entity/developing_country">ne region, has shoul</span>dere
-
-		return 0 < preg_match_all( '/\w<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">/', $content, $matches )
-			   || 0 < preg_match_all( ' /<[a-z]+ id="urn:[^"]+ " class="[^"]+" itemid="[^"]+">\s/', $content, $matches );
-	}
-
-	/**
-	 * Fix interpolation errors raised by Batch Analysis
-	 *
-	 * @param string $content The {@link WP_Post}'s content.
-	 * @param int    $id      The {@link WP_Post}'s id.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @return string Post content without interpolations.
-	 */
-	private function fix_interpolation_errors( $content, $id ) {
-
-		// Bail out if there are no interpolation errors.
-		if ( ! $this->has_interpolation_errors( $content ) ) {
-			$this->log->trace( "No interpolation errors found for post $id." );
-
-			return $content;
-		}
-
-		$this->log->debug( "Fixing post $id interpolations..." );
-
-		// Remove all interpolations from the content.
-		return preg_replace( self::$interpolation_patterns, '$1$2', $content );
-	}
-
-	/**
-	 * Clear the warning flag for the specified {@link WP_Post}s.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param int|array $post_ids A single {@link WP_Post}'s id or an array of
-	 *                            {@link WP_Post}s' ids.
-	 */
-	public function clear_warning( $post_ids ) {
-
-		foreach ( (array) $post_ids as $post_id ) {
-			delete_post_meta( $post_id, self::WARNING_META_KEY );
-		}
-
-	}
-
-	/**
-	 * Set the warning flag for the specified {@link WP_Post}.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param int  $post_id The {@link WP_Post}'s id.
-	 * @param bool $value   The flag's value.
-	 *
-	 * @return int|bool Meta ID if the key didn't exist, true on successful update,
-	 *                  false on failure.
-	 */
-	private function set_warning( $post_id, $value ) {
-
-		return update_post_meta( $post_id, self::WARNING_META_KEY, ( true === $value ? 'yes' : 'no' ) );
-	}
+            // Update the post content.
+            wp_update_post( array(
+                'ID'           => $id,
+                'post_content' => wp_slash( $content ),
+            ) );
+
+            // Update the status.
+            $this->set_state( $id, self::STATE_SUCCESS );
+
+            // Invalidating the cache for the current post.
+            $this->cache_service->delete_cache( $id );
+
+            $this->log->debug( "Post $id updated with batch analysis results." );
+
+            // Set default entity type term for posts that didn't have any.
+            $this->maybe_set_default_term( $id );
+
+            // @todo: implement a kind of timeout that sets an error if the
+            // results haven't been received after a long time.
+        }
+
+        // Call the `wl_batch_analysis_request` action again. This is going
+        // to be handled by the async task.
+        do_action( 'wl_batch_analysis_complete' );
+
+    }
+
+    /**
+     * Set a warning flag on the {@link WP_Post} if its content has suspicious
+     * interpolations.
+     *
+     * @since 3.14.2
+     *
+     * @param string $content The {@link WP_Post}'s content.
+     * @param int    $post_id The {@link WP_Post}'s id.
+     */
+    protected function set_warning_based_on_content( $content, $post_id ) {
+
+        // Check for suspicious interpolations.
+        $is_warning = $this->has_interpolation_errors( $content );
+
+        // Set the warning flag accordingly.
+        $this->set_warning( $post_id, $is_warning );
+
+    }
+
+    private function has_interpolation_errors( $content ) {
+        $matches = array();
+
+        // eg:
+        // r-pro<span id="urn:local-text-annotation-oxbgy6139gnjgk1n0oxnq9zg62py29pf" class="textannotation disambiguated wl-thing" itemid="http://data.wordlift.it/be2/entity/developing_country">ne region, has shoul</span>dere
+
+        return 0 < preg_match_all( '/\w<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">/', $content, $matches )
+               || 0 < preg_match_all( ' /<[a-z]+ id="urn:[^"]+ " class="[^"]+" itemid="[^"]+">\s/', $content, $matches );
+    }
+
+    /**
+     * Fix interpolation errors raised by Batch Analysis
+     *
+     * @param string $content The {@link WP_Post}'s content.
+     * @param int    $id      The {@link WP_Post}'s id.
+     *
+     * @since 3.17.0
+     *
+     * @return string Post content without interpolations.
+     */
+    private function fix_interpolation_errors( $content, $id ) {
+
+        // Bail out if there are no interpolation errors.
+        if ( ! $this->has_interpolation_errors( $content ) ) {
+            $this->log->trace( "No interpolation errors found for post $id." );
+
+            return $content;
+        }
+
+        $this->log->debug( "Fixing post $id interpolations..." );
+
+        // Remove all interpolations from the content.
+        return preg_replace( self::$interpolation_patterns, '$1$2', $content );
+    }
+
+    /**
+     * Clear the warning flag for the specified {@link WP_Post}s.
+     *
+     * @since 3.14.2
+     *
+     * @param int|array $post_ids A single {@link WP_Post}'s id or an array of
+     *                            {@link WP_Post}s' ids.
+     */
+    public function clear_warning( $post_ids ) {
+
+        foreach ( (array) $post_ids as $post_id ) {
+            delete_post_meta( $post_id, self::WARNING_META_KEY );
+        }
+
+    }
+
+    /**
+     * Set the warning flag for the specified {@link WP_Post}.
+     *
+     * @since 3.14.2
+     *
+     * @param int  $post_id The {@link WP_Post}'s id.
+     * @param bool $value   The flag's value.
+     *
+     * @return int|bool Meta ID if the key didn't exist, true on successful update,
+     *                  false on failure.
+     */
+    private function set_warning( $post_id, $value ) {
+
+        return update_post_meta( $post_id, self::WARNING_META_KEY, ( true === $value ? 'yes' : 'no' ) );
+    }
 
 //	/**
 //	 * Get the post/page batch analysis state.
@@ -618,231 +618,231 @@ 
 //		return get_post_meta( $post_id, self::STATE_META_KEY, true );
 //	}
 
-	/**
-	 * Set the post/page batch analysis state.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 * @param int $value   The new state.
-	 *
-	 * @return int|bool Meta ID if the key didn't exist, true on successful update,
-	 *                  false on failure.
-	 */
-	private function set_state( $post_id, $value ) {
-
-		// Update the state.
-		$result = update_post_meta( $post_id, self::STATE_META_KEY, $value );
-
-		// Update timestamps as required.
-		switch ( $value ) {
-
-			// ### REQUEST state.
-			case self::STATE_REQUEST:
-				add_post_meta( $post_id, self::REQUEST_TIMESTAMP_META_KEY, current_time( 'mysql', true ) );
-				break;
-
-			// ### SUCCESS/ERROR state.
-			case self::STATE_SUCCESS:
-			case self::STATE_ERROR:
-				add_post_meta( $post_id, self::COMPLETE_TIMESTAMP_META_KEY, current_time( 'mysql', true ) );
-				break;
-		}
-
-		// Finally return the result.
-		return $result;
-	}
-
-	/**
-	 * Get the options setting for a {@link WP_Post}.
-	 *
-	 * If there are multiple link settings, only the last one is returned.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return array The link settings.
-	 */
-	private function get_options( $post_id ) {
-
-		$values = get_post_meta( $post_id, self::BATCH_ANALYSIS_OPTIONS_META_KEY );
-
-		return end( $values ) ?: array(
-			'links'           => 'default',
-			'min_occurrences' => 1,
-		);
-	}
-
-	/**
-	 * Get the array of post IDS waiting in the queue to start processing.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @return array The waiting to be processed post ids queue.
-	 */
-	public function waiting_for_analysis() {
-
-		return get_posts( array(
-			'posts_per_page' => - 1,
-			'fields'         => 'ids',
-			'post_status'    => 'any',
-			'meta_key'       => self::STATE_META_KEY,
-			'meta_value'     => self::STATE_SUBMIT,
-			'orderby'        => 'ID',
-			'post_type'      => 'any',
-			// Add any because posts from multiple posts types may be waiting.
-		) );
-	}
-
-	/**
-	 * Get the array of post IDS waiting for response.
-	 *
-	 * @deprecated
-	 * @since 3.14.0
-	 *
-	 * @return array The waiting for response post ids queue.
-	 */
-	public function waiting_for_response() {
-
-		return get_posts( array(
-			'posts_per_page' => - 1,
-			'fields'         => 'ids',
-			'post_status'    => 'any',
-			'meta_key'       => self::STATE_META_KEY,
-			'meta_value'     => self::STATE_REQUEST,
-			'orderby'        => 'ID',
-			'post_type'      => 'any',
-			// Add any because posts from multiple posts types may be waiting.
-		) );
-	}
-
-	/**
-	 * Request the analysis for the specified {@link WP_Post}.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return WP_Error|array The response or WP_Error on failure.
-	 */
-	private function do_request( $post_id ) {
-
-		// Change the state to `REQUEST`.
-		$this->set_state( $post_id, self::STATE_REQUEST );
-
-		// 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 new WP_Error( 0, "Cannot find post $post_id." );
-		}
-
-		// Get the link setting.
-		$options = $this->get_options( $post_id );
-
-		$this->log->debug( 'Sending analysis request for post $post_id [ links :: ' . $options['links'] . ', min_occurrences :: ' . $options['min_occurrences'] . ' ] ...' );
-
-		// Get the batch analysis URL.
-		$url = $this->configuration_service->get_batch_analysis_url();
-
-		// Prepare the POST parameters.
-		$params = array(
-			'id'              => $post->ID,
-			'key'             => $this->configuration_service->get_key(),
-			'content'         => $post->post_content,
-			'contentLanguage' => $this->configuration_service->get_language_code(),
-			'version'         => $this->plugin->get_version(),
-			'scope'           => 'local',
-			'links'           => $options['links'],
-			'minOccurrences'  => $options['min_occurrences'],
-		);
-
-		// Get the HTTP options.
-		$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
-			'method'      => 'POST',
-			'headers'     => array(
-				'Accept'       => 'application/json',
-				'Content-type' => 'application/json; charset=UTF-8',
-			),
-			// we need to downgrade the HTTP version in this case since chunked encoding is dumping numbers in the response.
-			'httpversion' => '1.0',
-			'body'        => wp_json_encode( $params ),
-		) );
-
-		$this->log->debug( "Posting analysis request for post $post_id to $url..." );
-
-		// Post the parameter.
-		return wp_remote_post( $url, $args );
-	}
-
-	/**
-	 * Get the Batch Analysis results for the specified {@link WP_Post}.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return WP_Error|array The response or WP_Error on failure.
-	 */
-	private function do_complete( $post_id ) {
-
-		$post = get_post( $post_id );
-
-		if ( null === $post ) {
-			// Post was possibly deleted, just bailout.
-			return new WP_Error( 0, "Post $post_id not found . " );
-		}
-
-		$url = $this->configuration_service->get_batch_analysis_url();
-		$key = $this->configuration_service->get_key();
-		$url = $url . '/' . $post->ID . '?key=' . $key;
-
-		return wp_remote_get( $url, unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
-	}
-
-	/**
-	 * Get the {@link WP_Post}s' ids flagged with warnings.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @return array An array of {@link WP_Post}s' ids.
-	 */
-	public function get_warnings() {
-
-		return get_posts( array(
-			'fields'      => 'ids',
-			'numberposts' => - 1,
-			'post_status' => 'any',
-			'meta_key'    => self::WARNING_META_KEY,
-			'meta_value'  => 'yes',
-			'post_type'   => 'any',
-			// Add any because posts from multiple posts types may be waiting.
-		) );
-	}
-
-	/**
-	 * Check whether the term has entity type associated and set default term if it hasn't.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @param int $id The {@link WP_Post}'s id.
-	 */
-	private function maybe_set_default_term( $id ) {
-		// Check whether the post has any of the WordLift entity types.
-		$has_term = has_term( '', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $id );
-
-		// Bail if the term is associated with entity types already.
-		if ( ! empty( $has_term ) ) {
-			return;
-		}
-
-		// Set the default `article` term.
-		wp_set_object_terms( $id, 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-	}
+    /**
+     * Set the post/page batch analysis state.
+     *
+     * @since 3.14.2
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     * @param int $value   The new state.
+     *
+     * @return int|bool Meta ID if the key didn't exist, true on successful update,
+     *                  false on failure.
+     */
+    private function set_state( $post_id, $value ) {
+
+        // Update the state.
+        $result = update_post_meta( $post_id, self::STATE_META_KEY, $value );
+
+        // Update timestamps as required.
+        switch ( $value ) {
+
+            // ### REQUEST state.
+            case self::STATE_REQUEST:
+                add_post_meta( $post_id, self::REQUEST_TIMESTAMP_META_KEY, current_time( 'mysql', true ) );
+                break;
+
+            // ### SUCCESS/ERROR state.
+            case self::STATE_SUCCESS:
+            case self::STATE_ERROR:
+                add_post_meta( $post_id, self::COMPLETE_TIMESTAMP_META_KEY, current_time( 'mysql', true ) );
+                break;
+        }
+
+        // Finally return the result.
+        return $result;
+    }
+
+    /**
+     * Get the options setting for a {@link WP_Post}.
+     *
+     * If there are multiple link settings, only the last one is returned.
+     *
+     * @since 3.14.2
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return array The link settings.
+     */
+    private function get_options( $post_id ) {
+
+        $values = get_post_meta( $post_id, self::BATCH_ANALYSIS_OPTIONS_META_KEY );
+
+        return end( $values ) ?: array(
+            'links'           => 'default',
+            'min_occurrences' => 1,
+        );
+    }
+
+    /**
+     * Get the array of post IDS waiting in the queue to start processing.
+     *
+     * @since 3.14.0
+     *
+     * @return array The waiting to be processed post ids queue.
+     */
+    public function waiting_for_analysis() {
+
+        return get_posts( array(
+            'posts_per_page' => - 1,
+            'fields'         => 'ids',
+            'post_status'    => 'any',
+            'meta_key'       => self::STATE_META_KEY,
+            'meta_value'     => self::STATE_SUBMIT,
+            'orderby'        => 'ID',
+            'post_type'      => 'any',
+            // Add any because posts from multiple posts types may be waiting.
+        ) );
+    }
+
+    /**
+     * Get the array of post IDS waiting for response.
+     *
+     * @deprecated
+     * @since 3.14.0
+     *
+     * @return array The waiting for response post ids queue.
+     */
+    public function waiting_for_response() {
+
+        return get_posts( array(
+            'posts_per_page' => - 1,
+            'fields'         => 'ids',
+            'post_status'    => 'any',
+            'meta_key'       => self::STATE_META_KEY,
+            'meta_value'     => self::STATE_REQUEST,
+            'orderby'        => 'ID',
+            'post_type'      => 'any',
+            // Add any because posts from multiple posts types may be waiting.
+        ) );
+    }
+
+    /**
+     * Request the analysis for the specified {@link WP_Post}.
+     *
+     * @since 3.14.2
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return WP_Error|array The response or WP_Error on failure.
+     */
+    private function do_request( $post_id ) {
+
+        // Change the state to `REQUEST`.
+        $this->set_state( $post_id, self::STATE_REQUEST );
+
+        // 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 new WP_Error( 0, "Cannot find post $post_id." );
+        }
+
+        // Get the link setting.
+        $options = $this->get_options( $post_id );
+
+        $this->log->debug( 'Sending analysis request for post $post_id [ links :: ' . $options['links'] . ', min_occurrences :: ' . $options['min_occurrences'] . ' ] ...' );
+
+        // Get the batch analysis URL.
+        $url = $this->configuration_service->get_batch_analysis_url();
+
+        // Prepare the POST parameters.
+        $params = array(
+            'id'              => $post->ID,
+            'key'             => $this->configuration_service->get_key(),
+            'content'         => $post->post_content,
+            'contentLanguage' => $this->configuration_service->get_language_code(),
+            'version'         => $this->plugin->get_version(),
+            'scope'           => 'local',
+            'links'           => $options['links'],
+            'minOccurrences'  => $options['min_occurrences'],
+        );
+
+        // Get the HTTP options.
+        $args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+            'method'      => 'POST',
+            'headers'     => array(
+                'Accept'       => 'application/json',
+                'Content-type' => 'application/json; charset=UTF-8',
+            ),
+            // we need to downgrade the HTTP version in this case since chunked encoding is dumping numbers in the response.
+            'httpversion' => '1.0',
+            'body'        => wp_json_encode( $params ),
+        ) );
+
+        $this->log->debug( "Posting analysis request for post $post_id to $url..." );
+
+        // Post the parameter.
+        return wp_remote_post( $url, $args );
+    }
+
+    /**
+     * Get the Batch Analysis results for the specified {@link WP_Post}.
+     *
+     * @since 3.14.2
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return WP_Error|array The response or WP_Error on failure.
+     */
+    private function do_complete( $post_id ) {
+
+        $post = get_post( $post_id );
+
+        if ( null === $post ) {
+            // Post was possibly deleted, just bailout.
+            return new WP_Error( 0, "Post $post_id not found . " );
+        }
+
+        $url = $this->configuration_service->get_batch_analysis_url();
+        $key = $this->configuration_service->get_key();
+        $url = $url . '/' . $post->ID . '?key=' . $key;
+
+        return wp_remote_get( $url, unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
+    }
+
+    /**
+     * Get the {@link WP_Post}s' ids flagged with warnings.
+     *
+     * @since 3.14.2
+     *
+     * @return array An array of {@link WP_Post}s' ids.
+     */
+    public function get_warnings() {
+
+        return get_posts( array(
+            'fields'      => 'ids',
+            'numberposts' => - 1,
+            'post_status' => 'any',
+            'meta_key'    => self::WARNING_META_KEY,
+            'meta_value'  => 'yes',
+            'post_type'   => 'any',
+            // Add any because posts from multiple posts types may be waiting.
+        ) );
+    }
+
+    /**
+     * Check whether the term has entity type associated and set default term if it hasn't.
+     *
+     * @since 3.17.0
+     *
+     * @param int $id The {@link WP_Post}'s id.
+     */
+    private function maybe_set_default_term( $id ) {
+        // Check whether the post has any of the WordLift entity types.
+        $has_term = has_term( '', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $id );
+
+        // Bail if the term is associated with entity types already.
+        if ( ! empty( $has_term ) ) {
+            return;
+        }
+
+        // Set the default `article` term.
+        wp_set_object_terms( $id, 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+    }
 
 }

Spacing +130 added lines, -130 removed lines

@@ -185,22 +185,22 @@ 
 	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
 	 * @param \Wordlift_Cache_Service         $cache_service         The {@link Wordlift_Cache_Service} instance.
 	 */
-	public function __construct( $plugin, $configuration_service, $cache_service ) {
+	public function __construct($plugin, $configuration_service, $cache_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Batch_Analysis_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Batch_Analysis_Service');
 
 		$this->plugin                = $plugin;
 		$this->configuration_service = $configuration_service;
 		$this->cache_service         = $cache_service;
 
-		add_action( 'wl_async_wl_batch_analysis_request', array(
+		add_action('wl_async_wl_batch_analysis_request', array(
 			$this,
 			'request',
-		) );
-		add_action( 'wl_async_wl_batch_analysis_complete', array(
+		));
+		add_action('wl_async_wl_batch_analysis_complete', array(
 			$this,
 			'complete',
-		) );
+		));
 
 	}
 
@@ -231,9 +231,9 @@ 
 	 *
 	 * @return int The number of submitted {@link WP_Post}s or false on error.
 	 */
-	public function submit( $args ) {
+	public function submit($args) {
 		// Parse the parameters.
-		$params = wp_parse_args( $args, array(
+		$params = wp_parse_args($args, array(
 			'links'             => 'default',
 			'min_occurrences'   => 1,
 			'include_annotated' => false,
@@ -241,25 +241,25 @@ 
 			'from'              => null,
 			'to'                => null,
 			'post_type'         => 'post',
-		) );
+		));
 
 		// Validation.
-		if ( ! in_array( $params['links'], array( 'default', 'yes', 'no' ) ) ) {
-			wp_die( '`link` must be one of the following: `default`, `yes` or `no`.' );
+		if ( ! in_array($params['links'], array('default', 'yes', 'no'))) {
+			wp_die('`link` must be one of the following: `default`, `yes` or `no`.');
 		}
 
-		if ( ! is_numeric( $params['min_occurrences'] ) || 1 > $params['min_occurrences'] ) {
-			wp_die( '`min_occurrences` must greater or equal 1.' );
+		if ( ! is_numeric($params['min_occurrences']) || 1 > $params['min_occurrences']) {
+			wp_die('`min_occurrences` must greater or equal 1.');
 		}
 
 		// Get the sql query.
-		$query = Wordlift_Batch_Analysis_Sql_Helper::get_sql( $params );
+		$query = Wordlift_Batch_Analysis_Sql_Helper::get_sql($params);
 
 		// Set the post metas and get the value of the posts.
-		$submitted_posts = $this->update_posts_meta( $params, $query );
+		$submitted_posts = $this->update_posts_meta($params, $query);
 
 		// Request Batch Analysis (the operation is handled asynchronously).
-		do_action( 'wl_batch_analysis_request' );
+		do_action('wl_batch_analysis_request');
 
 		// Return the count of the posts.
 		return $submitted_posts;
@@ -281,27 +281,27 @@ 
 	 *
 	 * @return float|int
 	 */
-	public function submit_posts( $args ) {
+	public function submit_posts($args) {
 		// Parse the parameters.
-		$params = wp_parse_args( $args, array(
+		$params = wp_parse_args($args, array(
 			'links'           => 'default',
 			'min_occurrences' => 1,
 			'ids'             => array(),
-		) );
+		));
 
 		// Validation.
-		if ( empty( $params['ids'] ) ) {
-			wp_die( '`ids` cannot be empty.' );
+		if (empty($params['ids'])) {
+			wp_die('`ids` cannot be empty.');
 		}
 
 		// Get the query,
-		$query = Wordlift_Batch_Analysis_Sql_Helper::get_sql_for_ids( $params );
+		$query = Wordlift_Batch_Analysis_Sql_Helper::get_sql_for_ids($params);
 
 		// Set the post metas and get the value of the posts.
-		$submitted_posts = $this->update_posts_meta( $params, $query );
+		$submitted_posts = $this->update_posts_meta($params, $query);
 
 		// Request Batch Analysis (the operation is handled asynchronously).
-		do_action( 'wl_batch_analysis_request' );
+		do_action('wl_batch_analysis_request');
 
 		// Return the count of the posts.
 		return $submitted_posts;
@@ -317,7 +317,7 @@ 
 	 *
 	 * @return int The number of posts found/submitted.
 	 */
-	public function update_posts_meta( $params, $query ) {
+	public function update_posts_meta($params, $query) {
 		global $wpdb;
 
 		// Get the link options.
@@ -327,22 +327,22 @@ 
 		);
 
 		// Get the posts that should be submitted for analysis.
-		$posts = $wpdb->get_results( $query ); // WPCS: cache ok, db call ok.
+		$posts = $wpdb->get_results($query); // WPCS: cache ok, db call ok.
 
 		// Bail if there are no posts found.
-		if ( empty( $posts ) ) {
+		if (empty($posts)) {
 			return 0;
 		}
 
 		// Add the post metas.
-		foreach ( $posts as $p ) {
-			add_post_meta( $p->ID, self::STATE_META_KEY, 0 );
-			add_post_meta( $p->ID, self::SUBMIT_TIMESTAMP_META_KEY, gmdate( 'Y-m-d H:i:s' ) );
-			add_post_meta( $p->ID, self::BATCH_ANALYSIS_OPTIONS_META_KEY, $link_options );
+		foreach ($posts as $p) {
+			add_post_meta($p->ID, self::STATE_META_KEY, 0);
+			add_post_meta($p->ID, self::SUBMIT_TIMESTAMP_META_KEY, gmdate('Y-m-d H:i:s'));
+			add_post_meta($p->ID, self::BATCH_ANALYSIS_OPTIONS_META_KEY, $link_options);
 		}
 
 		// Finally return the posts count.
-		return count( $posts );
+		return count($posts);
 	}
 
 	/**
@@ -356,20 +356,20 @@ 
 	 * @return false|int The number of cancelled {@link WP_Post}s or false on
 	 *                   error.
 	 */
-	public function cancel( $post_ids ) {
+	public function cancel($post_ids) {
 		global $wpdb;
 
-		return $wpdb->query( $wpdb->prepare(
+		return $wpdb->query($wpdb->prepare(
 			"
 			DELETE FROM $wpdb->postmeta
 			WHERE meta_key = %s
 				AND meta_value IN ( %d, %d )
-				AND post_id IN( " . implode( ',', wp_parse_id_list( $post_ids ) ) . " )
+				AND post_id IN( ".implode(',', wp_parse_id_list($post_ids))." )
 			",
 			self::STATE_META_KEY,
 			self::STATE_SUBMIT,
 			self::STATE_REQUEST
-		) ); // WPCS: cache ok, db call ok.
+		)); // WPCS: cache ok, db call ok.
 
 	}
 
@@ -380,46 +380,46 @@ 
 	 */
 	public function request() {
 
-		$this->log->debug( 'Requesting analysis...' );
+		$this->log->debug('Requesting analysis...');
 
 		// By default 5 posts of any post type are returned.
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 			'fields'     => 'ids',
 			'meta_key'   => self::STATE_META_KEY,
 			'meta_value' => self::STATE_SUBMIT,
 			'orderby'    => 'ID',
 			'post_type'  => 'any',
-		) );
+		));
 
 		// Bail out if there are no submitted posts.
-		if ( empty( $posts ) ) {
-			$this->log->debug( 'No posts to submit found, checking for completed requests...' );
+		if (empty($posts)) {
+			$this->log->debug('No posts to submit found, checking for completed requests...');
 
-			do_action( 'wl_batch_analysis_complete' );
+			do_action('wl_batch_analysis_complete');
 
 			return;
 		}
 
 		// Send a request for each post.
-		foreach ( $posts as $id ) {
+		foreach ($posts as $id) {
 
-			$this->log->debug( "Requesting analysis for post $id..." );
+			$this->log->debug("Requesting analysis for post $id...");
 
 			// Send the actual request to the remote service.
-			$result = $this->do_request( $id );
+			$result = $this->do_request($id);
 
 			// Set an error if we received an error.
-			if ( is_wp_error( $result ) ) {
-				$this->log->error( "An error occurred while requesting a batch analysis for post $id: " . $result->get_error_message() );
+			if (is_wp_error($result)) {
+				$this->log->error("An error occurred while requesting a batch analysis for post $id: ".$result->get_error_message());
 
-				$this->set_state( $id, self::STATE_ERROR );
+				$this->set_state($id, self::STATE_ERROR);
 			}
 
 		}
 
 		// Call the `wl_batch_analysis_request` action again. This is going
 		// to be handled by the async task.
-		do_action( 'wl_batch_analysis_request' );
+		do_action('wl_batch_analysis_request');
 
 	}
 
@@ -430,55 +430,55 @@ 
 	 */
 	public function complete() {
 
-		$this->log->debug( 'Requesting results...' );
+		$this->log->debug('Requesting results...');
 
 		// By default 5 posts of any post type are returned.
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 			'fields'     => 'ids',
 			'meta_key'   => self::STATE_META_KEY,
 			'meta_value' => self::STATE_REQUEST,
 			'orderby'    => 'ID',
 			'post_type'  => 'any',
-		) );
+		));
 
 		// Bail out if there are no submitted posts.
-		if ( empty( $posts ) ) {
-			$this->log->debug( 'No posts in request state found.' );
+		if (empty($posts)) {
+			$this->log->debug('No posts in request state found.');
 
 			return;
 		}
 
 		// Send a request for each post.
-		foreach ( $posts as $id ) {
-			$this->log->debug( "Requesting results for post $id..." );
+		foreach ($posts as $id) {
+			$this->log->debug("Requesting results for post $id...");
 
 			// Send the actual request to the remote service.
-			$response = $this->do_complete( $id );
+			$response = $this->do_complete($id);
 
 			// Move to the next item if we don't have a reply for this one.
-			if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] || ! isset( $response['body'] ) ) {
+			if (is_wp_error($response) || 200 !== (int) $response['response']['code'] || ! isset($response['body'])) {
 				continue;
 			}
 
-			$this->log->debug( "Results received for post $id." );
+			$this->log->debug("Results received for post $id.");
 
 			// Save the returned content as new revision.
-			$json = json_decode( $response['body'] );
+			$json = json_decode($response['body']);
 
 			// Continue if the content isn't set.
-			if ( empty( $json->content ) ) {
+			if (empty($json->content)) {
 				// The post content is empty, so is should be marked as completed.
-				$this->log->error( "An error occurred while decoding the batch analysis response for post $id: {$response['body']}" );
+				$this->log->error("An error occurred while decoding the batch analysis response for post $id: {$response['body']}");
 
-				$this->set_state( $id, self::STATE_ERROR );
+				$this->set_state($id, self::STATE_ERROR);
 				continue;
 			}
 
 			// Set the warning flag if needed.
-			$this->set_warning_based_on_content( $json->content, $id );
+			$this->set_warning_based_on_content($json->content, $id);
 
 			// Get the content, cleaned up if there are interpolation errors.
-			$pre_content = $this->fix_interpolation_errors( $json->content, $id );
+			$pre_content = $this->fix_interpolation_errors($json->content, $id);
 
 			/**
 			 * Filter: 'wl_batch_analysis_update_post_content' - Allow third
@@ -489,24 +489,24 @@ 
 			 * @api    string $data The {@link WP_Post}'s content.
 			 * @api    int    $id   The {@link WP_Post}'s id.
 			 */
-			$content = apply_filters( 'wl_batch_analysis_update_post_content', $pre_content, $id );
+			$content = apply_filters('wl_batch_analysis_update_post_content', $pre_content, $id);
 
 			// Update the post content.
-			wp_update_post( array(
+			wp_update_post(array(
 				'ID'           => $id,
-				'post_content' => wp_slash( $content ),
-			) );
+				'post_content' => wp_slash($content),
+			));
 
 			// Update the status.
-			$this->set_state( $id, self::STATE_SUCCESS );
+			$this->set_state($id, self::STATE_SUCCESS);
 
 			// Invalidating the cache for the current post.
-			$this->cache_service->delete_cache( $id );
+			$this->cache_service->delete_cache($id);
 
-			$this->log->debug( "Post $id updated with batch analysis results." );
+			$this->log->debug("Post $id updated with batch analysis results.");
 
 			// Set default entity type term for posts that didn't have any.
-			$this->maybe_set_default_term( $id );
+			$this->maybe_set_default_term($id);
 
 			// @todo: implement a kind of timeout that sets an error if the
 			// results haven't been received after a long time.
@@ -514,7 +514,7 @@ 
 
 		// Call the `wl_batch_analysis_request` action again. This is going
 		// to be handled by the async task.
-		do_action( 'wl_batch_analysis_complete' );
+		do_action('wl_batch_analysis_complete');
 
 	}
 
@@ -527,24 +527,24 @@ 
 	 * @param string $content The {@link WP_Post}'s content.
 	 * @param int    $post_id The {@link WP_Post}'s id.
 	 */
-	protected function set_warning_based_on_content( $content, $post_id ) {
+	protected function set_warning_based_on_content($content, $post_id) {
 
 		// Check for suspicious interpolations.
-		$is_warning = $this->has_interpolation_errors( $content );
+		$is_warning = $this->has_interpolation_errors($content);
 
 		// Set the warning flag accordingly.
-		$this->set_warning( $post_id, $is_warning );
+		$this->set_warning($post_id, $is_warning);
 
 	}
 
-	private function has_interpolation_errors( $content ) {
+	private function has_interpolation_errors($content) {
 		$matches = array();
 
 		// eg:
 		// r-pro<span id="urn:local-text-annotation-oxbgy6139gnjgk1n0oxnq9zg62py29pf" class="textannotation disambiguated wl-thing" itemid="http://data.wordlift.it/be2/entity/developing_country">ne region, has shoul</span>dere
 
-		return 0 < preg_match_all( '/\w<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">/', $content, $matches )
-			   || 0 < preg_match_all( ' /<[a-z]+ id="urn:[^"]+ " class="[^"]+" itemid="[^"]+">\s/', $content, $matches );
+		return 0 < preg_match_all('/\w<[a-z]+ id="urn:[^"]+" class="[^"]+" itemid="[^"]+">/', $content, $matches)
+			   || 0 < preg_match_all(' /<[a-z]+ id="urn:[^"]+ " class="[^"]+" itemid="[^"]+">\s/', $content, $matches);
 	}
 
 	/**
@@ -557,19 +557,19 @@ 
 	 *
 	 * @return string Post content without interpolations.
 	 */
-	private function fix_interpolation_errors( $content, $id ) {
+	private function fix_interpolation_errors($content, $id) {
 
 		// Bail out if there are no interpolation errors.
-		if ( ! $this->has_interpolation_errors( $content ) ) {
-			$this->log->trace( "No interpolation errors found for post $id." );
+		if ( ! $this->has_interpolation_errors($content)) {
+			$this->log->trace("No interpolation errors found for post $id.");
 
 			return $content;
 		}
 
-		$this->log->debug( "Fixing post $id interpolations..." );
+		$this->log->debug("Fixing post $id interpolations...");
 
 		// Remove all interpolations from the content.
-		return preg_replace( self::$interpolation_patterns, '$1$2', $content );
+		return preg_replace(self::$interpolation_patterns, '$1$2', $content);
 	}
 
 	/**
@@ -580,10 +580,10 @@ 
 	 * @param int|array $post_ids A single {@link WP_Post}'s id or an array of
 	 *                            {@link WP_Post}s' ids.
 	 */
-	public function clear_warning( $post_ids ) {
+	public function clear_warning($post_ids) {
 
-		foreach ( (array) $post_ids as $post_id ) {
-			delete_post_meta( $post_id, self::WARNING_META_KEY );
+		foreach ((array) $post_ids as $post_id) {
+			delete_post_meta($post_id, self::WARNING_META_KEY);
 		}
 
 	}
@@ -599,9 +599,9 @@ 
 	 * @return int|bool Meta ID if the key didn't exist, true on successful update,
 	 *                  false on failure.
 	 */
-	private function set_warning( $post_id, $value ) {
+	private function set_warning($post_id, $value) {
 
-		return update_post_meta( $post_id, self::WARNING_META_KEY, ( true === $value ? 'yes' : 'no' ) );
+		return update_post_meta($post_id, self::WARNING_META_KEY, (true === $value ? 'yes' : 'no'));
 	}
 
 //	/**
@@ -629,23 +629,23 @@ 
 	 * @return int|bool Meta ID if the key didn't exist, true on successful update,
 	 *                  false on failure.
 	 */
-	private function set_state( $post_id, $value ) {
+	private function set_state($post_id, $value) {
 
 		// Update the state.
-		$result = update_post_meta( $post_id, self::STATE_META_KEY, $value );
+		$result = update_post_meta($post_id, self::STATE_META_KEY, $value);
 
 		// Update timestamps as required.
-		switch ( $value ) {
+		switch ($value) {
 
 			// ### REQUEST state.
 			case self::STATE_REQUEST:
-				add_post_meta( $post_id, self::REQUEST_TIMESTAMP_META_KEY, current_time( 'mysql', true ) );
+				add_post_meta($post_id, self::REQUEST_TIMESTAMP_META_KEY, current_time('mysql', true));
 				break;
 
 			// ### SUCCESS/ERROR state.
 			case self::STATE_SUCCESS:
 			case self::STATE_ERROR:
-				add_post_meta( $post_id, self::COMPLETE_TIMESTAMP_META_KEY, current_time( 'mysql', true ) );
+				add_post_meta($post_id, self::COMPLETE_TIMESTAMP_META_KEY, current_time('mysql', true));
 				break;
 		}
 
@@ -664,11 +664,11 @@ 
 	 *
 	 * @return array The link settings.
 	 */
-	private function get_options( $post_id ) {
+	private function get_options($post_id) {
 
-		$values = get_post_meta( $post_id, self::BATCH_ANALYSIS_OPTIONS_META_KEY );
+		$values = get_post_meta($post_id, self::BATCH_ANALYSIS_OPTIONS_META_KEY);
 
-		return end( $values ) ?: array(
+		return end($values) ?: array(
 			'links'           => 'default',
 			'min_occurrences' => 1,
 		);
@@ -683,8 +683,8 @@ 
 	 */
 	public function waiting_for_analysis() {
 
-		return get_posts( array(
-			'posts_per_page' => - 1,
+		return get_posts(array(
+			'posts_per_page' => -1,
 			'fields'         => 'ids',
 			'post_status'    => 'any',
 			'meta_key'       => self::STATE_META_KEY,
@@ -692,7 +692,7 @@ 
 			'orderby'        => 'ID',
 			'post_type'      => 'any',
 			// Add any because posts from multiple posts types may be waiting.
-		) );
+		));
 	}
 
 	/**
@@ -705,8 +705,8 @@ 
 	 */
 	public function waiting_for_response() {
 
-		return get_posts( array(
-			'posts_per_page' => - 1,
+		return get_posts(array(
+			'posts_per_page' => -1,
 			'fields'         => 'ids',
 			'post_status'    => 'any',
 			'meta_key'       => self::STATE_META_KEY,
@@ -714,7 +714,7 @@ 
 			'orderby'        => 'ID',
 			'post_type'      => 'any',
 			// Add any because posts from multiple posts types may be waiting.
-		) );
+		));
 	}
 
 	/**
@@ -726,25 +726,25 @@ 
 	 *
 	 * @return WP_Error|array The response or WP_Error on failure.
 	 */
-	private function do_request( $post_id ) {
+	private function do_request($post_id) {
 
 		// Change the state to `REQUEST`.
-		$this->set_state( $post_id, self::STATE_REQUEST );
+		$this->set_state($post_id, self::STATE_REQUEST);
 
 		// 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 new WP_Error( 0, "Cannot find post $post_id." );
+			return new WP_Error(0, "Cannot find post $post_id.");
 		}
 
 		// Get the link setting.
-		$options = $this->get_options( $post_id );
+		$options = $this->get_options($post_id);
 
-		$this->log->debug( 'Sending analysis request for post $post_id [ links :: ' . $options['links'] . ', min_occurrences :: ' . $options['min_occurrences'] . ' ] ...' );
+		$this->log->debug('Sending analysis request for post $post_id [ links :: '.$options['links'].', min_occurrences :: '.$options['min_occurrences'].' ] ...');
 
 		// Get the batch analysis URL.
 		$url = $this->configuration_service->get_batch_analysis_url();
@@ -762,7 +762,7 @@ 
 		);
 
 		// Get the HTTP options.
-		$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+		$args = array_merge_recursive(unserialize(WL_REDLINK_API_HTTP_OPTIONS), array(
 			'method'      => 'POST',
 			'headers'     => array(
 				'Accept'       => 'application/json',
@@ -770,13 +770,13 @@ 
 			),
 			// we need to downgrade the HTTP version in this case since chunked encoding is dumping numbers in the response.
 			'httpversion' => '1.0',
-			'body'        => wp_json_encode( $params ),
-		) );
+			'body'        => wp_json_encode($params),
+		));
 
-		$this->log->debug( "Posting analysis request for post $post_id to $url..." );
+		$this->log->debug("Posting analysis request for post $post_id to $url...");
 
 		// Post the parameter.
-		return wp_remote_post( $url, $args );
+		return wp_remote_post($url, $args);
 	}
 
 	/**
@@ -788,20 +788,20 @@ 
 	 *
 	 * @return WP_Error|array The response or WP_Error on failure.
 	 */
-	private function do_complete( $post_id ) {
+	private function do_complete($post_id) {
 
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		if ( null === $post ) {
+		if (null === $post) {
 			// Post was possibly deleted, just bailout.
-			return new WP_Error( 0, "Post $post_id not found . " );
+			return new WP_Error(0, "Post $post_id not found . ");
 		}
 
 		$url = $this->configuration_service->get_batch_analysis_url();
 		$key = $this->configuration_service->get_key();
-		$url = $url . '/' . $post->ID . '?key=' . $key;
+		$url = $url.'/'.$post->ID.'?key='.$key;
 
-		return wp_remote_get( $url, unserialize( WL_REDLINK_API_HTTP_OPTIONS ) );
+		return wp_remote_get($url, unserialize(WL_REDLINK_API_HTTP_OPTIONS));
 	}
 
 	/**
@@ -813,15 +813,15 @@ 
 	 */
 	public function get_warnings() {
 
-		return get_posts( array(
+		return get_posts(array(
 			'fields'      => 'ids',
-			'numberposts' => - 1,
+			'numberposts' => -1,
 			'post_status' => 'any',
 			'meta_key'    => self::WARNING_META_KEY,
 			'meta_value'  => 'yes',
 			'post_type'   => 'any',
 			// Add any because posts from multiple posts types may be waiting.
-		) );
+		));
 	}
 
 	/**
@@ -831,17 +831,17 @@ 
 	 *
 	 * @param int $id The {@link WP_Post}'s id.
 	 */
-	private function maybe_set_default_term( $id ) {
+	private function maybe_set_default_term($id) {
 		// Check whether the post has any of the WordLift entity types.
-		$has_term = has_term( '', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $id );
+		$has_term = has_term('', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $id);
 
 		// Bail if the term is associated with entity types already.
-		if ( ! empty( $has_term ) ) {
+		if ( ! empty($has_term)) {
 			return;
 		}
 
 		// Set the default `article` term.
-		wp_set_object_terms( $id, 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		wp_set_object_terms($id, 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
 	}
 

src/includes/linked-data/storage/class-wordlift-storage-factory.php

Indentation +205 added lines, -205 removed lines

@@ -18,210 +18,210 @@
  */
 class Wordlift_Storage_Factory {
 
-	/**
-	 * 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_User_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * The {@link Wordlift_Property_Getter} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Property_Getter The {@link Wordlift_Property_Getter} instance.
-	 */
-	private $property_getter;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Storage_Factory $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a {@link Wordlift_Storage_Factory} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param \Wordlift_Entity_Service  $entity_service  The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_User_Service    $user_service    The {@link Wordlift_User_Service} instance.
-	 * @param \Wordlift_Property_Getter $property_getter The {@link Wordlift_Property_Getter} instance.
-	 */
-	public function __construct( $entity_service, $user_service, $property_getter ) {
-
-		$this->entity_service  = $entity_service;
-		$this->user_service    = $user_service;
-		$this->property_getter = $property_getter;
-
-		self::$instance = $this;
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return \Wordlift_Storage_Factory The singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get a {@link Wordlift_Post_Property_Storage} to read {@link WP_Post}s'
-	 * titles.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return \Wordlift_Post_Property_Storage A {@link Wordlift_Post_Property_Storage}
-	 *                                         instance.
-	 */
-	public function post_title() {
-
-		return new Wordlift_Post_Property_Storage( Wordlift_Post_Property_Storage::TITLE );
-	}
-
-	/**
-	 * Get a {@link Wordlift_Post_Property_Storage} to read {@link WP_Post}s'
-	 * descriptions stripped of tags and shortcodes.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return \Wordlift_Post_Property_Storage A {@link Wordlift_Post_Property_Storage}
-	 *                                         instance.
-	 */
-	public function post_description_no_tags_no_shortcodes() {
-
-		return new Wordlift_Post_Property_Storage( Wordlift_Post_Property_Storage::DESCRIPTION_NO_TAGS_NO_SHORTCODES );
-	}
-
-	/**
-	 * Get a {@link Wordlift_Post_Property_Storage} to read {@link WP_Post}s'
-	 * authors.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return \Wordlift_Post_Property_Storage A {@link Wordlift_Post_Property_Storage}
-	 *                                         instance.
-	 */
-	public function post_author() {
-
-		return new Wordlift_Post_Property_Storage( Wordlift_Post_Property_Storage::AUTHOR );
-	}
-
-	/**
-	 * Get a {@link Wordlift_Post_Property_Storage} to read {@link WP_Post}s'
-	 * metas.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $meta_key The meta key to read.
-	 *
-	 * @return Wordlift_Post_Meta_Storage A {@link Wordlift_Post_Meta_Storage}
-	 *                                    instance.
-	 */
-	public function post_meta( $meta_key ) {
-
-		return new Wordlift_Post_Meta_Storage( $meta_key );
-	}
-
-	/**
-	 * Get a {@link Wordlift_Post_Schema_Class_Storage} to read {@link WP_Post}s'
-	 * entity type class.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return Wordlift_Post_Schema_Class_Storage A {@link Wordlift_Post_Schema_Class_Storage}
-	 *                                    instance.
-	 */
-	public function schema_class() {
-
-		return new Wordlift_Post_Schema_Class_Storage();
-	}
-
-	/**
-	 * Get a {@link Wordlift_Post_Author_Storage} instance able to turn an author
-	 * id into a URI.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return \Wordlift_Post_Author_Storage A {@link Wordlift_Post_Author_Storage}
-	 *                                       instance.
-	 */
-	public function author_uri() {
-
-		return new Wordlift_Post_Author_Storage( $this->entity_service, $this->user_service );
-	}
-
-	/**
-	 * Get a {@link Wordlift_Post_Meta_Uri_Storage} instance which reads {@link WP_Post}
-	 * ids and maps them to URI.
-	 *
-	 * @param string $meta_key The {@link WP_Post}'s meta key.
-	 *
-	 * @return \Wordlift_Post_Meta_Uri_Storage A {@link Wordlift_Post_Meta_Uri_Storage}
-	 *                                         instance.
-	 */
-	public function post_meta_to_uri( $meta_key ) {
-
-		return new Wordlift_Post_Meta_Uri_Storage( $meta_key, $this->entity_service );
-	}
-
-	/**
-	 * Get a list of {@link WP_Post}'s images URI.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return \Wordlift_Post_Image_Storage A {@link Wordlift_Post_Image_Storage}
-	 *                                      instance.
-	 */
-	public function post_images() {
-
-		return new Wordlift_Post_Image_Storage();
-	}
-
-	/**
-	 * Get a {@link Wordlift_Post_Related_Storage} instance to get related
-	 * {@link WP_Post}s.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return \Wordlift_Post_Related_Storage A {@link Wordlift_Post_Related_Storage}
-	 *                                        instance.
-	 */
-	public function relations() {
-
-		return new Wordlift_Post_Related_Storage( $this->entity_service );
-	}
-
-	/**
-	 * Get the {@link Wordlift_Url_Property_Storage} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return \Wordlift_Url_Property_Storage The {@link Wordlift_Url_Property_Storage}
-	 *                                        instance.
-	 */
-	public function url_property() {
-
-		return new Wordlift_Url_Property_Storage( $this->property_getter );
-	}
+    /**
+     * 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_User_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * The {@link Wordlift_Property_Getter} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Property_Getter The {@link Wordlift_Property_Getter} instance.
+     */
+    private $property_getter;
+
+    /**
+     * The singleton instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Storage_Factory $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a {@link Wordlift_Storage_Factory} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param \Wordlift_Entity_Service  $entity_service  The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_User_Service    $user_service    The {@link Wordlift_User_Service} instance.
+     * @param \Wordlift_Property_Getter $property_getter The {@link Wordlift_Property_Getter} instance.
+     */
+    public function __construct( $entity_service, $user_service, $property_getter ) {
+
+        $this->entity_service  = $entity_service;
+        $this->user_service    = $user_service;
+        $this->property_getter = $property_getter;
+
+        self::$instance = $this;
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.15.0
+     *
+     * @return \Wordlift_Storage_Factory The singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get a {@link Wordlift_Post_Property_Storage} to read {@link WP_Post}s'
+     * titles.
+     *
+     * @since 3.15.0
+     *
+     * @return \Wordlift_Post_Property_Storage A {@link Wordlift_Post_Property_Storage}
+     *                                         instance.
+     */
+    public function post_title() {
+
+        return new Wordlift_Post_Property_Storage( Wordlift_Post_Property_Storage::TITLE );
+    }
+
+    /**
+     * Get a {@link Wordlift_Post_Property_Storage} to read {@link WP_Post}s'
+     * descriptions stripped of tags and shortcodes.
+     *
+     * @since 3.15.0
+     *
+     * @return \Wordlift_Post_Property_Storage A {@link Wordlift_Post_Property_Storage}
+     *                                         instance.
+     */
+    public function post_description_no_tags_no_shortcodes() {
+
+        return new Wordlift_Post_Property_Storage( Wordlift_Post_Property_Storage::DESCRIPTION_NO_TAGS_NO_SHORTCODES );
+    }
+
+    /**
+     * Get a {@link Wordlift_Post_Property_Storage} to read {@link WP_Post}s'
+     * authors.
+     *
+     * @since 3.15.0
+     *
+     * @return \Wordlift_Post_Property_Storage A {@link Wordlift_Post_Property_Storage}
+     *                                         instance.
+     */
+    public function post_author() {
+
+        return new Wordlift_Post_Property_Storage( Wordlift_Post_Property_Storage::AUTHOR );
+    }
+
+    /**
+     * Get a {@link Wordlift_Post_Property_Storage} to read {@link WP_Post}s'
+     * metas.
+     *
+     * @since 3.15.0
+     *
+     * @param string $meta_key The meta key to read.
+     *
+     * @return Wordlift_Post_Meta_Storage A {@link Wordlift_Post_Meta_Storage}
+     *                                    instance.
+     */
+    public function post_meta( $meta_key ) {
+
+        return new Wordlift_Post_Meta_Storage( $meta_key );
+    }
+
+    /**
+     * Get a {@link Wordlift_Post_Schema_Class_Storage} to read {@link WP_Post}s'
+     * entity type class.
+     *
+     * @since 3.15.0
+     *
+     * @return Wordlift_Post_Schema_Class_Storage A {@link Wordlift_Post_Schema_Class_Storage}
+     *                                    instance.
+     */
+    public function schema_class() {
+
+        return new Wordlift_Post_Schema_Class_Storage();
+    }
+
+    /**
+     * Get a {@link Wordlift_Post_Author_Storage} instance able to turn an author
+     * id into a URI.
+     *
+     * @since 3.15.0
+     *
+     * @return \Wordlift_Post_Author_Storage A {@link Wordlift_Post_Author_Storage}
+     *                                       instance.
+     */
+    public function author_uri() {
+
+        return new Wordlift_Post_Author_Storage( $this->entity_service, $this->user_service );
+    }
+
+    /**
+     * Get a {@link Wordlift_Post_Meta_Uri_Storage} instance which reads {@link WP_Post}
+     * ids and maps them to URI.
+     *
+     * @param string $meta_key The {@link WP_Post}'s meta key.
+     *
+     * @return \Wordlift_Post_Meta_Uri_Storage A {@link Wordlift_Post_Meta_Uri_Storage}
+     *                                         instance.
+     */
+    public function post_meta_to_uri( $meta_key ) {
+
+        return new Wordlift_Post_Meta_Uri_Storage( $meta_key, $this->entity_service );
+    }
+
+    /**
+     * Get a list of {@link WP_Post}'s images URI.
+     *
+     * @since 3.15.0
+     *
+     * @return \Wordlift_Post_Image_Storage A {@link Wordlift_Post_Image_Storage}
+     *                                      instance.
+     */
+    public function post_images() {
+
+        return new Wordlift_Post_Image_Storage();
+    }
+
+    /**
+     * Get a {@link Wordlift_Post_Related_Storage} instance to get related
+     * {@link WP_Post}s.
+     *
+     * @since 3.15.0
+     *
+     * @return \Wordlift_Post_Related_Storage A {@link Wordlift_Post_Related_Storage}
+     *                                        instance.
+     */
+    public function relations() {
+
+        return new Wordlift_Post_Related_Storage( $this->entity_service );
+    }
+
+    /**
+     * Get the {@link Wordlift_Url_Property_Storage} instance.
+     *
+     * @since 3.15.0
+     *
+     * @return \Wordlift_Url_Property_Storage The {@link Wordlift_Url_Property_Storage}
+     *                                        instance.
+     */
+    public function url_property() {
+
+        return new Wordlift_Url_Property_Storage( $this->property_getter );
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -63,7 +63,7 @@ 
 	 * @param \Wordlift_User_Service    $user_service    The {@link Wordlift_User_Service} instance.
 	 * @param \Wordlift_Property_Getter $property_getter The {@link Wordlift_Property_Getter} instance.
 	 */
-	public function __construct( $entity_service, $user_service, $property_getter ) {
+	public function __construct($entity_service, $user_service, $property_getter) {
 
 		$this->entity_service  = $entity_service;
 		$this->user_service    = $user_service;
@@ -95,7 +95,7 @@ 
 	 */
 	public function post_title() {
 
-		return new Wordlift_Post_Property_Storage( Wordlift_Post_Property_Storage::TITLE );
+		return new Wordlift_Post_Property_Storage(Wordlift_Post_Property_Storage::TITLE);
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function post_description_no_tags_no_shortcodes() {
 
-		return new Wordlift_Post_Property_Storage( Wordlift_Post_Property_Storage::DESCRIPTION_NO_TAGS_NO_SHORTCODES );
+		return new Wordlift_Post_Property_Storage(Wordlift_Post_Property_Storage::DESCRIPTION_NO_TAGS_NO_SHORTCODES);
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function post_author() {
 
-		return new Wordlift_Post_Property_Storage( Wordlift_Post_Property_Storage::AUTHOR );
+		return new Wordlift_Post_Property_Storage(Wordlift_Post_Property_Storage::AUTHOR);
 	}
 
 	/**
@@ -137,9 +137,9 @@ 
 	 * @return Wordlift_Post_Meta_Storage A {@link Wordlift_Post_Meta_Storage}
 	 *                                    instance.
 	 */
-	public function post_meta( $meta_key ) {
+	public function post_meta($meta_key) {
 
-		return new Wordlift_Post_Meta_Storage( $meta_key );
+		return new Wordlift_Post_Meta_Storage($meta_key);
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function author_uri() {
 
-		return new Wordlift_Post_Author_Storage( $this->entity_service, $this->user_service );
+		return new Wordlift_Post_Author_Storage($this->entity_service, $this->user_service);
 	}
 
 	/**
@@ -179,9 +179,9 @@ 
 	 * @return \Wordlift_Post_Meta_Uri_Storage A {@link Wordlift_Post_Meta_Uri_Storage}
 	 *                                         instance.
 	 */
-	public function post_meta_to_uri( $meta_key ) {
+	public function post_meta_to_uri($meta_key) {
 
-		return new Wordlift_Post_Meta_Uri_Storage( $meta_key, $this->entity_service );
+		return new Wordlift_Post_Meta_Uri_Storage($meta_key, $this->entity_service);
 	}
 
 	/**
@@ -208,7 +208,7 @@ 
 	 */
 	public function relations() {
 
-		return new Wordlift_Post_Related_Storage( $this->entity_service );
+		return new Wordlift_Post_Related_Storage($this->entity_service);
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	public function url_property() {
 
-		return new Wordlift_Url_Property_Storage( $this->property_getter );
+		return new Wordlift_Url_Property_Storage($this->property_getter);
 	}
 
 }

src/includes/wp-async-task/class-wordlift-push-references-async-task.php

Indentation +45 added lines, -45 removed lines

@@ -18,59 +18,59 @@
  */
 class Wordlift_Push_References_Async_Task extends Wordlift_Async_Task {
 
-	/**
-	 * The protected $action property should be set to the action to which you
-	 * wish to attach the asynchronous task. For example, if you want to spin
-	 * off an asynchronous task whenever a post gets saved, you would set this
-	 * to save_post.
-	 *
-	 * @since  3.18.0
-	 * @access protected
-	 * @var string $action The action to which you wish to attach the
-	 *                     asynchronous task.
-	 */
-	protected $action = 'wl_push_references';
+    /**
+     * The protected $action property should be set to the action to which you
+     * wish to attach the asynchronous task. For example, if you want to spin
+     * off an asynchronous task whenever a post gets saved, you would set this
+     * to save_post.
+     *
+     * @since  3.18.0
+     * @access protected
+     * @var string $action The action to which you wish to attach the
+     *                     asynchronous task.
+     */
+    protected $action = 'wl_push_references';
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.18.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.18.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
-	/**
-	 * Create a {@link Wordlift_Push_References_Async_Task} instance.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @param int $auth_level The authentication level to use (see above)
-	 */
-	public function __construct( $auth_level = self::BOTH ) {
-		parent::__construct( $auth_level );
+    /**
+     * Create a {@link Wordlift_Push_References_Async_Task} instance.
+     *
+     * @since 3.18.0
+     *
+     * @param int $auth_level The authentication level to use (see above)
+     */
+    public function __construct( $auth_level = self::BOTH ) {
+        parent::__construct( $auth_level );
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Push_References_Async_Task' );
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Push_References_Async_Task' );
 
-	}
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	protected function prepare_data( $data ) {
+    /**
+     * @inheritdoc
+     */
+    protected function prepare_data( $data ) {
 
-		// Return the link setting.
-		return array();
-	}
+        // Return the link setting.
+        return array();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	protected function run_action() {
+    /**
+     * @inheritdoc
+     */
+    protected function run_action() {
 
-		// Run the asynchronous action.
-		do_action( "wl_async_$this->action" );
+        // Run the asynchronous action.
+        do_action( "wl_async_$this->action" );
 
-	}
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -47,17 +47,17 @@ 
 	 *
 	 * @param int $auth_level The authentication level to use (see above)
 	 */
-	public function __construct( $auth_level = self::BOTH ) {
-		parent::__construct( $auth_level );
+	public function __construct($auth_level = self::BOTH) {
+		parent::__construct($auth_level);
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Push_References_Async_Task' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Push_References_Async_Task');
 
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	protected function prepare_data( $data ) {
+	protected function prepare_data($data) {
 
 		// Return the link setting.
 		return array();
@@ -69,7 +69,7 @@ 
 	protected function run_action() {
 
 		// Run the asynchronous action.
-		do_action( "wl_async_$this->action" );
+		do_action("wl_async_$this->action");
 
 	}
 

src/includes/class-wordlift-query-builder.php

Spacing +20 added lines, -22 removed lines

@@ -199,7 +199,7 @@ 
 	 *
 	 * @return $this \Wordlift_Query_Builder The Query builder.
 	 */
-	public function select( $props = '*' ) {
+	public function select($props = '*') {
 
 		$this->template = "SELECT $props WHERE { %s }";
 
@@ -220,38 +220,36 @@ 
 	 *
 	 * @return $this \Wordlift_Query_Builder The Query builder.
 	 */
-	public function statement( $subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null ) {
+	public function statement($subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null) {
 
 		// If no value has been provided, we don't set any statement.
-		if ( empty( $object ) ) {
+		if (empty($object)) {
 			return $this;
 		}
 
 		// Guess the subject type.
-		$subject_value_type = $this->guess_subject_type( $subject );
+		$subject_value_type = $this->guess_subject_type($subject);
 
 		// Get the object type if set, otherwise try to guess it.
-		$object_value_type = ( self::OBJECT_AUTO === $object_type ? $this->guess_object_type( $predicate, $object ) : $object_type );
+		$object_value_type = (self::OBJECT_AUTO === $object_type ? $this->guess_object_type($predicate, $object) : $object_type);
 
 		// Prepare the statement template.
 		$template =
 			// Subject as a parameter, no `<`, `>`.
-			( self::OBJECT_PARAMETER === $subject_value_type ? '%1$s' : '<%1$s>' ) .
+			(self::OBJECT_PARAMETER === $subject_value_type ? '%1$s' : '<%1$s>').
 			// Predicate.
-			' <%2$s> ' .
+			' <%2$s> '.
 			// Object.
-			( self::OBJECT_URI === $object_value_type ? '<%3$s>' :
-				( self::OBJECT_PARAMETER === $object_value_type ? '%3$s' :
-					// self::OBJECT_VALUE === $object_value_type
-					'"%3$s"' . ( isset( $data_type ) ? '^^%4$s' : '' ) . ( isset( $language ) ? '@%5$s' : '' ) ) );
+			(self::OBJECT_URI === $object_value_type ? '<%3$s>' : (self::OBJECT_PARAMETER === $object_value_type ? '%3$s' : // self::OBJECT_VALUE === $object_value_type
+					'"%3$s"'.(isset($data_type) ? '^^%4$s' : '').(isset($language) ? '@%5$s' : '')));
 
 		// Escape the subject, predicate and object.
-		$escaped_subject   = Wordlift_Sparql_Service::escape_uri( $subject );
-		$escaped_predicate = Wordlift_Sparql_Service::escape_uri( $predicate );
-		$escaped_object    = ( self::OBJECT_URI === $object_value_type ? Wordlift_Sparql_Service::escape_uri( $object ) : Wordlift_Sparql_Service::escape( $object ) );
+		$escaped_subject   = Wordlift_Sparql_Service::escape_uri($subject);
+		$escaped_predicate = Wordlift_Sparql_Service::escape_uri($predicate);
+		$escaped_object    = (self::OBJECT_URI === $object_value_type ? Wordlift_Sparql_Service::escape_uri($object) : Wordlift_Sparql_Service::escape($object));
 
 		// Prepare the statement and add it to the list of statements.
-		$this->statements[] = sprintf( $template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language );
+		$this->statements[] = sprintf($template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language);
 
 		return $this;
 	}
@@ -265,11 +263,11 @@ 
 	public function build() {
 
 		// If there are no statements return an empty string.
-		if ( empty( $this->statements ) ) {
+		if (empty($this->statements)) {
 			return '';
 		}
 
-		return sprintf( $this->template, implode( ' . ', $this->statements ) ) . "\n";
+		return sprintf($this->template, implode(' . ', $this->statements))."\n";
 	}
 
 	/**
@@ -282,15 +280,15 @@ 
 	 *
 	 * @return int {@link Wordlift_Query_Builder::OBJECT_URI} if the Query builder thinks the object must be an URI, {@link Wordlift_Query_Builder::OBJECT_VALUE} otherwise.
 	 */
-	private function guess_object_type( $predicate, $object ) {
+	private function guess_object_type($predicate, $object) {
 
 		// If the object starts with a question mark, it's a parameter.
-		if ( 0 === strpos( $object, '?' ) ) {
+		if (0 === strpos($object, '?')) {
 			return self::OBJECT_PARAMETER;
 		}
 
 		// Guess based on the predicate.
-		switch ( $predicate ) {
+		switch ($predicate) {
 
 			case self::DCTERMS_REFERENCES_URI:
 			case self::DCTERMS_SUBJECT_URI:
@@ -315,10 +313,10 @@ 
 	 *
 	 * @return int {@link Wordlift_Query_Builder::OBJECT_PARAMETER} if the Query builder thinks the subject is a parameter (starts with ?), otherwise {@link Wordlift_Query_Builder::OBJECT_URI}.
 	 */
-	private function guess_subject_type( $subject ) {
+	private function guess_subject_type($subject) {
 
 		// If the object starts with a question mark, it's a parameter.
-		if ( 0 === strpos( $subject, '?' ) ) {
+		if (0 === strpos($subject, '?')) {
 			return self::OBJECT_PARAMETER;
 		}
 

Indentation +324 added lines, -324 removed lines

@@ -7,329 +7,329 @@
  */
 class Wordlift_Query_Builder {
 
-	/**
-	 * The INSERT statement template.
-	 *
-	 * @since 3.1.7
-	 */
-	const INSERT = 'INSERT DATA { %s };';
-
-	/**
-	 * The DELETE statement template (it repeats the statements in the WHERE clause.
-	 *
-	 * @since 3.1.7
-	 */
-	const DELETE = 'DELETE { %s } WHERE { %1$s };';
-
-	/**
-	 * Tell the statement function to guess the object type (URI, value or parameter).
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_AUTO = - 1;
-
-	/**
-	 * Tell the statement function that the object is a URI.
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_URI = 0;
-
-	/**
-	 * Tell the statement function that the object is a value.
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_VALUE = 1;
-
-	/**
-	 * Tell the statement function that the object is a parameter.
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_PARAMETER = 2;
-
-	/**
-	 * The RDFS type.
-	 *
-	 * @since 3.1.7
-	 */
-	const RDFS_TYPE_URI = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
-
-	/**
-	 * The schema.org/Person type.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_PERSON_URI = 'http://schema.org/Person';
-
-	/**
-	 * The schema.org given name predicate.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_GIVEN_NAME_URI = 'http://schema.org/givenName';
-
-	/**
-	 * The schema.org family name predicate.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_FAMILY_NAME_URI = 'http://schema.org/familyName';
-
-	/**
-	 * The schema.org url predicate.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_URL_URI = 'http://schema.org/url';
-
-	/**
-	 * @since 3.14.0
-	 */
-	const SCHEMA_IMAGE_URI = 'http://schema.org/image';
-
-	/**
-	 * The location created predicate.
-	 *
-	 * @since 3.14.0
-	 */
-	const SCHEMA_LOCATION_CREATED_URI = 'http://schema.org/locationCreated';
-
-	/**
-	 * @since 3.14.0
-	 */
-	const SCHEMA_AUTHOR_URI = 'http://schema.org/author';
-
-	/**
-	 * @since 3.14.0
-	 */
-	const SCHEMA_INTERACTION_COUNT_URI = 'http://schema.org/interactionCount';
-
-	/**
-	 * @since 3.14.0
-	 */
-	const DCTERMS_SUBJECT_URI = 'http://purl.org/dc/terms/subject';
-
-	/**
-	 * @since 3.14.0
-	 */
-	const DCTERMS_REFERENCES_URI = 'http://purl.org/dc/terms/references';
-
-	/**
-	 * @since 3.15.0
-	 */
-	const DCTERMS_RELATION_URI = 'http://purl.org/dc/terms/relation';
-
-	/**
-	 * The RDF label.
-	 *
-	 * @since 3.1.7
-	 */
-	const RDFS_LABEL_URI = 'http://www.w3.org/2000/01/rdf-schema#label';
-
-	/**
-	 * The schema.org `streetAddress` property.
-	 *
-	 * @since 3.18.0
-	 */
-	const SCHEMA_STREET_ADDRESS = 'http://schema.org/streetAddress';
-
-	/**
-	 * The schema.org headline.
-	 *
-	 * @since 3.18.0
-	 */
-	const SCHEMA_HEADLINE_URI = 'http://schema.org/headline';
-
-	/**
-	 * Hold the template (INSERT or DELETE).
-	 *
-	 * @since  3.1.7
-	 * @access private
-	 * @var string $template The query template.
-	 */
-	private $template;
-
-	/**
-	 * An array of statements (in the form of subject, predicate, object).
-	 *
-	 * @since  3.1.7
-	 * @access private
-	 * @var array $statements An array of statements.
-	 */
-	private $statements = array();
-
-	/**
-	 * Create a new instance of the Query builder (compatible with PHP 5.3).
-	 *
-	 * @since 3.1.7
-	 * @return Wordlift_Query_Builder A new instance of the Query builder.
-	 */
-	public static function new_instance() {
-
-		return new Wordlift_Query_Builder();
-	}
-
-	/**
-	 * Set the query to INSERT.
-	 *
-	 * @since 3.1.7
-	 * @return Wordlift_Query_Builder The Query builder.
-	 */
-	public function insert() {
-
-		$this->template = self::INSERT;
-
-		return $this;
-	}
-
-	/**
-	 * Set the query to DELETE.
-	 *
-	 * @since 3.1.7
-	 * @return $this \Wordlift_Query_Builder The Query builder.
-	 */
-	public function delete() {
-
-		$this->template = self::DELETE;
-
-		return $this;
-	}
-
-	/**
-	 * Set the query to SELECT.
-	 *
-	 * @since 3.12.2
-	 *
-	 * @param string $props The list of properties to read.
-	 *
-	 * @return $this \Wordlift_Query_Builder The Query builder.
-	 */
-	public function select( $props = '*' ) {
-
-		$this->template = "SELECT $props WHERE { %s }";
-
-		return $this;
-	}
-
-	/**
-	 * Add a statement.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string      $subject     The subject of the statement (must be a URI).
-	 * @param string      $predicate   The predicate (must be a URI).
-	 * @param string      $object      The object, can be a URI or a value.
-	 * @param int         $object_type The object type, either a {@link OBJECT_URI} or a value {@link OBJECT_VALUE}. If set to {@link OBJECT_AUTO}, the Query builder will try to guess.
-	 * @param string|null $data_type   The data type (or null).
-	 * @param string|null $language    The language code (or null).
-	 *
-	 * @return $this \Wordlift_Query_Builder The Query builder.
-	 */
-	public function statement( $subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null ) {
-
-		// If no value has been provided, we don't set any statement.
-		if ( empty( $object ) ) {
-			return $this;
-		}
-
-		// Guess the subject type.
-		$subject_value_type = $this->guess_subject_type( $subject );
-
-		// Get the object type if set, otherwise try to guess it.
-		$object_value_type = ( self::OBJECT_AUTO === $object_type ? $this->guess_object_type( $predicate, $object ) : $object_type );
-
-		// Prepare the statement template.
-		$template =
-			// Subject as a parameter, no `<`, `>`.
-			( self::OBJECT_PARAMETER === $subject_value_type ? '%1$s' : '<%1$s>' ) .
-			// Predicate.
-			' <%2$s> ' .
-			// Object.
-			( self::OBJECT_URI === $object_value_type ? '<%3$s>' :
-				( self::OBJECT_PARAMETER === $object_value_type ? '%3$s' :
-					// self::OBJECT_VALUE === $object_value_type
-					'"%3$s"' . ( isset( $data_type ) ? '^^%4$s' : '' ) . ( isset( $language ) ? '@%5$s' : '' ) ) );
-
-		// Escape the subject, predicate and object.
-		$escaped_subject   = Wordlift_Sparql_Service::escape_uri( $subject );
-		$escaped_predicate = Wordlift_Sparql_Service::escape_uri( $predicate );
-		$escaped_object    = ( self::OBJECT_URI === $object_value_type ? Wordlift_Sparql_Service::escape_uri( $object ) : Wordlift_Sparql_Service::escape( $object ) );
-
-		// Prepare the statement and add it to the list of statements.
-		$this->statements[] = sprintf( $template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language );
-
-		return $this;
-	}
-
-	/**
-	 * Build the query.
-	 *
-	 * @since 3.1.7
-	 * @return string The query string.
-	 */
-	public function build() {
-
-		// If there are no statements return an empty string.
-		if ( empty( $this->statements ) ) {
-			return '';
-		}
-
-		return sprintf( $this->template, implode( ' . ', $this->statements ) ) . "\n";
-	}
-
-	/**
-	 * Guess the statement object type.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string $predicate The predicate.
-	 * @param string $object    The object.
-	 *
-	 * @return int {@link Wordlift_Query_Builder::OBJECT_URI} if the Query builder thinks the object must be an URI, {@link Wordlift_Query_Builder::OBJECT_VALUE} otherwise.
-	 */
-	private function guess_object_type( $predicate, $object ) {
-
-		// If the object starts with a question mark, it's a parameter.
-		if ( 0 === strpos( $object, '?' ) ) {
-			return self::OBJECT_PARAMETER;
-		}
-
-		// Guess based on the predicate.
-		switch ( $predicate ) {
-
-			case self::DCTERMS_REFERENCES_URI:
-			case self::DCTERMS_SUBJECT_URI:
-			case self::RDFS_TYPE_URI:
-			case self::SCHEMA_AUTHOR_URI:
-			case self::SCHEMA_LOCATION_CREATED_URI:
-			case self::SCHEMA_URL_URI:
-			case self::SCHEMA_IMAGE_URI:
-				return self::OBJECT_URI;
-
-		}
-
-		return self::OBJECT_VALUE;
-	}
-
-	/**
-	 * Guess the subject type.
-	 *
-	 * @since 3.12.3
-	 *
-	 * @param string $subject The subject string.
-	 *
-	 * @return int {@link Wordlift_Query_Builder::OBJECT_PARAMETER} if the Query builder thinks the subject is a parameter (starts with ?), otherwise {@link Wordlift_Query_Builder::OBJECT_URI}.
-	 */
-	private function guess_subject_type( $subject ) {
-
-		// If the object starts with a question mark, it's a parameter.
-		if ( 0 === strpos( $subject, '?' ) ) {
-			return self::OBJECT_PARAMETER;
-		}
-
-		return self::OBJECT_URI;
-	}
+    /**
+     * The INSERT statement template.
+     *
+     * @since 3.1.7
+     */
+    const INSERT = 'INSERT DATA { %s };';
+
+    /**
+     * The DELETE statement template (it repeats the statements in the WHERE clause.
+     *
+     * @since 3.1.7
+     */
+    const DELETE = 'DELETE { %s } WHERE { %1$s };';
+
+    /**
+     * Tell the statement function to guess the object type (URI, value or parameter).
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_AUTO = - 1;
+
+    /**
+     * Tell the statement function that the object is a URI.
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_URI = 0;
+
+    /**
+     * Tell the statement function that the object is a value.
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_VALUE = 1;
+
+    /**
+     * Tell the statement function that the object is a parameter.
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_PARAMETER = 2;
+
+    /**
+     * The RDFS type.
+     *
+     * @since 3.1.7
+     */
+    const RDFS_TYPE_URI = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
+
+    /**
+     * The schema.org/Person type.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_PERSON_URI = 'http://schema.org/Person';
+
+    /**
+     * The schema.org given name predicate.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_GIVEN_NAME_URI = 'http://schema.org/givenName';
+
+    /**
+     * The schema.org family name predicate.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_FAMILY_NAME_URI = 'http://schema.org/familyName';
+
+    /**
+     * The schema.org url predicate.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_URL_URI = 'http://schema.org/url';
+
+    /**
+     * @since 3.14.0
+     */
+    const SCHEMA_IMAGE_URI = 'http://schema.org/image';
+
+    /**
+     * The location created predicate.
+     *
+     * @since 3.14.0
+     */
+    const SCHEMA_LOCATION_CREATED_URI = 'http://schema.org/locationCreated';
+
+    /**
+     * @since 3.14.0
+     */
+    const SCHEMA_AUTHOR_URI = 'http://schema.org/author';
+
+    /**
+     * @since 3.14.0
+     */
+    const SCHEMA_INTERACTION_COUNT_URI = 'http://schema.org/interactionCount';
+
+    /**
+     * @since 3.14.0
+     */
+    const DCTERMS_SUBJECT_URI = 'http://purl.org/dc/terms/subject';
+
+    /**
+     * @since 3.14.0
+     */
+    const DCTERMS_REFERENCES_URI = 'http://purl.org/dc/terms/references';
+
+    /**
+     * @since 3.15.0
+     */
+    const DCTERMS_RELATION_URI = 'http://purl.org/dc/terms/relation';
+
+    /**
+     * The RDF label.
+     *
+     * @since 3.1.7
+     */
+    const RDFS_LABEL_URI = 'http://www.w3.org/2000/01/rdf-schema#label';
+
+    /**
+     * The schema.org `streetAddress` property.
+     *
+     * @since 3.18.0
+     */
+    const SCHEMA_STREET_ADDRESS = 'http://schema.org/streetAddress';
+
+    /**
+     * The schema.org headline.
+     *
+     * @since 3.18.0
+     */
+    const SCHEMA_HEADLINE_URI = 'http://schema.org/headline';
+
+    /**
+     * Hold the template (INSERT or DELETE).
+     *
+     * @since  3.1.7
+     * @access private
+     * @var string $template The query template.
+     */
+    private $template;
+
+    /**
+     * An array of statements (in the form of subject, predicate, object).
+     *
+     * @since  3.1.7
+     * @access private
+     * @var array $statements An array of statements.
+     */
+    private $statements = array();
+
+    /**
+     * Create a new instance of the Query builder (compatible with PHP 5.3).
+     *
+     * @since 3.1.7
+     * @return Wordlift_Query_Builder A new instance of the Query builder.
+     */
+    public static function new_instance() {
+
+        return new Wordlift_Query_Builder();
+    }
+
+    /**
+     * Set the query to INSERT.
+     *
+     * @since 3.1.7
+     * @return Wordlift_Query_Builder The Query builder.
+     */
+    public function insert() {
+
+        $this->template = self::INSERT;
+
+        return $this;
+    }
+
+    /**
+     * Set the query to DELETE.
+     *
+     * @since 3.1.7
+     * @return $this \Wordlift_Query_Builder The Query builder.
+     */
+    public function delete() {
+
+        $this->template = self::DELETE;
+
+        return $this;
+    }
+
+    /**
+     * Set the query to SELECT.
+     *
+     * @since 3.12.2
+     *
+     * @param string $props The list of properties to read.
+     *
+     * @return $this \Wordlift_Query_Builder The Query builder.
+     */
+    public function select( $props = '*' ) {
+
+        $this->template = "SELECT $props WHERE { %s }";
+
+        return $this;
+    }
+
+    /**
+     * Add a statement.
+     *
+     * @since 3.1.7
+     *
+     * @param string      $subject     The subject of the statement (must be a URI).
+     * @param string      $predicate   The predicate (must be a URI).
+     * @param string      $object      The object, can be a URI or a value.
+     * @param int         $object_type The object type, either a {@link OBJECT_URI} or a value {@link OBJECT_VALUE}. If set to {@link OBJECT_AUTO}, the Query builder will try to guess.
+     * @param string|null $data_type   The data type (or null).
+     * @param string|null $language    The language code (or null).
+     *
+     * @return $this \Wordlift_Query_Builder The Query builder.
+     */
+    public function statement( $subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null ) {
+
+        // If no value has been provided, we don't set any statement.
+        if ( empty( $object ) ) {
+            return $this;
+        }
+
+        // Guess the subject type.
+        $subject_value_type = $this->guess_subject_type( $subject );
+
+        // Get the object type if set, otherwise try to guess it.
+        $object_value_type = ( self::OBJECT_AUTO === $object_type ? $this->guess_object_type( $predicate, $object ) : $object_type );
+
+        // Prepare the statement template.
+        $template =
+            // Subject as a parameter, no `<`, `>`.
+            ( self::OBJECT_PARAMETER === $subject_value_type ? '%1$s' : '<%1$s>' ) .
+            // Predicate.
+            ' <%2$s> ' .
+            // Object.
+            ( self::OBJECT_URI === $object_value_type ? '<%3$s>' :
+                ( self::OBJECT_PARAMETER === $object_value_type ? '%3$s' :
+                    // self::OBJECT_VALUE === $object_value_type
+                    '"%3$s"' . ( isset( $data_type ) ? '^^%4$s' : '' ) . ( isset( $language ) ? '@%5$s' : '' ) ) );
+
+        // Escape the subject, predicate and object.
+        $escaped_subject   = Wordlift_Sparql_Service::escape_uri( $subject );
+        $escaped_predicate = Wordlift_Sparql_Service::escape_uri( $predicate );
+        $escaped_object    = ( self::OBJECT_URI === $object_value_type ? Wordlift_Sparql_Service::escape_uri( $object ) : Wordlift_Sparql_Service::escape( $object ) );
+
+        // Prepare the statement and add it to the list of statements.
+        $this->statements[] = sprintf( $template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language );
+
+        return $this;
+    }
+
+    /**
+     * Build the query.
+     *
+     * @since 3.1.7
+     * @return string The query string.
+     */
+    public function build() {
+
+        // If there are no statements return an empty string.
+        if ( empty( $this->statements ) ) {
+            return '';
+        }
+
+        return sprintf( $this->template, implode( ' . ', $this->statements ) ) . "\n";
+    }
+
+    /**
+     * Guess the statement object type.
+     *
+     * @since 3.1.7
+     *
+     * @param string $predicate The predicate.
+     * @param string $object    The object.
+     *
+     * @return int {@link Wordlift_Query_Builder::OBJECT_URI} if the Query builder thinks the object must be an URI, {@link Wordlift_Query_Builder::OBJECT_VALUE} otherwise.
+     */
+    private function guess_object_type( $predicate, $object ) {
+
+        // If the object starts with a question mark, it's a parameter.
+        if ( 0 === strpos( $object, '?' ) ) {
+            return self::OBJECT_PARAMETER;
+        }
+
+        // Guess based on the predicate.
+        switch ( $predicate ) {
+
+            case self::DCTERMS_REFERENCES_URI:
+            case self::DCTERMS_SUBJECT_URI:
+            case self::RDFS_TYPE_URI:
+            case self::SCHEMA_AUTHOR_URI:
+            case self::SCHEMA_LOCATION_CREATED_URI:
+            case self::SCHEMA_URL_URI:
+            case self::SCHEMA_IMAGE_URI:
+                return self::OBJECT_URI;
+
+        }
+
+        return self::OBJECT_VALUE;
+    }
+
+    /**
+     * Guess the subject type.
+     *
+     * @since 3.12.3
+     *
+     * @param string $subject The subject string.
+     *
+     * @return int {@link Wordlift_Query_Builder::OBJECT_PARAMETER} if the Query builder thinks the subject is a parameter (starts with ?), otherwise {@link Wordlift_Query_Builder::OBJECT_URI}.
+     */
+    private function guess_subject_type( $subject ) {
+
+        // If the object starts with a question mark, it's a parameter.
+        if ( 0 === strpos( $subject, '?' ) ) {
+            return self::OBJECT_PARAMETER;
+        }
+
+        return self::OBJECT_URI;
+    }
 
 }