insideout10 / wordlift-plugin

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

Indentation +227 added lines, -227 removed lines

@@ -18,235 +18,235 @@
  */
 class Wordlift_Publisher_Service {
 
-	protected function __construct() {
-
-	}
-
-	private static $instance = null;
-
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Counts the number of potential publishers.
-	 *
-	 * @return int The number of potential publishers.
-	 * @since 3.11.0
-	 */
-	public function count() {
-
-		// Search for entities which are either a Person
-		// or Organization.
-
-		// Get only the ids as all we need is the count.
-		$entities = get_posts(
-			array(
-				'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-				'post_status'    => 'publish',
-				'posts_per_page' => - 1,
-				'tax_query'      => array(
-					array(
-						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-						'field'    => 'slug',
-						'terms'    => array( 'organization', 'person' ),
-					),
-				),
-				'fields'         => 'ids',
-			)
-		);
-
-		// Finally return the count.
-		return count( $entities );
-	}
-
-	/**
-	 * Search SQL filter for matching against post title only.
-	 *
-	 * @link    http://wordpress.stackexchange.com/a/11826/1685
-	 *
-	 * @since   3.15.0
-	 *
-	 * @param string   $search The search string.
-	 * @param WP_Query $wp_query The {@link WP_Query} instance.
-	 *
-	 * @return array|string An array of results.
-	 */
-	public function limit_search_to_title( $search, $wp_query ) {
-
-		// Bail out if the search or the `search_terms` haven't been set.
-		if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
-			return $search;
-		}
-
-		global $wpdb;
-
-		$query_vars = $wp_query->query_vars;
-		$percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
-		$search     = array();
-
-		foreach ( (array) $query_vars['search_terms'] as $term ) {
-			$search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
-		}
-
-		if ( ! is_user_logged_in() ) {
-			$search[] = "$wpdb->posts.post_password = ''";
-		}
-
-		$search = ' AND ' . implode( ' AND ', $search );
-
-		return $search;
-	}
-
-	/**
-	 * Query WP for potential publishers, i.e. {@link WP_Post}s which are associated`
-	 * with `wl_entity_type` (taxonomy) terms of `Organization` or `Person`.
-	 *
-	 * @param string $filter The title filter.
-	 *
-	 * @return array An array of results in a select2 friendly format.
-	 * @since 3.11.0
-	 */
-	public function query( $filter = '' ) {
-
-		// Search for the filter in the titles only.
-		add_filter(
-			'posts_search',
-			array(
-				$this,
-				'limit_search_to_title',
-			),
-			10,
-			2
-		);
-
-		/*
+    protected function __construct() {
+
+    }
+
+    private static $instance = null;
+
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Counts the number of potential publishers.
+     *
+     * @return int The number of potential publishers.
+     * @since 3.11.0
+     */
+    public function count() {
+
+        // Search for entities which are either a Person
+        // or Organization.
+
+        // Get only the ids as all we need is the count.
+        $entities = get_posts(
+            array(
+                'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+                'post_status'    => 'publish',
+                'posts_per_page' => - 1,
+                'tax_query'      => array(
+                    array(
+                        'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                        'field'    => 'slug',
+                        'terms'    => array( 'organization', 'person' ),
+                    ),
+                ),
+                'fields'         => 'ids',
+            )
+        );
+
+        // Finally return the count.
+        return count( $entities );
+    }
+
+    /**
+     * Search SQL filter for matching against post title only.
+     *
+     * @link    http://wordpress.stackexchange.com/a/11826/1685
+     *
+     * @since   3.15.0
+     *
+     * @param string   $search The search string.
+     * @param WP_Query $wp_query The {@link WP_Query} instance.
+     *
+     * @return array|string An array of results.
+     */
+    public function limit_search_to_title( $search, $wp_query ) {
+
+        // Bail out if the search or the `search_terms` haven't been set.
+        if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
+            return $search;
+        }
+
+        global $wpdb;
+
+        $query_vars = $wp_query->query_vars;
+        $percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
+        $search     = array();
+
+        foreach ( (array) $query_vars['search_terms'] as $term ) {
+            $search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
+        }
+
+        if ( ! is_user_logged_in() ) {
+            $search[] = "$wpdb->posts.post_password = ''";
+        }
+
+        $search = ' AND ' . implode( ' AND ', $search );
+
+        return $search;
+    }
+
+    /**
+     * Query WP for potential publishers, i.e. {@link WP_Post}s which are associated`
+     * with `wl_entity_type` (taxonomy) terms of `Organization` or `Person`.
+     *
+     * @param string $filter The title filter.
+     *
+     * @return array An array of results in a select2 friendly format.
+     * @since 3.11.0
+     */
+    public function query( $filter = '' ) {
+
+        // Search for the filter in the titles only.
+        add_filter(
+            'posts_search',
+            array(
+                $this,
+                'limit_search_to_title',
+            ),
+            10,
+            2
+        );
+
+        /*
 		 * Search for entities which are either a Person
 		 * or Organization. Sort the results by title in ascending order.
 		 */
-		$entities = get_posts(
-			array(
-				'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-				'post_status'    => 'publish',
-				'posts_per_page' => - 1,
-				'tax_query'      => array(
-					array(
-						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-						'field'    => 'slug',
-						'terms'    => array( 'organization', 'person' ),
-					),
-				),
-				's'              => $filter,
-				'orderby'        => 'title',
-				'order'          => 'ASC',
-			)
-		);
-
-		// Remove the search filter added before the query.
-		remove_filter(
-			'posts_search',
-			array(
-				$this,
-				'limit_search_to_title',
-			),
-			10,
-			2
-		);
-
-		// Set a reference to ourselves to pass to the closure.
-		$publisher_service = $this;
-
-		// Map the results in a `Select2` compatible array.
-		return array_map(
-			function ( $entity ) use ( $publisher_service ) {
-				$type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-				$thumb_id = get_post_thumbnail_id( $entity->ID );
-
-				return array(
-					'id'            => $entity->ID,
-					'text'          => $entity->post_title,
-					'type'          => $type[0]->name,
-					'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
-				);
-			},
-			$entities
-		);
-	}
-
-	/**
-	 * Get the thumbnail's URL.
-	 *
-	 * @param int    $attachment_id The attachment id.
-	 * @param string $size The attachment size (default = 'thumbnail').
-	 *
-	 * @return string|bool The image URL or false if not found.
-	 * @since 3.11.0
-	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
-
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
-
-		return isset( $image['0'] ) ? $image['0'] : false;
-	}
-
-	/**
-	 * Add additional instructions to featured image metabox
-	 * when the entity type is the publisher.
-	 *
-	 * @param string $content Current metabox content.
-	 *
-	 * @return string $content metabox content with additional instructions.
-	 * @since  3.19.0
-	 */
-	public function add_featured_image_instruction( $content ) {
-		// Get the current post ID.
-		$post_id = get_the_ID();
-
-		// Get the publisher id.
-		$publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-
-		// Bail if for some reason the post id is not set.
-		if (
-			empty( $post_id ) ||
-			$post_id !== (int) $publisher_id
-		) {
-			return $content;
-		}
-
-		$terms = wp_get_post_terms(
-			$post_id, // The post id.
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, // The taxonomy slug.
-			array(
-				'fields' => 'slugs',
-				// We don't need all fields, but only slugs.
-			)
-		);
-
-		// Check that the entity type is "Organization".
-		if ( in_array( 'organization', $terms, true ) ) {
-			// Add the featured image description when the type is "Organization".
-
-			$link     = sprintf(
-				'<a target="_blank" href="%s">%s</a>',
-				esc_attr__( 'https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift' ),
-				esc_html__( 'AMP logo guidelines', 'wordlift' )
-			);
-			$content .= sprintf(
-				'<p>'
-								/* translators: %s: AMP logo guidelines. */
-								 . esc_html_x( 'According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift' )
-								 . '</p>',
-				$link
-			);
-		}
-
-		// Finally return the content.
-		return $content;
-	}
+        $entities = get_posts(
+            array(
+                'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+                'post_status'    => 'publish',
+                'posts_per_page' => - 1,
+                'tax_query'      => array(
+                    array(
+                        'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                        'field'    => 'slug',
+                        'terms'    => array( 'organization', 'person' ),
+                    ),
+                ),
+                's'              => $filter,
+                'orderby'        => 'title',
+                'order'          => 'ASC',
+            )
+        );
+
+        // Remove the search filter added before the query.
+        remove_filter(
+            'posts_search',
+            array(
+                $this,
+                'limit_search_to_title',
+            ),
+            10,
+            2
+        );
+
+        // Set a reference to ourselves to pass to the closure.
+        $publisher_service = $this;
+
+        // Map the results in a `Select2` compatible array.
+        return array_map(
+            function ( $entity ) use ( $publisher_service ) {
+                $type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+                $thumb_id = get_post_thumbnail_id( $entity->ID );
+
+                return array(
+                    'id'            => $entity->ID,
+                    'text'          => $entity->post_title,
+                    'type'          => $type[0]->name,
+                    'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
+                );
+            },
+            $entities
+        );
+    }
+
+    /**
+     * Get the thumbnail's URL.
+     *
+     * @param int    $attachment_id The attachment id.
+     * @param string $size The attachment size (default = 'thumbnail').
+     *
+     * @return string|bool The image URL or false if not found.
+     * @since 3.11.0
+     */
+    public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+
+        $image = wp_get_attachment_image_src( $attachment_id, $size );
+
+        return isset( $image['0'] ) ? $image['0'] : false;
+    }
+
+    /**
+     * Add additional instructions to featured image metabox
+     * when the entity type is the publisher.
+     *
+     * @param string $content Current metabox content.
+     *
+     * @return string $content metabox content with additional instructions.
+     * @since  3.19.0
+     */
+    public function add_featured_image_instruction( $content ) {
+        // Get the current post ID.
+        $post_id = get_the_ID();
+
+        // Get the publisher id.
+        $publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
+
+        // Bail if for some reason the post id is not set.
+        if (
+            empty( $post_id ) ||
+            $post_id !== (int) $publisher_id
+        ) {
+            return $content;
+        }
+
+        $terms = wp_get_post_terms(
+            $post_id, // The post id.
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, // The taxonomy slug.
+            array(
+                'fields' => 'slugs',
+                // We don't need all fields, but only slugs.
+            )
+        );
+
+        // Check that the entity type is "Organization".
+        if ( in_array( 'organization', $terms, true ) ) {
+            // Add the featured image description when the type is "Organization".
+
+            $link     = sprintf(
+                '<a target="_blank" href="%s">%s</a>',
+                esc_attr__( 'https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift' ),
+                esc_html__( 'AMP logo guidelines', 'wordlift' )
+            );
+            $content .= sprintf(
+                '<p>'
+                                /* translators: %s: AMP logo guidelines. */
+                                    . esc_html_x( 'According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift' )
+                                    . '</p>',
+                $link
+            );
+        }
+
+        // Finally return the content.
+        return $content;
+    }
 
 }

Spacing +28 added lines, -28 removed lines

@@ -26,7 +26,7 @@ 
 
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -49,12 +49,12 @@ 
 			array(
 				'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 				'post_status'    => 'publish',
-				'posts_per_page' => - 1,
+				'posts_per_page' => -1,
 				'tax_query'      => array(
 					array(
 						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 						'field'    => 'slug',
-						'terms'    => array( 'organization', 'person' ),
+						'terms'    => array('organization', 'person'),
 					),
 				),
 				'fields'         => 'ids',
@@ -62,7 +62,7 @@ 
 		);
 
 		// Finally return the count.
-		return count( $entities );
+		return count($entities);
 	}
 
 	/**
@@ -77,28 +77,28 @@ 
 	 *
 	 * @return array|string An array of results.
 	 */
