insideout10 / wordlift-plugin

src/includes/class-wordlift-sparql-service.php

Indentation +243 added lines, -243 removed lines

@@ -11,279 +11,279 @@
  */
 class Wordlift_Sparql_Service {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Sparql_Service} singleton instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Sparql_Service $instance The {@link Wordlift_Sparql_Service} singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since 3.6.0
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Sparql_Service' );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the {@link Wordlift_Sparql_Service}.
-	 *
-	 * @since 3.6.0
-	 * @return \Wordlift_Sparql_Service
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Queue a SPARQL statement for execution.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $stmt  The SPARQL statement.
-	 * @param bool   $queue Whether to queue the statement for asynchronous
-	 *                      execution.
-	 */
-	public function execute( $stmt, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
-
-		rl_execute_sparql_update_query( $stmt, $queue );
-
-	}
-
-	/**
-	 * Run the SPARQL queries buffered for the specified request id.
-	 *
-	 * @since 3.13.2
-	 *
-	 * @param string $request_id A unique request id.
-	 */
-	public function run_sparql_query( $request_id ) {
-
-		$this->log->debug( "Running SPARQL queries..." );
-
-		// Look for a free temporary filename.
-		for ( $index = 1; $index < 1000; $index ++ ) {
-			$filename = WL_TEMP_DIR . $request_id . "-$index.sparql";
-
-			// Bail out if there are no files left.
-			if ( ! file_exists( $filename ) ) {
-				break;
-			}
-
-			$this->log->debug( "Running SPARQL from $filename..." );
-
-			// Get the query saved in the file.
-			$query = file_get_contents( $filename );
-
-			// Execute the SPARQL query.
-			rl_execute_sparql_update_query( $query, false );
-
-			// Delete the temporary file.
-			unlink( $filename );
-		}
-
-		// Reindex the triple store.
-		wordlift_reindex_triple_store();
-
-	}
-
-	/**
-	 * Queue a SPARQL statement for asynchronous execution.
-	 *
-	 * @since 3.13.2
-	 *
-	 * @param string $stmt The SPARQL statement.
-	 */
-	public function queue( $stmt ) {
-
-		// Get a temporary filename.
-		$filename = $this->get_temporary_file_for_sparql();
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Sparql_Service} singleton instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Sparql_Service $instance The {@link Wordlift_Sparql_Service} singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since 3.6.0
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Sparql_Service' );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the {@link Wordlift_Sparql_Service}.
+     *
+     * @since 3.6.0
+     * @return \Wordlift_Sparql_Service
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Queue a SPARQL statement for execution.
+     *
+     * @since 3.6.0
+     *
+     * @param string $stmt  The SPARQL statement.
+     * @param bool   $queue Whether to queue the statement for asynchronous
+     *                      execution.
+     */
+    public function execute( $stmt, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+
+        rl_execute_sparql_update_query( $stmt, $queue );
+
+    }
+
+    /**
+     * Run the SPARQL queries buffered for the specified request id.
+     *
+     * @since 3.13.2
+     *
+     * @param string $request_id A unique request id.
+     */
+    public function run_sparql_query( $request_id ) {
+
+        $this->log->debug( "Running SPARQL queries..." );
+
+        // Look for a free temporary filename.
+        for ( $index = 1; $index < 1000; $index ++ ) {
+            $filename = WL_TEMP_DIR . $request_id . "-$index.sparql";
+
+            // Bail out if there are no files left.
+            if ( ! file_exists( $filename ) ) {
+                break;
+            }
+
+            $this->log->debug( "Running SPARQL from $filename..." );
+
+            // Get the query saved in the file.
+            $query = file_get_contents( $filename );
+
+            // Execute the SPARQL query.
+            rl_execute_sparql_update_query( $query, false );
+
+            // Delete the temporary file.
+            unlink( $filename );
+        }
+
+        // Reindex the triple store.
+        wordlift_reindex_triple_store();
+
+    }
+
+    /**
+     * Queue a SPARQL statement for asynchronous execution.
+     *
+     * @since 3.13.2
+     *
+     * @param string $stmt The SPARQL statement.
+     */
+    public function queue( $stmt ) {
+
+        // Get a temporary filename.
+        $filename = $this->get_temporary_file_for_sparql();
 
-		$this->log->debug( "Buffering SPARQL to file $filename..." );
+        $this->log->debug( "Buffering SPARQL to file $filename..." );
 
-		// Write the contents to the temporary filename.
-		file_put_contents( $filename, $stmt . "\n", FILE_APPEND );
+        // Write the contents to the temporary filename.
+        file_put_contents( $filename, $stmt . "\n", FILE_APPEND );
 
-	}
+    }
 
-	/**
-	 * Get a temporary filename where to store SPARQL queries.
-	 *
-	 * @since 3.13.2
-	 *
-	 * @return string The filename.
-	 * @throws Exception An exception is thrown if there are already 1.000
-	 *                   temporary files for this request.
-	 */
-	private function get_temporary_file_for_sparql() {
+    /**
+     * Get a temporary filename where to store SPARQL queries.
+     *
+     * @since 3.13.2
+     *
+     * @return string The filename.
+     * @throws Exception An exception is thrown if there are already 1.000
+     *                   temporary files for this request.
+     */
+    private function get_temporary_file_for_sparql() {
 
-		// Look for a free temporary filename.
-		for ( $index = 1; $index < 1000; $index ++ ) {
-			$filename = WL_TEMP_DIR . WL_REQUEST_ID . "-$index.sparql";
+        // Look for a free temporary filename.
+        for ( $index = 1; $index < 1000; $index ++ ) {
+            $filename = WL_TEMP_DIR . WL_REQUEST_ID . "-$index.sparql";
 
-			if ( ! file_exists( $filename ) ) {
+            if ( ! file_exists( $filename ) ) {
 
-				// Only if this it the first buffered SPARQL, then launch the
-				// action which will be handled by the Async Task. The Async
-				// Task will take care of all the buffered files.
-				if ( 1 === $index ) {
-					do_action( 'wl_run_sparql_query', WL_REQUEST_ID );
-				}
+                // Only if this it the first buffered SPARQL, then launch the
+                // action which will be handled by the Async Task. The Async
+                // Task will take care of all the buffered files.
+                if ( 1 === $index ) {
+                    do_action( 'wl_run_sparql_query', WL_REQUEST_ID );
+                }
 
-				// Return the temporary filename.
-				return $filename;
-			}
-		}
+                // Return the temporary filename.
+                return $filename;
+            }
+        }
 
-		throw new Exception( 'Cannot create a temporary file.' );
-	}
+        throw new Exception( 'Cannot create a temporary file.' );
+    }
 
-	/**
-	 * Execute the SELECT query.
-	 *
-	 * @since 3.12.2
-	 *
-	 * @param string $query The SELECT query to execute.
-	 *
-	 * @return WP_Error|array The response or WP_Error on failure.
-	 */
-	public function select( $query ) {
+    /**
+     * Execute the SELECT query.
+     *
+     * @since 3.12.2
+     *
+     * @param string $query The SELECT query to execute.
+     *
+     * @return WP_Error|array The response or WP_Error on failure.
+     */
+    public function select( $query ) {
 
-		// Prepare the SPARQL statement by prepending the default namespaces.
-		$sparql = rl_sparql_prefixes() . "\n" . $query;
+        // Prepare the SPARQL statement by prepending the default namespaces.
+        $sparql = rl_sparql_prefixes() . "\n" . $query;
 
-		// Get the SPARQL SELECT URL.
-		$url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
+        // Get the SPARQL SELECT URL.
+        $url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
 
-		// Prepare the request.
-		$args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
+        // Prepare the request.
+        $args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
 
-		return wp_remote_get( $url, $args );
-	}
+        return wp_remote_get( $url, $args );
+    }
 
-	/**
-	 * Formats the provided value according to the specified type in order to
-	 * insert the value using SPARQL. The value is also escaped.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $value The value.
-	 * @param string $type  The value type.
-	 *
-	 * @return string The formatted value for SPARQL statements.
-	 */
-	public function format( $value, $type ) {
+    /**
+     * Formats the provided value according to the specified type in order to
+     * insert the value using SPARQL. The value is also escaped.
+     *
+     * @since 3.6.0
+     *
+     * @param string $value The value.
+     * @param string $type  The value type.
+     *
+     * @return string The formatted value for SPARQL statements.
+     */
+    public function format( $value, $type ) {
 
-		// see https://www.w3.org/TR/sparql11-query/.
-
-		switch ( $type ) {
+        // see https://www.w3.org/TR/sparql11-query/.
+
+        switch ( $type ) {
 
-			case Wordlift_Schema_Service::DATA_TYPE_BOOLEAN:
-
-				// SPARQL supports 'true' and 'false', so we evaluate the $value
-				// and return true/false accordingly.
-				return $value ? 'true' : 'false';
-
-			case Wordlift_Schema_Service::DATA_TYPE_DATE:
-
-				return sprintf( '"%s"^^xsd:date', self::escape( $value ) );
-
-
-			case Wordlift_Schema_Service::DATA_TYPE_DOUBLE:
-
-				return sprintf( '"%s"^^xsd:double', self::escape( $value ) );
+            case Wordlift_Schema_Service::DATA_TYPE_BOOLEAN:
+
+                // SPARQL supports 'true' and 'false', so we evaluate the $value
+                // and return true/false accordingly.
+                return $value ? 'true' : 'false';
+
+            case Wordlift_Schema_Service::DATA_TYPE_DATE:
+
+                return sprintf( '"%s"^^xsd:date', self::escape( $value ) );
+
+
+            case Wordlift_Schema_Service::DATA_TYPE_DOUBLE:
+
+                return sprintf( '"%s"^^xsd:double', self::escape( $value ) );
 
-			case Wordlift_Schema_Service::DATA_TYPE_INTEGER:
+            case Wordlift_Schema_Service::DATA_TYPE_INTEGER:
 
-				return sprintf( '"%s"^^xsd:integer', self::escape( $value ) );
+                return sprintf( '"%s"^^xsd:integer', self::escape( $value ) );
 
-			case Wordlift_Schema_Service::DATA_TYPE_STRING:
+            case Wordlift_Schema_Service::DATA_TYPE_STRING:
 
-				return sprintf( '"%s"^^xsd:string', self::escape( $value ) );
+                return sprintf( '"%s"^^xsd:string', self::escape( $value ) );
 
-			case Wordlift_Schema_Service::DATA_TYPE_URI:
-
-				return sprintf( '<%s>', self::escape_uri( $value ) );
-
-			default:
-
-				$this->log->warn( "Unknown data type [ type :: $type ]" );
-
-				// Try to insert the value anyway.
-				return sprintf( '"%s"', self::escape( $value ) );
-		}
+            case Wordlift_Schema_Service::DATA_TYPE_URI:
+
+                return sprintf( '<%s>', self::escape_uri( $value ) );
+
+            default:
+
+                $this->log->warn( "Unknown data type [ type :: $type ]" );
+
+                // Try to insert the value anyway.
+                return sprintf( '"%s"', self::escape( $value ) );
+        }
 
-	}
+    }
 
-	/**
-	 * Escapes an URI for a SPARQL statement.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $uri The URI to escape.
-	 *
-	 * @return string The escaped URI.
-	 */
-	public static function escape_uri( $uri ) {
+    /**
+     * Escapes an URI for a SPARQL statement.
+     *
+     * @since 3.6.0
+     *
+     * @param string $uri The URI to escape.
+     *
+     * @return string The escaped URI.
+     */
+    public static function escape_uri( $uri ) {
 
-		// Should we validate the IRI?
-		// http://www.w3.org/TR/sparql11-query/#QSynIRI
+        // Should we validate the IRI?
+        // http://www.w3.org/TR/sparql11-query/#QSynIRI
 
-		$uri = str_replace( '<', '\<', $uri );
-		$uri = str_replace( '>', '\>', $uri );
+        $uri = str_replace( '<', '\<', $uri );
+        $uri = str_replace( '>', '\>', $uri );
 
-		return $uri;
-	}
+        return $uri;
+    }
 
-	/**
-	 * Escapes a string for a SPARQL statement.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $string The string to escape.
-	 *
-	 * @return string The escaped string.
-	 */
-	public static function escape( $string ) {
+    /**
+     * Escapes a string for a SPARQL statement.
+     *
+     * @since 3.6.0
+     *
+     * @param string $string The string to escape.
+     *
+     * @return string The escaped string.
+     */
+    public static function escape( $string ) {
 
-		// see http://www.w3.org/TR/rdf-sparql-query/
-		//    '\t'	U+0009 (tab)
-		//    '\n'	U+000A (line feed)
-		//    '\r'	U+000D (carriage return)
-		//    '\b'	U+0008 (backspace)
-		//    '\f'	U+000C (form feed)
-		//    '\"'	U+0022 (quotation mark, double quote mark)
-		//    "\'"	U+0027 (apostrophe-quote, single quote mark)
-		//    '\\'	U+005C (backslash)
+        // see http://www.w3.org/TR/rdf-sparql-query/
+        //    '\t'	U+0009 (tab)
+        //    '\n'	U+000A (line feed)
+        //    '\r'	U+000D (carriage return)
+        //    '\b'	U+0008 (backspace)
+        //    '\f'	U+000C (form feed)
+        //    '\"'	U+0022 (quotation mark, double quote mark)
+        //    "\'"	U+0027 (apostrophe-quote, single quote mark)
+        //    '\\'	U+005C (backslash)
 
-		$string = str_replace( '\\', '\\\\', $string );
-		$string = str_replace( '\'', '\\\'', $string );
-		$string = str_replace( '"', '\\"', $string );
-		$string = str_replace( "\f", '\\f', $string );
-		$string = str_replace( "\b", '\\b', $string );
-		$string = str_replace( "\r", '\\r', $string );
-		$string = str_replace( "\n", '\\n', $string );
-		$string = str_replace( "\t", '\\t', $string );
+        $string = str_replace( '\\', '\\\\', $string );
+        $string = str_replace( '\'', '\\\'', $string );
+        $string = str_replace( '"', '\\"', $string );
+        $string = str_replace( "\f", '\\f', $string );
+        $string = str_replace( "\b", '\\b', $string );
+        $string = str_replace( "\r", '\\r', $string );
+        $string = str_replace( "\n", '\\n', $string );
+        $string = str_replace( "\t", '\\t', $string );
 
-		return $string;
-	}
+        return $string;
+    }
 
 }

Spacing +47 added lines, -47 removed lines

@@ -36,7 +36,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Sparql_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Sparql_Service');
 
 		self::$instance = $this;
 
@@ -62,9 +62,9 @@ 
 	 * @param bool   $queue Whether to queue the statement for asynchronous
 	 *                      execution.
 	 */
