insideout10 / wordlift-plugin

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

Doc Comments +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 	 * @since 3.6.0
 	 *
 	 * @param string $slug The slug.
-	 * @param array $post_types An array of post types.
+	 * @param string[] $post_types An array of post types.
 	 *
 	 * @return bool True if the slug exists, otherwise false.
 	 */

Indentation +165 added lines, -165 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -59,9 +59,9 @@ 
 	 * @param Wordlift_Entity_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;
@@ -80,17 +80,17 @@ 
 	 *
 	 * @return string The link to the post.
 	 */
-	public function post_type_link( $post_link, $post, $leavename, $sample ) {
+	public function post_type_link($post_link, $post, $leavename, $sample) {
 
 		// Return the post link if this is not our post type.
-		if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
+		if ( ! empty($this->slug) || $this->entity_type_service->get_post_type() !== get_post_type($post)) {
 			return $post_link;
 		}
 
 		// Replace /slug/post_name/ with /post_name/
 		// The slug comes from the Entity Type Service since that service is responsible for registering the default
 		// slug.
-		return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
+		return str_replace("/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link);
 	}
 
 	/**
@@ -100,21 +100,21 @@ 
 	 *
 	 * @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;
 		}
 
 		// Check if it's a query we should extend with our own custom post type.
-		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_type = is_array( $query->get( 'post_type' ) ) ? $query->get( 'post_type' ) : array();
-		$query->set( 'post_type', array_merge( $post_type, array( 'post', $this->entity_type_service->get_post_type(), 'page' ) ) );
+		$post_type = is_array($query->get('post_type')) ? $query->get('post_type') : array();
+		$query->set('post_type', array_merge($post_type, array('post', $this->entity_type_service->get_post_type(), 'page')));
 
 	}
 
@@ -129,19 +129,19 @@ 
 	 *
 	 * @return bool Whether the slug is bad.
 	 */
-	public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
+	public function wp_unique_post_slug_is_bad_flat_slug($bad_slug, $slug, $post_type) {
 
 		// The list of post types that might have conflicting slugs.
-		$post_types = array( 'post', 'page', $this->entity_type_service->get_post_type() );
+		$post_types = array('post', 'page', $this->entity_type_service->get_post_type());
 
 		// Ignore post types different from the ones we need to check.
-		if ( ! in_array( $post_type, $post_types ) ) {
+		if ( ! in_array($post_type, $post_types)) {
 			return $bad_slug;
 		}
 
-		$exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
+		$exists = $this->slug_exists($slug, array_diff($post_types, array($post_type)));
 
-		$this->log->debug( "[ exists :: " . ( $exists ? "yes" : "no" ) . " ]" );
+		$this->log->debug("[ exists :: ".($exists ? "yes" : "no")." ]");
 
 		return $exists;
 	}
@@ -158,17 +158,17 @@ 
 	 *
 	 * @return bool Whether the slug is bad.
 	 */
-	public function wp_unique_post_slug_is_bad_hierarchical_slug( $bad_slug, $slug, $post_type, $post_parent ) {
+	public function wp_unique_post_slug_is_bad_hierarchical_slug($bad_slug, $slug, $post_type, $post_parent) {
 
 		// We only care about pages here.
-		if ( 'page' !== $post_type ) {
+		if ('page' !== $post_type) {
 			return $bad_slug;
 		}
 
 		// We redirect the call to the flat hook, this means that this check is going to solve also the 6-years old issue
 		// about overlapping slugs among pages and posts:
 		//  https://core.trac.wordpress.org/ticket/13459
-		return $this->wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type );
+		return $this->wp_unique_post_slug_is_bad_flat_slug($bad_slug, $slug, $post_type);
 	}
 
 	/**
@@ -181,13 +181,13 @@ 
 	 *
 	 * @return bool True if the slug exists, otherwise false.
 	 */
-	private function slug_exists( $slug, $post_types ) {
+	private function slug_exists($slug, $post_types) {
 		global $wpdb;
 
 		// Post slugs must be unique across all posts.
-		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('" . implode( "', '", array_map( 'esc_sql', $post_types ) ) . "') LIMIT 1";
+		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('".implode("', '", array_map('esc_sql', $post_types))."') LIMIT 1";
 
-		return null !== $wpdb->get_var( $wpdb->prepare( $check_sql, $slug ) );
+		return null !== $wpdb->get_var($wpdb->prepare($check_sql, $slug));
 	}
 
 }

src/modules/core/wordlift_core_install.php

Indentation +120 added lines, -120 removed lines

@@ -5,103 +5,103 @@ 
  */
 function wl_core_install_entity_type_data() {
 
-	// global $wl_logger;
-	// $wl_logger->trace( 'Installing entity type data...' );
+    // global $wl_logger;
+    // $wl_logger->trace( 'Installing entity type data...' );
 
-	// Ensure the custom type and the taxonomy are registered.
+    // Ensure the custom type and the taxonomy are registered.
 //	wl_entity_type_register();
-	Wordlift_Entity_Type_Service::get_instance()->register();
-
-	wl_entity_type_taxonomy_register();
-	// Ensure the custom taxonomy for dbpedia topics is registered
-	Wordlift_Topic_Taxonomy_Service::get_instance()->init();
-
-	// Set the taxonomy data.
-	// Note: parent types must be defined before child types.
-	$terms = array(
-		'thing'         => array(
-			'label'       => 'Thing',
-			'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
-		),
-		'creative-work' => array(
-			'label'       => 'CreativeWork',
-			'description' => 'A creative work (or a Music Album).',
-			'parents'     => array( 'thing' ), // give term slug as parent
-		),
-		'event'         => array(
-			'label'       => 'Event',
-			'description' => 'An event.',
-			'parents'     => array( 'thing' ),
-		),
-		'organization'  => array(
-			'label'       => 'Organization',
-			'description' => 'An organization, including a government or a newspaper.',
-			'parents'     => array( 'thing' ),
-		),
-		'person'        => array(
-			'label'       => 'Person',
-			'description' => 'A person (or a music artist).',
-			'parents'     => array( 'thing' ),
-		),
-		'place'         => array(
-			'label'       => 'Place',
-			'description' => 'A place.',
-			'parents'     => array( 'thing' ),
-		),
-		'localbusiness' => array(
-			'label'       => 'LocalBusiness',
-			'description' => 'A local business.',
-			'parents'     => array( 'place', 'organization' ),
-		),
-	);
-
-	foreach ( $terms as $slug => $term ) {
-
-		// Create the term if it does not exist, then get its ID
-		$term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-		if ( $term_id == 0 || is_null( $term_id ) ) {
-			$result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-		} else {
-			$term_id = $term_id['term_id'];
-			$result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
-		}
-
-		// Check for errors.
-		if ( is_wp_error( $result ) ) {
-			wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
-			continue;
-		}
-
-		// Check if 'parent' corresponds to an actual term and get its ID.
-		if ( ! isset( $term['parents'] ) ) {
-			$term['parents'] = array();
-		}
-
-		$parent_ids = array();
-		foreach ( $term['parents'] as $parent_slug ) {
-			$parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-			$parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
-		}
-
-		// Define a parent in the WP taxonomy style (not important for WL)
-		if ( empty( $parent_ids ) ) {
-			// No parent
-			$parent_id = 0;
-		} else {
-			// Get first parent
-			$parent_id = $parent_ids[0];
-		}
-
-		// Update term with description, slug and parent
-		wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-			'name'        => $term['label'],
-			'slug'        => $slug,
-			'description' => $term['description'],
-			'parent'      => $parent_id   // We give to WP taxonomy just one parent. TODO: see if can give more than one
-		) );
-
-	}
+    Wordlift_Entity_Type_Service::get_instance()->register();
+
+    wl_entity_type_taxonomy_register();
+    // Ensure the custom taxonomy for dbpedia topics is registered
+    Wordlift_Topic_Taxonomy_Service::get_instance()->init();
+
+    // Set the taxonomy data.
+    // Note: parent types must be defined before child types.
+    $terms = array(
+        'thing'         => array(
+            'label'       => 'Thing',
+            'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
+        ),
+        'creative-work' => array(
+            'label'       => 'CreativeWork',
+            'description' => 'A creative work (or a Music Album).',
+            'parents'     => array( 'thing' ), // give term slug as parent
+        ),
+        'event'         => array(
+            'label'       => 'Event',
+            'description' => 'An event.',
+            'parents'     => array( 'thing' ),
+        ),
+        'organization'  => array(
+            'label'       => 'Organization',
+            'description' => 'An organization, including a government or a newspaper.',
+            'parents'     => array( 'thing' ),
+        ),
+        'person'        => array(
+            'label'       => 'Person',
+            'description' => 'A person (or a music artist).',
+            'parents'     => array( 'thing' ),
+        ),
+        'place'         => array(
+            'label'       => 'Place',
+            'description' => 'A place.',
+            'parents'     => array( 'thing' ),
+        ),
+        'localbusiness' => array(
+            'label'       => 'LocalBusiness',
+            'description' => 'A local business.',
+            'parents'     => array( 'place', 'organization' ),
+        ),
+    );
+
+    foreach ( $terms as $slug => $term ) {
+
+        // Create the term if it does not exist, then get its ID
+        $term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+        if ( $term_id == 0 || is_null( $term_id ) ) {
+            $result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+        } else {
+            $term_id = $term_id['term_id'];
+            $result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+        }
+
+        // Check for errors.
+        if ( is_wp_error( $result ) ) {
+            wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
+            continue;
+        }
+
+        // Check if 'parent' corresponds to an actual term and get its ID.
+        if ( ! isset( $term['parents'] ) ) {
+            $term['parents'] = array();
+        }
+
+        $parent_ids = array();
+        foreach ( $term['parents'] as $parent_slug ) {
+            $parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+            $parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
+        }
+
+        // Define a parent in the WP taxonomy style (not important for WL)
+        if ( empty( $parent_ids ) ) {
+            // No parent
+            $parent_id = 0;
+        } else {
+            // Get first parent
+            $parent_id = $parent_ids[0];
+        }
+
+        // Update term with description, slug and parent
+        wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+            'name'        => $term['label'],
+            'slug'        => $slug,
+            'description' => $term['description'],
+            'parent'      => $parent_id   // We give to WP taxonomy just one parent. TODO: see if can give more than one
+        ) );
+
+    }
 
 }
 
