insideout10 / wordlift-plugin

src/admin/class-wordlift-admin-settings-page-action-link.php

Indentation +37 added lines, -37 removed lines

@@ -18,48 +18,48 @@
  */
 class Wordlift_Admin_Settings_Page_Action_Link {
 
-	/**
-	 * The {@link Wordlift_Admin_Settings_Page} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Settings_Page $settings_page The {@link Wordlift_Admin_Settings_Page} instance.
-	 */
-	private $settings_page;
+    /**
+     * The {@link Wordlift_Admin_Settings_Page} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Settings_Page $settings_page The {@link Wordlift_Admin_Settings_Page} instance.
+     */
+    private $settings_page;
 
-	/**
-	 * Create a {@link Wordlift_Admin_Settings_Page_Action_Link} instance.
-	 *
-	 * @since  3.11.0
-	 *
-	 * @param \Wordlift_Admin_Settings_Page $settings_page The {@link Wordlift_Admin_Settings_Page} instance.
-	 */
-	function __construct( $settings_page ) {
+    /**
+     * Create a {@link Wordlift_Admin_Settings_Page_Action_Link} instance.
+     *
+     * @since  3.11.0
+     *
+     * @param \Wordlift_Admin_Settings_Page $settings_page The {@link Wordlift_Admin_Settings_Page} instance.
+     */
+    function __construct( $settings_page ) {
 
-		$this->settings_page = $settings_page;
+        $this->settings_page = $settings_page;
 
-	}
+    }
 
-	/**
-	 * Create a link to the WordLift settings page.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $links An array of links.
-	 *
-	 * @return array An array of links including those added by the plugin.
-	 */
-	function action_links( $links ) {
+    /**
+     * Create a link to the WordLift settings page.
+     *
+     * @since 3.11.0
+     *
+     * @param array $links An array of links.
+     *
+     * @return array An array of links including those added by the plugin.
+     */
+    function action_links( $links ) {
 
-		// Get the menu slug from the page, then prepare the path, hence the url.
-		$menu_slug = $this->settings_page->get_menu_slug();
-		$path      = "admin.php?page=$menu_slug";
-		$url       = get_admin_url( null, $path );
+        // Get the menu slug from the page, then prepare the path, hence the url.
+        $menu_slug = $this->settings_page->get_menu_slug();
+        $path      = "admin.php?page=$menu_slug";
+        $url       = get_admin_url( null, $path );
 
-		// Add our own link to the list of links.
-		return array_merge( $links, array(
-			sprintf( "<a href='$url'>%s</a>", __( 'Settings', 'wordlift' ) ),
-		) );
-	}
+        // Add our own link to the list of links.
+        return array_merge( $links, array(
+            sprintf( "<a href='$url'>%s</a>", __( 'Settings', 'wordlift' ) ),
+        ) );
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 	 *
 	 * @param \Wordlift_Admin_Settings_Page $settings_page The {@link Wordlift_Admin_Settings_Page} instance.
 	 */
-	function __construct( $settings_page ) {
+	function __construct($settings_page) {
 
 		$this->settings_page = $settings_page;
 
@@ -49,17 +49,17 @@ 
 	 *
 	 * @return array An array of links including those added by the plugin.
 	 */
-	function action_links( $links ) {
+	function action_links($links) {
 
 		// Get the menu slug from the page, then prepare the path, hence the url.
 		$menu_slug = $this->settings_page->get_menu_slug();
 		$path      = "admin.php?page=$menu_slug";
-		$url       = get_admin_url( null, $path );
+		$url       = get_admin_url(null, $path);
 
 		// Add our own link to the list of links.
-		return array_merge( $links, array(
-			sprintf( "<a href='$url'>%s</a>", __( 'Settings', 'wordlift' ) ),
-		) );
+		return array_merge($links, array(
+			sprintf("<a href='$url'>%s</a>", __('Settings', 'wordlift')),
+		));
 	}
 
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	 *
 	 * @since 3.18.0
 	 *
-	 * @return string|bool The file extension on success and
+	 * @return string|false The file extension on success and
 	 * false on fail or if the content type is not supported.
 	 */
 	private static function get_extension_from_content_type( $content_type ) {

Indentation +129 added lines, -129 removed lines

@@ -8,134 +8,134 @@
  */
 class Wordlift_Remote_Image_Service {
 
-	/**
-	 * Save the image with the specified URL locally.
-	 *
-	 * @param string $url The image remote URL.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
-	 * url, *content_type*: the image content type) or false on error.
-	 */
-	public static function save_from_url( $url ) {
-
-		// Load `WP_Filesystem`.
-		WP_Filesystem();
-		global $wp_filesystem;
-
-		// Parse the url.
-		$parts = wp_parse_url( $url );
-
-		// Get the bare filename (filename w/o the extension).
-		$basename = pathinfo( $parts['path'], PATHINFO_FILENAME );
-
-		// Get the base dir.
-		$wp_upload_dir = wp_upload_dir();
-
-		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
-
-		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
-
-		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
-
-			return false;
-		};
-
-		$response = self::get_response( $url );
-
-		// Bail if the response is not set.
-		if ( false === $response ) {
-			wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
-
-			return false;
-		}
-
-		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
-
-		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
-
-		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
-			return false;
-		}
-
-		// Complete the local filename.
-		$image_full_path .= $extension;
-		$image_full_url  .= $extension;
-
-		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
-
-		// Return the path.
-		return array(
-			'path'         => $image_full_path,
-			'url'          => $image_full_url,
-			'content_type' => $content_type,
-		);
-	}
-
-	/**
-	 * Returns the file extension using the content type.
-	 *
-	 * @param string $content_type File content type.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return string|bool The file extension on success and
-	 * false on fail or if the content type is not supported.
-	 */
-	private static function get_extension_from_content_type( $content_type ) {
-
-		// Return the extension if match.
-		switch ( $content_type ) {
-			case 'image/jpeg':
-			case 'image/jpg':
-				return '.jpg';
-			case 'image/gif':
-				return '.gif';
-			case 'image/png':
-				return '.png';
-		}
-
-		// Otherwise return false.
-		return false;
-	}
-
-	/**
-	 * Retrieve the response from url and sets the response.
-	 *
-	 * @param string $url The url to retrieve.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return false|array True on success and false on failure.
-	 */
-	private static function get_response( $url ) {
-		// Request the remote file.
-		$response = wp_remote_get( $url );
-
-		// Bail out if the response is not ok.
-		if (
-			is_wp_error( $response )
-			|| 200 !== (int) $response['response']['code']
-			|| ! isset( $response['body'] )
-		) {
-			wl_write_log( "save_image_from_url : error fetching image $url \n" );
-
-			return false;
-		}
-
-		// Set the response.
-		return $response;
-	}
+    /**
+     * Save the image with the specified URL locally.
+     *
+     * @param string $url The image remote URL.
+     *
+     * @since 3.18.0
+     *
+     * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
+     * url, *content_type*: the image content type) or false on error.
+     */
+    public static function save_from_url( $url ) {
+
+        // Load `WP_Filesystem`.
+        WP_Filesystem();
+        global $wp_filesystem;
+
+        // Parse the url.
+        $parts = wp_parse_url( $url );
+
+        // Get the bare filename (filename w/o the extension).
+        $basename = pathinfo( $parts['path'], PATHINFO_FILENAME );
+
+        // Get the base dir.
+        $wp_upload_dir = wp_upload_dir();
+
+        // Set the upload directory and URL.
+        $upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
+        $upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+
+        // Get the full path to the local filename.
+        $image_full_path = $upload_dir . '/' . $basename;
+        $image_full_url  = $upload_url . '/' . $basename;
+
+        // Create custom directory and bail on failure.
+        if ( ! wp_mkdir_p( $upload_dir ) ) {
+            wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+
+            return false;
+        };
+
+        $response = self::get_response( $url );
+
+        // Bail if the response is not set.
+        if ( false === $response ) {
+            wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
+
+            return false;
+        }
+
+        // Get the content type of response.
+        $content_type = wp_remote_retrieve_header( $response, 'content-type' );
+
+        // Get the file extension.
+        $extension = self::get_extension_from_content_type( $content_type );
+
+        // Bail if the content type is not supported.
+        if ( empty( $extension ) ) {
+            return false;
+        }
+
+        // Complete the local filename.
+        $image_full_path .= $extension;
+        $image_full_url  .= $extension;
+
+        // Store the data locally.
+        $wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+
+        // Return the path.
+        return array(
+            'path'         => $image_full_path,
+            'url'          => $image_full_url,
+            'content_type' => $content_type,
+        );
+    }
+
+    /**
+     * Returns the file extension using the content type.
+     *
+     * @param string $content_type File content type.
+     *
+     * @since 3.18.0
+     *
+     * @return string|bool The file extension on success and
+     * false on fail or if the content type is not supported.
+     */
+    private static function get_extension_from_content_type( $content_type ) {
+
+        // Return the extension if match.
+        switch ( $content_type ) {
+            case 'image/jpeg':
+            case 'image/jpg':
+                return '.jpg';
+            case 'image/gif':
+                return '.gif';
+            case 'image/png':
+                return '.png';
+        }
+
+        // Otherwise return false.
+        return false;
+    }
+
+    /**
+     * Retrieve the response from url and sets the response.
+     *
+     * @param string $url The url to retrieve.
+     *
+     * @since 3.18.0
+     *
+     * @return false|array True on success and false on failure.
+     */
+    private static function get_response( $url ) {
+        // Request the remote file.
+        $response = wp_remote_get( $url );
+
+        // Bail out if the response is not ok.
+        if (
+            is_wp_error( $response )
+            || 200 !== (int) $response['response']['code']
+            || ! isset( $response['body'] )
+        ) {
+            wl_write_log( "save_image_from_url : error fetching image $url \n" );
+
+            return false;
+        }
+
+        // Set the response.
+        return $response;
+    }
 
 }

Spacing +23 added lines, -23 removed lines

@@ -18,53 +18,53 @@ 
 	 * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
 	 * url, *content_type*: the image content type) or false on error.
 	 */
-	public static function save_from_url( $url ) {
+	public static function save_from_url($url) {
 
 		// Load `WP_Filesystem`.
 		WP_Filesystem();
 		global $wp_filesystem;
 
 		// Parse the url.
-		$parts = wp_parse_url( $url );
+		$parts = wp_parse_url($url);
 
 		// Get the bare filename (filename w/o the extension).
-		$basename = pathinfo( $parts['path'], PATHINFO_FILENAME );
+		$basename = pathinfo($parts['path'], PATHINFO_FILENAME);
 
 		// Get the base dir.
 		$wp_upload_dir = wp_upload_dir();
 
 		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+		$upload_dir = $wp_upload_dir['basedir'].'/wl'.$wp_upload_dir['subdir'];
+		$upload_url = $wp_upload_dir['baseurl'].'/wl'.$wp_upload_dir['subdir'];
 
 		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
+		$image_full_path = $upload_dir.'/'.$basename;
+		$image_full_url  = $upload_url.'/'.$basename;
 
 		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+		if ( ! wp_mkdir_p($upload_dir)) {
+			wl_write_log("save_image_from_url : failed creating upload dir $upload_dir \n");
 
 			return false;
 		};
 
-		$response = self::get_response( $url );
+		$response = self::get_response($url);
 
 		// Bail if the response is not set.
-		if ( false === $response ) {
-			wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
+		if (false === $response) {
+			wl_write_log("save_image_from_url : failed to fetch the response from: $url \n");
 
 			return false;
 		}
 
 		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
+		$content_type = wp_remote_retrieve_header($response, 'content-type');
 
 		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
+		$extension = self::get_extension_from_content_type($content_type);
 
 		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
+		if (empty($extension)) {
 			return false;
 		}
 
@@ -73,7 +73,7 @@ 
 		$image_full_url  .= $extension;
 
 		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+		$wp_filesystem->put_contents($image_full_path, wp_remote_retrieve_body($response));
 
 		// Return the path.
 		return array(
@@ -93,10 +93,10 @@ 
 	 * @return string|bool The file extension on success and
 	 * false on fail or if the content type is not supported.
 	 */
-	private static function get_extension_from_content_type( $content_type ) {
+	private static function get_extension_from_content_type($content_type) {
 
 		// Return the extension if match.
-		switch ( $content_type ) {
+		switch ($content_type) {
 			case 'image/jpeg':
 			case 'image/jpg':
 				return '.jpg';
@@ -119,17 +119,17 @@ 
 	 *
 	 * @return false|array True on success and false on failure.
 	 */
-	private static function get_response( $url ) {
+	private static function get_response($url) {
 		// Request the remote file.
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
 		// Bail out if the response is not ok.
 		if (
-			is_wp_error( $response )
+			is_wp_error($response)
 			|| 200 !== (int) $response['response']['code']
-			|| ! isset( $response['body'] )
+			|| ! isset($response['body'])
 		) {
-			wl_write_log( "save_image_from_url : error fetching image $url \n" );
+			wl_write_log("save_image_from_url : error fetching image $url \n");
 
 			return false;
 		}

src/modules/linked_data/wordlift_linked_data.php

Indentation +351 added lines, -351 removed lines

@@ -16,38 +16,38 @@ 
  */
 function wl_linked_data_save_post( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
 
-	$log->trace( "Saving post $post_id to Linked Data..." );
+    $log->trace( "Saving post $post_id to Linked Data..." );
 
-	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+    // If it's not numeric exit from here.
+    if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+        $log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
 
-		return;
-	}
+        return;
+    }
 
-	// Get the post type and check whether it supports the editor.
-	//
-	// See https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type           = get_post_type( $post_id );
-	$is_editor_supported = post_type_supports( $post_type, 'editor' );
+    // Get the post type and check whether it supports the editor.
+    //
+    // See https://github.com/insideout10/wordlift-plugin/issues/659.
+    $post_type           = get_post_type( $post_id );
+    $is_editor_supported = post_type_supports( $post_type, 'editor' );
 
-	// Bail out if it's not an entity.
-	if ( ! $is_editor_supported ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+    // Bail out if it's not an entity.
+    if ( ! $is_editor_supported ) {
+        $log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
 
-		return;
-	}
+        return;
+    }
 
-	// Unhook this function so it doesn't loop infinitely.
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+    // Unhook this function so it doesn't loop infinitely.
+    remove_action( 'save_post', 'wl_linked_data_save_post' );
 
-	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+    // raise the *wl_linked_data_save_post* event.
+    do_action( 'wl_linked_data_save_post', $post_id );
 
-	// Re-hook this function.
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+    // Re-hook this function.
+    add_action( 'save_post', 'wl_linked_data_save_post' );
 }
 
 add_action( 'save_post', 'wl_linked_data_save_post' );
@@ -61,156 +61,156 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
 
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+    $log->trace( "Saving $post_id to Linked Data along with related entities..." );
 
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        $log->trace( 'Doing autosave, skipping...' );
 
-		return;
-	}
+        return;
+    }
 
-	// get the current post.
-	$post = get_post( $post_id );
+    // get the current post.
+    $post = get_post( $post_id );
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 
-	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
+    // wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
-	// Get the entity service instance.
-	$entity_service = Wordlift_Entity_Service::get_instance();
+    // Get the entity service instance.
+    $entity_service = Wordlift_Entity_Service::get_instance();
 
-	// Store mapping between tmp new entities uris and real new entities uri
-	$entities_uri_mapping = array();
+    // Store mapping between tmp new entities uris and real new entities uri
+    $entities_uri_mapping = array();
 
-	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+    // Save the entities coming with POST data.
+    if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
+        wl_write_log( json_encode( $_POST['wl_entities'] ) );
+        wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
+        wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
+        wl_write_log( "]" );
 
-		$entities_via_post = $_POST['wl_entities'];
-		$boxes_via_post    = $_POST['wl_boxes'];
+        $entities_via_post = $_POST['wl_entities'];
+        $boxes_via_post    = $_POST['wl_boxes'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+        foreach ( $entities_via_post as $entity_uri => $entity ) {
 
-			// Only if the current entity is created from scratch let's avoid to
-			// create more than one entity with same label & entity type.
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
-				$entity['main_type'] : null;
+            // Only if the current entity is created from scratch let's avoid to
+            // create more than one entity with same label & entity type.
+            $entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+                $entity['main_type'] : null;
 
-			// Look if current entity uri matches an internal existing entity, meaning:
-			// 1. when $entity_uri is an internal uri
-			// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-			$ie = $entity_service->get_entity_post_by_uri( $entity_uri );
+            // Look if current entity uri matches an internal existing entity, meaning:
+            // 1. when $entity_uri is an internal uri
+            // 2. when $entity_uri is an external uri used as sameAs of an internal entity
+            $ie = $entity_service->get_entity_post_by_uri( $entity_uri );
 
-			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
-				Wordlift_Uri_Service::get_instance()->build_uri(
-					$entity['label'],
-					Wordlift_Entity_Service::TYPE_NAME,
-					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
+            // Detect the uri depending if is an existing or a new entity
+            $uri = ( null === $ie ) ?
+                Wordlift_Uri_Service::get_instance()->build_uri(
+                    $entity['label'],
+                    Wordlift_Entity_Service::TYPE_NAME,
+                    $entity_type
+                ) : wl_get_entity_uri( $ie->ID );
 
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+            wl_write_log( "Map $entity_uri on $uri" );
+            $entities_uri_mapping[ $entity_uri ] = $uri;
 
-			// Local entities have a tmp uri with 'local-entity-' prefix
-			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
-				// Override the entity obj
-				$entity['uri'] = $uri;
-			}
+            // Local entities have a tmp uri with 'local-entity-' prefix
+            // These uris need to be rewritten here and replaced in the content
+            if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+                // Override the entity obj
+                $entity['uri'] = $uri;
+            }
 
-			// Update entity data with related post
-			$entity['related_post_id'] = $post_id;
+            // Update entity data with related post
+            $entity['related_post_id'] = $post_id;
 
-			// Save the entity if is a new entity
-			if ( null === $ie ) {
-				wl_save_entity( $entity );
-			}
+            // Save the entity if is a new entity
+            if ( null === $ie ) {
+                wl_save_entity( $entity );
+            }
 
-		}
+        }
 
-	}
+    }
 
-	// Replace tmp uris in content post if needed
-	$updated_post_content = $post->post_content;
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
 
-	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
-		// Save each entity and store the post id.
-		foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-			$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
-		}
+    // Update the post content if we found mappings of new entities.
+    if ( ! empty( $entities_uri_mapping ) ) {
+        // Save each entity and store the post id.
+        foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
+            $updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+        }
 
-		// Update the post content.
-		wp_update_post( array(
-			'ID'           => $post->ID,
-			'post_content' => $updated_post_content,
-		) );
-	}
+        // Update the post content.
+        wp_update_post( array(
+            'ID'           => $post->ID,
+            'post_content' => $updated_post_content,
+        ) );
+    }
 
-	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+    // Extract related/referenced entities from text.
+    $disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
 
-	// Reset previously saved instances.
-	wl_core_delete_relation_instances( $post_id );
+    // Reset previously saved instances.
+    wl_core_delete_relation_instances( $post_id );
 
-	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+    // Save relation instances
+    foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
 
-		wl_core_add_relation_instance(
-			$post_id,
-			$entity_service->get_classification_scope_for( $referenced_entity_id ),
-			$referenced_entity_id
-		);
+        wl_core_add_relation_instance(
+            $post_id,
+            $entity_service->get_classification_scope_for( $referenced_entity_id ),
+            $referenced_entity_id
+        );
 
-	}
+    }
 
-	if ( isset( $_POST['wl_entities'] ) ) {
-		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
-			$_POST['wl_metadata'] : array();
-
-		$fields = array(
-			Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
-			Wordlift_Schema_Service::FIELD_TOPIC,
-		);
-
-		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
-
-		foreach ( $fields as $field ) {
-
-			// Delete current values
-			delete_post_meta( $post->ID, $field );
-			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
-
-			$entity = $entity_service->get_entity_post_by_uri( $uri );
-
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
-				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
-				}
-			}
-		}
-	}
-
-	// Push the post to Redlink.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post->ID );
-
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    if ( isset( $_POST['wl_entities'] ) ) {
+        // Save post metadata if available
+        $metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
+            $_POST['wl_metadata'] : array();
+
+        $fields = array(
+            Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
+            Wordlift_Schema_Service::FIELD_TOPIC,
+        );
+
+        // Unlink topic taxonomy terms
+        Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+
+        foreach ( $fields as $field ) {
+
+            // Delete current values
+            delete_post_meta( $post->ID, $field );
+            // Retrieve the entity uri
+            $uri = ( isset( $metadata_via_post[ $field ] ) ) ?
+                stripslashes( $metadata_via_post[ $field ] ) : '';
+
+            $entity = $entity_service->get_entity_post_by_uri( $uri );
+
+            if ( $entity ) {
+                add_post_meta( $post->ID, $field, $entity->ID, true );
+                // Set also the topic taxonomy
+                if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
+                    Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+                }
+            }
+        }
+    }
+
+    // Push the post to Redlink.
+    Wordlift_Linked_Data_Service::get_instance()->push( $post->ID );
+
+    add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 }
 
 add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
