insideout10 / wordlift-plugin

src/includes/class-wordlift-http-api.php

Indentation +180 added lines, -180 removed lines

@@ -16,185 +16,185 @@
  */
 class Wordlift_Http_Api {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.3
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create a {@link Wordlift_End_Point} instance.
-	 *
-	 * @since 3.15.3
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		add_action( 'init', array( $this, 'add_rewrite_endpoint' ) );
-		add_action( 'template_redirect', array( $this, 'template_redirect' ) );
-
-		// region SAMPLE ACTIONS.
-		add_action(
-			'admin_post_wl_hello_world',
-			array(
-				$this,
-				'hello_world',
-			)
-		);
-		add_action(
-			'admin_post_nopriv_wl_hello_world',
-			array(
-				$this,
-				'nopriv_hello_world',
-			)
-		);
-		// endregion
-	}
-
-	/**
-	 * Add the `wl-api` rewrite end-point.
-	 *
-	 * @since 3.15.3
-	 */
-	public function add_rewrite_endpoint() {
-
-		add_rewrite_endpoint( 'wl-api', EP_ROOT );
-		$this->ensure_rewrite_rules_are_flushed();
-
-	}
-
-	/**
-	 * Handle `template_redirect` hooks.
-	 *
-	 * @since 3.15.3
-	 */
-	public function template_redirect() {
-
-		global $wp_query;
-
-		if ( ! isset( $wp_query->query_vars['wl-api'] ) ) {
-			$this->log->trace( 'Skipping, not a `wl-api` call.' );
-
-			return;
-		}
-
-		$action = isset( $_REQUEST['action'] ) ? sanitize_text_field( wp_unslash( (string) $_REQUEST['action'] ) ) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$this->do_action( $action );
-
-		exit;
-
-	}
-
-	/**
-	 * Do the requested action.
-	 *
-	 * @param string $action The action to execute.
-	 *
-	 * @since 3.15.3
-	 */
-	private function do_action( $action ) {
-
-		if ( empty( $action ) ) {
-			return;
-		}
-
-		if ( ! wp_validate_auth_cookie( '', 'logged_in' ) ) {
-			/**
-			 * Fires on a non-authenticated admin post request for the given action.
-			 *
-			 * The dynamic portion of the hook name, `$action`, refers to the given
-			 * request action.
-			 *
-			 * @since 2.6.0
-			 */
-			do_action( "admin_post_nopriv_{$action}" );
-		} else {
-			/**
-			 * Fires on an authenticated admin post request for the given action.
-			 *
-			 * The dynamic portion of the hook name, `$action`, refers to the given
-			 * request action.
-			 *
-			 * @since 2.6.0
-			 */
-			do_action( "admin_post_{$action}" );
-		}
-
-	}
-
-	/**
-	 * Test function, anonymous.
-	 *
-	 * @since 3.15.3
-	 */
-	public function nopriv_hello_world() {
-
-		wp_die( 'Hello World! (from anonymous)' );
-
-	}
-
-	/**
-	 * Test function, authenticated.
-	 *
-	 * @since 3.15.3
-	 */
-	public function hello_world() {
-
-		wp_die( 'Hello World! (from authenticated)' );
-
-	}
-
-	/**
-	 * Ensure that the rewrite rules are flushed the first time.
-	 *
-	 * @since 3.16.0 changed the value from 1 to `yes` to avoid type juggling issues.
-	 * @since 3.15.3
-	 */
-	public static function ensure_rewrite_rules_are_flushed() {
-
-		// See https://github.com/insideout10/wordlift-plugin/issues/698.
-		if ( 'yes' !== get_option( 'wl_http_api' ) ) {
-			update_option( 'wl_http_api', 'yes' );
-			add_action(
-				'wp_loaded',
-				function () {
-					flush_rewrite_rules();
-				}
-			);
-		}
-
-	}
-
-	/**
-	 * Called by {@see activate_wordlift}, resets the `wl_http_api` option flag in order to force WordLift to
-	 * reinitialize the `wl-api` route.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
-	 *
-	 * @since 3.19.2
-	 */
-	public static function activate() {
-
-		// Force the plugin to reinitialize the rewrite rules.
-		update_option( 'wl_http_api', 'no' );
-
-	}
-
-	/**
-	 * Delete the option when the plugin is deactivated.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/846
-	 */
-	public static function deactivate() {
-
-		delete_option( 'wl_http_api' );
-
-	}
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.3
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create a {@link Wordlift_End_Point} instance.
+     *
+     * @since 3.15.3
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        add_action( 'init', array( $this, 'add_rewrite_endpoint' ) );
+        add_action( 'template_redirect', array( $this, 'template_redirect' ) );
+
+        // region SAMPLE ACTIONS.
+        add_action(
+            'admin_post_wl_hello_world',
+            array(
+                $this,
+                'hello_world',
+            )
+        );
+        add_action(
+            'admin_post_nopriv_wl_hello_world',
+            array(
+                $this,
+                'nopriv_hello_world',
+            )
+        );
+        // endregion
+    }
+
+    /**
+     * Add the `wl-api` rewrite end-point.
+     *
+     * @since 3.15.3
+     */
+    public function add_rewrite_endpoint() {
+
+        add_rewrite_endpoint( 'wl-api', EP_ROOT );
+        $this->ensure_rewrite_rules_are_flushed();
+
+    }
+
+    /**
+     * Handle `template_redirect` hooks.
+     *
+     * @since 3.15.3
+     */
+    public function template_redirect() {
+
+        global $wp_query;
+
+        if ( ! isset( $wp_query->query_vars['wl-api'] ) ) {
+            $this->log->trace( 'Skipping, not a `wl-api` call.' );
+
+            return;
+        }
+
+        $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( wp_unslash( (string) $_REQUEST['action'] ) ) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $this->do_action( $action );
+
+        exit;
+
+    }
+
+    /**
+     * Do the requested action.
+     *
+     * @param string $action The action to execute.
+     *
+     * @since 3.15.3
+     */
+    private function do_action( $action ) {
+
+        if ( empty( $action ) ) {
+            return;
+        }
+
+        if ( ! wp_validate_auth_cookie( '', 'logged_in' ) ) {
+            /**
+             * Fires on a non-authenticated admin post request for the given action.
+             *
+             * The dynamic portion of the hook name, `$action`, refers to the given
+             * request action.
+             *
+             * @since 2.6.0
+             */
+            do_action( "admin_post_nopriv_{$action}" );
+        } else {
+            /**
+             * Fires on an authenticated admin post request for the given action.
+             *
+             * The dynamic portion of the hook name, `$action`, refers to the given
+             * request action.
+             *
+             * @since 2.6.0
+             */
+            do_action( "admin_post_{$action}" );
+        }
+
+    }
+
+    /**
+     * Test function, anonymous.
+     *
+     * @since 3.15.3
+     */
+    public function nopriv_hello_world() {
+
+        wp_die( 'Hello World! (from anonymous)' );
+
+    }
+
+    /**
+     * Test function, authenticated.
+     *
+     * @since 3.15.3
+     */
+    public function hello_world() {
+
+        wp_die( 'Hello World! (from authenticated)' );
+
+    }
+
+    /**
+     * Ensure that the rewrite rules are flushed the first time.
+     *
+     * @since 3.16.0 changed the value from 1 to `yes` to avoid type juggling issues.
+     * @since 3.15.3
+     */
+    public static function ensure_rewrite_rules_are_flushed() {
+
+        // See https://github.com/insideout10/wordlift-plugin/issues/698.
+        if ( 'yes' !== get_option( 'wl_http_api' ) ) {
+            update_option( 'wl_http_api', 'yes' );
+            add_action(
+                'wp_loaded',
+                function () {
+                    flush_rewrite_rules();
+                }
+            );
+        }
+
+    }
+
+    /**
+     * Called by {@see activate_wordlift}, resets the `wl_http_api` option flag in order to force WordLift to
+     * reinitialize the `wl-api` route.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
+     *
+     * @since 3.19.2
+     */
+    public static function activate() {
+
+        // Force the plugin to reinitialize the rewrite rules.
+        update_option( 'wl_http_api', 'no' );
+
+    }
+
+    /**
+     * Delete the option when the plugin is deactivated.
+     *
+     * @since 3.19.4
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/846
+     */
+    public static function deactivate() {
+
+        delete_option( 'wl_http_api' );
+
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -32,10 +32,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
-		add_action( 'init', array( $this, 'add_rewrite_endpoint' ) );
-		add_action( 'template_redirect', array( $this, 'template_redirect' ) );
+		add_action('init', array($this, 'add_rewrite_endpoint'));
+		add_action('template_redirect', array($this, 'template_redirect'));
 
 		// region SAMPLE ACTIONS.
 		add_action(
@@ -62,7 +62,7 @@ 
 	 */
 	public function add_rewrite_endpoint() {
 
-		add_rewrite_endpoint( 'wl-api', EP_ROOT );
+		add_rewrite_endpoint('wl-api', EP_ROOT);
 		$this->ensure_rewrite_rules_are_flushed();
 
 	}
@@ -76,14 +76,14 @@ 
 
 		global $wp_query;
 
-		if ( ! isset( $wp_query->query_vars['wl-api'] ) ) {
-			$this->log->trace( 'Skipping, not a `wl-api` call.' );
+		if ( ! isset($wp_query->query_vars['wl-api'])) {
+			$this->log->trace('Skipping, not a `wl-api` call.');
 
 			return;
 		}
 
-		$action = isset( $_REQUEST['action'] ) ? sanitize_text_field( wp_unslash( (string) $_REQUEST['action'] ) ) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$this->do_action( $action );
+		$action = isset($_REQUEST['action']) ? sanitize_text_field(wp_unslash((string) $_REQUEST['action'])) : ''; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$this->do_action($action);
 
 		exit;
 
@@ -96,13 +96,13 @@ 
 	 *
 	 * @since 3.15.3
 	 */
-	private function do_action( $action ) {
+	private function do_action($action) {
 
-		if ( empty( $action ) ) {
+		if (empty($action)) {
 			return;
 		}
 
-		if ( ! wp_validate_auth_cookie( '', 'logged_in' ) ) {
+		if ( ! wp_validate_auth_cookie('', 'logged_in')) {
 			/**
 			 * Fires on a non-authenticated admin post request for the given action.
 			 *
@@ -111,7 +111,7 @@ 
 			 *
 			 * @since 2.6.0
 			 */
-			do_action( "admin_post_nopriv_{$action}" );
+			do_action("admin_post_nopriv_{$action}");
 		} else {
 			/**
 			 * Fires on an authenticated admin post request for the given action.
@@ -121,7 +121,7 @@ 
 			 *
 			 * @since 2.6.0
 			 */
-			do_action( "admin_post_{$action}" );
+			do_action("admin_post_{$action}");
 		}
 
 	}
@@ -133,7 +133,7 @@ 
 	 */
 	public function nopriv_hello_world() {
 
-		wp_die( 'Hello World! (from anonymous)' );
+		wp_die('Hello World! (from anonymous)');
 
 	}
 
@@ -144,7 +144,7 @@ 
 	 */
 	public function hello_world() {
 
-		wp_die( 'Hello World! (from authenticated)' );
+		wp_die('Hello World! (from authenticated)');
 
 	}
 
@@ -157,11 +157,11 @@ 
 	public static function ensure_rewrite_rules_are_flushed() {
 
 		// See https://github.com/insideout10/wordlift-plugin/issues/698.
-		if ( 'yes' !== get_option( 'wl_http_api' ) ) {
-			update_option( 'wl_http_api', 'yes' );
+		if ('yes' !== get_option('wl_http_api')) {
+			update_option('wl_http_api', 'yes');
 			add_action(
 				'wp_loaded',
-				function () {
+				function() {
 					flush_rewrite_rules();
 				}
 			);
@@ -180,7 +180,7 @@ 
 	public static function activate() {
 
 		// Force the plugin to reinitialize the rewrite rules.
-		update_option( 'wl_http_api', 'no' );
+		update_option('wl_http_api', 'no');
 
 	}
 
@@ -193,7 +193,7 @@ 
 	 */
 	public static function deactivate() {
 
-		delete_option( 'wl_http_api' );
+		delete_option('wl_http_api');
 
 	}
 

src/includes/mapping/class-wordlift-mapping-ajax-adapter.php

Indentation +54 added lines, -54 removed lines

@@ -8,80 +8,80 @@
 
 class Wordlift_Mapping_Ajax_Adapter {
 
-	/**
-	 * The {@link Wordlift_Mapping_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Mapping_Service $mapping_service The {@link Wordlift_Mapping_Service} instance.
-	 */
-	private $mapping_service;
+    /**
+     * The {@link Wordlift_Mapping_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Mapping_Service $mapping_service The {@link Wordlift_Mapping_Service} instance.
+     */
+    private $mapping_service;
 
-	/**
-	 * Create a {@link Wordlift_Mapping_Ajax_Adapter} instance.
-	 *
-	 * @param Wordlift_Mapping_Service $mapping_service The {@link Wordlift_Mapping_Service} instance.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct( $mapping_service ) {
+    /**
+     * Create a {@link Wordlift_Mapping_Ajax_Adapter} instance.
+     *
+     * @param Wordlift_Mapping_Service $mapping_service The {@link Wordlift_Mapping_Service} instance.
+     *
+     * @since 3.20.0
+     */
+    public function __construct( $mapping_service ) {
 
-		$this->mapping_service = $mapping_service;
+        $this->mapping_service = $mapping_service;
 
-		add_action( 'wp_ajax_wl_set_entity_types_for_post_type', array( $this, 'set_entity_types_for_post_type' ) );
-		add_action( 'wp_ajax_wl_update_post_type_entity_types', array( $this, 'update_post_type_entity_types' ) );
+        add_action( 'wp_ajax_wl_set_entity_types_for_post_type', array( $this, 'set_entity_types_for_post_type' ) );
+        add_action( 'wp_ajax_wl_update_post_type_entity_types', array( $this, 'update_post_type_entity_types' ) );
 
-	}
+    }
 
-	public function set_entity_types_for_post_type() {
+    public function set_entity_types_for_post_type() {
 
-		if ( ! isset( $_REQUEST['post_type'] ) || ! isset( $_REQUEST['entity_types'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			return;
-		}
+        if ( ! isset( $_REQUEST['post_type'] ) || ! isset( $_REQUEST['entity_types'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            return;
+        }
 
-		$post_type    = sanitize_text_field( wp_unslash( $_REQUEST['post_type'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$entity_types = array_map( 'sanitize_text_field', wp_unslash( (array) $_REQUEST['entity_types'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $post_type    = sanitize_text_field( wp_unslash( $_REQUEST['post_type'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $entity_types = array_map( 'sanitize_text_field', wp_unslash( (array) $_REQUEST['entity_types'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
-		$this->mapping_service->set_entity_types_for_post_type( $post_type, $entity_types );
+        $this->mapping_service->set_entity_types_for_post_type( $post_type, $entity_types );
 
-		wp_send_json_success();
+        wp_send_json_success();
 
-	}
+    }
 
-	public function update_post_type_entity_types() {
+    public function update_post_type_entity_types() {
 
-		// If the nonce is invalid, return an error.
-		$nonce = isset( $_REQUEST['_nonce'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['_nonce'] ) ) : '';
-		if ( ! wp_verify_nonce( $nonce, 'update_post_type_entity_types' ) ) {
-			wp_send_json_error( __( 'Nonce Security Check Failed!', 'wordlift' ) );
-		}
+        // If the nonce is invalid, return an error.
+        $nonce = isset( $_REQUEST['_nonce'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['_nonce'] ) ) : '';
+        if ( ! wp_verify_nonce( $nonce, 'update_post_type_entity_types' ) ) {
+            wp_send_json_error( __( 'Nonce Security Check Failed!', 'wordlift' ) );
+        }
 
-		if ( empty( $_REQUEST['post_type'] ) ) {
-			wp_send_json_error( __( '`post_type` is required', 'wordlift' ) );
-		}
+        if ( empty( $_REQUEST['post_type'] ) ) {
+            wp_send_json_error( __( '`post_type` is required', 'wordlift' ) );
+        }
 
-		if ( empty( $_REQUEST['entity_types'] ) ) {
-			wp_send_json_error( __( '`entity_types` is required', 'wordlift' ) );
-		}
+        if ( empty( $_REQUEST['entity_types'] ) ) {
+            wp_send_json_error( __( '`entity_types` is required', 'wordlift' ) );
+        }
 
-		// Get the post type.
-		$post_type = isset( $_REQUEST['post_type'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_type'] ) ) : '';
+        // Get the post type.
+        $post_type = isset( $_REQUEST['post_type'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_type'] ) ) : '';
 
-		// Get the entity types URIs.
-		$entity_types = isset( $_REQUEST['entity_types'] ) ? filter_var( wp_unslash( $_REQUEST['entity_types'] ), FILTER_REQUIRE_ARRAY ) : array();
+        // Get the entity types URIs.
+        $entity_types = isset( $_REQUEST['entity_types'] ) ? filter_var( wp_unslash( $_REQUEST['entity_types'] ), FILTER_REQUIRE_ARRAY ) : array();
 
-		// Get the offset.
-		$offset = isset( $_REQUEST['offset'] ) ? intval( $_REQUEST['offset'] ) : 0;
+        // Get the offset.
+        $offset = isset( $_REQUEST['offset'] ) ? intval( $_REQUEST['offset'] ) : 0;
 
-		// Update and get the results.
-		$result = $this->mapping_service->update( $post_type, $entity_types, $offset );
+        // Update and get the results.
+        $result = $this->mapping_service->update( $post_type, $entity_types, $offset );
 
-		// Add our nonce to the result.
-		$result['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
+        // Add our nonce to the result.
+        $result['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
 
-		// Finally send the results.
-		wp_send_json_success( $result );
+        // Finally send the results.
+        wp_send_json_success( $result );
 
-	}
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -24,25 +24,25 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	public function __construct( $mapping_service ) {
+	public function __construct($mapping_service) {
 
 		$this->mapping_service = $mapping_service;
 
-		add_action( 'wp_ajax_wl_set_entity_types_for_post_type', array( $this, 'set_entity_types_for_post_type' ) );
-		add_action( 'wp_ajax_wl_update_post_type_entity_types', array( $this, 'update_post_type_entity_types' ) );
+		add_action('wp_ajax_wl_set_entity_types_for_post_type', array($this, 'set_entity_types_for_post_type'));
+		add_action('wp_ajax_wl_update_post_type_entity_types', array($this, 'update_post_type_entity_types'));
 
 	}
 
 	public function set_entity_types_for_post_type() {
 
-		if ( ! isset( $_REQUEST['post_type'] ) || ! isset( $_REQUEST['entity_types'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if ( ! isset($_REQUEST['post_type']) || ! isset($_REQUEST['entity_types'])) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return;
 		}
 
-		$post_type    = sanitize_text_field( wp_unslash( $_REQUEST['post_type'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		$entity_types = array_map( 'sanitize_text_field', wp_unslash( (array) $_REQUEST['entity_types'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$post_type    = sanitize_text_field(wp_unslash($_REQUEST['post_type'])); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$entity_types = array_map('sanitize_text_field', wp_unslash((array) $_REQUEST['entity_types'])); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
-		$this->mapping_service->set_entity_types_for_post_type( $post_type, $entity_types );
+		$this->mapping_service->set_entity_types_for_post_type($post_type, $entity_types);
 
 		wp_send_json_success();
 
@@ -51,36 +51,36 @@ 
 	public function update_post_type_entity_types() {
 
 		// If the nonce is invalid, return an error.
-		$nonce = isset( $_REQUEST['_nonce'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['_nonce'] ) ) : '';
-		if ( ! wp_verify_nonce( $nonce, 'update_post_type_entity_types' ) ) {
-			wp_send_json_error( __( 'Nonce Security Check Failed!', 'wordlift' ) );
+		$nonce = isset($_REQUEST['_nonce']) ? sanitize_text_field(wp_unslash($_REQUEST['_nonce'])) : '';
+		if ( ! wp_verify_nonce($nonce, 'update_post_type_entity_types')) {
+			wp_send_json_error(__('Nonce Security Check Failed!', 'wordlift'));
 		}
 
-		if ( empty( $_REQUEST['post_type'] ) ) {
-			wp_send_json_error( __( '`post_type` is required', 'wordlift' ) );
+		if (empty($_REQUEST['post_type'])) {
+			wp_send_json_error(__('`post_type` is required', 'wordlift'));
 		}
 
-		if ( empty( $_REQUEST['entity_types'] ) ) {
-			wp_send_json_error( __( '`entity_types` is required', 'wordlift' ) );
+		if (empty($_REQUEST['entity_types'])) {
+			wp_send_json_error(__('`entity_types` is required', 'wordlift'));
 		}
 
 		// Get the post type.
-		$post_type = isset( $_REQUEST['post_type'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_type'] ) ) : '';
+		$post_type = isset($_REQUEST['post_type']) ? sanitize_text_field(wp_unslash($_REQUEST['post_type'])) : '';
 
 		// Get the entity types URIs.
-		$entity_types = isset( $_REQUEST['entity_types'] ) ? filter_var( wp_unslash( $_REQUEST['entity_types'] ), FILTER_REQUIRE_ARRAY ) : array();
+		$entity_types = isset($_REQUEST['entity_types']) ? filter_var(wp_unslash($_REQUEST['entity_types']), FILTER_REQUIRE_ARRAY) : array();
 
 		// Get the offset.
-		$offset = isset( $_REQUEST['offset'] ) ? intval( $_REQUEST['offset'] ) : 0;
+		$offset = isset($_REQUEST['offset']) ? intval($_REQUEST['offset']) : 0;
 
 		// Update and get the results.
-		$result = $this->mapping_service->update( $post_type, $entity_types, $offset );
+		$result = $this->mapping_service->update($post_type, $entity_types, $offset);
 
 		// Add our nonce to the result.
-		$result['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
+		$result['_nonce'] = wp_create_nonce('update_post_type_entity_types');
 
 		// Finally send the results.
-		wp_send_json_success( $result );
+		wp_send_json_success($result);
 
 	}
 

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

Indentation +218 added lines, -218 removed lines

@@ -14,223 +14,223 @@
  */
 class Wordlift_Mapping_Service {
 
-	/**
-	 * The mapping's options.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var array $options The mapping's options.
-	 */
-	private $options;
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Mapping_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a {@link Wordlift_Mapping_Service} instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	public function __construct( $entity_type_service ) {
-
-		// Set the entity type service instance.
-		$this->entity_type_service = $entity_type_service;
-
-		// Load the options.
-		$this->options = get_option( 'wl_mappings', array() );
-
-		// Hook to `wl_valid_entity_post_types` and to `wl_default_entity_types_for_post_type`.
-		add_filter( 'wl_valid_entity_post_types', array( $this, 'valid_entity_post_types' ), 9 );
-		add_filter(
-			'wl_default_entity_types_for_post_type',
-			array(
-				$this,
-				'default_entity_types_for_post_type',
-			),
-			9,
-			2
-		);
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @return \Wordlift_Mapping_Service The singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Save the options.
-	 *
-	 * @since 3.20.0
-	 */
-	private function save_options() {
-
-		update_option( 'wl_mappings', $this->options, true );
-
-	}
-
-	/**
-	 * Set the default entity types for a post type.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type Post type.
-	 * @param array  $entity_types An array of entity types slugs.
-	 */
-	public function set_entity_types_for_post_type( $post_type, $entity_types ) {
-
-		$this->options[ $post_type ] = $entity_types;
-		$this->save_options();
-
-	}
-
-	/**
-	 * Hook to `wl_valid_entity_post_types` to declare schema.org support for the configured post types.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $post_types The default post types.
-	 *
-	 * @return array The supported post types.
-	 */
-	public function valid_entity_post_types( $post_types ) {
-
-		return array_merge( $post_types, array_keys( $this->options ) );
-	}
-
-	/**
-	 * Hook to `wl_default_entity_types_for_post_type` to declare the entity types for a post type.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array  $default The default entity types.
-	 * @param string $post_type The post type.
-	 *
-	 * @return array The default entity types.
-	 */
-	public function default_entity_types_for_post_type( $default, $post_type ) {
-
-		return isset( $this->options[ $post_type ] ) ? $this->options[ $post_type ] : $default;
-	}
-
-	/**
-	 * Update the post type with the entity types, starting at the specified offset.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type The post type.
-	 * @param array  $entity_types The entity types.
-	 * @param int    $offset The offset (0 by default).
-	 *
-	 * @return array {
-	 * The result array.
-	 *
-	 * @type int     $current The current offset.
-	 * @type int     $next The next offset.
-	 * @type int     $count The total element count.
-	 * }
-	 */
-	public function update( $post_type, $entity_types, $offset = 0 ) {
-
-		$entity_type_service = $this->entity_type_service;
-		$tax_query           = $this->get_tax_query( $entity_types );
-
-		return Wordlift_Batch_Action::process(
-			$post_type,
-			$offset,
-			$tax_query,
-			function ( $post_id ) use ( $entity_type_service, $entity_types ) {
-				foreach ( $entity_types as $entity_type ) {
-					$entity_type_service->set( $post_id, $entity_type, false );
-				}
-			}
-		);
-	}
-
-	/**
-	 * Count the number of posts that need to be assigned with the entity types.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type The post type.
-	 * @param array  $entity_types An array of entity types.
-	 *
-	 * @return int The number of posts to be assigned with entity types.
-	 */
-	public function count( $post_type, $entity_types ) {
-
-		$tax_query = $this->get_tax_query( $entity_types );
-
-		return Wordlift_Batch_Action::count( $post_type, $tax_query );
-	}
-
-	/**
-	 * Get the taxonomy query for the specified entity types.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $entity_types The entity types.
-	 *
-	 * @return array The tax query.
-	 */
-	private function get_tax_query( $entity_types ) {
-
-		$entity_type_service = $this->entity_type_service;
-		$entity_types_terms  = array_filter(
-			array_map(
-				function ( $item ) use ( $entity_type_service ) {
-					return $entity_type_service->get_term_by_uri( $item );
-				},
-				$entity_types
-			)
-		);
-
-		$entity_types_terms_ids = array_map(
-			function ( $term ) {
-				return $term->term_id;
-			},
-			$entity_types_terms
-		);
-
-		$tax_query = array(
-			'tax_query' => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'term_id',
-					'terms'    => $entity_types_terms_ids,
-					'operator' => 'NOT IN',
-				),
-			),
-		);
-
-		return $tax_query;
-	}
+    /**
+     * The mapping's options.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var array $options The mapping's options.
+     */
+    private $options;
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The singleton instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Mapping_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a {@link Wordlift_Mapping_Service} instance.
+     *
+     * @since 3.20.0
+     *
+     * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    public function __construct( $entity_type_service ) {
+
+        // Set the entity type service instance.
+        $this->entity_type_service = $entity_type_service;
+
+        // Load the options.
+        $this->options = get_option( 'wl_mappings', array() );
+
+        // Hook to `wl_valid_entity_post_types` and to `wl_default_entity_types_for_post_type`.
+        add_filter( 'wl_valid_entity_post_types', array( $this, 'valid_entity_post_types' ), 9 );
+        add_filter(
+            'wl_default_entity_types_for_post_type',
+            array(
+                $this,
+                'default_entity_types_for_post_type',
+            ),
+            9,
+            2
+        );
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.20.0
+     *
+     * @return \Wordlift_Mapping_Service The singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Save the options.
+     *
+     * @since 3.20.0
+     */
+    private function save_options() {
+
+        update_option( 'wl_mappings', $this->options, true );
+
+    }
+
+    /**
+     * Set the default entity types for a post type.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type Post type.
+     * @param array  $entity_types An array of entity types slugs.
+     */
+    public function set_entity_types_for_post_type( $post_type, $entity_types ) {
+
+        $this->options[ $post_type ] = $entity_types;
+        $this->save_options();
+
+    }
+
+    /**
+     * Hook to `wl_valid_entity_post_types` to declare schema.org support for the configured post types.
+     *
+     * @since 3.20.0
+     *
+     * @param array $post_types The default post types.
+     *
+     * @return array The supported post types.
+     */
+    public function valid_entity_post_types( $post_types ) {
+
+        return array_merge( $post_types, array_keys( $this->options ) );
+    }
+
+    /**
+     * Hook to `wl_default_entity_types_for_post_type` to declare the entity types for a post type.
+     *
+     * @since 3.20.0
+     *
+     * @param array  $default The default entity types.
+     * @param string $post_type The post type.
+     *
+     * @return array The default entity types.
+     */
+    public function default_entity_types_for_post_type( $default, $post_type ) {
+
+        return isset( $this->options[ $post_type ] ) ? $this->options[ $post_type ] : $default;
+    }
+
+    /**
+     * Update the post type with the entity types, starting at the specified offset.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type The post type.
+     * @param array  $entity_types The entity types.
+     * @param int    $offset The offset (0 by default).
+     *
+     * @return array {
+     * The result array.
+     *
+     * @type int     $current The current offset.
+     * @type int     $next The next offset.
+     * @type int     $count The total element count.
+     * }
+     */
+    public function update( $post_type, $entity_types, $offset = 0 ) {
+
+        $entity_type_service = $this->entity_type_service;
+        $tax_query           = $this->get_tax_query( $entity_types );
+
+        return Wordlift_Batch_Action::process(
+            $post_type,
+            $offset,
+            $tax_query,
+            function ( $post_id ) use ( $entity_type_service, $entity_types ) {
+                foreach ( $entity_types as $entity_type ) {
+                    $entity_type_service->set( $post_id, $entity_type, false );
+                }
+            }
+        );
+    }
+
+    /**
+     * Count the number of posts that need to be assigned with the entity types.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type The post type.
+     * @param array  $entity_types An array of entity types.
+     *
+     * @return int The number of posts to be assigned with entity types.
+     */
+    public function count( $post_type, $entity_types ) {
+
+        $tax_query = $this->get_tax_query( $entity_types );
+
+        return Wordlift_Batch_Action::count( $post_type, $tax_query );
+    }
+
+    /**
+     * Get the taxonomy query for the specified entity types.
+     *
+     * @since 3.20.0
+     *
+     * @param array $entity_types The entity types.
+     *
+     * @return array The tax query.
+     */
+    private function get_tax_query( $entity_types ) {
+
+        $entity_type_service = $this->entity_type_service;
+        $entity_types_terms  = array_filter(
+            array_map(
+                function ( $item ) use ( $entity_type_service ) {
+                    return $entity_type_service->get_term_by_uri( $item );
+                },
+                $entity_types
+            )
+        );
+
+        $entity_types_terms_ids = array_map(
+            function ( $term ) {
+                return $term->term_id;
+            },
+            $entity_types_terms
+        );
+
+        $tax_query = array(
+            'tax_query' => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'term_id',
+                    'terms'    => $entity_types_terms_ids,
+                    'operator' => 'NOT IN',
+                ),
+            ),
+        );
+
+        return $tax_query;
+    }
 
 }

Spacing +22 added lines, -22 removed lines

@@ -48,16 +48,16 @@ 
 	 *
 	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
 	 */
-	public function __construct( $entity_type_service ) {
+	public function __construct($entity_type_service) {
 
 		// Set the entity type service instance.
 		$this->entity_type_service = $entity_type_service;
 
 		// Load the options.
-		$this->options = get_option( 'wl_mappings', array() );
+		$this->options = get_option('wl_mappings', array());
 
 		// Hook to `wl_valid_entity_post_types` and to `wl_default_entity_types_for_post_type`.
-		add_filter( 'wl_valid_entity_post_types', array( $this, 'valid_entity_post_types' ), 9 );
+		add_filter('wl_valid_entity_post_types', array($this, 'valid_entity_post_types'), 9);
 		add_filter(
 			'wl_default_entity_types_for_post_type',
 			array(
@@ -92,7 +92,7 @@ 
 	 */
 	private function save_options() {
 
-		update_option( 'wl_mappings', $this->options, true );
+		update_option('wl_mappings', $this->options, true);
 
 	}
 
@@ -104,9 +104,9 @@ 
 	 * @param string $post_type Post type.
 	 * @param array  $entity_types An array of entity types slugs.
 	 */
-	public function set_entity_types_for_post_type( $post_type, $entity_types ) {
+	public function set_entity_types_for_post_type($post_type, $entity_types) {
 
-		$this->options[ $post_type ] = $entity_types;
+		$this->options[$post_type] = $entity_types;
 		$this->save_options();
 
 	}
@@ -120,9 +120,9 @@ 
 	 *
 	 * @return array The supported post types.
 	 */
-	public function valid_entity_post_types( $post_types ) {
+	public function valid_entity_post_types($post_types) {
 
-		return array_merge( $post_types, array_keys( $this->options ) );
+		return array_merge($post_types, array_keys($this->options));
 	}
 
 	/**
@@ -135,9 +135,9 @@ 
 	 *
 	 * @return array The default entity types.
 	 */
-	public function default_entity_types_for_post_type( $default, $post_type ) {
+	public function default_entity_types_for_post_type($default, $post_type) {
 
-		return isset( $this->options[ $post_type ] ) ? $this->options[ $post_type ] : $default;
+		return isset($this->options[$post_type]) ? $this->options[$post_type] : $default;
 	}
 
 	/**
@@ -157,18 +157,18 @@ 
 	 * @type int     $count The total element count.
 	 * }
 	 */
-	public function update( $post_type, $entity_types, $offset = 0 ) {
+	public function update($post_type, $entity_types, $offset = 0) {
 
 		$entity_type_service = $this->entity_type_service;
-		$tax_query           = $this->get_tax_query( $entity_types );
+		$tax_query           = $this->get_tax_query($entity_types);
 
 		return Wordlift_Batch_Action::process(
 			$post_type,
 			$offset,
 			$tax_query,
-			function ( $post_id ) use ( $entity_type_service, $entity_types ) {
-				foreach ( $entity_types as $entity_type ) {
-					$entity_type_service->set( $post_id, $entity_type, false );
+			function($post_id) use ($entity_type_service, $entity_types) {
+				foreach ($entity_types as $entity_type) {
+					$entity_type_service->set($post_id, $entity_type, false);
 				}
 			}
 		);
@@ -184,11 +184,11 @@ 
 	 *
 	 * @return int The number of posts to be assigned with entity types.
 	 */
-	public function count( $post_type, $entity_types ) {
+	public function count($post_type, $entity_types) {
 
-		$tax_query = $this->get_tax_query( $entity_types );
+		$tax_query = $this->get_tax_query($entity_types);
 
-		return Wordlift_Batch_Action::count( $post_type, $tax_query );
+		return Wordlift_Batch_Action::count($post_type, $tax_query);
 	}
 
 	/**
@@ -200,20 +200,20 @@ 
 	 *
 	 * @return array The tax query.
 	 */
-	private function get_tax_query( $entity_types ) {
+	private function get_tax_query($entity_types) {
 
 		$entity_type_service = $this->entity_type_service;
 		$entity_types_terms  = array_filter(
 			array_map(
-				function ( $item ) use ( $entity_type_service ) {
-					return $entity_type_service->get_term_by_uri( $item );
+				function($item) use ($entity_type_service) {
+					return $entity_type_service->get_term_by_uri($item);
 				},
 				$entity_types
 			)
 		);
 
 		$entity_types_terms_ids = array_map(
-			function ( $term ) {
+			function($term) {
 				return $term->term_id;
 			},
 			$entity_types_terms

src/includes/class-wordlift-post-adapter.php

Indentation +248 added lines, -248 removed lines

@@ -19,258 +19,258 @@
  */
 class Wordlift_Post_Adapter {
 
-	/**
-	 * The post id to which the adopter relates.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @var integer $post_id .
-	 */
-	private $post_id;
-
-	const TYPE_ENTITY_LINK = 0;
-	const TYPE_TERM_LINK   = 1;
-
-	/**
-	 * Create the {@link Wordlift_Post_Adatpter} instance.
-	 *
-	 * @param integer $post_id the post ID of the post the adopter relates to.
-	 *
-	 * @since 3.14.0
-	 */
-	public function __construct( $post_id ) {
-
-		$this->post_id = $post_id;
-
-	}
-
-	/**
-	 * Get the word count of the post content.
-	 *
-	 * The count is calculated over the post content after stripping shortcodes and html tags.
-	 *
-	 * @return integer the number of words in the content after stripping shortcodes and html tags..
-	 * @since 3.14.0
-	 */
-	public function word_count() {
-
-		$post = get_post( $this->post_id );
-
-		/*
+    /**
+     * The post id to which the adopter relates.
+     *
+     * @since 3.14.0
+     *
+     * @var integer $post_id .
+     */
+    private $post_id;
+
+    const TYPE_ENTITY_LINK = 0;
+    const TYPE_TERM_LINK   = 1;
+
+    /**
+     * Create the {@link Wordlift_Post_Adatpter} instance.
+     *
+     * @param integer $post_id the post ID of the post the adopter relates to.
+     *
+     * @since 3.14.0
+     */
+    public function __construct( $post_id ) {
+
+        $this->post_id = $post_id;
+
+    }
+
+    /**
+     * Get the word count of the post content.
+     *
+     * The count is calculated over the post content after stripping shortcodes and html tags.
+     *
+     * @return integer the number of words in the content after stripping shortcodes and html tags..
+     * @since 3.14.0
+     */
+    public function word_count() {
+
+        $post = get_post( $this->post_id );
+
+        /*
 		 * Apply the `wl_post_content` filter, in case 3rd parties want to change the post content, e.g.
 		 * because the content is written elsewhere.
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-
-		return self::str_word_count_utf8( wp_strip_all_tags( strip_shortcodes( $post_content ) ) );
-	}
-
-	/**
-	 * Count words in the string, taking into account UTF-8 characters.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/884
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $str The target string.
-	 *
-	 * @return int The number of words.
-	 */
-	private static function str_word_count_utf8( $str ) {
-
-		$words = preg_split( '~[^\p{L}\p{N}\']+~u', $str );
-
-		return $words ? count( $words ) : 0;
-	}
-
-	/**
-	 * Get the {@link WP_Post} permalink allowing 3rd parties to alter the URL.
-	 *
-	 * @param int $post_id Post ID.
-	 *
-	 * @return string The post permalink.
-	 * @since 3.20.0
-	 */
-	public static function get_production_permalink( $post_id, $object_type = Object_Type_Enum::POST ) {
-
-		$object_link_service = Object_Link_Provider::get_instance();
-		$permalink           = $object_link_service->get_permalink( $post_id, $object_type );
-
-		/**
-		 * WordPress 4.4 doesn't support meta queries for terms, therefore we only support post permalinks here.
-		 *
-		 * Later on for WordPress 4.5+ we look for terms bound to the entity and we use the term link instead of the
-		 * post permalink if we find them.
-		 */
-		global $wp_version;
-		if ( version_compare( $wp_version, '4.5', '<' ) ) {
-			return apply_filters( 'wl_production_permalink', $permalink, $post_id, self::TYPE_ENTITY_LINK, null );
-		}
-
-		/**
-		 * The `wl_production_permalink` filter allows to change the permalink, this is useful in contexts
-		 * when the production environment is copied over from a staging environment with staging
-		 * URLs.
-		 *
-		 * @param string $permalink_url The default permalink.
-		 * @param int $post_id The post id.
-		 *
-		 * @since 3.23.0 we check whether the entity is bound to a term and, in that case, we link to the term.
-		 * @since 3.20.0
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/850
-		 */
-
-		$uris = $object_link_service->get_same_as_uris(
-			$post_id,
-			$object_type
-		);
-
-		// Only try to link a term if `WL_ENABLE_TERM_LINKING` is enabled.
-		$terms = array();
-		if ( defined( 'WL_ENABLE_TERM_LINKING' ) && WL_ENABLE_TERM_LINKING ) {
-			// Try to find one term matching the entity.
-			$terms = get_terms(
-				array(
-					'number'                 => 1,
-					'hide_empty'             => false,
-					'update_term_meta_cache' => false,
-					'meta_key'               => '_wl_entity_id',
-					'meta_value'             => $uris,
-					'meta_compare'           => 'IN',
-				)
-			);
-		}
-
-		$type = self::TYPE_ENTITY_LINK;
-		$term = null;
-		// If found use the term link, otherwise the permalink.
-		if ( 1 === count( $terms ) ) {
-			$term      = current( $terms );
-			$permalink = get_term_link( $term );
-			$type      = self::TYPE_TERM_LINK;
-		}
-
-		/**
-		 * Apply the `wl_production_permalink` filter.
-		 *
-		 * @param string $permalink The permalink.
-		 * @param int $post_id The post id.
-		 * @param int $type The permalink type: 0 = entity permalink, 1 = term link.
-		 * @param WP_Term $term The term if type is term link, otherwise null.
-		 *
-		 * @since 3.23.0 add the permalink type and term parameters.
-		 */
-		return apply_filters( 'wl_production_permalink', $permalink, $post_id, $type, $term );
-	}
-
-	/**
-	 * Get comma separated tags to be used as keywords
-	 *
-	 * @return string|void Comma separated tags
-	 *
-	 * @since 3.27.2
-	 */
-	public function keywords() {
-		$tags = get_the_tags( $this->post_id );
-
-		if ( empty( $tags ) ) {
-			return;
-		}
-
-		return implode(
-			',',
-			array_map(
-				function ( $tag ) {
-					return $tag->name;
-				},
-				$tags
-			)
-		);
-	}
-
-	/**
-	 * Get comma separated categories to be used as article section
-	 *
-	 * @return string[] Comma separated categories
-	 *
-	 * @since 3.27.2
-	 */
-	public function article_section() {
-		$categories = get_the_category( $this->post_id );
-
-		return wp_list_pluck( $categories, 'cat_name' );
-	}
-
-	/**
-	 * Get comment count
-	 *
-	 * @return string|void Comment count
-	 *
-	 * @since 3.27.2
-	 */
-	public function comment_count() {
-		return get_comments_number( $this->post_id );
-	}
-
-	/**
-	 * Get Language
-	 * Try WPML, Polylang for post specific languages, else fallback on get_locale()
-	 *
-	 * @return string|void Language code (locale)
-	 *
-	 * @since 3.27.2
-	 */
-	public function locale() {
-		$language = 'en-US';
-
-		if ( function_exists( 'wpml_get_language_information' ) ) {
-			// WPML handling
-			// WPML: Updated function signature.
-			// function wpml_get_language_information( $empty_value = null, $post_id = null )
-			$post_language = wpml_get_language_information( null, $this->post_id );
-			if ( ! $post_language instanceof WP_Error ) {
-				$language = $post_language['locale'];
-			}
-		} elseif ( function_exists( 'pll_get_post_language' ) ) {
-			// Polylang handling
-			$language = pll_get_post_language( $this->post_id, 'locale' );
-		} else {
-			$language = get_locale();
-		}
-
-		return str_replace( '_', '-', $language );
-	}
-
-	/**
-	 * Add mentions to an article.
-	 * To add mentions we just push the referenced entities to mentions.
-	 *
-	 * @param $post_id int
-	 * @param $references int[]
-	 */
-	public function add_references( $post_id, &$references ) {
-		$tags = get_the_tags( $post_id );
-
-		if ( $tags && ! is_wp_error( $tags ) ) {
-			// Loop through the tags and push it to references.
-			foreach ( $tags as $tag ) {
-				/**
-				 * @var $tag WP_Term
-				 */
-				$entity_uris = get_term_meta( $tag->term_id, '_wl_entity_id' );
-				foreach ( $entity_uris as $uri ) {
-					$referenced_entity = Wordlift_Entity_Uri_Service::get_instance()->get_entity( $uri );
-					if ( $referenced_entity instanceof WP_Post ) {
-						// push the referenced entities to references.
-						$references[] = $referenced_entity->ID;
-					}
-				}
-			}
-		}
-
-	}
+        $post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+
+        return self::str_word_count_utf8( wp_strip_all_tags( strip_shortcodes( $post_content ) ) );
+    }
+
+    /**
+     * Count words in the string, taking into account UTF-8 characters.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/884
+     *
+     * @since 3.20.0
+     *
+     * @param string $str The target string.
+     *
+     * @return int The number of words.
+     */
+    private static function str_word_count_utf8( $str ) {
+
+        $words = preg_split( '~[^\p{L}\p{N}\']+~u', $str );
+
+        return $words ? count( $words ) : 0;
+    }
+
+    /**
+     * Get the {@link WP_Post} permalink allowing 3rd parties to alter the URL.
+     *
+     * @param int $post_id Post ID.
+     *
+     * @return string The post permalink.
+     * @since 3.20.0
+     */
+    public static function get_production_permalink( $post_id, $object_type = Object_Type_Enum::POST ) {
+
+        $object_link_service = Object_Link_Provider::get_instance();
+        $permalink           = $object_link_service->get_permalink( $post_id, $object_type );
+
+        /**
+         * WordPress 4.4 doesn't support meta queries for terms, therefore we only support post permalinks here.
+         *
+         * Later on for WordPress 4.5+ we look for terms bound to the entity and we use the term link instead of the
+         * post permalink if we find them.
+         */
+        global $wp_version;
+        if ( version_compare( $wp_version, '4.5', '<' ) ) {
+            return apply_filters( 'wl_production_permalink', $permalink, $post_id, self::TYPE_ENTITY_LINK, null );
+        }
+
+        /**
+         * The `wl_production_permalink` filter allows to change the permalink, this is useful in contexts
+         * when the production environment is copied over from a staging environment with staging
+         * URLs.
+         *
+         * @param string $permalink_url The default permalink.
+         * @param int $post_id The post id.
+         *
+         * @since 3.23.0 we check whether the entity is bound to a term and, in that case, we link to the term.
+         * @since 3.20.0
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/850
+         */
+
+        $uris = $object_link_service->get_same_as_uris(
+            $post_id,
+            $object_type
+        );
+
+        // Only try to link a term if `WL_ENABLE_TERM_LINKING` is enabled.
+        $terms = array();
+        if ( defined( 'WL_ENABLE_TERM_LINKING' ) && WL_ENABLE_TERM_LINKING ) {
+            // Try to find one term matching the entity.
+            $terms = get_terms(
+                array(
+                    'number'                 => 1,
+                    'hide_empty'             => false,
+                    'update_term_meta_cache' => false,
+                    'meta_key'               => '_wl_entity_id',
+                    'meta_value'             => $uris,
+                    'meta_compare'           => 'IN',
+                )
+            );
+        }
+
+        $type = self::TYPE_ENTITY_LINK;
+        $term = null;
+        // If found use the term link, otherwise the permalink.
+        if ( 1 === count( $terms ) ) {
+            $term      = current( $terms );
+            $permalink = get_term_link( $term );
+            $type      = self::TYPE_TERM_LINK;
+        }
+
+        /**
+         * Apply the `wl_production_permalink` filter.
+         *
+         * @param string $permalink The permalink.
+         * @param int $post_id The post id.
+         * @param int $type The permalink type: 0 = entity permalink, 1 = term link.
+         * @param WP_Term $term The term if type is term link, otherwise null.
+         *
+         * @since 3.23.0 add the permalink type and term parameters.
+         */
+        return apply_filters( 'wl_production_permalink', $permalink, $post_id, $type, $term );
+    }
+
+    /**
+     * Get comma separated tags to be used as keywords
+     *
+     * @return string|void Comma separated tags
+     *
+     * @since 3.27.2
+     */
+    public function keywords() {
+        $tags = get_the_tags( $this->post_id );
+
+        if ( empty( $tags ) ) {
+            return;
+        }
+
+        return implode(
+            ',',
+            array_map(
+                function ( $tag ) {
+                    return $tag->name;
+                },
+                $tags
+            )
+        );
+    }
+
+    /**
+     * Get comma separated categories to be used as article section
+     *
+     * @return string[] Comma separated categories
+     *
+     * @since 3.27.2
+     */
+    public function article_section() {
+        $categories = get_the_category( $this->post_id );
+
+        return wp_list_pluck( $categories, 'cat_name' );
+    }
+
+    /**
+     * Get comment count
+     *
+     * @return string|void Comment count
+     *
+     * @since 3.27.2
+     */
+    public function comment_count() {
+        return get_comments_number( $this->post_id );
+    }
+
+    /**
+     * Get Language
+     * Try WPML, Polylang for post specific languages, else fallback on get_locale()
+     *
+     * @return string|void Language code (locale)
+     *
+     * @since 3.27.2
+     */
+    public function locale() {
+        $language = 'en-US';
+
+        if ( function_exists( 'wpml_get_language_information' ) ) {
+            // WPML handling
+            // WPML: Updated function signature.
+            // function wpml_get_language_information( $empty_value = null, $post_id = null )
+            $post_language = wpml_get_language_information( null, $this->post_id );
+            if ( ! $post_language instanceof WP_Error ) {
+                $language = $post_language['locale'];
+            }
+        } elseif ( function_exists( 'pll_get_post_language' ) ) {
+            // Polylang handling
+            $language = pll_get_post_language( $this->post_id, 'locale' );
+        } else {
+            $language = get_locale();
+        }
+
+        return str_replace( '_', '-', $language );
+    }
+
+    /**
+     * Add mentions to an article.
+     * To add mentions we just push the referenced entities to mentions.
+     *
+     * @param $post_id int
+     * @param $references int[]
+     */
+    public function add_references( $post_id, &$references ) {
+        $tags = get_the_tags( $post_id );
+
+        if ( $tags && ! is_wp_error( $tags ) ) {
+            // Loop through the tags and push it to references.
+            foreach ( $tags as $tag ) {
+                /**
+                 * @var $tag WP_Term
+                 */
+                $entity_uris = get_term_meta( $tag->term_id, '_wl_entity_id' );
+                foreach ( $entity_uris as $uri ) {
+                    $referenced_entity = Wordlift_Entity_Uri_Service::get_instance()->get_entity( $uri );
+                    if ( $referenced_entity instanceof WP_Post ) {
+                        // push the referenced entities to references.
+                        $references[] = $referenced_entity->ID;
+                    }
+                }
+            }
+        }
+
+    }
 
 }

Spacing +36 added lines, -36 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @since 3.14.0
 	 */
-	public function __construct( $post_id ) {
+	public function __construct($post_id) {
 
 		$this->post_id = $post_id;
 
@@ -54,7 +54,7 @@ 
 	 */
 	public function word_count() {
 
-		$post = get_post( $this->post_id );
+		$post = get_post($this->post_id);
 
 		/*
 		 * Apply the `wl_post_content` filter, in case 3rd parties want to change the post content, e.g.
@@ -62,9 +62,9 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+		$post_content = apply_filters('wl_post_content', $post->post_content, $post);
 
-		return self::str_word_count_utf8( wp_strip_all_tags( strip_shortcodes( $post_content ) ) );
+		return self::str_word_count_utf8(wp_strip_all_tags(strip_shortcodes($post_content)));
 	}
 
 	/**
@@ -78,11 +78,11 @@ 
 	 *
 	 * @return int The number of words.
 	 */
-	private static function str_word_count_utf8( $str ) {
+	private static function str_word_count_utf8($str) {
 
-		$words = preg_split( '~[^\p{L}\p{N}\']+~u', $str );
+		$words = preg_split('~[^\p{L}\p{N}\']+~u', $str);
 
-		return $words ? count( $words ) : 0;
+		return $words ? count($words) : 0;
 	}
 
 	/**
@@ -93,10 +93,10 @@ 
 	 * @return string The post permalink.
 	 * @since 3.20.0
 	 */
-	public static function get_production_permalink( $post_id, $object_type = Object_Type_Enum::POST ) {
+	public static function get_production_permalink($post_id, $object_type = Object_Type_Enum::POST) {
 
 		$object_link_service = Object_Link_Provider::get_instance();
-		$permalink           = $object_link_service->get_permalink( $post_id, $object_type );
+		$permalink           = $object_link_service->get_permalink($post_id, $object_type);
 
 		/**
 		 * WordPress 4.4 doesn't support meta queries for terms, therefore we only support post permalinks here.
@@ -105,8 +105,8 @@ 
 		 * post permalink if we find them.
 		 */
 		global $wp_version;
-		if ( version_compare( $wp_version, '4.5', '<' ) ) {
-			return apply_filters( 'wl_production_permalink', $permalink, $post_id, self::TYPE_ENTITY_LINK, null );
+		if (version_compare($wp_version, '4.5', '<')) {
+			return apply_filters('wl_production_permalink', $permalink, $post_id, self::TYPE_ENTITY_LINK, null);
 		}
 
 		/**
@@ -130,7 +130,7 @@ 
 
 		// Only try to link a term if `WL_ENABLE_TERM_LINKING` is enabled.
 		$terms = array();
-		if ( defined( 'WL_ENABLE_TERM_LINKING' ) && WL_ENABLE_TERM_LINKING ) {
+		if (defined('WL_ENABLE_TERM_LINKING') && WL_ENABLE_TERM_LINKING) {
 			// Try to find one term matching the entity.
 			$terms = get_terms(
 				array(
@@ -147,9 +147,9 @@ 
 		$type = self::TYPE_ENTITY_LINK;
 		$term = null;
 		// If found use the term link, otherwise the permalink.
-		if ( 1 === count( $terms ) ) {
-			$term      = current( $terms );
-			$permalink = get_term_link( $term );
+		if (1 === count($terms)) {
+			$term      = current($terms);
+			$permalink = get_term_link($term);
 			$type      = self::TYPE_TERM_LINK;
 		}
 
@@ -163,7 +163,7 @@ 
 		 *
 		 * @since 3.23.0 add the permalink type and term parameters.
 		 */
-		return apply_filters( 'wl_production_permalink', $permalink, $post_id, $type, $term );
+		return apply_filters('wl_production_permalink', $permalink, $post_id, $type, $term);
 	}
 
 	/**
@@ -174,16 +174,16 @@ 
 	 * @since 3.27.2
 	 */
 	public function keywords() {
-		$tags = get_the_tags( $this->post_id );
+		$tags = get_the_tags($this->post_id);
 
-		if ( empty( $tags ) ) {
+		if (empty($tags)) {
 			return;
 		}
 
 		return implode(
 			',',
 			array_map(
-				function ( $tag ) {
+				function($tag) {
 					return $tag->name;
 				},
 				$tags
@@ -199,9 +199,9 @@ 
 	 * @since 3.27.2
 	 */
 	public function article_section() {
-		$categories = get_the_category( $this->post_id );
+		$categories = get_the_category($this->post_id);
 
-		return wp_list_pluck( $categories, 'cat_name' );
+		return wp_list_pluck($categories, 'cat_name');
 	}
 
 	/**
@@ -212,7 +212,7 @@ 
 	 * @since 3.27.2
 	 */
 	public function comment_count() {
-		return get_comments_number( $this->post_id );
+		return get_comments_number($this->post_id);
 	}
 
 	/**
@@ -226,22 +226,22 @@ 
 	public function locale() {
 		$language = 'en-US';
 
-		if ( function_exists( 'wpml_get_language_information' ) ) {
+		if (function_exists('wpml_get_language_information')) {
 			// WPML handling
 			// WPML: Updated function signature.
 			// function wpml_get_language_information( $empty_value = null, $post_id = null )
-			$post_language = wpml_get_language_information( null, $this->post_id );
-			if ( ! $post_language instanceof WP_Error ) {
+			$post_language = wpml_get_language_information(null, $this->post_id);
+			if ( ! $post_language instanceof WP_Error) {
 				$language = $post_language['locale'];
 			}
-		} elseif ( function_exists( 'pll_get_post_language' ) ) {
+		} elseif (function_exists('pll_get_post_language')) {
 			// Polylang handling
-			$language = pll_get_post_language( $this->post_id, 'locale' );
+			$language = pll_get_post_language($this->post_id, 'locale');
 		} else {
 			$language = get_locale();
 		}
 
-		return str_replace( '_', '-', $language );
+		return str_replace('_', '-', $language);
 	}
 
 	/**
@@ -251,19 +251,19 @@ 
 	 * @param $post_id int
 	 * @param $references int[]
 	 */
-	public function add_references( $post_id, &$references ) {
-		$tags = get_the_tags( $post_id );
+	public function add_references($post_id, &$references) {
+		$tags = get_the_tags($post_id);
 
-		if ( $tags && ! is_wp_error( $tags ) ) {
+		if ($tags && ! is_wp_error($tags)) {
 			// Loop through the tags and push it to references.
-			foreach ( $tags as $tag ) {
+			foreach ($tags as $tag) {
 				/**
 				 * @var $tag WP_Term
 				 */
-				$entity_uris = get_term_meta( $tag->term_id, '_wl_entity_id' );
-				foreach ( $entity_uris as $uri ) {
-					$referenced_entity = Wordlift_Entity_Uri_Service::get_instance()->get_entity( $uri );
-					if ( $referenced_entity instanceof WP_Post ) {
+				$entity_uris = get_term_meta($tag->term_id, '_wl_entity_id');
+				foreach ($entity_uris as $uri) {
+					$referenced_entity = Wordlift_Entity_Uri_Service::get_instance()->get_entity($uri);
+					if ($referenced_entity instanceof WP_Post) {
 						// push the referenced entities to references.
 						$references[] = $referenced_entity->ID;
 					}

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

Indentation +239 added lines, -239 removed lines

@@ -20,100 +20,100 @@ 
  */
 class Wordlift_Entity_Uri_Service {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * An array of URIs to post ID valid for the current request.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var array $uri_to_post An array of URIs to post ID valid for the current request.
-	 */
-	protected $uri_to_post;
-
-	/**
-	 * Create a {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since 3.16.3
-	 */
-	protected function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		// Add a filter to the `rest_post_dispatch` filter to add the wl_entity_url meta as `wl:entity_url`.
-		add_filter( 'rest_post_dispatch', array( $this, 'rest_post_dispatch' ) );
-		add_filter( 'wl_content_service__post__not_found', array( $this, 'content_service__post__not_found' ), 10, 2 );
-
-	}
-
-	/**
-	 * Holds the {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since 3.21.5
-	 * @access private
-	 * @var Wordlift_Entity_Uri_Service $instance The {@link Wordlift_Entity_Uri_Service} singleton.
-	 */
-	private static $instance = null;
-
-	/**
-	 * Get the singleton.
-	 *
-	 * @return Wordlift_Entity_Uri_Service The singleton instance.
-	 * @since 3.21.5
-	 */
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			$entity_uri_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'entity_uri/' );
-			self::$instance           = new Wordlift_Cached_Entity_Uri_Service( $entity_uri_cache_service );
-
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Try to find a post when the content service doesn't find it.
-	 *
-	 * @param WP_Post|null $post
-	 * @param string       $uri
-	 *
-	 * @return false|int
-	 */
-	public function content_service__post__not_found( $post, $uri ) {
-		return $this->get_post_id_from_url( $uri );
-	}
-
-	/**
-	 * Preload the provided URIs in the local cache.
-	 *
-	 * This function will populate the local `$uri_to_post` array by running a
-	 * single query with all the URIs and returning the mappings in the array.
-	 *
-	 * @param array $uris An array of URIs.
-	 *
-	 * @since 3.16.3
-	 */
-	public function preload_uris( $uris ) {
-
-		// Bail out if there are no URIs.
-		if ( 0 === count( $uris ) ) {
-			return;
-		}
-
-		$this->log->trace( 'Preloading ' . count( $uris ) . ' URI(s)...' );
-
-		global $wpdb;
-		$in_post_types  = implode( "','", array_map( 'esc_sql', Wordlift_Entity_Service::valid_entity_post_types() ) );
-		$in_entity_uris = implode( "','", array_map( 'esc_sql', $uris ) );
-		$sql            = "
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * An array of URIs to post ID valid for the current request.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var array $uri_to_post An array of URIs to post ID valid for the current request.
+     */
+    protected $uri_to_post;
+
+    /**
+     * Create a {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since 3.16.3
+     */
+    protected function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        // Add a filter to the `rest_post_dispatch` filter to add the wl_entity_url meta as `wl:entity_url`.
+        add_filter( 'rest_post_dispatch', array( $this, 'rest_post_dispatch' ) );
+        add_filter( 'wl_content_service__post__not_found', array( $this, 'content_service__post__not_found' ), 10, 2 );
+
+    }
+
+    /**
+     * Holds the {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since 3.21.5
+     * @access private
+     * @var Wordlift_Entity_Uri_Service $instance The {@link Wordlift_Entity_Uri_Service} singleton.
+     */
+    private static $instance = null;
+
+    /**
+     * Get the singleton.
+     *
+     * @return Wordlift_Entity_Uri_Service The singleton instance.
+     * @since 3.21.5
+     */
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            $entity_uri_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'entity_uri/' );
+            self::$instance           = new Wordlift_Cached_Entity_Uri_Service( $entity_uri_cache_service );
+
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Try to find a post when the content service doesn't find it.
+     *
+     * @param WP_Post|null $post
+     * @param string       $uri
+     *
+     * @return false|int
+     */
+    public function content_service__post__not_found( $post, $uri ) {
+        return $this->get_post_id_from_url( $uri );
+    }
+
+    /**
+     * Preload the provided URIs in the local cache.
+     *
+     * This function will populate the local `$uri_to_post` array by running a
+     * single query with all the URIs and returning the mappings in the array.
+     *
+     * @param array $uris An array of URIs.
+     *
+     * @since 3.16.3
+     */
+    public function preload_uris( $uris ) {
+
+        // Bail out if there are no URIs.
+        if ( 0 === count( $uris ) ) {
+            return;
+        }
+
+        $this->log->trace( 'Preloading ' . count( $uris ) . ' URI(s)...' );
+
+        global $wpdb;
+        $in_post_types  = implode( "','", array_map( 'esc_sql', Wordlift_Entity_Service::valid_entity_post_types() ) );
+        $in_entity_uris = implode( "','", array_map( 'esc_sql', $uris ) );
+        $sql            = "
 			SELECT ID FROM $wpdb->posts p
 			INNER JOIN $wpdb->postmeta pm
 			 ON pm.post_id = p.ID
@@ -123,150 +123,150 @@ 
 			  AND p.post_status IN ( 'publish', 'draft', 'private', 'future' )
   		";
 
-		// Get the posts.
-		$posts = $wpdb->get_col( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-
-		// Populate the array. We reinitialize the array on purpose because
-		// we don't want these data to long live.
-		$this->uri_to_post = array_reduce(
-			$posts,
-			function ( $carry, $item ) {
-				$uris = get_post_meta( $item, Wordlift_Schema_Service::FIELD_SAME_AS );
-
-				$uri = Wordpress_Content_Service::get_instance()
-											->get_entity_id( Wordpress_Content_Id::create_post( $item ) );
-
-				if ( isset( $uri ) ) {
-					$uris[] = $uri;
-				}
-
-				return $carry
-				   // Get the URI related to the post and fill them with the item id.
-				   + array_fill_keys( $uris, $item );
-			},
-			array()
-		);
-
-		// Add the not found URIs.
-		$this->uri_to_post += array_fill_keys( $uris, null );
-
-		$this->log->debug( count( $this->uri_to_post ) . ' URI(s) preloaded.' );
-
-	}
-
-	/**
-	 * Reset the URI to post local cache.
-	 *
-	 * @since 3.16.3
-	 */
-	public function reset_uris() {
-
-		$this->uri_to_post = array();
-
-	}
-
-	/**
-	 * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
-	 *
-	 * @param string $uri The entity URI.
-	 *
-	 * @return WP_Post|null A WP_Post instance or null if not found.
-	 * @since 3.2.0
-	 */
-	public function get_entity( $uri ) {
-
-		$this->log->trace( "Getting an entity post for URI $uri..." );
-
-		$content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as( $uri );
-
-		// Return null if the content isn't found or isn't a post.
-		if ( ! isset( $content ) || ! is_a( $content->get_bag(), '\WP_Post' ) ) {
-			return null;
-		}
-
-		return $content->get_bag();
-	}
-
-	/**
-	 * Determines whether a given uri is an internal uri or not.
-	 *
-	 * @param string $uri An uri.
-	 *
-	 * @return true if the uri internal to the current dataset otherwise false.
-	 * @since 3.16.3
-	 */
-	public function is_internal( $uri ) {
-
-		return ( 0 === strrpos( $uri, (string) Wordlift_Configuration_Service::get_instance()->get_dataset_uri() ) );
-	}
-
-	/**
-	 * Hook to `rest_post_dispatch` to alter the response and add the `wl_entity_url` post meta as `wl:entity_url`.
-	 *
-	 * We're using this filter instead of the well known `register_meta` / `register_rest_field` because we still need
-	 * to provide full compatibility with WordPress 4.4+.
-	 *
-	 * @param WP_HTTP_Response $result Result to send to the client. Usually a WP_REST_Response.
-	 *
-	 * @return WP_HTTP_Response The result to send to the client.
-	 *
-	 * @since 3.23.0
-	 */
-	public function rest_post_dispatch( $result ) {
-
-		// Get a reference to the actual data.
-		$data = &$result->data;
-
-		// Bail out if we don't have the required parameters, or if the type is not a valid entity.
-		if ( ! is_array( $data ) || ! isset( $data['id'] ) || ! isset( $data['type'] )
-			 || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $data['type'] ) ) {
-			return $result;
-		}
-
-		// Add the `wl:entity_url`.
-		$data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri( $data['id'] );
-
-		return $result;
-	}
-
-	/**
-	 * Helper function to fetch post_id from a WordPress URL
-	 * Primarily used when dataset is not enabled
-	 *
-	 * @param $url
-	 *
-	 * @return int Post ID | bool false
-	 */
-	public function get_post_id_from_url( $url ) {
-
-		// Try url_to_postid
-		$post_id = url_to_postid( htmlspecialchars_decode( $url ) );
-		if ( 0 !== $post_id ) {
-			return $post_id;
-		}
-
-		$parsed_url = wp_parse_url( $url );
-
-		if ( ! isset( $parsed_url['query'] ) ) {
-			return false;
-		}
-
-		parse_str( $parsed_url['query'], $parsed_query );
-
-		// Try to parse WooCommerce non-pretty product URL
-		if ( $parsed_query['product'] ) {
-			$posts = get_posts(
-				array(
-					'name'      => $parsed_query['product'],
-					'post_type' => 'product',
-				)
-			);
-			if ( count( $posts ) > 0 ) {
-				return $posts[0]->ID;
-			}
-		}
-
-		return false;
-	}
+        // Get the posts.
+        $posts = $wpdb->get_col( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+
+        // Populate the array. We reinitialize the array on purpose because
+        // we don't want these data to long live.
+        $this->uri_to_post = array_reduce(
+            $posts,
+            function ( $carry, $item ) {
+                $uris = get_post_meta( $item, Wordlift_Schema_Service::FIELD_SAME_AS );
+
+                $uri = Wordpress_Content_Service::get_instance()
+                                            ->get_entity_id( Wordpress_Content_Id::create_post( $item ) );
+
+                if ( isset( $uri ) ) {
+                    $uris[] = $uri;
+                }
+
+                return $carry
+                    // Get the URI related to the post and fill them with the item id.
+                   + array_fill_keys( $uris, $item );
+            },
+            array()
+        );
+
+        // Add the not found URIs.
+        $this->uri_to_post += array_fill_keys( $uris, null );
+
+        $this->log->debug( count( $this->uri_to_post ) . ' URI(s) preloaded.' );
+
+    }
+
+    /**
+     * Reset the URI to post local cache.
+     *
+     * @since 3.16.3
+     */
+    public function reset_uris() {
+
+        $this->uri_to_post = array();
+
+    }
+
+    /**
+     * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
+     *
+     * @param string $uri The entity URI.
+     *
+     * @return WP_Post|null A WP_Post instance or null if not found.
+     * @since 3.2.0
+     */
+    public function get_entity( $uri ) {
+
+        $this->log->trace( "Getting an entity post for URI $uri..." );
+
+        $content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as( $uri );
+
+        // Return null if the content isn't found or isn't a post.
+        if ( ! isset( $content ) || ! is_a( $content->get_bag(), '\WP_Post' ) ) {
+            return null;
+        }
+
+        return $content->get_bag();
+    }
+
+    /**
+     * Determines whether a given uri is an internal uri or not.
+     *
+     * @param string $uri An uri.
+     *
+     * @return true if the uri internal to the current dataset otherwise false.
+     * @since 3.16.3
+     */
+    public function is_internal( $uri ) {
+
+        return ( 0 === strrpos( $uri, (string) Wordlift_Configuration_Service::get_instance()->get_dataset_uri() ) );
+    }
+
+    /**
+     * Hook to `rest_post_dispatch` to alter the response and add the `wl_entity_url` post meta as `wl:entity_url`.
+     *
+     * We're using this filter instead of the well known `register_meta` / `register_rest_field` because we still need
+     * to provide full compatibility with WordPress 4.4+.
+     *
+     * @param WP_HTTP_Response $result Result to send to the client. Usually a WP_REST_Response.
+     *
+     * @return WP_HTTP_Response The result to send to the client.
+     *
+     * @since 3.23.0
+     */
+    public function rest_post_dispatch( $result ) {
+
+        // Get a reference to the actual data.
+        $data = &$result->data;
+
+        // Bail out if we don't have the required parameters, or if the type is not a valid entity.
+        if ( ! is_array( $data ) || ! isset( $data['id'] ) || ! isset( $data['type'] )
+             || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $data['type'] ) ) {
+            return $result;
+        }
+
+        // Add the `wl:entity_url`.
+        $data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri( $data['id'] );
+
+        return $result;
+    }
+
+    /**
+     * Helper function to fetch post_id from a WordPress URL
+     * Primarily used when dataset is not enabled
+     *
+     * @param $url
+     *
+     * @return int Post ID | bool false
+     */
+    public function get_post_id_from_url( $url ) {
+
+        // Try url_to_postid
+        $post_id = url_to_postid( htmlspecialchars_decode( $url ) );
+        if ( 0 !== $post_id ) {
+            return $post_id;
+        }
+
+        $parsed_url = wp_parse_url( $url );
+
+        if ( ! isset( $parsed_url['query'] ) ) {
+            return false;
+        }
+
+        parse_str( $parsed_url['query'], $parsed_query );
+
+        // Try to parse WooCommerce non-pretty product URL
+        if ( $parsed_query['product'] ) {
+            $posts = get_posts(
+                array(
+                    'name'      => $parsed_query['product'],
+                    'post_type' => 'product',
+                )
+            );
+            if ( count( $posts ) > 0 ) {
+                return $posts[0]->ID;
+            }
+        }
+
+        return false;
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -45,11 +45,11 @@ 
 	 */
 	protected function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		// Add a filter to the `rest_post_dispatch` filter to add the wl_entity_url meta as `wl:entity_url`.
-		add_filter( 'rest_post_dispatch', array( $this, 'rest_post_dispatch' ) );
-		add_filter( 'wl_content_service__post__not_found', array( $this, 'content_service__post__not_found' ), 10, 2 );
+		add_filter('rest_post_dispatch', array($this, 'rest_post_dispatch'));
+		add_filter('wl_content_service__post__not_found', array($this, 'content_service__post__not_found'), 10, 2);
 
 	}
 
@@ -70,9 +70,9 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
-			$entity_uri_cache_service = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'entity_uri/' );
-			self::$instance           = new Wordlift_Cached_Entity_Uri_Service( $entity_uri_cache_service );
+		if ( ! isset(self::$instance)) {
+			$entity_uri_cache_service = new Wordlift_File_Cache_Service(WL_TEMP_DIR.'entity_uri/');
+			self::$instance           = new Wordlift_Cached_Entity_Uri_Service($entity_uri_cache_service);
 
 		}
 
@@ -87,8 +87,8 @@ 
 	 *
 	 * @return false|int
 	 */
-	public function content_service__post__not_found( $post, $uri ) {
-		return $this->get_post_id_from_url( $uri );
+	public function content_service__post__not_found($post, $uri) {
+		return $this->get_post_id_from_url($uri);
 	}
 
 	/**
@@ -101,18 +101,18 @@ 
 	 *
 	 * @since 3.16.3
 	 */
-	public function preload_uris( $uris ) {
+	public function preload_uris($uris) {
 
 		// Bail out if there are no URIs.
-		if ( 0 === count( $uris ) ) {
+		if (0 === count($uris)) {
 			return;
 		}
 
-		$this->log->trace( 'Preloading ' . count( $uris ) . ' URI(s)...' );
+		$this->log->trace('Preloading '.count($uris).' URI(s)...');
 
 		global $wpdb;
-		$in_post_types  = implode( "','", array_map( 'esc_sql', Wordlift_Entity_Service::valid_entity_post_types() ) );
-		$in_entity_uris = implode( "','", array_map( 'esc_sql', $uris ) );
+		$in_post_types  = implode("','", array_map('esc_sql', Wordlift_Entity_Service::valid_entity_post_types()));
+		$in_entity_uris = implode("','", array_map('esc_sql', $uris));
 		$sql            = "
 			SELECT ID FROM $wpdb->posts p
 			INNER JOIN $wpdb->postmeta pm
@@ -124,33 +124,33 @@ 
   		";
 
 		// Get the posts.
-		$posts = $wpdb->get_col( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		$posts = $wpdb->get_col($sql); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 
 		// Populate the array. We reinitialize the array on purpose because
 		// we don't want these data to long live.
 		$this->uri_to_post = array_reduce(
 			$posts,
-			function ( $carry, $item ) {
-				$uris = get_post_meta( $item, Wordlift_Schema_Service::FIELD_SAME_AS );
+			function($carry, $item) {
+				$uris = get_post_meta($item, Wordlift_Schema_Service::FIELD_SAME_AS);
 
 				$uri = Wordpress_Content_Service::get_instance()
-											->get_entity_id( Wordpress_Content_Id::create_post( $item ) );
+											->get_entity_id(Wordpress_Content_Id::create_post($item));
 
-				if ( isset( $uri ) ) {
+				if (isset($uri)) {
 					$uris[] = $uri;
 				}
 
 				return $carry
 				   // Get the URI related to the post and fill them with the item id.
-				   + array_fill_keys( $uris, $item );
+				   + array_fill_keys($uris, $item);
 			},
 			array()
 		);
 
 		// Add the not found URIs.
-		$this->uri_to_post += array_fill_keys( $uris, null );
+		$this->uri_to_post += array_fill_keys($uris, null);
 
-		$this->log->debug( count( $this->uri_to_post ) . ' URI(s) preloaded.' );
+		$this->log->debug(count($this->uri_to_post).' URI(s) preloaded.');
 
 	}
 
@@ -173,14 +173,14 @@ 
 	 * @return WP_Post|null A WP_Post instance or null if not found.
 	 * @since 3.2.0
 	 */
-	public function get_entity( $uri ) {
+	public function get_entity($uri) {
 
-		$this->log->trace( "Getting an entity post for URI $uri..." );
+		$this->log->trace("Getting an entity post for URI $uri...");
 
-		$content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as( $uri );
+		$content = Wordpress_Content_Service::get_instance()->get_by_entity_id_or_same_as($uri);
 
 		// Return null if the content isn't found or isn't a post.
-		if ( ! isset( $content ) || ! is_a( $content->get_bag(), '\WP_Post' ) ) {
+		if ( ! isset($content) || ! is_a($content->get_bag(), '\WP_Post')) {
 			return null;
 		}
 
@@ -195,9 +195,9 @@ 
 	 * @return true if the uri internal to the current dataset otherwise false.
 	 * @since 3.16.3
 	 */
-	public function is_internal( $uri ) {
+	public function is_internal($uri) {
 
-		return ( 0 === strrpos( $uri, (string) Wordlift_Configuration_Service::get_instance()->get_dataset_uri() ) );
+		return (0 === strrpos($uri, (string) Wordlift_Configuration_Service::get_instance()->get_dataset_uri()));
 	}
 
 	/**
@@ -212,19 +212,19 @@ 
 	 *
 	 * @since 3.23.0
 	 */
-	public function rest_post_dispatch( $result ) {
+	public function rest_post_dispatch($result) {
 
 		// Get a reference to the actual data.
 		$data = &$result->data;
 
 		// Bail out if we don't have the required parameters, or if the type is not a valid entity.
-		if ( ! is_array( $data ) || ! isset( $data['id'] ) || ! isset( $data['type'] )
-			 || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $data['type'] ) ) {
+		if ( ! is_array($data) || ! isset($data['id']) || ! isset($data['type'])
+			 || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type($data['type'])) {
 			return $result;
 		}
 
 		// Add the `wl:entity_url`.
-		$data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri( $data['id'] );
+		$data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri($data['id']);
 
 		return $result;
 	}
@@ -237,31 +237,31 @@ 
 	 *
 	 * @return int Post ID | bool false
 	 */
-	public function get_post_id_from_url( $url ) {
+	public function get_post_id_from_url($url) {
 
 		// Try url_to_postid
-		$post_id = url_to_postid( htmlspecialchars_decode( $url ) );
-		if ( 0 !== $post_id ) {
+		$post_id = url_to_postid(htmlspecialchars_decode($url));
+		if (0 !== $post_id) {
 			return $post_id;
 		}
 
-		$parsed_url = wp_parse_url( $url );
+		$parsed_url = wp_parse_url($url);
 
-		if ( ! isset( $parsed_url['query'] ) ) {
+		if ( ! isset($parsed_url['query'])) {
 			return false;
 		}
 
-		parse_str( $parsed_url['query'], $parsed_query );
+		parse_str($parsed_url['query'], $parsed_query);
 
 		// Try to parse WooCommerce non-pretty product URL
-		if ( $parsed_query['product'] ) {
+		if ($parsed_query['product']) {
 			$posts = get_posts(
 				array(
 					'name'      => $parsed_query['product'],
 					'post_type' => 'product',
 				)
 			);
-			if ( count( $posts ) > 0 ) {
+			if (count($posts) > 0) {
 				return $posts[0]->ID;
 			}
 		}

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

Indentation +111 added lines, -111 removed lines

@@ -7,148 +7,148 @@
  */
 class Wordlift_Log_Service {
 
-	const MESSAGE_TEMPLATE = '%-6s [%-40.40s] %s';
-
-	const ERROR = 4;
-	const WARN  = 3;
-	const INFO  = 2;
-	const DEBUG = 1;
-	const TRACE = 0;
-
-	/**
-	 * The class related to the logs.
-	 *
-	 * @since  1.0.0
-	 * @access private
-	 * @var string $class_name The class related to the logs.
-	 */
-	private $class_name;
-
-	/**
-	 * The log levels for printing in log lines.
-	 *
-	 * @var array $levels An array of log levels.
-	 */
-	private static $levels = array(
-		self::TRACE => 'TRACE',
-		self::DEBUG => 'DEBUG',
-		self::INFO  => 'INFO',
-		self::WARN  => 'WARN',
-		self::ERROR => 'ERROR',
-	);
-
-	/**
-	 * A singleton instance for legacy logging.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $instance A singleton instance for legacy logging.
-	 */
-	private static $instance = null;
+    const MESSAGE_TEMPLATE = '%-6s [%-40.40s] %s';
+
+    const ERROR = 4;
+    const WARN  = 3;
+    const INFO  = 2;
+    const DEBUG = 1;
+    const TRACE = 0;
+
+    /**
+     * The class related to the logs.
+     *
+     * @since  1.0.0
+     * @access private
+     * @var string $class_name The class related to the logs.
+     */
+    private $class_name;
+
+    /**
+     * The log levels for printing in log lines.
+     *
+     * @var array $levels An array of log levels.
+     */
+    private static $levels = array(
+        self::TRACE => 'TRACE',
+        self::DEBUG => 'DEBUG',
+        self::INFO  => 'INFO',
+        self::WARN  => 'WARN',
+        self::ERROR => 'ERROR',
+    );
+
+    /**
+     * A singleton instance for legacy logging.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Log_Service $instance A singleton instance for legacy logging.
+     */
+    private static $instance = null;
 
-	/**
-	 * Create an instance of the Log service.
-	 *
-	 * @param string $class_name The class related to the logs.
-	 *
-	 * @since 1.0.0
-	 */
-	public function __construct( $class_name ) {
+    /**
+     * Create an instance of the Log service.
+     *
+     * @param string $class_name The class related to the logs.
+     *
+     * @since 1.0.0
+     */
+    public function __construct( $class_name ) {
 
-		$this->class_name = $class_name;
+        $this->class_name = $class_name;
 
-	}
+    }
 
-	/**
-	 * Get the ROOT logger.
-	 *
-	 * @return \Wordlift_Log_Service A singleton instance for legacy logging.
-	 * @since 3.10.0
-	 */
-	public static function get_instance() {
+    /**
+     * Get the ROOT logger.
+     *
+     * @return \Wordlift_Log_Service A singleton instance for legacy logging.
+     * @since 3.10.0
+     */
+    public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new Wordlift_Log_Service( 'ROOT' );
-		}
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new Wordlift_Log_Service( 'ROOT' );
+        }
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	public static function get_logger( $class_name ) {
+    public static function get_logger( $class_name ) {
 
-		return new Wordlift_Log_Service( $class_name );
+        return new Wordlift_Log_Service( $class_name );
 
-	}
+    }
 
-	/**
-	 * Log a message.
-	 *
-	 * @param string $level The log level.
-	 * @param string $message The message to log.
-	 *
-	 * @since 1.0.0
-	 */
-	public function log( $level, $message ) {
+    /**
+     * Log a message.
+     *
+     * @param string $level The log level.
+     * @param string $message The message to log.
+     *
+     * @since 1.0.0
+     */
+    public function log( $level, $message ) {
 
-		// echo( sprintf( self::MESSAGE_TEMPLATE . "\n", self::$levels[ $level ], $this->class_name, is_array( $message ) ? implode( ', ', $message ) : $message ) );
+        // echo( sprintf( self::MESSAGE_TEMPLATE . "\n", self::$levels[ $level ], $this->class_name, is_array( $message ) ? implode( ', ', $message ) : $message ) );
 
-		// Bail out if `WL_DEBUG` isn't defined or it's false.
-		if ( ! defined( 'WL_DEBUG' ) || false === WL_DEBUG ) {
-			return;
-		}
+        // Bail out if `WL_DEBUG` isn't defined or it's false.
+        if ( ! defined( 'WL_DEBUG' ) || false === WL_DEBUG ) {
+            return;
+        }
 
-		// Bail out if WordLift log level isn't defined, and WP debug is disabled.
-		if ( ! defined( 'WL_LOG_LEVEL' ) && $level < self::ERROR
-			 && ( ! defined( 'WP_DEBUG' ) || false === WP_DEBUG ) ) {
-			return;
-		}
+        // Bail out if WordLift log level isn't defined, and WP debug is disabled.
+        if ( ! defined( 'WL_LOG_LEVEL' ) && $level < self::ERROR
+             && ( ! defined( 'WP_DEBUG' ) || false === WP_DEBUG ) ) {
+            return;
+        }
 
-		// Bail out if the log message is below the minimum log level.
-		if ( defined( 'WL_LOG_LEVEL' ) && $level < intval( WL_LOG_LEVEL ) ) {
-			return;
-		}
+        // Bail out if the log message is below the minimum log level.
+        if ( defined( 'WL_LOG_LEVEL' ) && $level < intval( WL_LOG_LEVEL ) ) {
+            return;
+        }
 
-		// Bail out if there's a filter and we don't match it.
-		$class_name = wp_slash( $this->class_name );
-		if ( defined( 'WL_LOG_FILTER' ) && 1 !== preg_match( "/(^|,)$class_name($|,)/", WL_LOG_FILTER ) ) {
-			return;
-		}
+        // Bail out if there's a filter and we don't match it.
+        $class_name = wp_slash( $this->class_name );
+        if ( defined( 'WL_LOG_FILTER' ) && 1 !== preg_match( "/(^|,)$class_name($|,)/", WL_LOG_FILTER ) ) {
+            return;
+        }
 
-		// Finally log the message.
-		// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
-		error_log( sprintf( self::MESSAGE_TEMPLATE, self::$levels[ $level ], $this->class_name, is_array( $message ) ? implode( ', ', $message ) : $message ) );
+        // Finally log the message.
+        // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
+        error_log( sprintf( self::MESSAGE_TEMPLATE, self::$levels[ $level ], $this->class_name, is_array( $message ) ? implode( ', ', $message ) : $message ) );
 
-	}
+    }
 
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function error( $message, $exception = null ) {
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function error( $message, $exception = null ) {
 
-		$this->log( self::ERROR, $message );
+        $this->log( self::ERROR, $message );
 
-	}
+    }
 
-	public function warn( $message ) {
+    public function warn( $message ) {
 
-		$this->log( self::WARN, $message );
+        $this->log( self::WARN, $message );
 
-	}
+    }
 
-	public function info( $message ) {
+    public function info( $message ) {
 
-		$this->log( self::INFO, $message );
+        $this->log( self::INFO, $message );
 
-	}
+    }
 
-	public function debug( $message ) {
+    public function debug( $message ) {
 
-		$this->log( self::DEBUG, $message );
+        $this->log( self::DEBUG, $message );
 
-	}
+    }
 
-	public function trace( $message ) {
+    public function trace( $message ) {
 
-		$this->log( self::TRACE, $message );
+        $this->log( self::TRACE, $message );
 
-	}
+    }
 
 }

Spacing +23 added lines, -23 removed lines

@@ -53,7 +53,7 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function __construct( $class_name ) {
+	public function __construct($class_name) {
 
 		$this->class_name = $class_name;
 
@@ -67,16 +67,16 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new Wordlift_Log_Service( 'ROOT' );
+		if ( ! isset(self::$instance)) {
+			self::$instance = new Wordlift_Log_Service('ROOT');
 		}
 
 		return self::$instance;
 	}
 
-	public static function get_logger( $class_name ) {
+	public static function get_logger($class_name) {
 
-		return new Wordlift_Log_Service( $class_name );
+		return new Wordlift_Log_Service($class_name);
 
 	}
 
@@ -88,66 +88,66 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function log( $level, $message ) {
+	public function log($level, $message) {
 
 		// echo( sprintf( self::MESSAGE_TEMPLATE . "\n", self::$levels[ $level ], $this->class_name, is_array( $message ) ? implode( ', ', $message ) : $message ) );
 
 		// Bail out if `WL_DEBUG` isn't defined or it's false.
-		if ( ! defined( 'WL_DEBUG' ) || false === WL_DEBUG ) {
+		if ( ! defined('WL_DEBUG') || false === WL_DEBUG) {
 			return;
 		}
 
 		// Bail out if WordLift log level isn't defined, and WP debug is disabled.
-		if ( ! defined( 'WL_LOG_LEVEL' ) && $level < self::ERROR
-			 && ( ! defined( 'WP_DEBUG' ) || false === WP_DEBUG ) ) {
+		if ( ! defined('WL_LOG_LEVEL') && $level < self::ERROR
+			 && ( ! defined('WP_DEBUG') || false === WP_DEBUG)) {
 			return;
 		}
 
 		// Bail out if the log message is below the minimum log level.
-		if ( defined( 'WL_LOG_LEVEL' ) && $level < intval( WL_LOG_LEVEL ) ) {
+		if (defined('WL_LOG_LEVEL') && $level < intval(WL_LOG_LEVEL)) {
 			return;
 		}
 
 		// Bail out if there's a filter and we don't match it.
-		$class_name = wp_slash( $this->class_name );
-		if ( defined( 'WL_LOG_FILTER' ) && 1 !== preg_match( "/(^|,)$class_name($|,)/", WL_LOG_FILTER ) ) {
+		$class_name = wp_slash($this->class_name);
+		if (defined('WL_LOG_FILTER') && 1 !== preg_match("/(^|,)$class_name($|,)/", WL_LOG_FILTER)) {
 			return;
 		}
 
 		// Finally log the message.
 		// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
-		error_log( sprintf( self::MESSAGE_TEMPLATE, self::$levels[ $level ], $this->class_name, is_array( $message ) ? implode( ', ', $message ) : $message ) );
+		error_log(sprintf(self::MESSAGE_TEMPLATE, self::$levels[$level], $this->class_name, is_array($message) ? implode(', ', $message) : $message));
 
 	}
 
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function error( $message, $exception = null ) {
+	public function error($message, $exception = null) {
 
-		$this->log( self::ERROR, $message );
+		$this->log(self::ERROR, $message);
 
 	}
 
-	public function warn( $message ) {
+	public function warn($message) {
 
-		$this->log( self::WARN, $message );
+		$this->log(self::WARN, $message);
 
 	}
 
-	public function info( $message ) {
+	public function info($message) {
 
-		$this->log( self::INFO, $message );
+		$this->log(self::INFO, $message);
 
 	}
 
-	public function debug( $message ) {
+	public function debug($message) {
 
-		$this->log( self::DEBUG, $message );
+		$this->log(self::DEBUG, $message);
 
 	}
 
-	public function trace( $message ) {
+	public function trace($message) {
 
-		$this->log( self::TRACE, $message );
+		$this->log(self::TRACE, $message);
 
 	}
 

src/includes/class-wordlift-website-jsonld-converter.php

Indentation +54 added lines, -54 removed lines

@@ -15,67 +15,67 @@
  */
 class Wordlift_Website_Jsonld_Converter extends Wordlift_Post_To_Jsonld_Converter {
 
-	/**
-	 * Convert the home/blog page to a JSON-LD array.
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.14.0
-	 */
-	public function create_schema() {
+    /**
+     * Convert the home/blog page to a JSON-LD array.
+     *
+     * @return array A JSON-LD array.
+     * @since 3.14.0
+     */
+    public function create_schema() {
 
-		// Create new jsonld.
-		$home_url = home_url( '/' );
+        // Create new jsonld.
+        $home_url = home_url( '/' );
 
-		$jsonld = array(
-			'@context'      => 'http://schema.org',
-			'@type'         => 'WebSite',
-			'@id'           => "$home_url#website",
-			'name'          => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
-			'alternateName' => html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES ),
-			'url'           => $home_url,
-		);
+        $jsonld = array(
+            '@context'      => 'http://schema.org',
+            '@type'         => 'WebSite',
+            '@id'           => "$home_url#website",
+            'name'          => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
+            'alternateName' => html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES ),
+            'url'           => $home_url,
+        );
 
-		// Add publisher information.
-		$this->set_publisher( $jsonld );
+        // Add publisher information.
+        $this->set_publisher( $jsonld );
 
-		// Add search action.
-		$this->set_search_action( $jsonld );
+        // Add search action.
+        $this->set_search_action( $jsonld );
 
-		/**
-		 * Call the `wl_website_jsonld` filter.
-		 *
-		 * @param array $jsonld The JSON-LD structure.
-		 *
-		 * @since 3.14.0
-		 *
-		 * @api
-		 */
-		return apply_filters( 'wl_website_jsonld', $jsonld );
-	}
+        /**
+         * Call the `wl_website_jsonld` filter.
+         *
+         * @param array $jsonld The JSON-LD structure.
+         *
+         * @since 3.14.0
+         *
+         * @api
+         */
+        return apply_filters( 'wl_website_jsonld', $jsonld );
+    }
 
-	/**
-	 * Add SearchAction part to the schema
-	 *
-	 * @param array $params The parameters array.
-	 *
-	 * @since 3.14.0
-	 */
-	private function set_search_action( &$params ) {
-		/**
-		 * Filter: 'wl_jsonld_search_url' - Allows filtering of the search URL.
-		 *
-		 * @since  3.14.0
-		 * @api    string $search_url The search URL for this site with a `{search_term_string}` variable.
-		 */
-		$search_url = apply_filters( 'wl_jsonld_search_url', home_url( '/' ) . '?s={search_term_string}' );
+    /**
+     * Add SearchAction part to the schema
+     *
+     * @param array $params The parameters array.
+     *
+     * @since 3.14.0
+     */
+    private function set_search_action( &$params ) {
+        /**
+         * Filter: 'wl_jsonld_search_url' - Allows filtering of the search URL.
+         *
+         * @since  3.14.0
+         * @api    string $search_url The search URL for this site with a `{search_term_string}` variable.
+         */
+        $search_url = apply_filters( 'wl_jsonld_search_url', home_url( '/' ) . '?s={search_term_string}' );
 
-		// Add search action
-		$params['potentialAction'] = array(
-			'@type'       => 'SearchAction',
-			'target'      => $search_url,
-			'query-input' => 'required name=search_term_string',
-		);
+        // Add search action
+        $params['potentialAction'] = array(
+            '@type'       => 'SearchAction',
+            'target'      => $search_url,
+            'query-input' => 'required name=search_term_string',
+        );
 
-	}
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -24,22 +24,22 @@ 
 	public function create_schema() {
 
 		// Create new jsonld.
-		$home_url = home_url( '/' );
+		$home_url = home_url('/');
 
 		$jsonld = array(
 			'@context'      => 'http://schema.org',
 			'@type'         => 'WebSite',
 			'@id'           => "$home_url#website",
-			'name'          => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
-			'alternateName' => html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES ),
+			'name'          => html_entity_decode(get_bloginfo('name'), ENT_QUOTES),
+			'alternateName' => html_entity_decode(get_bloginfo('description'), ENT_QUOTES),
 			'url'           => $home_url,
 		);
 
 		// Add publisher information.
-		$this->set_publisher( $jsonld );
+		$this->set_publisher($jsonld);
 
 		// Add search action.
-		$this->set_search_action( $jsonld );
+		$this->set_search_action($jsonld);
 
 		/**
 		 * Call the `wl_website_jsonld` filter.
@@ -50,7 +50,7 @@ 
 		 *
 		 * @api
 		 */
-		return apply_filters( 'wl_website_jsonld', $jsonld );
+		return apply_filters('wl_website_jsonld', $jsonld);
 	}
 
 	/**
@@ -60,14 +60,14 @@ 
 	 *
 	 * @since 3.14.0
 	 */
-	private function set_search_action( &$params ) {
+	private function set_search_action(&$params) {
 		/**
 		 * Filter: 'wl_jsonld_search_url' - Allows filtering of the search URL.
 		 *
 		 * @since  3.14.0
 		 * @api    string $search_url The search URL for this site with a `{search_term_string}` variable.
 		 */
-		$search_url = apply_filters( 'wl_jsonld_search_url', home_url( '/' ) . '?s={search_term_string}' );
+		$search_url = apply_filters('wl_jsonld_search_url', home_url('/').'?s={search_term_string}');
 
 		// Add search action
 		$params['potentialAction'] = array(

src/includes/class-wordlift-publisher-ajax-adapter.php

Indentation +40 added lines, -40 removed lines

@@ -16,55 +16,55 @@
  */
 class Wordlift_Publisher_Ajax_Adapter {
 
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	private $publisher_service;
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    private $publisher_service;
 
-	/**
-	 * Create a {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 *
-	 * @param \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since 3.11.0
-	 */
-	public function __construct( $publisher_service ) {
+    /**
+     * Create a {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     *
+     * @param \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since 3.11.0
+     */
+    public function __construct( $publisher_service ) {
 
-		$this->publisher_service = $publisher_service;
+        $this->publisher_service = $publisher_service;
 
-	}
+    }
 
-	/**
-	 * The publisher AJAX action. This function is hook to the `wl_publisher`
-	 * action.
-	 *
-	 * @since 3.11.0
-	 */
-	public function publisher() {
+    /**
+     * The publisher AJAX action. This function is hook to the `wl_publisher`
+     * action.
+     *
+     * @since 3.11.0
+     */
+    public function publisher() {
 
-		// Ensure we don't have garbage before us.
-		ob_clean();
+        // Ensure we don't have garbage before us.
+        ob_clean();
 
-		// Check if the current user can `manage_options`.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_send_json_error( 'Access denied.' );
-		}
+        // Check if the current user can `manage_options`.
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_send_json_error( 'Access denied.' );
+        }
 
-		// No actual search parameter was passed, bail out.
-		if ( ! isset( $_POST['q'] ) || empty( $_POST['q'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Missing
-			wp_send_json_error( 'The q parameter is required.' );
-		}
+        // No actual search parameter was passed, bail out.
+        if ( ! isset( $_POST['q'] ) || empty( $_POST['q'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Missing
+            wp_send_json_error( 'The q parameter is required.' );
+        }
 
-		// Get the response.
-		$response = $this->publisher_service->query( sanitize_text_field( wp_unslash( (string) $_POST['q'] ) ) ); //phpcs:ignore WordPress.Security.NonceVerification.Missing
+        // Get the response.
+        $response = $this->publisher_service->query( sanitize_text_field( wp_unslash( (string) $_POST['q'] ) ) ); //phpcs:ignore WordPress.Security.NonceVerification.Missing
 
-		// Finally output the response.
-		wp_send_json_success( $response );
+        // Finally output the response.
+        wp_send_json_success( $response );
 
-	}
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @since 3.11.0
 	 */
-	public function __construct( $publisher_service ) {
+	public function __construct($publisher_service) {
 
 		$this->publisher_service = $publisher_service;
 
@@ -50,20 +50,20 @@ 
 		ob_clean();
 
 		// Check if the current user can `manage_options`.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_send_json_error( 'Access denied.' );
+		if ( ! current_user_can('manage_options')) {
+			wp_send_json_error('Access denied.');
 		}
 
 		// No actual search parameter was passed, bail out.
-		if ( ! isset( $_POST['q'] ) || empty( $_POST['q'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Missing
-			wp_send_json_error( 'The q parameter is required.' );
+		if ( ! isset($_POST['q']) || empty($_POST['q'])) { //phpcs:ignore WordPress.Security.NonceVerification.Missing
+			wp_send_json_error('The q parameter is required.');
 		}
 
 		// Get the response.
-		$response = $this->publisher_service->query( sanitize_text_field( wp_unslash( (string) $_POST['q'] ) ) ); //phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$response = $this->publisher_service->query(sanitize_text_field(wp_unslash((string) $_POST['q']))); //phpcs:ignore WordPress.Security.NonceVerification.Missing
 
 		// Finally output the response.
-		wp_send_json_success( $response );
+		wp_send_json_success($response);
 
 	}
 

src/includes/class-wordlift-topic-taxonomy-service.php

Indentation +167 added lines, -167 removed lines

@@ -7,172 +7,172 @@
  */
 class Wordlift_Topic_Taxonomy_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.5.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Taxonomy name.
-	 *
-	 * @since 3.5.0
-	 */
-	const TAXONOMY_NAME = 'wl_topic';
-
-	/**
-	 * Taxonomy object type.
-	 *
-	 * @since 3.5.0
-	 */
-	const TAXONOMY_OBJECT_TYPE = 'post';
-
-	/**
-	 * Taxonomy slug.
-	 *
-	 * @since 3.5.0
-	 */
-	const TAXONOMY_SLUG = 'wl_topic';
-
-	/**
-	 * A singleton instance of the Wordlift_Topic_Taxonomy_Service service.
-	 *
-	 * @since 3.5.0
-	 * @access private
-	 * @var \Wordlift_Topic_Taxonomy_Service $instance A singleton instance of Wordlift_Topic_Taxonomy_Service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Topic_Taxonomy_Service instance.
-	 *
-	 * @since 3.5.0
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the Entity service.
-	 *
-	 * @since 3.5.0
-	 * @return Wordlift_Topic_Taxonomy_Service
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Just register the topic taxonomy.
-	 *
-	 * @since 3.5.0
-	 */
-	public function init() {
-
-		// See https://codex.wordpress.org/Function_Reference/register_taxonomy
-		$labels = array(
-			'name'              => _x( 'Topics', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Topic', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Topics', 'wordlift' ),
-			'all_items'         => __( 'All Topics', 'wordlift' ),
-			'parent_item'       => __( 'Parent Topic', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Topic:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Topic', 'wordlift' ),
-			'update_item'       => __( 'Update Topic', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Topic', 'wordlift' ),
-			'new_item_name'     => __( 'New Topic', 'wordlift' ),
-			'menu_name'         => __( 'Topics', 'wordlift' ),
-		);
-
-		$capabilities = array(
-			'manage_terms' => null,
-			'edit_terms'   => null,
-			'delete_terms' => null,
-			'assign_terms' => 'edit_posts',
-		);
-
-		$args = array(
-			'labels'            => $labels,
-			'capabilities'      => $capabilities,
-			'hierarchical'      => true,
-			'show_admin_column' => false,
-			'show_ui'           => false,
-			'rewrite'           => array(
-				'slug' => self::TAXONOMY_SLUG,
-			),
-		);
-
-		// Register taxonomy
-		register_taxonomy(
-			self::TAXONOMY_NAME,
-			self::TAXONOMY_OBJECT_TYPE,
-			$args
-		);
-
-	}
-
-	/**
-	 * Get or create a taxonomy term from a given entity topic.
-	 *
-	 * @since 3.5.0
-	 */
-	public function get_or_create_term_from_topic_entity( $topic ) {
-
-		// Define taxonomy term slug
-		$term_slug = sanitize_title( $topic->post_title );
-		// Look for an existing taxonomy term with a given slug
-		$term = get_term_by( 'slug', $term_slug, self::TAXONOMY_NAME );
-		if ( $term ) {
-			return (int) $term->term_id;
-		}
-		// Otherwise create a new term and return it
-		$result = wp_insert_term(
-			$topic->post_title,
-			self::TAXONOMY_NAME,
-			array(
-				'slug'        => $term_slug,
-				'description' => $topic->post_content,
-			)
-		);
-
-		return (int) $result['term_id'];
-	}
-
-	/**
-	 * Set a topic for a given post.
-	 *
-	 * @since 3.5.0
-	 */
-	public function set_topic_for( $post_id, $topic_id ) {
-		// Retrieve the topic entity post
-		$topic_entity_post = get_post( $topic_id );
-		// If current topic does not exist in db false is returned
-		if ( null === $topic_entity_post ) {
-			return false;
-		}
-		// Create the proper taxonomy term if needed
-		$term_id = $this->get_or_create_term_from_topic_entity( $topic_entity_post );
-		// Link the term to the current post
-		wp_set_post_terms( $post_id, $term_id, self::TAXONOMY_NAME, false );
-		return true;
-	}
-
-	/**
-	 * Unlink any topic for a given post.
-	 *
-	 * @since 3.5.0
-	 */
-	public function unlink_topic_for( $post_id ) {
-		wp_delete_object_term_relationships( $post_id, self::TAXONOMY_NAME );
-	}
+    /**
+     * The Log service.
+     *
+     * @since 3.5.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Taxonomy name.
+     *
+     * @since 3.5.0
+     */
+    const TAXONOMY_NAME = 'wl_topic';
+
+    /**
+     * Taxonomy object type.
+     *
+     * @since 3.5.0
+     */
+    const TAXONOMY_OBJECT_TYPE = 'post';
+
+    /**
+     * Taxonomy slug.
+     *
+     * @since 3.5.0
+     */
+    const TAXONOMY_SLUG = 'wl_topic';
+
+    /**
+     * A singleton instance of the Wordlift_Topic_Taxonomy_Service service.
+     *
+     * @since 3.5.0
+     * @access private
+     * @var \Wordlift_Topic_Taxonomy_Service $instance A singleton instance of Wordlift_Topic_Taxonomy_Service.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Topic_Taxonomy_Service instance.
+     *
+     * @since 3.5.0
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the Entity service.
+     *
+     * @since 3.5.0
+     * @return Wordlift_Topic_Taxonomy_Service
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Just register the topic taxonomy.
+     *
+     * @since 3.5.0
+     */
+    public function init() {
+
+        // See https://codex.wordpress.org/Function_Reference/register_taxonomy
+        $labels = array(
+            'name'              => _x( 'Topics', 'taxonomy general name', 'wordlift' ),
+            'singular_name'     => _x( 'Topic', 'taxonomy singular name', 'wordlift' ),
+            'search_items'      => __( 'Search Topics', 'wordlift' ),
+            'all_items'         => __( 'All Topics', 'wordlift' ),
+            'parent_item'       => __( 'Parent Topic', 'wordlift' ),
+            'parent_item_colon' => __( 'Parent Topic:', 'wordlift' ),
+            'edit_item'         => __( 'Edit Topic', 'wordlift' ),
+            'update_item'       => __( 'Update Topic', 'wordlift' ),
+            'add_new_item'      => __( 'Add New Topic', 'wordlift' ),
+            'new_item_name'     => __( 'New Topic', 'wordlift' ),
+            'menu_name'         => __( 'Topics', 'wordlift' ),
+        );
+
+        $capabilities = array(
+            'manage_terms' => null,
+            'edit_terms'   => null,
+            'delete_terms' => null,
+            'assign_terms' => 'edit_posts',
+        );
+
+        $args = array(
+            'labels'            => $labels,
+            'capabilities'      => $capabilities,
+            'hierarchical'      => true,
+            'show_admin_column' => false,
+            'show_ui'           => false,
+            'rewrite'           => array(
+                'slug' => self::TAXONOMY_SLUG,
+            ),
+        );
+
+        // Register taxonomy
+        register_taxonomy(
+            self::TAXONOMY_NAME,
+            self::TAXONOMY_OBJECT_TYPE,
+            $args
+        );
+
+    }
+
+    /**
+     * Get or create a taxonomy term from a given entity topic.
+     *
+     * @since 3.5.0
+     */
+    public function get_or_create_term_from_topic_entity( $topic ) {
+
+        // Define taxonomy term slug
+        $term_slug = sanitize_title( $topic->post_title );
+        // Look for an existing taxonomy term with a given slug
+        $term = get_term_by( 'slug', $term_slug, self::TAXONOMY_NAME );
+        if ( $term ) {
+            return (int) $term->term_id;
+        }
+        // Otherwise create a new term and return it
+        $result = wp_insert_term(
+            $topic->post_title,
+            self::TAXONOMY_NAME,
+            array(
+                'slug'        => $term_slug,
+                'description' => $topic->post_content,
+            )
+        );
+
+        return (int) $result['term_id'];
+    }
+
+    /**
+     * Set a topic for a given post.
+     *
+     * @since 3.5.0
+     */
+    public function set_topic_for( $post_id, $topic_id ) {
+        // Retrieve the topic entity post
+        $topic_entity_post = get_post( $topic_id );
+        // If current topic does not exist in db false is returned
+        if ( null === $topic_entity_post ) {
+            return false;
+        }
+        // Create the proper taxonomy term if needed
+        $term_id = $this->get_or_create_term_from_topic_entity( $topic_entity_post );
+        // Link the term to the current post
+        wp_set_post_terms( $post_id, $term_id, self::TAXONOMY_NAME, false );
+        return true;
+    }
+
+    /**
+     * Unlink any topic for a given post.
+     *
+     * @since 3.5.0
+     */
+    public function unlink_topic_for( $post_id ) {
+        wp_delete_object_term_relationships( $post_id, self::TAXONOMY_NAME );
+    }
 
 }

Spacing +23 added lines, -23 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Entity_Service');
 
 		// Set the singleton instance.
 		self::$instance = $this;
@@ -80,17 +80,17 @@ 
 
 		// See https://codex.wordpress.org/Function_Reference/register_taxonomy
 		$labels = array(
-			'name'              => _x( 'Topics', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Topic', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Topics', 'wordlift' ),
-			'all_items'         => __( 'All Topics', 'wordlift' ),
-			'parent_item'       => __( 'Parent Topic', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Topic:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Topic', 'wordlift' ),
-			'update_item'       => __( 'Update Topic', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Topic', 'wordlift' ),
-			'new_item_name'     => __( 'New Topic', 'wordlift' ),
-			'menu_name'         => __( 'Topics', 'wordlift' ),
+			'name'              => _x('Topics', 'taxonomy general name', 'wordlift'),
+			'singular_name'     => _x('Topic', 'taxonomy singular name', 'wordlift'),
+			'search_items'      => __('Search Topics', 'wordlift'),
+			'all_items'         => __('All Topics', 'wordlift'),
+			'parent_item'       => __('Parent Topic', 'wordlift'),
+			'parent_item_colon' => __('Parent Topic:', 'wordlift'),
+			'edit_item'         => __('Edit Topic', 'wordlift'),
+			'update_item'       => __('Update Topic', 'wordlift'),
+			'add_new_item'      => __('Add New Topic', 'wordlift'),
+			'new_item_name'     => __('New Topic', 'wordlift'),
+			'menu_name'         => __('Topics', 'wordlift'),
 		);
 
 		$capabilities = array(
@@ -125,13 +125,13 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	public function get_or_create_term_from_topic_entity( $topic ) {
+	public function get_or_create_term_from_topic_entity($topic) {
 
 		// Define taxonomy term slug
-		$term_slug = sanitize_title( $topic->post_title );
+		$term_slug = sanitize_title($topic->post_title);
 		// Look for an existing taxonomy term with a given slug
-		$term = get_term_by( 'slug', $term_slug, self::TAXONOMY_NAME );
-		if ( $term ) {
+		$term = get_term_by('slug', $term_slug, self::TAXONOMY_NAME);
+		if ($term) {
 			return (int) $term->term_id;
 		}
 		// Otherwise create a new term and return it
@@ -152,17 +152,17 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	public function set_topic_for( $post_id, $topic_id ) {
+	public function set_topic_for($post_id, $topic_id) {
 		// Retrieve the topic entity post
-		$topic_entity_post = get_post( $topic_id );
+		$topic_entity_post = get_post($topic_id);
 		// If current topic does not exist in db false is returned
-		if ( null === $topic_entity_post ) {
+		if (null === $topic_entity_post) {
 			return false;
 		}
 		// Create the proper taxonomy term if needed
-		$term_id = $this->get_or_create_term_from_topic_entity( $topic_entity_post );
+		$term_id = $this->get_or_create_term_from_topic_entity($topic_entity_post);
 		// Link the term to the current post
-		wp_set_post_terms( $post_id, $term_id, self::TAXONOMY_NAME, false );
+		wp_set_post_terms($post_id, $term_id, self::TAXONOMY_NAME, false);
 		return true;
 	}
 
@@ -171,8 +171,8 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	public function unlink_topic_for( $post_id ) {
-		wp_delete_object_term_relationships( $post_id, self::TAXONOMY_NAME );
+	public function unlink_topic_for($post_id) {
+		wp_delete_object_term_relationships($post_id, self::TAXONOMY_NAME);
 	}
 
 }