-	public function execute( $stmt, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+	public function execute($stmt, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING) {
 
-		rl_execute_sparql_update_query( $stmt, $queue );
+		rl_execute_sparql_update_query($stmt, $queue);
 
 	}
 
@@ -75,29 +75,29 @@ 
 	 *
 	 * @param string $request_id A unique request id.
 	 */
-	public function run_sparql_query( $request_id ) {
+	public function run_sparql_query($request_id) {
 
-		$this->log->debug( "Running SPARQL queries..." );
+		$this->log->debug("Running SPARQL queries...");
 
 		// Look for a free temporary filename.
-		for ( $index = 1; $index < 1000; $index ++ ) {
-			$filename = WL_TEMP_DIR . $request_id . "-$index.sparql";
+		for ($index = 1; $index < 1000; $index++) {
+			$filename = WL_TEMP_DIR.$request_id."-$index.sparql";
 
 			// Bail out if there are no files left.
-			if ( ! file_exists( $filename ) ) {
+			if ( ! file_exists($filename)) {
 				break;
 			}
 
-			$this->log->debug( "Running SPARQL from $filename..." );
+			$this->log->debug("Running SPARQL from $filename...");
 
 			// Get the query saved in the file.
-			$query = file_get_contents( $filename );
+			$query = file_get_contents($filename);
 
 			// Execute the SPARQL query.
-			rl_execute_sparql_update_query( $query, false );
+			rl_execute_sparql_update_query($query, false);
 
 			// Delete the temporary file.
-			unlink( $filename );
+			unlink($filename);
 		}
 
 		// Reindex the triple store.
@@ -112,15 +112,15 @@ 
 	 *
 	 * @param string $stmt The SPARQL statement.
 	 */
-	public function queue( $stmt ) {
+	public function queue($stmt) {
 
 		// Get a temporary filename.
 		$filename = $this->get_temporary_file_for_sparql();
 
-		$this->log->debug( "Buffering SPARQL to file $filename..." );
+		$this->log->debug("Buffering SPARQL to file $filename...");
 
 		// Write the contents to the temporary filename.
-		file_put_contents( $filename, $stmt . "\n", FILE_APPEND );
+		file_put_contents($filename, $stmt."\n", FILE_APPEND);
 
 	}
 
@@ -136,16 +136,16 @@ 
 	private function get_temporary_file_for_sparql() {
 
 		// Look for a free temporary filename.
-		for ( $index = 1; $index < 1000; $index ++ ) {
-			$filename = WL_TEMP_DIR . WL_REQUEST_ID . "-$index.sparql";
+		for ($index = 1; $index < 1000; $index++) {
+			$filename = WL_TEMP_DIR.WL_REQUEST_ID."-$index.sparql";
 
-			if ( ! file_exists( $filename ) ) {
+			if ( ! file_exists($filename)) {
 
 				// Only if this it the first buffered SPARQL, then launch the
 				// action which will be handled by the Async Task. The Async
 				// Task will take care of all the buffered files.
-				if ( 1 === $index ) {
-					do_action( 'wl_run_sparql_query', WL_REQUEST_ID );
+				if (1 === $index) {
+					do_action('wl_run_sparql_query', WL_REQUEST_ID);
 				}
 
 				// Return the temporary filename.
@@ -153,7 +153,7 @@ 
 			}
 		}
 
-		throw new Exception( 'Cannot create a temporary file.' );
+		throw new Exception('Cannot create a temporary file.');
 	}
 
 	/**
@@ -165,18 +165,18 @@ 
 	 *
 	 * @return WP_Error|array The response or WP_Error on failure.
 	 */
-	public function select( $query ) {
+	public function select($query) {
 
 		// Prepare the SPARQL statement by prepending the default namespaces.
-		$sparql = rl_sparql_prefixes() . "\n" . $query;
+		$sparql = rl_sparql_prefixes()."\n".$query;
 
 		// Get the SPARQL SELECT URL.
-		$url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
+		$url = wl_configuration_get_query_select_url('csv').urlencode($sparql);
 
 		// Prepare the request.
-		$args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
+		$args = unserialize(WL_REDLINK_API_HTTP_OPTIONS);
 
-		return wp_remote_get( $url, $args );
+		return wp_remote_get($url, $args);
 	}
 
 	/**
@@ -190,11 +190,11 @@ 
 	 *
 	 * @return string The formatted value for SPARQL statements.
 	 */
-	public function format( $value, $type ) {
+	public function format($value, $type) {
 
 		// see https://www.w3.org/TR/sparql11-query/.
 
-		switch ( $type ) {
+		switch ($type) {
 
 			case Wordlift_Schema_Service::DATA_TYPE_BOOLEAN:
 
@@ -204,31 +204,31 @@ 
 
 			case Wordlift_Schema_Service::DATA_TYPE_DATE:
 
-				return sprintf( '"%s"^^xsd:date', self::escape( $value ) );
+				return sprintf('"%s"^^xsd:date', self::escape($value));
 
 
 			case Wordlift_Schema_Service::DATA_TYPE_DOUBLE:
 
-				return sprintf( '"%s"^^xsd:double', self::escape( $value ) );
+				return sprintf('"%s"^^xsd:double', self::escape($value));
 
 			case Wordlift_Schema_Service::DATA_TYPE_INTEGER:
 
-				return sprintf( '"%s"^^xsd:integer', self::escape( $value ) );
+				return sprintf('"%s"^^xsd:integer', self::escape($value));
 
 			case Wordlift_Schema_Service::DATA_TYPE_STRING:
 
-				return sprintf( '"%s"^^xsd:string', self::escape( $value ) );
+				return sprintf('"%s"^^xsd:string', self::escape($value));
 
 			case Wordlift_Schema_Service::DATA_TYPE_URI:
 
-				return sprintf( '<%s>', self::escape_uri( $value ) );
+				return sprintf('<%s>', self::escape_uri($value));
 
 			default:
 
-				$this->log->warn( "Unknown data type [ type :: $type ]" );
+				$this->log->warn("Unknown data type [ type :: $type ]");
 
 				// Try to insert the value anyway.
-				return sprintf( '"%s"', self::escape( $value ) );
+				return sprintf('"%s"', self::escape($value));
 		}
 
 	}
@@ -242,13 +242,13 @@ 
 	 *
 	 * @return string The escaped URI.
 	 */
-	public static function escape_uri( $uri ) {
+	public static function escape_uri($uri) {
 
 		// Should we validate the IRI?
 		// http://www.w3.org/TR/sparql11-query/#QSynIRI
 
-		$uri = str_replace( '<', '\<', $uri );
-		$uri = str_replace( '>', '\>', $uri );
+		$uri = str_replace('<', '\<', $uri);
+		$uri = str_replace('>', '\>', $uri);
 
 		return $uri;
 	}
@@ -262,7 +262,7 @@ 
 	 *
 	 * @return string The escaped string.
 	 */
-	public static function escape( $string ) {
+	public static function escape($string) {
 
 		// see http://www.w3.org/TR/rdf-sparql-query/
 		//    '\t'	U+0009 (tab)
@@ -274,14 +274,14 @@ 
 		//    "\'"	U+0027 (apostrophe-quote, single quote mark)
 		//    '\\'	U+005C (backslash)
 
-		$string = str_replace( '\\', '\\\\', $string );
-		$string = str_replace( '\'', '\\\'', $string );
-		$string = str_replace( '"', '\\"', $string );
-		$string = str_replace( "\f", '\\f', $string );
-		$string = str_replace( "\b", '\\b', $string );
-		$string = str_replace( "\r", '\\r', $string );
-		$string = str_replace( "\n", '\\n', $string );
-		$string = str_replace( "\t", '\\t', $string );
+		$string = str_replace('\\', '\\\\', $string);
+		$string = str_replace('\'', '\\\'', $string);
+		$string = str_replace('"', '\\"', $string);
+		$string = str_replace("\f", '\\f', $string);
+		$string = str_replace("\b", '\\b', $string);
+		$string = str_replace("\r", '\\r', $string);
+		$string = str_replace("\n", '\\n', $string);
+		$string = str_replace("\t", '\\t', $string);
 
 		return $string;
 	}

src/includes/class-wordlift-import-service.php

Indentation +176 added lines, -176 removed lines

@@ -12,181 +12,181 @@
  */
 class Wordlift_Import_Service {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * A {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Post_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The entity service instance.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The entity service instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * The schema service instance.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The schema service instance.
-	 */
-	private $schema_service;
-
-	private $sparql_service;
-
-	/**
-	 * The dataset URI for this WordPress web site.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var string $dataset_uri The dataset URI for this WordPress web site.
-	 */
-	private $dataset_uri;
-
-	/**
-	 * Create a Wordlift_Import_Service instance.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param \Wordlift_Entity_Post_Type_Service $entity_type_service
-	 * @param \Wordlift_Entity_Service $entity_service
-	 * @param \Wordlift_Schema_Service $schema_service
-	 * @param \Wordlift_Sparql_Service $sparql_service
-	 * @param string $dataset_uri
-	 */
-	public function __construct( $entity_type_service, $entity_service, $schema_service, $sparql_service, $dataset_uri ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Import_Service' );
-
-		$this->entity_type_service = $entity_type_service;
-		$this->entity_service      = $entity_service;
-		$this->schema_service      = $schema_service;
-		$this->sparql_service      = $sparql_service;
-		$this->dataset_uri         = $dataset_uri;
-
-	}
-
-	/**
-	 * Handle the `wp_import_post_meta` filter by checking the `entity_url` meta.
-	 * If the `entity_url` meta value is not within the WP web site dataset URI,
-	 * it is changed into an `entity_same_as` meta key.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param array $postmeta An array of indexed post meta.
-	 * @param int $post_id The post ID being imported.
-	 * @param array $post An array of post properties.
-	 *
-	 * @return array An array of indexed post meta.
-	 */
-	public function wp_import_post_meta( $postmeta, $post_id, $post ) {
-
-		// If we're not dealing with entity posts, return the original post meta.
-		if ( $post['post_type'] !== $this->entity_type_service->get_post_type() ) {
-			return $postmeta;
-		}
-
-		// Get a reference to the entity URL meta.
-		$entity_url_meta = NULL;
-
-		foreach ( $postmeta as &$meta ) {
-			if ( 'entity_url' === $meta['key'] ) {
-				$entity_url_meta = &$meta;
-				break;
-			}
-		}
-
-		// If the entity URI is within the dataset URI, we don't change anything.
-		if ( NULL === $entity_url_meta || 0 === strpos( $entity_url_meta['value'], $this->dataset_uri ) ) {
-			return $postmeta;
-		}
-
-		// Since the entity URL doesn't belong to this WP install, as the dataset
-		// URI doesn't match the start of the entity URL, we turn the entity URL
-		// meta to an entity sameAs. $entity_url_meta is a reference so it should
-		// update the item in the postmeta array directly.
-		$entity_url_meta['key'] = 'entity_same_as';
-
-		return $postmeta;
-	}
-
-	/**
-	 * Catch post meta updates.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param int $mid The meta ID after successful update.
-	 * @param int $object_id Object ID.
-	 * @param string $meta_key Meta key.
-	 * @param mixed $meta_value Meta value.
-	 */
-	public function added_post_meta( $mid, $object_id, $meta_key, $meta_value ) {
-
-		// Get the entity URI.
-		$s = $this->entity_service->get_uri( $object_id );
-
-		// Get the field with the specified meta key. Return if the field is not defined.
-		if ( NULL === ( $field = $this->schema_service->get_field( $meta_key ) ) ) {
-			return;
-		}
-
-		// Get the field predicate.
-		$p = $field['predicate'];
-
-		// Format the object value according to the field type.
-		$o = $this->sparql_service->format( $meta_value, $field['type'] );
-
-		// Create the statement.
-		$stmt = sprintf( 'INSERT DATA { <%s> <%s> %s };', Wordlift_Sparql_Service::escape_uri( $s ), Wordlift_Sparql_Service::escape_uri( $p ), $o );
-
-		// Finally queue the statement.
-		$this->sparql_service->execute( $stmt );
-
-	}
-
-	/**
-	 * When an import is running, hook the {@link added_post_meta} function in order
-	 * to insert metadata from an import in Linked Data.
-	 *
-	 * @since 3.6.0
-	 */
-	public function import_start() {
-
-		add_action( 'added_post_meta', array(
-			$this,
-			'added_post_meta'
-		), 10, 4 );
-
-	}
-
-	/**
-	 * When an import ends, remove the hook previously added by {@link import_start}.
-	 *
-	 * @since 3.6.0
-	 */
-	public function import_end() {
-
-		remove_action( 'added_post_meta', array(
-			$this,
-			'added_post_meta'
-		), 10 );
-
-	}
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * A {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Post_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The entity service instance.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The entity service instance.
+     */
+    private $entity_service;
+
+    /**
+     * The schema service instance.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The schema service instance.
+     */
+    private $schema_service;
+
+    private $sparql_service;
+
+    /**
+     * The dataset URI for this WordPress web site.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var string $dataset_uri The dataset URI for this WordPress web site.
+     */
+    private $dataset_uri;
+
+    /**
+     * Create a Wordlift_Import_Service instance.
+     *
+     * @since 3.6.0
+     *
+     * @param \Wordlift_Entity_Post_Type_Service $entity_type_service
+     * @param \Wordlift_Entity_Service $entity_service
+     * @param \Wordlift_Schema_Service $schema_service
+     * @param \Wordlift_Sparql_Service $sparql_service
+     * @param string $dataset_uri
+     */
+    public function __construct( $entity_type_service, $entity_service, $schema_service, $sparql_service, $dataset_uri ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Import_Service' );
+
+        $this->entity_type_service = $entity_type_service;
+        $this->entity_service      = $entity_service;
+        $this->schema_service      = $schema_service;
+        $this->sparql_service      = $sparql_service;
+        $this->dataset_uri         = $dataset_uri;
+
+    }
+
+    /**
+     * Handle the `wp_import_post_meta` filter by checking the `entity_url` meta.
+     * If the `entity_url` meta value is not within the WP web site dataset URI,
+     * it is changed into an `entity_same_as` meta key.
+     *
+     * @since 3.6.0
+     *
+     * @param array $postmeta An array of indexed post meta.
+     * @param int $post_id The post ID being imported.
+     * @param array $post An array of post properties.
+     *
+     * @return array An array of indexed post meta.
+     */
+    public function wp_import_post_meta( $postmeta, $post_id, $post ) {
+
+        // If we're not dealing with entity posts, return the original post meta.
+        if ( $post['post_type'] !== $this->entity_type_service->get_post_type() ) {
+            return $postmeta;
+        }
+
+        // Get a reference to the entity URL meta.
+        $entity_url_meta = NULL;
+
+        foreach ( $postmeta as &$meta ) {
+            if ( 'entity_url' === $meta['key'] ) {
+                $entity_url_meta = &$meta;
+                break;
+            }
+        }
+
+        // If the entity URI is within the dataset URI, we don't change anything.
+        if ( NULL === $entity_url_meta || 0 === strpos( $entity_url_meta['value'], $this->dataset_uri ) ) {
+            return $postmeta;
+        }
+
+        // Since the entity URL doesn't belong to this WP install, as the dataset
+        // URI doesn't match the start of the entity URL, we turn the entity URL
+        // meta to an entity sameAs. $entity_url_meta is a reference so it should
+        // update the item in the postmeta array directly.
+        $entity_url_meta['key'] = 'entity_same_as';
+
+        return $postmeta;
+    }
+
+    /**
+     * Catch post meta updates.
+     *
+     * @since 3.6.0
+     *
+     * @param int $mid The meta ID after successful update.
+     * @param int $object_id Object ID.
+     * @param string $meta_key Meta key.
+     * @param mixed $meta_value Meta value.
+     */
+    public function added_post_meta( $mid, $object_id, $meta_key, $meta_value ) {
+
+        // Get the entity URI.
+        $s = $this->entity_service->get_uri( $object_id );
+
+        // Get the field with the specified meta key. Return if the field is not defined.
+        if ( NULL === ( $field = $this->schema_service->get_field( $meta_key ) ) ) {
+            return;
+        }
+
+        // Get the field predicate.
+        $p = $field['predicate'];
+
+        // Format the object value according to the field type.
+        $o = $this->sparql_service->format( $meta_value, $field['type'] );
+
+        // Create the statement.
+        $stmt = sprintf( 'INSERT DATA { <%s> <%s> %s };', Wordlift_Sparql_Service::escape_uri( $s ), Wordlift_Sparql_Service::escape_uri( $p ), $o );
+
+        // Finally queue the statement.
+        $this->sparql_service->execute( $stmt );
+
+    }
+
+    /**
+     * When an import is running, hook the {@link added_post_meta} function in order
+     * to insert metadata from an import in Linked Data.
+     *
+     * @since 3.6.0
+     */
+    public function import_start() {
+
+        add_action( 'added_post_meta', array(
+            $this,
+            'added_post_meta'
+        ), 10, 4 );
+
+    }
+
+    /**
+     * When an import ends, remove the hook previously added by {@link import_start}.
+     *
+     * @since 3.6.0
+     */
+    public function import_end() {
+
+        remove_action( 'added_post_meta', array(
+            $this,
+            'added_post_meta'
+        ), 10 );
+
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -70,9 +70,9 @@ 
 	 * @param \Wordlift_Sparql_Service $sparql_service
 	 * @param string $dataset_uri
 	 */
-	public function __construct( $entity_type_service, $entity_service, $schema_service, $sparql_service, $dataset_uri ) {
+	public function __construct($entity_type_service, $entity_service, $schema_service, $sparql_service, $dataset_uri) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Import_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Import_Service');
 
 		$this->entity_type_service = $entity_type_service;
 		$this->entity_service      = $entity_service;
@@ -95,25 +95,25 @@ 
 	 *
 	 * @return array An array of indexed post meta.
 	 */
-	public function wp_import_post_meta( $postmeta, $post_id, $post ) {
+	public function wp_import_post_meta($postmeta, $post_id, $post) {
 
 		// If we're not dealing with entity posts, return the original post meta.
-		if ( $post['post_type'] !== $this->entity_type_service->get_post_type() ) {
+		if ($post['post_type'] !== $this->entity_type_service->get_post_type()) {
 			return $postmeta;
 		}
 
 		// Get a reference to the entity URL meta.
 		$entity_url_meta = NULL;
 
-		foreach ( $postmeta as &$meta ) {
-			if ( 'entity_url' === $meta['key'] ) {
+		foreach ($postmeta as &$meta) {
+			if ('entity_url' === $meta['key']) {
 				$entity_url_meta = &$meta;
 				break;
 			}
 		}
 
 		// If the entity URI is within the dataset URI, we don't change anything.
-		if ( NULL === $entity_url_meta || 0 === strpos( $entity_url_meta['value'], $this->dataset_uri ) ) {
+		if (NULL === $entity_url_meta || 0 === strpos($entity_url_meta['value'], $this->dataset_uri)) {
 			return $postmeta;
 		}
 
@@ -136,13 +136,13 @@ 
 	 * @param string $meta_key Meta key.
 	 * @param mixed $meta_value Meta value.
 	 */
-	public function added_post_meta( $mid, $object_id, $meta_key, $meta_value ) {
+	public function added_post_meta($mid, $object_id, $meta_key, $meta_value) {
 
 		// Get the entity URI.
-		$s = $this->entity_service->get_uri( $object_id );
+		$s = $this->entity_service->get_uri($object_id);
 
 		// Get the field with the specified meta key. Return if the field is not defined.
-		if ( NULL === ( $field = $this->schema_service->get_field( $meta_key ) ) ) {
+		if (NULL === ($field = $this->schema_service->get_field($meta_key))) {
 			return;
 		}
 
@@ -150,13 +150,13 @@ 
 		$p = $field['predicate'];
 
 		// Format the object value according to the field type.
-		$o = $this->sparql_service->format( $meta_value, $field['type'] );
+		$o = $this->sparql_service->format($meta_value, $field['type']);
 
 		// Create the statement.
-		$stmt = sprintf( 'INSERT DATA { <%s> <%s> %s };', Wordlift_Sparql_Service::escape_uri( $s ), Wordlift_Sparql_Service::escape_uri( $p ), $o );
+		$stmt = sprintf('INSERT DATA { <%s> <%s> %s };', Wordlift_Sparql_Service::escape_uri($s), Wordlift_Sparql_Service::escape_uri($p), $o);
 
 		// Finally queue the statement.
-		$this->sparql_service->execute( $stmt );
+		$this->sparql_service->execute($stmt);
 
 	}
 
@@ -168,10 +168,10 @@ 
 	 */
 	public function import_start() {
 
-		add_action( 'added_post_meta', array(
+		add_action('added_post_meta', array(
 			$this,
 			'added_post_meta'
-		), 10, 4 );
+		), 10, 4);
 
 	}
 
@@ -182,10 +182,10 @@ 
 	 */
 	public function import_end() {
 
-		remove_action( 'added_post_meta', array(
+		remove_action('added_post_meta', array(
 			$this,
 			'added_post_meta'
-		), 10 );
+		), 10);
 
 	}
 

src/includes/wp-async-task/wp-async-task.php

Indentation +270 added lines, -270 removed lines

@@ -8,276 +8,276 @@
  */
 
 if ( ! class_exists( 'WP_Async_Task' ) ) {
-	abstract class WP_Async_Task {
-
-		/**
-		 * Constant identifier for a task that should be available to logged-in users
-		 *
-		 * See constructor documentation for more details.
-		 */
-		const LOGGED_IN = 1;
-
-		/**
-		 * Constant identifier for a task that should be available to logged-out users
-		 *
-		 * See constructor documentation for more details.
-		 */
-		const LOGGED_OUT = 2;
-
-		/**
-		 * Constant identifier for a task that should be available to all users regardless of auth status
-		 *
-		 * See constructor documentation for more details.
-		 */
-		const BOTH = 3;
-
-		/**
-		 * This is the argument count for the main action set in the constructor. It
-		 * is set to an arbitrarily high value of twenty, but can be overridden if
-		 * necessary
-		 *
-		 * @var int
-		 */
-		protected $argument_count = 20;
-
-		/**
-		 * Priority to fire intermediate action.
-		 *
-		 * @var int
-		 */
-		protected $priority = 10;
-
-		/**
-		 * @var string
-		 */
-		protected $action;
-
-		/**
-		 * @var array
-		 */
-		protected $_body_data;
-
-		/**
-		 * Constructor to wire up the necessary actions
-		 *
-		 * Which hooks the asynchronous postback happens on can be set by the
-		 * $auth_level parameter. There are essentially three options: logged in users
-		 * only, logged out users only, or both. Set this when you instantiate an
-		 * object by using one of the three class constants to do so:
-		 *  - LOGGED_IN
-		 *  - LOGGED_OUT
-		 *  - BOTH
-		 * $auth_level defaults to BOTH
-		 *
-		 * @throws Exception If the class' $action value hasn't been set
-		 *
-		 * @param int $auth_level The authentication level to use (see above)
-		 */
-		public function __construct( $auth_level = self::BOTH ) {
-			if ( empty( $this->action ) ) {
-				throw new Exception( 'Action not defined for class ' . __CLASS__ );
-			}
-			add_action( $this->action, array(
-				$this,
-				'launch',
-			), (int) $this->priority, (int) $this->argument_count );
-			if ( $auth_level & self::LOGGED_IN ) {
-				add_action( "admin_post_wp_async_$this->action", array(
-					$this,
-					'handle_postback',
-				) );
-			}
-			if ( $auth_level & self::LOGGED_OUT ) {
-				add_action( "admin_post_nopriv_wp_async_$this->action", array(
-					$this,
-					'handle_postback',
-				) );
-			}
-		}
-
-		/**
-		 * Add the shutdown action for launching the real postback if we don't
-		 * get an exception thrown by prepare_data().
-		 *
-		 * @uses func_get_args() To grab any arguments passed by the action
-		 */
-		public function launch() {
-			$data = func_get_args();
-			try {
-				$data = $this->prepare_data( $data );
-			} catch ( Exception $e ) {
-				return;
-			}
-
-			$data['action'] = "wp_async_$this->action";
-			$data['_nonce'] = $this->create_async_nonce();
-
-			$this->_body_data = $data;
-
-			if ( ! has_action( 'shutdown', array(
-				$this,
-				'launch_on_shutdown',
-			) )
-			) {
-				add_action( 'shutdown', array( $this, 'launch_on_shutdown' ) );
-			}
-		}
-
-		/**
-		 * Launch the request on the WordPress shutdown hook
-		 *
-		 * On VIP we got into data races due to the postback sometimes completing
-		 * faster than the data could propogate to the database server cluster.
-		 * This made WordPress get empty data sets from the database without
-		 * failing. On their advice, we're moving the actual firing of the async
-		 * postback to the shutdown hook. Supposedly that will ensure that the
-		 * data at least has time to get into the object cache.
-		 *
-		 * @uses $_COOKIE        To send a cookie header for async postback
-		 * @uses apply_filters()
-		 * @uses admin_url()
-		 * @uses wp_remote_post()
-		 */
-		public function launch_on_shutdown() {
-			if ( ! empty( $this->_body_data ) ) {
-				$cookies = array();
-				foreach ( $_COOKIE as $name => $value ) {
-					$cookies[] = "$name=" . urlencode( is_array( $value ) ? serialize( $value ) : $value );
-				}
-
-				$request_args = array(
-					'timeout'   => 0.01,
-					'blocking'  => false,
-					'sslverify' => apply_filters( 'https_local_ssl_verify', true ),
-					'body'      => $this->_body_data,
-					'headers'   => array(
-						'cookie' => implode( '; ', $cookies ),
-					),
-				);
-
-				$url = admin_url( 'admin-post.php' );
-
-				error_log( "Launching [ url :: $url ][ " . var_export( $request_args, true ) . " ]..." );
-				error_log( var_export( wp_remote_post( $url, $request_args ), true ) );
-			}
-		}
-
-		/**
-		 * Verify the postback is valid, then fire any scheduled events.
-		 *
-		 * @uses $_POST['_nonce']
-		 * @uses is_user_logged_in()
-		 * @uses add_filter()
-		 * @uses wp_die()
-		 */
-		public function handle_postback() {
-			if ( isset( $_POST['_nonce'] ) && $this->verify_async_nonce( $_POST['_nonce'] ) ) {
-				if ( ! is_user_logged_in() ) {
-					$this->action = "nopriv_$this->action";
-				}
-				$this->run_action();
-			}
-
-			add_filter( 'wp_die_handler', function () {
-				die();
-			} );
-			wp_die();
-		}
-
-		/**
-		 * Create a random, one time use token.
-		 *
-		 * Based entirely on wp_create_nonce() but does not tie the nonce to the
-		 * current logged-in user.
-		 *
-		 * @uses wp_nonce_tick()
-		 * @uses wp_hash()
-		 *
-		 * @return string The one-time use token
-		 */
-		protected function create_async_nonce() {
-			$action = $this->get_nonce_action();
-			$i      = wp_nonce_tick();
-
-			return substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 );
-		}
-
-		/**
-		 * Verify that the correct nonce was used within the time limit.
-		 *
-		 * @uses wp_nonce_tick()
-		 * @uses wp_hash()
-		 *
-		 * @param string $nonce Nonce to be verified
-		 *
-		 * @return bool Whether the nonce check passed or failed
-		 */
-		protected function verify_async_nonce( $nonce ) {
-			$action = $this->get_nonce_action();
-			$i      = wp_nonce_tick();
-
-			// Nonce generated 0-12 hours ago
-			if ( substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
-				return 1;
-			}
-
-			// Nonce generated 12-24 hours ago
-			if ( substr( wp_hash( ( $i - 1 ) . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
-				return 2;
-			}
-
-			// Invalid nonce
-			return false;
-		}
-
-		/**
-		 * Get a nonce action based on the $action property of the class
-		 *
-		 * @return string The nonce action for the current instance
-		 */
-		protected function get_nonce_action() {
-			$action = $this->action;
-			if ( substr( $action, 0, 7 ) === 'nopriv_' ) {
-				$action = substr( $action, 7 );
-			}
-			$action = "wp_async_$action";
-
-			return $action;
-		}
-
-		/**
-		 * Prepare any data to be passed to the asynchronous postback
-		 *
-		 * The array this function receives will be a numerically keyed array from
-		 * func_get_args(). It is expected that you will return an associative array
-		 * so that the $_POST values used in the asynchronous call will make sense.
-		 *
-		 * The array you send back may or may not have anything to do with the data
-		 * passed into this method. It all depends on the implementation details and
-		 * what data is needed in the asynchronous postback.
-		 *
-		 * Do not set values for 'action' or '_nonce', as those will get overwritten
-		 * later in launch().
-		 *
-		 * @throws Exception If the postback should not occur for any reason
-		 *
-		 * @param array $data The raw data received by the launch method
-		 *
-		 * @return array The prepared data
-		 */
-		abstract protected function prepare_data( $data );
-
-		/**
-		 * Run the do_action function for the asynchronous postback.
-		 *
-		 * This method needs to fetch and sanitize any and all data from the $_POST
-		 * superglobal and provide them to the do_action call.
-		 *
-		 * The action should be constructed as "wp_async_task_$this->action"
-		 */
-		abstract protected function run_action();
-
-	}
+    abstract class WP_Async_Task {
+
+        /**
+         * Constant identifier for a task that should be available to logged-in users
+         *
+         * See constructor documentation for more details.
+         */
+        const LOGGED_IN = 1;
+
+        /**
+         * Constant identifier for a task that should be available to logged-out users
+         *
+         * See constructor documentation for more details.
+         */
+        const LOGGED_OUT = 2;
+
+        /**
+         * Constant identifier for a task that should be available to all users regardless of auth status
+         *
+         * See constructor documentation for more details.
+         */
+        const BOTH = 3;
+
+        /**
+         * This is the argument count for the main action set in the constructor. It
+         * is set to an arbitrarily high value of twenty, but can be overridden if
+         * necessary
+         *
+         * @var int
+         */
+        protected $argument_count = 20;
+
+        /**
+         * Priority to fire intermediate action.
+         *
+         * @var int
+         */
+        protected $priority = 10;
+
+        /**
+         * @var string
+         */
+        protected $action;
+
+        /**
+         * @var array
+         */
+        protected $_body_data;
+
+        /**
+         * Constructor to wire up the necessary actions
+         *
+         * Which hooks the asynchronous postback happens on can be set by the
+         * $auth_level parameter. There are essentially three options: logged in users
+         * only, logged out users only, or both. Set this when you instantiate an
+         * object by using one of the three class constants to do so:
+         *  - LOGGED_IN
+         *  - LOGGED_OUT
+         *  - BOTH
+         * $auth_level defaults to BOTH
+         *
+         * @throws Exception If the class' $action value hasn't been set
+         *
+         * @param int $auth_level The authentication level to use (see above)
+         */
+        public function __construct( $auth_level = self::BOTH ) {
+            if ( empty( $this->action ) ) {
+                throw new Exception( 'Action not defined for class ' . __CLASS__ );
+            }
+            add_action( $this->action, array(
+                $this,
+                'launch',
+            ), (int) $this->priority, (int) $this->argument_count );
+            if ( $auth_level & self::LOGGED_IN ) {
+                add_action( "admin_post_wp_async_$this->action", array(
+                    $this,
+                    'handle_postback',
+                ) );
+            }
+            if ( $auth_level & self::LOGGED_OUT ) {
+                add_action( "admin_post_nopriv_wp_async_$this->action", array(
+                    $this,
+                    'handle_postback',
+                ) );
+            }
+        }
+
+        /**
+         * Add the shutdown action for launching the real postback if we don't
+         * get an exception thrown by prepare_data().
+         *
+         * @uses func_get_args() To grab any arguments passed by the action
+         */
+        public function launch() {
+            $data = func_get_args();
+            try {
+                $data = $this->prepare_data( $data );
+            } catch ( Exception $e ) {
+                return;
+            }
+
+            $data['action'] = "wp_async_$this->action";
+            $data['_nonce'] = $this->create_async_nonce();
+
+            $this->_body_data = $data;
+
+            if ( ! has_action( 'shutdown', array(
+                $this,
+                'launch_on_shutdown',
+            ) )
+            ) {
+                add_action( 'shutdown', array( $this, 'launch_on_shutdown' ) );
+            }
+        }
+
+        /**
+         * Launch the request on the WordPress shutdown hook
+         *
+         * On VIP we got into data races due to the postback sometimes completing
+         * faster than the data could propogate to the database server cluster.
+         * This made WordPress get empty data sets from the database without
+         * failing. On their advice, we're moving the actual firing of the async
+         * postback to the shutdown hook. Supposedly that will ensure that the
+         * data at least has time to get into the object cache.
+         *
+         * @uses $_COOKIE        To send a cookie header for async postback
+         * @uses apply_filters()
+         * @uses admin_url()
+         * @uses wp_remote_post()
+         */
+        public function launch_on_shutdown() {
+            if ( ! empty( $this->_body_data ) ) {
+                $cookies = array();
+                foreach ( $_COOKIE as $name => $value ) {
+                    $cookies[] = "$name=" . urlencode( is_array( $value ) ? serialize( $value ) : $value );
+                }
+
+                $request_args = array(
+                    'timeout'   => 0.01,
+                    'blocking'  => false,
+                    'sslverify' => apply_filters( 'https_local_ssl_verify', true ),
+                    'body'      => $this->_body_data,
+                    'headers'   => array(
+                        'cookie' => implode( '; ', $cookies ),
+                    ),
+                );
+
+                $url = admin_url( 'admin-post.php' );
+
+                error_log( "Launching [ url :: $url ][ " . var_export( $request_args, true ) . " ]..." );
+                error_log( var_export( wp_remote_post( $url, $request_args ), true ) );
+            }
+        }
+
+        /**
+         * Verify the postback is valid, then fire any scheduled events.
+         *
+         * @uses $_POST['_nonce']
+         * @uses is_user_logged_in()
+         * @uses add_filter()
+         * @uses wp_die()
+         */
+        public function handle_postback() {
+            if ( isset( $_POST['_nonce'] ) && $this->verify_async_nonce( $_POST['_nonce'] ) ) {
+                if ( ! is_user_logged_in() ) {
+                    $this->action = "nopriv_$this->action";
+                }
+                $this->run_action();
+            }
+
+            add_filter( 'wp_die_handler', function () {
+                die();
+            } );
+            wp_die();
+        }
+
+        /**
+         * Create a random, one time use token.
+         *
+         * Based entirely on wp_create_nonce() but does not tie the nonce to the
+         * current logged-in user.
+         *
+         * @uses wp_nonce_tick()
+         * @uses wp_hash()
+         *
+         * @return string The one-time use token
+         */
+        protected function create_async_nonce() {
+            $action = $this->get_nonce_action();
+            $i      = wp_nonce_tick();
+
+            return substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 );
+        }
+
+        /**
+         * Verify that the correct nonce was used within the time limit.
+         *
+         * @uses wp_nonce_tick()
+         * @uses wp_hash()
+         *
+         * @param string $nonce Nonce to be verified
+         *
+         * @return bool Whether the nonce check passed or failed
+         */
+        protected function verify_async_nonce( $nonce ) {
+            $action = $this->get_nonce_action();
+            $i      = wp_nonce_tick();
+
+            // Nonce generated 0-12 hours ago
+            if ( substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
+                return 1;
+            }
+
+            // Nonce generated 12-24 hours ago
+            if ( substr( wp_hash( ( $i - 1 ) . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
+                return 2;
+            }
+
+            // Invalid nonce
+            return false;
+        }
+
+        /**
+         * Get a nonce action based on the $action property of the class
+         *
+         * @return string The nonce action for the current instance
+         */
+        protected function get_nonce_action() {
+            $action = $this->action;
+            if ( substr( $action, 0, 7 ) === 'nopriv_' ) {
+                $action = substr( $action, 7 );
+            }
+            $action = "wp_async_$action";
+
+            return $action;
+        }
+
+        /**
+         * Prepare any data to be passed to the asynchronous postback
+         *
+         * The array this function receives will be a numerically keyed array from
+         * func_get_args(). It is expected that you will return an associative array
+         * so that the $_POST values used in the asynchronous call will make sense.
+         *
+         * The array you send back may or may not have anything to do with the data
+         * passed into this method. It all depends on the implementation details and
+         * what data is needed in the asynchronous postback.
+         *
+         * Do not set values for 'action' or '_nonce', as those will get overwritten
+         * later in launch().
+         *
+         * @throws Exception If the postback should not occur for any reason
+         *
+         * @param array $data The raw data received by the launch method
+         *
+         * @return array The prepared data
+         */
+        abstract protected function prepare_data( $data );
+
+        /**
+         * Run the do_action function for the asynchronous postback.
+         *
+         * This method needs to fetch and sanitize any and all data from the $_POST
+         * superglobal and provide them to the do_action call.
+         *
+         * The action should be constructed as "wp_async_task_$this->action"
+         */
+        abstract protected function run_action();
+
+    }
 
 }
 

Spacing +35 added lines, -35 removed lines

@@ -7,7 +7,7 @@ 
  * License: MIT
  */
 
-if ( ! class_exists( 'WP_Async_Task' ) ) {
+if ( ! class_exists('WP_Async_Task')) {
 	abstract class WP_Async_Task {
 
 		/**
@@ -73,25 +73,25 @@ 
 		 *
 		 * @param int $auth_level The authentication level to use (see above)
 		 */
-		public function __construct( $auth_level = self::BOTH ) {
-			if ( empty( $this->action ) ) {
-				throw new Exception( 'Action not defined for class ' . __CLASS__ );
+		public function __construct($auth_level = self::BOTH) {
+			if (empty($this->action)) {
+				throw new Exception('Action not defined for class '.__CLASS__);
 			}
-			add_action( $this->action, array(
+			add_action($this->action, array(
 				$this,
 				'launch',
-			), (int) $this->priority, (int) $this->argument_count );
-			if ( $auth_level & self::LOGGED_IN ) {
-				add_action( "admin_post_wp_async_$this->action", array(
+			), (int) $this->priority, (int) $this->argument_count);
+			if ($auth_level & self::LOGGED_IN) {
+				add_action("admin_post_wp_async_$this->action", array(
 					$this,
 					'handle_postback',
-				) );
+				));
 			}
-			if ( $auth_level & self::LOGGED_OUT ) {
-				add_action( "admin_post_nopriv_wp_async_$this->action", array(
+			if ($auth_level & self::LOGGED_OUT) {
+				add_action("admin_post_nopriv_wp_async_$this->action", array(
 					$this,
 					'handle_postback',
-				) );
+				));
 			}
 		}
 
@@ -104,8 +104,8 @@ 
 		public function launch() {
 			$data = func_get_args();
 			try {
-				$data = $this->prepare_data( $data );
-			} catch ( Exception $e ) {
+				$data = $this->prepare_data($data);
+			} catch (Exception $e) {
 				return;
 			}
 
@@ -114,12 +114,12 @@ 
 
 			$this->_body_data = $data;
 
-			if ( ! has_action( 'shutdown', array(
+			if ( ! has_action('shutdown', array(
 				$this,
 				'launch_on_shutdown',
-			) )
+			))
 			) {
-				add_action( 'shutdown', array( $this, 'launch_on_shutdown' ) );
+				add_action('shutdown', array($this, 'launch_on_shutdown'));
 			}
 		}
 
@@ -139,26 +139,26 @@ 
 		 * @uses wp_remote_post()
 		 */
 		public function launch_on_shutdown() {
-			if ( ! empty( $this->_body_data ) ) {
+			if ( ! empty($this->_body_data)) {
 				$cookies = array();
-				foreach ( $_COOKIE as $name => $value ) {
-					$cookies[] = "$name=" . urlencode( is_array( $value ) ? serialize( $value ) : $value );
+				foreach ($_COOKIE as $name => $value) {
+					$cookies[] = "$name=".urlencode(is_array($value) ? serialize($value) : $value);
 				}
 
 				$request_args = array(
 					'timeout'   => 0.01,
 					'blocking'  => false,
-					'sslverify' => apply_filters( 'https_local_ssl_verify', true ),
+					'sslverify' => apply_filters('https_local_ssl_verify', true),
 					'body'      => $this->_body_data,
 					'headers'   => array(
-						'cookie' => implode( '; ', $cookies ),
+						'cookie' => implode('; ', $cookies),
 					),
 				);
 
-				$url = admin_url( 'admin-post.php' );
+				$url = admin_url('admin-post.php');
 
-				error_log( "Launching [ url :: $url ][ " . var_export( $request_args, true ) . " ]..." );
-				error_log( var_export( wp_remote_post( $url, $request_args ), true ) );
+				error_log("Launching [ url :: $url ][ ".var_export($request_args, true)." ]...");
+				error_log(var_export(wp_remote_post($url, $request_args), true));
 			}
 		}
 
@@ -171,14 +171,14 @@ 
 		 * @uses wp_die()
 		 */
 		public function handle_postback() {
-			if ( isset( $_POST['_nonce'] ) && $this->verify_async_nonce( $_POST['_nonce'] ) ) {
-				if ( ! is_user_logged_in() ) {
+			if (isset($_POST['_nonce']) && $this->verify_async_nonce($_POST['_nonce'])) {
+				if ( ! is_user_logged_in()) {
 					$this->action = "nopriv_$this->action";
 				}
 				$this->run_action();
 			}
 
-			add_filter( 'wp_die_handler', function () {
+			add_filter('wp_die_handler', function() {
 				die();
 			} );
 			wp_die();
@@ -199,7 +199,7 @@ 
 			$action = $this->get_nonce_action();
 			$i      = wp_nonce_tick();
 
-			return substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 );
+			return substr(wp_hash($i.$action.get_class($this), 'nonce'), - 12, 10);
 		}
 
 		/**
@@ -212,17 +212,17 @@ 
 		 *
 		 * @return bool Whether the nonce check passed or failed
 		 */
-		protected function verify_async_nonce( $nonce ) {
+		protected function verify_async_nonce($nonce) {
 			$action = $this->get_nonce_action();
 			$i      = wp_nonce_tick();
 
 			// Nonce generated 0-12 hours ago
-			if ( substr( wp_hash( $i . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
+			if (substr(wp_hash($i.$action.get_class($this), 'nonce'), - 12, 10) == $nonce) {
 				return 1;
 			}
 
 			// Nonce generated 12-24 hours ago
-			if ( substr( wp_hash( ( $i - 1 ) . $action . get_class( $this ), 'nonce' ), - 12, 10 ) == $nonce ) {
+			if (substr(wp_hash(($i - 1).$action.get_class($this), 'nonce'), - 12, 10) == $nonce) {
 				return 2;
 			}
 
@@ -237,8 +237,8 @@ 
 		 */
 		protected function get_nonce_action() {
 			$action = $this->action;
-			if ( substr( $action, 0, 7 ) === 'nopriv_' ) {
-				$action = substr( $action, 7 );
+			if (substr($action, 0, 7) === 'nopriv_') {
+				$action = substr($action, 7);
 			}
 			$action = "wp_async_$action";
 
@@ -265,7 +265,7 @@ 
 		 *
 		 * @return array The prepared data
 		 */
-		abstract protected function prepare_data( $data );
+		abstract protected function prepare_data($data);
 
 		/**
 		 * Run the do_action function for the asynchronous postback.

src/includes/wp-async-task/class-wordlift-sparql-query-async-task.php

Indentation +51 added lines, -51 removed lines

@@ -18,68 +18,68 @@
  */
 class Wordlift_Sparql_Query_Async_Task extends WP_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.13.2
-	 * @access protected
-	 * @var string $action The action to which you wish to attach the
-	 *                     asynchronous task.
-	 */
-	protected $action = 'wl_run_sparql_query';
+    /**
+     * 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.13.2
+     * @access protected
+     * @var string $action The action to which you wish to attach the
+     *                     asynchronous task.
+     */
+    protected $action = 'wl_run_sparql_query';
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.13.2
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.13.2
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
-	/**
-	 * Create a {@link Wordlift_Sparql_Query_Async_Task} instance.
-	 *
-	 * @since 3.13.2
-	 *
-	 * @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_Sparql_Query_Async_Task} instance.
+     *
+     * @since 3.13.2
+     *
+     * @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_Sparql_Query_Async_Task' );
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Sparql_Query_Async_Task' );
 
-	}
+    }
 
 
-	/**
-	 * @inheritdoc
-	 */
-	protected function prepare_data( $data ) {
+    /**
+     * @inheritdoc
+     */
+    protected function prepare_data( $data ) {
 
-		// Return the request id, which is used to get the sparql queries stored
-		// in the temporary files.
-		return array( 'request_id' => $data[0] );
-	}
+        // Return the request id, which is used to get the sparql queries stored
+        // in the temporary files.
+        return array( 'request_id' => $data[0] );
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	protected function run_action() {
+    /**
+     * @inheritdoc
+     */
+    protected function run_action() {
 
-		// Bail out if there's no request id.
-		if ( ! isset( $_POST['request_id'] ) ) {
-			$this->log->warn( 'Request Id not found.' );
+        // Bail out if there's no request id.
+        if ( ! isset( $_POST['request_id'] ) ) {
+            $this->log->warn( 'Request Id not found.' );
 
-			return;
-		}
+            return;
+        }
 
-		// Run the asynchronous action.
-		do_action( "wp_async_$this->action", $_POST['request_id'] );
+        // Run the asynchronous action.
+        do_action( "wp_async_$this->action", $_POST['request_id'] );
 
-	}
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -47,10 +47,10 @@ 
 	 *
 	 * @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_Sparql_Query_Async_Task' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Sparql_Query_Async_Task');
 
 	}
 
@@ -58,11 +58,11 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	protected function prepare_data( $data ) {
+	protected function prepare_data($data) {
 
 		// Return the request id, which is used to get the sparql queries stored
 		// in the temporary files.
-		return array( 'request_id' => $data[0] );
+		return array('request_id' => $data[0]);
 	}
 
 	/**
@@ -71,14 +71,14 @@ 
 	protected function run_action() {
 
 		// Bail out if there's no request id.
-		if ( ! isset( $_POST['request_id'] ) ) {
-			$this->log->warn( 'Request Id not found.' );
+		if ( ! isset($_POST['request_id'])) {
+			$this->log->warn('Request Id not found.');
 
 			return;
 		}
 
 		// Run the asynchronous action.
-		do_action( "wp_async_$this->action", $_POST['request_id'] );
+		do_action("wp_async_$this->action", $_POST['request_id']);
 
 	}
 

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

Indentation +145 added lines, -145 removed lines

@@ -13,124 +13,124 @@ 
  */
 class Wordlift_Rebuild_Service extends Wordlift_Listable {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * A {@link Wordlift_Sparql_Service} instance.
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
-	 */
-	private $sparql_service;
-
-	/**
-	 * @var \Wordlift_Uri_Service
-	 */
-	private $uri_service;
-
-	/**
-	 * Create an instance of Wordlift_Rebuild_Service.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance used to query the remote dataset.
-	 * @param \Wordlift_Uri_Service    $uri_service
-	 */
-	public function __construct( $sparql_service, $uri_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
-
-		$this->sparql_service = $sparql_service;
-		$this->uri_service    = $uri_service;
-	}
-
-	/**
-	 * Rebuild the Linked Data remote dataset by clearing it out and repopulating
-	 * it with local data.
-	 *
-	 * @since 3.6.0
-	 */
-	public function rebuild() {
-
-		ob_clean();
-
-		// Give ourselves some time to process the data.
-		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;
-		$entity_only = isset( $_GET['entity_only'] ) && '1' === $_GET['entity_only'];
-		$max         = $offset + $limit;
-
-		// If we're starting at offset 0, then delete existing URIs and data from
-		// the remote dataset.
-		if ( 0 === $offset ) {
-
-			// Clear out all generated URIs, since the dataset URI might have changed
-			// in the process.
-			$this->uri_service->delete_all();
-
-			// Delete all the triples in the remote dataset.
-			$this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
-
-		}
-
-		// 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;
-		$this->process( function ( $post ) use ( &$count ) {
-			$count ++;
-			wl_linked_data_save_post( $post->ID );
-		}, array(
-			'post_status' => 'publish',
-			'post_type'   => $entity_only ? 'entity' : array(
-				'entity',
-				'post',
-			),
-		), $offset, $max );
-
-		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&entity_only=' . ( $entity_only ? '1' : '0' ) ) );
-		}
-
-		echo( "Rebuild complete [ count :: $count ][ limit :: $limit ]" );
-
-		// If we're being called as AJAX, die here.
-		if ( DOING_AJAX ) {
-			wp_die();
-		}
-
-	}
-
-	/**
-	 * Redirect using a client-side meta to avoid browsers' redirect restrictions.
-	 *
-	 * @since 3.9.8
-	 *
-	 * @param string $url The URL to redirect to.
-	 */
-	private function redirect( $url ) {
-
-		ob_clean();
-
-		@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-		?>
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * A {@link Wordlift_Sparql_Service} instance.
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
+     */
+    private $sparql_service;
+
+    /**
+     * @var \Wordlift_Uri_Service
+     */
+    private $uri_service;
+
+    /**
+     * Create an instance of Wordlift_Rebuild_Service.
+     *
+     * @since 3.6.0
+     *
+     * @param \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance used to query the remote dataset.
+     * @param \Wordlift_Uri_Service    $uri_service
+     */
+    public function __construct( $sparql_service, $uri_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
+
+        $this->sparql_service = $sparql_service;
+        $this->uri_service    = $uri_service;
+    }
+
+    /**
+     * Rebuild the Linked Data remote dataset by clearing it out and repopulating
+     * it with local data.
+     *
+     * @since 3.6.0
+     */
+    public function rebuild() {
+
+        ob_clean();
+
+        // Give ourselves some time to process the data.
+        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;
+        $entity_only = isset( $_GET['entity_only'] ) && '1' === $_GET['entity_only'];
+        $max         = $offset + $limit;
+
+        // If we're starting at offset 0, then delete existing URIs and data from
+        // the remote dataset.
+        if ( 0 === $offset ) {
+
+            // Clear out all generated URIs, since the dataset URI might have changed
+            // in the process.
+            $this->uri_service->delete_all();
+
+            // Delete all the triples in the remote dataset.
+            $this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
+
+        }
+
+        // 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;
+        $this->process( function ( $post ) use ( &$count ) {
+            $count ++;
+            wl_linked_data_save_post( $post->ID );
+        }, array(
+            'post_status' => 'publish',
+            'post_type'   => $entity_only ? 'entity' : array(
+                'entity',
+                'post',
+            ),
+        ), $offset, $max );
+
+        // Redirect to the next chunk.
+        if ( $count == $limit ) {
+            $this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&entity_only=' . ( $entity_only ? '1' : '0' ) ) );
+        }
+
+        echo( "Rebuild complete [ count :: $count ][ limit :: $limit ]" );
+
+        // If we're being called as AJAX, die here.
+        if ( DOING_AJAX ) {
+            wp_die();
+        }
+
+    }
+
+    /**
+     * Redirect using a client-side meta to avoid browsers' redirect restrictions.
+     *
+     * @since 3.9.8
+     *
+     * @param string $url The URL to redirect to.
+     */
+    private function redirect( $url ) {
+
+        ob_clean();
+
+        @header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+        ?>
 		<html>
 		<head>
 			<meta http-equiv="refresh"
@@ -142,32 +142,32 @@ 
 		</html>
 		<?php
 
-		exit;
-
-	}
-
-	/**
-	 * List the items starting at the specified offset and up to the specified limit.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @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).
-	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
-
-		return get_posts( wp_parse_args( $args, array(
-			'offset'      => $offset,
-			'numberposts' => $limit,
-			'fields'      => 'all',
-			'orderby'     => 'ID',
-			'order'       => 'ASC',
-			'post_status' => 'any',
-			'post_type'   => 'post',
-		) ) );
-	}
+        exit;
+
+    }
+
+    /**
+     * List the items starting at the specified offset and up to the specified limit.
+     *
+     * @since 3.6.0
+     *
+     * @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).
+     */
+    function find( $offset = 0, $limit = 10, $args = array() ) {
+
+        return get_posts( wp_parse_args( $args, array(
+            'offset'      => $offset,
+            'numberposts' => $limit,
+            'fields'      => 'all',
+            'orderby'     => 'ID',
+            'order'       => 'ASC',
+            'post_status' => 'any',
+            'post_type'   => 'post',
+        ) ) );
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -43,9 +43,9 @@ 
 	 * @param \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance used to query the remote dataset.
 	 * @param \Wordlift_Uri_Service    $uri_service
 	 */
-	public function __construct( $sparql_service, $uri_service ) {
+	public function __construct($sparql_service, $uri_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Rebuild_Service');
 
 		$this->sparql_service = $sparql_service;
 		$this->uri_service    = $uri_service;
@@ -62,27 +62,27 @@ 
 		ob_clean();
 
 		// Give ourselves some time to process the data.
-		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;
-		$entity_only = isset( $_GET['entity_only'] ) && '1' === $_GET['entity_only'];
+		$entity_only = isset($_GET['entity_only']) && '1' === $_GET['entity_only'];
 		$max         = $offset + $limit;
 
 		// If we're starting at offset 0, then delete existing URIs and data from
 		// the remote dataset.
-		if ( 0 === $offset ) {
+		if (0 === $offset) {
 
 			// Clear out all generated URIs, since the dataset URI might have changed
 			// in the process.
 			$this->uri_service->delete_all();
 
 			// Delete all the triples in the remote dataset.
-			$this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
+			$this->sparql_service->execute('DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };');
 
 		}
 
@@ -93,26 +93,26 @@ 
 		// in order to avoid memory errors.
 
 		$count = 0;
-		$this->process( function ( $post ) use ( &$count ) {
-			$count ++;
-			wl_linked_data_save_post( $post->ID );
+		$this->process(function($post) use (&$count) {
+			$count++;
+			wl_linked_data_save_post($post->ID);
 		}, array(
 			'post_status' => 'publish',
 			'post_type'   => $entity_only ? 'entity' : array(
 				'entity',
 				'post',
 			),
-		), $offset, $max );
+		), $offset, $max);
 
 		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&entity_only=' . ( $entity_only ? '1' : '0' ) ) );
+		if ($count == $limit) {
+			$this->redirect(admin_url('admin-ajax.php?action=wl_rebuild&offset='.($offset + $limit).'&limit='.$limit.'&entity_only='.($entity_only ? '1' : '0')));
 		}
 
-		echo( "Rebuild complete [ count :: $count ][ limit :: $limit ]" );
+		echo("Rebuild complete [ count :: $count ][ limit :: $limit ]");
 
 		// If we're being called as AJAX, die here.
-		if ( DOING_AJAX ) {
+		if (DOING_AJAX) {
 			wp_die();
 		}
 
@@ -125,16 +125,16 @@ 
 	 *
 	 * @param string $url The URL to redirect to.
 	 */
-	private function redirect( $url ) {
+	private function redirect($url) {
 
 		ob_clean();
 
-		@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+		@header('Content-Type: text/html; charset='.get_option('blog_charset'));
 		?>
 		<html>
 		<head>
 			<meta http-equiv="refresh"
-			      content="0; <?php echo esc_attr( $url ); ?>">
+			      content="0; <?php echo esc_attr($url); ?>">
 		</head>
 		<body>
 			Rebuilding, please wait...
@@ -157,9 +157,9 @@ 
 	 *
 	 * @return array A array of items (or an empty array if no items are found).
 	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
+	function find($offset = 0, $limit = 10, $args = array()) {
 
-		return get_posts( wp_parse_args( $args, array(
+		return get_posts(wp_parse_args($args, array(
 			'offset'      => $offset,
 			'numberposts' => $limit,
 			'fields'      => 'all',
@@ -167,7 +167,7 @@ 
 			'order'       => 'ASC',
 			'post_status' => 'any',
 			'post_type'   => 'post',
-		) ) );
+		)));
 	}
 
 }

src/includes/class-wordlift.php

Spacing +182 added lines, -182 removed lines

@@ -538,327 +538,327 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * WordLift's supported languages.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-languages.php';
 
 		/**
 		 * Provide support functions to sanitize data.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-sanitizer.php';
 
 		/**
 		 * The Redirect service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-redirect-service.php';
 
 		/**
 		 * The Log service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-log-service.php';
 
 		/**
 		 * The configuration service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-configuration-service.php';
 
 		/**
 		 * The entity post type service (this is the WordPress post type, not the entity schema type).
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-post-type-service.php';
 
 		/**
 		 * The entity type service (i.e. the schema type).
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-type-service.php';
 
 		/**
 		 * The entity link service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-link-service.php';
 
 		/**
 		 * The Query builder.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-query-builder.php';
 
 		/**
 		 * The Schema service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The schema:url property service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-property-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-url-property-service.php';
 
 		/**
 		 * The UI service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-ui-service.php';
 
 		/**
 		 * The Thumbnail service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-thumbnail-service.php';
 
 		/**
 		 * The Entity Types Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-types-taxonomy-service.php';
 
 		/**
 		 * The Entity service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-service.php';
 
 		// Add the entity rating service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-rating-service.php';
 
 		/**
 		 * The User service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-user-service.php';
 
 		/**
 		 * The Timeline service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-timeline-service.php';
 
 		/**
 		 * The Topic Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-topic-taxonomy-service.php';
 
 		/**
 		 * The SPARQL service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-sparql-service.php';
 
 		/**
 		 * The WordLift import service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-import-service.php';
 
 		/**
 		 * The WordLift URI service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-uri-service.php';
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-listable.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-listable.php';
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-property-factory.php';
 
 		/**
 		 * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rebuild-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-rebuild-service.php';
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/properties/class-wordlift-property-getter-factory.php';
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-attachment-service.php';
 
 		/**
 		 * Load the converters.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/intf-wordlift-post-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-postid-to-jsonld-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-post-to-jsonld-converter.php';
 
 		/**
 		 * Load the content filter.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-content-filter-service.php';
 
 		/*
 		 * Load the excerpt helper.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-excerpt-helper.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-post-excerpt-helper.php';
 
 		/**
 		 * Load the JSON-LD service to publish entities using JSON-LD.s
 		 *
 		 * @since 3.8.0
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-jsonld-service.php';
 
 		// The Publisher Service and the AJAX adapter.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-publisher-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-publisher-ajax-adapter.php';
 
 		/**
 		 * Load the WordLift key validation service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-key-validation-service.php';
 
 		// Load the `Wordlift_Category_Taxonomy_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-category-taxonomy-service.php';
 
 		// Load the `Wordlift_Event_Entity_Page_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-event-entity-page-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-event-entity-page-service.php';
 
 		/** Adapters. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-tinymce-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-newrelic-adapter.php';
 
 		/** Async Tasks. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/wp-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/wp-async-task/wp-async-task.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin.php';
 
 		/**
 		 * The class to customize the entity list admin page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-entity-list.php';
 
 		/**
 		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-types-taxonomy-walker.php';
 
 		/**
 		 * The Notice service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-notice-service.php';
 
 		/**
 		 * The PrimaShop adapter.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-primashop-adapter.php';
 
 		/**
 		 * The WordLift Dashboard service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard.php';
 
 		/**
 		 * The admin 'Install wizard' page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-setup.php';
 
 		/**
 		 * The WordLift entity type list admin page controller.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
 
 		/**
 		 * The WordLift entity type settings admin page controller.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-type-settings.php';
 
 		/**
 		 * The admin 'Download Your Data' page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-download-your-data-page.php';
 
 		/**
 		 * The admin 'Download Your Data' page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-download-your-data-page.php';
 
 		/**
 		 * The admin 'WordLift Settings' page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/intf-wordlift-admin-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-input-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-input-radio-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-select2-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-language-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-tabs-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-publisher-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/intf-wordlift-admin-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-input-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-input-radio-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-select2-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-language-select-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-tabs-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-publisher-element.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-settings-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-settings-page-action-link.php';
 
 		/** Admin Pages */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-post-edit-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-status-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-post-edit-page.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-status-page.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-public.php';
 
 		/**
 		 * The shortcode abstract class.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-shortcode.php';
 
 		/**
 		 * The Timeline shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-timeline-shortcode.php';
 
 		/**
 		 * The Navigator shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-navigator-shortcode.php';
 
 		/**
 		 * The chord shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-chord-shortcode.php';
 
 		/**
 		 * The geomap shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-geomap-shortcode.php';
 
 		/**
 		 * The entity cloud shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-related-entities-cloud-shortcode.php';
 
 		/**
 		 * The ShareThis service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-sharethis-service.php';
 
 		/**
 		 * The SEO service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-seo-service.php';
 
 		/**
 		 * The AMP service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-amp-service.php';
 
 		/** Widgets */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-widget.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-related-entities-cloud-widget.php';
 
 		$this->loader = new Wordlift_Loader();
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Create the configuration service.
 		$this->configuration_service = new Wordlift_Configuration_Service();
 
 		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service( Wordlift_Entity_Service::TYPE_NAME, $this->configuration_service->get_entity_base_path() );
+		$this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service(Wordlift_Entity_Service::TYPE_NAME, $this->configuration_service->get_entity_base_path());
 
 		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $this->configuration_service->get_entity_base_path() );
+		$this->entity_link_service = new Wordlift_Entity_Link_Service($this->entity_post_type_service, $this->configuration_service->get_entity_base_path());
 
 		// Create an instance of the UI service.
 		$this->ui_service = new Wordlift_UI_Service();
@@ -869,23 +869,23 @@ 
 		$this->sparql_service = new Wordlift_Sparql_Service();
 
 		// Create an instance of the Schema service.
-		$schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
+		$schema_url_property_service = new Wordlift_Schema_Url_Property_Service($this->sparql_service);
 		$this->schema_service        = new Wordlift_Schema_Service();
 
 		// Create an instance of the Notice service.
 		$this->notice_service = new Wordlift_Notice_Service();
 
 		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service );
+		$this->entity_service = new Wordlift_Entity_Service($this->ui_service);
 
 		// Create an instance of the User service.
 		$this->user_service = new Wordlift_User_Service();
 
 		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+		$this->timeline_service = new Wordlift_Timeline_Service($this->entity_service);
 
 		// Create a new instance of the Redirect service.
-		$this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
+		$this->redirect_service = new Wordlift_Redirect_Service($this->entity_service);
 
 		// Initialize the shortcodes.
 		new Wordlift_Navigator_Shortcode();
@@ -911,45 +911,45 @@ 
 		$this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
 
 		// Create an import service instance to hook later to WP's import function.
-		$this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri() );
+		$this->import_service = new Wordlift_Import_Service($this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri());
 
-		$uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
+		$uri_service = new Wordlift_Uri_Service($GLOBALS['wpdb']);
 
 		// Create a Rebuild Service instance, which we'll later bound to an ajax call.
-		$this->rebuild_service = new Wordlift_Rebuild_Service( $this->sparql_service, $uri_service );
+		$this->rebuild_service = new Wordlift_Rebuild_Service($this->sparql_service, $uri_service);
 
-		$this->entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
+		$this->entity_type_service = new Wordlift_Entity_Type_Service($this->schema_service);
 
 		// Create the entity rating service.
-		$this->rating_service = new Wordlift_Rating_Service( $this->entity_service, $this->entity_type_service, $this->notice_service );
+		$this->rating_service = new Wordlift_Rating_Service($this->entity_service, $this->entity_type_service, $this->notice_service);
 
 		// Create entity list customization (wp-admin/edit.php)
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->rating_service );
+		$this->entity_list_service = new Wordlift_Entity_List_Service($this->rating_service);
 
 		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->rating_service );
+		$this->dashboard_service = new Wordlift_Dashboard_Service($this->rating_service);
 
-		$this->property_factory = new Wordlift_Property_Factory( $schema_url_property_service );
-		$this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
+		$this->property_factory = new Wordlift_Property_Factory($schema_url_property_service);
+		$this->property_factory->register(Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service);
 
 		$attachment_service = new Wordlift_Attachment_Service();
 
 		// Instantiate the JSON-LD service.
-		$property_getter                       = Wordlift_Property_Getter_Factory::create( $this->entity_service );
-		$this->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter );
-		$this->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
-		$this->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter( $this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter );
-		$this->jsonld_service                  = new Wordlift_Jsonld_Service( $this->entity_service, $this->postid_to_jsonld_converter );
+		$property_getter                       = Wordlift_Property_Getter_Factory::create($this->entity_service);
+		$this->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter($this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter);
+		$this->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter($this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service);
+		$this->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter($this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter);
+		$this->jsonld_service                  = new Wordlift_Jsonld_Service($this->entity_service, $this->postid_to_jsonld_converter);
 
 		// Create an instance of the Key Validation service. This service is later hooked to provide an AJAX call (only for admins).
 		$this->key_validation_service = new Wordlift_Key_Validation_Service();
 
 		// Create an instance of the Publisher Service and the AJAX Adapter.
 		$publisher_service            = new Wordlift_Publisher_Service();
-		$this->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter( $publisher_service );
+		$this->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter($publisher_service);
 
 		/** Adapters. */
-		$this->tinymce_adapter = new Wordlift_Tinymce_Adapter( $this );
+		$this->tinymce_adapter = new Wordlift_Tinymce_Adapter($this);
 
 		/** Async Tasks. */
 		new Wordlift_Sparql_Query_Async_Task();
@@ -962,14 +962,14 @@ 
 		$this->select2_element         = new Wordlift_Admin_Select2_Element();
 		$this->language_select_element = new Wordlift_Admin_Language_Select_Element();
 		$tabs_element                  = new Wordlift_Admin_Tabs_Element();
-		$this->publisher_element       = new Wordlift_Admin_Publisher_Element( $this->configuration_service, $publisher_service, $tabs_element, $this->select2_element );
+		$this->publisher_element       = new Wordlift_Admin_Publisher_Element($this->configuration_service, $publisher_service, $tabs_element, $this->select2_element);
 
-		$this->download_your_data_page   = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
-		$this->settings_page             = new Wordlift_Admin_Settings_Page( $this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->publisher_element, $this->radio_input_element );
-		$this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $this->settings_page );
+		$this->download_your_data_page   = new Wordlift_Admin_Download_Your_Data_Page($this->configuration_service);
+		$this->settings_page             = new Wordlift_Admin_Settings_Page($this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->publisher_element, $this->radio_input_element);
+		$this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link($this->settings_page);
 
 		// Pages.
-		new Wordlift_Admin_Post_Edit_Page( $this );
+		new Wordlift_Admin_Post_Edit_Page($this);
 
 		// create an instance of the entity type list admin page controller.
 		$this->entity_type_admin_page = new Wordlift_Admin_Entity_Taxonomy_List_Page();
@@ -981,23 +981,23 @@ 
 		$this->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
 
 		//** WordPress Admin */
-		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
-		$this->status_page             = new Wordlift_Admin_Status_Page( $this->entity_service, $this->sparql_service );
+		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page($this->configuration_service);
+		$this->status_page             = new Wordlift_Admin_Status_Page($this->entity_service, $this->sparql_service);
 
 		// Create an instance of the install wizard.
-		$this->admin_setup = new Wordlift_Admin_Setup( $this->configuration_service, $this->key_validation_service, $this->entity_service );
+		$this->admin_setup = new Wordlift_Admin_Setup($this->configuration_service, $this->key_validation_service, $this->entity_service);
 
 		// Create an instance of the content filter service.
-		$this->content_filter_service = new Wordlift_Content_Filter_Service( $this->entity_service, $this->configuration_service );
+		$this->content_filter_service = new Wordlift_Content_Filter_Service($this->entity_service, $this->configuration_service);
 
-		$this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $this->entity_post_type_service );
+		$this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service($this->entity_post_type_service);
 
 		$this->event_entity_page_service = new Wordlift_Event_Entity_Page_Service();
 
 		// Load the debug service if WP is in debug mode.
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
-			new Wordlift_Debug_Service( $this->entity_service, $uri_service );
+		if (defined('WP_DEBUG') && WP_DEBUG) {
+			require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-debug-service.php';
+			new Wordlift_Debug_Service($this->entity_service, $uri_service);
 		}
 
 	}
@@ -1014,9 +1014,9 @@ 
 	private function set_locale() {
 
 		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+		$plugin_i18n->set_domain($this->get_plugin_name());
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 	}
 
@@ -1036,119 +1036,119 @@ 
 			$this->notice_service
 		);
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
 		// Hook the init action to the Topic Taxonomy service.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
+		$this->loader->add_action('init', $this->topic_taxonomy_service, 'init', 0);
 
 		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+		$this->loader->add_action('deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4);
 
 		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+		$this->loader->add_action('added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4);
 
 		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+		$this->loader->add_action('updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4);
 
 		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+		$this->loader->add_action('wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3);
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+		$this->loader->add_filter('allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+		$this->loader->add_action('wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
+		$this->loader->add_action('wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
+		$this->loader->add_action('wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets');
 
 		// Hook save_post to the entity service to update custom fields (such as alternate labels).
 		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post_entity', $this->rating_service, 'set_rating_for', 10, 1 );
+		$this->loader->add_action('save_post', $this->entity_service, 'save_post', 9, 3);
+		$this->loader->add_action('save_post_entity', $this->rating_service, 'set_rating_for', 10, 1);
 
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->rating_service, 'in_admin_header' );
+		$this->loader->add_action('edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1);
+		$this->loader->add_action('in_admin_header', $this->rating_service, 'in_admin_header');
 
 		// Entity listing customization (wp-admin/edit.php)
 		// Add custom columns
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
-		$this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+		$this->loader->add_filter('manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns');
+		$this->loader->add_filter('manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2);
 		// Add 4W selection
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
+		$this->loader->add_action('restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope');
+		$this->loader->add_filter('posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope');
 
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+		$this->loader->add_filter('wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args');
 
 		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
 		// entities.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+		$this->loader->add_filter('prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2);
 
 		// Filter imported post meta.
-		$this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
+		$this->loader->add_filter('wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3);
 
 		// Notify the import service when an import starts and ends.
-		$this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
-		$this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
+		$this->loader->add_action('import_start', $this->import_service, 'import_start', 10, 0);
+		$this->loader->add_action('import_end', $this->import_service, 'import_end', 10, 0);
 
 		// Hook the AJAX wl_rebuild action to the Rebuild Service.
-		$this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
+		$this->loader->add_action('wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild');
 
 		// Hook the menu to the Download Your Data page.
-		$this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->status_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0 );
+		$this->loader->add_action('admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0);
+		$this->loader->add_action('admin_menu', $this->status_page, 'admin_menu', 100, 0);
+		$this->loader->add_action('admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0);
 
 		// Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
-		$this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
+		$this->loader->add_action('wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10);
 
 		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
+		$this->loader->add_action('wp_ajax_wl_jsonld', $this->jsonld_service, 'get');
 
 		// Hook the AJAX wl_validate_key action to the Key Validation service.
-		$this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
+		$this->loader->add_action('wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key');
 
 		// Hook the `admin_init` function to the Admin Setup.
-		$this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
+		$this->loader->add_action('admin_init', $this->admin_setup, 'admin_init');
 
 		// Hook the admin_init to the settings page.
-		$this->loader->add_action( 'admin_init', $this->settings_page, 'admin_init' );
+		$this->loader->add_action('admin_init', $this->settings_page, 'admin_init');
 
 		// Hook the menu creation on the general wordlift menu creation
-		$this->loader->add_action( 'wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2 );
+		$this->loader->add_action('wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2);
 
 		// Hook key update.
-		$this->loader->add_action( 'pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2 );
-		$this->loader->add_action( 'update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2 );
+		$this->loader->add_action('pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2);
+		$this->loader->add_action('update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2);
 
 		// Add additional action links to the WordLift plugin in the plugins page.
-		$this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->settings_page_action_link, 'action_links', 10, 1 );
+		$this->loader->add_filter('plugin_action_links_wordlift/wordlift.php', $this->settings_page_action_link, 'action_links', 10, 1);
 
 		// Hook the AJAX `wl_publisher` action name.
-		$this->loader->add_action( 'wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher' );
+		$this->loader->add_action('wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher');
 
 		// Hook row actions for the entity type list admin.
-		$this->loader->add_filter( 'wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
+		$this->loader->add_filter('wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2);
 
 		// Hook capabilities manipulation to allow access to entity type admin
 		// page  on wordpress versions before 4.7.
 		global $wp_version;
-		if ( version_compare( $wp_version, '4.7', '<' ) ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4 );
+		if (version_compare($wp_version, '4.7', '<')) {
+			$this->loader->add_filter('map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4);
 		}
 
 		/** Adapters. */
-		$this->loader->add_filter( 'mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1 );
+		$this->loader->add_filter('mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1);
 
-		$this->loader->add_action( 'wp_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
+		$this->loader->add_action('wp_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1);
 
 		// Hooks to restrict multisite super admin from manipulating entity types.
-		if ( is_multisite() ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4 );
+		if (is_multisite()) {
+			$this->loader->add_filter('map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4);
 		}
 	}
 
@@ -1161,46 +1161,46 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Wordlift_Public($this->get_plugin_name(), $this->get_version());
 
 		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
+		$this->loader->add_action('init', $this->entity_post_type_service, 'register');
 
 		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+		$this->loader->add_filter('post_type_link', $this->entity_link_service, 'post_type_link', 10, 4);
+		$this->loader->add_action('pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1);
+		$this->loader->add_filter('wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3);
+		$this->loader->add_filter('wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4);
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 		// Hook the content filter service to add entity links.
-		$this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
+		$this->loader->add_filter('the_content', $this->content_filter_service, 'the_content');
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+		$this->loader->add_filter('the_content', $this->sharethis_service, 'the_content', 99);
+		$this->loader->add_filter('the_excerpt', $this->sharethis_service, 'the_excerpt', 99);
 
 		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get');
 
 		// Hook the `pre_get_posts` action to the `Wordlift_Category_Taxonomy_Service`
 		// in order to tweak WP's `WP_Query` to include entities in queries related
 		// to categories.
-		$this->loader->add_action( 'pre_get_posts', $this->category_taxonomy_service, 'pre_get_posts', 10, 1 );
+		$this->loader->add_action('pre_get_posts', $this->category_taxonomy_service, 'pre_get_posts', 10, 1);
 
 		/*
 		 * Hook the `pre_get_posts` action to the `Wordlift_Event_Entity_Page_Service`
 		 * in order to tweak WP's `WP_Query` to show event related entities in reverse
 		 * order of start time.
 		 */
-		$this->loader->add_action( 'pre_get_posts', $this->event_entity_page_service, 'pre_get_posts', 10, 1 );
+		$this->loader->add_action('pre_get_posts', $this->event_entity_page_service, 'pre_get_posts', 10, 1);
 
-		$this->loader->add_action( 'wp_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
+		$this->loader->add_action('wp_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1);
 
 	}
 

Indentation +1109 added lines, -1109 removed lines

@@ -29,1219 +29,1219 @@
  */
 class Wordlift {
 
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The {@link Wordlift_Tinymce_Adapter} instance.
-	 *
-	 * @since  3.12.0
-	 * @access protected
-	 * @var \Wordlift_Tinymce_Adapter $tinymce_adapter The {@link Wordlift_Tinymce_Adapter} instance.
-	 */
-	protected $tinymce_adapter;
-
-	/**
-	 * The Thumbnail service.
-	 *
-	 * @since  3.1.5
-	 * @access private
-	 * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
-	 */
-	private $thumbnail_service;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The Schema service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	private $schema_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since  3.1.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	protected $entity_service;
-
-	/**
-	 * The Topic Taxonomy service.
-	 *
-	 * @since  3.5.0
-	 * @access private
-	 * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
-	 */
-	private $topic_taxonomy_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since  3.1.7
-	 * @access protected
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	protected $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Redirect service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
-	 */
-	private $redirect_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * The Entity list customization.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Entity_List_Service $entity_list_service The Entity list service.
-	 */
-	private $entity_list_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * The ShareThis service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
-	 */
-	private $sharethis_service;
-
-	/**
-	 * The PrimaShop adapter.
-	 *
-	 * @since  3.2.3
-	 * @access private
-	 * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
-	 */
-	private $primashop_adapter;
-
-	/**
-	 * The WordLift Dashboard adapter.
-	 *
-	 * @since  3.4.0
-	 * @access private
-	 * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
-	 */
-	private $dashboard_service;
-
-	/**
-	 * The entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Post_Type_Service
-	 */
-	private $entity_post_type_service;
-
-	/**
-	 * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Link_Service
-	 */
-	private $entity_link_service;
-
-	/**
-	 * A {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @var    3.6.0
-	 * @access protected
-	 * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
-	 */
-	protected $sparql_service;
-
-	/**
-	 * A {@link Wordlift_Import_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Import_Service $import_service A {@link Wordlift_Import_Service} instance.
-	 */
-	private $import_service;
-
-	/**
-	 * A {@link Wordlift_Rebuild_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Rebuild_Service $rebuild_service A {@link Wordlift_Rebuild_Service} instance.
-	 */
-	private $rebuild_service;
-
-	/**
-	 * A {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @since  3.7.0
-	 * @access protected
-	 * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
-	 */
-	protected $jsonld_service;
-
-	/**
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Property_Factory $property_factory
-	 */
-	private $property_factory;
-
-	/**
-	 * The 'Download Your Data' page.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
-	 */
-	private $download_your_data_page;
-
-	/**
-	 * The 'WordLift Settings' page.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page $settings_page The 'WordLift Settings' page.
-	 */
-	protected $settings_page;
-
-	/**
-	 * The install wizard page.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
-	 */
-	private $admin_setup;
-
-	/**
-	 * The Content Filter Service hooks up to the 'the_content' filter and provides
-	 * linking of entities to their pages.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
-	 */
-	private $content_filter_service;
-
-	/**
-	 * A {@link Wordlift_Key_Validation_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
-	 */
-	private $key_validation_service;
-
-	/**
-	 * A {@link Wordlift_Rating_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
-	 */
-	private $rating_service;
-
-	/**
-	 * A {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter A {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 */
-	protected $post_to_jsonld_converter;
-
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	protected $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	protected $entity_type_service;
-
-	/**
-	 * A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
-	 */
-	protected $entity_post_to_jsonld_converter;
-
-	/**
-	 * A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
-	 *
-	 * @since  3.10.0
-	 * @access protected
-	 * @var \Wordlift_Postid_To_Jsonld_Converter $postid_to_jsonld_converter A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
-	 */
-	protected $postid_to_jsonld_converter;
-
-	/**
-	 * The {@link Wordlift_Admin_Status_Page} class.
-	 *
-	 * @since  3.9.8
-	 * @access private
-	 * @var \Wordlift_Admin_Status_Page $status_page The {@link Wordlift_Admin_Status_Page} class.
-	 */
-	private $status_page;
-
-	/**
-	 * The {@link Wordlift_Category_Taxonomy_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Category_Taxonomy_Service $category_taxonomy_service The {@link Wordlift_Category_Taxonomy_Service} instance.
-	 */
-	protected $category_taxonomy_service;
-
-	/**
-	 * The {@link Wordlift_Event_Entity_Page_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Event_Entity_Page_Service $event_entity_page_service The {@link Wordlift_Event_Entity_Page_Service} instance.
-	 */
-	protected $event_entity_page_service;
-
-	/**
-	 * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
-	 */
-	protected $settings_page_action_link;
-
-	/**
-	 * The {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Publisher_Ajax_Adapter $publisher_ajax_adapter The {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 */
-	protected $publisher_ajax_adapter;
-
-	/**
-	 * The {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Input_Element $input_element The {@link Wordlift_Admin_Input_Element} element renderer.
-	 */
-	protected $input_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 *
-	 * @since  3.13.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	protected $radio_input_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element The {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	protected $language_select_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Publisher_Element $publisher_element The {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 */
-	protected $publisher_element;
-
-	/**
-	 * The {@link Wordlift_Admin_Select2_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Select2_Element $select2_element The {@link Wordlift_Admin_Select2_Element} element renderer.
-	 */
-	protected $select2_element;
-
-	/**
-	 * The controller for the entity type list admin page
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Entity_Taxonomy_List_Page $entity_type_admin_page The {@link Wordlift_Admin_Entity_Taxonomy_List_Page} class.
-	 */
-	private $entity_type_admin_page;
-
-	/**
-	 * The controller for the entity type settings admin page
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Entity_Type_Settings $entity_type_settings_admin_page The {@link Wordlift_Admin_Entity_Type_Settings} class.
-	 */
-	private $entity_type_settings_admin_page;
-
-	/**
-	 * The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 *
-	 * @since  3.11.0
-	 * @access protected
-	 * @var \Wordlift_Related_Entities_Cloud_Widget $related_entities_cloud_widget The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
-	 */
-	protected $related_entities_cloud_widget;
-
-	/**
-	 * {@link Wordlift}'s singleton instance.
-	 *
-	 * @since  3.11.2
-	 *
-	 * @since  3.11.2
-	 * @access private
-	 * @var Wordlift $instance {@link Wordlift}'s singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		$this->plugin_name = 'wordlift';
-		$this->version     = '3.14.0-dev';
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.11.2
-	 *
-	 * @return Wordlift The {@link Wordlift} singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * WordLift's supported languages.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
-
-		/**
-		 * Provide support functions to sanitize data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
-
-		/**
-		 * The Redirect service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
-
-		/**
-		 * The Log service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-
-		/**
-		 * The configuration service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
-
-		/**
-		 * The entity post type service (this is the WordPress post type, not the entity schema type).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
-
-		/**
-		 * The entity type service (i.e. the schema type).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
-
-		/**
-		 * The entity link service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
-
-		/**
-		 * The Query builder.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The schema:url property service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Thumbnail service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		// Add the entity rating service.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The Topic Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
-
-		/**
-		 * The SPARQL service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
-
-		/**
-		 * The WordLift import service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
-
-		/**
-		 * The WordLift URI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-listable.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
-
-		/**
-		 * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rebuild-service.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
-
-		/**
-		 * Load the converters.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
-
-		/**
-		 * Load the content filter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
-
-		/*
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The {@link Wordlift_Tinymce_Adapter} instance.
+     *
+     * @since  3.12.0
+     * @access protected
+     * @var \Wordlift_Tinymce_Adapter $tinymce_adapter The {@link Wordlift_Tinymce_Adapter} instance.
+     */
+    protected $tinymce_adapter;
+
+    /**
+     * The Thumbnail service.
+     *
+     * @since  3.1.5
+     * @access private
+     * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
+     */
+    private $thumbnail_service;
+
+    /**
+     * The UI service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The Schema service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    private $schema_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since  3.1.0
+     * @access protected
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    protected $entity_service;
+
+    /**
+     * The Topic Taxonomy service.
+     *
+     * @since  3.5.0
+     * @access private
+     * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
+     */
+    private $topic_taxonomy_service;
+
+    /**
+     * The User service.
+     *
+     * @since  3.1.7
+     * @access protected
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    protected $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Redirect service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
+     */
+    private $redirect_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * The Entity list customization.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Entity_List_Service $entity_list_service The Entity list service.
+     */
+    private $entity_list_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * The ShareThis service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
+     */
+    private $sharethis_service;
+
+    /**
+     * The PrimaShop adapter.
+     *
+     * @since  3.2.3
+     * @access private
+     * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
+     */
+    private $primashop_adapter;
+
+    /**
+     * The WordLift Dashboard adapter.
+     *
+     * @since  3.4.0
+     * @access private
+     * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
+     */
+    private $dashboard_service;
+
+    /**
+     * The entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Post_Type_Service
+     */
+    private $entity_post_type_service;
+
+    /**
+     * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Link_Service
+     */
+    private $entity_link_service;
+
+    /**
+     * A {@link Wordlift_Sparql_Service} instance.
+     *
+     * @var    3.6.0
+     * @access protected
+     * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
+     */
+    protected $sparql_service;
+
+    /**
+     * A {@link Wordlift_Import_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Import_Service $import_service A {@link Wordlift_Import_Service} instance.
+     */
+    private $import_service;
+
+    /**
+     * A {@link Wordlift_Rebuild_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Rebuild_Service $rebuild_service A {@link Wordlift_Rebuild_Service} instance.
+     */
+    private $rebuild_service;
+
+    /**
+     * A {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @since  3.7.0
+     * @access protected
+     * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
+     */
+    protected $jsonld_service;
+
+    /**
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Property_Factory $property_factory
+     */
+    private $property_factory;
+
+    /**
+     * The 'Download Your Data' page.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
+     */
+    private $download_your_data_page;
+
+    /**
+     * The 'WordLift Settings' page.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page $settings_page The 'WordLift Settings' page.
+     */
+    protected $settings_page;
+
+    /**
+     * The install wizard page.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
+     */
+    private $admin_setup;
+
+    /**
+     * The Content Filter Service hooks up to the 'the_content' filter and provides
+     * linking of entities to their pages.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
+     */
+    private $content_filter_service;
+
+    /**
+     * A {@link Wordlift_Key_Validation_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
+     */
+    private $key_validation_service;
+
+    /**
+     * A {@link Wordlift_Rating_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
+     */
+    private $rating_service;
+
+    /**
+     * A {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter A {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     */
+    protected $post_to_jsonld_converter;
+
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    protected $configuration_service;
+
+    /**
+     * A {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    protected $entity_type_service;
+
+    /**
+     * A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter A {@link Wordlift_Entity_Post_To_Jsonld_Converter} instance.
+     */
+    protected $entity_post_to_jsonld_converter;
+
+    /**
+     * A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
+     *
+     * @since  3.10.0
+     * @access protected
+     * @var \Wordlift_Postid_To_Jsonld_Converter $postid_to_jsonld_converter A {@link Wordlift_Postid_To_Jsonld_Converter} instance.
+     */
+    protected $postid_to_jsonld_converter;
+
+    /**
+     * The {@link Wordlift_Admin_Status_Page} class.
+     *
+     * @since  3.9.8
+     * @access private
+     * @var \Wordlift_Admin_Status_Page $status_page The {@link Wordlift_Admin_Status_Page} class.
+     */
+    private $status_page;
+
+    /**
+     * The {@link Wordlift_Category_Taxonomy_Service} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Category_Taxonomy_Service $category_taxonomy_service The {@link Wordlift_Category_Taxonomy_Service} instance.
+     */
+    protected $category_taxonomy_service;
+
+    /**
+     * The {@link Wordlift_Event_Entity_Page_Service} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Event_Entity_Page_Service $event_entity_page_service The {@link Wordlift_Event_Entity_Page_Service} instance.
+     */
+    protected $event_entity_page_service;
+
+    /**
+     * The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Settings_Page_Action_Link $settings_page_action_link The {@link Wordlift_Admin_Settings_Page_Action_Link} class.
+     */
+    protected $settings_page_action_link;
+
+    /**
+     * The {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Publisher_Ajax_Adapter $publisher_ajax_adapter The {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     */
+    protected $publisher_ajax_adapter;
+
+    /**
+     * The {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Input_Element $input_element The {@link Wordlift_Admin_Input_Element} element renderer.
+     */
+    protected $input_element;
+
+    /**
+     * The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     *
+     * @since  3.13.0
+     * @access protected
+     * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element The {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    protected $radio_input_element;
+
+    /**
+     * The {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element The {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    protected $language_select_element;
+
+    /**
+     * The {@link Wordlift_Admin_Publisher_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Publisher_Element $publisher_element The {@link Wordlift_Admin_Publisher_Element} element renderer.
+     */
+    protected $publisher_element;
+
+    /**
+     * The {@link Wordlift_Admin_Select2_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Admin_Select2_Element $select2_element The {@link Wordlift_Admin_Select2_Element} element renderer.
+     */
+    protected $select2_element;
+
+    /**
+     * The controller for the entity type list admin page
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Entity_Taxonomy_List_Page $entity_type_admin_page The {@link Wordlift_Admin_Entity_Taxonomy_List_Page} class.
+     */
+    private $entity_type_admin_page;
+
+    /**
+     * The controller for the entity type settings admin page
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Entity_Type_Settings $entity_type_settings_admin_page The {@link Wordlift_Admin_Entity_Type_Settings} class.
+     */
+    private $entity_type_settings_admin_page;
+
+    /**
+     * The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     *
+     * @since  3.11.0
+     * @access protected
+     * @var \Wordlift_Related_Entities_Cloud_Widget $related_entities_cloud_widget The {@link Wordlift_Related_Entities_Cloud_Widget} instance.
+     */
+    protected $related_entities_cloud_widget;
+
+    /**
+     * {@link Wordlift}'s singleton instance.
+     *
+     * @since  3.11.2
+     *
+     * @since  3.11.2
+     * @access private
+     * @var Wordlift $instance {@link Wordlift}'s singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        $this->plugin_name = 'wordlift';
+        $this->version     = '3.14.0-dev';
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.11.2
+     *
+     * @return Wordlift The {@link Wordlift} singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * WordLift's supported languages.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
+
+        /**
+         * Provide support functions to sanitize data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+
+        /**
+         * The Redirect service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+
+        /**
+         * The Log service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+
+        /**
+         * The configuration service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
+
+        /**
+         * The entity post type service (this is the WordPress post type, not the entity schema type).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
+
+        /**
+         * The entity type service (i.e. the schema type).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+
+        /**
+         * The entity link service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+
+        /**
+         * The Query builder.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The schema:url property service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Thumbnail service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        // Add the entity rating service.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rating-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The Topic Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+
+        /**
+         * The SPARQL service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
+
+        /**
+         * The WordLift import service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
+
+        /**
+         * The WordLift URI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-listable.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
+
+        /**
+         * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rebuild-service.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-attachment-service.php';
+
+        /**
+         * Load the converters.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/intf-wordlift-post-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-abstract-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-postid-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-to-jsonld-converter.php';
+
+        /**
+         * Load the content filter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
+
+        /*
 		 * Load the excerpt helper.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-excerpt-helper.php';
-
-		/**
-		 * Load the JSON-LD service to publish entities using JSON-LD.s
-		 *
-		 * @since 3.8.0
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
-
-		// The Publisher Service and the AJAX adapter.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
-
-		/**
-		 * Load the WordLift key validation service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
-
-		// Load the `Wordlift_Category_Taxonomy_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
-
-		// Load the `Wordlift_Event_Entity_Page_Service` class definition.
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-event-entity-page-service.php';
-
-		/** Adapters. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
-
-		/** Async Tasks. */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/wp-async-task.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The class to customize the entity list admin page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
-
-		/**
-		 * The PrimaShop adapter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
-
-		/**
-		 * The WordLift Dashboard service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
-
-		/**
-		 * The admin 'Install wizard' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-post-excerpt-helper.php';
+
+        /**
+         * Load the JSON-LD service to publish entities using JSON-LD.s
+         *
+         * @since 3.8.0
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
+
+        // The Publisher Service and the AJAX adapter.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-publisher-ajax-adapter.php';
+
+        /**
+         * Load the WordLift key validation service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
+
+        // Load the `Wordlift_Category_Taxonomy_Service` class definition.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-category-taxonomy-service.php';
+
+        // Load the `Wordlift_Event_Entity_Page_Service` class definition.
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-event-entity-page-service.php';
+
+        /** Adapters. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-tinymce-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-newrelic-adapter.php';
+
+        /** Async Tasks. */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/wp-async-task.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/wp-async-task/class-wordlift-sparql-query-async-task.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The class to customize the entity list admin page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+
+        /**
+         * The PrimaShop adapter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+
+        /**
+         * The WordLift Dashboard service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+
+        /**
+         * The admin 'Install wizard' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
+
+        /**
+         * The WordLift entity type list admin page controller.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
+
+        /**
+         * The WordLift entity type settings admin page controller.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
+
+        /**
+         * The admin 'Download Your Data' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
+
+        /**
+         * The admin 'Download Your Data' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
+
+        /**
+         * The admin 'WordLift Settings' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/intf-wordlift-admin-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-input-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-input-radio-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-select2-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-language-select-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-tabs-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-publisher-element.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
+
+        /** Admin Pages */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-post-edit-page.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-status-page.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The shortcode abstract class.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        /**
+         * The Navigator shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
+
+        /**
+         * The chord shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
+
+        /**
+         * The geomap shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
+
+        /**
+         * The entity cloud shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
 
-		/**
-		 * The WordLift entity type list admin page controller.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-taxonomy-list-page.php';
-
-		/**
-		 * The WordLift entity type settings admin page controller.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-type-settings.php';
-
-		/**
-		 * The admin 'Download Your Data' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
-
-		/**
-		 * The admin 'Download Your Data' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
-
-		/**
-		 * The admin 'WordLift Settings' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/intf-wordlift-admin-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-input-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-input-radio-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-select2-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-language-select-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-tabs-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-publisher-element.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-settings-page-action-link.php';
-
-		/** Admin Pages */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-post-edit-page.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-status-page.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The shortcode abstract class.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		/**
-		 * The Navigator shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
 
-		/**
-		 * The chord shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
+        /**
+         * The SEO service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
 
-		/**
-		 * The geomap shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
-
-		/**
-		 * The entity cloud shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-shortcode.php';
-
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
-
-		/**
-		 * The SEO service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-seo-service.php';
-
-		/**
-		 * The AMP service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
+        /**
+         * The AMP service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-amp-service.php';
 
-		/** Widgets */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
+        /** Widgets */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-widget.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-related-entities-cloud-widget.php';
 
-		$this->loader = new Wordlift_Loader();
+        $this->loader = new Wordlift_Loader();
 
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+        // Instantiate a global logger.
+        global $wl_logger;
+        $wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
 
-		// Create the configuration service.
-		$this->configuration_service = new Wordlift_Configuration_Service();
+        // Create the configuration service.
+        $this->configuration_service = new Wordlift_Configuration_Service();
 
-		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service( Wordlift_Entity_Service::TYPE_NAME, $this->configuration_service->get_entity_base_path() );
+        // Create an entity type service instance. It'll be later bound to the init action.
+        $this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service( Wordlift_Entity_Service::TYPE_NAME, $this->configuration_service->get_entity_base_path() );
 
-		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $this->configuration_service->get_entity_base_path() );
+        // Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
+        $this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $this->configuration_service->get_entity_base_path() );
 
-		// Create an instance of the UI service.
-		$this->ui_service = new Wordlift_UI_Service();
+        // Create an instance of the UI service.
+        $this->ui_service = new Wordlift_UI_Service();
 
-		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
-		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
+        // Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
+        $this->thumbnail_service = new Wordlift_Thumbnail_Service();
 
-		$this->sparql_service = new Wordlift_Sparql_Service();
+        $this->sparql_service = new Wordlift_Sparql_Service();
 
-		// Create an instance of the Schema service.
-		$schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
-		$this->schema_service        = new Wordlift_Schema_Service();
+        // Create an instance of the Schema service.
+        $schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
+        $this->schema_service        = new Wordlift_Schema_Service();
 
-		// Create an instance of the Notice service.
-		$this->notice_service = new Wordlift_Notice_Service();
+        // Create an instance of the Notice service.
+        $this->notice_service = new Wordlift_Notice_Service();
 
-		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service );
+        // Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
+        $this->entity_service = new Wordlift_Entity_Service( $this->ui_service );
 
-		// Create an instance of the User service.
-		$this->user_service = new Wordlift_User_Service();
+        // Create an instance of the User service.
+        $this->user_service = new Wordlift_User_Service();
 
-		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+        // Create a new instance of the Timeline service and Timeline shortcode.
+        $this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
 
-		// Create a new instance of the Redirect service.
-		$this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
+        // Create a new instance of the Redirect service.
+        $this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
 
-		// Initialize the shortcodes.
-		new Wordlift_Navigator_Shortcode();
-		new Wordlift_Chord_Shortcode();
-		new Wordlift_Geomap_Shortcode();
-		new Wordlift_Timeline_Shortcode();
-		new Wordlift_Related_Entities_Cloud_Shortcode();
+        // Initialize the shortcodes.
+        new Wordlift_Navigator_Shortcode();
+        new Wordlift_Chord_Shortcode();
+        new Wordlift_Geomap_Shortcode();
+        new Wordlift_Timeline_Shortcode();
+        new Wordlift_Related_Entities_Cloud_Shortcode();
 
-		// Initialize the SEO service.
-		new Wordlift_Seo_Service();
+        // Initialize the SEO service.
+        new Wordlift_Seo_Service();
 
-		// Initialize the AMP service.
-		new Wordlift_AMP_Service();
+        // Initialize the AMP service.
+        new Wordlift_AMP_Service();
 
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+        $this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
-		$this->topic_taxonomy_service = new Wordlift_Topic_Taxonomy_Service();
+        $this->topic_taxonomy_service = new Wordlift_Topic_Taxonomy_Service();
 
-		// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-		$this->sharethis_service = new Wordlift_ShareThis_Service();
+        // Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
+        $this->sharethis_service = new Wordlift_ShareThis_Service();
 
-		// Create an instance of the PrimaShop adapter.
-		$this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
+        // Create an instance of the PrimaShop adapter.
+        $this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
 
-		// Create an import service instance to hook later to WP's import function.
-		$this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri() );
+        // Create an import service instance to hook later to WP's import function.
+        $this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, $this->configuration_service->get_dataset_uri() );
 
-		$uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
+        $uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
 
-		// Create a Rebuild Service instance, which we'll later bound to an ajax call.
-		$this->rebuild_service = new Wordlift_Rebuild_Service( $this->sparql_service, $uri_service );
+        // Create a Rebuild Service instance, which we'll later bound to an ajax call.
+        $this->rebuild_service = new Wordlift_Rebuild_Service( $this->sparql_service, $uri_service );
 
-		$this->entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
+        $this->entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
 
-		// Create the entity rating service.
-		$this->rating_service = new Wordlift_Rating_Service( $this->entity_service, $this->entity_type_service, $this->notice_service );
+        // Create the entity rating service.
+        $this->rating_service = new Wordlift_Rating_Service( $this->entity_service, $this->entity_type_service, $this->notice_service );
 
-		// Create entity list customization (wp-admin/edit.php)
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->rating_service );
+        // Create entity list customization (wp-admin/edit.php)
+        $this->entity_list_service = new Wordlift_Entity_List_Service( $this->rating_service );
 
-		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->rating_service );
+        // Create a new instance of the Redirect service.
+        $this->dashboard_service = new Wordlift_Dashboard_Service( $this->rating_service );
 
-		$this->property_factory = new Wordlift_Property_Factory( $schema_url_property_service );
-		$this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
+        $this->property_factory = new Wordlift_Property_Factory( $schema_url_property_service );
+        $this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
 
-		$attachment_service = new Wordlift_Attachment_Service();
+        $attachment_service = new Wordlift_Attachment_Service();
 
-		// Instantiate the JSON-LD service.
-		$property_getter                       = Wordlift_Property_Getter_Factory::create( $this->entity_service );
-		$this->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter );
-		$this->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
-		$this->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter( $this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter );
-		$this->jsonld_service                  = new Wordlift_Jsonld_Service( $this->entity_service, $this->postid_to_jsonld_converter );
+        // Instantiate the JSON-LD service.
+        $property_getter                       = Wordlift_Property_Getter_Factory::create( $this->entity_service );
+        $this->entity_post_to_jsonld_converter = new Wordlift_Entity_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $property_getter );
+        $this->post_to_jsonld_converter        = new Wordlift_Post_To_Jsonld_Converter( $this->entity_type_service, $this->entity_service, $this->user_service, $attachment_service, $this->configuration_service );
+        $this->postid_to_jsonld_converter      = new Wordlift_Postid_To_Jsonld_Converter( $this->entity_service, $this->entity_post_to_jsonld_converter, $this->post_to_jsonld_converter );
+        $this->jsonld_service                  = new Wordlift_Jsonld_Service( $this->entity_service, $this->postid_to_jsonld_converter );
 
-		// Create an instance of the Key Validation service. This service is later hooked to provide an AJAX call (only for admins).
-		$this->key_validation_service = new Wordlift_Key_Validation_Service();
+        // Create an instance of the Key Validation service. This service is later hooked to provide an AJAX call (only for admins).
+        $this->key_validation_service = new Wordlift_Key_Validation_Service();
 
-		// Create an instance of the Publisher Service and the AJAX Adapter.
-		$publisher_service            = new Wordlift_Publisher_Service();
-		$this->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter( $publisher_service );
+        // Create an instance of the Publisher Service and the AJAX Adapter.
+        $publisher_service            = new Wordlift_Publisher_Service();
+        $this->publisher_ajax_adapter = new Wordlift_Publisher_Ajax_Adapter( $publisher_service );
 
-		/** Adapters. */
-		$this->tinymce_adapter = new Wordlift_Tinymce_Adapter( $this );
+        /** Adapters. */
+        $this->tinymce_adapter = new Wordlift_Tinymce_Adapter( $this );
 
-		/** Async Tasks. */
-		new Wordlift_Sparql_Query_Async_Task();
+        /** Async Tasks. */
+        new Wordlift_Sparql_Query_Async_Task();
 
-		/** WordPress Admin UI. */
+        /** WordPress Admin UI. */
 
-		// UI elements.
-		$this->input_element           = new Wordlift_Admin_Input_Element();
-		$this->radio_input_element     = new Wordlift_Admin_Radio_Input_Element();
-		$this->select2_element         = new Wordlift_Admin_Select2_Element();
-		$this->language_select_element = new Wordlift_Admin_Language_Select_Element();
-		$tabs_element                  = new Wordlift_Admin_Tabs_Element();
-		$this->publisher_element       = new Wordlift_Admin_Publisher_Element( $this->configuration_service, $publisher_service, $tabs_element, $this->select2_element );
+        // UI elements.
+        $this->input_element           = new Wordlift_Admin_Input_Element();
+        $this->radio_input_element     = new Wordlift_Admin_Radio_Input_Element();
+        $this->select2_element         = new Wordlift_Admin_Select2_Element();
+        $this->language_select_element = new Wordlift_Admin_Language_Select_Element();
+        $tabs_element                  = new Wordlift_Admin_Tabs_Element();
+        $this->publisher_element       = new Wordlift_Admin_Publisher_Element( $this->configuration_service, $publisher_service, $tabs_element, $this->select2_element );
 
-		$this->download_your_data_page   = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
-		$this->settings_page             = new Wordlift_Admin_Settings_Page( $this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->publisher_element, $this->radio_input_element );
-		$this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $this->settings_page );
+        $this->download_your_data_page   = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
+        $this->settings_page             = new Wordlift_Admin_Settings_Page( $this->configuration_service, $this->entity_service, $this->input_element, $this->language_select_element, $this->publisher_element, $this->radio_input_element );
+        $this->settings_page_action_link = new Wordlift_Admin_Settings_Page_Action_Link( $this->settings_page );
 
-		// Pages.
-		new Wordlift_Admin_Post_Edit_Page( $this );
+        // Pages.
+        new Wordlift_Admin_Post_Edit_Page( $this );
 
-		// create an instance of the entity type list admin page controller.
-		$this->entity_type_admin_page = new Wordlift_Admin_Entity_Taxonomy_List_Page();
+        // create an instance of the entity type list admin page controller.
+        $this->entity_type_admin_page = new Wordlift_Admin_Entity_Taxonomy_List_Page();
 
-		// create an instance of the entity type etting admin page controller.
-		$this->entity_type_settings_admin_page = new Wordlift_Admin_Entity_Type_Settings();
+        // create an instance of the entity type etting admin page controller.
+        $this->entity_type_settings_admin_page = new Wordlift_Admin_Entity_Type_Settings();
 
-		/** Widgets */
-		$this->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
+        /** Widgets */
+        $this->related_entities_cloud_widget = new Wordlift_Related_Entities_Cloud_Widget();
 
-		//** WordPress Admin */
-		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
-		$this->status_page             = new Wordlift_Admin_Status_Page( $this->entity_service, $this->sparql_service );
+        //** WordPress Admin */
+        $this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page( $this->configuration_service );
+        $this->status_page             = new Wordlift_Admin_Status_Page( $this->entity_service, $this->sparql_service );
 
-		// Create an instance of the install wizard.
-		$this->admin_setup = new Wordlift_Admin_Setup( $this->configuration_service, $this->key_validation_service, $this->entity_service );
+        // Create an instance of the install wizard.
+        $this->admin_setup = new Wordlift_Admin_Setup( $this->configuration_service, $this->key_validation_service, $this->entity_service );
 
-		// Create an instance of the content filter service.
-		$this->content_filter_service = new Wordlift_Content_Filter_Service( $this->entity_service, $this->configuration_service );
+        // Create an instance of the content filter service.
+        $this->content_filter_service = new Wordlift_Content_Filter_Service( $this->entity_service, $this->configuration_service );
 
-		$this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $this->entity_post_type_service );
+        $this->category_taxonomy_service = new Wordlift_Category_Taxonomy_Service( $this->entity_post_type_service );
 
-		$this->event_entity_page_service = new Wordlift_Event_Entity_Page_Service();
+        $this->event_entity_page_service = new Wordlift_Event_Entity_Page_Service();
 
-		// Load the debug service if WP is in debug mode.
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
-			new Wordlift_Debug_Service( $this->entity_service, $uri_service );
-		}
+        // Load the debug service if WP is in debug mode.
+        if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
+            new Wordlift_Debug_Service( $this->entity_service, $uri_service );
+        }
 
-	}
+    }
 
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the Wordlift_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the Wordlift_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
 
-		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+        $plugin_i18n = new Wordlift_i18n();
+        $plugin_i18n->set_domain( $this->get_plugin_name() );
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
 
-	}
+    }
 
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks() {
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin(
-			$this->get_plugin_name(),
-			$this->get_version(),
-			$this->configuration_service,
-			$this->notice_service
-		);
+        $plugin_admin = new Wordlift_Admin(
+            $this->get_plugin_name(),
+            $this->get_version(),
+            $this->configuration_service,
+            $this->notice_service
+        );
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
 
-		// Hook the init action to the Topic Taxonomy service.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
+        // Hook the init action to the Topic Taxonomy service.
+        $this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
 
-		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+        // Hook the deleted_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
 
-		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+        // Hook the added_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
 
-		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+        // Hook the updated_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
 
-		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+        // Hook posts inserts (or updates) to the user service.
+        $this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
 
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
 
-		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
+        // Register custom allowed redirect hosts.
+        $this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
 
-		// Hook save_post to the entity service to update custom fields (such as alternate labels).
-		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post_entity', $this->rating_service, 'set_rating_for', 10, 1 );
+        // Hook save_post to the entity service to update custom fields (such as alternate labels).
+        // We have a priority of 9 because we want to be executed before data is sent to Redlink.
+        $this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
+        $this->loader->add_action( 'save_post_entity', $this->rating_service, 'set_rating_for', 10, 1 );
 
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->rating_service, 'in_admin_header' );
+        $this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
+        $this->loader->add_action( 'in_admin_header', $this->rating_service, 'in_admin_header' );
 
-		// Entity listing customization (wp-admin/edit.php)
-		// Add custom columns
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
-		$this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
-		// Add 4W selection
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
+        // Entity listing customization (wp-admin/edit.php)
+        // Add custom columns
+        $this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
+        $this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+        // Add 4W selection
+        $this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
+        $this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
 
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+        $this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
 
-		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
-		// entities.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+        // Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
+        // entities.
+        $this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
 
-		// Filter imported post meta.
-		$this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
+        // Filter imported post meta.
+        $this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
 
-		// Notify the import service when an import starts and ends.
-		$this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
-		$this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
-
-		// Hook the AJAX wl_rebuild action to the Rebuild Service.
-		$this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
+        // Notify the import service when an import starts and ends.
+        $this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
+        $this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
+
+        // Hook the AJAX wl_rebuild action to the Rebuild Service.
+        $this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
 
-		// Hook the menu to the Download Your Data page.
-		$this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->status_page, 'admin_menu', 100, 0 );
-		$this->loader->add_action( 'admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0 );
-
-		// Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
-		$this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
+        // Hook the menu to the Download Your Data page.
+        $this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
+        $this->loader->add_action( 'admin_menu', $this->status_page, 'admin_menu', 100, 0 );
+        $this->loader->add_action( 'admin_menu', $this->entity_type_settings_admin_page, 'admin_menu', 100, 0 );
+
+        // Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
+        $this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
 
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
 
-		// Hook the AJAX wl_validate_key action to the Key Validation service.
-		$this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
+        // Hook the AJAX wl_validate_key action to the Key Validation service.
+        $this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
 
-		// Hook the `admin_init` function to the Admin Setup.
-		$this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
+        // Hook the `admin_init` function to the Admin Setup.
+        $this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
 
-		// Hook the admin_init to the settings page.
-		$this->loader->add_action( 'admin_init', $this->settings_page, 'admin_init' );
+        // Hook the admin_init to the settings page.
+        $this->loader->add_action( 'admin_init', $this->settings_page, 'admin_init' );
 
-		// Hook the menu creation on the general wordlift menu creation
-		$this->loader->add_action( 'wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2 );
+        // Hook the menu creation on the general wordlift menu creation
+        $this->loader->add_action( 'wl_admin_menu', $this->settings_page, 'admin_menu', 10, 2 );
 
-		// Hook key update.
-		$this->loader->add_action( 'pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2 );
-		$this->loader->add_action( 'update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2 );
+        // Hook key update.
+        $this->loader->add_action( 'pre_update_option_wl_general_settings', $this->configuration_service, 'maybe_update_dataset_uri', 10, 2 );
+        $this->loader->add_action( 'update_option_wl_general_settings', $this->configuration_service, 'update_key', 10, 2 );
 
-		// Add additional action links to the WordLift plugin in the plugins page.
-		$this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->settings_page_action_link, 'action_links', 10, 1 );
+        // Add additional action links to the WordLift plugin in the plugins page.
+        $this->loader->add_filter( 'plugin_action_links_wordlift/wordlift.php', $this->settings_page_action_link, 'action_links', 10, 1 );
 
-		// Hook the AJAX `wl_publisher` action name.
-		$this->loader->add_action( 'wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher' );
+        // Hook the AJAX `wl_publisher` action name.
+        $this->loader->add_action( 'wp_ajax_wl_publisher', $this->publisher_ajax_adapter, 'publisher' );
 
-		// Hook row actions for the entity type list admin.
-		$this->loader->add_filter( 'wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
+        // Hook row actions for the entity type list admin.
+        $this->loader->add_filter( 'wl_entity_type_row_actions', $this->entity_type_admin_page, 'wl_entity_type_row_actions', 10, 2 );
 
-		// Hook capabilities manipulation to allow access to entity type admin
-		// page  on wordpress versions before 4.7.
-		global $wp_version;
-		if ( version_compare( $wp_version, '4.7', '<' ) ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4 );
-		}
+        // Hook capabilities manipulation to allow access to entity type admin
+        // page  on wordpress versions before 4.7.
+        global $wp_version;
+        if ( version_compare( $wp_version, '4.7', '<' ) ) {
+            $this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'enable_admin_access_pre_47', 10, 4 );
+        }
 
-		/** Adapters. */
-		$this->loader->add_filter( 'mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1 );
+        /** Adapters. */
+        $this->loader->add_filter( 'mce_external_plugins', $this->tinymce_adapter, 'mce_external_plugins', 10, 1 );
 
-		$this->loader->add_action( 'wp_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
+        $this->loader->add_action( 'wp_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
 
-		// Hooks to restrict multisite super admin from manipulating entity types.
-		if ( is_multisite() ) {
-			$this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4 );
-		}
-	}
+        // Hooks to restrict multisite super admin from manipulating entity types.
+        if ( is_multisite() ) {
+            $this->loader->add_filter( 'map_meta_cap', $this->entity_type_admin_page, 'restrict_super_admin', 10, 4 );
+        }
+    }
 
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks() {
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+        $plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
 
-		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
+        // Register the entity post type.
+        $this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
 
-		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+        // Bind the link generation and handling hooks to the entity link service.
+        $this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
+        $this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', PHP_INT_MAX, 1 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
 
-		// Hook the content filter service to add entity links.
-		$this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
+        // Hook the content filter service to add entity links.
+        $this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
 
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
 
-		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+        // Hook the ShareThis service.
+        $this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
+        $this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
 
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
 
-		// Hook the `pre_get_posts` action to the `Wordlift_Category_Taxonomy_Service`
-		// in order to tweak WP's `WP_Query` to include entities in queries related
-		// to categories.
-		$this->loader->add_action( 'pre_get_posts', $this->category_taxonomy_service, 'pre_get_posts', 10, 1 );
+        // Hook the `pre_get_posts` action to the `Wordlift_Category_Taxonomy_Service`
+        // in order to tweak WP's `WP_Query` to include entities in queries related
+        // to categories.
+        $this->loader->add_action( 'pre_get_posts', $this->category_taxonomy_service, 'pre_get_posts', 10, 1 );
 
-		/*
+        /*
 		 * Hook the `pre_get_posts` action to the `Wordlift_Event_Entity_Page_Service`
 		 * in order to tweak WP's `WP_Query` to show event related entities in reverse
 		 * order of start time.
 		 */
-		$this->loader->add_action( 'pre_get_posts', $this->event_entity_page_service, 'pre_get_posts', 10, 1 );
-
-		$this->loader->add_action( 'wp_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
-
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The name of the plugin.
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The version number of the plugin.
-	 */
-	public function get_version() {
-		return $this->version;
-	}
+        $this->loader->add_action( 'pre_get_posts', $this->event_entity_page_service, 'pre_get_posts', 10, 1 );
+
+        $this->loader->add_action( 'wp_async_wl_run_sparql_query', $this->sparql_service, 'run_sparql_query', 10, 1 );
+
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @since     1.0.0
+     * @return    string    The name of the plugin.
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @since     1.0.0
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @since     1.0.0
+     * @return    string    The version number of the plugin.
+     */
+    public function get_version() {
+        return $this->version;
+    }
 
 }

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

Indentation +184 added lines, -184 removed lines

@@ -26,189 +26,189 @@
  */
 class Wordlift_Entity_Link_Service {
 
-	/**
-	 * The entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var Wordlift_Entity_Post_Type_Service $entity_type_service The entity type service.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The entity post type slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $slug The entity post type slug.
-	 */
-	private $slug;
-
-	/**
-	 * A logger instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * Wordlift_Entity_Link_Service constructor.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param Wordlift_Entity_Post_Type_Service $entity_type_service
-	 * @param string                            $slug The entity post type slug.
-	 */
-	public function __construct( $entity_type_service, $slug ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Link_Service' );
-
-		$this->entity_type_service = $entity_type_service;
-		$this->slug                = $slug;
-
-	}
-
-	/**
-	 * Intercept link generation to posts in order to customize links to entities.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string  $post_link The post's permalink.
-	 * @param WP_Post $post      The post in question.
-	 * @param bool    $leavename Whether to keep the post name.
-	 * @param bool    $sample    Is it a sample permalink.
-	 *
-	 * @return string The link to the post.
-	 */
-	public function post_type_link( $post_link, $post, $leavename, $sample ) {
-
-		// Return the post link if this is not our post type.
-		if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
-			return $post_link;
-		}
-
-		// Replace /slug/post_name/ with /post_name/
-		// The slug comes from the Entity Type Service since that service is responsible for registering the default
-		// slug.
-		return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
-	}
-
-	/**
-	 * Alter the query to look for our own custom type.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param WP_Query $query
-	 */
-	public function pre_get_posts( $query ) {
-
-		// If a slug has been set, we don't need to alter the query.
-		if ( ! empty( $this->slug ) ) {
-			return;
-		}
-
-		// Check if it's a query we should extend with our own custom post type.
-		//
-		// The `$query->query` count could be > 2 if the preview parameter is passed too.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/439
-		if ( ! $query->is_main_query() || 2 > count( $query->query ) || ! isset( $query->query['page'] ) || empty( $query->query['name'] ) ) {
-			return;
-		}
-
-		// Add our own post type to the query.
-		$post_types = '' === $query->get( 'post_type' )
-			? $this->get_default_post_types()
-			: array_merge( (array) $query->get( 'post_type' ), (array) $this->entity_type_service->get_post_type() );
-		$query->set( 'post_type', $post_types );
-
-	}
-
-	private function get_default_post_types() {
-
-		return array(
-			'post',
-			$this->entity_type_service->get_post_type(),
-			'page',
-		);
-	}
-
-	/**
-	 * Hook to WordPress' wp_unique_post_slug_is_bad_flat_slug filter. This is called when a page is saved.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
-	 * @param string $slug      The post slug.
-	 * @param string $post_type Post type.
-	 *
-	 * @return bool Whether the slug is bad.
-	 */
-	public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
-
-		// The list of post types that might have conflicting slugs.
-		$post_types = array(
-			'post',
-			'page',
-			$this->entity_type_service->get_post_type(),
-		);
-
-		// Ignore post types different from the ones we need to check.
-		if ( ! in_array( $post_type, $post_types ) ) {
-			return $bad_slug;
-		}
-
-		$exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
-
-		$this->log->debug( "Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: " . ( $exists ? "yes" : "no" ) . " ]" );
-
-		return $exists;
-	}
-
-	/**
-	 * Hook to WordPress' wp_unique_post_slug_is_bad_hierarchical_slug filter. This is called when a page is saved.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
-	 * @param string $slug      The post slug.
-	 * @param string $post_type Post type.
-	 * @param int    $post_parent
-	 *
-	 * @return bool Whether the slug is bad.
-	 */
-	public function wp_unique_post_slug_is_bad_hierarchical_slug( $bad_slug, $slug, $post_type, $post_parent ) {
-
-		// We only care about pages here.
-		if ( 'page' !== $post_type ) {
-			return $bad_slug;
-		}
-
-		// We redirect the call to the flat hook, this means that this check is going to solve also the 6-years old issue
-		// about overlapping slugs among pages and posts:
-		//  https://core.trac.wordpress.org/ticket/13459
-		return $this->wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type );
-	}
-
-	/**
-	 * Check whether a slug exists already for the specified post types.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $slug       The slug.
-	 * @param array  $post_types An array of post types.
-	 *
-	 * @return bool True if the slug exists, otherwise false.
-	 */
-	private function slug_exists( $slug, $post_types ) {
-		global $wpdb;
-
-		// Post slugs must be unique across all posts.
-		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('" . implode( "', '", array_map( 'esc_sql', $post_types ) ) . "') LIMIT 1";
-
-		return null !== $wpdb->get_var( $wpdb->prepare( $check_sql, $slug ) );
-	}
+    /**
+     * The entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var Wordlift_Entity_Post_Type_Service $entity_type_service The entity type service.
+     */
+    private $entity_type_service;
+
+    /**
+     * The entity post type slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $slug The entity post type slug.
+     */
+    private $slug;
+
+    /**
+     * A logger instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * Wordlift_Entity_Link_Service constructor.
+     *
+     * @since 3.6.0
+     *
+     * @param Wordlift_Entity_Post_Type_Service $entity_type_service
+     * @param string                            $slug The entity post type slug.
+     */
+    public function __construct( $entity_type_service, $slug ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Link_Service' );
+
+        $this->entity_type_service = $entity_type_service;
+        $this->slug                = $slug;
+
+    }
+
+    /**
+     * Intercept link generation to posts in order to customize links to entities.
+     *
+     * @since 3.6.0
+     *
+     * @param string  $post_link The post's permalink.
+     * @param WP_Post $post      The post in question.
+     * @param bool    $leavename Whether to keep the post name.
+     * @param bool    $sample    Is it a sample permalink.
+     *
+     * @return string The link to the post.
+     */
+    public function post_type_link( $post_link, $post, $leavename, $sample ) {
+
+        // Return the post link if this is not our post type.
+        if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
+            return $post_link;
+        }
+
+        // Replace /slug/post_name/ with /post_name/
+        // The slug comes from the Entity Type Service since that service is responsible for registering the default
+        // slug.
+        return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
+    }
+
+    /**
+     * Alter the query to look for our own custom type.
+     *
+     * @since 3.6.0
+     *
+     * @param WP_Query $query
+     */
+    public function pre_get_posts( $query ) {
+
+        // If a slug has been set, we don't need to alter the query.
+        if ( ! empty( $this->slug ) ) {
+            return;
+        }
+
+        // Check if it's a query we should extend with our own custom post type.
+        //
+        // The `$query->query` count could be > 2 if the preview parameter is passed too.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/439
+        if ( ! $query->is_main_query() || 2 > count( $query->query ) || ! isset( $query->query['page'] ) || empty( $query->query['name'] ) ) {
+            return;
+        }
+
+        // Add our own post type to the query.
+        $post_types = '' === $query->get( 'post_type' )
+            ? $this->get_default_post_types()
+            : array_merge( (array) $query->get( 'post_type' ), (array) $this->entity_type_service->get_post_type() );
+        $query->set( 'post_type', $post_types );
+
+    }
+
+    private function get_default_post_types() {
+
+        return array(
+            'post',
+            $this->entity_type_service->get_post_type(),
+            'page',
+        );
+    }
+
+    /**
+     * Hook to WordPress' wp_unique_post_slug_is_bad_flat_slug filter. This is called when a page is saved.
+     *
+     * @since 3.6.0
+     *
+     * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
+     * @param string $slug      The post slug.
+     * @param string $post_type Post type.
+     *
+     * @return bool Whether the slug is bad.
+     */
+    public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
+
+        // The list of post types that might have conflicting slugs.
+        $post_types = array(
+            'post',
+            'page',
+            $this->entity_type_service->get_post_type(),
+        );
+
+        // Ignore post types different from the ones we need to check.
+        if ( ! in_array( $post_type, $post_types ) ) {
+            return $bad_slug;
+        }
+
+        $exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
+
+        $this->log->debug( "Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: " . ( $exists ? "yes" : "no" ) . " ]" );
+
+        return $exists;
+    }
+
+    /**
+     * Hook to WordPress' wp_unique_post_slug_is_bad_hierarchical_slug filter. This is called when a page is saved.
+     *
+     * @since 3.6.0
+     *
+     * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
+     * @param string $slug      The post slug.
+     * @param string $post_type Post type.
+     * @param int    $post_parent
+     *
+     * @return bool Whether the slug is bad.
+     */
+    public function wp_unique_post_slug_is_bad_hierarchical_slug( $bad_slug, $slug, $post_type, $post_parent ) {
+
+        // We only care about pages here.
+        if ( 'page' !== $post_type ) {
+            return $bad_slug;
+        }
+
+        // We redirect the call to the flat hook, this means that this check is going to solve also the 6-years old issue
+        // about overlapping slugs among pages and posts:
+        //  https://core.trac.wordpress.org/ticket/13459
+        return $this->wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type );
+    }
+
+    /**
+     * Check whether a slug exists already for the specified post types.
+     *
+     * @since 3.6.0
+     *
+     * @param string $slug       The slug.
+     * @param array  $post_types An array of post types.
+     *
+     * @return bool True if the slug exists, otherwise false.
+     */
+    private function slug_exists( $slug, $post_types ) {
+        global $wpdb;
+
+        // Post slugs must be unique across all posts.
+        $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('" . implode( "', '", array_map( 'esc_sql', $post_types ) ) . "') LIMIT 1";
+
+        return null !== $wpdb->get_var( $wpdb->prepare( $check_sql, $slug ) );
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -61,9 +61,9 @@ 
 	 * @param Wordlift_Entity_Post_Type_Service $entity_type_service
 	 * @param string                            $slug The entity post type slug.
 	 */
-	public function __construct( $entity_type_service, $slug ) {
+	public function __construct($entity_type_service, $slug) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Link_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Link_Service');
 
 		$this->entity_type_service = $entity_type_service;
 		$this->slug                = $slug;
@@ -82,17 +82,17 @@ 
 	 *
 	 * @return string The link to the post.
 	 */
-	public function post_type_link( $post_link, $post, $leavename, $sample ) {
+	public function post_type_link($post_link, $post, $leavename, $sample) {
 
 		// Return the post link if this is not our post type.
-		if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
+		if ( ! empty($this->slug) || $this->entity_type_service->get_post_type() !== get_post_type($post)) {
 			return $post_link;
 		}
 
 		// Replace /slug/post_name/ with /post_name/
 		// The slug comes from the Entity Type Service since that service is responsible for registering the default
 		// slug.
-		return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
+		return str_replace("/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link);
 	}
 
 	/**
@@ -102,10 +102,10 @@ 
 	 *
 	 * @param WP_Query $query
 	 */
-	public function pre_get_posts( $query ) {
+	public function pre_get_posts($query) {
 
 		// If a slug has been set, we don't need to alter the query.
-		if ( ! empty( $this->slug ) ) {
+		if ( ! empty($this->slug)) {
 			return;
 		}
 
@@ -114,15 +114,15 @@ 
 		// The `$query->query` count could be > 2 if the preview parameter is passed too.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/439
-		if ( ! $query->is_main_query() || 2 > count( $query->query ) || ! isset( $query->query['page'] ) || empty( $query->query['name'] ) ) {
+		if ( ! $query->is_main_query() || 2 > count($query->query) || ! isset($query->query['page']) || empty($query->query['name'])) {
 			return;
 		}
 
 		// Add our own post type to the query.
-		$post_types = '' === $query->get( 'post_type' )
+		$post_types = '' === $query->get('post_type')
 			? $this->get_default_post_types()
-			: array_merge( (array) $query->get( 'post_type' ), (array) $this->entity_type_service->get_post_type() );
-		$query->set( 'post_type', $post_types );
+			: array_merge((array) $query->get('post_type'), (array) $this->entity_type_service->get_post_type());
+		$query->set('post_type', $post_types);
 
 	}
 
@@ -146,7 +146,7 @@ 
 	 *
 	 * @return bool Whether the slug is bad.
 	 */
-	public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
+	public function wp_unique_post_slug_is_bad_flat_slug($bad_slug, $slug, $post_type) {
 
 		// The list of post types that might have conflicting slugs.
 		$post_types = array(
@@ -156,13 +156,13 @@ 
 		);
 
 		// Ignore post types different from the ones we need to check.
-		if ( ! in_array( $post_type, $post_types ) ) {
+		if ( ! in_array($post_type, $post_types)) {
 			return $bad_slug;
 		}
 
-		$exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
+		$exists = $this->slug_exists($slug, array_diff($post_types, array($post_type)));
 
-		$this->log->debug( "Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: " . ( $exists ? "yes" : "no" ) . " ]" );
+		$this->log->debug("Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: ".($exists ? "yes" : "no")." ]");
 
 		return $exists;
 	}
@@ -179,17 +179,17 @@ 
 	 *
 	 * @return bool Whether the slug is bad.
 	 */
-	public function wp_unique_post_slug_is_bad_hierarchical_slug( $bad_slug, $slug, $post_type, $post_parent ) {
+	public function wp_unique_post_slug_is_bad_hierarchical_slug($bad_slug, $slug, $post_type, $post_parent) {
 
 		// We only care about pages here.
-		if ( 'page' !== $post_type ) {
+		if ('page' !== $post_type) {
 			return $bad_slug;
 		}
 
 		// We redirect the call to the flat hook, this means that this check is going to solve also the 6-years old issue
 		// about overlapping slugs among pages and posts:
 		//  https://core.trac.wordpress.org/ticket/13459
-		return $this->wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type );
+		return $this->wp_unique_post_slug_is_bad_flat_slug($bad_slug, $slug, $post_type);
 	}
 
 	/**
@@ -202,13 +202,13 @@ 
 	 *
 	 * @return bool True if the slug exists, otherwise false.
 	 */
-	private function slug_exists( $slug, $post_types ) {
+	private function slug_exists($slug, $post_types) {
 		global $wpdb;
 
 		// Post slugs must be unique across all posts.
-		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('" . implode( "', '", array_map( 'esc_sql', $post_types ) ) . "') LIMIT 1";
+		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('".implode("', '", array_map('esc_sql', $post_types))."') LIMIT 1";
 
-		return null !== $wpdb->get_var( $wpdb->prepare( $check_sql, $slug ) );
+		return null !== $wpdb->get_var($wpdb->prepare($check_sql, $slug));
 	}
 
 }

src/wordlift_redlink.php

Indentation +38 added lines, -38 removed lines

@@ -18,54 +18,54 @@
  */
 function rl_execute_sparql_update_query( $query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
 
-	if ( get_transient( 'DISABLE_ENTITY_PUSH' ) ) {
-		return true;
-	}
+    if ( get_transient( 'DISABLE_ENTITY_PUSH' ) ) {
+        return true;
+    }
 
-	// Queue the update query.
-	if ( $queue ) {
+    // Queue the update query.
+    if ( $queue ) {
 
-		Wordlift_Sparql_Service::get_instance()->queue( $query );
+        Wordlift_Sparql_Service::get_instance()->queue( $query );
 
-		return true;
-	}
+        return true;
+    }
 
-	// Get the update end-point.
-	$url = wl_configuration_get_query_update_url();
+    // Get the update end-point.
+    $url = wl_configuration_get_query_update_url();
 
-	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
-		'method'  => 'POST',
-		'headers' => array(
-			'Accept'       => 'application/json',
-			'Content-type' => 'application/sparql-update; charset=utf-8',
-		),
-		'body'    => $query,
-	) );
+    // Prepare the request.
+    $args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+        'method'  => 'POST',
+        'headers' => array(
+            'Accept'       => 'application/json',
+            'Content-type' => 'application/sparql-update; charset=utf-8',
+        ),
+        'body'    => $query,
+    ) );
 
-	// Send the request.
-	$response = wp_remote_post( $url, $args );
+    // Send the request.
+    $response = wp_remote_post( $url, $args );
 
-	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+    // If an error has been raised, return the error.
+    if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+        $body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
 
-		wl_write_log( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+        wl_write_log( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
+        wl_write_log( "\n" . var_export( $args, true ) );
+        wl_write_log( "[ response :: " );
+        wl_write_log( "\n" . var_export( $response, true ) );
+        wl_write_log( "][ body :: " );
+        wl_write_log( "\n" . $body );
+        wl_write_log( "]" );
 
-		return false;
-	}
+        return false;
+    }
 
-	if ( WP_DEBUG ) {
-		global $wl_logger;
-		$wl_logger->trace( "Query executed successfully [ query :: $query ]" );
-	}
+    if ( WP_DEBUG ) {
+        global $wl_logger;
+        $wl_logger->trace( "Query executed successfully [ query :: $query ]" );
+    }
 
-	return true;
+    return true;
 }

Spacing +18 added lines, -18 removed lines

@@ -16,16 +16,16 @@ 
  *
  * @return bool True if successful otherwise false.
  */
-function rl_execute_sparql_update_query( $query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+function rl_execute_sparql_update_query($query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING) {
 
-	if ( get_transient( 'DISABLE_ENTITY_PUSH' ) ) {
+	if (get_transient('DISABLE_ENTITY_PUSH')) {
 		return true;
 	}
 
 	// Queue the update query.
-	if ( $queue ) {
+	if ($queue) {
 
-		Wordlift_Sparql_Service::get_instance()->queue( $query );
+		Wordlift_Sparql_Service::get_instance()->queue($query);
 
 		return true;
 	}
@@ -34,37 +34,37 @@ 
 	$url = wl_configuration_get_query_update_url();
 
 	// Prepare the request.
-	$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',
 			'Content-type' => 'application/sparql-update; charset=utf-8',
 		),
 		'body'    => $query,
-	) );
+	));
 
 	// Send the request.
-	$response = wp_remote_post( $url, $args );
+	$response = wp_remote_post($url, $args);
 
 	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+	if (is_wp_error($response) || 200 !== (int) $response['response']['code']) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+		$body = (is_wp_error($response) ? $response->get_error_message() : $response['body']);
 
-		wl_write_log( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+		wl_write_log("rl_execute_sparql_update_query : error [ url :: $url ][ args :: ");
+		wl_write_log("\n".var_export($args, true));
+		wl_write_log("[ response :: ");
+		wl_write_log("\n".var_export($response, true));
+		wl_write_log("][ body :: ");
+		wl_write_log("\n".$body);
+		wl_write_log("]");
 
 		return false;
 	}
 
-	if ( WP_DEBUG ) {
+	if (WP_DEBUG) {
 		global $wl_logger;
-		$wl_logger->trace( "Query executed successfully [ query :: $query ]" );
+		$wl_logger->trace("Query executed successfully [ query :: $query ]");
 	}
 
 	return true;

src/wordlift_constants.php

Spacing +13 added lines, -13 removed lines

@@ -4,36 +4,36 @@ 
  */
 
 // Define the basic options for HTTP calls to REDLINK.
-define( 'WL_REDLINK_API_HTTP_OPTIONS', serialize( array(
+define('WL_REDLINK_API_HTTP_OPTIONS', serialize(array(
 	'timeout'         => 300,
 	'redirection'     => 5,
 	'httpversion'     => '1.1',
 	'blocking'        => true,
 	'cookies'         => array(),
-	'sslverify'       => ( 'false' === getenv( 'WL_SSL_VERIFY_ENABLED' ) ) ? false : true,
-	'sslcertificates' => dirname( __FILE__ ) . '/ssl/ca-bundle.crt',
+	'sslverify'       => ('false' === getenv('WL_SSL_VERIFY_ENABLED')) ? false : true,
+	'sslcertificates' => dirname(__FILE__).'/ssl/ca-bundle.crt',
 	'decompress'      => false,
-) ) );
+)));
 
 // Create a unique ID for this request, useful to hook async HTTP requests.
-define( 'WL_REQUEST_ID', uniqid( true ) );
+define('WL_REQUEST_ID', uniqid(true));
 
 // Set the temporary files folder.
-defined( 'WL_TEMP_DIR' ) || define( 'WL_TEMP_DIR', get_temp_dir() );
+defined('WL_TEMP_DIR') || define('WL_TEMP_DIR', get_temp_dir());
 
-define( 'WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING', 'true' !== getenv( 'WL_DISABLE_SPARQL_UPDATE_QUERIES_BUFFERING' ) );
+define('WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING', 'true' !== getenv('WL_DISABLE_SPARQL_UPDATE_QUERIES_BUFFERING'));
 
 // Define the meta name used to store the entity URL.
-define( 'WL_ENTITY_URL_META_NAME', 'entity_url' );
+define('WL_ENTITY_URL_META_NAME', 'entity_url');
 
 // Max number of recursions when printing microdata
-define( 'WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 3 );
+define('WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 3);
 
 // 3.13.0, we use by default WLS 1.11 which provides us with the new, faster
 // chunked analysis.
-define( 'WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined( 'WORDLIFT_API_URL' ) ? WORDLIFT_API_URL . '/' : 'https://api.wordlift.it/' );
+define('WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined('WORDLIFT_API_URL') ? WORDLIFT_API_URL.'/' : 'https://api.wordlift.it/');
 
-define( 'WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL', 'https://developers.google.com/structured-data/testing-tool/?url=' );
+define('WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL', 'https://developers.google.com/structured-data/testing-tool/?url=');
 
 
 /**
@@ -46,8 +46,8 @@ 
 	$items    = wl_prefixes_list();
 	$prefixes = array();
 
-	foreach ( $items as $item ) {
-		$prefixes[ $item['prefix'] ] = $item['namespace'];
+	foreach ($items as $item) {
+		$prefixes[$item['prefix']] = $item['namespace'];
 	}
 
 	return $prefixes;