@@ -233,196 +233,196 @@ 
  */
 function wl_save_entity( $entity_data ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
-
-	$uri              = $entity_data['uri'];
-	$label            = $entity_data['label'];
-	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
-	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
-
-	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
-
-	// Check whether an entity already exists with the provided URI.
-	if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
-		$log->debug( "Post already exists for URI $uri." );
-
-		return $post;
-	}
-
-	// Prepare properties of the new entity.
-	$params = array(
-		'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
-		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
-		'post_title'   => $label,
-		'post_content' => $description,
-		'post_excerpt' => '',
-		// Ensure we're using a valid slug. We're not overwriting an existing
-		// entity with a post_name already set, since this call is made only for
-		// new entities.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
-	);
-
-	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
-	// the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
-	// Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
-	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
-	// is created when saving a post.
-	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action( 'wp_insert_post', array(
-			$wpseo_metabox,
-			'save_postdata',
-		) );
-	}
-
-	if ( isset( $seo_ultimate ) ) {
-		remove_action( 'save_post', array(
-			$seo_ultimate,
-			'save_postmeta_box',
-		) );
-	}
-
-	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
-	// save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
-	// to the save_post and restore them after we saved the entity.
-	// see https://github.com/insideout10/wordlift-plugin/issues/203
-	// see https://github.com/insideout10/wordlift-plugin/issues/156
-	// see https://github.com/insideout10/wordlift-plugin/issues/148
-	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
-
-
-	$log->trace( 'Going to insert new post...' );
-
-	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
-
-	// Setting the alternative labels for this entity.
-	Wordlift_Entity_Service::get_instance()
-						   ->set_alternative_labels( $post_id, $synonyms );
-
-	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
-
-	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action( 'wp_insert_post', array(
-			$wpseo_metabox,
-			'save_postdata',
-		) );
-	}
-
-	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action( 'save_post', array(
-			$seo_ultimate,
-			'save_postmeta_box',
-		), 10, 2 );
-	}
-
-	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
-
-		// inform an error occurred.
-		return null;
-	}
-
-	wl_set_entity_main_type( $post_id, $type_uri );
-
-	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
-
-	// Get a dataset URI for the entity.
-	$wl_uri = wl_build_entity_uri( $post_id );
-
-	// Save the entity URI.
-	wl_set_entity_uri( $post_id, $wl_uri );
-
-	// Add the uri to the sameAs data if it's not a local URI.
-	if ( $wl_uri !== $uri ) {
-		array_push( $same_as, $uri );
-	}
-
-	$new_uri = wl_get_entity_uri( $post_id );
-
-	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
-
-	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
-	}
-
-	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
-
-	foreach ( $images as $image_remote_url ) {
-
-		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
-			// Do nothing.
-			continue;
-		}
-
-		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
-
-		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
-			continue;
-		}
-
-		// Save the image and get the local path.
-		$image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
-
-		if ( false === $image ) {
-			continue;
-		}
+    $log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+
+    $uri              = $entity_data['uri'];
+    $label            = $entity_data['label'];
+    $type_uri         = $entity_data['main_type'];
+    $entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+    $description      = $entity_data['description'];
+    $images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
+    $same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
+    $related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
+    $other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+
+    // Get the synonyms.
+    $synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+
+    // Check whether an entity already exists with the provided URI.
+    if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
+        $log->debug( "Post already exists for URI $uri." );
+
+        return $post;
+    }
+
+    // Prepare properties of the new entity.
+    $params = array(
+        'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
+        'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
+        'post_title'   => $label,
+        'post_content' => $description,
+        'post_excerpt' => '',
+        // Ensure we're using a valid slug. We're not overwriting an existing
+        // entity with a post_name already set, since this call is made only for
+        // new entities.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/282
+        'post_name'    => sanitize_title( $label ),
+    );
+
+    // If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
+    // the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
+    // Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
+    // This does NOT affect saving an entity from the entity admin page since this function is called when an entity
+    // is created when saving a post.
+    global $wpseo_metabox, $seo_ultimate;
+    if ( isset( $wpseo_metabox ) ) {
+        remove_action( 'wp_insert_post', array(
+            $wpseo_metabox,
+            'save_postdata',
+        ) );
+    }
+
+    if ( isset( $seo_ultimate ) ) {
+        remove_action( 'save_post', array(
+            $seo_ultimate,
+            'save_postmeta_box',
+        ) );
+    }
+
+    // The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
+    // save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
+    // to the save_post and restore them after we saved the entity.
+    // see https://github.com/insideout10/wordlift-plugin/issues/203
+    // see https://github.com/insideout10/wordlift-plugin/issues/156
+    // see https://github.com/insideout10/wordlift-plugin/issues/148
+    global $wp_filter;
+    $save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
+
+
+    $log->trace( 'Going to insert new post...' );
+
+    // create or update the post.
+    $post_id = wp_insert_post( $params, true );
+
+    // Setting the alternative labels for this entity.
+    Wordlift_Entity_Service::get_instance()
+                            ->set_alternative_labels( $post_id, $synonyms );
+
+    // Restore all the existing filters.
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
+
+    // If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
+    if ( isset( $wpseo_metabox ) ) {
+        add_action( 'wp_insert_post', array(
+            $wpseo_metabox,
+            'save_postdata',
+        ) );
+    }
+
+    // If SEO Ultimate is installed, add back the hook we removed a few lines above.
+    if ( isset( $seo_ultimate ) ) {
+        add_action( 'save_post', array(
+            $seo_ultimate,
+            'save_postmeta_box',
+        ), 10, 2 );
+    }
+
+    // TODO: handle errors.
+    if ( is_wp_error( $post_id ) ) {
+        $log->error( 'An error occurred: ' . $post_id->get_error_message() );
+
+        // inform an error occurred.
+        return null;
+    }
+
+    wl_set_entity_main_type( $post_id, $type_uri );
+
+    // Save the entity types.
+    wl_set_entity_rdf_types( $post_id, $entity_types );
+
+    // Get a dataset URI for the entity.
+    $wl_uri = wl_build_entity_uri( $post_id );
+
+    // Save the entity URI.
+    wl_set_entity_uri( $post_id, $wl_uri );
+
+    // Add the uri to the sameAs data if it's not a local URI.
+    if ( $wl_uri !== $uri ) {
+        array_push( $same_as, $uri );
+    }
+
+    $new_uri = wl_get_entity_uri( $post_id );
+
+    // Save the sameAs data for the entity.
+    wl_schema_set_value( $post_id, 'sameAs', $same_as );
+
+    // Save the other properties (latitude, langitude, startDate, endDate, etc.)
+    foreach ( $other_properties as $property_name => $property_value ) {
+        wl_schema_set_value( $post_id, $property_name, $property_value );
+    }
+
+    // Call hooks.
+    do_action( 'wl_save_entity', $post_id );
+
+    foreach ( $images as $image_remote_url ) {
+
+        // Check if image is already present in local DB
+        if ( strpos( $image_remote_url, site_url() ) !== false ) {
+            // Do nothing.
+            continue;
+        }
+
+        // Check if there is an existing attachment for this post ID and source URL.
+        $existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+
+        // Skip if an existing image is found.
+        if ( null !== $existing_image ) {
+            continue;
+        }
+
+        // Save the image and get the local path.
+        $image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+
+        if ( false === $image ) {
+            continue;
+        }
 
-		// Get the local URL.
-		$filename     = $image['path'];
-		$url          = $image['url'];
-		$content_type = $image['content_type'];
+        // Get the local URL.
+        $filename     = $image['path'];
+        $url          = $image['url'];
+        $content_type = $image['content_type'];
 
-		$attachment = array(
-			'guid'           => $url,
-			// post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
-			'post_title'     => $label,
-			// Set the title to the post title.
-			'post_content'   => '',
-			'post_status'    => 'inherit',
-			'post_mime_type' => $content_type,
-		);
-
-		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
-
-		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
+        $attachment = array(
+            'guid'           => $url,
+            // post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
+            'post_title'     => $label,
+            // Set the title to the post title.
+            'post_content'   => '',
+            'post_status'    => 'inherit',
+            'post_mime_type' => $content_type,
+        );
+
+        // Create the attachment in WordPress and generate the related metadata.
+        $attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+
+        // Set the source URL for the image.
+        wl_set_source_url( $attachment_id, $image_remote_url );
 
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+        $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+        wp_update_attachment_metadata( $attachment_id, $attachment_data );
 
-		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
-	}
+        // Set it as the featured image.
+        set_post_thumbnail( $post_id, $attachment_id );
+    }
 