@@ -110,16 +110,16 @@ 
  */
 function wl_core_install_create_relation_instance_table() {
 
-	global $wpdb;
-	// global $wl_db_version;
-	$installed_version = get_option( "wl_db_version" );
+    global $wpdb;
+    // global $wl_db_version;
+    $installed_version = get_option( "wl_db_version" );
 
-	if ( $installed_version != WL_DB_VERSION ) {
-		$table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
-		$charset_collate = $wpdb->get_charset_collate();
+    if ( $installed_version != WL_DB_VERSION ) {
+        $table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+        $charset_collate = $wpdb->get_charset_collate();
 
-		// Sql statement for the relation instances custom table
-		$sql = <<<EOF
+        // Sql statement for the relation instances custom table
+        $sql = <<<EOF
 			CREATE TABLE $table_name (
   				id int(11) NOT NULL AUTO_INCREMENT,
   				subject_id int(11) NOT NULL,
@@ -131,14 +131,14 @@ 
 			) $charset_collate;
 EOF;
 
-		// @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		$results = dbDelta( $sql );
+        // @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        $results = dbDelta( $sql );
 
-		wl_write_log( $results );
+        wl_write_log( $results );
 
-		update_option( "wl_db_version", WL_DB_VERSION );
-	}
+        update_option( "wl_db_version", WL_DB_VERSION );
+    }
 }
 
 /**
@@ -146,15 +146,15 @@ 
  */
 function wl_core_install() {
 
-	// Create a blank application key if there is none
-	$key = wl_configuration_get_key();
-	if ( empty( $key ) ) {
-		wl_configuration_set_key( '' );
-	}
+    // Create a blank application key if there is none
+    $key = wl_configuration_get_key();
+    if ( empty( $key ) ) {
+        wl_configuration_set_key( '' );
+    }
 
-	wl_core_install_entity_type_data();
-	wl_core_install_create_relation_instance_table();
-	flush_rewrite_rules();
+    wl_core_install_entity_type_data();
+    wl_core_install_create_relation_instance_table();
+    flush_rewrite_rules();
 }
 
 // Installation Hook
@@ -162,9 +162,9 @@ 
 
 // Check db status on automated plugins updates
 function wl_core_update_db_check() {
-	if ( get_site_option( 'wl_db_version' ) != WL_DB_VERSION ) {
-		wl_core_install_create_relation_instance_table();
-	}
+    if ( get_site_option( 'wl_db_version' ) != WL_DB_VERSION ) {
+        wl_core_install_create_relation_instance_table();
+    }
 }
 
 add_action( 'plugins_loaded', 'wl_core_update_db_check' );

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

Spacing +121 added lines, -130 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Define the default entity type slug if it's not defined already. The entity type slug is used in permalinks.
-defined( 'WL_ENTITY_TYPE_SLUG' ) || define( 'WL_ENTITY_TYPE_SLUG', Wordlift_Entity_Service::TYPE_NAME );
+defined('WL_ENTITY_TYPE_SLUG') || define('WL_ENTITY_TYPE_SLUG', Wordlift_Entity_Service::TYPE_NAME);
 
 /**
  * Provide entity-related services.
@@ -158,9 +158,9 @@ 
 	 *
 	 * @param \Wordlift_UI_Service $ui_service The UI service.
 	 */