-	public function limit_search_to_title( $search, $wp_query ) {
+	public function limit_search_to_title($search, $wp_query) {
 
 		// Bail out if the search or the `search_terms` haven't been set.
-		if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
+		if (empty($search) || empty($wp_query->query_vars['search_terms'])) {
 			return $search;
 		}
 
 		global $wpdb;
 
 		$query_vars = $wp_query->query_vars;
-		$percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
+		$percent    = ! empty($query_vars['exact']) ? '' : '%';
 		$search     = array();
 
-		foreach ( (array) $query_vars['search_terms'] as $term ) {
-			$search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
+		foreach ((array) $query_vars['search_terms'] as $term) {
+			$search[] = $wpdb->prepare("$wpdb->posts.post_title LIKE %s", $percent.$wpdb->esc_like($term).$percent);
 		}
 
-		if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in()) {
 			$search[] = "$wpdb->posts.post_password = ''";
 		}
 
-		$search = ' AND ' . implode( ' AND ', $search );
+		$search = ' AND '.implode(' AND ', $search);
 
 		return $search;
 	}
@@ -112,7 +112,7 @@ 
 	 * @return array An array of results in a select2 friendly format.
 	 * @since 3.11.0
 	 */
-	public function query( $filter = '' ) {
+	public function query($filter = '') {
 
 		// Search for the filter in the titles only.
 		add_filter(
@@ -133,12 +133,12 @@ 
 			array(
 				'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 				'post_status'    => 'publish',
-				'posts_per_page' => - 1,
+				'posts_per_page' => -1,
 				'tax_query'      => array(
 					array(
 						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 						'field'    => 'slug',
-						'terms'    => array( 'organization', 'person' ),
+						'terms'    => array('organization', 'person'),
 					),
 				),
 				's'              => $filter,
@@ -163,15 +163,15 @@ 
 
 		// Map the results in a `Select2` compatible array.
 		return array_map(
-			function ( $entity ) use ( $publisher_service ) {
-				$type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-				$thumb_id = get_post_thumbnail_id( $entity->ID );
+			function($entity) use ($publisher_service) {
+				$type     = wp_get_post_terms($entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
+				$thumb_id = get_post_thumbnail_id($entity->ID);
 
 				return array(
 					'id'            => $entity->ID,
 					'text'          => $entity->post_title,
 					'type'          => $type[0]->name,
-					'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
+					'thumbnail_url' => $publisher_service->get_attachment_image_url($thumb_id),
 				);
 			},
 			$entities
@@ -187,11 +187,11 @@ 
 	 * @return string|bool The image URL or false if not found.
 	 * @since 3.11.0
 	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+	public function get_attachment_image_url($attachment_id, $size = 'thumbnail') {
 
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
+		$image = wp_get_attachment_image_src($attachment_id, $size);
 
-		return isset( $image['0'] ) ? $image['0'] : false;
+		return isset($image['0']) ? $image['0'] : false;
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 	 * @return string $content metabox content with additional instructions.
 	 * @since  3.19.0
 	 */
-	public function add_featured_image_instruction( $content ) {
+	public function add_featured_image_instruction($content) {
 		// Get the current post ID.
 		$post_id = get_the_ID();
 
@@ -212,7 +212,7 @@ 
 
 		// Bail if for some reason the post id is not set.
 		if (
-			empty( $post_id ) ||
+			empty($post_id) ||
 			$post_id !== (int) $publisher_id
 		) {
 			return $content;
@@ -228,18 +228,18 @@ 
 		);
 
 		// Check that the entity type is "Organization".
-		if ( in_array( 'organization', $terms, true ) ) {
+		if (in_array('organization', $terms, true)) {
 			// Add the featured image description when the type is "Organization".
 
-			$link     = sprintf(
+			$link = sprintf(
 				'<a target="_blank" href="%s">%s</a>',
-				esc_attr__( 'https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift' ),
-				esc_html__( 'AMP logo guidelines', 'wordlift' )
+				esc_attr__('https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift'),
+				esc_html__('AMP logo guidelines', 'wordlift')
 			);
 			$content .= sprintf(
 				'<p>'
 								/* translators: %s: AMP logo guidelines. */
-								 . esc_html_x( 'According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift' )
+								 . esc_html_x('According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift')
 								 . '</p>',
 				$link
 			);

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

Indentation +188 added lines, -188 removed lines

@@ -20,199 +20,199 @@
  */
 class Wordlift_Uri_Service {
 
-	/**
-	 * The title regex to sanitize titles in paths.
-	 *
-	 * According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
-	 * ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-	 * "$" | ","
-	 *
-	 * We also remove the space and the UTF-8 BOM sequence.
-	 *
-	 * @since 3.7.1
-	 */
-	const INVALID_CHARACTERS = "/[ ;\\/?:@&=\\+\\\$,]|(?:\\xEF\\xBB\\xBF)/";
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The global WordPress database connection.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \wpdb $wpdb The global WordPress database connection.
-	 */
-	private $wpdb;
-
-	/**
-	 * The {@link Wordlift_Uri_Service} singleton instance.
-	 *
-	 * @since  3.7.2
-	 * @access private
-	 * @var \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create an instance of Wordlift_Uri_Service.
-	 *
-	 * @param \wpdb $wpdb The global WordPress database connection.
-	 *
-	 * @since 3.6.0
-	 */
-	public function __construct( $wpdb ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
-
-		$this->wpdb = $wpdb;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the {@link Wordlift_Uri_Service} singleton instance.
-	 *
-	 * @return \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
-	 * @since 3.7.2
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Sanitizes an URI path by replacing the not allowed characters with an underscore.
-	 *
-	 * @param string $path The path to sanitize.
-	 * @param string $char The replacement character (by default an underscore).
-	 *
-	 * @return string The sanitized path.
-	 * @since 3.7.2
-	 * @uses  sanitize_title() to manage not ASCII chars
-	 *
-	 * @see   https://codex.wordpress.org/Function_Reference/sanitize_title
-	 */
-	public function sanitize_path( $path, $char = '_' ) {
-
-		// Ensure the path is ASCII.
-		// see https://github.com/insideout10/wordlift-plugin/issues/386
-		// $path_ascii = mb_convert_encoding( $path, 'ASCII' );
-
-		return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
-	}
-
-	/**
-	 * Build an entity uri for a given title. The uri is composed using a given
-	 * post_type and a title. If already exists an entity e2 with a given uri a
-	 * numeric suffix is added. If a schema type is given entities with same label
-	 * and same type are overridden.
-	 *
-	 * @param string  $title A post title.
-	 * @param string  $post_type A post type. Default value is 'entity'
-	 * @param string  $schema_type A schema org type.
-	 * @param integer $increment_digit A digit used to call recursively the same function.
-	 *
-	 * @return string Returns an uri.
-	 * @deprecated don't use anywhere else, since we're refactoring the way URIs are built in the global function wl_build_entity_uri.
-	 * @since 3.5.0
-	 */
-	public function build_uri( $title, $post_type, $schema_type = null, $increment_digit = 0 ) {
-
-		// Get the entity slug suffix digit
-		$suffix_digit = $increment_digit + 1;
-
-		// Get a sanitized uri for a given title.
-		/*
+    /**
+     * The title regex to sanitize titles in paths.
+     *
+     * According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
+     * ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+     * "$" | ","
+     *
+     * We also remove the space and the UTF-8 BOM sequence.
+     *
+     * @since 3.7.1
+     */
+    const INVALID_CHARACTERS = "/[ ;\\/?:@&=\\+\\\$,]|(?:\\xEF\\xBB\\xBF)/";
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The global WordPress database connection.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \wpdb $wpdb The global WordPress database connection.
+     */
+    private $wpdb;
+
+    /**
+     * The {@link Wordlift_Uri_Service} singleton instance.
+     *
+     * @since  3.7.2
+     * @access private
+     * @var \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create an instance of Wordlift_Uri_Service.
+     *
+     * @param \wpdb $wpdb The global WordPress database connection.
+     *
+     * @since 3.6.0
+     */
+    public function __construct( $wpdb ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
+
+        $this->wpdb = $wpdb;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the {@link Wordlift_Uri_Service} singleton instance.
+     *
+     * @return \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
+     * @since 3.7.2
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Sanitizes an URI path by replacing the not allowed characters with an underscore.
+     *
+     * @param string $path The path to sanitize.
+     * @param string $char The replacement character (by default an underscore).
+     *
+     * @return string The sanitized path.
+     * @since 3.7.2
+     * @uses  sanitize_title() to manage not ASCII chars
+     *
+     * @see   https://codex.wordpress.org/Function_Reference/sanitize_title
+     */
+    public function sanitize_path( $path, $char = '_' ) {
+
+        // Ensure the path is ASCII.
+        // see https://github.com/insideout10/wordlift-plugin/issues/386
+        // $path_ascii = mb_convert_encoding( $path, 'ASCII' );
+
+        return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
+    }
+
+    /**
+     * Build an entity uri for a given title. The uri is composed using a given
+     * post_type and a title. If already exists an entity e2 with a given uri a
+     * numeric suffix is added. If a schema type is given entities with same label
+     * and same type are overridden.
+     *
+     * @param string  $title A post title.
+     * @param string  $post_type A post type. Default value is 'entity'
+     * @param string  $schema_type A schema org type.
+     * @param integer $increment_digit A digit used to call recursively the same function.
+     *
+     * @return string Returns an uri.
+     * @deprecated don't use anywhere else, since we're refactoring the way URIs are built in the global function wl_build_entity_uri.
+     * @since 3.5.0
+     */
+    public function build_uri( $title, $post_type, $schema_type = null, $increment_digit = 0 ) {
+
+        // Get the entity slug suffix digit
+        $suffix_digit = $increment_digit + 1;
+
+        // Get a sanitized uri for a given title.
+        /*
 		 * The call takes into consideration URL encoding.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/885
 		 *
 		 * @since 3.20.0
 		 */
-		$entity_slug = urldecode( wl_sanitize_uri_path( $title ) )
-					   . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
-
-		// Compose a candidate uri.
-		$new_entity_uri = sprintf(
-			'%s/%s/%s',
-			untrailingslashit( wl_configuration_get_redlink_dataset_uri() ),
-			$post_type,
-			$entity_slug
-		);
-
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
-
-		$content = Wordpress_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
-		$post_id = $content && is_a( $content->get_bag(), '\WP_Post' ) ? $content->get_bag()->ID : null;
-
-		// If the post does not exist, then the new uri is returned
-		if ( ! is_numeric( $post_id ) ) {
-			$this->log->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
-
-			return $new_entity_uri;
-		}
-
-		// If schema_type is equal to schema org type of post x, then the new uri is returned
-		$schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
-
-		// @todo: we shouldn't rely on css classes to take such decisions.
-		if ( $schema_type === $schema_post_type['css_class'] ) {
-			$this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
-
-			return $new_entity_uri;
-		}
-
-		// Otherwise the same function is called recursively
-		return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
-	}
-
-	/**
-	 *
-	 * @param string  $title A post title.
-	 * @param string  $taxonomy A post type. Default value is 'entity'
-	 * @param integer $increment_digit A digit used to call recursively the same function.
-	 *
-	 * @return string Returns an uri.
-	 * @since 3.32.0
-	 */
-	public function build_term_uri( $title, $taxonomy, $increment_digit = 0 ) {
-
-		// Get the entity slug suffix digit
-		$suffix_digit = $increment_digit + 1;
-
-		$entity_slug = urldecode( $title )
-					   . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
-
-		// Compose a candidate uri.
-		$new_entity_uri = sprintf(
-			'%s/term/%s/%s',
-			Wordlift_Configuration_Service::get_instance()->get_dataset_uri(),
-			$taxonomy,
-			$entity_slug
-		);
-
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
-
-		$content = Wordpress_Term_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
-		$term_id = $content ? $content->get_bag()->term_id : null;
-
-		// If the post does not exist, then the new uri is returned
-		if ( ! is_numeric( $term_id ) ) {
-			$this->log->trace( "Going to return uri [ new_term_entity_uri :: $new_entity_uri ]" );
-
-			return $new_entity_uri;
-		}
-
-		// Otherwise the same function is called recursively
-		return $this->build_term_uri( $title, $taxonomy, ++ $increment_digit );
-	}
+        $entity_slug = urldecode( wl_sanitize_uri_path( $title ) )
+                        . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
+
+        // Compose a candidate uri.
+        $new_entity_uri = sprintf(
+            '%s/%s/%s',
+            untrailingslashit( wl_configuration_get_redlink_dataset_uri() ),
+            $post_type,
+            $entity_slug
+        );
+
+        $this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+
+        $content = Wordpress_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
+        $post_id = $content && is_a( $content->get_bag(), '\WP_Post' ) ? $content->get_bag()->ID : null;
+
+        // If the post does not exist, then the new uri is returned
+        if ( ! is_numeric( $post_id ) ) {
+            $this->log->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+
+            return $new_entity_uri;
+        }
+
+        // If schema_type is equal to schema org type of post x, then the new uri is returned
+        $schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+
+        // @todo: we shouldn't rely on css classes to take such decisions.
+        if ( $schema_type === $schema_post_type['css_class'] ) {
+            $this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
+
+            return $new_entity_uri;
+        }
+
+        // Otherwise the same function is called recursively
+        return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
+    }
+
+    /**
+     *
+     * @param string  $title A post title.
+     * @param string  $taxonomy A post type. Default value is 'entity'
+     * @param integer $increment_digit A digit used to call recursively the same function.
+     *
+     * @return string Returns an uri.
+     * @since 3.32.0
+     */
+    public function build_term_uri( $title, $taxonomy, $increment_digit = 0 ) {
+
+        // Get the entity slug suffix digit
+        $suffix_digit = $increment_digit + 1;
+
+        $entity_slug = urldecode( $title )
+                        . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
+
+        // Compose a candidate uri.
+        $new_entity_uri = sprintf(
+            '%s/term/%s/%s',
+            Wordlift_Configuration_Service::get_instance()->get_dataset_uri(),
+            $taxonomy,
+            $entity_slug
+        );
+
+        $this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+
+        $content = Wordpress_Term_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
+        $term_id = $content ? $content->get_bag()->term_id : null;
+
+        // If the post does not exist, then the new uri is returned
+        if ( ! is_numeric( $term_id ) ) {
+            $this->log->trace( "Going to return uri [ new_term_entity_uri :: $new_entity_uri ]" );
+
+            return $new_entity_uri;
+        }
+
+        // Otherwise the same function is called recursively
+        return $this->build_term_uri( $title, $taxonomy, ++ $increment_digit );
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -67,9 +67,9 @@ 
 	 *
 	 * @since 3.6.0
 	 */
-	public function __construct( $wpdb ) {
+	public function __construct($wpdb) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Uri_Service');
 
 		$this->wpdb = $wpdb;
 
@@ -100,13 +100,13 @@ 
 	 *
 	 * @see   https://codex.wordpress.org/Function_Reference/sanitize_title
 	 */
-	public function sanitize_path( $path, $char = '_' ) {
+	public function sanitize_path($path, $char = '_') {
 
 		// Ensure the path is ASCII.
 		// see https://github.com/insideout10/wordlift-plugin/issues/386
 		// $path_ascii = mb_convert_encoding( $path, 'ASCII' );
 
-		return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
+		return sanitize_title(preg_replace(self::INVALID_CHARACTERS, $char, stripslashes($path)));
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 * @deprecated don't use anywhere else, since we're refactoring the way URIs are built in the global function wl_build_entity_uri.
 	 * @since 3.5.0
 	 */
-	public function build_uri( $title, $post_type, $schema_type = null, $increment_digit = 0 ) {
+	public function build_uri($title, $post_type, $schema_type = null, $increment_digit = 0) {
 
 		// Get the entity slug suffix digit
 		$suffix_digit = $increment_digit + 1;
@@ -137,41 +137,41 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$entity_slug = urldecode( wl_sanitize_uri_path( $title ) )
-					   . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
+		$entity_slug = urldecode(wl_sanitize_uri_path($title))
+					   . (0 === $increment_digit ? '' : '_'.$suffix_digit);
 
 		// Compose a candidate uri.
 		$new_entity_uri = sprintf(
 			'%s/%s/%s',
-			untrailingslashit( wl_configuration_get_redlink_dataset_uri() ),
+			untrailingslashit(wl_configuration_get_redlink_dataset_uri()),
 			$post_type,
 			$entity_slug
 		);
 
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+		$this->log->trace("Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]");
 
-		$content = Wordpress_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
-		$post_id = $content && is_a( $content->get_bag(), '\WP_Post' ) ? $content->get_bag()->ID : null;
+		$content = Wordpress_Content_Service::get_instance()->get_by_entity_id($new_entity_uri);
+		$post_id = $content && is_a($content->get_bag(), '\WP_Post') ? $content->get_bag()->ID : null;
 
 		// If the post does not exist, then the new uri is returned
-		if ( ! is_numeric( $post_id ) ) {
-			$this->log->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ( ! is_numeric($post_id)) {
+			$this->log->trace("Going to return uri [ new_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// If schema_type is equal to schema org type of post x, then the new uri is returned
-		$schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+		$schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get($post_id);
 
 		// @todo: we shouldn't rely on css classes to take such decisions.
-		if ( $schema_type === $schema_post_type['css_class'] ) {
-			$this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ($schema_type === $schema_post_type['css_class']) {
+			$this->log->trace("An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// Otherwise the same function is called recursively
-		return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
+		return $this->build_uri($title, $post_type, $schema_type, ++ $increment_digit);
 	}
 
 	/**
@@ -183,13 +183,13 @@ 
 	 * @return string Returns an uri.
 	 * @since 3.32.0
 	 */
-	public function build_term_uri( $title, $taxonomy, $increment_digit = 0 ) {
+	public function build_term_uri($title, $taxonomy, $increment_digit = 0) {
 
 		// Get the entity slug suffix digit
 		$suffix_digit = $increment_digit + 1;
 
-		$entity_slug = urldecode( $title )
-					   . ( 0 === $increment_digit ? '' : '_' . $suffix_digit );
+		$entity_slug = urldecode($title)
+					   . (0 === $increment_digit ? '' : '_'.$suffix_digit);
 
 		// Compose a candidate uri.
 		$new_entity_uri = sprintf(
@@ -199,20 +199,20 @@ 
 			$entity_slug
 		);
 
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+		$this->log->trace("Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]");
 
-		$content = Wordpress_Term_Content_Service::get_instance()->get_by_entity_id( $new_entity_uri );
+		$content = Wordpress_Term_Content_Service::get_instance()->get_by_entity_id($new_entity_uri);
 		$term_id = $content ? $content->get_bag()->term_id : null;
 
 		// If the post does not exist, then the new uri is returned
-		if ( ! is_numeric( $term_id ) ) {
-			$this->log->trace( "Going to return uri [ new_term_entity_uri :: $new_entity_uri ]" );
+		if ( ! is_numeric($term_id)) {
+			$this->log->trace("Going to return uri [ new_term_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// Otherwise the same function is called recursively
-		return $this->build_term_uri( $title, $taxonomy, ++ $increment_digit );
+		return $this->build_term_uri($title, $taxonomy, ++ $increment_digit);
 	}
 
 }

src/includes/class-wordlift-batch-action.php

Indentation +47 added lines, -47 removed lines

@@ -8,61 +8,61 @@
 
 class Wordlift_Batch_Action {
 
-	public static function process( $post_type, $offset, $query, $callback ) {
+    public static function process( $post_type, $offset, $query, $callback ) {
 
-		$posts_per_page = 10;
+        $posts_per_page = 10;
 
-		$args = array_merge(
-			self::get_args( $post_type, $query ),
-			array(
-				'offset'         => $offset,
-				'posts_per_page' => $posts_per_page,
-			)
-		);
+        $args = array_merge(
+            self::get_args( $post_type, $query ),
+            array(
+                'offset'         => $offset,
+                'posts_per_page' => $posts_per_page,
+            )
+        );
 
-		$post_ids = get_posts( $args );
+        $post_ids = get_posts( $args );
 
-		foreach ( $post_ids as $post_id ) {
-			call_user_func( $callback, $post_id );
-		}
+        foreach ( $post_ids as $post_id ) {
+            call_user_func( $callback, $post_id );
+        }
 
-		return array(
-			'current' => $offset,
-			'next'    => $offset + $posts_per_page,
-			'count'   => self::count( $post_type, $query ),
-		);
-	}
+        return array(
+            'current' => $offset,
+            'next'    => $offset + $posts_per_page,
+            'count'   => self::count( $post_type, $query ),
+        );
+    }
 
-	public static function count( $post_type, $query ) {
-		$args = array_merge(
-			self::get_args( $post_type, $query ),
-			array(
-				'posts_per_page' => - 1,
-			)
-		);
+    public static function count( $post_type, $query ) {
+        $args = array_merge(
+            self::get_args( $post_type, $query ),
+            array(
+                'posts_per_page' => - 1,
+            )
+        );
 
-		return count( get_posts( $args ) );
-	}
+        return count( get_posts( $args ) );
+    }
 
-	private static function get_args( $post_type, $query ) {
+    private static function get_args( $post_type, $query ) {
 
-		return array_merge(
-			array(
-				'fields'        => 'ids',
-				'post_type'     => $post_type,
-				'post_status'   => array(
-					'publish',
-					'future',
-					'draft',
-					'pending',
-					'private',
-					'auto-draft',
-					'inherit',
-				),
-				'cache_results' => false,
-			),
-			$query
-		);
-	}
+        return array_merge(
+            array(
+                'fields'        => 'ids',
+                'post_type'     => $post_type,
+                'post_status'   => array(
+                    'publish',
+                    'future',
+                    'draft',
+                    'pending',
+                    'private',
+                    'auto-draft',
+                    'inherit',
+                ),
+                'cache_results' => false,
+            ),
+            $query
+        );
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -8,43 +8,43 @@
 
 class Wordlift_Batch_Action {
 
-	public static function process( $post_type, $offset, $query, $callback ) {
+	public static function process($post_type, $offset, $query, $callback) {
 
 		$posts_per_page = 10;
 
 		$args = array_merge(
-			self::get_args( $post_type, $query ),
+			self::get_args($post_type, $query),
 			array(
 				'offset'         => $offset,
 				'posts_per_page' => $posts_per_page,
 			)
 		);
 
-		$post_ids = get_posts( $args );
+		$post_ids = get_posts($args);
 
-		foreach ( $post_ids as $post_id ) {
-			call_user_func( $callback, $post_id );
+		foreach ($post_ids as $post_id) {
+			call_user_func($callback, $post_id);
 		}
 
 		return array(
 			'current' => $offset,
 			'next'    => $offset + $posts_per_page,
-			'count'   => self::count( $post_type, $query ),
+			'count'   => self::count($post_type, $query),
 		);
 	}
 
-	public static function count( $post_type, $query ) {
+	public static function count($post_type, $query) {
 		$args = array_merge(
-			self::get_args( $post_type, $query ),
+			self::get_args($post_type, $query),
 			array(
-				'posts_per_page' => - 1,
+				'posts_per_page' => -1,
 			)
 		);
 
-		return count( get_posts( $args ) );
+		return count(get_posts($args));
 	}
 
-	private static function get_args( $post_type, $query ) {
+	private static function get_args($post_type, $query) {
 
 		return array_merge(
 			array(

src/includes/class-wordlift-sanitizer.php

Indentation +18 added lines, -18 removed lines

@@ -2,26 +2,26 @@
 
 class Wordlift_Sanitizer {
 
-	/**
-	 * Only accept URIs
-	 *
-	 * @param string $value
-	 *
-	 * @return null
-	 */
-	public static function sanitize_url( $value ) {
+    /**
+     * Only accept URIs
+     *
+     * @param string $value
+     *
+     * @return null
+     */
+    public static function sanitize_url( $value ) {
 
-		// Initially this function used also filter_var( $value, FILTER_VALIDATE_URL )
-		// but URLs with UTF-8 characters are not valid. We store those anyway in the DB as it's up to the browser
-		// to do proper url encoding when requesting the URL.
-		//
-		// see also http://stackoverflow.com/questions/2137080/php-filter-var-filter-validate-url
+        // Initially this function used also filter_var( $value, FILTER_VALIDATE_URL )
+        // but URLs with UTF-8 characters are not valid. We store those anyway in the DB as it's up to the browser
+        // to do proper url encoding when requesting the URL.
+        //
+        // see also http://stackoverflow.com/questions/2137080/php-filter-var-filter-validate-url
 
-		if ( $value !== null && '' !== $value ) {
-			return $value;
-		}
+        if ( $value !== null && '' !== $value ) {
+            return $value;
+        }
 
-		return null;
-	}
+        return null;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 	 *
 	 * @return null
 	 */
-	public static function sanitize_url( $value ) {
+	public static function sanitize_url($value) {
 
 		// Initially this function used also filter_var( $value, FILTER_VALIDATE_URL )
 		// but URLs with UTF-8 characters are not valid. We store those anyway in the DB as it's up to the browser
@@ -17,7 +17,7 @@ 
 		//
 		// see also http://stackoverflow.com/questions/2137080/php-filter-var-filter-validate-url
 
-		if ( $value !== null && '' !== $value ) {
+		if ($value !== null && '' !== $value) {
 			return $value;
 		}
 

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

Indentation +184 added lines, -184 removed lines

@@ -25,194 +25,194 @@
  */
 class Wordlift_Entity_Link_Service {
 
-	/**
-	 * The entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var Wordlift_Entity_Post_Type_Service $entity_type_service The entity type service.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The entity post type slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $slug The entity post type slug.
-	 */
-	private $slug;
-
-	/**
-	 * A logger instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * Wordlift_Entity_Link_Service constructor.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param Wordlift_Entity_Post_Type_Service $entity_type_service
-	 * @param string                            $slug The entity post type slug.
-	 */
-	public function __construct( $entity_type_service, $slug ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Link_Service' );
-
-		$this->entity_type_service = $entity_type_service;
-		$this->slug                = $slug;
-
-	}
-
-	/**
-	 * Intercept link generation to posts in order to customize links to entities.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string  $post_link The post's permalink.
-	 * @param WP_Post $post      The post in question.
-	 *
-	 * @return string The link to the post.
-	 */
-	public function post_type_link( $post_link, $post ) {
-
-		// Return the post link if this is not our post type.
-		if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
-			return $post_link;
-		}
-
-		// Replace /slug/post_name/ with /post_name/
-		// The slug comes from the Entity Type Service since that service is responsible for registering the default
-		// slug.
-		return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
-	}
-
-	/**
-	 * Alter the query to look for our own custom type.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param WP_Query $query
-	 */
-	public function pre_get_posts( $query ) {
-
-		// If a slug has been set, we don't need to alter the query.
-		if ( ! empty( $this->slug ) ) {
-			return;
-		}
-
-		// Check if it's a query we should extend with our own custom post type.
-		//
-		// The `$query->query` count could be > 2 if the preview parameter is passed too.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/439
-		if ( ! $query->is_main_query() || 2 > count( $query->query ) || ! isset( $query->query['page'] ) || empty( $query->query['name'] ) ) {
-			return;
-		}
-
-		// Add our own post type to the query.
-		$post_types = '' === $query->get( 'post_type' )
-			? Wordlift_Entity_Service::valid_entity_post_types()
-			: array_merge( (array) $query->get( 'post_type' ), (array) $this->entity_type_service->get_post_type() );
-		$query->set( 'post_type', $post_types );
-
-	}
-
-	/**
-	 * Hook to WordPress' wp_unique_post_slug_is_bad_flat_slug filter. This is called when a page is saved.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
-	 * @param string $slug      The post slug.
-	 * @param string $post_type Post type.
-	 *
-	 * @return bool Whether the slug is bad.
-	 */
-	public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
-
-		// The list of post types that might have conflicting slugs.
-		$post_types = Wordlift_Entity_Service::valid_entity_post_types();
-
-		// Ignore post types different from the ones we need to check.
-		if ( ! in_array( $post_type, $post_types, true ) ) {
-			return $bad_slug;
-		}
-
-		// We remove the request post type since WordPress is already checking that the slug doesn't conflict.
-		$exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
-
-		$this->log->debug( "Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: " . ( $exists ? 'yes' : 'no' ) . ' ]' );
-
-		return apply_filters( 'wl_unique_post_slug_is_bad_flat_slug', $exists, $bad_slug, $slug, $post_type );
-	}
-
-	/**
-	 * Check whether a slug exists already for the specified post types.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $slug       The slug.
-	 * @param array  $post_types An array of post types.
-	 *
-	 * @return bool True if the slug exists, otherwise false.
-	 */
-	private function slug_exists( $slug, $post_types ) {
-		global $wpdb;
-
-		// Loop through all post types and check
-		// whether they have archive pages and if
-		// the archive slug matches the post slug.
-		//
-		// Note that the condition below checks only post types used by WordLift.
-		// We don't check other post types for archive pages,
-		// because this is a job of WordPress.
-		//
-		// There is a open ticket that should solve this, when it's merged:
-		// https://core.trac.wordpress.org/ticket/13459
-		$all_post_types = Wordlift_Entity_Service::valid_entity_post_types();
-		foreach ( $all_post_types as $post_type ) {
-
-			// Get the post type object for current post type.
-			$post_type_object = get_post_type_object( $post_type );
-
-			if (
-				// Check whether the post type object is not empty.
-				! empty( $post_type_object ) &&
-				// And the post type has archive page.
-				$post_type_object->has_archive &&
-				// And `rewrite` options exists..
-				! empty( $post_type_object->rewrite ) &&
-				// And the `rewrite` slug property is not empty.
-				! empty( $post_type_object->rewrite['slug'] ) &&
-				// And if the rewrite slug equals to the slug.
-				$post_type_object->rewrite['slug'] === $slug
-			) {
-				// Return true which means that the slug is already in use.
-				return true;
-			}
-		}
-
-		return null !== $wpdb->get_var(
-			$wpdb->prepare(
-				sprintf(
-					"SELECT post_name
+    /**
+     * The entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var Wordlift_Entity_Post_Type_Service $entity_type_service The entity type service.
+     */
+    private $entity_type_service;
+
+    /**
+     * The entity post type slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $slug The entity post type slug.
+     */
+    private $slug;
+
+    /**
+     * A logger instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * Wordlift_Entity_Link_Service constructor.
+     *
+     * @since 3.6.0
+     *
+     * @param Wordlift_Entity_Post_Type_Service $entity_type_service
+     * @param string                            $slug The entity post type slug.
+     */
+    public function __construct( $entity_type_service, $slug ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Link_Service' );
+
+        $this->entity_type_service = $entity_type_service;
+        $this->slug                = $slug;
+
+    }
+
+    /**
+     * Intercept link generation to posts in order to customize links to entities.
+     *
+     * @since 3.6.0
+     *
+     * @param string  $post_link The post's permalink.
+     * @param WP_Post $post      The post in question.
+     *
+     * @return string The link to the post.
+     */
+    public function post_type_link( $post_link, $post ) {
+
+        // Return the post link if this is not our post type.
+        if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
+            return $post_link;
+        }
+
+        // Replace /slug/post_name/ with /post_name/
+        // The slug comes from the Entity Type Service since that service is responsible for registering the default
+        // slug.
+        return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
+    }
+
+    /**
+     * Alter the query to look for our own custom type.
+     *
+     * @since 3.6.0
+     *
+     * @param WP_Query $query
+     */
+    public function pre_get_posts( $query ) {
+
+        // If a slug has been set, we don't need to alter the query.
+        if ( ! empty( $this->slug ) ) {
+            return;
+        }
+
+        // Check if it's a query we should extend with our own custom post type.
+        //
+        // The `$query->query` count could be > 2 if the preview parameter is passed too.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/439
+        if ( ! $query->is_main_query() || 2 > count( $query->query ) || ! isset( $query->query['page'] ) || empty( $query->query['name'] ) ) {
+            return;
+        }
+
+        // Add our own post type to the query.
+        $post_types = '' === $query->get( 'post_type' )
+            ? Wordlift_Entity_Service::valid_entity_post_types()
+            : array_merge( (array) $query->get( 'post_type' ), (array) $this->entity_type_service->get_post_type() );
+        $query->set( 'post_type', $post_types );
+
+    }
+
+    /**
+     * Hook to WordPress' wp_unique_post_slug_is_bad_flat_slug filter. This is called when a page is saved.
+     *
+     * @since 3.6.0
+     *
+     * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
+     * @param string $slug      The post slug.
+     * @param string $post_type Post type.
+     *
+     * @return bool Whether the slug is bad.
+     */
+    public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
+
+        // The list of post types that might have conflicting slugs.
+        $post_types = Wordlift_Entity_Service::valid_entity_post_types();
+
+        // Ignore post types different from the ones we need to check.
+        if ( ! in_array( $post_type, $post_types, true ) ) {
+            return $bad_slug;
+        }
+
+        // We remove the request post type since WordPress is already checking that the slug doesn't conflict.
+        $exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
+
+        $this->log->debug( "Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: " . ( $exists ? 'yes' : 'no' ) . ' ]' );
+
+        return apply_filters( 'wl_unique_post_slug_is_bad_flat_slug', $exists, $bad_slug, $slug, $post_type );
+    }
+
+    /**
+     * Check whether a slug exists already for the specified post types.
+     *
+     * @since 3.6.0
+     *
+     * @param string $slug       The slug.
+     * @param array  $post_types An array of post types.
+     *
+     * @return bool True if the slug exists, otherwise false.
+     */
+    private function slug_exists( $slug, $post_types ) {
+        global $wpdb;
+
+        // Loop through all post types and check
+        // whether they have archive pages and if
+        // the archive slug matches the post slug.
+        //
+        // Note that the condition below checks only post types used by WordLift.
+        // We don't check other post types for archive pages,
+        // because this is a job of WordPress.
+        //
+        // There is a open ticket that should solve this, when it's merged:
+        // https://core.trac.wordpress.org/ticket/13459
+        $all_post_types = Wordlift_Entity_Service::valid_entity_post_types();
+        foreach ( $all_post_types as $post_type ) {
+
+            // Get the post type object for current post type.
+            $post_type_object = get_post_type_object( $post_type );
+
+            if (
+                // Check whether the post type object is not empty.
+                ! empty( $post_type_object ) &&
+                // And the post type has archive page.
+                $post_type_object->has_archive &&
+                // And `rewrite` options exists..
+                ! empty( $post_type_object->rewrite ) &&
+                // And the `rewrite` slug property is not empty.
+                ! empty( $post_type_object->rewrite['slug'] ) &&
+                // And if the rewrite slug equals to the slug.
+                $post_type_object->rewrite['slug'] === $slug
+            ) {
+                // Return true which means that the slug is already in use.
+                return true;
+            }
+        }
+
+        return null !== $wpdb->get_var(
+            $wpdb->prepare(
+                sprintf(
+                    "SELECT post_name
 			FROM $wpdb->posts
 			WHERE post_name = %s
 			AND post_type IN (%s)
 			LIMIT 1
 			",
-					'%s',
-					implode( ',', array_fill( 0, count( $post_types ), '%s' ) )
-				),
-				array_merge( array( $slug ), $post_types )
-			)
-		);
-	}
+                    '%s',
+                    implode( ',', array_fill( 0, count( $post_types ), '%s' ) )
+                ),
+                array_merge( array( $slug ), $post_types )
+            )
+        );
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -60,9 +60,9 @@ 
 	 * @param Wordlift_Entity_Post_Type_Service $entity_type_service
 	 * @param string                            $slug The entity post type slug.
 	 */
-	public function __construct( $entity_type_service, $slug ) {
+	public function __construct($entity_type_service, $slug) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Link_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Link_Service');
 
 		$this->entity_type_service = $entity_type_service;
 		$this->slug                = $slug;
@@ -79,17 +79,17 @@ 
 	 *
 	 * @return string The link to the post.
 	 */
-	public function post_type_link( $post_link, $post ) {
+	public function post_type_link($post_link, $post) {
 
 		// Return the post link if this is not our post type.
-		if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
+		if ( ! empty($this->slug) || $this->entity_type_service->get_post_type() !== get_post_type($post)) {
 			return $post_link;
 		}
 
 		// Replace /slug/post_name/ with /post_name/
 		// The slug comes from the Entity Type Service since that service is responsible for registering the default
 		// slug.
-		return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
+		return str_replace("/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link);
 	}
 
 	/**
@@ -99,10 +99,10 @@ 
 	 *
 	 * @param WP_Query $query
 	 */
-	public function pre_get_posts( $query ) {
+	public function pre_get_posts($query) {
 
 		// If a slug has been set, we don't need to alter the query.
-		if ( ! empty( $this->slug ) ) {
+		if ( ! empty($this->slug)) {
 			return;
 		}
 
@@ -111,15 +111,15 @@ 
 		// The `$query->query` count could be > 2 if the preview parameter is passed too.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/439
-		if ( ! $query->is_main_query() || 2 > count( $query->query ) || ! isset( $query->query['page'] ) || empty( $query->query['name'] ) ) {
+		if ( ! $query->is_main_query() || 2 > count($query->query) || ! isset($query->query['page']) || empty($query->query['name'])) {
 			return;
 		}
 
 		// Add our own post type to the query.
-		$post_types = '' === $query->get( 'post_type' )
+		$post_types = '' === $query->get('post_type')
 			? Wordlift_Entity_Service::valid_entity_post_types()
-			: array_merge( (array) $query->get( 'post_type' ), (array) $this->entity_type_service->get_post_type() );
-		$query->set( 'post_type', $post_types );
+			: array_merge((array) $query->get('post_type'), (array) $this->entity_type_service->get_post_type());
+		$query->set('post_type', $post_types);
 
 	}
 
@@ -134,22 +134,22 @@ 
 	 *
 	 * @return bool Whether the slug is bad.
 	 */
-	public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
+	public function wp_unique_post_slug_is_bad_flat_slug($bad_slug, $slug, $post_type) {
 
 		// The list of post types that might have conflicting slugs.
 		$post_types = Wordlift_Entity_Service::valid_entity_post_types();
 
 		// Ignore post types different from the ones we need to check.
-		if ( ! in_array( $post_type, $post_types, true ) ) {
+		if ( ! in_array($post_type, $post_types, true)) {
 			return $bad_slug;
 		}
 
 		// We remove the request post type since WordPress is already checking that the slug doesn't conflict.
-		$exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
+		$exists = $this->slug_exists($slug, array_diff($post_types, array($post_type)));
 
-		$this->log->debug( "Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: " . ( $exists ? 'yes' : 'no' ) . ' ]' );
+		$this->log->debug("Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: ".($exists ? 'yes' : 'no').' ]');
 
-		return apply_filters( 'wl_unique_post_slug_is_bad_flat_slug', $exists, $bad_slug, $slug, $post_type );
+		return apply_filters('wl_unique_post_slug_is_bad_flat_slug', $exists, $bad_slug, $slug, $post_type);
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 	 *
 	 * @return bool True if the slug exists, otherwise false.
 	 */
-	private function slug_exists( $slug, $post_types ) {
+	private function slug_exists($slug, $post_types) {
 		global $wpdb;
 
 		// Loop through all post types and check
@@ -176,20 +176,20 @@ 
 		// There is a open ticket that should solve this, when it's merged:
 		// https://core.trac.wordpress.org/ticket/13459
 		$all_post_types = Wordlift_Entity_Service::valid_entity_post_types();
-		foreach ( $all_post_types as $post_type ) {
+		foreach ($all_post_types as $post_type) {
 
 			// Get the post type object for current post type.
-			$post_type_object = get_post_type_object( $post_type );
+			$post_type_object = get_post_type_object($post_type);
 
 			if (
 				// Check whether the post type object is not empty.
-				! empty( $post_type_object ) &&
+				! empty($post_type_object) &&
 				// And the post type has archive page.
 				$post_type_object->has_archive &&
 				// And `rewrite` options exists..
-				! empty( $post_type_object->rewrite ) &&
+				! empty($post_type_object->rewrite) &&
 				// And the `rewrite` slug property is not empty.
-				! empty( $post_type_object->rewrite['slug'] ) &&
+				! empty($post_type_object->rewrite['slug']) &&
 				// And if the rewrite slug equals to the slug.
 				$post_type_object->rewrite['slug'] === $slug
 			) {
@@ -208,9 +208,9 @@ 
 			LIMIT 1
 			",
 					'%s',
-					implode( ',', array_fill( 0, count( $post_types ), '%s' ) )
+					implode(',', array_fill(0, count($post_types), '%s'))
 				),
-				array_merge( array( $slug ), $post_types )
+				array_merge(array($slug), $post_types)
 			)
 		);
 	}

src/includes/batch/class-wordlift-batch-operation-ajax-adapter.php

Indentation +138 added lines, -138 removed lines

@@ -14,143 +14,143 @@
  */
 class Wordlift_Batch_Operation_Ajax_Adapter {
 
-	/**
-	 * The access levels.
-	 *
-	 * @since 3.20.0
-	 */
-	const ACCESS_ANONYMOUS = 1;
-	const ACCESS_ADMIN     = 2;
-	const ACCESS_ALL       = 3;
-
-	/**
-	 * A {@link Wordlift_Batch_Operation_Interface} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Batch_Operation_Interface $operation A {@link Wordlift_Batch_Operation_Interface} instance.
-	 */
-	private $operation;
-
-	/**
-	 * The ajax action name.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var string $action The ajax action name.
-	 */
-	private $action;
-
-	/**
-	 * Wordlift_Batch_Operation_Ajax_Adapter constructor.
-	 *
-	 * @param \Wordlift_Batch_Operation_Interface $operation The batch operation.
-	 * @param string                              $action The action name.
-	 * @param int                                 $access The access level.
-	 */
-	public function __construct( $operation, $action, $access = self::ACCESS_ADMIN ) {
-
-		$this->operation = $operation;
-
-		if ( $access & self::ACCESS_ADMIN ) {
-			add_action( "wp_ajax_$action", array( $this, 'process' ) );
-			add_action( "wp_ajax_{$action}_count", array( $this, 'count' ) );
-
-			// Add the nonce for the `schemaorg_sync` action.
-			add_filter( 'wl_admin_settings', array( $this, 'add_nonce' ) );
-		}
-
-		if ( $access & self::ACCESS_ANONYMOUS ) {
-			add_action( "wp_ajax_nopriv_$action", array( $this, 'process' ) );
-			add_action( "wp_ajax_nopriv_{$action}_count", array( $this, 'count' ) );
-		}
-
-		$this->action = $action;
-	}
-
-	/**
-	 * Hook to `wl_admin_settings`, adds the nonce.
-	 *
-	 * @param array $params An array of settings.
-	 *
-	 * @return array The updated array of settings.
-	 * @since 3.20.0
-	 */
-	public function add_nonce( $params ) {
-
-		return array_merge(
-			$params,
-			array(
-				"{$this->action}_nonce" => $this->create_nonce(),
-			)
-		);
-	}
-
-	/**
-	 * Process the requested operation.
-	 *
-	 * @since 3.20.0
-	 */
-	public function process() {
-		$nonce = isset( $_POST['_nonce'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['_nonce'] ) ) : '';
-		// Validate the nonce.
-		if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
-			wp_send_json_error( 'Invalid nonce.' );
-		}
-
-		$offset = isset( $_POST['offset'] ) ? (int) $_POST['offset'] : 0;
-		$limit  = isset( $_POST['limit'] ) ? (int) $_POST['limit'] : 10;
-
-		// Run the batch operation.
-		$result = $this->operation->process( $offset, $limit );
-
-		// Send the results along with a potentially updated nonce.
-		wp_send_json_success(
-			array_merge(
-				$result,
-				array(
-					'_nonce' => $this->create_nonce(),
-				)
-			)
-		);
-
-	}
-
-	/**
-	 * Count the number of elements that would be affected by the operation.
-	 *
-	 * @since 3.20.0
-	 */
-	public function count() {
-
-		// Validate the nonce.
-		$nonce = isset( $_POST['_nonce'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['_nonce'] ) ) : '';
-		if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
-			wp_send_json_error( 'Invalid nonce.' );
-		}
-
-		// Run the batch operation.
-		$result = $this->operation->count();
-
-		// Send the results along with a potentially updated nonce.
-		wp_send_json_success(
-			array(
-				'count'  => $result,
-				'_nonce' => $this->create_nonce(),
-			)
-		);
-
-	}
-
-	/**
-	 * Create a nonce for the ajax operation.
-	 *
-	 * @return string The nonce.
-	 * @since 3.20.0
-	 */
-	public function create_nonce() {
-
-		return wp_create_nonce( $this->action );
-	}
+    /**
+     * The access levels.
+     *
+     * @since 3.20.0
+     */
+    const ACCESS_ANONYMOUS = 1;
+    const ACCESS_ADMIN     = 2;
+    const ACCESS_ALL       = 3;
+
+    /**
+     * A {@link Wordlift_Batch_Operation_Interface} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Batch_Operation_Interface $operation A {@link Wordlift_Batch_Operation_Interface} instance.
+     */
+    private $operation;
+
+    /**
+     * The ajax action name.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var string $action The ajax action name.
+     */
+    private $action;
+
+    /**
+     * Wordlift_Batch_Operation_Ajax_Adapter constructor.
+     *
+     * @param \Wordlift_Batch_Operation_Interface $operation The batch operation.
+     * @param string                              $action The action name.
+     * @param int                                 $access The access level.
+     */
+    public function __construct( $operation, $action, $access = self::ACCESS_ADMIN ) {
+
+        $this->operation = $operation;
+
+        if ( $access & self::ACCESS_ADMIN ) {
+            add_action( "wp_ajax_$action", array( $this, 'process' ) );
+            add_action( "wp_ajax_{$action}_count", array( $this, 'count' ) );
+
+            // Add the nonce for the `schemaorg_sync` action.
+            add_filter( 'wl_admin_settings', array( $this, 'add_nonce' ) );
+        }
+
+        if ( $access & self::ACCESS_ANONYMOUS ) {
+            add_action( "wp_ajax_nopriv_$action", array( $this, 'process' ) );
+            add_action( "wp_ajax_nopriv_{$action}_count", array( $this, 'count' ) );
+        }
+
+        $this->action = $action;
+    }
+
+    /**
+     * Hook to `wl_admin_settings`, adds the nonce.
+     *
+     * @param array $params An array of settings.
+     *
+     * @return array The updated array of settings.
+     * @since 3.20.0
+     */
+    public function add_nonce( $params ) {
+
+        return array_merge(
+            $params,
+            array(
+                "{$this->action}_nonce" => $this->create_nonce(),
+            )
+        );
+    }
+
+    /**
+     * Process the requested operation.
+     *
+     * @since 3.20.0
+     */
+    public function process() {
+        $nonce = isset( $_POST['_nonce'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['_nonce'] ) ) : '';
+        // Validate the nonce.
+        if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
+            wp_send_json_error( 'Invalid nonce.' );
+        }
+
+        $offset = isset( $_POST['offset'] ) ? (int) $_POST['offset'] : 0;
+        $limit  = isset( $_POST['limit'] ) ? (int) $_POST['limit'] : 10;
+
+        // Run the batch operation.
+        $result = $this->operation->process( $offset, $limit );
+
+        // Send the results along with a potentially updated nonce.
+        wp_send_json_success(
+            array_merge(
+                $result,
+                array(
+                    '_nonce' => $this->create_nonce(),
+                )
+            )
+        );
+
+    }
+
+    /**
+     * Count the number of elements that would be affected by the operation.
+     *
+     * @since 3.20.0
+     */
+    public function count() {
+
+        // Validate the nonce.
+        $nonce = isset( $_POST['_nonce'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['_nonce'] ) ) : '';
+        if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
+            wp_send_json_error( 'Invalid nonce.' );
+        }
+
+        // Run the batch operation.
+        $result = $this->operation->count();
+
+        // Send the results along with a potentially updated nonce.
+        wp_send_json_success(
+            array(
+                'count'  => $result,
+                '_nonce' => $this->create_nonce(),
+            )
+        );
+
+    }
+
+    /**
+     * Create a nonce for the ajax operation.
+     *
+     * @return string The nonce.
+     * @since 3.20.0
+     */
+    public function create_nonce() {
+
+        return wp_create_nonce( $this->action );
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -48,21 +48,21 @@ 
 	 * @param string                              $action The action name.
 	 * @param int                                 $access The access level.
 	 */
-	public function __construct( $operation, $action, $access = self::ACCESS_ADMIN ) {
+	public function __construct($operation, $action, $access = self::ACCESS_ADMIN) {
 
 		$this->operation = $operation;
 
-		if ( $access & self::ACCESS_ADMIN ) {
-			add_action( "wp_ajax_$action", array( $this, 'process' ) );
-			add_action( "wp_ajax_{$action}_count", array( $this, 'count' ) );
+		if ($access & self::ACCESS_ADMIN) {
+			add_action("wp_ajax_$action", array($this, 'process'));
+			add_action("wp_ajax_{$action}_count", array($this, 'count'));
 
 			// Add the nonce for the `schemaorg_sync` action.
-			add_filter( 'wl_admin_settings', array( $this, 'add_nonce' ) );
+			add_filter('wl_admin_settings', array($this, 'add_nonce'));
 		}
 
-		if ( $access & self::ACCESS_ANONYMOUS ) {
-			add_action( "wp_ajax_nopriv_$action", array( $this, 'process' ) );
-			add_action( "wp_ajax_nopriv_{$action}_count", array( $this, 'count' ) );
+		if ($access & self::ACCESS_ANONYMOUS) {
+			add_action("wp_ajax_nopriv_$action", array($this, 'process'));
+			add_action("wp_ajax_nopriv_{$action}_count", array($this, 'count'));
 		}
 
 		$this->action = $action;
@@ -76,7 +76,7 @@ 
 	 * @return array The updated array of settings.
 	 * @since 3.20.0
 	 */
-	public function add_nonce( $params ) {
+	public function add_nonce($params) {
 
 		return array_merge(
 			$params,
@@ -92,17 +92,17 @@ 
 	 * @since 3.20.0
 	 */
 	public function process() {
-		$nonce = isset( $_POST['_nonce'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['_nonce'] ) ) : '';
+		$nonce = isset($_POST['_nonce']) ? sanitize_text_field(wp_unslash((string) $_POST['_nonce'])) : '';
 		// Validate the nonce.
-		if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
-			wp_send_json_error( 'Invalid nonce.' );
+		if ( ! wp_verify_nonce($nonce, $this->action)) {
+			wp_send_json_error('Invalid nonce.');
 		}
 
-		$offset = isset( $_POST['offset'] ) ? (int) $_POST['offset'] : 0;
-		$limit  = isset( $_POST['limit'] ) ? (int) $_POST['limit'] : 10;
+		$offset = isset($_POST['offset']) ? (int) $_POST['offset'] : 0;
+		$limit  = isset($_POST['limit']) ? (int) $_POST['limit'] : 10;
 
 		// Run the batch operation.
-		$result = $this->operation->process( $offset, $limit );
+		$result = $this->operation->process($offset, $limit);
 
 		// Send the results along with a potentially updated nonce.
 		wp_send_json_success(
@@ -124,9 +124,9 @@ 
 	public function count() {
 
 		// Validate the nonce.
-		$nonce = isset( $_POST['_nonce'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['_nonce'] ) ) : '';
-		if ( ! wp_verify_nonce( $nonce, $this->action ) ) {
-			wp_send_json_error( 'Invalid nonce.' );
+		$nonce = isset($_POST['_nonce']) ? sanitize_text_field(wp_unslash((string) $_POST['_nonce'])) : '';
+		if ( ! wp_verify_nonce($nonce, $this->action)) {
+			wp_send_json_error('Invalid nonce.');
 		}
 
 		// Run the batch operation.
@@ -150,7 +150,7 @@ 
 	 */
 	public function create_nonce() {
 
-		return wp_create_nonce( $this->action );
+		return wp_create_nonce($this->action);
 	}
 
 }

src/includes/class-wordlift-remote-image-service.php

Indentation +144 added lines, -144 removed lines

@@ -8,149 +8,149 @@
  */
 class Wordlift_Remote_Image_Service {
 
-	/**
-	 * Save the image with the specified URL locally.
-	 *
-	 * @param string $url The image remote URL.
-	 *
-	 * @return array|false|WP_Error An array with information about the saved image (*path*: the local path to the image, *url*: the local
-	 * url, *content_type*: the image content type) or false on error.
-	 * @since 3.18.0
-	 * @since 3.23.4 the function may return a WP_Error.
-	 */
-	public static function save_from_url( $url ) {
-
-		// Required for REST API calls
-		if ( ! function_exists( 'WP_Filesystem' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/file.php';
-		}
-
-		// Load `WP_Filesystem`.
-		add_filter( 'filesystem_method', 'Wordlift_Remote_Image_Service::_return_direct' );
-		WP_Filesystem();
-		global $wp_filesystem;
-
-		// Parse the url.
-		$parts = wp_parse_url( $url );
-
-		// Get the bare filename (filename w/o the extension).
-		$basename = str_replace(
-			DIRECTORY_SEPARATOR,
-			'_',
-			rawurldecode(
-				pathinfo( $parts['path'], PATHINFO_FILENAME )
-			)
-		);
-
-		// Get the base dir.
-		$wp_upload_dir = wp_upload_dir();
-
-		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
-
-		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
-
-		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			Wordlift_Log_Service::get_logger( 'Wordlift_Remote_Image_Service' )
-								->warn( "save_image_from_url : failed creating upload dir $upload_dir \n" );
-
-			return new WP_Error( 'image_error', "save_image_from_url : failed creating upload dir $upload_dir \n" );
-		};
-
-		$response = wp_remote_get(
-			$url,
-			array(
-				'user-agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.135 Safari/537.36',
-			)
-		);
-
-		// Bail if the response is not set.
-		if ( self::is_response_error( $response ) ) {
-			Wordlift_Log_Service::get_logger( 'Wordlift_Remote_Image_Service' )
-								// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-								->warn( "save_image_from_url : failed to fetch the response from: $url\nThe response was:\n" . var_export( $response, true ) );
-
-			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-			return new WP_Error( 'image_error', "save_image_from_url : failed to fetch the response from: $url\nThe response was:\n" . var_export( $response, true ) );
-		}
-
-		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
-
-		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
-
-		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
-			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-			return new WP_Error( 'image_error', "Unsupported content type [ $content_type ]:\n" . var_export( $response, true ) );
-		}
-
-		// Complete the local filename.
-		$image_full_path .= $extension;
-		$image_full_url  .= $extension;
-
-		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
-		remove_filter( 'filesystem_method', 'Wordlift_Remote_Image_Service::_return_direct' );
-
-		// Return the path.
-		return array(
-			'path'         => $image_full_path,
-			'url'          => $image_full_url,
-			'content_type' => $content_type,
-		);
-	}
-
-	// phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-	public static function _return_direct() {
-		return 'direct';
-	}
-
-	/**
-	 * Returns the file extension using the content type.
-	 *
-	 * @param string $content_type File content type.
-	 *
-	 * @return string|bool The file extension on success and
-	 * false on fail or if the content type is not supported.
-	 * @since 3.18.0
-	 */
-	private static function get_extension_from_content_type( $content_type ) {
-
-		// Return the extension if match.
-		switch ( $content_type ) {
-			case 'image/jpeg':
-			case 'image/jpg':
-				return '.jpg';
-			case 'image/gif':
-				return '.gif';
-			case 'image/png':
-				return '.png';
-		}
-
-		// Otherwise return false.
-		return false;
-	}
-
-	/**
-	 * Checks whether a response is an error.
-	 *
-	 * @param array|WP_Error $response The response.
-	 *
-	 * @return bool True if the response is an error, otherwise false.
-	 * @since 3.23.4
-	 */
-	private static function is_response_error( $response ) {
-
-		return ( is_wp_error( $response )
-				 || 200 !== (int) $response['response']['code']
-				 || ! isset( $response['body'] )
-		);
-	}
+    /**
+     * Save the image with the specified URL locally.
+     *
+     * @param string $url The image remote URL.
+     *
+     * @return array|false|WP_Error An array with information about the saved image (*path*: the local path to the image, *url*: the local
+     * url, *content_type*: the image content type) or false on error.
+     * @since 3.18.0
+     * @since 3.23.4 the function may return a WP_Error.
+     */
+    public static function save_from_url( $url ) {
+
+        // Required for REST API calls
+        if ( ! function_exists( 'WP_Filesystem' ) ) {
+            require_once ABSPATH . 'wp-admin/includes/file.php';
+        }
+
+        // Load `WP_Filesystem`.
+        add_filter( 'filesystem_method', 'Wordlift_Remote_Image_Service::_return_direct' );
+        WP_Filesystem();
+        global $wp_filesystem;
+
+        // Parse the url.
+        $parts = wp_parse_url( $url );
+
+        // Get the bare filename (filename w/o the extension).
+        $basename = str_replace(
+            DIRECTORY_SEPARATOR,
+            '_',
+            rawurldecode(
+                pathinfo( $parts['path'], PATHINFO_FILENAME )
+            )
+        );
+
+        // Get the base dir.
+        $wp_upload_dir = wp_upload_dir();
+
+        // Set the upload directory and URL.
+        $upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
+        $upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+
+        // Get the full path to the local filename.
+        $image_full_path = $upload_dir . '/' . $basename;
+        $image_full_url  = $upload_url . '/' . $basename;
+
+        // Create custom directory and bail on failure.
+        if ( ! wp_mkdir_p( $upload_dir ) ) {
+            Wordlift_Log_Service::get_logger( 'Wordlift_Remote_Image_Service' )
+                                ->warn( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+
+            return new WP_Error( 'image_error', "save_image_from_url : failed creating upload dir $upload_dir \n" );
+        };
+
+        $response = wp_remote_get(
+            $url,
+            array(
+                'user-agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.135 Safari/537.36',
+            )
+        );
+
+        // Bail if the response is not set.
+        if ( self::is_response_error( $response ) ) {
+            Wordlift_Log_Service::get_logger( 'Wordlift_Remote_Image_Service' )
+                                // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
+                                ->warn( "save_image_from_url : failed to fetch the response from: $url\nThe response was:\n" . var_export( $response, true ) );
+
+            // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
+            return new WP_Error( 'image_error', "save_image_from_url : failed to fetch the response from: $url\nThe response was:\n" . var_export( $response, true ) );
+        }
+
+        // Get the content type of response.
+        $content_type = wp_remote_retrieve_header( $response, 'content-type' );
+
+        // Get the file extension.
+        $extension = self::get_extension_from_content_type( $content_type );
+
+        // Bail if the content type is not supported.
+        if ( empty( $extension ) ) {
+            // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
+            return new WP_Error( 'image_error', "Unsupported content type [ $content_type ]:\n" . var_export( $response, true ) );
+        }
+
+        // Complete the local filename.
+        $image_full_path .= $extension;
+        $image_full_url  .= $extension;
+
+        // Store the data locally.
+        $wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+        remove_filter( 'filesystem_method', 'Wordlift_Remote_Image_Service::_return_direct' );
+
+        // Return the path.
+        return array(
+            'path'         => $image_full_path,
+            'url'          => $image_full_url,
+            'content_type' => $content_type,
+        );
+    }
+
+    // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+    public static function _return_direct() {
+        return 'direct';
+    }
+
+    /**
+     * Returns the file extension using the content type.
+     *
+     * @param string $content_type File content type.
+     *
+     * @return string|bool The file extension on success and
+     * false on fail or if the content type is not supported.
+     * @since 3.18.0
+     */
+    private static function get_extension_from_content_type( $content_type ) {
+
+        // Return the extension if match.
+        switch ( $content_type ) {
+            case 'image/jpeg':
+            case 'image/jpg':
+                return '.jpg';
+            case 'image/gif':
+                return '.gif';
+            case 'image/png':
+                return '.png';
+        }
+
+        // Otherwise return false.
+        return false;
+    }
+
+    /**
+     * Checks whether a response is an error.
+     *
+     * @param array|WP_Error $response The response.
+     *
+     * @return bool True if the response is an error, otherwise false.
+     * @since 3.23.4
+     */
+    private static function is_response_error( $response ) {
+
+        return ( is_wp_error( $response )
+                 || 200 !== (int) $response['response']['code']
+                 || ! isset( $response['body'] )
+        );
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -18,27 +18,27 @@ 
 	 * @since 3.18.0
 	 * @since 3.23.4 the function may return a WP_Error.
 	 */
-	public static function save_from_url( $url ) {
+	public static function save_from_url($url) {
 
 		// Required for REST API calls
-		if ( ! function_exists( 'WP_Filesystem' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/file.php';
+		if ( ! function_exists('WP_Filesystem')) {
+			require_once ABSPATH.'wp-admin/includes/file.php';
 		}
 
 		// Load `WP_Filesystem`.
-		add_filter( 'filesystem_method', 'Wordlift_Remote_Image_Service::_return_direct' );
+		add_filter('filesystem_method', 'Wordlift_Remote_Image_Service::_return_direct');
 		WP_Filesystem();
 		global $wp_filesystem;
 
 		// Parse the url.
-		$parts = wp_parse_url( $url );
+		$parts = wp_parse_url($url);
 
 		// Get the bare filename (filename w/o the extension).
 		$basename = str_replace(
 			DIRECTORY_SEPARATOR,
 			'_',
 			rawurldecode(
-				pathinfo( $parts['path'], PATHINFO_FILENAME )
+				pathinfo($parts['path'], PATHINFO_FILENAME)
 			)
 		);
 
@@ -46,19 +46,19 @@ 
 		$wp_upload_dir = wp_upload_dir();
 
 		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+		$upload_dir = $wp_upload_dir['basedir'].'/wl'.$wp_upload_dir['subdir'];
+		$upload_url = $wp_upload_dir['baseurl'].'/wl'.$wp_upload_dir['subdir'];
 
 		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
+		$image_full_path = $upload_dir.'/'.$basename;
+		$image_full_url  = $upload_url.'/'.$basename;
 
 		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			Wordlift_Log_Service::get_logger( 'Wordlift_Remote_Image_Service' )
-								->warn( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+		if ( ! wp_mkdir_p($upload_dir)) {
+			Wordlift_Log_Service::get_logger('Wordlift_Remote_Image_Service')
+								->warn("save_image_from_url : failed creating upload dir $upload_dir \n");
 
-			return new WP_Error( 'image_error', "save_image_from_url : failed creating upload dir $upload_dir \n" );
+			return new WP_Error('image_error', "save_image_from_url : failed creating upload dir $upload_dir \n");
 		};
 
 		$response = wp_remote_get(
@@ -69,25 +69,25 @@ 
 		);
 
 		// Bail if the response is not set.
-		if ( self::is_response_error( $response ) ) {
-			Wordlift_Log_Service::get_logger( 'Wordlift_Remote_Image_Service' )
+		if (self::is_response_error($response)) {
+			Wordlift_Log_Service::get_logger('Wordlift_Remote_Image_Service')
 								// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-								->warn( "save_image_from_url : failed to fetch the response from: $url\nThe response was:\n" . var_export( $response, true ) );
+								->warn("save_image_from_url : failed to fetch the response from: $url\nThe response was:\n".var_export($response, true));
 
 			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-			return new WP_Error( 'image_error', "save_image_from_url : failed to fetch the response from: $url\nThe response was:\n" . var_export( $response, true ) );
+			return new WP_Error('image_error', "save_image_from_url : failed to fetch the response from: $url\nThe response was:\n".var_export($response, true));
 		}
 
 		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
+		$content_type = wp_remote_retrieve_header($response, 'content-type');
 
 		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
+		$extension = self::get_extension_from_content_type($content_type);
 
 		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
+		if (empty($extension)) {
 			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-			return new WP_Error( 'image_error', "Unsupported content type [ $content_type ]:\n" . var_export( $response, true ) );
+			return new WP_Error('image_error', "Unsupported content type [ $content_type ]:\n".var_export($response, true));
 		}
 
 		// Complete the local filename.
@@ -95,8 +95,8 @@ 
 		$image_full_url  .= $extension;
 
 		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
-		remove_filter( 'filesystem_method', 'Wordlift_Remote_Image_Service::_return_direct' );
+		$wp_filesystem->put_contents($image_full_path, wp_remote_retrieve_body($response));
+		remove_filter('filesystem_method', 'Wordlift_Remote_Image_Service::_return_direct');
 
 		// Return the path.
 		return array(
@@ -120,10 +120,10 @@ 
 	 * false on fail or if the content type is not supported.
 	 * @since 3.18.0
 	 */
-	private static function get_extension_from_content_type( $content_type ) {
+	private static function get_extension_from_content_type($content_type) {
 
 		// Return the extension if match.
-		switch ( $content_type ) {
+		switch ($content_type) {
 			case 'image/jpeg':
 			case 'image/jpg':
 				return '.jpg';
@@ -145,11 +145,11 @@ 
 	 * @return bool True if the response is an error, otherwise false.
 	 * @since 3.23.4
 	 */
-	private static function is_response_error( $response ) {
+	private static function is_response_error($response) {
 
-		return ( is_wp_error( $response )
+		return (is_wp_error($response)
 				 || 200 !== (int) $response['response']['code']
-				 || ! isset( $response['body'] )
+				 || ! isset($response['body'])
 		);
 	}
 

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

Indentation +469 added lines, -469 removed lines

@@ -19,147 +19,147 @@ 
  */
 class Wordlift_Entity_Type_Service {
 
-	/**
-	 * The {@link Wordlift_Schema_Service} instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 */
-	private $schema_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Wordlift_Entity_Type_Service constructor.
-	 *
-	 * @since 3.7.0
-	 */
-	protected function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
-
-		$this->schema_service = Wordlift_Schema_Service::get_instance();
-
-		$this->prepare_post_types();
-
-	}
-
-	/**
-	 * Prepare post types for Gutenberg use
-	 *
-	 * @since 3.26.0
-	 */
-	private function prepare_post_types() {
-
-		add_action(
-			'init',
-			function () {
-				// Add post type support for 'custom-fields' for all post types. Specifically needed in Gutenberg
-				$post_types = get_post_types();
-				foreach ( $post_types as $post_type ) {
-					add_post_type_support( $post_type, 'custom-fields' );
-				}
-			}
-		);
-	}
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $instance The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 */
-	private static $instance = null;
-
-	/**
-	 * Get the {@link Wordlift_Entity_Type_Service} singleton instance.
-	 *
-	 * @return \Wordlift_Entity_Type_Service The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 * @since 3.7.0
-	 */
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the types associated with the specified entity post id.
-	 *
-	 * We have a strategy to define the entity type, given that everything is
-	 * an entity, i.e. also posts/pages and custom post types.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|null {
-	 * An array of type properties or null if no term is associated
-	 *
-	 * @type string css_class     The css class, e.g. `wl-thing`.
-	 * @type string uri           The schema.org class URI, e.g. `http://schema.org/Thing`.
-	 * @type array  same_as       An array of same as attributes.
-	 * @type array  custom_fields An array of custom fields.
-	 * }
-	 * @since 3.33.9 The `linked_data` key has been removed.
-	 *
-	 * @since 3.20.0 This function will **not** return entity types introduced with 3.20.0.
-	 *
-	 * @since 3.18.0 The cases are the following:
-	 *  1. the post has a term from the Entity Types Taxonomy: the term defines
-	 *     the entity type, e.g. Organization, Person, ...
-	 *  2. the post doesn't have a term from the Entity Types Taxonomy:
-	 *      a) the post is a `wl_entity` custom post type, then the post is
-	 *           assigned the `Thing` entity type by default.
-	 *      b) the post is a `post` post type, then the post is
-	 *           assigned the `Article` entity type by default.
-	 *      c) the post is a custom post type then it is
-	 *          assigned the `WebPage` entity type by default.
-	 */
-	public function get( $post_id ) {
-
-		$this->log->trace( "Getting the post type for post $post_id..." );
-
-		// Get the post type.
-		$post_type = get_post_type( $post_id );
-
-		// Return `web-page` for non entities.
-		if ( ! self::is_valid_entity_post_type( $post_type ) ) {
-			$this->log->info( "Returning `web-page` for post $post_id." );
-
-			return $this->schema_service->get_schema( 'web-page' );
-		}
-
-		// Get the type from the associated classification.
-		$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-		// Return the schema type if there is a term found.
-		if ( ! is_wp_error( $terms ) && ! empty( $terms ) ) {
-			// Cycle through the terms and return the first one with a valid schema.
-			foreach ( $terms as $term ) {
-				$this->log->debug( "Found `{$term->slug}` term for post $post_id." );
-
-				// Try to get the schema for the term.
-				$schema = $this->schema_service->get_schema( $term->slug );
-
-				// If found, return it, ignoring the other types.
-				if ( null !== $schema ) {
-					// Return the entity type with the specified id.
-					return $schema;
-				}
-			}
-
-			/*
+    /**
+     * The {@link Wordlift_Schema_Service} instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     */
+    private $schema_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Wordlift_Entity_Type_Service constructor.
+     *
+     * @since 3.7.0
+     */
+    protected function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
+
+        $this->schema_service = Wordlift_Schema_Service::get_instance();
+
+        $this->prepare_post_types();
+
+    }
+
+    /**
+     * Prepare post types for Gutenberg use
+     *
+     * @since 3.26.0
+     */
+    private function prepare_post_types() {
+
+        add_action(
+            'init',
+            function () {
+                // Add post type support for 'custom-fields' for all post types. Specifically needed in Gutenberg
+                $post_types = get_post_types();
+                foreach ( $post_types as $post_type ) {
+                    add_post_type_support( $post_type, 'custom-fields' );
+                }
+            }
+        );
+    }
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} singleton instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $instance The {@link Wordlift_Entity_Type_Service} singleton instance.
+     */
+    private static $instance = null;
+
+    /**
+     * Get the {@link Wordlift_Entity_Type_Service} singleton instance.
+     *
+     * @return \Wordlift_Entity_Type_Service The {@link Wordlift_Entity_Type_Service} singleton instance.
+     * @since 3.7.0
+     */
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the types associated with the specified entity post id.
+     *
+     * We have a strategy to define the entity type, given that everything is
+     * an entity, i.e. also posts/pages and custom post types.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|null {
+     * An array of type properties or null if no term is associated
+     *
+     * @type string css_class     The css class, e.g. `wl-thing`.
+     * @type string uri           The schema.org class URI, e.g. `http://schema.org/Thing`.
+     * @type array  same_as       An array of same as attributes.
+     * @type array  custom_fields An array of custom fields.
+     * }
+     * @since 3.33.9 The `linked_data` key has been removed.
+     *
+     * @since 3.20.0 This function will **not** return entity types introduced with 3.20.0.
+     *
+     * @since 3.18.0 The cases are the following:
+     *  1. the post has a term from the Entity Types Taxonomy: the term defines
+     *     the entity type, e.g. Organization, Person, ...
+     *  2. the post doesn't have a term from the Entity Types Taxonomy:
+     *      a) the post is a `wl_entity` custom post type, then the post is
+     *           assigned the `Thing` entity type by default.
+     *      b) the post is a `post` post type, then the post is
+     *           assigned the `Article` entity type by default.
+     *      c) the post is a custom post type then it is
+     *          assigned the `WebPage` entity type by default.
+     */
+    public function get( $post_id ) {
+
+        $this->log->trace( "Getting the post type for post $post_id..." );
+
+        // Get the post type.
+        $post_type = get_post_type( $post_id );
+
+        // Return `web-page` for non entities.
+        if ( ! self::is_valid_entity_post_type( $post_type ) ) {
+            $this->log->info( "Returning `web-page` for post $post_id." );
+
+            return $this->schema_service->get_schema( 'web-page' );
+        }
+
+        // Get the type from the associated classification.
+        $terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+        // Return the schema type if there is a term found.
+        if ( ! is_wp_error( $terms ) && ! empty( $terms ) ) {
+            // Cycle through the terms and return the first one with a valid schema.
+            foreach ( $terms as $term ) {
+                $this->log->debug( "Found `{$term->slug}` term for post $post_id." );
+
+                // Try to get the schema for the term.
+                $schema = $this->schema_service->get_schema( $term->slug );
+
+                // If found, return it, ignoring the other types.
+                if ( null !== $schema ) {
+                    // Return the entity type with the specified id.
+                    return $schema;
+                }
+            }
+
+            /*
 			 * When a schema isn't found, we return `thing`. Schema may not be found because
 			 * the new schema classes that we support since #852 aren't configured in the schema
 			 * service.
@@ -169,93 +169,93 @@ 
 			 * @since 3.20.0
 			 */
 
-			return $this->schema_service->get_schema( 'thing' );
-		}
-
-		// If it's a page or post return `Article`.
-		if ( in_array( $post_type, array( 'post', 'page' ), true ) ) {
-			$this->log->debug( "Post $post_id has no terms, and it's a `post` type, returning `Article`." );
-
-			// Return "Article" schema type for posts.
-			return $this->schema_service->get_schema( 'article' );
-		}
-
-		// Return "Thing" schema type for entities.
-		$this->log->debug( "Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`." );
-
-		// Return the entity type with the specified id.
-		return $this->schema_service->get_schema( 'thing' );
-
-	}
-
-	/**
-	 * Get the term ids of the entity types associated to the specified post.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|WP_Error An array of entity types ids or a {@link WP_Error}.
-	 * @since 3.20.0
-	 */
-	public function get_ids( $post_id ) {
-
-		return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'fields' => 'ids' ) );
-	}
-
-	/**
-	 * Get the camel case names of the entity types associated to the specified post.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|WP_Error An array of entity types camel case names or a {@link WP_Error}.
-	 * @since 3.20.0
-	 */
-	public function get_names( $post_id ) {
-
-		$ids = $this->get_ids( $post_id );
-
-		// Filter out invalid terms (ones without _wl_name term meta)
-		return array_values(
-			array_filter(
-				array_map(
-					function ( $id ) {
-						return get_term_meta( $id, '_wl_name', true );
-					},
-					$ids
-				)
-			)
-		);
-	}
-
-	/**
-	 * Set the main type for the specified entity post, given the type URI.
-	 *
-	 * @param int    $post_id The post id.
-	 * @param string $type_uri The type URI.
-	 * @param bool   $replace Whether the provided type must replace the existing types, by default `true`.
-	 *
-	 * @since 3.8.0
-	 */
-	public function set( $post_id, $type_uri, $replace = true ) {
-
-		// If the type URI is empty we remove the type.
-		if ( empty( $type_uri ) ) {
-			$this->log->debug( "Removing entity type for post $post_id..." );
-
-			wp_set_object_terms( $post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-			return;
-		}
-
-		$this->log->debug( "Setting entity type for post $post_id..." );
-
-		// if the `$type_uri` starts with `wl-`, we're looking at the class name, which is `wl-` + slug.
-		$term = ( 0 === strpos( $type_uri, 'wl-' ) )
-			// Get term by slug.
-			? $this->get_term_by_slug( substr( $type_uri, 3 ) )
-			// Get term by URI.
-			: $this->get_term_by_uri( $type_uri );
-
-		/*
+            return $this->schema_service->get_schema( 'thing' );
+        }
+
+        // If it's a page or post return `Article`.
+        if ( in_array( $post_type, array( 'post', 'page' ), true ) ) {
+            $this->log->debug( "Post $post_id has no terms, and it's a `post` type, returning `Article`." );
+
+            // Return "Article" schema type for posts.
+            return $this->schema_service->get_schema( 'article' );
+        }
+
+        // Return "Thing" schema type for entities.
+        $this->log->debug( "Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`." );
+
+        // Return the entity type with the specified id.
+        return $this->schema_service->get_schema( 'thing' );
+
+    }
+
+    /**
+     * Get the term ids of the entity types associated to the specified post.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|WP_Error An array of entity types ids or a {@link WP_Error}.
+     * @since 3.20.0
+     */
+    public function get_ids( $post_id ) {
+
+        return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'fields' => 'ids' ) );
+    }
+
+    /**
+     * Get the camel case names of the entity types associated to the specified post.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|WP_Error An array of entity types camel case names or a {@link WP_Error}.
+     * @since 3.20.0
+     */
+    public function get_names( $post_id ) {
+
+        $ids = $this->get_ids( $post_id );
+
+        // Filter out invalid terms (ones without _wl_name term meta)
+        return array_values(
+            array_filter(
+                array_map(
+                    function ( $id ) {
+                        return get_term_meta( $id, '_wl_name', true );
+                    },
+                    $ids
+                )
+            )
+        );
+    }
+
+    /**
+     * Set the main type for the specified entity post, given the type URI.
+     *
+     * @param int    $post_id The post id.
+     * @param string $type_uri The type URI.
+     * @param bool   $replace Whether the provided type must replace the existing types, by default `true`.
+     *
+     * @since 3.8.0
+     */
+    public function set( $post_id, $type_uri, $replace = true ) {
+
+        // If the type URI is empty we remove the type.
+        if ( empty( $type_uri ) ) {
+            $this->log->debug( "Removing entity type for post $post_id..." );
+
+            wp_set_object_terms( $post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+            return;
+        }
+
+        $this->log->debug( "Setting entity type for post $post_id..." );
+
+        // if the `$type_uri` starts with `wl-`, we're looking at the class name, which is `wl-` + slug.
+        $term = ( 0 === strpos( $type_uri, 'wl-' ) )
+            // Get term by slug.
+            ? $this->get_term_by_slug( substr( $type_uri, 3 ) )
+            // Get term by URI.
+            : $this->get_term_by_uri( $type_uri );
+
+        /*
 		 * We always want to assign a type to an entity otherwise it won't show in the Vocabulary and it won't be
 		 * connected to Articles via mentions. We realized that the client JS code is passing `wl-other` when the
 		 * entity type isn't "notable". In which case we couldn't find an entity type.
@@ -266,246 +266,246 @@ 
 		 *
 		 * @since 3.23.4
 		 */
-		if ( false === $term ) {
-			$this->log->warn( "No term found for URI $type_uri, will use Thing." );
-
-			$term = $this->get_term_by_slug( 'thing' );
-
-			// We still need to be able to bali out here, for example WordPress 5.1 tests create posts before our taxonomy
-			// is installed.
-			if ( false === $term ) {
-				return;
-			}
-		}
-
-		$this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]..." );
-
-		// `$replace` is passed to decide whether to replace or append the term.
-		wp_set_object_terms( $post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace );
-
-	}
-
-	/**
-	 * Get an entity type term given its slug.
-	 *
-	 * @param string $slug The slug.
-	 *
-	 * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
-	 *                             or `$term` was not found.
-	 * @since 3.20.0
-	 */
-	private function get_term_by_slug( $slug ) {
-
-		return get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-	}
-
-	/**
-	 * Get an entity type term given its URI.
-	 *
-	 * @param string $uri The uri.
-	 *
-	 * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
-	 *                             or `$term` was not found.
-	 * @since 3.20.0
-	 */
-	public function get_term_by_uri( $uri ) {
-
-		$terms = get_terms(
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-			array(
-				'fields'     => 'all',
-				'get'        => 'all',
-				'number'     => 1,
-				'meta_query' => array(
-					array(
-						// Don't use a reference to Wordlift_Schemaorg_Class_Service, unless
-						// `WL_ALL_ENTITY_TYPES` is set to true.
-						'key'   => '_wl_uri',
-						'value' => $uri,
-					),
-				),
-				'orderby'    => 'term_id',
-				'order'      => 'ASC',
-			)
-		);
-
-		return is_array( $terms ) && ! empty( $terms ) ? $terms[0] : false;
-	}
-
-	/**
-	 * Check whether an entity type is set for the {@link WP_Post} with the
-	 * specified id.
-	 *
-	 * @param int    $post_id The {@link WP_Post}'s `id`.
-	 * @param string $uri The entity type URI.
-	 *
-	 * @return bool True if an entity type is set otherwise false.
-	 * @since 3.15.0
-	 */
-	public function has_entity_type( $post_id, $uri = null ) {
-
-		$this->log->debug( "Checking if post $post_id has an entity type [ $uri ]..." );
-
-		// If an URI hasn't been specified just check whether we have at least
-		// one entity type.
-		if ( null === $uri ) {
-			return has_term( '', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id );
-		}
-
-		$has_entity_type = ( null !== $this->has_post_term_by_uri( $post_id, $uri ) );
-
-		$this->log->debug( "Post $post_id has $uri type: " . ( $has_entity_type ? 'yes' : 'no' ) );
-
-		// Check whether the post has an entity type with that URI.
-		return $has_entity_type;
-	}
-
-	/**
-	 * Get the list of entity types' terms for the specified {@link WP_Post}.
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 *
-	 * @return array|WP_Error An array of entity types' terms or {@link WP_Error}.
-	 * @since 3.15.0
-	 */
-	private function get_post_terms( $post_id ) {
-
-		return wp_get_object_terms(
-			$post_id,
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-			array(
-				'hide_empty' => false,
-				// Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
-				// An issue has been opened with the AAM plugin author as well.
-				//
-				// see https://github.com/insideout10/wordlift-plugin/issues/334
-				// see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
-				'fields'     => 'all',
-			)
-		);
-	}
-
-	/**
-	 * Get an entity type term given its URI.
-	 *
-	 * @param int    $post_id The {@link WP_Post} id.
-	 * @param string $uri The entity type URI.
-	 *
-	 * @return bool True if the post has that type URI bound to it otherwise false.
-	 * @since 3.15.0
-	 *
-	 * @since 3.20.0 function renamed to `has_post_term_by_uri` and return type changed to `bool`.
-	 */
-	private function has_post_term_by_uri( $post_id, $uri ) {
-
-		// Get the post terms bound to the specified post.
-		$terms = $this->get_post_terms( $post_id );
-
-		// Look for a term if the specified URI.
-		foreach ( $terms as $term ) {
-			$term_uri = get_term_meta( $term->term_id, '_wl_uri', true );
-
-			if ( $uri === $term_uri ) {
-				return true;
-			}
-		}
-
-		// Return null.
-		return false;
-	}
-
-	/**
-	 * Get the custom fields for a specific post.
-	 *
-	 * @param int $post_id The post ID.
-	 *
-	 * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
-	 * @since 3.25.2
-	 */
-	public function get_custom_fields_for_post( $post_id ) {
-
-		// Return custom fields for this specific entity's type.
-		$types = $this->get_ids( $post_id );
-
-		/** @var WP_Term[] $terms */
-		$terms = array_filter(
-			array_map(
-				function ( $item ) {
-					return get_term( $item );
-				},
-				$types
-			),
-			function ( $item ) {
-				return isset( $item ) && is_a( $item, 'WP_Term' );
-			}
-		);
-
-		$term_slugs = array_map(
-			function ( $item ) {
-				return $item->slug;
-			},
-			$terms
-		);
-
-		$term_slugs[] = 'thing';
-
-		return $this->get_custom_fields_by_term_slugs( $term_slugs );
-	}
-
-	/**
-	 * Get the custom fields for a specific term.
-	 *
-	 * @param int $term_id The term ID.
-	 *
-	 * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
-	 * @since 3.32.0
-	 */
-	public function get_custom_fields_for_term( $term_id ) {
-		$selected_entity_types   = get_term_meta( $term_id, 'wl_entity_type' );
-		$selected_entity_types[] = 'thing';
-		$selected_entity_types   = array_unique( $selected_entity_types );
-
-		return $this->get_custom_fields_by_term_slugs( $selected_entity_types );
-	}
-
-	/**
-	 * Determines whether a post type can be used for entities.
-	 *
-	 * Criteria is that the post type is public. The list of valid post types
-	 * can be overridden with a filter.
-	 *
-	 * @param string $post_type A post type name.
-	 *
-	 * @return bool Return true if the post type can be used for entities, otherwise false.
-	 * @since 3.15.0
-	 */
-	public static function is_valid_entity_post_type( $post_type ) {
-
-		return in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true );
-	}
-
-	/**
-	 * @param $term_slugs
-	 *
-	 * @return array
-	 */
-	private function get_custom_fields_by_term_slugs( $term_slugs ) {
-		$schema_service = Wordlift_Schema_Service::get_instance();
-
-		return array_reduce(
-			$term_slugs,
-			function ( $carry, $item ) use ( $schema_service ) {
-
-				$schema = $schema_service->get_schema( $item );
-
-				if ( ! isset( $schema['custom_fields'] ) ) {
-					return $carry;
-				}
-
-				return $carry + $schema['custom_fields'];
-			},
-			array()
-		);
-	}
+        if ( false === $term ) {
+            $this->log->warn( "No term found for URI $type_uri, will use Thing." );
+
+            $term = $this->get_term_by_slug( 'thing' );
+
+            // We still need to be able to bali out here, for example WordPress 5.1 tests create posts before our taxonomy
+            // is installed.
+            if ( false === $term ) {
+                return;
+            }
+        }
+
+        $this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]..." );
+
+        // `$replace` is passed to decide whether to replace or append the term.
+        wp_set_object_terms( $post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace );
+
+    }
+
+    /**
+     * Get an entity type term given its slug.
+     *
+     * @param string $slug The slug.
+     *
+     * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
+     *                             or `$term` was not found.
+     * @since 3.20.0
+     */
+    private function get_term_by_slug( $slug ) {
+
+        return get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+    }
+
+    /**
+     * Get an entity type term given its URI.
+     *
+     * @param string $uri The uri.
+     *
+     * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
+     *                             or `$term` was not found.
+     * @since 3.20.0
+     */
+    public function get_term_by_uri( $uri ) {
+
+        $terms = get_terms(
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+            array(
+                'fields'     => 'all',
+                'get'        => 'all',
+                'number'     => 1,
+                'meta_query' => array(
+                    array(
+                        // Don't use a reference to Wordlift_Schemaorg_Class_Service, unless
+                        // `WL_ALL_ENTITY_TYPES` is set to true.
+                        'key'   => '_wl_uri',
+                        'value' => $uri,
+                    ),
+                ),
+                'orderby'    => 'term_id',
+                'order'      => 'ASC',
+            )
+        );
+
+        return is_array( $terms ) && ! empty( $terms ) ? $terms[0] : false;
+    }
+
+    /**
+     * Check whether an entity type is set for the {@link WP_Post} with the
+     * specified id.
+     *
+     * @param int    $post_id The {@link WP_Post}'s `id`.
+     * @param string $uri The entity type URI.
+     *
+     * @return bool True if an entity type is set otherwise false.
+     * @since 3.15.0
+     */
+    public function has_entity_type( $post_id, $uri = null ) {
+
+        $this->log->debug( "Checking if post $post_id has an entity type [ $uri ]..." );
+
+        // If an URI hasn't been specified just check whether we have at least
+        // one entity type.
+        if ( null === $uri ) {
+            return has_term( '', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id );
+        }
+
+        $has_entity_type = ( null !== $this->has_post_term_by_uri( $post_id, $uri ) );
+
+        $this->log->debug( "Post $post_id has $uri type: " . ( $has_entity_type ? 'yes' : 'no' ) );
+
+        // Check whether the post has an entity type with that URI.
+        return $has_entity_type;
+    }
+
+    /**
+     * Get the list of entity types' terms for the specified {@link WP_Post}.
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     *
+     * @return array|WP_Error An array of entity types' terms or {@link WP_Error}.
+     * @since 3.15.0
+     */
+    private function get_post_terms( $post_id ) {
+
+        return wp_get_object_terms(
+            $post_id,
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+            array(
+                'hide_empty' => false,
+                // Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
+                // An issue has been opened with the AAM plugin author as well.
+                //
+                // see https://github.com/insideout10/wordlift-plugin/issues/334
+                // see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
+                'fields'     => 'all',
+            )
+        );
+    }
+
+    /**
+     * Get an entity type term given its URI.
+     *
+     * @param int    $post_id The {@link WP_Post} id.
+     * @param string $uri The entity type URI.
+     *
+     * @return bool True if the post has that type URI bound to it otherwise false.
+     * @since 3.15.0
+     *
+     * @since 3.20.0 function renamed to `has_post_term_by_uri` and return type changed to `bool`.
+     */
+    private function has_post_term_by_uri( $post_id, $uri ) {
+
+        // Get the post terms bound to the specified post.
+        $terms = $this->get_post_terms( $post_id );
+
+        // Look for a term if the specified URI.
+        foreach ( $terms as $term ) {
+            $term_uri = get_term_meta( $term->term_id, '_wl_uri', true );
+
+            if ( $uri === $term_uri ) {
+                return true;
+            }
+        }
+
+        // Return null.
+        return false;
+    }
+
+    /**
+     * Get the custom fields for a specific post.
+     *
+     * @param int $post_id The post ID.
+     *
+     * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
+     * @since 3.25.2
+     */
+    public function get_custom_fields_for_post( $post_id ) {
+
+        // Return custom fields for this specific entity's type.
+        $types = $this->get_ids( $post_id );
+
+        /** @var WP_Term[] $terms */
+        $terms = array_filter(
+            array_map(
+                function ( $item ) {
+                    return get_term( $item );
+                },
+                $types
+            ),
+            function ( $item ) {
+                return isset( $item ) && is_a( $item, 'WP_Term' );
+            }
+        );
+
+        $term_slugs = array_map(
+            function ( $item ) {
+                return $item->slug;
+            },
+            $terms
+        );
+
+        $term_slugs[] = 'thing';
+
+        return $this->get_custom_fields_by_term_slugs( $term_slugs );
+    }
+
+    /**
+     * Get the custom fields for a specific term.
+     *
+     * @param int $term_id The term ID.
+     *
+     * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
+     * @since 3.32.0
+     */
+    public function get_custom_fields_for_term( $term_id ) {
+        $selected_entity_types   = get_term_meta( $term_id, 'wl_entity_type' );
+        $selected_entity_types[] = 'thing';
+        $selected_entity_types   = array_unique( $selected_entity_types );
+
+        return $this->get_custom_fields_by_term_slugs( $selected_entity_types );
+    }
+
+    /**
+     * Determines whether a post type can be used for entities.
+     *
+     * Criteria is that the post type is public. The list of valid post types
+     * can be overridden with a filter.
+     *
+     * @param string $post_type A post type name.
+     *
+     * @return bool Return true if the post type can be used for entities, otherwise false.
+     * @since 3.15.0
+     */
+    public static function is_valid_entity_post_type( $post_type ) {
+
+        return in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true );
+    }
+
+    /**
+     * @param $term_slugs
+     *
+     * @return array
+     */
+    private function get_custom_fields_by_term_slugs( $term_slugs ) {
+        $schema_service = Wordlift_Schema_Service::get_instance();
+
+        return array_reduce(
+            $term_slugs,
+            function ( $carry, $item ) use ( $schema_service ) {
+
+                $schema = $schema_service->get_schema( $item );
+
+                if ( ! isset( $schema['custom_fields'] ) ) {
+                    return $carry;
+                }
+
+                return $carry + $schema['custom_fields'];
+            },
+            array()
+        );
+    }
 
 }

Spacing +77 added lines, -77 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	protected function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Type_Service');
 
 		$this->schema_service = Wordlift_Schema_Service::get_instance();
 
@@ -61,11 +61,11 @@ 
 
 		add_action(
 			'init',
-			function () {
+			function() {
 				// Add post type support for 'custom-fields' for all post types. Specifically needed in Gutenberg
 				$post_types = get_post_types();
-				foreach ( $post_types as $post_type ) {
-					add_post_type_support( $post_type, 'custom-fields' );
+				foreach ($post_types as $post_type) {
+					add_post_type_support($post_type, 'custom-fields');
 				}
 			}
 		);
@@ -88,7 +88,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -126,34 +126,34 @@ 
 	 *      c) the post is a custom post type then it is
 	 *          assigned the `WebPage` entity type by default.
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
-		$this->log->trace( "Getting the post type for post $post_id..." );
+		$this->log->trace("Getting the post type for post $post_id...");
 
 		// Get the post type.
-		$post_type = get_post_type( $post_id );
+		$post_type = get_post_type($post_id);
 
 		// Return `web-page` for non entities.
-		if ( ! self::is_valid_entity_post_type( $post_type ) ) {
-			$this->log->info( "Returning `web-page` for post $post_id." );
+		if ( ! self::is_valid_entity_post_type($post_type)) {
+			$this->log->info("Returning `web-page` for post $post_id.");
 
-			return $this->schema_service->get_schema( 'web-page' );
+			return $this->schema_service->get_schema('web-page');
 		}
 
 		// Get the type from the associated classification.
-		$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		$terms = wp_get_object_terms($post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
 		// Return the schema type if there is a term found.
-		if ( ! is_wp_error( $terms ) && ! empty( $terms ) ) {
+		if ( ! is_wp_error($terms) && ! empty($terms)) {
 			// Cycle through the terms and return the first one with a valid schema.
-			foreach ( $terms as $term ) {
-				$this->log->debug( "Found `{$term->slug}` term for post $post_id." );
+			foreach ($terms as $term) {
+				$this->log->debug("Found `{$term->slug}` term for post $post_id.");
 
 				// Try to get the schema for the term.
-				$schema = $this->schema_service->get_schema( $term->slug );
+				$schema = $this->schema_service->get_schema($term->slug);
 
 				// If found, return it, ignoring the other types.
-				if ( null !== $schema ) {
+				if (null !== $schema) {
 					// Return the entity type with the specified id.
 					return $schema;
 				}
@@ -169,22 +169,22 @@ 
 			 * @since 3.20.0
 			 */
 
-			return $this->schema_service->get_schema( 'thing' );
+			return $this->schema_service->get_schema('thing');
 		}
 
 		// If it's a page or post return `Article`.
-		if ( in_array( $post_type, array( 'post', 'page' ), true ) ) {
-			$this->log->debug( "Post $post_id has no terms, and it's a `post` type, returning `Article`." );
+		if (in_array($post_type, array('post', 'page'), true)) {
+			$this->log->debug("Post $post_id has no terms, and it's a `post` type, returning `Article`.");
 
 			// Return "Article" schema type for posts.
-			return $this->schema_service->get_schema( 'article' );
+			return $this->schema_service->get_schema('article');
 		}
 
 		// Return "Thing" schema type for entities.
-		$this->log->debug( "Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`." );
+		$this->log->debug("Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`.");
 
 		// Return the entity type with the specified id.
-		return $this->schema_service->get_schema( 'thing' );
+		return $this->schema_service->get_schema('thing');
 
 	}
 
@@ -196,9 +196,9 @@ 
 	 * @return array|WP_Error An array of entity types ids or a {@link WP_Error}.
 	 * @since 3.20.0
 	 */
-	public function get_ids( $post_id ) {
+	public function get_ids($post_id) {
 
-		return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'fields' => 'ids' ) );
+		return wp_get_object_terms($post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array('fields' => 'ids'));
 	}
 
 	/**
@@ -209,16 +209,16 @@ 
 	 * @return array|WP_Error An array of entity types camel case names or a {@link WP_Error}.
 	 * @since 3.20.0
 	 */
-	public function get_names( $post_id ) {
+	public function get_names($post_id) {
 
-		$ids = $this->get_ids( $post_id );
+		$ids = $this->get_ids($post_id);
 
 		// Filter out invalid terms (ones without _wl_name term meta)
 		return array_values(
 			array_filter(
 				array_map(
-					function ( $id ) {
-						return get_term_meta( $id, '_wl_name', true );
+					function($id) {
+						return get_term_meta($id, '_wl_name', true);
 					},
 					$ids
 				)
@@ -235,25 +235,25 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function set( $post_id, $type_uri, $replace = true ) {
+	public function set($post_id, $type_uri, $replace = true) {
 
 		// If the type URI is empty we remove the type.
-		if ( empty( $type_uri ) ) {
-			$this->log->debug( "Removing entity type for post $post_id..." );
+		if (empty($type_uri)) {
+			$this->log->debug("Removing entity type for post $post_id...");
 
-			wp_set_object_terms( $post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			wp_set_object_terms($post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
 			return;
 		}
 
-		$this->log->debug( "Setting entity type for post $post_id..." );
+		$this->log->debug("Setting entity type for post $post_id...");
 
 		// if the `$type_uri` starts with `wl-`, we're looking at the class name, which is `wl-` + slug.
-		$term = ( 0 === strpos( $type_uri, 'wl-' ) )
+		$term = (0 === strpos($type_uri, 'wl-'))
 			// Get term by slug.
-			? $this->get_term_by_slug( substr( $type_uri, 3 ) )
+			? $this->get_term_by_slug(substr($type_uri, 3))
 			// Get term by URI.
-			: $this->get_term_by_uri( $type_uri );
+			: $this->get_term_by_uri($type_uri);
 
 		/*
 		 * We always want to assign a type to an entity otherwise it won't show in the Vocabulary and it won't be
@@ -266,22 +266,22 @@ 
 		 *
 		 * @since 3.23.4
 		 */
-		if ( false === $term ) {
-			$this->log->warn( "No term found for URI $type_uri, will use Thing." );
+		if (false === $term) {
+			$this->log->warn("No term found for URI $type_uri, will use Thing.");
 
-			$term = $this->get_term_by_slug( 'thing' );
+			$term = $this->get_term_by_slug('thing');
 
 			// We still need to be able to bali out here, for example WordPress 5.1 tests create posts before our taxonomy
 			// is installed.
-			if ( false === $term ) {
+			if (false === $term) {
 				return;
 			}
 		}
 
-		$this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]..." );
+		$this->log->debug("Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]...");
 
 		// `$replace` is passed to decide whether to replace or append the term.
-		wp_set_object_terms( $post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace );
+		wp_set_object_terms($post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace);
 
 	}
 
@@ -294,9 +294,9 @@ 
 	 *                             or `$term` was not found.
 	 * @since 3.20.0
 	 */
-	private function get_term_by_slug( $slug ) {
+	private function get_term_by_slug($slug) {
 
-		return get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		return get_term_by('slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 	}
 
 	/**
@@ -308,7 +308,7 @@ 
 	 *                             or `$term` was not found.
 	 * @since 3.20.0
 	 */
-	public function get_term_by_uri( $uri ) {
+	public function get_term_by_uri($uri) {
 
 		$terms = get_terms(
 			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
@@ -329,7 +329,7 @@ 
 			)
 		);
 
-		return is_array( $terms ) && ! empty( $terms ) ? $terms[0] : false;
+		return is_array($terms) && ! empty($terms) ? $terms[0] : false;
 	}
 
 	/**
@@ -342,19 +342,19 @@ 
 	 * @return bool True if an entity type is set otherwise false.
 	 * @since 3.15.0
 	 */
-	public function has_entity_type( $post_id, $uri = null ) {
+	public function has_entity_type($post_id, $uri = null) {
 
-		$this->log->debug( "Checking if post $post_id has an entity type [ $uri ]..." );
+		$this->log->debug("Checking if post $post_id has an entity type [ $uri ]...");
 
 		// If an URI hasn't been specified just check whether we have at least
 		// one entity type.
-		if ( null === $uri ) {
-			return has_term( '', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id );
+		if (null === $uri) {
+			return has_term('', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id);
 		}
 
-		$has_entity_type = ( null !== $this->has_post_term_by_uri( $post_id, $uri ) );
+		$has_entity_type = (null !== $this->has_post_term_by_uri($post_id, $uri));
 
-		$this->log->debug( "Post $post_id has $uri type: " . ( $has_entity_type ? 'yes' : 'no' ) );
+		$this->log->debug("Post $post_id has $uri type: ".($has_entity_type ? 'yes' : 'no'));
 
 		// Check whether the post has an entity type with that URI.
 		return $has_entity_type;
@@ -368,7 +368,7 @@ 
 	 * @return array|WP_Error An array of entity types' terms or {@link WP_Error}.
 	 * @since 3.15.0
 	 */
-	private function get_post_terms( $post_id ) {
+	private function get_post_terms($post_id) {
 
 		return wp_get_object_terms(
 			$post_id,
@@ -396,16 +396,16 @@ 
 	 *
 	 * @since 3.20.0 function renamed to `has_post_term_by_uri` and return type changed to `bool`.
 	 */
-	private function has_post_term_by_uri( $post_id, $uri ) {
+	private function has_post_term_by_uri($post_id, $uri) {
 
 		// Get the post terms bound to the specified post.
-		$terms = $this->get_post_terms( $post_id );
+		$terms = $this->get_post_terms($post_id);
 
 		// Look for a term if the specified URI.
-		foreach ( $terms as $term ) {
-			$term_uri = get_term_meta( $term->term_id, '_wl_uri', true );
+		foreach ($terms as $term) {
+			$term_uri = get_term_meta($term->term_id, '_wl_uri', true);
 
-			if ( $uri === $term_uri ) {
+			if ($uri === $term_uri) {
 				return true;
 			}
 		}
@@ -422,26 +422,26 @@ 
 	 * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
 	 * @since 3.25.2
 	 */
-	public function get_custom_fields_for_post( $post_id ) {
+	public function get_custom_fields_for_post($post_id) {
 
 		// Return custom fields for this specific entity's type.
-		$types = $this->get_ids( $post_id );
+		$types = $this->get_ids($post_id);
 
 		/** @var WP_Term[] $terms */
 		$terms = array_filter(
 			array_map(
-				function ( $item ) {
-					return get_term( $item );
+				function($item) {
+					return get_term($item);
 				},
 				$types
 			),
-			function ( $item ) {
-				return isset( $item ) && is_a( $item, 'WP_Term' );
+			function($item) {
+				return isset($item) && is_a($item, 'WP_Term');
 			}
 		);
 
 		$term_slugs = array_map(
-			function ( $item ) {
+			function($item) {
 				return $item->slug;
 			},
 			$terms
@@ -449,7 +449,7 @@ 
 
 		$term_slugs[] = 'thing';
 
-		return $this->get_custom_fields_by_term_slugs( $term_slugs );
+		return $this->get_custom_fields_by_term_slugs($term_slugs);
 	}
 
 	/**
@@ -460,12 +460,12 @@ 
 	 * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
 	 * @since 3.32.0
 	 */
-	public function get_custom_fields_for_term( $term_id ) {
-		$selected_entity_types   = get_term_meta( $term_id, 'wl_entity_type' );
+	public function get_custom_fields_for_term($term_id) {
+		$selected_entity_types   = get_term_meta($term_id, 'wl_entity_type');
 		$selected_entity_types[] = 'thing';
-		$selected_entity_types   = array_unique( $selected_entity_types );
+		$selected_entity_types   = array_unique($selected_entity_types);
 
-		return $this->get_custom_fields_by_term_slugs( $selected_entity_types );
+		return $this->get_custom_fields_by_term_slugs($selected_entity_types);
 	}
 
 	/**
@@ -479,9 +479,9 @@ 
 	 * @return bool Return true if the post type can be used for entities, otherwise false.
 	 * @since 3.15.0
 	 */
-	public static function is_valid_entity_post_type( $post_type ) {
+	public static function is_valid_entity_post_type($post_type) {
 
-		return in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true );
+		return in_array($post_type, Wordlift_Entity_Service::valid_entity_post_types(), true);
 	}
 
 	/**
@@ -489,16 +489,16 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_custom_fields_by_term_slugs( $term_slugs ) {
+	private function get_custom_fields_by_term_slugs($term_slugs) {
 		$schema_service = Wordlift_Schema_Service::get_instance();
 
 		return array_reduce(
 			$term_slugs,
-			function ( $carry, $item ) use ( $schema_service ) {
+			function($carry, $item) use ($schema_service) {
 
-				$schema = $schema_service->get_schema( $item );
+				$schema = $schema_service->get_schema($item);
 
-				if ( ! isset( $schema['custom_fields'] ) ) {
+				if ( ! isset($schema['custom_fields'])) {
 					return $carry;
 				}
 

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

Indentation +76 added lines, -76 removed lines

@@ -13,7 +13,7 @@ 
 use Wordlift\Autocomplete\Autocomplete_Service;
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -23,79 +23,79 @@ 
  */
 class Wordlift_Autocomplete_Adapter {
 
-	/**
-	 * The {@link Autocomplete_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var Autocomplete_Service $configuration_service The {@link Autocomplete_Service} instance.
-	 */
-	private $autocomplete_service;
-
-	/**
-	 * Wordlift_Autocomplete_Adapter constructor.
-	 *
-	 * @param Autocomplete_Service $autocomplete_service The {@link Autocomplete_Service} instance.
-	 *
-	 * @since 3.14.2
-	 */
-	public function __construct( $autocomplete_service ) {
-		$this->autocomplete_service = $autocomplete_service;
-	}
-
-	/**
-	 * Handle the autocomplete ajax request.
-	 *
-	 * @since 3.15.0
-	 */
-	public function wl_autocomplete() {
-
-		check_ajax_referer( 'wl_autocomplete' );
-
-		// Return error if the query param is empty.
-		if ( ! empty( $_REQUEST['query'] ) ) { // Input var okay.
-			$query = sanitize_text_field( wp_unslash( $_REQUEST['query'] ) ); // Input var okay.
-		} else {
-			wp_send_json_error(
-				array(
-					'message' => __( 'The query param is empty.', 'wordlift' ),
-				)
-			);
-		}
-
-		// Get the exclude parameter.
-		$exclude = ! empty( $_REQUEST['exclude'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['exclude'] ) ) : '';
-
-		$scope = ! empty( $_REQUEST['scope'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['scope'] ) ) : WL_AUTOCOMPLETE_SCOPE;
-
-		/**
-		 * @since 3.26.1
-		 * Providing a way for term pages to show and save local entities.
-		 */
-		$show_local_entities = false;
-
-		if ( isset( $_REQUEST['show_local_entities'] )
-			 && ! empty( $_REQUEST['show_local_entities'] ) ) { // Make request.
-			$show_local_entities = filter_var( wp_unslash( $_REQUEST['show_local_entities'] ), FILTER_VALIDATE_BOOLEAN );
-		}
-
-		// Add the filter to check if we need to show local entities or not.
-		add_filter(
-			'wl_show_local_entities',
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-			function ( $state ) use ( $show_local_entities ) {
-				return $show_local_entities;
-			}
-		);
-
-		$results = $this->autocomplete_service->query( $query, $scope, $exclude );
-
-		// Clear any buffer.
-		ob_clean();
-
-		wp_send_json_success( $results );
-
-	}
+    /**
+     * The {@link Autocomplete_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var Autocomplete_Service $configuration_service The {@link Autocomplete_Service} instance.
+     */
+    private $autocomplete_service;
+
+    /**
+     * Wordlift_Autocomplete_Adapter constructor.
+     *
+     * @param Autocomplete_Service $autocomplete_service The {@link Autocomplete_Service} instance.
+     *
+     * @since 3.14.2
+     */
+    public function __construct( $autocomplete_service ) {
+        $this->autocomplete_service = $autocomplete_service;
+    }
+
+    /**
+     * Handle the autocomplete ajax request.
+     *
+     * @since 3.15.0
+     */
+    public function wl_autocomplete() {
+
+        check_ajax_referer( 'wl_autocomplete' );
+
+        // Return error if the query param is empty.
+        if ( ! empty( $_REQUEST['query'] ) ) { // Input var okay.
+            $query = sanitize_text_field( wp_unslash( $_REQUEST['query'] ) ); // Input var okay.
+        } else {
+            wp_send_json_error(
+                array(
+                    'message' => __( 'The query param is empty.', 'wordlift' ),
+                )
+            );
+        }
+
+        // Get the exclude parameter.
+        $exclude = ! empty( $_REQUEST['exclude'] )
+            ? sanitize_text_field( wp_unslash( $_REQUEST['exclude'] ) ) : '';
+
+        $scope = ! empty( $_REQUEST['scope'] )
+            ? sanitize_text_field( wp_unslash( $_REQUEST['scope'] ) ) : WL_AUTOCOMPLETE_SCOPE;
+
+        /**
+         * @since 3.26.1
+         * Providing a way for term pages to show and save local entities.
+         */
+        $show_local_entities = false;
+
+        if ( isset( $_REQUEST['show_local_entities'] )
+             && ! empty( $_REQUEST['show_local_entities'] ) ) { // Make request.
+            $show_local_entities = filter_var( wp_unslash( $_REQUEST['show_local_entities'] ), FILTER_VALIDATE_BOOLEAN );
+        }
+
+        // Add the filter to check if we need to show local entities or not.
+        add_filter(
+            'wl_show_local_entities',
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+            function ( $state ) use ( $show_local_entities ) {
+                return $show_local_entities;
+            }
+        );
+
+        $results = $this->autocomplete_service->query( $query, $scope, $exclude );
+
+        // Clear any buffer.
+        ob_clean();
+
+        wp_send_json_success( $results );
+
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -12,7 +12,7 @@ 
 
 use Wordlift\Autocomplete\Autocomplete_Service;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -39,7 +39,7 @@ 
 	 *
 	 * @since 3.14.2
 	 */
-	public function __construct( $autocomplete_service ) {
+	public function __construct($autocomplete_service) {
 		$this->autocomplete_service = $autocomplete_service;
 	}
 
@@ -50,25 +50,25 @@ 
 	 */
 	public function wl_autocomplete() {
 
-		check_ajax_referer( 'wl_autocomplete' );
+		check_ajax_referer('wl_autocomplete');
 
 		// Return error if the query param is empty.
-		if ( ! empty( $_REQUEST['query'] ) ) { // Input var okay.
-			$query = sanitize_text_field( wp_unslash( $_REQUEST['query'] ) ); // Input var okay.
+		if ( ! empty($_REQUEST['query'])) { // Input var okay.
+			$query = sanitize_text_field(wp_unslash($_REQUEST['query'])); // Input var okay.
 		} else {
 			wp_send_json_error(
 				array(
-					'message' => __( 'The query param is empty.', 'wordlift' ),
+					'message' => __('The query param is empty.', 'wordlift'),
 				)
 			);
 		}
 
 		// Get the exclude parameter.
-		$exclude = ! empty( $_REQUEST['exclude'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['exclude'] ) ) : '';
+		$exclude = ! empty($_REQUEST['exclude'])
+			? sanitize_text_field(wp_unslash($_REQUEST['exclude'])) : '';
 
-		$scope = ! empty( $_REQUEST['scope'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['scope'] ) ) : WL_AUTOCOMPLETE_SCOPE;
+		$scope = ! empty($_REQUEST['scope'])
+			? sanitize_text_field(wp_unslash($_REQUEST['scope'])) : WL_AUTOCOMPLETE_SCOPE;
 
 		/**
 		 * @since 3.26.1
@@ -76,26 +76,26 @@ 
 		 */
 		$show_local_entities = false;
 
-		if ( isset( $_REQUEST['show_local_entities'] )
-			 && ! empty( $_REQUEST['show_local_entities'] ) ) { // Make request.
-			$show_local_entities = filter_var( wp_unslash( $_REQUEST['show_local_entities'] ), FILTER_VALIDATE_BOOLEAN );
+		if (isset($_REQUEST['show_local_entities'])
+			 && ! empty($_REQUEST['show_local_entities'])) { // Make request.
+			$show_local_entities = filter_var(wp_unslash($_REQUEST['show_local_entities']), FILTER_VALIDATE_BOOLEAN);
 		}
 
 		// Add the filter to check if we need to show local entities or not.
 		add_filter(
 			'wl_show_local_entities',
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-			function ( $state ) use ( $show_local_entities ) {
+			function($state) use ($show_local_entities) {
 				return $show_local_entities;
 			}
 		);
 
-		$results = $this->autocomplete_service->query( $query, $scope, $exclude );
+		$results = $this->autocomplete_service->query($query, $scope, $exclude);
 
 		// Clear any buffer.
 		ob_clean();
 
-		wp_send_json_success( $results );
+		wp_send_json_success($results);
 
 	}
 }