-	// The entity is pushed to Redlink on save by the function hooked to save_post.
-	// save the entity in the triple store.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post_id );
+    // The entity is pushed to Redlink on save by the function hooked to save_post.
+    // save the entity in the triple store.
+    Wordlift_Linked_Data_Service::get_instance()->push( $post_id );
 
-	// finally return the entity post.
-	return get_post( $post_id );
+    // finally return the entity post.
+    return get_post( $post_id );
 }
 
 /**
@@ -436,40 +436,40 @@ 
  */
 function wl_linked_data_content_get_embedded_entities( $content ) {
 
-	// Remove quote escapes.
-	$content = str_replace( '\\"', '"', $content );
+    // Remove quote escapes.
+    $content = str_replace( '\\"', '"', $content );
 
-	// Match all itemid attributes.
-	$pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
+    // Match all itemid attributes.
+    $pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
 
-	//	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
+    //	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
 
-	// Remove the pattern while it is found (match nested annotations).
-	$matches = array();
+    // Remove the pattern while it is found (match nested annotations).
+    $matches = array();
 
-	// In case of errors, return an empty array.
-	if ( false === preg_match_all( $pattern, $content, $matches ) ) {
-		wl_write_log( "Found no entities embedded in content" );
+    // In case of errors, return an empty array.
+    if ( false === preg_match_all( $pattern, $content, $matches ) ) {
+        wl_write_log( "Found no entities embedded in content" );
 
-		return array();
-	}
+        return array();
+    }
 
 //    wl_write_log("wl_update_related_entities [ content :: $content ][ data :: " . var_export($data, true). " ][ matches :: " . var_export($matches, true) . " ]");
 
-	// Collect the entities.
-	$entities = array();
-	foreach ( $matches[1] as $uri ) {
-		$uri_d = html_entity_decode( $uri );
+    // Collect the entities.
+    $entities = array();
+    foreach ( $matches[1] as $uri ) {
+        $uri_d = html_entity_decode( $uri );
 
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+        $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
-		}
-	}
+        if ( null !== $entity ) {
+            array_push( $entities, $entity->ID );
+        }
+    }
 
-	// $count = sizeof( $entities );
-	// wl_write_log( "Found $count entities embedded in content" );
+    // $count = sizeof( $entities );
+    // wl_write_log( "Found $count entities embedded in content" );
 
-	return $entities;
+    return $entities;
 }

Spacing +126 added lines, -126 removed lines

@@ -14,15 +14,15 @@ 
  *
  * @param int $post_id The post id.
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post');
 
-	$log->trace( "Saving post $post_id to Linked Data..." );
+	$log->trace("Saving post $post_id to Linked Data...");
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
+		$log->debug("Skipping $post_id, because id is not numeric or is a post revision.");
 
 		return;
 	}
@@ -30,27 +30,27 @@ 
 	// Get the post type and check whether it supports the editor.
 	//
 	// See https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type           = get_post_type( $post_id );
-	$is_editor_supported = post_type_supports( $post_type, 'editor' );
+	$post_type           = get_post_type($post_id);
+	$is_editor_supported = post_type_supports($post_type, 'editor');
 
 	// Bail out if it's not an entity.
-	if ( ! $is_editor_supported ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+	if ( ! $is_editor_supported) {
+		$log->debug("Skipping $post_id, because $post_type doesn't support the editor (content).");
 
 		return;
 	}
 
 	// Unhook this function so it doesn't loop infinitely.
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+	remove_action('save_post', 'wl_linked_data_save_post');
 
 	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+	do_action('wl_linked_data_save_post', $post_id);
 
 	// Re-hook this function.
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+	add_action('save_post', 'wl_linked_data_save_post');
 }
 
-add_action( 'save_post', 'wl_linked_data_save_post' );
+add_action('save_post', 'wl_linked_data_save_post');
 
 /**
  * Save the post to the triple store. Also saves the entities locally and on the triple store.
@@ -59,23 +59,23 @@ 
  *
  * @param int $post_id The post id being saved.
  */
