insideout10 / wordlift-plugin

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

Indentation +171 added lines, -171 removed lines

@@ -16,176 +16,176 @@
  */
 class Wordlift_Entity_Post_Type_Service {
 
-	/**
-	 * The entity post type.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $post_type The entity post type.
-	 */
-	private $post_type;
-
-	/**
-	 * The entity type slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $slug The entity type slug.
-	 */
-	private $slug;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * A singleton instance of the entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var Wordlift_Entity_Post_Type_Service
-	 */
-	private static $instance;
-
-	/**
-	 * Create an entity type service instance.
-	 *
-	 * @param string $post_type The post type, e.g. entity.
-	 * @param string $slug The entity type slug, if the slug is empty, the default slug will be used.
-	 *
-	 * @since 3.6.0
-	 */
-	public function __construct( $post_type, $slug ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->post_type = $post_type;
-
-		// We cannot assign an empty slug to the register_post_type function, therefore if the slug is empty we default
-		// to the type name.
-		$this->slug = $slug ? $slug : $post_type;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the entity type service singleton instance.
-	 *
-	 * @return Wordlift_Entity_Post_Type_Service The entity type service singleton instance.
-	 * @since 3.6.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the entity type slug.
-	 *
-	 * @return string The entity type slug.
-	 * @since 3.6.0
-	 */
-	public function get_slug() {
-
-		return $this->slug;
-	}
-
-	/**
-	 * Get the entity post type name.
-	 *
-	 * @return string The entity post type.
-	 * @since 3.6.0
-	 */
-	public function get_post_type() {
-
-		return $this->post_type;
-	}
-
-	/**
-	 * Register the WordLift entity post type. This method is hooked to WordPress' init action.
-	 *
-	 * @since 3.6.0
-	 */
-	public function register() {
-
-		$this->log->debug( "Registering post type $this->post_type..." );
-
-		$labels = array(
-			'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
-			'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
-			'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
-			'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
-			'edit_item'          => __( 'Edit Entity', 'wordlift' ),
-			'new_item'           => __( 'New Entity', 'wordlift' ),
-			'all_items'          => __( 'All Entities', 'wordlift' ),
-			'view_item'          => __( 'View Entity', 'wordlift' ),
-			'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
-			'not_found'          => __( 'No entities found', 'wordlift' ),
-			'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
-			'parent_item_colon'  => '',
-			'menu_name'          => __( 'Vocabulary', 'wordlift' ),
-		);
-
-		$args = array(
-			'labels'          => $labels,
-			'description'     => 'Holds our vocabulary (set of entities) and entity specific data',
-			'public'          => true,
-			'menu_position'   => 20,
-			// after the pages menu.
-			// Add support for 'authors' and 'revisions':
-			// * see https://github.com/insideout10/wordlift-plugin/issues/395
-			// * see https://github.com/insideout10/wordlift-plugin/issues/376
-			'supports'        => array(
-				'title',
-				'editor',
-				'thumbnail',
-				'excerpt',
-				'comments',
-				'author',
-				'revisions',
-				'custom-fields',
-			),
-			'has_archive'     => true,
-			'menu_icon'       => WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
-			// Although we define our slug here, we further manage linking to entities using the Wordlift_Entity_Link_Service.
-			'rewrite'         => array( 'slug' => $this->slug ),
-			'capability_type' => array(
-				'wordlift_entity',
-				'wordlift_entities',
-			),
-			'capabilities'    => array(
-				'delete_posts' => 'delete_wordlift_entities',
-			),
-			'rest_base'       => 'entities',
-			'show_in_rest'    => true,
-			/**
-			 * Filter: wl_feature__enable__vocabulary.
-			 *
-			 * @param bool whether the vocabulary needs to be shown in menu.
-			 *
-			 * @return bool
-			 * @since 3.27.6
-			 */
-			'show_in_menu'    => apply_filters( 'wl_feature__enable__vocabulary', true ),
-		);
-
-		register_post_type( $this->post_type, $args );
-
-		// Enable WP's standard `category` taxonomy for entities.
-		//
-		// While this enables editors to bind entities to the WP posts' category
-		// taxonomy, in Wordlift_Category_Taxonomy_Service we also need to alter
-		// WP's main category query to include the `entity` post type.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/442
-		register_taxonomy_for_object_type( 'category', $this->post_type );
-
-	}
+    /**
+     * The entity post type.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $post_type The entity post type.
+     */
+    private $post_type;
+
+    /**
+     * The entity type slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $slug The entity type slug.
+     */
+    private $slug;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * A singleton instance of the entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var Wordlift_Entity_Post_Type_Service
+     */
+    private static $instance;
+
+    /**
+     * Create an entity type service instance.
+     *
+     * @param string $post_type The post type, e.g. entity.
+     * @param string $slug The entity type slug, if the slug is empty, the default slug will be used.
+     *
+     * @since 3.6.0
+     */
+    public function __construct( $post_type, $slug ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->post_type = $post_type;
+
+        // We cannot assign an empty slug to the register_post_type function, therefore if the slug is empty we default
+        // to the type name.
+        $this->slug = $slug ? $slug : $post_type;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the entity type service singleton instance.
+     *
+     * @return Wordlift_Entity_Post_Type_Service The entity type service singleton instance.
+     * @since 3.6.0
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the entity type slug.
+     *
+     * @return string The entity type slug.
+     * @since 3.6.0
+     */
+    public function get_slug() {
+
+        return $this->slug;
+    }
+
+    /**
+     * Get the entity post type name.
+     *
+     * @return string The entity post type.
+     * @since 3.6.0
+     */
+    public function get_post_type() {
+
+        return $this->post_type;
+    }
+
+    /**
+     * Register the WordLift entity post type. This method is hooked to WordPress' init action.
+     *
+     * @since 3.6.0
+     */
+    public function register() {
+
+        $this->log->debug( "Registering post type $this->post_type..." );
+
+        $labels = array(
+            'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
+            'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
+            'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
+            'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
+            'edit_item'          => __( 'Edit Entity', 'wordlift' ),
+            'new_item'           => __( 'New Entity', 'wordlift' ),
+            'all_items'          => __( 'All Entities', 'wordlift' ),
+            'view_item'          => __( 'View Entity', 'wordlift' ),
+            'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
+            'not_found'          => __( 'No entities found', 'wordlift' ),
+            'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
+            'parent_item_colon'  => '',
+            'menu_name'          => __( 'Vocabulary', 'wordlift' ),
+        );
+
+        $args = array(
+            'labels'          => $labels,
+            'description'     => 'Holds our vocabulary (set of entities) and entity specific data',
+            'public'          => true,
+            'menu_position'   => 20,
+            // after the pages menu.
+            // Add support for 'authors' and 'revisions':
+            // * see https://github.com/insideout10/wordlift-plugin/issues/395
+            // * see https://github.com/insideout10/wordlift-plugin/issues/376
+            'supports'        => array(
+                'title',
+                'editor',
+                'thumbnail',
+                'excerpt',
+                'comments',
+                'author',
+                'revisions',
+                'custom-fields',
+            ),
+            'has_archive'     => true,
+            'menu_icon'       => WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
+            // Although we define our slug here, we further manage linking to entities using the Wordlift_Entity_Link_Service.
+            'rewrite'         => array( 'slug' => $this->slug ),
+            'capability_type' => array(
+                'wordlift_entity',
+                'wordlift_entities',
+            ),
+            'capabilities'    => array(
+                'delete_posts' => 'delete_wordlift_entities',
+            ),
+            'rest_base'       => 'entities',
+            'show_in_rest'    => true,
+            /**
+             * Filter: wl_feature__enable__vocabulary.
+             *
+             * @param bool whether the vocabulary needs to be shown in menu.
+             *
+             * @return bool
+             * @since 3.27.6
+             */
+            'show_in_menu'    => apply_filters( 'wl_feature__enable__vocabulary', true ),
+        );
+
+        register_post_type( $this->post_type, $args );
+
+        // Enable WP's standard `category` taxonomy for entities.
+        //
+        // While this enables editors to bind entities to the WP posts' category
+        // taxonomy, in Wordlift_Category_Taxonomy_Service we also need to alter
+        // WP's main category query to include the `entity` post type.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/442
+        register_taxonomy_for_object_type( 'category', $this->post_type );
+
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -60,9 +60,9 @@ 
 	 *
 	 * @since 3.6.0
 	 */
-	public function __construct( $post_type, $slug ) {
+	public function __construct($post_type, $slug) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->post_type = $post_type;
 
@@ -114,22 +114,22 @@ 
 	 */
 	public function register() {
 
-		$this->log->debug( "Registering post type $this->post_type..." );
+		$this->log->debug("Registering post type $this->post_type...");
 
 		$labels = array(
-			'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
-			'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
-			'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
-			'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
-			'edit_item'          => __( 'Edit Entity', 'wordlift' ),
-			'new_item'           => __( 'New Entity', 'wordlift' ),
-			'all_items'          => __( 'All Entities', 'wordlift' ),
-			'view_item'          => __( 'View Entity', 'wordlift' ),
-			'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
-			'not_found'          => __( 'No entities found', 'wordlift' ),
-			'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
+			'name'               => _x('Vocabulary', 'post type general name', 'wordlift'),
+			'singular_name'      => _x('Entity', 'post type singular name', 'wordlift'),
+			'add_new'            => _x('Add New Entity', 'entity', 'wordlift'),
+			'add_new_item'       => __('Add New Entity', 'wordlift'),
+			'edit_item'          => __('Edit Entity', 'wordlift'),
+			'new_item'           => __('New Entity', 'wordlift'),
+			'all_items'          => __('All Entities', 'wordlift'),
+			'view_item'          => __('View Entity', 'wordlift'),
+			'search_items'       => __('Search in Vocabulary', 'wordlift'),
+			'not_found'          => __('No entities found', 'wordlift'),
+			'not_found_in_trash' => __('No entities found in the Trash', 'wordlift'),
 			'parent_item_colon'  => '',
-			'menu_name'          => __( 'Vocabulary', 'wordlift' ),
+			'menu_name'          => __('Vocabulary', 'wordlift'),
 		);
 
 		$args = array(
@@ -152,9 +152,9 @@ 
 				'custom-fields',
 			),
 			'has_archive'     => true,
-			'menu_icon'       => WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
+			'menu_icon'       => WP_CONTENT_URL.'/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
 			// Although we define our slug here, we further manage linking to entities using the Wordlift_Entity_Link_Service.
-			'rewrite'         => array( 'slug' => $this->slug ),
+			'rewrite'         => array('slug' => $this->slug),
 			'capability_type' => array(
 				'wordlift_entity',
 				'wordlift_entities',
@@ -172,10 +172,10 @@ 
 			 * @return bool
 			 * @since 3.27.6
 			 */
-			'show_in_menu'    => apply_filters( 'wl_feature__enable__vocabulary', true ),
+			'show_in_menu'    => apply_filters('wl_feature__enable__vocabulary', true),
 		);
 
-		register_post_type( $this->post_type, $args );
+		register_post_type($this->post_type, $args);
 
 		// Enable WP's standard `category` taxonomy for entities.
 		//
@@ -184,7 +184,7 @@ 
 		// WP's main category query to include the `entity` post type.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/442
-		register_taxonomy_for_object_type( 'category', $this->post_type );
+		register_taxonomy_for_object_type('category', $this->post_type);
 
 	}
 

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/class-wordlift-ui-service.php

Indentation +66 added lines, -66 removed lines

@@ -6,82 +6,82 @@
  */
 class Wordlift_UI_Service {
 
-	/**
-	 * The button element HTML code.
-	 *
-	 * @since 3.2.0
-	 */
-	const BUTTON_HTML = '<a id="%s" class="button wl-button">%s</a>';
+    /**
+     * The button element HTML code.
+     *
+     * @since 3.2.0
+     */
+    const BUTTON_HTML = '<a id="%s" class="button wl-button">%s</a>';
 
-	/**
-	 * The template HTML code.
-	 *
-	 * @since 3.2.0
-	 */
-	const TEMPLATE_HTML = '<script id="%s" type="text/template">%s</script>';
+    /**
+     * The template HTML code.
+     *
+     * @since 3.2.0
+     */
+    const TEMPLATE_HTML = '<script id="%s" type="text/template">%s</script>';
 
-	/**
-	 * Get the button HTML.
-	 *
-	 * @param string $element_id The button element id.
-	 * @param string $label The button (translated) label.
-	 *
-	 * @return string The button HTML code.
-	 * @since 3.2.0
-	 */
-	public static function get_button_html( $element_id, $label ) {
+    /**
+     * Get the button HTML.
+     *
+     * @param string $element_id The button element id.
+     * @param string $label The button (translated) label.
+     *
+     * @return string The button HTML code.
+     * @since 3.2.0
+     */
+    public static function get_button_html( $element_id, $label ) {
 
-		return sprintf( self::BUTTON_HTML, $element_id, esc_html( $label ) );
-	}
+        return sprintf( self::BUTTON_HTML, $element_id, esc_html( $label ) );
+    }
 
-	/**
-	 * Echo the button HTML.
-	 *
-	 * @param string $element_id The button element id.
-	 * @param string $label The button (translated) label.
-	 *
-	 * @since 3.2.0
-	 */
-	public static function print_button( $element_id, $label ) {
+    /**
+     * Echo the button HTML.
+     *
+     * @param string $element_id The button element id.
+     * @param string $label The button (translated) label.
+     *
+     * @since 3.2.0
+     */
+    public static function print_button( $element_id, $label ) {
 
-		echo wp_kses(
-			self::get_button_html( $element_id, $label ),
-			array(
-				'a' => array(
-					'id'    => array(),
-					'class' => array(),
-				),
-			)
-		);
+        echo wp_kses(
+            self::get_button_html( $element_id, $label ),
+            array(
+                'a' => array(
+                    'id'    => array(),
+                    'class' => array(),
+                ),
+            )
+        );
 
-	}
+    }
 
-	/**
-	 * Get the HTML code for a template tag.
-	 *
-	 * @param string $element_id The element id.
-	 * @param string $body The element content.
-	 *
-	 * @return string The HTML code.
-	 * @since 3.2.0
-	 */
-	public static function get_template_html( $element_id, $body ) {
+    /**
+     * Get the HTML code for a template tag.
+     *
+     * @param string $element_id The element id.
+     * @param string $body The element content.
+     *
+     * @return string The HTML code.
+     * @since 3.2.0
+     */
+    public static function get_template_html( $element_id, $body ) {
 
-		return sprintf( self::TEMPLATE_HTML, $element_id, $body );
-	}
+        return sprintf( self::TEMPLATE_HTML, $element_id, $body );
+    }
 
-	/**
-	 * Echo the HTML code for a template tag.
-	 *
-	 * @param string $element_id The element id.
-	 * @param string $body The element content.
-	 *
-	 * @since 3.2.0
-	 */
-	public static function print_template( $element_id, $body ) {
+    /**
+     * Echo the HTML code for a template tag.
+     *
+     * @param string $element_id The element id.
+     * @param string $body The element content.
+     *
+     * @since 3.2.0
+     */
+    public static function print_template( $element_id, $body ) {
 
-		echo( self::get_template_html( $element_id, $body ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+        echo( self::get_template_html( $element_id, $body ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
-	}
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -29,9 +29,9 @@ 
 	 * @return string The button HTML code.
 	 * @since 3.2.0
 	 */
-	public static function get_button_html( $element_id, $label ) {
+	public static function get_button_html($element_id, $label) {
 
-		return sprintf( self::BUTTON_HTML, $element_id, esc_html( $label ) );
+		return sprintf(self::BUTTON_HTML, $element_id, esc_html($label));
 	}
 
 	/**
@@ -42,10 +42,10 @@ 
 	 *
 	 * @since 3.2.0
 	 */
-	public static function print_button( $element_id, $label ) {
+	public static function print_button($element_id, $label) {
 
 		echo wp_kses(
-			self::get_button_html( $element_id, $label ),
+			self::get_button_html($element_id, $label),
 			array(
 				'a' => array(
 					'id'    => array(),
@@ -65,9 +65,9 @@ 
 	 * @return string The HTML code.
 	 * @since 3.2.0
 	 */
-	public static function get_template_html( $element_id, $body ) {
+	public static function get_template_html($element_id, $body) {
 
-		return sprintf( self::TEMPLATE_HTML, $element_id, $body );
+		return sprintf(self::TEMPLATE_HTML, $element_id, $body);
 	}
 
 	/**
@@ -78,9 +78,9 @@ 
 	 *
 	 * @since 3.2.0
 	 */
-	public static function print_template( $element_id, $body ) {
+	public static function print_template($element_id, $body) {
 
-		echo( self::get_template_html( $element_id, $body ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		echo(self::get_template_html($element_id, $body)); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
 	}
 

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-timeline-service.php

Indentation +348 added lines, -348 removed lines

@@ -16,353 +16,353 @@
  */
 class Wordlift_Timeline_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log The Log service.
-	 */
-	private $log;
-
-	/**
-	 * The number of words to use for the excerpt, set in the `to_json` function
-	 * and used by a filter.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var int $excerpt_length The number of words to use for the excerpt.
-	 */
-	private $excerpt_length;
-
-	/**
-	 * A singleton instance of the Timeline service (useful for unit tests).
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Timeline_Service instance.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the Wordlift_Timeline_Service
-	 *
-	 * @return \Wordlift_Timeline_Service The singleton instance of the Wordlift_Timeline_Service.
-	 * @since 3.1.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Retrieve timeline events and output them in JSON.
-	 *
-	 * @since 3.1.0
-	 */
-	public function ajax_timeline() {
-
-		check_ajax_referer( 'wl_timeline' );
-
-		// Get the ID of the post who requested the timeline.
-		$post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
-
-		// Get the events and transform them for the JSON response, then send them to the client.
-		wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
-
-	}
-
-	/**
-	 * Retrieve timeline events.
-	 *
-	 * @param int $post_id The post ID.
-	 *
-	 * @return array An array of event posts.
-	 * @since 3.1.0
-	 *
-	 * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
-	 */
-	public function get_events( $post_id = null ) {
-
-		// Get the entity IDs either from the entities related to the specified post or from the last 50 published
-		// posts if no post has been specified.
-		$ids = ( is_numeric( $post_id )
-			? wl_core_get_related_entity_ids( $post_id )
-			: $this->get_all_related_to_last_50_published_posts() );
-
-		// Add the post itself if it's an entity.
-		if ( is_numeric( $post_id ) && Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
-			$ids[] = $post_id;
-		}
-
-		// If there's no entities, return an empty array right away.
-		if ( 0 === count( $ids ) ) {
-			$this->log->trace( "No events found [ post id :: $post_id ]" );
-
-			return array();
-		}
-
-		$this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
-
-		$args = array(
-			'post__in'       => $ids,
-			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
-			'meta_query'     => array(
-				'relation' => 'AND',
-				array(
-					'key'     => Wordlift_Schema_Service::FIELD_DATE_START,
-					'value'   => null,
-					'compare' => '!=',
-				),
-				array(
-					'key'     => Wordlift_Schema_Service::FIELD_DATE_END,
-					'value'   => null,
-					'compare' => '!=',
-				),
-			),
-			'tax_query'      => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => 'event',
-				),
-			),
-			'orderby'        => 'meta_value',
-			'order'          => 'DESC',
-			'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
-		);
-
-		return get_posts( $args );
-	}
-
-	/**
-	 * Convert timeline events to JSON. This function sets the global post in order
-	 * to get an automatic excerpt. Since we're being called inside an AJAX request,
-	 * we're not taking care of restoring any previous post: there isn't any.
-	 *
-	 * @param array $posts An array of posts.
-	 *
-	 * @return array|string An array of timeline events or an empty string if no posts are provided.
-	 * @since 3.1.0
-	 */
-	public function to_json( $posts ) {
-		check_ajax_referer( 'wl_timeline' );
-		// If there are no events, return empty JSON
-		if ( empty( $posts ) || $posts === null ) {
-			return '';
-		}
-
-		// {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
-		$display_images_as = isset( $_REQUEST['display_images_as'] ) ? sanitize_text_field( wp_unslash( (string) $_REQUEST['display_images_as'] ) ) : 'media';
-
-		// The number of words for the excerpt (by default 55, as WordPress).
-		$excerpt_length       = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['excerpt_length'] ) ) : 55;
-		$this->excerpt_length = $excerpt_length;
-		add_filter( 'excerpt_length', array( $this, 'excerpt_length' ), 10, 0 );
-
-		// Add a filter to remove the [...] after excerpts, since we're adding
-		// a link to the post itself.
-		add_filter( 'excerpt_more', array( $this, 'excerpt_more' ), 10, 0 );
-
-		// Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
-		$start_at_slide = 0;
-		$event_index    = - 1;
-		$now            = time();
-
-		// Prepare the timeline variable.
-		$timeline = array();
-
-		// Populate the arrays.
-		$timeline['events'] = array_map(
-			function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
-
-				$date = array();
-
-				// Get the start and end dates.
-				// We have to remove double quotes from date to make timeline work properly
-				$start_date = strtotime( str_replace( '"', '', get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) ) );
-				$end_date   = strtotime( str_replace( '"', '', get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) ) );
-
-				// Set the starting slide.
-				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				$event_index ++;
-				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
-					// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-					$start_at_slide = $event_index;
-				}
-
-				// Load thumbnail
-				$thumbnail_id = get_post_thumbnail_id( $item->ID );
-				$attachment   = wp_get_attachment_image_src( $thumbnail_id );
-				if ( '' !== (string) $thumbnail_id && 0 !== $thumbnail_id
-				     && false !== $attachment
-				) {
-
-					// Set the thumbnail URL.
-					// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-					if ( 'background' === $display_images_as ) {
-						$date['background'] = array( 'url' => $attachment[0] );
-						$date['media']      = array( 'thumbnail' => $attachment[0] );
-					} else {
-						$date['media'] = array(
-							'url'       => $attachment[0],
-							'thumbnail' => $attachment[0],
-						);
-					}
-				}
-
-				// Set the start/end dates by converting them to TimelineJS required format.
-				$date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
-				$date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
-
-				setup_postdata( $GLOBALS['post'] = $item ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-
-				$more_link_text = sprintf(
-					'<span aria-label="%1$s">%2$s</span>',
-					sprintf(
-					/* translators: %s: Name of current post */
-						__( 'Continue reading %s', 'wordlift' ),
-						the_title_attribute( array( 'echo' => false ) )
-					),
-					__( '(more&hellip;)', 'wordlift' )
-				);
-
-				// Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
-				$date['text'] = array(
-					'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
-				);
-
-				// If we have an excerpt, set it.
-				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				if ( 0 < $excerpt_length ) {
-					$date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
-				}
-
-				return $date;
-
-			},
-			$posts
-		);
-
-		// Finally remove the excerpt filter.
-		remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
-
-		// The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
-		return array(
-			'timeline'       => $timeline,
-			'start_at_slide' => $start_at_slide,
-		);
-	}
-
-	/**
-	 * This function filters {@link excerpt_more} by removing it, since we're
-	 * adding the 'read more' link. This filter is set by {@see to_json}.
-	 *
-	 * @return string An empty string.
-	 * @since 3.7.0
-	 */
-	public function excerpt_more() {
-
-		return '';
-	}
-
-	/**
-	 * A filter for the excerpt length, set by the `to_json` function, to tailor
-	 * how many words to return according to the client setting.
-	 *
-	 * @return int The number of words for the preset.
-	 * @since 3.7.0
-	 */
-	public function excerpt_length() {
-
-		return $this->excerpt_length;
-	}
-
-	/**
-	 * Convert the date to a date array.
-	 *
-	 * @param $value int A date value.
-	 *
-	 * @return array An array containing year, month and day values.
-	 * @since 3.7.0
-	 */
-	public static function date( $value ) {
-
-		return array(
-			'year'  => (int) gmdate( 'Y', $value ),
-			'month' => (int) gmdate( 'm', $value ),
-			'day'   => (int) gmdate( 'd', $value ),
-
-		);
-	}
-
-	/**
-	 * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
-	 * its specific function).
-	 *
-	 * @return array An array of post IDs.
-	 * @since 3.1.0
-	 */
-	public function get_all_related_to_last_50_published_posts() {
-
-		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts(
-			array(
-				'numberposts' => 50,
-				'fields'      => 'ids', // only get post IDs
-				'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-				'tax_query'   => array(
-					'relation' => 'OR',
-					array(
-						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-						'operator' => 'NOT EXISTS',
-					),
-					array(
-						'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-						'field'    => 'slug',
-						'terms'    => 'article',
-					),
-				),
-				'post_status' => 'publish',
-			)
-		);
-
-		if ( empty( $latest_posts_ids ) ) {
-			// There are no posts.
-			return array();
-		}
-
-		// Collect entities related to latest posts
-		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge(
-				$entity_ids,
-				wl_core_get_related_entity_ids(
-					$id,
-					array(
-						'status' => 'publish',
-					)
-				)
-			);
-		}
-
-		return $entity_ids;
-	}
+    /**
+     * The Log service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log The Log service.
+     */
+    private $log;
+
+    /**
+     * The number of words to use for the excerpt, set in the `to_json` function
+     * and used by a filter.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var int $excerpt_length The number of words to use for the excerpt.
+     */
+    private $excerpt_length;
+
+    /**
+     * A singleton instance of the Timeline service (useful for unit tests).
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Timeline_Service instance.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the Wordlift_Timeline_Service
+     *
+     * @return \Wordlift_Timeline_Service The singleton instance of the Wordlift_Timeline_Service.
+     * @since 3.1.0
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Retrieve timeline events and output them in JSON.
+     *
+     * @since 3.1.0
+     */
+    public function ajax_timeline() {
+
+        check_ajax_referer( 'wl_timeline' );
+
+        // Get the ID of the post who requested the timeline.
+        $post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
+
+        // Get the events and transform them for the JSON response, then send them to the client.
+        wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
+
+    }
+
+    /**
+     * Retrieve timeline events.
+     *
+     * @param int $post_id The post ID.
+     *
+     * @return array An array of event posts.
+     * @since 3.1.0
+     *
+     * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
+     */
+    public function get_events( $post_id = null ) {
+
+        // Get the entity IDs either from the entities related to the specified post or from the last 50 published
+        // posts if no post has been specified.
+        $ids = ( is_numeric( $post_id )
+            ? wl_core_get_related_entity_ids( $post_id )
+            : $this->get_all_related_to_last_50_published_posts() );
+
+        // Add the post itself if it's an entity.
+        if ( is_numeric( $post_id ) && Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+            $ids[] = $post_id;
+        }
+
+        // If there's no entities, return an empty array right away.
+        if ( 0 === count( $ids ) ) {
+            $this->log->trace( "No events found [ post id :: $post_id ]" );
+
+            return array();
+        }
+
+        $this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
+
+        $args = array(
+            'post__in'       => $ids,
+            'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+            'post_status'    => 'publish',
+            'posts_per_page' => - 1,
+            'meta_query'     => array(
+                'relation' => 'AND',
+                array(
+                    'key'     => Wordlift_Schema_Service::FIELD_DATE_START,
+                    'value'   => null,
+                    'compare' => '!=',
+                ),
+                array(
+                    'key'     => Wordlift_Schema_Service::FIELD_DATE_END,
+                    'value'   => null,
+                    'compare' => '!=',
+                ),
+            ),
+            'tax_query'      => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => 'event',
+                ),
+            ),
+            'orderby'        => 'meta_value',
+            'order'          => 'DESC',
+            'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
+        );
+
+        return get_posts( $args );
+    }
+
+    /**
+     * Convert timeline events to JSON. This function sets the global post in order
+     * to get an automatic excerpt. Since we're being called inside an AJAX request,
+     * we're not taking care of restoring any previous post: there isn't any.
+     *
+     * @param array $posts An array of posts.
+     *
+     * @return array|string An array of timeline events or an empty string if no posts are provided.
+     * @since 3.1.0
+     */
+    public function to_json( $posts ) {
+        check_ajax_referer( 'wl_timeline' );
+        // If there are no events, return empty JSON
+        if ( empty( $posts ) || $posts === null ) {
+            return '';
+        }
+
+        // {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
+        $display_images_as = isset( $_REQUEST['display_images_as'] ) ? sanitize_text_field( wp_unslash( (string) $_REQUEST['display_images_as'] ) ) : 'media';
+
+        // The number of words for the excerpt (by default 55, as WordPress).
+        $excerpt_length       = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['excerpt_length'] ) ) : 55;
+        $this->excerpt_length = $excerpt_length;
+        add_filter( 'excerpt_length', array( $this, 'excerpt_length' ), 10, 0 );
+
+        // Add a filter to remove the [...] after excerpts, since we're adding
+        // a link to the post itself.
+        add_filter( 'excerpt_more', array( $this, 'excerpt_more' ), 10, 0 );
+
+        // Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
+        $start_at_slide = 0;
+        $event_index    = - 1;
+        $now            = time();
+
+        // Prepare the timeline variable.
+        $timeline = array();
+
+        // Populate the arrays.
+        $timeline['events'] = array_map(
+            function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
+
+                $date = array();
+
+                // Get the start and end dates.
+                // We have to remove double quotes from date to make timeline work properly
+                $start_date = strtotime( str_replace( '"', '', get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) ) );
+                $end_date   = strtotime( str_replace( '"', '', get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) ) );
+
+                // Set the starting slide.
+                // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                $event_index ++;
+                // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
+                    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                    $start_at_slide = $event_index;
+                }
+
+                // Load thumbnail
+                $thumbnail_id = get_post_thumbnail_id( $item->ID );
+                $attachment   = wp_get_attachment_image_src( $thumbnail_id );
+                if ( '' !== (string) $thumbnail_id && 0 !== $thumbnail_id
+                     && false !== $attachment
+                ) {
+
+                    // Set the thumbnail URL.
+                    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                    if ( 'background' === $display_images_as ) {
+                        $date['background'] = array( 'url' => $attachment[0] );
+                        $date['media']      = array( 'thumbnail' => $attachment[0] );
+                    } else {
+                        $date['media'] = array(
+                            'url'       => $attachment[0],
+                            'thumbnail' => $attachment[0],
+                        );
+                    }
+                }
+
+                // Set the start/end dates by converting them to TimelineJS required format.
+                $date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
+                $date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
+
+                setup_postdata( $GLOBALS['post'] = $item ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+
+                $more_link_text = sprintf(
+                    '<span aria-label="%1$s">%2$s</span>',
+                    sprintf(
+                    /* translators: %s: Name of current post */
+                        __( 'Continue reading %s', 'wordlift' ),
+                        the_title_attribute( array( 'echo' => false ) )
+                    ),
+                    __( '(more&hellip;)', 'wordlift' )
+                );
+
+                // Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
+                $date['text'] = array(
+                    'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
+                );
+
+                // If we have an excerpt, set it.
+                // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
+                if ( 0 < $excerpt_length ) {
+                    $date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
+                }
+
+                return $date;
+
+            },
+            $posts
+        );
+
+        // Finally remove the excerpt filter.
+        remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+
+        // The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
+        return array(
+            'timeline'       => $timeline,
+            'start_at_slide' => $start_at_slide,
+        );
+    }
+
+    /**
+     * This function filters {@link excerpt_more} by removing it, since we're
+     * adding the 'read more' link. This filter is set by {@see to_json}.
+     *
+     * @return string An empty string.
+     * @since 3.7.0
+     */
+    public function excerpt_more() {
+
+        return '';
+    }
+
+    /**
+     * A filter for the excerpt length, set by the `to_json` function, to tailor
+     * how many words to return according to the client setting.
+     *
+     * @return int The number of words for the preset.
+     * @since 3.7.0
+     */
+    public function excerpt_length() {
+
+        return $this->excerpt_length;
+    }
+
+    /**
+     * Convert the date to a date array.
+     *
+     * @param $value int A date value.
+     *
+     * @return array An array containing year, month and day values.
+     * @since 3.7.0
+     */
+    public static function date( $value ) {
+
+        return array(
+            'year'  => (int) gmdate( 'Y', $value ),
+            'month' => (int) gmdate( 'm', $value ),
+            'day'   => (int) gmdate( 'd', $value ),
+
+        );
+    }
+
+    /**
+     * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
+     * its specific function).
+     *
+     * @return array An array of post IDs.
+     * @since 3.1.0
+     */
+    public function get_all_related_to_last_50_published_posts() {
+
+        // Global timeline. Get entities from the latest posts.
+        $latest_posts_ids = get_posts(
+            array(
+                'numberposts' => 50,
+                'fields'      => 'ids', // only get post IDs
+                'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+                'tax_query'   => array(
+                    'relation' => 'OR',
+                    array(
+                        'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                        'operator' => 'NOT EXISTS',
+                    ),
+                    array(
+                        'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                        'field'    => 'slug',
+                        'terms'    => 'article',
+                    ),
+                ),
+                'post_status' => 'publish',
+            )
+        );
+
+        if ( empty( $latest_posts_ids ) ) {
+            // There are no posts.
+            return array();
+        }
+
+        // Collect entities related to latest posts
+        $entity_ids = array();
+        foreach ( $latest_posts_ids as $id ) {
+            $entity_ids = array_merge(
+                $entity_ids,
+                wl_core_get_related_entity_ids(
+                    $id,
+                    array(
+                        'status' => 'publish',
+                    )
+                )
+            );
+        }
+
+        return $entity_ids;
+    }
 
 }

Spacing +48 added lines, -48 removed lines

@@ -51,7 +51,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Timeline_Service');
 
 		self::$instance = $this;
 
@@ -75,13 +75,13 @@ 
 	 */
 	public function ajax_timeline() {
 
-		check_ajax_referer( 'wl_timeline' );
+		check_ajax_referer('wl_timeline');
 
 		// Get the ID of the post who requested the timeline.
-		$post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
+		$post_id = (isset($_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : null);
 
 		// Get the events and transform them for the JSON response, then send them to the client.
-		wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
+		wp_send_json($this->to_json($this->get_events($post_id)));
 
 	}
 
@@ -95,33 +95,33 @@ 
 	 *
 	 * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
 	 */
-	public function get_events( $post_id = null ) {
+	public function get_events($post_id = null) {
 
 		// Get the entity IDs either from the entities related to the specified post or from the last 50 published
 		// posts if no post has been specified.
-		$ids = ( is_numeric( $post_id )
-			? wl_core_get_related_entity_ids( $post_id )
-			: $this->get_all_related_to_last_50_published_posts() );
+		$ids = (is_numeric($post_id)
+			? wl_core_get_related_entity_ids($post_id)
+			: $this->get_all_related_to_last_50_published_posts());
 
 		// Add the post itself if it's an entity.
-		if ( is_numeric( $post_id ) && Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+		if (is_numeric($post_id) && Wordlift_Entity_Service::get_instance()->is_entity($post_id)) {
 			$ids[] = $post_id;
 		}
 
 		// If there's no entities, return an empty array right away.
-		if ( 0 === count( $ids ) ) {
-			$this->log->trace( "No events found [ post id :: $post_id ]" );
+		if (0 === count($ids)) {
+			$this->log->trace("No events found [ post id :: $post_id ]");
 
 			return array();
 		}
 
-		$this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
+		$this->log->trace('Getting events [ entity ids :: '.join(', ', $ids).' ]');
 
 		$args = array(
 			'post__in'       => $ids,
 			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'meta_query'     => array(
 				'relation' => 'AND',
 				array(
@@ -147,7 +147,7 @@ 
 			'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
 		);
 
-		return get_posts( $args );
+		return get_posts($args);
 	}
 
 	/**
@@ -160,24 +160,24 @@ 
 	 * @return array|string An array of timeline events or an empty string if no posts are provided.
 	 * @since 3.1.0
 	 */
-	public function to_json( $posts ) {
-		check_ajax_referer( 'wl_timeline' );
+	public function to_json($posts) {
+		check_ajax_referer('wl_timeline');
 		// If there are no events, return empty JSON
-		if ( empty( $posts ) || $posts === null ) {
+		if (empty($posts) || $posts === null) {
 			return '';
 		}
 
 		// {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
-		$display_images_as = isset( $_REQUEST['display_images_as'] ) ? sanitize_text_field( wp_unslash( (string) $_REQUEST['display_images_as'] ) ) : 'media';
+		$display_images_as = isset($_REQUEST['display_images_as']) ? sanitize_text_field(wp_unslash((string) $_REQUEST['display_images_as'])) : 'media';
 
 		// The number of words for the excerpt (by default 55, as WordPress).
-		$excerpt_length       = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['excerpt_length'] ) ) : 55;
+		$excerpt_length       = isset($_REQUEST['excerpt_length']) && is_numeric($_REQUEST['excerpt_length']) ? sanitize_text_field(wp_unslash($_REQUEST['excerpt_length'])) : 55;
 		$this->excerpt_length = $excerpt_length;
-		add_filter( 'excerpt_length', array( $this, 'excerpt_length' ), 10, 0 );
+		add_filter('excerpt_length', array($this, 'excerpt_length'), 10, 0);
 
 		// Add a filter to remove the [...] after excerpts, since we're adding
 		// a link to the post itself.
-		add_filter( 'excerpt_more', array( $this, 'excerpt_more' ), 10, 0 );
+		add_filter('excerpt_more', array($this, 'excerpt_more'), 10, 0);
 
 		// Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
 		$start_at_slide = 0;
@@ -189,36 +189,36 @@ 
 
 		// Populate the arrays.
 		$timeline['events'] = array_map(
-			function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
+			function($item) use (&$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length) {
 
 				$date = array();
 
 				// Get the start and end dates.
 				// We have to remove double quotes from date to make timeline work properly
-				$start_date = strtotime( str_replace( '"', '', get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) ) );
-				$end_date   = strtotime( str_replace( '"', '', get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) ) );
+				$start_date = strtotime(str_replace('"', '', get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true)));
+				$end_date   = strtotime(str_replace('"', '', get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true)));
 
 				// Set the starting slide.
 				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				$event_index ++;
+				$event_index++;
 				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
+				if (0 === $start_at_slide && $now >= $start_date && $now <= $end_date) {
 					// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
 					$start_at_slide = $event_index;
 				}
 
 				// Load thumbnail
-				$thumbnail_id = get_post_thumbnail_id( $item->ID );
-				$attachment   = wp_get_attachment_image_src( $thumbnail_id );
-				if ( '' !== (string) $thumbnail_id && 0 !== $thumbnail_id
+				$thumbnail_id = get_post_thumbnail_id($item->ID);
+				$attachment   = wp_get_attachment_image_src($thumbnail_id);
+				if ('' !== (string) $thumbnail_id && 0 !== $thumbnail_id
 				     && false !== $attachment
 				) {
 
 					// Set the thumbnail URL.
 					// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-					if ( 'background' === $display_images_as ) {
-						$date['background'] = array( 'url' => $attachment[0] );
-						$date['media']      = array( 'thumbnail' => $attachment[0] );
+					if ('background' === $display_images_as) {
+						$date['background'] = array('url' => $attachment[0]);
+						$date['media']      = array('thumbnail' => $attachment[0]);
 					} else {
 						$date['media'] = array(
 							'url'       => $attachment[0],
@@ -228,30 +228,30 @@ 
 				}
 
 				// Set the start/end dates by converting them to TimelineJS required format.
-				$date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
-				$date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
+				$date['start_date'] = Wordlift_Timeline_Service::date($start_date);
+				$date['end_date']   = Wordlift_Timeline_Service::date($end_date);
 
-				setup_postdata( $GLOBALS['post'] = $item ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+				setup_postdata($GLOBALS['post'] = $item); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 
 				$more_link_text = sprintf(
 					'<span aria-label="%1$s">%2$s</span>',
 					sprintf(
 					/* translators: %s: Name of current post */
-						__( 'Continue reading %s', 'wordlift' ),
-						the_title_attribute( array( 'echo' => false ) )
+						__('Continue reading %s', 'wordlift'),
+						the_title_attribute(array('echo' => false))
 					),
-					__( '(more&hellip;)', 'wordlift' )
+					__('(more&hellip;)', 'wordlift')
 				);
 
 				// Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
 				$date['text'] = array(
-					'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
+					'headline' => '<a href="'.get_permalink($item->ID).'">'.$item->post_title.'</a>',
 				);
 
 				// If we have an excerpt, set it.
 				// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
-				if ( 0 < $excerpt_length ) {
-					$date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
+				if (0 < $excerpt_length) {
+					$date['text']['text'] = sprintf('%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text);
 				}
 
 				return $date;
@@ -261,7 +261,7 @@ 
 		);
 
 		// Finally remove the excerpt filter.
-		remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+		remove_filter('excerpt_length', array($this, 'excerpt_length'));
 
 		// The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
 		return array(
@@ -302,12 +302,12 @@ 
 	 * @return array An array containing year, month and day values.
 	 * @since 3.7.0
 	 */
-	public static function date( $value ) {
+	public static function date($value) {
 
 		return array(
-			'year'  => (int) gmdate( 'Y', $value ),
-			'month' => (int) gmdate( 'm', $value ),
-			'day'   => (int) gmdate( 'd', $value ),
+			'year'  => (int) gmdate('Y', $value),
+			'month' => (int) gmdate('m', $value),
+			'day'   => (int) gmdate('d', $value),
 
 		);
 	}
@@ -343,14 +343,14 @@ 
 			)
 		);
 
-		if ( empty( $latest_posts_ids ) ) {
+		if (empty($latest_posts_ids)) {
 			// There are no posts.
 			return array();
 		}
 
 		// Collect entities related to latest posts
 		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
+		foreach ($latest_posts_ids as $id) {
 			$entity_ids = array_merge(
 				$entity_ids,
 				wl_core_get_related_entity_ids(