-	public function __construct( $ui_service, $schema_service, $notice_service ) {
+	public function __construct($ui_service, $schema_service, $notice_service) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Entity_Service');
 
 		// Set the UI service.
 		$this->ui_service = $ui_service;
@@ -209,24 +209,24 @@ 
 	public function get_all_related_to_last_50_published_posts() {
 
 		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
+		$latest_posts_ids = get_posts(array(
 			'numberposts' => 50,
 			'fields'      => 'ids', //only get post IDs
 			'post_type'   => 'post',
 			'post_status' => 'publish'
-		) );
+		));
 
-		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 ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, 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;
@@ -241,9 +241,9 @@ 
 	 *
 	 * @return bool Return true if the post is an entity otherwise false.
 	 */
-	public function is_entity( $post_id ) {
+	public function is_entity($post_id) {
 
-		return ( self::TYPE_NAME === get_post_type( $post_id ) );
+		return (self::TYPE_NAME === get_post_type($post_id));
 	}
 
 	/**
@@ -255,19 +255,19 @@ 
 	 *
 	 * @return string Returns an uri.
 	 */
-	public function get_classification_scope_for( $post_id ) {
+	public function get_classification_scope_for($post_id) {
 		
-		if ( FALSE === $this->is_entity( $post_id ) ) {
+		if (FALSE === $this->is_entity($post_id)) {
 			return null;
 		}
 		// Retrieve the entity type
-		$entity_type_arr = wl_entity_type_taxonomy_get_type( $post_id );
-		$entity_type = 	str_replace( 'wl-', '', $entity_type_arr[ 'css_class' ] );
+		$entity_type_arr = wl_entity_type_taxonomy_get_type($post_id);
+		$entity_type = str_replace('wl-', '', $entity_type_arr['css_class']);
 		// Retrieve classification boxes configuration
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type , $cb[ 'registeredTypes' ] ) ) {
-				return $cb[ 'id' ];
+		$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
+		foreach ($classification_boxes as $cb) {
+			if (in_array($entity_type, $cb['registeredTypes'])) {
+				return $cb['id'];
 			}
 		}
 		// or null
@@ -290,23 +290,22 @@ 
 	 *
 	 * @return string Returns an uri.
 	 */
-	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;
 		// Get a sanitized uri for a given title
-		$entity_slug = ( 0 == $increment_digit ) ? 
-			wl_sanitize_uri_path( $title ) :
-			wl_sanitize_uri_path( $title . '_'. $suffix_digit );
+		$entity_slug = (0 == $increment_digit) ? 
+			wl_sanitize_uri_path($title) : wl_sanitize_uri_path($title.'_'.$suffix_digit);
 
 		// Compose a candidated uri
-		$new_entity_uri = sprintf( '%s/%s/%s', 
+		$new_entity_uri = sprintf('%s/%s/%s', 
 			wl_configuration_get_redlink_dataset_uri(), 
 			$post_type, 
 			$entity_slug 
 		); 
 		
-		$this->log_service->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+		$this->log_service->trace("Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]");
 		
 		global $wpdb;
     	// Check if the candidated uri already is used
@@ -317,32 +316,32 @@ 
     	);
 
     	// Perform the query
-		$post_id = $wpdb->get_var( $stmt ); 		
+		$post_id = $wpdb->get_var($stmt); 		
 			
 		// If the post does not exist, then the new uri is returned 	
-		if ( ! is_numeric( $post_id ) ) {
-			$this->log_service->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ( ! is_numeric($post_id)) {
+			$this->log_service->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 = wl_entity_type_taxonomy_get_type( $post_id );
+		$schema_post_type = wl_entity_type_taxonomy_get_type($post_id);
 			
-		if ( $schema_type === $schema_post_type[ 'css_class' ] ) {
-			$this->log_service->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_service->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 recorsively
-		return $this->build_uri( $title, $post_type, $schema_type, ++$increment_digit );
+		return $this->build_uri($title, $post_type, $schema_type, ++$increment_digit);
 	}
 
-	public function is_used( $post_id ) {
+	public function is_used($post_id) {
 
-		if ( FALSE === $this->is_entity( $post_id ) ) {
+		if (FALSE === $this->is_entity($post_id)) {
 			return null;
 		}
 		// Retrieve the post
-		$entity = get_post( $post_id ); 
+		$entity = get_post($post_id); 
 
 		global $wpdb;
     	// Retrieve Wordlift relation instances table name
@@ -355,9 +354,9 @@ 
     	);
 		
 		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt ); 
+		$relation_instances = (int) $wpdb->get_var($stmt); 
 		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {		
+		if (0 < $relation_instances) {		
 			return TRUE;
 		}
 
@@ -365,13 +364,13 @@ 
 		$stmt = $wpdb->prepare( 
     		"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s", 
     		$entity->ID,
-    		wl_get_entity_uri( $entity->ID )
+    		wl_get_entity_uri($entity->ID)
     	);
     	// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt ); 
+		$meta_instances = (int) $wpdb->get_var($stmt); 
 		
 		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
+		if (0 < $meta_instances) {
 			return TRUE;
 		}
 
@@ -388,9 +387,9 @@ 
 	 *
 	 * @return true if the uri internal to the current dataset otherwise false.
 	 */
-	public function is_internal_uri( $uri ) {
+	public function is_internal_uri($uri) {
 
-		return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
+		return (0 === strrpos($uri, wl_configuration_get_redlink_dataset_uri()));
 	}
 
 	/**
@@ -402,7 +401,7 @@ 
 	 *
 	 * @return WP_Post|null A WP_Post instance or null if not found.
 	 */
-	public function get_entity_post_by_uri( $uri ) {
+	public function get_entity_post_by_uri($uri) {
 
 		$query_args = array(
 			'posts_per_page'	=> 1,
@@ -420,23 +419,23 @@ 
 		// Only if the current uri is not an internal uri 
 		// entity search is performed also looking at sameAs values
 		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( !$this->is_internal_uri( $uri ) ) {
+		if ( ! $this->is_internal_uri($uri)) {
 		
-			$query_args[ 'meta_query' ][ 'relation' ] = 'OR';
-			$query_args[ 'meta_query' ][] = array(
+			$query_args['meta_query']['relation'] = 'OR';
+			$query_args['meta_query'][] = array(
 				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
 				'value'   => $uri,
 				'compare' => '='
 			);
 		} 
 
-		$query = new WP_Query( $query_args );
+		$query = new WP_Query($query_args);
 
 		// Get the matching entity posts.
 		$posts = $query->get_posts();
 
 		// Return null if no post is found.
-		if ( 0 === count( $posts ) ) {
+		if (0 === count($posts)) {
 			return null;
 		}
 
@@ -453,18 +452,18 @@ 
 	 * @param WP_Post $post Post object.
 	 * @param bool $update Whether this is an existing post being updated or not.
 	 */
-	public function save_post( $post_id, $post, $update ) {
+	public function save_post($post_id, $post, $update) {
 
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post_id ) ) {
+		if ( ! $this->is_entity($post_id)) {
 			return;
 		}
 
 		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? $_REQUEST['wl_alternative_label'] : array();
+		$alt_labels = isset($_REQUEST['wl_alternative_label']) ? $_REQUEST['wl_alternative_label'] : array();
 
 		// Set the alternative labels.
-		$this->set_alternative_labels( $post_id, $alt_labels );
+		$this->set_alternative_labels($post_id, $alt_labels);
 
 	}
 
@@ -476,22 +475,22 @@ 
 	 * @param int $post_id The post id.
 	 * @param array $alt_labels An array of labels.
 	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
+	public function set_alternative_labels($post_id, $alt_labels) {
 		
 		// Force $alt_labels to be an array
-		if( !is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
+		if ( ! is_array($alt_labels)) {
+			$alt_labels = array($alt_labels);
 		}
 
-		$this->log_service->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
+		$this->log_service->debug("Setting alternative labels [ post id :: $post_id ][ alt labels :: ".implode(',', $alt_labels)." ]");
 
 		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		delete_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 		
 		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
+		foreach ($alt_labels as $alt_label) {
+			if ( ! empty($alt_label)) {
+				add_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label);
 			}
 		}
 
@@ -506,9 +505,9 @@ 
 	 *
 	 * @return mixed An array  of alternative labels.
 	 */
-	public function get_alternative_labels( $post_id ) {
+	public function get_alternative_labels($post_id) {
 
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		return get_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 	}
 
 	/**
@@ -518,25 +517,25 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function edit_form_before_permalink( $post ) {
+	public function edit_form_before_permalink($post) {
 
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
+		if ( ! $this->is_entity($post->ID)) {
 			return;
 		}
 
 		// Print the input template.
-		$this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+		$this->ui_service->print_template('wl-tmpl-alternative-label-input', $this->get_alternative_label_input());
 
 		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+		foreach ($this->get_alternative_labels($post->ID) as $alt_label) {
 
-			echo $this->get_alternative_label_input( $alt_label );
+			echo $this->get_alternative_label_input($alt_label);
 
 		};
 
 		// Print the button.
-		$this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+		$this->ui_service->print_button('wl-add-alternative-labels-button', __('Add more titles', 'wordlift'));
 
 	}
 
@@ -550,32 +549,32 @@ 
 	public function in_admin_header() {
 
 		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
+		if (FALSE === function_exists('get_current_screen')) {
 			return;
 		}
 		
 		$screen = get_current_screen();
 		// If there is any valid screen nothing to do
-		if ( NULL === $screen ) {
+		if (NULL === $screen) {
 			return $clauses;
 		}
 
 		// If you're not in the entity post edit page, return.
-		if ( self::TYPE_NAME !== $screen->id ) {
+		if (self::TYPE_NAME !== $screen->id) {
 			return;
 		}
 		// Retrieve the current global post
 		global $post;
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
+		if ( ! $this->is_entity($post->ID)) {
 			return;
 		}
 		// Retrieve an updated rating for the current entity
-		$rating = $this->get_rating_for( $post->ID, true );
+		$rating = $this->get_rating_for($post->ID, true);
 		// If there is at least 1 warning
-		if ( isset( $rating[ 'warnings' ] ) && 0 < count( $rating[ 'warnings' ] ) ) {
+		if (isset($rating['warnings']) && 0 < count($rating['warnings'])) {
 			// TODO - Pass Wordlift_Notice_Service trough the service constructor 
-			$this->notice_service->add_suggestion( $rating[ 'warnings' ] );
+			$this->notice_service->add_suggestion($rating['warnings']);
 		}
 		
 	}
@@ -589,19 +588,19 @@ 
 	 *
 	 * @return int An array representing the rating obj.
 	 */
-	public function set_rating_for( $post_id ) {
+	public function set_rating_for($post_id) {
 
 		// Calculate rating for the given post
-		$rating = $this->calculate_rating_for( $post_id );
+		$rating = $this->calculate_rating_for($post_id);
 		// Store the rating on db as post meta
 		// Please notice that RATING_RAW_SCORE_META_KEY 
 		// is saved on a different meta to allow score sorting
 		// Both meta are managed as unique
 		// https://codex.wordpress.org/Function_Reference/update_post_meta
-		update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating[ 'raw_score' ] );
-		update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating[ 'warnings' ] );
+		update_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score']);
+		update_post_meta($post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings']);
 		
-		$this->log_service->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating[ 'raw_score' ]  ) );
+		$this->log_service->trace(sprintf("Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score']));
 		
 		// Finally returns the rating 
 		return $rating;
@@ -616,27 +615,27 @@ 
 	 *
 	 * @return int An array representing the rating obj.
 	 */
-	public function get_rating_for( $post_id, $force_reload = false ) {
+	public function get_rating_for($post_id, $force_reload = false) {
 		
 		// If forced reload is required or rating is missing ..
-		if ( $force_reload ) {
-			$this->log_service->trace( "Force rating reload [ post_id :: $post_id ]" );
-			return $this->set_rating_for( $post_id );
+		if ($force_reload) {
+			$this->log_service->trace("Force rating reload [ post_id :: $post_id ]");
+			return $this->set_rating_for($post_id);
 		}
 		
-		$current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );  
+		$current_raw_score = get_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, true);  
 			
-		if ( ! is_numeric( $current_raw_score ) ) {
-			$this->log_service->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
-			return $this->set_rating_for( $post_id );
+		if ( ! is_numeric($current_raw_score)) {
+			$this->log_service->trace("Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]");
+			return $this->set_rating_for($post_id);
 		}
-		$current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );  
+		$current_warnings = get_post_meta($post_id, self::RATING_WARNINGS_META_KEY, true);  
 		
 		// Finally return score and warnings
 		return array( 
 			'raw_score'				=> $current_raw_score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $current_raw_score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $current_raw_score ),
+			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light($current_raw_score),
+			'percentage_score'		=> $this->convert_raw_score_to_percentage($current_raw_score),
 			'warnings'				=> $current_warnings, 
 		);
 
@@ -661,44 +660,39 @@ 
 	 *
 	 * @return int An array representing the rating obj.
 	 */
-	public function calculate_rating_for( $post_id ) {
+	public function calculate_rating_for($post_id) {
 		
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post_id ) ) {
+		if ( ! $this->is_entity($post_id)) {
 			return;
 		}
 		// Retrieve the post object
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 		// Rating value
 		$score = 0;
 		// Store warning messages
 		$warnings = array();
 
 		// Is the current entity related to at least 1 post?
-		( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
-			$score++ : 
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
+		(0 < count(wl_core_get_related_post_ids($post->ID))) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift'));
 		
 		// Is the post content not empty?
-		( ! empty( $post->post_content ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
+		( ! empty($post->post_content)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift'));
 		
 		// Is the current entity related to at least 1 entity?
 		// Was the current entity already disambiguated?
-		( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
+		(0 < count(wl_core_get_related_entity_ids($post->ID))) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift'));
 		
 		// Is the entity published?
-		( 'publish' === get_post_status( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
+		('publish' === get_post_status($post->ID)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_IS_PUBLISHED, 'wordlift'));
 		
 		// Has a thumbnail?
-		( has_post_thumbnail( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
+		(has_post_thumbnail($post->ID)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift'));
 		
 		// Get all post meta keys for the current post		
 		global $wpdb;
@@ -708,30 +702,27 @@ 
 		
 		// Check intersection between available meta keys 
 		// and expected ones arrays to detect missing values
-		$available_meta_keys = $wpdb->get_col( $query );
+		$available_meta_keys = $wpdb->get_col($query);
 
 		// If each expected key is contained in available keys array ...
-		( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
+		(in_array(Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_SAME_AS, 'wordlift'));
 		
-		$schema = wl_entity_type_taxonomy_get_type( $post_id );
+		$schema = wl_entity_type_taxonomy_get_type($post_id);
 
-		$expected_meta_keys = ( null === $schema[ 'custom_fields' ] ) ? 
-			array() : 
-			array_keys( $schema[ 'custom_fields' ] );
+		$expected_meta_keys = (null === $schema['custom_fields']) ? 
+			array() : array_keys($schema['custom_fields']);
 
-		$intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
+		$intersection = array_intersect($expected_meta_keys, $available_meta_keys);
 		// If each expected key is contained in available keys array ...
-		( count( $intersection ) === count( $expected_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
+		(count($intersection) === count($expected_meta_keys)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift'));
 		
 		// Finally return score and warnings
 		return array( 
 			'raw_score'				=> $score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $score ),
+			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light($score),
+			'percentage_score'		=> $this->convert_raw_score_to_percentage($score),
 			'warnings'				=> $warnings, 
 		);
 
@@ -746,12 +737,12 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	private function convert_raw_score_to_traffic_light( $score ) {
+	private function convert_raw_score_to_traffic_light($score) {
 		// RATING_MAX : $score = 3 : x 
 		// See http://php.net/manual/en/function.round.php
-		$rating = round( ( $score * 3 ) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+		$rating = round(($score * 3) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP);
 		// If rating is 0, return 1, otherwise return rating
-		return ( 0 == $rating ) ? 1 : $rating; 
+		return (0 == $rating) ? 1 : $rating; 
 
 	}
 
@@ -764,9 +755,9 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	public function convert_raw_score_to_percentage( $score ) {
+	public function convert_raw_score_to_percentage($score) {
 		// RATING_MAX : $score = 100 : x 
-		return round( ( $score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+		return round(($score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP);
 	}
 
 	/**
@@ -778,8 +769,8 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	private function get_alternative_label_input( $value = '' ) {
+	private function get_alternative_label_input($value = '') {
 
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
+		return sprintf(self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr($value), __('Delete', 'wordlift'));
 	}
 }

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

Indentation +168 added lines, -168 removed lines

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

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

Indentation +124 added lines, -124 removed lines

@@ -6,129 +6,129 @@
  */
 class Wordlift_Entity_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 singleton instance of the entity type service.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var Wordlift_Entity_Type_Service
-	 */
-	private static $instance;
-
-	/**
-	 * Create an entity type service instance.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @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.
-	 */
-	public function __construct( $post_type, $slug ) {
-
-
-		$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 ?: $post_type;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the entity type service singleton instance.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return Wordlift_Entity_Type_Service The entity type service singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the entity type slug.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return string The entity type slug.
-	 */
-	public function get_slug() {
-
-		return $this->slug;
-	}
-
-	/**
-	 * Get the entity post type name.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return string The entity post type.
-	 */
-	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() {
-
-		$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.
-			'supports'      => array( 'title', 'editor', 'thumbnail', 'excerpt', 'comments' ),
-			'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 )
-		);
-
-		register_post_type( $this->post_type, $args );
-
-	}
+    /**
+     * 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 singleton instance of the entity type service.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var Wordlift_Entity_Type_Service
+     */
+    private static $instance;
+
+    /**
+     * Create an entity type service instance.
+     *
+     * @since 3.6.0
+     *
+     * @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.
+     */
+    public function __construct( $post_type, $slug ) {
+
+
+        $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 ?: $post_type;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the entity type service singleton instance.
+     *
+     * @since 3.6.0
+     *
+     * @return Wordlift_Entity_Type_Service The entity type service singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the entity type slug.
+     *
+     * @since 3.6.0
+     *
+     * @return string The entity type slug.
+     */
+    public function get_slug() {
+
+        return $this->slug;
+    }
+
+    /**
+     * Get the entity post type name.
+     *
+     * @since 3.6.0
+     *
+     * @return string The entity post type.
+     */
+    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() {
+
+        $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.
+            'supports'      => array( 'title', 'editor', 'thumbnail', 'excerpt', 'comments' ),
+            '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 )
+        );
+
+        register_post_type( $this->post_type, $args );
+
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -41,7 +41,7 @@ 
 	 * @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.
 	 */
-	public function __construct( $post_type, $slug ) {
+	public function __construct($post_type, $slug) {
 
 
 		$this->post_type = $post_type;
@@ -99,19 +99,19 @@ 
 	public function register() {
 
 		$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(
@@ -120,14 +120,14 @@ 
 			'public'        => true,
 			'menu_position' => 20,
 			// after the pages menu.
-			'supports'      => array( 'title', 'editor', 'thumbnail', 'excerpt', 'comments' ),
+			'supports'      => array('title', 'editor', 'thumbnail', 'excerpt', 'comments'),
 			'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)
 		);
 
-		register_post_type( $this->post_type, $args );
+		register_post_type($this->post_type, $args);
 
 	}
 

src/includes/class-wordlift.php

Indentation +514 added lines, -514 removed lines

@@ -29,547 +29,547 @@
  */
 class Wordlift {
 
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The Thumbnail service.
-	 *
-	 * @since 3.1.5
-	 * @access private
-	 * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
-	 */
-	private $thumbnail_service;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The Schema service.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	private $schema_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * The Topic Taxonomy service.
-	 *
-	 * @since 3.5.0
-	 * @access private
-	 * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
-	 */
-	private $topic_taxonomy_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	private $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Redirect service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
-	 */
-	private $redirect_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * The Entity list customization.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_List_Service $entity_list_service The Entity list service.
-	 */
-	private $entity_list_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * The ShareThis service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
-	 */
-	private $sharethis_service;
-
-	/**
-	 * The PrimaShop adapter.
-	 *
-	 * @since 3.2.3
-	 * @access private
-	 * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
-	 */
-	private $primashop_adapter;
-
-	/**
-	 * The WordLift Dashboard adapter.
-	 *
-	 * @since 3.4.0
-	 * @access private
-	 * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
-	 */
-	private $dashboard_service;
-
-	/**
-	 * The entity type service.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Link_Service
-	 */
-	private $entity_link_service;
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		$this->plugin_name = 'wordlift';
-		$this->version     = '3.6.0-dev';
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * The Redirect service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
-
-		/**
-		 * The Log service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-
-		/**
-		 * The entity post type service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
-
-		/**
-		 * The entity link service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
-
-		/**
-		 * The Query builder.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Thumbnail service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The Topic Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The class to customize the entity list admin page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
-
-		/**
-		 * The PrimaShop adapter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
-
-		/**
-		 * The WordLift Dashboard service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The Thumbnail service.
+     *
+     * @since 3.1.5
+     * @access private
+     * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
+     */
+    private $thumbnail_service;
+
+    /**
+     * The UI service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The Schema service.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    private $schema_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * The Topic Taxonomy service.
+     *
+     * @since 3.5.0
+     * @access private
+     * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
+     */
+    private $topic_taxonomy_service;
+
+    /**
+     * The User service.
+     *
+     * @since 3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    private $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Redirect service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
+     */
+    private $redirect_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * The Entity list customization.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_List_Service $entity_list_service The Entity list service.
+     */
+    private $entity_list_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * The ShareThis service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
+     */
+    private $sharethis_service;
+
+    /**
+     * The PrimaShop adapter.
+     *
+     * @since 3.2.3
+     * @access private
+     * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
+     */
+    private $primashop_adapter;
+
+    /**
+     * The WordLift Dashboard adapter.
+     *
+     * @since 3.4.0
+     * @access private
+     * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
+     */
+    private $dashboard_service;
+
+    /**
+     * The entity type service.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service
+     */
+    private $entity_type_service;
+
+    /**
+     * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Link_Service
+     */
+    private $entity_link_service;
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        $this->plugin_name = 'wordlift';
+        $this->version     = '3.6.0-dev';
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * The Redirect service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+
+        /**
+         * The Log service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+
+        /**
+         * The entity post type service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+
+        /**
+         * The entity link service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+
+        /**
+         * The Query builder.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Thumbnail service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The Topic Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The class to customize the entity list admin page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+
+        /**
+         * The PrimaShop adapter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+
+        /**
+         * The WordLift Dashboard service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
 
-		$this->loader = new Wordlift_Loader();
+        $this->loader = new Wordlift_Loader();
 
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+        // Instantiate a global logger.
+        global $wl_logger;
+        $wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
 
-		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_type_service = new Wordlift_Entity_Type_Service( Wordlift_Entity_Service::TYPE_NAME, WL_ENTITY_TYPE_SLUG );
+        // Create an entity type service instance. It'll be later bound to the init action.
+        $this->entity_type_service = new Wordlift_Entity_Type_Service( Wordlift_Entity_Service::TYPE_NAME, WL_ENTITY_TYPE_SLUG );
 
-		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_type_service, WL_ENTITY_TYPE_SLUG );
+        // Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
+        $this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_type_service, WL_ENTITY_TYPE_SLUG );
 
-		// Create an instance of the UI service.
-		$this->ui_service = new Wordlift_UI_Service();
+        // Create an instance of the UI service.
+        $this->ui_service = new Wordlift_UI_Service();
 
-		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
-		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
+        // Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
+        $this->thumbnail_service = new Wordlift_Thumbnail_Service();
 
-		// Create an instance of the Schema service.
-		$this->schema_service = new Wordlift_Schema_Service();
+        // Create an instance of the Schema service.
+        $this->schema_service = new Wordlift_Schema_Service();
 
-		// Create an instance of the Notice service.
-		$this->notice_service = new Wordlift_Notice_Service();
+        // Create an instance of the Notice service.
+        $this->notice_service = new Wordlift_Notice_Service();
 
-		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service, $this->schema_service, $this->notice_service );
+        // Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
+        $this->entity_service = new Wordlift_Entity_Service( $this->ui_service, $this->schema_service, $this->notice_service );
 
-		// Create an instance of the User service.
-		$this->user_service = new Wordlift_User_Service();
-
-		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+        // Create an instance of the User service.
+        $this->user_service = new Wordlift_User_Service();
+
+        // Create a new instance of the Timeline service and Timeline shortcode.
+        $this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
 
-		// Create a new instance of the Redirect service.
-		$this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
+        // Create a new instance of the Redirect service.
+        $this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
 
-		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->entity_service );
+        // Create a new instance of the Redirect service.
+        $this->dashboard_service = new Wordlift_Dashboard_Service( $this->entity_service );
 
-		// Create an instance of the Timeline shortcode.
-		new Wordlift_Timeline_Shortcode();
+        // Create an instance of the Timeline shortcode.
+        new Wordlift_Timeline_Shortcode();
 
-		// Create entity list customization (wp-admin/edit.php)
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->entity_service );
-
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+        // Create entity list customization (wp-admin/edit.php)
+        $this->entity_list_service = new Wordlift_Entity_List_Service( $this->entity_service );
+
+        $this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
-		$this->topic_taxonomy_service = new Wordlift_Topic_Taxonomy_Service();
+        $this->topic_taxonomy_service = new Wordlift_Topic_Taxonomy_Service();
 
-		// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-		$this->sharethis_service = new Wordlift_ShareThis_Service();
+        // Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
+        $this->sharethis_service = new Wordlift_ShareThis_Service();
 
-		// Create an instance of the PrimaShop adapter.
-		$this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
-	}
+        // Create an instance of the PrimaShop adapter.
+        $this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
+    }
 
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the Wordlift_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the Wordlift_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
 
-		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+        $plugin_i18n = new Wordlift_i18n();
+        $plugin_i18n->set_domain( $this->get_plugin_name() );
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
 
-	}
+    }
 
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks() {
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+        $plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
 
-		// Hook the init action to the Topic Taxonomy service.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
+        // Hook the init action to the Topic Taxonomy service.
+        $this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
 
-		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+        // Hook the deleted_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
 
-		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
-
-		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+        // Hook the added_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+
+        // Hook the updated_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
 
-		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
-
-		// Hook save_post to the entity service to update custom fields (such as alternate labels).
-		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post_entity', $this->entity_service, 'set_rating_for', 10, 1 );
-
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->entity_service, 'in_admin_header' );
-
-		// Entity listing customization (wp-admin/edit.php)
-		// Add custom columns
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
-		$this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
-		// Add 4W selection
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
-
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
-
-		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
-		// entities.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
-	}
-
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks() {
-
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
-
-		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_type_service, 'register' );
-
-		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
-
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The name of the plugin.
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The version number of the plugin.
-	 */
-	public function get_version() {
-		return $this->version;
-	}
+        // Hook posts inserts (or updates) to the user service.
+        $this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Register custom allowed redirect hosts.
+        $this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
+
+        // Hook save_post to the entity service to update custom fields (such as alternate labels).
+        // We have a priority of 9 because we want to be executed before data is sent to Redlink.
+        $this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
+        $this->loader->add_action( 'save_post_entity', $this->entity_service, 'set_rating_for', 10, 1 );
+
+        $this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
+        $this->loader->add_action( 'in_admin_header', $this->entity_service, 'in_admin_header' );
+
+        // Entity listing customization (wp-admin/edit.php)
+        // Add custom columns
+        $this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
+        $this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+        // Add 4W selection
+        $this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
+        $this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
+
+        $this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+
+        // Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
+        // entities.
+        $this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+    }
+
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks() {
+
+        $plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+
+        // Register the entity post type.
+        $this->loader->add_action( 'init', $this->entity_type_service, 'register' );
+
+        // Bind the link generation and handling hooks to the entity link service.
+        $this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
+        $this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Hook the ShareThis service.
+        $this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
+        $this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @since     1.0.0
+     * @return    string    The name of the plugin.
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @since     1.0.0
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @since     1.0.0
+     * @return    string    The version number of the plugin.
+     */
+    public function get_version() {
+        return $this->version;
+    }
 
 }

Spacing +68 added lines, -68 removed lines

@@ -243,136 +243,136 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * The Redirect service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-redirect-service.php';
 
 		/**
 		 * The Log service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-log-service.php';
 
 		/**
 		 * The entity post type service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-type-service.php';
 
 		/**
 		 * The entity link service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-link-service.php';
 
 		/**
 		 * The Query builder.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-query-builder.php';
 
 		/**
 		 * The Schema service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The UI service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-ui-service.php';
 
 		/**
 		 * The Thumbnail service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-thumbnail-service.php';
 
 		/**
 		 * The Entity Types Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-types-taxonomy-service.php';
 
 		/**
 		 * The Entity service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-service.php';
 
 		/**
 		 * The User service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-user-service.php';
 
 		/**
 		 * The Timeline service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-timeline-service.php';
 
 		/**
 		 * The Topic Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-topic-taxonomy-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin.php';
 
 		/**
 		 * The class to customize the entity list admin page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-entity-list.php';
 
 		/**
 		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-types-taxonomy-walker.php';
 
 		/**
 		 * The Notice service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-notice-service.php';
 
 		/**
 		 * The PrimaShop adapter.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-primashop-adapter.php';
 
 		/**
 		 * The WordLift Dashboard service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-public.php';
 
 		/**
 		 * The Timeline shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-timeline-shortcode.php';
 
 		/**
 		 * The ShareThis service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-sharethis-service.php';
 
 		$this->loader = new Wordlift_Loader();
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_type_service = new Wordlift_Entity_Type_Service( Wordlift_Entity_Service::TYPE_NAME, WL_ENTITY_TYPE_SLUG );
+		$this->entity_type_service = new Wordlift_Entity_Type_Service(Wordlift_Entity_Service::TYPE_NAME, WL_ENTITY_TYPE_SLUG);
 
 		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_type_service, WL_ENTITY_TYPE_SLUG );
+		$this->entity_link_service = new Wordlift_Entity_Link_Service($this->entity_type_service, WL_ENTITY_TYPE_SLUG);
 
 		// Create an instance of the UI service.
 		$this->ui_service = new Wordlift_UI_Service();
@@ -387,25 +387,25 @@ 
 		$this->notice_service = new Wordlift_Notice_Service();
 
 		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service, $this->schema_service, $this->notice_service );
+		$this->entity_service = new Wordlift_Entity_Service($this->ui_service, $this->schema_service, $this->notice_service);
 
 		// Create an instance of the User service.
 		$this->user_service = new Wordlift_User_Service();
 
 		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+		$this->timeline_service = new Wordlift_Timeline_Service($this->entity_service);
 
 		// Create a new instance of the Redirect service.
-		$this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
+		$this->redirect_service = new Wordlift_Redirect_Service($this->entity_service);
 
 		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->entity_service );
+		$this->dashboard_service = new Wordlift_Dashboard_Service($this->entity_service);
 
 		// Create an instance of the Timeline shortcode.
 		new Wordlift_Timeline_Shortcode();
 
 		// Create entity list customization (wp-admin/edit.php)
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->entity_service );
+		$this->entity_list_service = new Wordlift_Entity_List_Service($this->entity_service);
 
 		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
@@ -430,9 +430,9 @@ 
 	private function set_locale() {
 
 		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+		$plugin_i18n->set_domain($this->get_plugin_name());
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 	}
 
@@ -445,59 +445,59 @@ 
 	 */
 	private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Wordlift_Admin($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
 		// Hook the init action to the Topic Taxonomy service.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
+		$this->loader->add_action('init', $this->topic_taxonomy_service, 'init', 0);
 
 		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+		$this->loader->add_action('deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4);
 
 		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+		$this->loader->add_action('added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4);
 
 		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+		$this->loader->add_action('updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4);
 
 		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+		$this->loader->add_action('wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3);
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+		$this->loader->add_filter('allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+		$this->loader->add_action('wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
+		$this->loader->add_action('wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
+		$this->loader->add_action('wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets');
 
 		// Hook save_post to the entity service to update custom fields (such as alternate labels).
 		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post_entity', $this->entity_service, 'set_rating_for', 10, 1 );
+		$this->loader->add_action('save_post', $this->entity_service, 'save_post', 9, 3);
+		$this->loader->add_action('save_post_entity', $this->entity_service, 'set_rating_for', 10, 1);
 
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->entity_service, 'in_admin_header' );
+		$this->loader->add_action('edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1);
+		$this->loader->add_action('in_admin_header', $this->entity_service, 'in_admin_header');
 
 		// Entity listing customization (wp-admin/edit.php)
 		// Add custom columns
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
-		$this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+		$this->loader->add_filter('manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns');
+		$this->loader->add_filter('manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2);
 		// Add 4W selection
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
+		$this->loader->add_action('restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope');
+		$this->loader->add_filter('posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope');
 
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+		$this->loader->add_filter('wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args');
 
 		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
 		// entities.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+		$this->loader->add_filter('prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2);
 	}
 
 	/**
@@ -509,26 +509,26 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Wordlift_Public($this->get_plugin_name(), $this->get_version());
 
 		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_type_service, 'register' );
+		$this->loader->add_action('init', $this->entity_type_service, 'register');
 
 		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+		$this->loader->add_filter('post_type_link', $this->entity_link_service, 'post_type_link', 10, 4);
+		$this->loader->add_action('pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1);
+		$this->loader->add_filter('wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3);
+		$this->loader->add_filter('wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4);
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+		$this->loader->add_filter('the_content', $this->sharethis_service, 'the_content', 99);
+		$this->loader->add_filter('the_excerpt', $this->sharethis_service, 'the_excerpt', 99);
 
 	}
 

src/wordlift_entity_type.php

Indentation +49 added lines, -49 removed lines

@@ -46,30 +46,30 @@ 
 
 //	wl_write_log( "wl_set_entity_main_type [ post id :: $post_id ][ type uri :: $type_uri ]" );
 
-	// If the type URI is empty we remove the type.
-	if ( empty( $type_uri ) ) {
-		wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-		return;
-	}
-
-	// Get all the terms bound to the wl_entity_type taxonomy.
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-		'hide_empty' => false,
-		'fields'     => 'id=>slug'
-	) );
-
-	// Check which term matches the specified URI.
-	foreach ( $terms as $term_id => $term_slug ) {
-		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term_slug );
-		// Set the related term ID.
-		if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
-			wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-			return;
-		}
-	}
+    // If the type URI is empty we remove the type.
+    if ( empty( $type_uri ) ) {
+        wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+        return;
+    }
+
+    // Get all the terms bound to the wl_entity_type taxonomy.
+    $terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+        'hide_empty' => false,
+        'fields'     => 'id=>slug'
+    ) );
+
+    // Check which term matches the specified URI.
+    foreach ( $terms as $term_id => $term_slug ) {
+        // Load the type data.
+        $type = Wordlift_Schema_Service::get_instance()->get_schema( $term_slug );
+        // Set the related term ID.
+        if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
+            wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+            return;
+        }
+    }
 }
 
 /**
@@ -77,46 +77,46 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-		'hide_empty' => false
-	) );
+    $terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+        'hide_empty' => false
+    ) );
 
-	echo <<<EOF
+    echo <<<EOF
     <script type="text/javascript">
         (function() {
         var t = [];
 
 EOF;
 
-	// Cycle in each WordLift term and get its metadata. The metadata will be printed as a global object in JavaScript
-	// to be used by the JavaScript client library.
-	foreach ( $terms as $term ) {
+    // Cycle in each WordLift term and get its metadata. The metadata will be printed as a global object in JavaScript
+    // to be used by the JavaScript client library.
+    foreach ( $terms as $term ) {
 
-		$term_name = $term->name;
+        $term_name = $term->name;
 
-		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
+        // Load the type data.
+        $type = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
 
-		// Skip types that are not defined.
-		if ( ! empty( $type['uri'] ) ) {
+        // Skip types that are not defined.
+        if ( ! empty( $type['uri'] ) ) {
 
-			// Prepare the JSON output then print it to the browser.
-			$json = json_encode( array(
-				'label'     => $term_name,
-				'uri'       => $type['uri'],
-				'css'       => $type['css_class'],
-				'sameAs'    => $type['same_as'],
-				'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
-			) );
+            // Prepare the JSON output then print it to the browser.
+            $json = json_encode( array(
+                'label'     => $term_name,
+                'uri'       => $type['uri'],
+                'css'       => $type['css_class'],
+                'sameAs'    => $type['same_as'],
+                'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
+            ) );
 
-			// Output the type data.
-			echo "t.push($json);\n";
+            // Output the type data.
+            echo "t.push($json);\n";
 
-		}
+        }
 
-	}
+    }
 
-	echo <<<EOF
+    echo <<<EOF
             if ('undefined' == typeof window.wordlift) {
                 window.wordlift = {}
             }

Spacing +19 added lines, -19 removed lines

@@ -42,30 +42,30 @@ 
  * @param int $post_id The numeric post ID.
  * @param string $type_uri A type URI.
  */
-function wl_set_entity_main_type( $post_id, $type_uri ) {
+function wl_set_entity_main_type($post_id, $type_uri) {
 
 //	wl_write_log( "wl_set_entity_main_type [ post id :: $post_id ][ type uri :: $type_uri ]" );
 
 	// If the type URI is empty we remove the type.
-	if ( empty( $type_uri ) ) {
-		wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+	if (empty($type_uri)) {
+		wp_set_object_terms($post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 		return;
 	}
 
 	// Get all the terms bound to the wl_entity_type taxonomy.
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+	$terms = get_terms(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 		'hide_empty' => false,
 		'fields'     => 'id=>slug'
-	) );
+	));
 
 	// Check which term matches the specified URI.
-	foreach ( $terms as $term_id => $term_slug ) {
+	foreach ($terms as $term_id => $term_slug) {
 		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term_slug );
+		$type = Wordlift_Schema_Service::get_instance()->get_schema($term_slug);
 		// Set the related term ID.
-		if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
-			wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+		if ($type_uri === $type['uri'] || $type_uri === $type['css_class']) {
+			wp_set_object_terms($post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 			return;
 		}
@@ -77,9 +77,9 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+	$terms = get_terms(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 		'hide_empty' => false
-	) );
+	));
 
 	echo <<<EOF
     <script type="text/javascript">
@@ -90,24 +90,24 @@ 
 
 	// Cycle in each WordLift term and get its metadata. The metadata will be printed as a global object in JavaScript
 	// to be used by the JavaScript client library.
-	foreach ( $terms as $term ) {
+	foreach ($terms as $term) {
 
 		$term_name = $term->name;
 
 		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
+		$type = Wordlift_Schema_Service::get_instance()->get_schema($term->slug);
 
 		// Skip types that are not defined.
-		if ( ! empty( $type['uri'] ) ) {
+		if ( ! empty($type['uri'])) {
 
 			// Prepare the JSON output then print it to the browser.
-			$json = json_encode( array(
+			$json = json_encode(array(
 				'label'     => $term_name,
 				'uri'       => $type['uri'],
 				'css'       => $type['css_class'],
 				'sameAs'    => $type['same_as'],
-				'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
-			) );
+				'templates' => (isset($type['templates']) ? $type['templates'] : array()),
+			));
 
 			// Output the type data.
 			echo "t.push($json);\n";
@@ -128,6 +128,6 @@ 
 
 }
 
-add_action( 'admin_print_scripts', 'wl_print_entity_type_inline_js' );
+add_action('admin_print_scripts', 'wl_print_entity_type_inline_js');
 
-add_action( 'init', 'wl_entity_type_taxonomy_register', 0 );
+add_action('init', 'wl_entity_type_taxonomy_register', 0);