-function wl_linked_data_save_post_and_related_entities( $post_id ) {
+function wl_linked_data_save_post_and_related_entities($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post_and_related_entities');
 
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+	$log->trace("Saving $post_id to Linked Data along with related entities...");
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+		$log->trace('Doing autosave, skipping...');
 
 		return;
 	}
 
 	// get the current post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	remove_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
@@ -86,44 +86,44 @@ 
 	$entities_uri_mapping = array();
 
 	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+	if (isset($_POST['wl_entities']) && isset($_POST['wl_boxes'])) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+		wl_write_log("[ post id :: $post_id ][ POST(wl_entities) :: ");
+		wl_write_log(json_encode($_POST['wl_entities']));
+		wl_write_log("]");
+		wl_write_log("[ post id :: $post_id ][ POST(wl_boxes) :: ");
+		wl_write_log(json_encode($_POST['wl_boxes'], true));
+		wl_write_log("]");
 
 		$entities_via_post = $_POST['wl_entities'];
 		$boxes_via_post    = $_POST['wl_boxes'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+		foreach ($entities_via_post as $entity_uri => $entity) {
 
 			// Only if the current entity is created from scratch let's avoid to
 			// create more than one entity with same label & entity type.
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+			$entity_type = (preg_match('/^local-entity-.+/', $entity_uri) > 0) ?
 				$entity['main_type'] : null;
 
 			// Look if current entity uri matches an internal existing entity, meaning:
 			// 1. when $entity_uri is an internal uri
 			// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-			$ie = $entity_service->get_entity_post_by_uri( $entity_uri );
+			$ie = $entity_service->get_entity_post_by_uri($entity_uri);
 
 			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
+			$uri = (null === $ie) ?
 				Wordlift_Uri_Service::get_instance()->build_uri(
 					$entity['label'],
 					Wordlift_Entity_Service::TYPE_NAME,
 					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
+				) : wl_get_entity_uri($ie->ID);
 
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+			wl_write_log("Map $entity_uri on $uri");
+			$entities_uri_mapping[$entity_uri] = $uri;
 
 			// Local entities have a tmp uri with 'local-entity-' prefix
 			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+			if (preg_match('/^local-entity-.+/', $entity_uri) > 0) {
 				// Override the entity obj
 				$entity['uri'] = $uri;
 			}
@@ -132,8 +132,8 @@ 
 			$entity['related_post_id'] = $post_id;
 
 			// Save the entity if is a new entity
-			if ( null === $ie ) {
-				wl_save_entity( $entity );
+			if (null === $ie) {
+				wl_save_entity($entity);
 			}
 
 		}
@@ -144,39 +144,39 @@ 
 	$updated_post_content = $post->post_content;
 
 	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
+	if ( ! empty($entities_uri_mapping)) {
 		// Save each entity and store the post id.
-		foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-			$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+		foreach ($entities_uri_mapping as $tmp_uri => $uri) {
+			$updated_post_content = str_replace($tmp_uri, $uri, $updated_post_content);
 		}
 
 		// Update the post content.
-		wp_update_post( array(
+		wp_update_post(array(
 			'ID'           => $post->ID,
 			'post_content' => $updated_post_content,
-		) );
+		));
 	}
 
 	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+	$disambiguated_entities = wl_linked_data_content_get_embedded_entities($updated_post_content);
 
 	// Reset previously saved instances.
-	wl_core_delete_relation_instances( $post_id );
+	wl_core_delete_relation_instances($post_id);
 
 	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+	foreach (array_unique($disambiguated_entities) as $referenced_entity_id) {
 
 		wl_core_add_relation_instance(
 			$post_id,
-			$entity_service->get_classification_scope_for( $referenced_entity_id ),
+			$entity_service->get_classification_scope_for($referenced_entity_id),
 			$referenced_entity_id
 		);
 
 	}
 
-	if ( isset( $_POST['wl_entities'] ) ) {
+	if (isset($_POST['wl_entities'])) {
 		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
+		$metadata_via_post = (isset($_POST['wl_metadata'])) ?
 			$_POST['wl_metadata'] : array();
 
 		$fields = array(
@@ -185,35 +185,35 @@ 
 		);
 
 		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for($post->ID);
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			// Delete current values
-			delete_post_meta( $post->ID, $field );
+			delete_post_meta($post->ID, $field);
 			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
+			$uri = (isset($metadata_via_post[$field])) ?
+				stripslashes($metadata_via_post[$field]) : '';
 
-			$entity = $entity_service->get_entity_post_by_uri( $uri );
+			$entity = $entity_service->get_entity_post_by_uri($uri);
 
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
+			if ($entity) {
+				add_post_meta($post->ID, $field, $entity->ID, true);
 				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+				if ($field === Wordlift_Schema_Service::FIELD_TOPIC) {
+					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for($post->ID, $entity);
 				}
 			}
 		}
 	}
 
 	// Push the post to Redlink.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post->ID );
+	Wordlift_Linked_Data_Service::get_instance()->push($post->ID);
 
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 }
 
-add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 /**
  * Save the specified data as an entity in WordPress. This method only create new entities. When an existing entity is
@@ -231,33 +231,33 @@ 
  *
  * @return null|WP_Post A post instance or null in case of failure.
  */
-function wl_save_entity( $entity_data ) {
+function wl_save_entity($entity_data) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+	$log = Wordlift_Log_Service::get_logger('wl_save_entity');
 
 	$uri              = $entity_data['uri'];
 	$label            = $entity_data['label'];
 	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+	$entity_types     = isset($entity_data['type']) ? $entity_data['type'] : array();
 	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+	$images           = isset($entity_data['image']) ? (array) $entity_data['image'] : array();
+	$same_as          = isset($entity_data['sameas']) ? (array) $entity_data['sameas'] : array();
+	$related_post_id  = isset($entity_data['related_post_id']) ? $entity_data['related_post_id'] : null;
+	$other_properties = isset($entity_data['properties']) ? $entity_data['properties'] : array();
 
 	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+	$synonyms = isset($entity_data['synonym']) ? $entity_data['synonym'] : array();
 
 	// Check whether an entity already exists with the provided URI.
-	if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
-		$log->debug( "Post already exists for URI $uri." );
+	if (null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri)) {
+		$log->debug("Post already exists for URI $uri.");
 
 		return $post;
 	}
 
 	// Prepare properties of the new entity.
 	$params = array(
-		'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
+		'post_status'  => (is_numeric($related_post_id) ? get_post_status($related_post_id) : 'draft'),
 		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
 		'post_title'   => $label,
 		'post_content' => $description,
@@ -267,7 +267,7 @@ 
 		// new entities.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
+		'post_name'    => sanitize_title($label),
 	);
 
 	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
@@ -276,18 +276,18 @@ 
 	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
 	// is created when saving a post.
 	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		remove_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
-	if ( isset( $seo_ultimate ) ) {
-		remove_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		remove_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		) );
+		));
 	}
 
 	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
@@ -297,95 +297,95 @@ 
 	// see https://github.com/insideout10/wordlift-plugin/issues/156
 	// see https://github.com/insideout10/wordlift-plugin/issues/148
 	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
+	$save_post_filters = is_array($wp_filter['save_post']) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
 
 
-	$log->trace( 'Going to insert new post...' );
+	$log->trace('Going to insert new post...');
 
 	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
+	$post_id = wp_insert_post($params, true);
 
 	// Setting the alternative labels for this entity.
 	Wordlift_Entity_Service::get_instance()
-						   ->set_alternative_labels( $post_id, $synonyms );
+						   ->set_alternative_labels($post_id, $synonyms);
 
 	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
 
 	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		add_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
 	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		add_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		), 10, 2 );
+		), 10, 2);
 	}
 
 	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
+	if (is_wp_error($post_id)) {
+		$log->error('An error occurred: '.$post_id->get_error_message());
 
 		// inform an error occurred.
 		return null;
 	}
 
-	wl_set_entity_main_type( $post_id, $type_uri );
+	wl_set_entity_main_type($post_id, $type_uri);
 
 	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
+	wl_set_entity_rdf_types($post_id, $entity_types);
 
 	// Get a dataset URI for the entity.
-	$wl_uri = wl_build_entity_uri( $post_id );
+	$wl_uri = wl_build_entity_uri($post_id);
 
 	// Save the entity URI.
-	wl_set_entity_uri( $post_id, $wl_uri );
+	wl_set_entity_uri($post_id, $wl_uri);
 
 	// Add the uri to the sameAs data if it's not a local URI.
-	if ( $wl_uri !== $uri ) {
-		array_push( $same_as, $uri );
+	if ($wl_uri !== $uri) {
+		array_push($same_as, $uri);
 	}
 
-	$new_uri = wl_get_entity_uri( $post_id );
+	$new_uri = wl_get_entity_uri($post_id);
 
 	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
+	wl_schema_set_value($post_id, 'sameAs', $same_as);
 
 	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
+	foreach ($other_properties as $property_name => $property_value) {
+		wl_schema_set_value($post_id, $property_name, $property_value);
 	}
 
 	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
+	do_action('wl_save_entity', $post_id);
 
-	foreach ( $images as $image_remote_url ) {
+	foreach ($images as $image_remote_url) {
 
 		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
+		if (strpos($image_remote_url, site_url()) !== false) {
 			// Do nothing.
 			continue;
 		}
 
 		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+		$existing_image = wl_get_attachment_for_source_url($post_id, $image_remote_url);
 
 		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
+		if (null !== $existing_image) {
 			continue;
 		}
 
 		// Save the image and get the local path.
-		$image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+		$image = Wordlift_Remote_Image_Service::save_from_url($image_remote_url);
 
-		if ( false === $image ) {
+		if (false === $image) {
 			continue;
 		}
 
@@ -405,24 +405,24 @@ 
 		);
 
 		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+		$attachment_id = wp_insert_attachment($attachment, $filename, $post_id);
 
 		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
+		wl_set_source_url($attachment_id, $image_remote_url);
 
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+		$attachment_data = wp_generate_attachment_metadata($attachment_id, $filename);
+		wp_update_attachment_metadata($attachment_id, $attachment_data);
 
 		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
+		set_post_thumbnail($post_id, $attachment_id);
 	}
 
 	// The entity is pushed to Redlink on save by the function hooked to save_post.
 	// save the entity in the triple store.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post_id );
+	Wordlift_Linked_Data_Service::get_instance()->push($post_id);
 
 	// finally return the entity post.
-	return get_post( $post_id );
+	return get_post($post_id);
 }
 
 /**
@@ -434,10 +434,10 @@ 
  *
  * @return array An array of entity posts.
  */
-function wl_linked_data_content_get_embedded_entities( $content ) {
+function wl_linked_data_content_get_embedded_entities($content) {
 
 	// Remove quote escapes.
-	$content = str_replace( '\\"', '"', $content );
+	$content = str_replace('\\"', '"', $content);
 
 	// Match all itemid attributes.
 	$pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
@@ -448,8 +448,8 @@ 
 	$matches = array();
 
 	// In case of errors, return an empty array.
-	if ( false === preg_match_all( $pattern, $content, $matches ) ) {
-		wl_write_log( "Found no entities embedded in content" );
+	if (false === preg_match_all($pattern, $content, $matches)) {
+		wl_write_log("Found no entities embedded in content");
 
 		return array();
 	}
@@ -458,13 +458,13 @@ 
 
 	// Collect the entities.
 	$entities = array();
-	foreach ( $matches[1] as $uri ) {
-		$uri_d = html_entity_decode( $uri );
+	foreach ($matches[1] as $uri) {
+		$uri_d = html_entity_decode($uri);
 
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri_d);
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
+		if (null !== $entity) {
+			array_push($entities, $entity->ID);
 		}
 	}
 

src/admin/wordlift_admin_save_post.php

Indentation +53 added lines, -53 removed lines

@@ -26,23 +26,23 @@ 
  */
 function wl_transition_post_status( $new_status, $old_status, $post ) {
 
-	// wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
-
-	// transition from *published* to any other status: delete the post.
-	if ( 'publish' === $old_status && 'publish' !== $new_status ) {
-		// Delete the post from the triple store.
-		rl_delete_post( $post );
-
-		// Remove all relation instances for the current post from `wl_relation_instances`.
-		wl_core_delete_relation_instances( $post->ID );
-	}
-
-	// when a post is published, then all the referenced entities must be published.
-	if ( 'publish' !== $old_status && 'publish' === $new_status ) {
-		foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
-			wl_update_post_status( $entity_id, 'publish' );
-		}
-	}
+    // wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
+
+    // transition from *published* to any other status: delete the post.
+    if ( 'publish' === $old_status && 'publish' !== $new_status ) {
+        // Delete the post from the triple store.
+        rl_delete_post( $post );
+
+        // Remove all relation instances for the current post from `wl_relation_instances`.
+        wl_core_delete_relation_instances( $post->ID );
+    }
+
+    // when a post is published, then all the referenced entities must be published.
+    if ( 'publish' !== $old_status && 'publish' === $new_status ) {
+        foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
+            wl_update_post_status( $entity_id, 'publish' );
+        }
+    }
 }
 
 // hook save events.
@@ -56,25 +56,25 @@ 
  */
 function rl_delete_post( $post ) {
 
-	$post_id = ( is_numeric( $post ) ? $post : $post->ID );
+    $post_id = ( is_numeric( $post ) ? $post : $post->ID );
 
-	// hide all entities that are not referenced by any published post.
-	foreach ( wl_core_get_related_entity_ids( $post_id ) as $entity_id ) {
+    // hide all entities that are not referenced by any published post.
+    foreach ( wl_core_get_related_entity_ids( $post_id ) as $entity_id ) {
 
-		// check if there is at least one referencing post published.
-		$is_published = array_reduce( wl_core_get_related_post_ids( $entity_id ), function ( $carry, $item ) {
-			$post = get_post( $item );
+        // check if there is at least one referencing post published.
+        $is_published = array_reduce( wl_core_get_related_post_ids( $entity_id ), function ( $carry, $item ) {
+            $post = get_post( $item );
 
-			return ( $carry || ( 'publish' === $post->post_status ) );
-		} );
-		// set the entity to draft if no referencing posts are published.
-		if ( ! $is_published ) {
-			wl_update_post_status( $entity_id, 'draft' );
-		}
-	}
+            return ( $carry || ( 'publish' === $post->post_status ) );
+        } );
+        // set the entity to draft if no referencing posts are published.
+        if ( ! $is_published ) {
+            wl_update_post_status( $entity_id, 'draft' );
+        }
+    }
 
-	// Remove the post.
-	Wordlift_Linked_Data_Service::get_instance()->remove( $post_id );
+    // Remove the post.
+    Wordlift_Linked_Data_Service::get_instance()->remove( $post_id );
 
 }
 
@@ -86,33 +86,33 @@ 
  */
 function wl_update_post_status( $post_id, $status ) {
 
-	wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
+    wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
 
-	global $wpdb;
+    global $wpdb;
 
-	if ( ! $post = get_post( $post_id ) ) {
-		return;
-	}
+    if ( ! $post = get_post( $post_id ) ) {
+        return;
+    }
 
-	if ( $status === $post->post_status ) {
-		return;
-	}
+    if ( $status === $post->post_status ) {
+        return;
+    }
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
+    $wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
 
-	clean_post_cache( $post->ID );
+    clean_post_cache( $post->ID );
 
-	$old_status        = $post->post_status;
-	$post->post_status = $status;
+    $old_status        = $post->post_status;
+    $post->post_status = $status;
 
-	wp_transition_post_status( $status, $old_status, $post );
+    wp_transition_post_status( $status, $old_status, $post );
 
-	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
-	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
-	/** This action is documented in wp-includes/post.php */
-	do_action( 'wl_linked_data_save_post', $post->ID );
-	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+    /** This action is documented in wp-includes/post.php */
+    do_action( 'edit_post', $post->ID, $post );
+    /** This action is documented in wp-includes/post.php */
+    do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+    /** This action is documented in wp-includes/post.php */
+    do_action( 'wl_linked_data_save_post', $post->ID );
+    /** This action is documented in wp-includes/post.php */
+    do_action( 'wp_insert_post', $post->ID, $post, true );
 }

Spacing +28 added lines, -28 removed lines

@@ -24,29 +24,29 @@ 
  * @param string $old_status The old post status
  * @param array  $post       An array with the post data
  */
-function wl_transition_post_status( $new_status, $old_status, $post ) {
+function wl_transition_post_status($new_status, $old_status, $post) {
 
 	// wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
 
 	// transition from *published* to any other status: delete the post.
-	if ( 'publish' === $old_status && 'publish' !== $new_status ) {
+	if ('publish' === $old_status && 'publish' !== $new_status) {
 		// Delete the post from the triple store.
-		rl_delete_post( $post );
+		rl_delete_post($post);
 
 		// Remove all relation instances for the current post from `wl_relation_instances`.
-		wl_core_delete_relation_instances( $post->ID );
+		wl_core_delete_relation_instances($post->ID);
 	}
 
 	// when a post is published, then all the referenced entities must be published.
-	if ( 'publish' !== $old_status && 'publish' === $new_status ) {
-		foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
-			wl_update_post_status( $entity_id, 'publish' );
+	if ('publish' !== $old_status && 'publish' === $new_status) {
+		foreach (wl_core_get_related_entity_ids($post->ID) as $entity_id) {
+			wl_update_post_status($entity_id, 'publish');
 		}
 	}
 }
 
 // hook save events.
-add_action( 'transition_post_status', 'wl_transition_post_status', 10, 3 );
+add_action('transition_post_status', 'wl_transition_post_status', 10, 3);
 
 
 /**
@@ -54,27 +54,27 @@ 
  *
  * @param array|int $post An array of post data
  */
-function rl_delete_post( $post ) {
+function rl_delete_post($post) {
 
-	$post_id = ( is_numeric( $post ) ? $post : $post->ID );
+	$post_id = (is_numeric($post) ? $post : $post->ID);
 
 	// hide all entities that are not referenced by any published post.
-	foreach ( wl_core_get_related_entity_ids( $post_id ) as $entity_id ) {
+	foreach (wl_core_get_related_entity_ids($post_id) as $entity_id) {
 
 		// check if there is at least one referencing post published.
-		$is_published = array_reduce( wl_core_get_related_post_ids( $entity_id ), function ( $carry, $item ) {
-			$post = get_post( $item );
+		$is_published = array_reduce(wl_core_get_related_post_ids($entity_id), function($carry, $item) {
+			$post = get_post($item);
 
-			return ( $carry || ( 'publish' === $post->post_status ) );
+			return ($carry || ('publish' === $post->post_status));
 		} );
 		// set the entity to draft if no referencing posts are published.
-		if ( ! $is_published ) {
-			wl_update_post_status( $entity_id, 'draft' );
+		if ( ! $is_published) {
+			wl_update_post_status($entity_id, 'draft');
 		}
 	}
 
 	// Remove the post.
-	Wordlift_Linked_Data_Service::get_instance()->remove( $post_id );
+	Wordlift_Linked_Data_Service::get_instance()->remove($post_id);
 
 }
 
@@ -84,35 +84,35 @@ 
  * @param int    $post_id The post ID
  * @param string $status  The new status
  */
-function wl_update_post_status( $post_id, $status ) {
+function wl_update_post_status($post_id, $status) {
 
-	wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
+	wl_write_log("wl_update_post_status [ post ID :: $post_id ][ status :: $status ]");
 
 	global $wpdb;
 
-	if ( ! $post = get_post( $post_id ) ) {
+	if ( ! $post = get_post($post_id)) {
 		return;
 	}
 
-	if ( $status === $post->post_status ) {
+	if ($status === $post->post_status) {
 		return;
 	}
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
+	$wpdb->update($wpdb->posts, array('post_status' => $status), array('ID' => $post->ID));
 
-	clean_post_cache( $post->ID );
+	clean_post_cache($post->ID);
 
 	$old_status        = $post->post_status;
 	$post->post_status = $status;
 
-	wp_transition_post_status( $status, $old_status, $post );
+	wp_transition_post_status($status, $old_status, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
+	do_action('edit_post', $post->ID, $post);
 	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+	do_action("save_post_{$post->post_type}", $post->ID, $post, true);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wl_linked_data_save_post', $post->ID );
+	do_action('wl_linked_data_save_post', $post->ID);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+	do_action('wp_insert_post', $post->ID, $post, true);
 }

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

Indentation +47 added lines, -47 removed lines

@@ -6,59 +6,59 @@
  */
 class Wordlift_Entity_Type_Taxonomy_Service {
 
-	// @@todo: rename using singular.
+    // @@todo: rename using singular.
 
-	const TAXONOMY_NAME = 'wl_entity_type';
+    const TAXONOMY_NAME = 'wl_entity_type';
 
-	/**
-	 * Register the taxonomies.
-	 *
-	 * @since 3.18.0
-	 */
-	public function init() {
+    /**
+     * Register the taxonomies.
+     *
+     * @since 3.18.0
+     */
+    public function init() {
 
-		$labels = array(
-			'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Entity Types', 'wordlift' ),
-			'all_items'         => __( 'All Entity Types', 'wordlift' ),
-			'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
-			'update_item'       => __( 'Update Entity Type', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
-			'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
-			'menu_name'         => __( 'Entity Types', 'wordlift' ),
-		);
+        $labels = array(
+            'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
+            'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
+            'search_items'      => __( 'Search Entity Types', 'wordlift' ),
+            'all_items'         => __( 'All Entity Types', 'wordlift' ),
+            'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
+            'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
+            'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
+            'update_item'       => __( 'Update Entity Type', 'wordlift' ),
+            'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
+            'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
+            'menu_name'         => __( 'Entity Types', 'wordlift' ),
+        );
 
-		// Take away GUI for taxonomy editing.
-		// TODO: read capabilities when editing of the WL <-> schema.org mapping is possible.
-		$capabilities = array(
-			// We enable editors to change the title/description of terms:
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/398
-			'manage_terms' => 'manage_options',
-			'edit_terms'   => 'wl_entity_type_edit_term',
-			'delete_terms' => 'wl_entity_type_delete_term',
-			'assign_terms' => 'edit_posts',
-		);
+        // Take away GUI for taxonomy editing.
+        // TODO: read capabilities when editing of the WL <-> schema.org mapping is possible.
+        $capabilities = array(
+            // We enable editors to change the title/description of terms:
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/398
+            'manage_terms' => 'manage_options',
+            'edit_terms'   => 'wl_entity_type_edit_term',
+            'delete_terms' => 'wl_entity_type_delete_term',
+            'assign_terms' => 'edit_posts',
+        );
 
-		$args = array(
-			'labels'             => $labels,
-			'capabilities'       => $capabilities,
-			'hierarchical'       => true,
-			'show_admin_column'  => true,
-			'show_in_quick_edit' => false,
-		);
+        $args = array(
+            'labels'             => $labels,
+            'capabilities'       => $capabilities,
+            'hierarchical'       => true,
+            'show_admin_column'  => true,
+            'show_in_quick_edit' => false,
+        );
 
-		register_taxonomy(
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, // Taxonomy name.
-			Wordlift_Entity_Service::valid_entity_post_types(), // Taxonomy post types.
-			$args // Taxonomy args.
-		);
+        register_taxonomy(
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, // Taxonomy name.
+            Wordlift_Entity_Service::valid_entity_post_types(), // Taxonomy post types.
+            $args // Taxonomy args.
+        );
 
-		// Add filter to change the metabox CSS class
-		add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
-	}
+        // Add filter to change the metabox CSS class
+        add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -18,17 +18,17 @@ 
 	public function init() {
 
 		$labels = array(
-			'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Entity Types', 'wordlift' ),
-			'all_items'         => __( 'All Entity Types', 'wordlift' ),
-			'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
-			'update_item'       => __( 'Update Entity Type', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
-			'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
-			'menu_name'         => __( 'Entity Types', 'wordlift' ),
+			'name'              => _x('Entity Types', 'taxonomy general name', 'wordlift'),
+			'singular_name'     => _x('Entity Type', 'taxonomy singular name', 'wordlift'),
+			'search_items'      => __('Search Entity Types', 'wordlift'),
+			'all_items'         => __('All Entity Types', 'wordlift'),
+			'parent_item'       => __('Parent Entity Type', 'wordlift'),
+			'parent_item_colon' => __('Parent Entity Type:', 'wordlift'),
+			'edit_item'         => __('Edit Entity Type', 'wordlift'),
+			'update_item'       => __('Update Entity Type', 'wordlift'),
+			'add_new_item'      => __('Add New Entity Type', 'wordlift'),
+			'new_item_name'     => __('New Entity Type', 'wordlift'),
+			'menu_name'         => __('Entity Types', 'wordlift'),
 		);
 
 		// Take away GUI for taxonomy editing.
@@ -58,7 +58,7 @@ 
 		);
 
 		// Add filter to change the metabox CSS class
-		add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
+		add_filter('postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class');
 	}
 
 }

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

Indentation +356 added lines, -356 removed lines

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

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

Indentation +175 added lines, -175 removed lines

@@ -17,182 +17,182 @@
  */
 class Wordlift_Uri_Service {
 
-	/**
-	 * The title regex to sanitize titles in paths.
-	 *
-	 * According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
-	 * ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-	 * "$" | ","
-	 *
-	 * We also remove the space and the UTF-8 BOM sequence.
-	 *
-	 * @since 3.7.1
-	 */
-	const INVALID_CHARACTERS = "/[ ;\\/?:@&=\\+\\\$,]|(?:\\xEF\\xBB\\xBF)/";
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The global WordPress database connection.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \wpdb $wpdb The global WordPress database connection.
-	 */
-	private $wpdb;
-
-	/**
-	 * The {@link Wordlift_Uri_Service} singleton instance.
-	 *
-	 * @since  3.7.2
-	 * @access private
-	 * @var \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create an instance of Wordlift_Uri_Service.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param \wpdb $wpdb The global WordPress database connection.
-	 */
-	public function __construct( $wpdb ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
-
-		$this->wpdb = $wpdb;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the {@link Wordlift_Uri_Service} singleton instance.
-	 *
-	 * @since 3.7.2
-	 * @return \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Delete all generated URIs from the database.
-	 *
-	 * @since 3.6.0
-	 */
-	public function delete_all() {
-
-		$this->log->trace( 'Going to delete all the `entity_url` post metas...' );
-
-		// Delete URIs associated with posts/entities.
-		$this->wpdb->delete( $this->wpdb->postmeta, array( 'meta_key' => 'entity_url' ) );
-
-		$this->log->trace( 'Going to delete all the `_wl_uri` user metas...' );
-
-		// Delete URIs associated with authors.
-		$this->wpdb->delete( $this->wpdb->usermeta, array( 'meta_key' => '_wl_uri' ) );
-
-		$this->log->debug( '`entity_url` post metas and `_wl_uri` user metas deleted.' );
-
-	}
-
-	/**
-	 * Sanitizes an URI path by replacing the non allowed characters with an underscore.
-	 *
-	 * @since 3.7.2
-	 * @uses  sanitize_title() to manage not ASCII chars
-	 *
-	 * @see   https://codex.wordpress.org/Function_Reference/sanitize_title
-	 *
-	 * @param string $path The path to sanitize.
-	 * @param string $char The replacement character (by default an underscore).
-	 *
-	 * @return string The sanitized path.
-	 */
-	public function sanitize_path( $path, $char = '_' ) {
-
-		// Ensure the path is ASCII.
-		// see https://github.com/insideout10/wordlift-plugin/issues/386
+    /**
+     * The title regex to sanitize titles in paths.
+     *
+     * According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
+     * ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+     * "$" | ","
+     *
+     * We also remove the space and the UTF-8 BOM sequence.
+     *
+     * @since 3.7.1
+     */
+    const INVALID_CHARACTERS = "/[ ;\\/?:@&=\\+\\\$,]|(?:\\xEF\\xBB\\xBF)/";
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The global WordPress database connection.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \wpdb $wpdb The global WordPress database connection.
+     */
+    private $wpdb;
+
+    /**
+     * The {@link Wordlift_Uri_Service} singleton instance.
+     *
+     * @since  3.7.2
+     * @access private
+     * @var \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create an instance of Wordlift_Uri_Service.
+     *
+     * @since 3.6.0
+     *
+     * @param \wpdb $wpdb The global WordPress database connection.
+     */
+    public function __construct( $wpdb ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
+
+        $this->wpdb = $wpdb;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the {@link Wordlift_Uri_Service} singleton instance.
+     *
+     * @since 3.7.2
+     * @return \Wordlift_Uri_Service The {@link Wordlift_Uri_Service} singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Delete all generated URIs from the database.
+     *
+     * @since 3.6.0
+     */
+    public function delete_all() {
+
+        $this->log->trace( 'Going to delete all the `entity_url` post metas...' );
+
+        // Delete URIs associated with posts/entities.
+        $this->wpdb->delete( $this->wpdb->postmeta, array( 'meta_key' => 'entity_url' ) );
+
+        $this->log->trace( 'Going to delete all the `_wl_uri` user metas...' );
+
+        // Delete URIs associated with authors.
+        $this->wpdb->delete( $this->wpdb->usermeta, array( 'meta_key' => '_wl_uri' ) );
+
+        $this->log->debug( '`entity_url` post metas and `_wl_uri` user metas deleted.' );
+
+    }
+
+    /**
+     * Sanitizes an URI path by replacing the non allowed characters with an underscore.
+     *
+     * @since 3.7.2
+     * @uses  sanitize_title() to manage not ASCII chars
+     *
+     * @see   https://codex.wordpress.org/Function_Reference/sanitize_title
+     *
+     * @param string $path The path to sanitize.
+     * @param string $char The replacement character (by default an underscore).
+     *
+     * @return string The sanitized path.
+     */
+    public function sanitize_path( $path, $char = '_' ) {
+
+        // Ensure the path is ASCII.
+        // see https://github.com/insideout10/wordlift-plugin/issues/386
 //		$path_ascii = mb_convert_encoding( $path, 'ASCII' );
 
-		return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
-	}
-
-	/**
-	 * Build an entity uri for a given title. The uri is composed using a given
-	 * post_type and a title. If already exists an entity e2 with a given uri a
-	 * numeric suffix is added. If a schema type is given entities with same label
-	 * and same type are overridden.
-	 *
-	 * @since 3.5.0
-	 *
-	 * @param string  $title           A post title.
-	 * @param string  $post_type       A post type. Default value is 'entity'
-	 * @param string  $schema_type     A schema org type.
-	 * @param integer $increment_digit A digit used to call recursively the same function.
-	 *
-	 * @return string Returns an uri.
-	 */
-	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 );
-
-		// Compose a candidate uri.
-		$new_entity_uri = sprintf( '%s/%s/%s',
-			wl_configuration_get_redlink_dataset_uri(),
-			$post_type,
-			$entity_slug
-		);
-
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
-
-		global $wpdb;
-
-		// Check if the candidated uri already is used
-		$stmt = $wpdb->prepare(
-			"SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s LIMIT 1",
-			WL_ENTITY_URL_META_NAME,
-			$new_entity_uri
-		);
-
-		// Perform the query
-		$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->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
-
-			return $new_entity_uri;
-		}
-
-		// If schema_type is equal to schema org type of post x, then the new uri is returned
-		$schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
-
-		// @todo: we shouldn't rely on css classes to take such decisions.
-		if ( $schema_type === $schema_post_type['css_class'] ) {
-			$this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
-
-			return $new_entity_uri;
-		}
-
-		// Otherwise the same function is called recursively
-		return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
-	}
+        return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
+    }
+
+    /**
+     * Build an entity uri for a given title. The uri is composed using a given
+     * post_type and a title. If already exists an entity e2 with a given uri a
+     * numeric suffix is added. If a schema type is given entities with same label
+     * and same type are overridden.
+     *
+     * @since 3.5.0
+     *
+     * @param string  $title           A post title.
+     * @param string  $post_type       A post type. Default value is 'entity'
+     * @param string  $schema_type     A schema org type.
+     * @param integer $increment_digit A digit used to call recursively the same function.
+     *
+     * @return string Returns an uri.
+     */
+    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 );
+
+        // Compose a candidate uri.
+        $new_entity_uri = sprintf( '%s/%s/%s',
+            wl_configuration_get_redlink_dataset_uri(),
+            $post_type,
+            $entity_slug
+        );
+
+        $this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+
+        global $wpdb;
+
+        // Check if the candidated uri already is used
+        $stmt = $wpdb->prepare(
+            "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s LIMIT 1",
+            WL_ENTITY_URL_META_NAME,
+            $new_entity_uri
+        );
+
+        // Perform the query
+        $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->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+
+            return $new_entity_uri;
+        }
+
+        // If schema_type is equal to schema org type of post x, then the new uri is returned
+        $schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+
+        // @todo: we shouldn't rely on css classes to take such decisions.
+        if ( $schema_type === $schema_post_type['css_class'] ) {
+            $this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
+
+            return $new_entity_uri;
+        }
+
+        // Otherwise the same function is called recursively
+        return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
+    }
 
 }

Spacing +21 added lines, -22 removed lines

@@ -64,9 +64,9 @@ 
 	 *
 	 * @param \wpdb $wpdb The global WordPress database connection.
 	 */
-	public function __construct( $wpdb ) {
+	public function __construct($wpdb) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Uri_Service');
 
 		$this->wpdb = $wpdb;
 
@@ -92,17 +92,17 @@ 
 	 */
 	public function delete_all() {
 
-		$this->log->trace( 'Going to delete all the `entity_url` post metas...' );
+		$this->log->trace('Going to delete all the `entity_url` post metas...');
 
 		// Delete URIs associated with posts/entities.
-		$this->wpdb->delete( $this->wpdb->postmeta, array( 'meta_key' => 'entity_url' ) );
+		$this->wpdb->delete($this->wpdb->postmeta, array('meta_key' => 'entity_url'));
 
-		$this->log->trace( 'Going to delete all the `_wl_uri` user metas...' );
+		$this->log->trace('Going to delete all the `_wl_uri` user metas...');
 
 		// Delete URIs associated with authors.
-		$this->wpdb->delete( $this->wpdb->usermeta, array( 'meta_key' => '_wl_uri' ) );
+		$this->wpdb->delete($this->wpdb->usermeta, array('meta_key' => '_wl_uri'));
 
-		$this->log->debug( '`entity_url` post metas and `_wl_uri` user metas deleted.' );
+		$this->log->debug('`entity_url` post metas and `_wl_uri` user metas deleted.');
 
 	}
 
@@ -119,13 +119,13 @@ 
 	 *
 	 * @return string The sanitized path.
 	 */
-	public function sanitize_path( $path, $char = '_' ) {
+	public function sanitize_path($path, $char = '_') {
 
 		// Ensure the path is ASCII.
 		// see https://github.com/insideout10/wordlift-plugin/issues/386
 //		$path_ascii = mb_convert_encoding( $path, 'ASCII' );
 
-		return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
+		return sanitize_title(preg_replace(self::INVALID_CHARACTERS, $char, stripslashes($path)));
 	}
 
 	/**
@@ -143,24 +143,23 @@ 
 	 *
 	 * @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 candidate 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->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+		$this->log->trace("Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]");
 
 		global $wpdb;
 
@@ -172,27 +171,27 @@ 
 		);
 
 		// 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->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ( ! is_numeric($post_id)) {
+			$this->log->trace("Going to return uri [ new_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// If schema_type is equal to schema org type of post x, then the new uri is returned
-		$schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+		$schema_post_type = Wordlift_Entity_Type_Service::get_instance()->get($post_id);
 
 		// @todo: we shouldn't rely on css classes to take such decisions.
-		if ( $schema_type === $schema_post_type['css_class'] ) {
-			$this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ($schema_type === $schema_post_type['css_class']) {
+			$this->log->trace("An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// Otherwise the same function is called recursively
-		return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
+		return $this->build_uri($title, $post_type, $schema_type, ++ $increment_digit);
 	}
 
 }

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

Indentation +143 added lines, -143 removed lines

@@ -18,151 +18,151 @@
  */
 class Wordlift_Publisher_Service {
 
-	/**
-	 * Counts the number of potential publishers.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return int The number of potential publishers.
-	 */
-	public function count() {
-
-		// Search for entities which are either a Person
-		// or Organization.
-
-		// Get only the ids as all we need is the count.
-		$entities = get_posts( array(
-			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
-			'tax_query'      => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => array( 'organization', 'person' ),
-				),
-			),
-			'fields'         => 'ids',
-		) );
-
-		// Finally return the count.
-		return count( $entities );
-	}
-
-	/**
-	 * Search SQL filter for matching against post title only.
-	 *
-	 * @link    http://wordpress.stackexchange.com/a/11826/1685
-	 *
-	 * @since   3.15.0
-	 *
-	 * @param   string   $search   The search string.
-	 * @param   WP_Query $wp_query The {@link WP_Query} instance.
-	 *
-	 * @return array|string An array of results.
-	 */
-	public function limit_search_to_title( $search, $wp_query ) {
-
-		// Bail out if the search or the `search_terms` haven't been set.
-		if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
-			return $search;
-		}
-
-		global $wpdb;
-
-		$query_vars = $wp_query->query_vars;
-		$percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
-		$search     = array();
-
-		foreach ( (array) $query_vars['search_terms'] as $term ) {
-			$search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
-		}
-
-		if ( ! is_user_logged_in() ) {
-			$search[] = "$wpdb->posts.post_password = ''";
-		}
-
-		$search = ' AND ' . implode( ' AND ', $search );
-
-		return $search;
-	}
-
-	/**
-	 * Query WP for potential publishers, i.e. {@link WP_Post}s which are associated`
-	 * with `wl_entity_type` (taxonomy) terms of `Organization` or `Person`.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param string $filter The title filter.
-	 *
-	 * @return array An array of results in a select2 friendly format.
-	 */
-	public function query( $filter = '' ) {
-
-		// Search for the filter in the titles only.
-		add_filter( 'posts_search', array(
-			$this,
-			'limit_search_to_title',
-		), 10, 2 );
-
-		/*
+    /**
+     * Counts the number of potential publishers.
+     *
+     * @since 3.11.0
+     *
+     * @return int The number of potential publishers.
+     */
+    public function count() {
+
+        // Search for entities which are either a Person
+        // or Organization.
+
+        // Get only the ids as all we need is the count.
+        $entities = get_posts( array(
+            'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+            'post_status'    => 'publish',
+            'posts_per_page' => - 1,
+            'tax_query'      => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => array( 'organization', 'person' ),
+                ),
+            ),
+            'fields'         => 'ids',
+        ) );
+
+        // Finally return the count.
+        return count( $entities );
+    }
+
+    /**
+     * Search SQL filter for matching against post title only.
+     *
+     * @link    http://wordpress.stackexchange.com/a/11826/1685
+     *
+     * @since   3.15.0
+     *
+     * @param   string   $search   The search string.
+     * @param   WP_Query $wp_query The {@link WP_Query} instance.
+     *
+     * @return array|string An array of results.
+     */
+    public function limit_search_to_title( $search, $wp_query ) {
+
+        // Bail out if the search or the `search_terms` haven't been set.
+        if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
+            return $search;
+        }
+
+        global $wpdb;
+
+        $query_vars = $wp_query->query_vars;
+        $percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
+        $search     = array();
+
+        foreach ( (array) $query_vars['search_terms'] as $term ) {
+            $search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
+        }
+
+        if ( ! is_user_logged_in() ) {
+            $search[] = "$wpdb->posts.post_password = ''";
+        }
+
+        $search = ' AND ' . implode( ' AND ', $search );
+
+        return $search;
+    }
+
+    /**
+     * Query WP for potential publishers, i.e. {@link WP_Post}s which are associated`
+     * with `wl_entity_type` (taxonomy) terms of `Organization` or `Person`.
+     *
+     * @since 3.11.0
+     *
+     * @param string $filter The title filter.
+     *
+     * @return array An array of results in a select2 friendly format.
+     */
+    public function query( $filter = '' ) {
+
+        // Search for the filter in the titles only.
+        add_filter( 'posts_search', array(
+            $this,
+            'limit_search_to_title',
+        ), 10, 2 );
+
+        /*
 		 * Search for entities which are either a Person
 		 * or Organization. Sort the results by title in ascending order.
 		 */
-		$entities = get_posts( array(
-			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
-			'tax_query'      => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => array( 'organization', 'person' ),
-				),
-			),
-			's'              => $filter,
-			'orderby'        => 'title',
-			'order'          => 'ASC',
-		) );
-
-		// Remove the search filter added before the query.
-		remove_filter( 'posts_search', array(
-			$this,
-			'limit_search_to_title',
-		), 10, 2 );
-
-		// Set a reference to ourselves to pass to the closure.
-		$publisher_service = $this;
-
-		// Map the results in a `Select2` compatible array.
-		return array_map( function ( $entity ) use ( $publisher_service ) {
-			$type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			$thumb_id = get_post_thumbnail_id( $entity->ID );
-
-			return array(
-				'id'            => $entity->ID,
-				'text'          => $entity->post_title,
-				'type'          => $type[0]->name,
-				'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
-			);
-		}, $entities );
-	}
-
-	/**
-	 * Get the thumbnail's URL.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param int    $attachment_id The attachment id.
-	 * @param string $size          The attachment size (default = 'thumbnail').
-	 *
-	 * @return string|bool The image URL or false if not found.
-	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
-
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
-
-		return isset( $image['0'] ) ? $image['0'] : false;
-	}
+        $entities = get_posts( array(
+            'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+            'post_status'    => 'publish',
+            'posts_per_page' => - 1,
+            'tax_query'      => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => array( 'organization', 'person' ),
+                ),
+            ),
+            's'              => $filter,
+            'orderby'        => 'title',
+            'order'          => 'ASC',
+        ) );
+
+        // Remove the search filter added before the query.
+        remove_filter( 'posts_search', array(
+            $this,
+            'limit_search_to_title',
+        ), 10, 2 );
+
+        // Set a reference to ourselves to pass to the closure.
+        $publisher_service = $this;
+
+        // Map the results in a `Select2` compatible array.
+        return array_map( function ( $entity ) use ( $publisher_service ) {
+            $type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            $thumb_id = get_post_thumbnail_id( $entity->ID );
+
+            return array(
+                'id'            => $entity->ID,
+                'text'          => $entity->post_title,
+                'type'          => $type[0]->name,
+                'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
+            );
+        }, $entities );
+    }
+
+    /**
+     * Get the thumbnail's URL.
+     *
+     * @since 3.11.0
+     *
+     * @param int    $attachment_id The attachment id.
+     * @param string $size          The attachment size (default = 'thumbnail').
+     *
+     * @return string|bool The image URL or false if not found.
+     */
+    public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+
+        $image = wp_get_attachment_image_src( $attachment_id, $size );
+
+        return isset( $image['0'] ) ? $image['0'] : false;
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -31,22 +31,22 @@ 
 		// or Organization.
 
 		// Get only the ids as all we need is the count.
-		$entities = get_posts( array(
+		$entities = get_posts(array(
 			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'tax_query'      => array(
 				array(
 					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 					'field'    => 'slug',
-					'terms'    => array( 'organization', 'person' ),
+					'terms'    => array('organization', 'person'),
 				),
 			),
 			'fields'         => 'ids',
-		) );
+		));
 
 		// Finally return the count.
-		return count( $entities );
+		return count($entities);
 	}
 
 	/**
@@ -61,28 +61,28 @@ 
 	 *
 	 * @return array|string An array of results.
 	 */
-	public function limit_search_to_title( $search, $wp_query ) {
+	public function limit_search_to_title($search, $wp_query) {
 
 		// Bail out if the search or the `search_terms` haven't been set.
-		if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
+		if (empty($search) || empty($wp_query->query_vars['search_terms'])) {
 			return $search;
 		}
 
 		global $wpdb;
 
 		$query_vars = $wp_query->query_vars;
-		$percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
+		$percent    = ! empty($query_vars['exact']) ? '' : '%';
 		$search     = array();
 
-		foreach ( (array) $query_vars['search_terms'] as $term ) {
-			$search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
+		foreach ((array) $query_vars['search_terms'] as $term) {
+			$search[] = $wpdb->prepare("$wpdb->posts.post_title LIKE %s", $percent.$wpdb->esc_like($term).$percent);
 		}
 
-		if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in()) {
 			$search[] = "$wpdb->posts.post_password = ''";
 		}
 
-		$search = ' AND ' . implode( ' AND ', $search );
+		$search = ' AND '.implode(' AND ', $search);
 
 		return $search;
 	}
@@ -97,55 +97,55 @@ 
 	 *
 	 * @return array An array of results in a select2 friendly format.
 	 */
-	public function query( $filter = '' ) {
+	public function query($filter = '') {
 
 		// Search for the filter in the titles only.
-		add_filter( 'posts_search', array(
+		add_filter('posts_search', array(
 			$this,
 			'limit_search_to_title',
-		), 10, 2 );
+		), 10, 2);
 
 		/*
 		 * Search for entities which are either a Person
 		 * or Organization. Sort the results by title in ascending order.
 		 */
-		$entities = get_posts( array(
+		$entities = get_posts(array(
 			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'tax_query'      => array(
 				array(
 					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 					'field'    => 'slug',
-					'terms'    => array( 'organization', 'person' ),
+					'terms'    => array('organization', 'person'),
 				),
 			),
 			's'              => $filter,
 			'orderby'        => 'title',
 			'order'          => 'ASC',
-		) );
+		));
 
 		// Remove the search filter added before the query.
-		remove_filter( 'posts_search', array(
+		remove_filter('posts_search', array(
 			$this,
 			'limit_search_to_title',
-		), 10, 2 );
+		), 10, 2);
 
 		// Set a reference to ourselves to pass to the closure.
 		$publisher_service = $this;
 
 		// Map the results in a `Select2` compatible array.
-		return array_map( function ( $entity ) use ( $publisher_service ) {
-			$type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			$thumb_id = get_post_thumbnail_id( $entity->ID );
+		return array_map(function($entity) use ($publisher_service) {
+			$type     = wp_get_post_terms($entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
+			$thumb_id = get_post_thumbnail_id($entity->ID);
 
 			return array(
 				'id'            => $entity->ID,
 				'text'          => $entity->post_title,
 				'type'          => $type[0]->name,
-				'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
+				'thumbnail_url' => $publisher_service->get_attachment_image_url($thumb_id),
 			);
-		}, $entities );
+		}, $entities);
 	}
 
 	/**
@@ -158,11 +158,11 @@ 
 	 *
 	 * @return string|bool The image URL or false if not found.
 	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+	public function get_attachment_image_url($attachment_id, $size = 'thumbnail') {
 
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
+		$image = wp_get_attachment_image_src($attachment_id, $size);
 
-		return isset( $image['0'] ) ? $image['0'] : false;
+		return isset($image['0']) ? $image['0'] : false;
 	}
 
 }

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

Indentation +114 added lines, -114 removed lines

@@ -17,52 +17,52 @@ 
  */
 class Wordlift_Entity_Page_Service {
 
-	/**
-	 * Set the entity post types as one to be included in archive pages.
-	 *
-	 * In order to have entities show up in standard WP categories (Posts categories)
-	 * we configure the `entity` post type, but we also need to alter the main
-	 * WP query (which by default queries posts only) to include the `entities`.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param WP_Query $query WP's {@link WP_Query} instance.
-	 */
-	public function pre_get_posts( $query ) {
-
-		// Only for the main query, avoid problems with widgets and what not.
-		if ( ! $query->is_main_query() ) {
-			return;
-		}
-
-		// We don't want to alter the query if we're in the admin UI, if this is
-		// not a entity type achieve query, or if the `suppress_filters` is set.
-		//
-		// Note that it is unlikely for `suppress_filter` to be set on the front
-		// end, but let's be safe if it is set the calling code assumes no
-		// modifications of queries.
-
-		// Ignore admin side request, requests for which filters should be
-		// suppressed, and when we are not on a entity type archive page.
-		if ( is_admin() ||
-			 ! is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) ||
-			 ! empty( $query->query_vars['suppress_filters'] )
-		) {
-			return;
-		}
-
-		// Events should be sorted by start date in descending order.
-		if ( is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, 'event' ) ) {
-
-			// Update the query to use the start time meta and desc order.
-			$meta_query[] = array(
-				'key' => Wordlift_Schema_Service::FIELD_DATE_START,
-			);
-			$query->set( 'meta_query', $meta_query );
-			$query->set( 'orderby', 'meta_value' );
-			$query->set( 'order', 'DESC' );
-		} else {
-			/*
+    /**
+     * Set the entity post types as one to be included in archive pages.
+     *
+     * In order to have entities show up in standard WP categories (Posts categories)
+     * we configure the `entity` post type, but we also need to alter the main
+     * WP query (which by default queries posts only) to include the `entities`.
+     *
+     * @since 3.12.0
+     *
+     * @param WP_Query $query WP's {@link WP_Query} instance.
+     */
+    public function pre_get_posts( $query ) {
+
+        // Only for the main query, avoid problems with widgets and what not.
+        if ( ! $query->is_main_query() ) {
+            return;
+        }
+
+        // We don't want to alter the query if we're in the admin UI, if this is
+        // not a entity type achieve query, or if the `suppress_filters` is set.
+        //
+        // Note that it is unlikely for `suppress_filter` to be set on the front
+        // end, but let's be safe if it is set the calling code assumes no
+        // modifications of queries.
+
+        // Ignore admin side request, requests for which filters should be
+        // suppressed, and when we are not on a entity type archive page.
+        if ( is_admin() ||
+             ! is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) ||
+             ! empty( $query->query_vars['suppress_filters'] )
+        ) {
+            return;
+        }
+
+        // Events should be sorted by start date in descending order.
+        if ( is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, 'event' ) ) {
+
+            // Update the query to use the start time meta and desc order.
+            $meta_query[] = array(
+                'key' => Wordlift_Schema_Service::FIELD_DATE_START,
+            );
+            $query->set( 'meta_query', $meta_query );
+            $query->set( 'orderby', 'meta_value' );
+            $query->set( 'order', 'DESC' );
+        } else {
+            /*
 			 * All other entity types should be sorted by their connectivity.
 			 * For this we need to query the relationship table which has
 			 * to be done by manipulating the SQL generated for the query.
@@ -70,73 +70,73 @@ 
 			 * additional filters to handle it.
 			 */
 
-			add_filter( 'posts_join', array( $this, 'posts_join' ) );
-			add_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
-			add_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
-		}
-	}
-
-	/**
-	 * Filter handler that sets the join part of a query to include the
-	 * relationship table to be able to use it in the sorting.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $join_statement The join part of the SQL statement which is used for the query.
-	 *
-	 * @return string An join SQL which add the relationships table to the join.
-	 */
-	public function posts_join( $join_statement ) {
-
-		global $wpdb;
-
-		$join_statement .= " LEFT JOIN {$wpdb->prefix}wl_relation_instances ri "
-						   . " ON (ri.object_id = {$wpdb->posts}.ID)";
-
-		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_join', array( $this, 'posts_join' ) );
-
-		return $join_statement;
-	}
-
-	/**
-	 * Filter handler that sets the groupby part of a query to include the
-	 * relationship table to be able to use it in the sorting.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $groupby_statement The groupby part of the SQL statement which is used for the query.
-	 *
-	 * @return string A groupby SQL which add the relationships table to the join.
-	 */
-	public function posts_groupby( $groupby_statement ) {
-
-		$groupby_statement = 'ri.object_id, ' . $groupby_statement;
-
-		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
-
-		return $groupby_statement;
-	}
-
-	/**
-	 * Filter handler that sets the orderby part of a query to sort by number of
-	 * relationships.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $orderby_statement The orderby part of the SQL statement which is used for the query.
-	 *
-	 * @return string An orderby SQL which sorts by the number of relationships
-	 */
-	public function posts_orderby( $orderby_statement ) {
-
-		$orderby_statement = 'COUNT( ri.object_id ) DESC, ' . $orderby_statement;
-
-		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
-
-		return $orderby_statement;
-	}
+            add_filter( 'posts_join', array( $this, 'posts_join' ) );
+            add_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
+            add_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
+        }
+    }
+
+    /**
+     * Filter handler that sets the join part of a query to include the
+     * relationship table to be able to use it in the sorting.
+     *
+     * @since 3.15.0
+     *
+     * @param string $join_statement The join part of the SQL statement which is used for the query.
+     *
+     * @return string An join SQL which add the relationships table to the join.
+     */
+    public function posts_join( $join_statement ) {
+
+        global $wpdb;
+
+        $join_statement .= " LEFT JOIN {$wpdb->prefix}wl_relation_instances ri "
+                            . " ON (ri.object_id = {$wpdb->posts}.ID)";
+
+        // Remove to make sure it will not run agan in other context.
+        remove_filter( 'posts_join', array( $this, 'posts_join' ) );
+
+        return $join_statement;
+    }
+
+    /**
+     * Filter handler that sets the groupby part of a query to include the
+     * relationship table to be able to use it in the sorting.
+     *
+     * @since 3.15.0
+     *
+     * @param string $groupby_statement The groupby part of the SQL statement which is used for the query.
+     *
+     * @return string A groupby SQL which add the relationships table to the join.
+     */
+    public function posts_groupby( $groupby_statement ) {
+
+        $groupby_statement = 'ri.object_id, ' . $groupby_statement;
+
+        // Remove to make sure it will not run agan in other context.
+        remove_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
+
+        return $groupby_statement;
+    }
+
+    /**
+     * Filter handler that sets the orderby part of a query to sort by number of
+     * relationships.
+     *
+     * @since 3.15.0
+     *
+     * @param string $orderby_statement The orderby part of the SQL statement which is used for the query.
+     *
+     * @return string An orderby SQL which sorts by the number of relationships
+     */
+    public function posts_orderby( $orderby_statement ) {
+
+        $orderby_statement = 'COUNT( ri.object_id ) DESC, ' . $orderby_statement;
+
+        // Remove to make sure it will not run agan in other context.
+        remove_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
+
+        return $orderby_statement;
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -28,10 +28,10 @@ 
 	 *
 	 * @param WP_Query $query WP's {@link WP_Query} instance.
 	 */
-	public function pre_get_posts( $query ) {
+	public function pre_get_posts($query) {
 
 		// Only for the main query, avoid problems with widgets and what not.
-		if ( ! $query->is_main_query() ) {
+		if ( ! $query->is_main_query()) {
 			return;
 		}
 
@@ -44,23 +44,23 @@ 
 
 		// Ignore admin side request, requests for which filters should be
 		// suppressed, and when we are not on a entity type archive page.
-		if ( is_admin() ||
-			 ! is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) ||
-			 ! empty( $query->query_vars['suppress_filters'] )
+		if (is_admin() ||
+			 ! is_tax(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME) ||
+			 ! empty($query->query_vars['suppress_filters'])
 		) {
 			return;
 		}
 
 		// Events should be sorted by start date in descending order.
-		if ( is_tax( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, 'event' ) ) {
+		if (is_tax(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, 'event')) {
 
 			// Update the query to use the start time meta and desc order.
 			$meta_query[] = array(
 				'key' => Wordlift_Schema_Service::FIELD_DATE_START,
 			);
-			$query->set( 'meta_query', $meta_query );
-			$query->set( 'orderby', 'meta_value' );
-			$query->set( 'order', 'DESC' );
+			$query->set('meta_query', $meta_query);
+			$query->set('orderby', 'meta_value');
+			$query->set('order', 'DESC');
 		} else {
 			/*
 			 * All other entity types should be sorted by their connectivity.
@@ -70,9 +70,9 @@ 
 			 * additional filters to handle it.
 			 */
 
-			add_filter( 'posts_join', array( $this, 'posts_join' ) );
-			add_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
-			add_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
+			add_filter('posts_join', array($this, 'posts_join'));
+			add_filter('posts_groupby', array($this, 'posts_groupby'));
+			add_filter('posts_orderby', array($this, 'posts_orderby'));
 		}
 	}
 
@@ -86,7 +86,7 @@ 
 	 *
 	 * @return string An join SQL which add the relationships table to the join.
 	 */
-	public function posts_join( $join_statement ) {
+	public function posts_join($join_statement) {
 
 		global $wpdb;
 
@@ -94,7 +94,7 @@ 
 						   . " ON (ri.object_id = {$wpdb->posts}.ID)";
 
 		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_join', array( $this, 'posts_join' ) );
+		remove_filter('posts_join', array($this, 'posts_join'));
 
 		return $join_statement;
 	}
@@ -109,12 +109,12 @@ 
 	 *
 	 * @return string A groupby SQL which add the relationships table to the join.
 	 */
-	public function posts_groupby( $groupby_statement ) {
+	public function posts_groupby($groupby_statement) {
 
-		$groupby_statement = 'ri.object_id, ' . $groupby_statement;
+		$groupby_statement = 'ri.object_id, '.$groupby_statement;
 
 		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_groupby', array( $this, 'posts_groupby' ) );
+		remove_filter('posts_groupby', array($this, 'posts_groupby'));
 
 		return $groupby_statement;
 	}
@@ -129,12 +129,12 @@ 
 	 *
 	 * @return string An orderby SQL which sorts by the number of relationships
 	 */
-	public function posts_orderby( $orderby_statement ) {
+	public function posts_orderby($orderby_statement) {
 
-		$orderby_statement = 'COUNT( ri.object_id ) DESC, ' . $orderby_statement;
+		$orderby_statement = 'COUNT( ri.object_id ) DESC, '.$orderby_statement;
 
 		// Remove to make sure it will not run agan in other context.
-		remove_filter( 'posts_orderby', array( $this, 'posts_orderby' ) );
+		remove_filter('posts_orderby', array($this, 'posts_orderby'));
 
 		return $orderby_statement;
 	}