insideout10 / wordlift-plugin

src/wordlift.php

Indentation +231 added lines, -231 removed lines

@@ -49,7 +49,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
@@ -72,7 +72,7 @@ 
  */
 function wl_write_log( $log ) {
 
-	Wordlift_Log_Service::get_instance()->debug( $log );
+    Wordlift_Log_Service::get_instance()->debug( $log );
 
 }
 
@@ -89,7 +89,7 @@ 
  */
 function wl_write_log_hide_key( $text ) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+    return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
 }
 
 /**
@@ -97,21 +97,21 @@ 
  * see http://vip.wordpress.com/documentation/register-additional-html-attributes-for-tinymce-and-wp-kses/
  */
 function wordlift_allowed_post_tags() {
-	global $allowedposttags;
-
-	$tags           = array( 'span' );
-	$new_attributes = array(
-		'itemscope' => array(),
-		'itemtype'  => array(),
-		'itemprop'  => array(),
-		'itemid'    => array(),
-	);
-
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
-		}
-	}
+    global $allowedposttags;
+
+    $tags           = array( 'span' );
+    $new_attributes = array(
+        'itemscope' => array(),
+        'itemtype'  => array(),
+        'itemprop'  => array(),
+        'itemid'    => array(),
+    );
+
+    foreach ( $tags as $tag ) {
+        if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
+            $allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+        }
+    }
 }
 
 // add allowed post tags.
@@ -122,18 +122,18 @@ 
  */
 function wordlift_admin_enqueue_scripts() {
 
-	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+    // Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
+    wp_enqueue_script( 'wpdialogs' );
+    wp_enqueue_style( 'wp-jquery-ui-dialog' );
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+    wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
+    wp_enqueue_script( 'jquery-ui-autocomplete' );
 
-	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
-	}
+    // Disable auto-save for custom entity posts only
+    if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
+        wp_dequeue_script( 'autosave' );
+    }
 
 }
 
@@ -149,18 +149,18 @@ 
  */
 function wordlift_allowed_html( $allowedtags, $context ) {
 
-	if ( 'post' !== $context ) {
-		return $allowedtags;
-	}
-
-	return array_merge_recursive( $allowedtags, array(
-		'span' => array(
-			'itemscope' => true,
-			'itemtype'  => true,
-			'itemid'    => true,
-			'itemprop'  => true,
-		),
-	) );
+    if ( 'post' !== $context ) {
+        return $allowedtags;
+    }
+
+    return array_merge_recursive( $allowedtags, array(
+        'span' => array(
+            'itemscope' => true,
+            'itemtype'  => true,
+            'itemid'    => true,
+            'itemprop'  => true,
+        ),
+    ) );
 }
 
 add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
@@ -174,16 +174,16 @@ 
  */
 function wl_get_coordinates( $post_id ) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+    $latitude  = wl_schema_get_value( $post_id, 'latitude' );
+    $longitude = wl_schema_get_value( $post_id, 'longitude' );
 
-	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
-	// place on the globe:"The zero/zero point of this system is located in the
-	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
-	);
+    // DO NOT set latitude/longitude to 0/0 as default values. It's a specific
+    // place on the globe:"The zero/zero point of this system is located in the
+    // Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
+    return array(
+        'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
+        'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+    );
 }
 
 /**
@@ -197,9 +197,9 @@ 
  */
 function wl_get_image_urls( $post_id ) {
 
-	return Wordlift_Storage_Factory::get_instance()
-	                               ->post_images()
-	                               ->get( $post_id );
+    return Wordlift_Storage_Factory::get_instance()
+                                    ->post_images()
+                                    ->get( $post_id );
 
 }
 
@@ -213,24 +213,24 @@ 
  */
 function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
 
-	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
+    // wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
-		'post_type'      => 'attachment',
-		'posts_per_page' => 1,
-		'post_status'    => 'any',
-		'post_parent'    => $parent_post_id,
-		'meta_key'       => 'wl_source_url',
-		'meta_value'     => $source_url,
-	) );
+    $posts = get_posts( array(
+        'post_type'      => 'attachment',
+        'posts_per_page' => 1,
+        'post_status'    => 'any',
+        'post_parent'    => $parent_post_id,
+        'meta_key'       => 'wl_source_url',
+        'meta_value'     => $source_url,
+    ) );
 
-	// Return the found post.
-	if ( 1 === count( $posts ) ) {
-		return $posts[0];
-	}
+    // Return the found post.
+    if ( 1 === count( $posts ) ) {
+        return $posts[0];
+    }
 
-	// Return null.
-	return null;
+    // Return null.
+    return null;
 }
 
 /**
@@ -241,8 +241,8 @@ 
  */
 function wl_set_source_url( $post_id, $source_url ) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+    delete_post_meta( $post_id, 'wl_source_url' );
+    add_post_meta( $post_id, 'wl_source_url', $source_url );
 }
 
 /**
@@ -259,7 +259,7 @@ 
  */
 function wl_sanitize_uri_path( $path, $char = '_' ) {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+    return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
 }
 
 /**
@@ -271,47 +271,47 @@ 
  */
 function wl_replace_item_id_with_uri( $content ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
-	$log->trace( 'Replacing item IDs with URIs...' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
+    $log->trace( 'Replacing item IDs with URIs...' );
 
-	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+    // Strip slashes, see https://core.trac.wordpress.org/ticket/21767
+    $content = stripslashes( $content );
 
-	// If any match are found.
-	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+    // If any match are found.
+    $matches = array();
+    if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
 
-		foreach ( $matches as $match ) {
+        foreach ( $matches as $match ) {
 
-			// Get the item ID.
-			$item_id = $match[1];
+            // Get the item ID.
+            $item_id = $match[1];
 
-			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+            // Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
+            $post = Wordlift_Entity_Service::get_instance()
+                                            ->get_entity_post_by_uri( $item_id );
 
-			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
-				continue;
-			}
+            // If no entity is found, continue to the next one.
+            if ( null === $post ) {
+                continue;
+            }
 
-			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+            // Get the URI for that post.
+            $uri = wl_get_entity_uri( $post->ID );
 
-			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
+            // wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
-			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( ! empty( $uri ) && $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
-			}
-		}
-	}
+            // If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
+            if ( ! empty( $uri ) && $item_id !== $uri ) {
+                $uri_e   = esc_html( $uri );
+                $content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+            }
+        }
+    }
 
-	// Reapply slashes.
-	$content = addslashes( $content );
+    // Reapply slashes.
+    $content = addslashes( $content );
 
-	return $content;
+    return $content;
 }
 
 add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
@@ -374,29 +374,29 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
-
-	$log->info( 'Activating WordLift...' );
-
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
-	Wordlift_Activator::activate();
-
-	/**
-	 * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
-	 * @since 3.19.2
-	 */
-	Wordlift_Http_Api::activate();
-
-	// Ensure the post type is registered before flushing the rewrite rules.
-	Wordlift_Entity_Post_Type_Service::get_instance()->register();
-	flush_rewrite_rules();
-	/**
-	 * @since 3.27.7
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-	 */
-	Top_Entities::activate();
+    $log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+
+    $log->info( 'Activating WordLift...' );
+
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+    Wordlift_Activator::activate();
+
+    /**
+     * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
+     * @since 3.19.2
+     */
+    Wordlift_Http_Api::activate();
+
+    // Ensure the post type is registered before flushing the rewrite rules.
+    Wordlift_Entity_Post_Type_Service::get_instance()->register();
+    flush_rewrite_rules();
+    /**
+     * @since 3.27.7
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+     */
+    Top_Entities::activate();
 }
 
 /**
@@ -405,16 +405,16 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
-	Wordlift_Http_Api::deactivate();
-	Ttl_Cache_Cleaner::deactivate();
-	/**
-	 * @since 3.27.7
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1214
-	 */
-	Top_Entities::deactivate();
-	flush_rewrite_rules();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
+    Wordlift_Http_Api::deactivate();
+    Ttl_Cache_Cleaner::deactivate();
+    /**
+     * @since 3.27.7
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1214
+     */
+    Top_Entities::deactivate();
+    flush_rewrite_rules();
 
 }
 
@@ -437,98 +437,98 @@ 
  * @since    1.0.0
  */
 function run_wordlift() {
-	/**
-	 * Filter: wl_feature__enable__widgets.
-	 *
-	 * @param bool whether the widgets needed to be registered, defaults to true.
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
-	}
-	add_filter( 'widget_text', 'do_shortcode' );
-
-
-	/**
-	 * Filter: wl_feature__enable__analysis
-	 *
-	 * @param bool Whether to send api request to analysis or not
-	 *
-	 * @return bool
-	 * @since 3.27.6
-	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
-	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
-	}
-
-	/*
+    /**
+     * Filter: wl_feature__enable__widgets.
+     *
+     * @param bool whether the widgets needed to be registered, defaults to true.
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
+        add_action( 'widgets_init', 'wl_register_chord_widget' );
+        add_action( 'widgets_init', 'wl_register_geo_widget' );
+        add_action( 'widgets_init', 'wl_register_timeline_widget' );
+    }
+    add_filter( 'widget_text', 'do_shortcode' );
+
+
+    /**
+     * Filter: wl_feature__enable__analysis
+     *
+     * @param bool Whether to send api request to analysis or not
+     *
+     * @return bool
+     * @since 3.27.6
+     */
+    if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+    } else {
+        add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+    }
+
+    /*
 	 * We introduce the WordLift autoloader, since we start using classes in namespaces, i.e. Wordlift\Http.
 	 *
 	 * @since 3.21.2
 	 */
-	wordlift_plugin_autoload_register();
+    wordlift_plugin_autoload_register();
 
-	$plugin = new Wordlift();
-	$plugin->run();
+    $plugin = new Wordlift();
+    $plugin->run();
 
-	// Initialize the TTL Cache Cleaner.
-	new Ttl_Cache_Cleaner();
+    // Initialize the TTL Cache Cleaner.
+    new Ttl_Cache_Cleaner();
 
-	// Load the new Post Adapter.
-	new Post_Adapter();
+    // Load the new Post Adapter.
+    new Post_Adapter();
 
-	// Load the API Data Hooks.
-	new Api_Data_Hooks();
+    // Load the API Data Hooks.
+    new Api_Data_Hooks();
 
-	add_action( 'plugins_loaded', function () use ( $plugin ) {
-		// Load early. **PLEASE NOTE** that features are applied only to calls that happen **AFTER** the `plugins_loaded`
-		// action.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/features/index.php';
+    add_action( 'plugins_loaded', function () use ( $plugin ) {
+        // Load early. **PLEASE NOTE** that features are applied only to calls that happen **AFTER** the `plugins_loaded`
+        // action.
+        require_once plugin_dir_path( __FILE__ ) . 'wordlift/features/index.php';
 
-		// Licenses Images.
-		$user_agent                   = User_Agent::get_user_agent();
-		$wordlift_key                 = Wordlift_Configuration_Service::get_instance()->get_key();
-		$api_service                  = new Default_Api_Service( apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ), 60, $user_agent, $wordlift_key );
-		$image_license_factory        = new Image_License_Factory();
-		$image_license_service        = new Image_License_Service( $api_service, $image_license_factory );
-		$image_license_cache          = new Ttl_Cache( 'image-license', 86400 * 30 ); // 30 days.
-		$cached_image_license_service = new Cached_Image_License_Service( $image_license_service, $image_license_cache );
+        // Licenses Images.
+        $user_agent                   = User_Agent::get_user_agent();
+        $wordlift_key                 = Wordlift_Configuration_Service::get_instance()->get_key();
+        $api_service                  = new Default_Api_Service( apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ), 60, $user_agent, $wordlift_key );
+        $image_license_factory        = new Image_License_Factory();
+        $image_license_service        = new Image_License_Service( $api_service, $image_license_factory );
+        $image_license_cache          = new Ttl_Cache( 'image-license', 86400 * 30 ); // 30 days.
+        $cached_image_license_service = new Cached_Image_License_Service( $image_license_service, $image_license_cache );
 
-		$image_license_scheduler       = new Image_License_Scheduler( $image_license_service, $image_license_cache );
-		$image_license_cleanup_service = new Image_License_Cleanup_Service();
+        $image_license_scheduler       = new Image_License_Scheduler( $image_license_service, $image_license_cache );
+        $image_license_cleanup_service = new Image_License_Cleanup_Service();
 
-		// Get the cached data. If we have cached data, we load the notifier.
-		$image_license_data = $image_license_cache->get( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES );
-		if ( null !== $image_license_data ) {
-			$image_license_page = new Image_License_Page( $image_license_data, Wordlift::get_instance()->get_version() );
-			new Image_License_Notifier( $image_license_data, $image_license_page );
-		}
+        // Get the cached data. If we have cached data, we load the notifier.
+        $image_license_data = $image_license_cache->get( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES );
+        if ( null !== $image_license_data ) {
+            $image_license_page = new Image_License_Page( $image_license_data, Wordlift::get_instance()->get_version() );
+            new Image_License_Notifier( $image_license_data, $image_license_page );
+        }
 
-		$remove_all_images_task         = new Remove_All_Images_Task( $cached_image_license_service );
-		$remove_all_images_task_adapter = new Task_Ajax_Adapter( $remove_all_images_task );
+        $remove_all_images_task         = new Remove_All_Images_Task( $cached_image_license_service );
+        $remove_all_images_task_adapter = new Task_Ajax_Adapter( $remove_all_images_task );
 
-		$reload_data_task         = new Reload_Data_Task();
-		$reload_data_task_adapter = new Task_Ajax_Adapter( $reload_data_task );
+        $reload_data_task         = new Reload_Data_Task();
+        $reload_data_task_adapter = new Task_Ajax_Adapter( $reload_data_task );
 
-		$add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task( $cached_image_license_service );
-		$add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter( $add_license_caption_or_remove_task );
+        $add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task( $cached_image_license_service );
+        $add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter( $add_license_caption_or_remove_task );
 
-		$remove_all_images_task_page             = new Remove_All_Images_Page( new Task_Ajax_Adapters_Registry( $remove_all_images_task_adapter ), $plugin->get_version() );
-		$reload_data_task_page                   = new Reload_Data_Page( new Task_Ajax_Adapters_Registry( $reload_data_task_adapter ), $plugin->get_version() );
-		$add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page( new Task_Ajax_Adapters_Registry( $add_license_caption_or_remove_task_adapter ), $plugin->get_version() );
+        $remove_all_images_task_page             = new Remove_All_Images_Page( new Task_Ajax_Adapters_Registry( $remove_all_images_task_adapter ), $plugin->get_version() );
+        $reload_data_task_page                   = new Reload_Data_Page( new Task_Ajax_Adapters_Registry( $reload_data_task_adapter ), $plugin->get_version() );
+        $add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page( new Task_Ajax_Adapters_Registry( $add_license_caption_or_remove_task_adapter ), $plugin->get_version() );
 
-		new Wordlift_Products_Navigator_Shortcode_REST();
+        new Wordlift_Products_Navigator_Shortcode_REST();
 
-		// Register the Dataset module, requires `$api_service`.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
+        // Register the Dataset module, requires `$api_service`.
+        require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
 
-	} );
+    } );
 
 }
 
@@ -542,45 +542,45 @@ 
  */
 function wordlift_plugin_autoload_register() {
 
-	spl_autoload_register( function ( $class_name ) {
+    spl_autoload_register( function ( $class_name ) {
 
-		// Bail out if these are not our classes.
-		if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
-			return false;
-		}
+        // Bail out if these are not our classes.
+        if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+            return false;
+        }
 
-		$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+        $class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
 
-		preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+        preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
 
-		$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-		$file = 'class-' . $matches[2] . '.php';
+        $path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
+        $file = 'class-' . $matches[2] . '.php';
 
-		$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+        $full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
 
-		if ( ! file_exists( $full_path ) ) {
-			echo( "Class $class_name not found at $full_path." );
+        if ( ! file_exists( $full_path ) ) {
+            echo( "Class $class_name not found at $full_path." );
 
-			return false;
-		}
+            return false;
+        }
 
-		require_once $full_path;
+        require_once $full_path;
 
-		return true;
-	} );
+        return true;
+    } );
 
 }
 
 function wl_block_categories( $categories, $post ) {
-	return array_merge(
-		$categories,
-		array(
-			array(
-				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
-			),
-		)
-	);
+    return array_merge(
+        $categories,
+        array(
+            array(
+                'slug'  => 'wordlift',
+                'title' => __( 'WordLift', 'wordlift' ),
+            ),
+        )
+    );
 }
 
 add_filter( 'block_categories', 'wl_block_categories', 10, 2 );

Spacing +128 added lines, -128 removed lines

@@ -48,17 +48,17 @@ 
 use Wordlift\Tasks\Task_Ajax_Adapters_Registry;
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
-require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
+require_once plugin_dir_path(__FILE__).'vendor/autoload.php';
 
 // Include WordLift constants.
-require_once( 'wordlift_constants.php' );
+require_once('wordlift_constants.php');
 
 // Load modules.
-require_once( 'modules/core/wordlift_core.php' );
+require_once('modules/core/wordlift_core.php');
 
 /**
  * Log to the debug.log file.
@@ -70,9 +70,9 @@ 
  * @deprecated use Wordlift_Log_Service::get_instance()->info( $log );
  *
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	Wordlift_Log_Service::get_instance()->debug( $log );
+	Wordlift_Log_Service::get_instance()->debug($log);
 
 }
 
@@ -87,9 +87,9 @@ 
  * @since 3.0.0
  *
  */
-function wl_write_log_hide_key( $text ) {
+function wl_write_log_hide_key($text) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+	return str_ireplace(wl_configuration_get_key(), '<hidden>', $text);
 }
 
 /**
@@ -99,7 +99,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -107,15 +107,15 @@ 
 		'itemid'    => array(),
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
 
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 /**
  * Register additional scripts for the admin UI.
@@ -123,21 +123,21 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
+	wp_enqueue_script('jquery-ui-autocomplete');
 
 	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
+	if (Wordlift_Entity_Service::TYPE_NAME === get_post_type()) {
+		wp_dequeue_script('autosave');
 	}
 
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 /**
  * Hooked to *wp_kses_allowed_html* filter, adds microdata attributes.
@@ -147,23 +147,23 @@ 
  *
  * @return array An array which contains allowed microdata attributes.
  */
-function wordlift_allowed_html( $allowedtags, $context ) {
+function wordlift_allowed_html($allowedtags, $context) {
 
-	if ( 'post' !== $context ) {
+	if ('post' !== $context) {
 		return $allowedtags;
 	}
 
-	return array_merge_recursive( $allowedtags, array(
+	return array_merge_recursive($allowedtags, array(
 		'span' => array(
 			'itemscope' => true,
 			'itemtype'  => true,
 			'itemid'    => true,
 			'itemprop'  => true,
 		),
-	) );
+	));
 }
 
-add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
+add_filter('wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2);
 
 /**
  * Get the coordinates for the specified post ID.
@@ -172,17 +172,17 @@ 
  *
  * @return array|null An array of coordinates or null.
  */
-function wl_get_coordinates( $post_id ) {
+function wl_get_coordinates($post_id) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+	$latitude  = wl_schema_get_value($post_id, 'latitude');
+	$longitude = wl_schema_get_value($post_id, 'longitude');
 
 	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
 	// place on the globe:"The zero/zero point of this system is located in the
 	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
 	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+		'latitude'  => isset($latitude[0]) && is_numeric($latitude[0]) ? $latitude[0] : '',
+		'longitude' => isset($longitude[0]) && is_numeric($longitude[0]) ? $longitude[0] : '',
 	);
 }
 
@@ -195,11 +195,11 @@ 
  * @deprecated use Wordlift_Storage_Factory::get_instance()->post_images()->get( $post_id )
  *
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 	return Wordlift_Storage_Factory::get_instance()
 	                               ->post_images()
-	                               ->get( $post_id );
+	                               ->get($post_id);
 
 }
 
@@ -211,21 +211,21 @@ 
  *
  * @return WP_Post|null A post instance or null if not found.
  */
-function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
+function wl_get_attachment_for_source_url($parent_post_id, $source_url) {
 
 	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'attachment',
 		'posts_per_page' => 1,
 		'post_status'    => 'any',
 		'post_parent'    => $parent_post_id,
 		'meta_key'       => 'wl_source_url',
 		'meta_value'     => $source_url,
-	) );
+	));
 
 	// Return the found post.
-	if ( 1 === count( $posts ) ) {
+	if (1 === count($posts)) {
 		return $posts[0];
 	}
 
@@ -239,10 +239,10 @@ 
  * @param int $post_id The post ID.
  * @param string $source_url The source URL.
  */
-function wl_set_source_url( $post_id, $source_url ) {
+function wl_set_source_url($post_id, $source_url) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+	delete_post_meta($post_id, 'wl_source_url');
+	add_post_meta($post_id, 'wl_source_url', $source_url);
 }
 
 /**
@@ -257,9 +257,9 @@ 
  * @see        https://codex.wordpress.org/Function_Reference/sanitize_title
  *
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+	return Wordlift_Uri_Service::get_instance()->sanitize_path($path, $char);
 }
 
 /**
@@ -269,104 +269,104 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
-	$log->trace( 'Replacing item IDs with URIs...' );
+	$log = Wordlift_Log_Service::get_logger('wl_replace_item_id_with_uri');
+	$log->trace('Replacing item IDs with URIs...');
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
 			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+			                               ->get_entity_post_by_uri($item_id);
 
 			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( ! empty( $uri ) && $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ( ! empty($uri) && $item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
+require_once('wordlift_entity_type.php');
 
 // add callbacks on post save to notify data changes from wp to redlink triple store
-require_once( 'wordlift_to_redlink_data_push_callbacks.php' );
+require_once('wordlift_to_redlink_data_push_callbacks.php');
 
-require_once( 'modules/configuration/wordlift_configuration_settings.php' );
+require_once('modules/configuration/wordlift_configuration_settings.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/prefixes/wordlift_prefixes.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
 
 // Shortcodes
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/class-wordlift-shortcode-rest.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
-require_once( 'shortcodes/class-wordlift-products-navigator-shortcode-rest.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/class-wordlift-shortcode-rest.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
+require_once('shortcodes/class-wordlift-products-navigator-shortcode-rest.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/class-wordlift-chord-widget.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/class-wordlift-chord-widget.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_redlink.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');
 
 /**
  * The code that runs during plugin activation.
@@ -374,11 +374,11 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+	$log = Wordlift_Log_Service::get_logger('activate_wordlift');
 
-	$log->info( 'Activating WordLift...' );
+	$log->info('Activating WordLift...');
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 
 	/**
@@ -405,7 +405,7 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 	Wordlift_Http_Api::deactivate();
 	Ttl_Cache_Cleaner::deactivate();
@@ -418,14 +418,14 @@ 
 
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.
@@ -445,12 +445,12 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__widgets', true ) ) {
-		add_action( 'widgets_init', 'wl_register_chord_widget' );
-		add_action( 'widgets_init', 'wl_register_geo_widget' );
-		add_action( 'widgets_init', 'wl_register_timeline_widget' );
+	if (apply_filters('wl_feature__enable__widgets', true)) {
+		add_action('widgets_init', 'wl_register_chord_widget');
+		add_action('widgets_init', 'wl_register_geo_widget');
+		add_action('widgets_init', 'wl_register_timeline_widget');
 	}
-	add_filter( 'widget_text', 'do_shortcode' );
+	add_filter('widget_text', 'do_shortcode');
 
 
 	/**
@@ -461,10 +461,10 @@ 
 	 * @return bool
 	 * @since 3.27.6
 	 */
-	if ( apply_filters( 'wl_feature__enable__analysis', true ) ) {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+	if (apply_filters('wl_feature__enable__analysis', true)) {
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_action');
 	} else {
-		add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action' );
+		add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_disabled_action');
 	}
 
 	/*
@@ -486,47 +486,47 @@ 
 	// Load the API Data Hooks.
 	new Api_Data_Hooks();
 
-	add_action( 'plugins_loaded', function () use ( $plugin ) {
+	add_action('plugins_loaded', function() use ($plugin) {
 		// Load early. **PLEASE NOTE** that features are applied only to calls that happen **AFTER** the `plugins_loaded`
 		// action.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/features/index.php';
+		require_once plugin_dir_path(__FILE__).'wordlift/features/index.php';
 
 		// Licenses Images.
 		$user_agent                   = User_Agent::get_user_agent();
 		$wordlift_key                 = Wordlift_Configuration_Service::get_instance()->get_key();
-		$api_service                  = new Default_Api_Service( apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ), 60, $user_agent, $wordlift_key );
+		$api_service                  = new Default_Api_Service(apply_filters('wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE), 60, $user_agent, $wordlift_key);
 		$image_license_factory        = new Image_License_Factory();
-		$image_license_service        = new Image_License_Service( $api_service, $image_license_factory );
-		$image_license_cache          = new Ttl_Cache( 'image-license', 86400 * 30 ); // 30 days.
-		$cached_image_license_service = new Cached_Image_License_Service( $image_license_service, $image_license_cache );
+		$image_license_service        = new Image_License_Service($api_service, $image_license_factory);
+		$image_license_cache          = new Ttl_Cache('image-license', 86400 * 30); // 30 days.
+		$cached_image_license_service = new Cached_Image_License_Service($image_license_service, $image_license_cache);
 
-		$image_license_scheduler       = new Image_License_Scheduler( $image_license_service, $image_license_cache );
+		$image_license_scheduler       = new Image_License_Scheduler($image_license_service, $image_license_cache);
 		$image_license_cleanup_service = new Image_License_Cleanup_Service();
 
 		// Get the cached data. If we have cached data, we load the notifier.
-		$image_license_data = $image_license_cache->get( Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES );
-		if ( null !== $image_license_data ) {
-			$image_license_page = new Image_License_Page( $image_license_data, Wordlift::get_instance()->get_version() );
-			new Image_License_Notifier( $image_license_data, $image_license_page );
+		$image_license_data = $image_license_cache->get(Cached_Image_License_Service::GET_NON_PUBLIC_DOMAIN_IMAGES);
+		if (null !== $image_license_data) {
+			$image_license_page = new Image_License_Page($image_license_data, Wordlift::get_instance()->get_version());
+			new Image_License_Notifier($image_license_data, $image_license_page);
 		}
 
-		$remove_all_images_task         = new Remove_All_Images_Task( $cached_image_license_service );
-		$remove_all_images_task_adapter = new Task_Ajax_Adapter( $remove_all_images_task );
+		$remove_all_images_task         = new Remove_All_Images_Task($cached_image_license_service);
+		$remove_all_images_task_adapter = new Task_Ajax_Adapter($remove_all_images_task);
 
 		$reload_data_task         = new Reload_Data_Task();
-		$reload_data_task_adapter = new Task_Ajax_Adapter( $reload_data_task );
+		$reload_data_task_adapter = new Task_Ajax_Adapter($reload_data_task);
 
-		$add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task( $cached_image_license_service );
-		$add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter( $add_license_caption_or_remove_task );
+		$add_license_caption_or_remove_task         = new Add_License_Caption_Or_Remove_Task($cached_image_license_service);
+		$add_license_caption_or_remove_task_adapter = new Task_Ajax_Adapter($add_license_caption_or_remove_task);
 
-		$remove_all_images_task_page             = new Remove_All_Images_Page( new Task_Ajax_Adapters_Registry( $remove_all_images_task_adapter ), $plugin->get_version() );
-		$reload_data_task_page                   = new Reload_Data_Page( new Task_Ajax_Adapters_Registry( $reload_data_task_adapter ), $plugin->get_version() );
-		$add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page( new Task_Ajax_Adapters_Registry( $add_license_caption_or_remove_task_adapter ), $plugin->get_version() );
+		$remove_all_images_task_page             = new Remove_All_Images_Page(new Task_Ajax_Adapters_Registry($remove_all_images_task_adapter), $plugin->get_version());
+		$reload_data_task_page                   = new Reload_Data_Page(new Task_Ajax_Adapters_Registry($reload_data_task_adapter), $plugin->get_version());
+		$add_license_caption_or_remove_task_page = new Add_License_Caption_Or_Remove_Page(new Task_Ajax_Adapters_Registry($add_license_caption_or_remove_task_adapter), $plugin->get_version());
 
 		new Wordlift_Products_Navigator_Shortcode_REST();
 
 		// Register the Dataset module, requires `$api_service`.
-		require_once plugin_dir_path( __FILE__ ) . 'wordlift/dataset/index.php';
+		require_once plugin_dir_path(__FILE__).'wordlift/dataset/index.php';
 
 	} );
 
@@ -542,24 +542,24 @@ 
  */
 function wordlift_plugin_autoload_register() {
 
-	spl_autoload_register( function ( $class_name ) {
+	spl_autoload_register(function($class_name) {
 
 		// Bail out if these are not our classes.
-		if ( 0 !== strpos( $class_name, 'Wordlift\\' ) ) {
+		if (0 !== strpos($class_name, 'Wordlift\\')) {
 			return false;
 		}
 
-		$class_name_lc = strtolower( str_replace( '_', '-', $class_name ) );
+		$class_name_lc = strtolower(str_replace('_', '-', $class_name));
 
-		preg_match( '|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches );
+		preg_match('|^(?:(.*)\\\\)?(.+?)$|', $class_name_lc, $matches);
 
-		$path = str_replace( '\\', DIRECTORY_SEPARATOR, $matches[1] );
-		$file = 'class-' . $matches[2] . '.php';
+		$path = str_replace('\\', DIRECTORY_SEPARATOR, $matches[1]);
+		$file = 'class-'.$matches[2].'.php';
 
-		$full_path = plugin_dir_path( __FILE__ ) . $path . DIRECTORY_SEPARATOR . $file;
+		$full_path = plugin_dir_path(__FILE__).$path.DIRECTORY_SEPARATOR.$file;
 
-		if ( ! file_exists( $full_path ) ) {
-			echo( "Class $class_name not found at $full_path." );
+		if ( ! file_exists($full_path)) {
+			echo("Class $class_name not found at $full_path.");
 
 			return false;
 		}
@@ -571,16 +571,16 @@ 
 
 }
 
-function wl_block_categories( $categories, $post ) {
+function wl_block_categories($categories, $post) {
 	return array_merge(
 		$categories,
 		array(
 			array(
 				'slug'  => 'wordlift',
-				'title' => __( 'WordLift', 'wordlift' ),
+				'title' => __('WordLift', 'wordlift'),
 			),
 		)
 	);
 }
 
-add_filter( 'block_categories', 'wl_block_categories', 10, 2 );
+add_filter('block_categories', 'wl_block_categories', 10, 2);

src/includes/class-wordlift-languages.php

Indentation +282 added lines, -282 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,295 +21,295 @@ 
  */
 class Wordlift_Languages {
 
-	/**
-	 * An array that will contain language codes => language names pairs. It gets lazily loaded the first time by the
-	 * `get_languages` function.
-	 *
-	 * @since 3.9.0
-	 * @var array|null An array of language codes => language names pairs or NULL if not initialized yet.
-	 */
-	private static $languages = null;
+    /**
+     * An array that will contain language codes => language names pairs. It gets lazily loaded the first time by the
+     * `get_languages` function.
+     *
+     * @since 3.9.0
+     * @var array|null An array of language codes => language names pairs or NULL if not initialized yet.
+     */
+    private static $languages = null;
 
-	/**
-	 * The list of supported language codes.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @var array An array of language codes.
-	 */
-	private static $codes = array(
-		'ar',
-		'be',
-		'bg',
-		'ca',
-		'cs',
-		'da',
-		'de',
-		'el',
-		'en',
-		'es',
-		'et',
-		'fi',
-		'fr',
-		'he',
-		'hr',
-		'hu',
-		'id',
-		'is',
-		'it',
-		'lt',
-		'lv',
-		'nl',
-		'no',
-		'pl',
-		'pt',
-		'ro',
-		'ru',
-		'sk',
-		'sl',
-		'sq',
-		'sr',
-		'sv',
-		'tr',
-		'uk',
-		'zh-cn',
-	);
+    /**
+     * The list of supported language codes.
+     *
+     * @since 3.9.0
+     *
+     * @var array An array of language codes.
+     */
+    private static $codes = array(
+        'ar',
+        'be',
+        'bg',
+        'ca',
+        'cs',
+        'da',
+        'de',
+        'el',
+        'en',
+        'es',
+        'et',
+        'fi',
+        'fr',
+        'he',
+        'hr',
+        'hu',
+        'id',
+        'is',
+        'it',
+        'lt',
+        'lv',
+        'nl',
+        'no',
+        'pl',
+        'pt',
+        'ro',
+        'ru',
+        'sk',
+        'sl',
+        'sq',
+        'sr',
+        'sv',
+        'tr',
+        'uk',
+        'zh-cn',
+    );
 
-	/**
-	 * Get the list of WordLift's supported languages in an array with language code => language name pairs.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return array An array with language code => language name pairs.
-	 */
-	public static function get_languages() {
+    /**
+     * Get the list of WordLift's supported languages in an array with language code => language name pairs.
+     *
+     * @since 3.9.0
+     *
+     * @return array An array with language code => language name pairs.
+     */
+    public static function get_languages() {
 
-		// Lazily load the languages.
-		if ( null === self::$languages ) {
+        // Lazily load the languages.
+        if ( null === self::$languages ) {
 
-			// Get the language names from WP's own (multisite) function.
-			foreach ( self::$codes as $key ) {
-				self::$languages[ $key ] = self::format_code_lang( $key );
-			}
+            // Get the language names from WP's own (multisite) function.
+            foreach ( self::$codes as $key ) {
+                self::$languages[ $key ] = self::format_code_lang( $key );
+            }
 
-			// Sort by language name.
-			asort( self::$languages );
-		}
+            // Sort by language name.
+            asort( self::$languages );
+        }
 
-		return self::$languages;
-	}
+        return self::$languages;
+    }
 
-	/**
-	 * Returns the language for a language code. This function is a clone of WP's function provided in `ms.php`.
-	 *
-	 * @since 3.9.3
-	 *
-	 * @param string $code Optional. The two-letter language code. Default empty.
-	 *
-	 * @return string The language corresponding to $code if it exists. If it does not exist,
-	 *                then the first two letters of $code is returned.
-	 */
-	private static function format_code_lang( $code = '' ) {
-		$code       = strtolower( substr( $code, 0, 2 ) );
-		$lang_codes = array(
-			'aa' => 'Afar',
-			'ab' => 'Abkhazian',
-			'af' => 'Afrikaans',
-			'ak' => 'Akan',
-			'sq' => 'Albanian',
-			'am' => 'Amharic',
-			'ar' => 'Arabic',
-			'an' => 'Aragonese',
-			'hy' => 'Armenian',
-			'as' => 'Assamese',
-			'av' => 'Avaric',
-			'ae' => 'Avestan',
-			'ay' => 'Aymara',
-			'az' => 'Azerbaijani',
-			'ba' => 'Bashkir',
-			'bm' => 'Bambara',
-			'eu' => 'Basque',
-			'be' => 'Belarusian',
-			'bn' => 'Bengali',
-			'bh' => 'Bihari',
-			'bi' => 'Bislama',
-			'bs' => 'Bosnian',
-			'br' => 'Breton',
-			'bg' => 'Bulgarian',
-			'my' => 'Burmese',
-			'ca' => 'Catalan; Valencian',
-			'ch' => 'Chamorro',
-			'ce' => 'Chechen',
-			'zh' => 'Chinese',
-			'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic',
-			'cv' => 'Chuvash',
-			'kw' => 'Cornish',
-			'co' => 'Corsican',
-			'cr' => 'Cree',
-			'cs' => 'Czech',
-			'da' => 'Danish',
-			'dv' => 'Divehi; Dhivehi; Maldivian',
-			'nl' => 'Dutch; Flemish',
-			'dz' => 'Dzongkha',
-			'en' => 'English',
-			'eo' => 'Esperanto',
-			'et' => 'Estonian',
-			'ee' => 'Ewe',
-			'fo' => 'Faroese',
-			'fj' => 'Fijjian',
-			'fi' => 'Finnish',
-			'fr' => 'French',
-			'fy' => 'Western Frisian',
-			'ff' => 'Fulah',
-			'ka' => 'Georgian',
-			'de' => 'German',
-			'gd' => 'Gaelic; Scottish Gaelic',
-			'ga' => 'Irish',
-			'gl' => 'Galician',
-			'gv' => 'Manx',
-			'el' => 'Greek, Modern',
-			'gn' => 'Guarani',
-			'gu' => 'Gujarati',
-			'ht' => 'Haitian; Haitian Creole',
-			'ha' => 'Hausa',
-			'he' => 'Hebrew',
-			'hz' => 'Herero',
-			'hi' => 'Hindi',
-			'ho' => 'Hiri Motu',
-			'hu' => 'Hungarian',
-			'ig' => 'Igbo',
-			'is' => 'Icelandic',
-			'io' => 'Ido',
-			'ii' => 'Sichuan Yi',
-			'iu' => 'Inuktitut',
-			'ie' => 'Interlingue',
-			'ia' => 'Interlingua (International Auxiliary Language Association)',
-			'id' => 'Indonesian',
-			'ik' => 'Inupiaq',
-			'it' => 'Italian',
-			'jv' => 'Javanese',
-			'ja' => 'Japanese',
-			'kl' => 'Kalaallisut; Greenlandic',
-			'kn' => 'Kannada',
-			'ks' => 'Kashmiri',
-			'kr' => 'Kanuri',
-			'kk' => 'Kazakh',
-			'km' => 'Central Khmer',
-			'ki' => 'Kikuyu; Gikuyu',
-			'rw' => 'Kinyarwanda',
-			'ky' => 'Kirghiz; Kyrgyz',
-			'kv' => 'Komi',
-			'kg' => 'Kongo',
-			'ko' => 'Korean',
-			'kj' => 'Kuanyama; Kwanyama',
-			'ku' => 'Kurdish',
-			'lo' => 'Lao',
-			'la' => 'Latin',
-			'lv' => 'Latvian',
-			'li' => 'Limburgan; Limburger; Limburgish',
-			'ln' => 'Lingala',
-			'lt' => 'Lithuanian',
-			'lb' => 'Luxembourgish; Letzeburgesch',
-			'lu' => 'Luba-Katanga',
-			'lg' => 'Ganda',
-			'mk' => 'Macedonian',
-			'mh' => 'Marshallese',
-			'ml' => 'Malayalam',
-			'mi' => 'Maori',
-			'mr' => 'Marathi',
-			'ms' => 'Malay',
-			'mg' => 'Malagasy',
-			'mt' => 'Maltese',
-			'mo' => 'Moldavian',
-			'mn' => 'Mongolian',
-			'na' => 'Nauru',
-			'nv' => 'Navajo; Navaho',
-			'nr' => 'Ndebele, South; South Ndebele',
-			'nd' => 'Ndebele, North; North Ndebele',
-			'ng' => 'Ndonga',
-			'ne' => 'Nepali',
-			'nn' => 'Norwegian Nynorsk; Nynorsk, Norwegian',
-			'nb' => 'Bokmål, Norwegian, Norwegian Bokmål',
-			'no' => 'Norwegian',
-			'ny' => 'Chichewa; Chewa; Nyanja',
-			'oc' => 'Occitan, Provençal',
-			'oj' => 'Ojibwa',
-			'or' => 'Oriya',
-			'om' => 'Oromo',
-			'os' => 'Ossetian; Ossetic',
-			'pa' => 'Panjabi; Punjabi',
-			'fa' => 'Persian',
-			'pi' => 'Pali',
-			'pl' => 'Polish',
-			'pt' => 'Portuguese',
-			'ps' => 'Pushto',
-			'qu' => 'Quechua',
-			'rm' => 'Romansh',
-			'ro' => 'Romanian',
-			'rn' => 'Rundi',
-			'ru' => 'Russian',
-			'sg' => 'Sango',
-			'sa' => 'Sanskrit',
-			'sr' => 'Serbian',
-			'hr' => 'Croatian',
-			'si' => 'Sinhala; Sinhalese',
-			'sk' => 'Slovak',
-			'sl' => 'Slovenian',
-			'se' => 'Northern Sami',
-			'sm' => 'Samoan',
-			'sn' => 'Shona',
-			'sd' => 'Sindhi',
-			'so' => 'Somali',
-			'st' => 'Sotho, Southern',
-			'es' => 'Spanish; Castilian',
-			'sc' => 'Sardinian',
-			'ss' => 'Swati',
-			'su' => 'Sundanese',
-			'sw' => 'Swahili',
-			'sv' => 'Swedish',
-			'ty' => 'Tahitian',
-			'ta' => 'Tamil',
-			'tt' => 'Tatar',
-			'te' => 'Telugu',
-			'tg' => 'Tajik',
-			'tl' => 'Tagalog',
-			'th' => 'Thai',
-			'bo' => 'Tibetan',
-			'ti' => 'Tigrinya',
-			'to' => 'Tonga (Tonga Islands)',
-			'tn' => 'Tswana',
-			'ts' => 'Tsonga',
-			'tk' => 'Turkmen',
-			'tr' => 'Turkish',
-			'tw' => 'Twi',
-			'ug' => 'Uighur; Uyghur',
-			'uk' => 'Ukrainian',
-			'ur' => 'Urdu',
-			'uz' => 'Uzbek',
-			've' => 'Venda',
-			'vi' => 'Vietnamese',
-			'vo' => 'Volapük',
-			'cy' => 'Welsh',
-			'wa' => 'Walloon',
-			'wo' => 'Wolof',
-			'xh' => 'Xhosa',
-			'yi' => 'Yiddish',
-			'yo' => 'Yoruba',
-			'za' => 'Zhuang; Chuang',
-			'zu' => 'Zulu'
-		);
+    /**
+     * Returns the language for a language code. This function is a clone of WP's function provided in `ms.php`.
+     *
+     * @since 3.9.3
+     *
+     * @param string $code Optional. The two-letter language code. Default empty.
+     *
+     * @return string The language corresponding to $code if it exists. If it does not exist,
+     *                then the first two letters of $code is returned.
+     */
+    private static function format_code_lang( $code = '' ) {
+        $code       = strtolower( substr( $code, 0, 2 ) );
+        $lang_codes = array(
+            'aa' => 'Afar',
+            'ab' => 'Abkhazian',
+            'af' => 'Afrikaans',
+            'ak' => 'Akan',
+            'sq' => 'Albanian',
+            'am' => 'Amharic',
+            'ar' => 'Arabic',
+            'an' => 'Aragonese',
+            'hy' => 'Armenian',
+            'as' => 'Assamese',
+            'av' => 'Avaric',
+            'ae' => 'Avestan',
+            'ay' => 'Aymara',
+            'az' => 'Azerbaijani',
+            'ba' => 'Bashkir',
+            'bm' => 'Bambara',
+            'eu' => 'Basque',
+            'be' => 'Belarusian',
+            'bn' => 'Bengali',
+            'bh' => 'Bihari',
+            'bi' => 'Bislama',
+            'bs' => 'Bosnian',
+            'br' => 'Breton',
+            'bg' => 'Bulgarian',
+            'my' => 'Burmese',
+            'ca' => 'Catalan; Valencian',
+            'ch' => 'Chamorro',
+            'ce' => 'Chechen',
+            'zh' => 'Chinese',
+            'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic',
+            'cv' => 'Chuvash',
+            'kw' => 'Cornish',
+            'co' => 'Corsican',
+            'cr' => 'Cree',
+            'cs' => 'Czech',
+            'da' => 'Danish',
+            'dv' => 'Divehi; Dhivehi; Maldivian',
+            'nl' => 'Dutch; Flemish',
+            'dz' => 'Dzongkha',
+            'en' => 'English',
+            'eo' => 'Esperanto',
+            'et' => 'Estonian',
+            'ee' => 'Ewe',
+            'fo' => 'Faroese',
+            'fj' => 'Fijjian',
+            'fi' => 'Finnish',
+            'fr' => 'French',
+            'fy' => 'Western Frisian',
+            'ff' => 'Fulah',
+            'ka' => 'Georgian',
+            'de' => 'German',
+            'gd' => 'Gaelic; Scottish Gaelic',
+            'ga' => 'Irish',
+            'gl' => 'Galician',
+            'gv' => 'Manx',
+            'el' => 'Greek, Modern',
+            'gn' => 'Guarani',
+            'gu' => 'Gujarati',
+            'ht' => 'Haitian; Haitian Creole',
+            'ha' => 'Hausa',
+            'he' => 'Hebrew',
+            'hz' => 'Herero',
+            'hi' => 'Hindi',
+            'ho' => 'Hiri Motu',
+            'hu' => 'Hungarian',
+            'ig' => 'Igbo',
+            'is' => 'Icelandic',
+            'io' => 'Ido',
+            'ii' => 'Sichuan Yi',
+            'iu' => 'Inuktitut',
+            'ie' => 'Interlingue',
+            'ia' => 'Interlingua (International Auxiliary Language Association)',
+            'id' => 'Indonesian',
+            'ik' => 'Inupiaq',
+            'it' => 'Italian',
+            'jv' => 'Javanese',
+            'ja' => 'Japanese',
+            'kl' => 'Kalaallisut; Greenlandic',
+            'kn' => 'Kannada',
+            'ks' => 'Kashmiri',
+            'kr' => 'Kanuri',
+            'kk' => 'Kazakh',
+            'km' => 'Central Khmer',
+            'ki' => 'Kikuyu; Gikuyu',
+            'rw' => 'Kinyarwanda',
+            'ky' => 'Kirghiz; Kyrgyz',
+            'kv' => 'Komi',
+            'kg' => 'Kongo',
+            'ko' => 'Korean',
+            'kj' => 'Kuanyama; Kwanyama',
+            'ku' => 'Kurdish',
+            'lo' => 'Lao',
+            'la' => 'Latin',
+            'lv' => 'Latvian',
+            'li' => 'Limburgan; Limburger; Limburgish',
+            'ln' => 'Lingala',
+            'lt' => 'Lithuanian',
+            'lb' => 'Luxembourgish; Letzeburgesch',
+            'lu' => 'Luba-Katanga',
+            'lg' => 'Ganda',
+            'mk' => 'Macedonian',
+            'mh' => 'Marshallese',
+            'ml' => 'Malayalam',
+            'mi' => 'Maori',
+            'mr' => 'Marathi',
+            'ms' => 'Malay',
+            'mg' => 'Malagasy',
+            'mt' => 'Maltese',
+            'mo' => 'Moldavian',
+            'mn' => 'Mongolian',
+            'na' => 'Nauru',
+            'nv' => 'Navajo; Navaho',
+            'nr' => 'Ndebele, South; South Ndebele',
+            'nd' => 'Ndebele, North; North Ndebele',
+            'ng' => 'Ndonga',
+            'ne' => 'Nepali',
+            'nn' => 'Norwegian Nynorsk; Nynorsk, Norwegian',
+            'nb' => 'Bokmål, Norwegian, Norwegian Bokmål',
+            'no' => 'Norwegian',
+            'ny' => 'Chichewa; Chewa; Nyanja',
+            'oc' => 'Occitan, Provençal',
+            'oj' => 'Ojibwa',
+            'or' => 'Oriya',
+            'om' => 'Oromo',
+            'os' => 'Ossetian; Ossetic',
+            'pa' => 'Panjabi; Punjabi',
+            'fa' => 'Persian',
+            'pi' => 'Pali',
+            'pl' => 'Polish',
+            'pt' => 'Portuguese',
+            'ps' => 'Pushto',
+            'qu' => 'Quechua',
+            'rm' => 'Romansh',
+            'ro' => 'Romanian',
+            'rn' => 'Rundi',
+            'ru' => 'Russian',
+            'sg' => 'Sango',
+            'sa' => 'Sanskrit',
+            'sr' => 'Serbian',
+            'hr' => 'Croatian',
+            'si' => 'Sinhala; Sinhalese',
+            'sk' => 'Slovak',
+            'sl' => 'Slovenian',
+            'se' => 'Northern Sami',
+            'sm' => 'Samoan',
+            'sn' => 'Shona',
+            'sd' => 'Sindhi',
+            'so' => 'Somali',
+            'st' => 'Sotho, Southern',
+            'es' => 'Spanish; Castilian',
+            'sc' => 'Sardinian',
+            'ss' => 'Swati',
+            'su' => 'Sundanese',
+            'sw' => 'Swahili',
+            'sv' => 'Swedish',
+            'ty' => 'Tahitian',
+            'ta' => 'Tamil',
+            'tt' => 'Tatar',
+            'te' => 'Telugu',
+            'tg' => 'Tajik',
+            'tl' => 'Tagalog',
+            'th' => 'Thai',
+            'bo' => 'Tibetan',
+            'ti' => 'Tigrinya',
+            'to' => 'Tonga (Tonga Islands)',
+            'tn' => 'Tswana',
+            'ts' => 'Tsonga',
+            'tk' => 'Turkmen',
+            'tr' => 'Turkish',
+            'tw' => 'Twi',
+            'ug' => 'Uighur; Uyghur',
+            'uk' => 'Ukrainian',
+            'ur' => 'Urdu',
+            'uz' => 'Uzbek',
+            've' => 'Venda',
+            'vi' => 'Vietnamese',
+            'vo' => 'Volapük',
+            'cy' => 'Welsh',
+            'wa' => 'Walloon',
+            'wo' => 'Wolof',
+            'xh' => 'Xhosa',
+            'yi' => 'Yiddish',
+            'yo' => 'Yoruba',
+            'za' => 'Zhuang; Chuang',
+            'zu' => 'Zulu'
+        );
 
-		/**
-		 * Filters the language codes.
-		 *
-		 * @since MU
-		 *
-		 * @param array $lang_codes Key/value pair of language codes where key is the short version.
-		 * @param string $code A two-letter designation of the language.
-		 */
-		$lang_codes = apply_filters( 'lang_codes', $lang_codes, $code );
+        /**
+         * Filters the language codes.
+         *
+         * @since MU
+         *
+         * @param array $lang_codes Key/value pair of language codes where key is the short version.
+         * @param string $code A two-letter designation of the language.
+         */
+        $lang_codes = apply_filters( 'lang_codes', $lang_codes, $code );
 
-		return strtr( $code, $lang_codes );
-	}
+        return strtr( $code, $lang_codes );
+    }
 
 }

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

Indentation +275 added lines, -275 removed lines

@@ -17,280 +17,280 @@
  */
 class Wordlift_Entity_Uri_Service {
 
-	/**
-	 * Holds the {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since 3.21.5
-	 * @access private
-	 * @var Wordlift_Entity_Uri_Service $instance The {@link Wordlift_Entity_Uri_Service} singleton.
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * An array of URIs to post ID valid for the current request.
-	 *
-	 * @since  3.16.3
-	 * @access private
-	 * @var array $uri_to_post An array of URIs to post ID valid for the current request.
-	 */
-	protected $uri_to_post;
-
-	/**
-	 * Create a {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	public function __construct( $configuration_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->configuration_service = $configuration_service;
-
-		// Add a filter to the `rest_post_dispatch` filter to add the wl_entity_url meta as `wl:entity_url`.
-		add_filter( 'rest_post_dispatch', array( $this, 'rest_post_dispatch' ) );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton.
-	 *
-	 * @return Wordlift_Entity_Uri_Service The singleton instance.
-	 * @since 3.21.5
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Preload the provided URIs in the local cache.
-	 *
-	 * This function will populate the local `$uri_to_post` array by running a
-	 * single query with all the URIs and returning the mappings in the array.
-	 *
-	 * @param array $uris An array of URIs.
-	 *
-	 * @since 3.16.3
-	 *
-	 */
-	public function preload_uris( $uris ) {
-
-		// Bail out if there are no URIs.
-		if ( 0 === count( $uris ) ) {
-			return;
-		}
-
-		$this->log->trace( 'Preloading ' . count( $uris ) . ' URI(s)...' );
-
-		$that          = $this;
-		$external_uris = array_filter( $uris, function ( $item ) use ( $that ) {
-			return ! $that->is_internal( $item );
-		} );
-
-		$query_args = array(
-			// See https://github.com/insideout10/wordlift-plugin/issues/654.
-			'ignore_sticky_posts' => 1,
-			'cache_results'       => false,
-			'numberposts'         => - 1,
-			'post_status'         => array( 'publish', 'draft', 'private', 'future' ),
-			'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
-			'meta_query'          => array(
-				array(
-					'key'     => WL_ENTITY_URL_META_NAME,
-					'value'   => $uris,
-					'compare' => 'IN',
-				),
-			),
-		);
-
-		// Only if the current uri is not an internal uri, entity search is
-		// performed also looking at sameAs values.
-		//
-		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( 0 < count( $external_uris ) ) {
-
-			$query_args['meta_query']['relation'] = 'OR';
-			$query_args['meta_query'][]           = array(
-				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-				'value'   => $external_uris,
-				'compare' => 'IN',
-			);
-
-		}
-
-		// Get the posts.
-		$posts = get_posts( $query_args );
-
-		// Populate the array. We reinitialize the array on purpose because
-		// we don't want these data to long live.
-		$this->uri_to_post = array_reduce( $posts, function ( $carry, $item ) use ( $that ) {
-			$uris = array_merge(
-				get_post_meta( $item->ID, WL_ENTITY_URL_META_NAME ),
-				get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_SAME_AS )
-			);
-
-			return $carry
-			       // Get the URI related to the post and fill them with the item id.
-			       + array_fill_keys( $uris, $item );
-		}, array() );
-
-		// Add the not found URIs.
-		$this->uri_to_post += array_fill_keys( $uris, null );
-
-		$this->log->debug( count( $this->uri_to_post ) . " URI(s) preloaded." );
-
-	}
-
-	/**
-	 * Reset the URI to post local cache.
-	 *
-	 * @since 3.16.3
-	 */
-	public function reset_uris() {
-
-		$this->uri_to_post = array();
-
-	}
-
-	/**
-	 * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
-	 *
-	 * @param string $uri The entity URI.
-	 *
-	 * @return WP_Post|null A WP_Post instance or null if not found.
-	 * @since 3.2.0
-	 *
-	 */
-	public function get_entity( $uri ) {
-
-		$this->log->trace( "Getting an entity post for URI $uri..." );
-
-		// Check if we've been provided with a value otherwise return null.
-		if ( empty( $uri ) ) {
-			return null;
-		}
-
-		$this->log->debug( "Querying post for $uri..." );
-
-		$query_args = array(
-			// See https://github.com/insideout10/wordlift-plugin/issues/654.
-			'ignore_sticky_posts' => 1,
-			'posts_per_page'      => 1,
-			'post_status'         => 'any',
-			'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
-			'meta_query'          => array(
-				array(
-					'key'     => WL_ENTITY_URL_META_NAME,
-					'value'   => $uri,
-					'compare' => '=',
-				),
-			),
-		);
-
-		// Only if the current uri is not an internal uri, entity search is
-		// performed also looking at sameAs values.
-		//
-		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( ! $this->is_internal( $uri ) ) {
-
-			$query_args['meta_query']['relation'] = 'OR';
-			$query_args['meta_query'][]           = array(
-				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-				'value'   => $uri,
-				'compare' => '=',
-			);
-		}
-
-		$posts = get_posts( $query_args );
-
-		// Attempt to find post by URI (only for local entity URLs)
-		if ( empty( $posts ) ) {
-
-			$this->log->debug( "Finding post by $uri..." );
-			$postid = url_to_postid( $uri );
-			if ( $postid !== 0 ) {
-				$this->log->trace( "Found post $postid by URL" );
-
-				return get_post( $postid );
-			}
-
-		}
-
-		// Return null if no post is found.
-		if ( empty( $posts ) ) {
-			$this->log->warn( "No post for URI $uri." );
-
-			return null;
-		}
-
-		// Return the found post.
-		return current( $posts );
-	}
-
-	/**
-	 * Determines whether a given uri is an internal uri or not.
-	 *
-	 * @param string $uri An uri.
-	 *
-	 * @return true if the uri internal to the current dataset otherwise false.
-	 * @since 3.16.3
-	 *
-	 */
-	public function is_internal( $uri ) {
-
-		return ( 0 === strrpos( $uri, (string) $this->configuration_service->get_dataset_uri() ) );
-	}
-
-	/**
-	 * Hook to `rest_post_dispatch` to alter the response and add the `wl_entity_url` post meta as `wl:entity_url`.
-	 *
-	 * We're using this filter instead of the well known `register_meta` / `register_rest_field` because we still need
-	 * to provide full compatibility with WordPress 4.4+.
-	 *
-	 * @param WP_HTTP_Response $result Result to send to the client. Usually a WP_REST_Response.
-	 *
-	 * @return WP_HTTP_Response The result to send to the client.
-	 *
-	 * @since 3.23.0
-	 */
-	public function rest_post_dispatch( $result ) {
-
-		// Get a reference to the actual data.
-		$data = &$result->data;
-
-		// Bail out if we don't have the required parameters, or if the type is not a valid entity.
-		if ( ! is_array( $data ) || ! isset( $data['id'] ) || ! isset( $data['type'] )
-		     || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $data['type'] ) ) {
-			return $result;
-		}
-
-		// Add the `wl:entity_url`.
-		$data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri( $data['id'] );
-
-		return $result;
-	}
+    /**
+     * Holds the {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since 3.21.5
+     * @access private
+     * @var Wordlift_Entity_Uri_Service $instance The {@link Wordlift_Entity_Uri_Service} singleton.
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * An array of URIs to post ID valid for the current request.
+     *
+     * @since  3.16.3
+     * @access private
+     * @var array $uri_to_post An array of URIs to post ID valid for the current request.
+     */
+    protected $uri_to_post;
+
+    /**
+     * Create a {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since 3.16.3
+     *
+     */
+    public function __construct( $configuration_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->configuration_service = $configuration_service;
+
+        // Add a filter to the `rest_post_dispatch` filter to add the wl_entity_url meta as `wl:entity_url`.
+        add_filter( 'rest_post_dispatch', array( $this, 'rest_post_dispatch' ) );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton.
+     *
+     * @return Wordlift_Entity_Uri_Service The singleton instance.
+     * @since 3.21.5
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Preload the provided URIs in the local cache.
+     *
+     * This function will populate the local `$uri_to_post` array by running a
+     * single query with all the URIs and returning the mappings in the array.
+     *
+     * @param array $uris An array of URIs.
+     *
+     * @since 3.16.3
+     *
+     */
+    public function preload_uris( $uris ) {
+
+        // Bail out if there are no URIs.
+        if ( 0 === count( $uris ) ) {
+            return;
+        }
+
+        $this->log->trace( 'Preloading ' . count( $uris ) . ' URI(s)...' );
+
+        $that          = $this;
+        $external_uris = array_filter( $uris, function ( $item ) use ( $that ) {
+            return ! $that->is_internal( $item );
+        } );
+
+        $query_args = array(
+            // See https://github.com/insideout10/wordlift-plugin/issues/654.
+            'ignore_sticky_posts' => 1,
+            'cache_results'       => false,
+            'numberposts'         => - 1,
+            'post_status'         => array( 'publish', 'draft', 'private', 'future' ),
+            'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
+            'meta_query'          => array(
+                array(
+                    'key'     => WL_ENTITY_URL_META_NAME,
+                    'value'   => $uris,
+                    'compare' => 'IN',
+                ),
+            ),
+        );
+
+        // Only if the current uri is not an internal uri, entity search is
+        // performed also looking at sameAs values.
+        //
+        // This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
+        if ( 0 < count( $external_uris ) ) {
+
+            $query_args['meta_query']['relation'] = 'OR';
+            $query_args['meta_query'][]           = array(
+                'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                'value'   => $external_uris,
+                'compare' => 'IN',
+            );
+
+        }
+
+        // Get the posts.
+        $posts = get_posts( $query_args );
+
+        // Populate the array. We reinitialize the array on purpose because
+        // we don't want these data to long live.
+        $this->uri_to_post = array_reduce( $posts, function ( $carry, $item ) use ( $that ) {
+            $uris = array_merge(
+                get_post_meta( $item->ID, WL_ENTITY_URL_META_NAME ),
+                get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_SAME_AS )
+            );
+
+            return $carry
+                    // Get the URI related to the post and fill them with the item id.
+                   + array_fill_keys( $uris, $item );
+        }, array() );
+
+        // Add the not found URIs.
+        $this->uri_to_post += array_fill_keys( $uris, null );
+
+        $this->log->debug( count( $this->uri_to_post ) . " URI(s) preloaded." );
+
+    }
+
+    /**
+     * Reset the URI to post local cache.
+     *
+     * @since 3.16.3
+     */
+    public function reset_uris() {
+
+        $this->uri_to_post = array();
+
+    }
+
+    /**
+     * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
+     *
+     * @param string $uri The entity URI.
+     *
+     * @return WP_Post|null A WP_Post instance or null if not found.
+     * @since 3.2.0
+     *
+     */
+    public function get_entity( $uri ) {
+
+        $this->log->trace( "Getting an entity post for URI $uri..." );
+
+        // Check if we've been provided with a value otherwise return null.
+        if ( empty( $uri ) ) {
+            return null;
+        }
+
+        $this->log->debug( "Querying post for $uri..." );
+
+        $query_args = array(
+            // See https://github.com/insideout10/wordlift-plugin/issues/654.
+            'ignore_sticky_posts' => 1,
+            'posts_per_page'      => 1,
+            'post_status'         => 'any',
+            'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
+            'meta_query'          => array(
+                array(
+                    'key'     => WL_ENTITY_URL_META_NAME,
+                    'value'   => $uri,
+                    'compare' => '=',
+                ),
+            ),
+        );
+
+        // Only if the current uri is not an internal uri, entity search is
+        // performed also looking at sameAs values.
+        //
+        // This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
+        if ( ! $this->is_internal( $uri ) ) {
+
+            $query_args['meta_query']['relation'] = 'OR';
+            $query_args['meta_query'][]           = array(
+                'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                'value'   => $uri,
+                'compare' => '=',
+            );
+        }
+
+        $posts = get_posts( $query_args );
+
+        // Attempt to find post by URI (only for local entity URLs)
+        if ( empty( $posts ) ) {
+
+            $this->log->debug( "Finding post by $uri..." );
+            $postid = url_to_postid( $uri );
+            if ( $postid !== 0 ) {
+                $this->log->trace( "Found post $postid by URL" );
+
+                return get_post( $postid );
+            }
+
+        }
+
+        // Return null if no post is found.
+        if ( empty( $posts ) ) {
+            $this->log->warn( "No post for URI $uri." );
+
+            return null;
+        }
+
+        // Return the found post.
+        return current( $posts );
+    }
+
+    /**
+     * Determines whether a given uri is an internal uri or not.
+     *
+     * @param string $uri An uri.
+     *
+     * @return true if the uri internal to the current dataset otherwise false.
+     * @since 3.16.3
+     *
+     */
+    public function is_internal( $uri ) {
+
+        return ( 0 === strrpos( $uri, (string) $this->configuration_service->get_dataset_uri() ) );
+    }
+
+    /**
+     * Hook to `rest_post_dispatch` to alter the response and add the `wl_entity_url` post meta as `wl:entity_url`.
+     *
+     * We're using this filter instead of the well known `register_meta` / `register_rest_field` because we still need
+     * to provide full compatibility with WordPress 4.4+.
+     *
+     * @param WP_HTTP_Response $result Result to send to the client. Usually a WP_REST_Response.
+     *
+     * @return WP_HTTP_Response The result to send to the client.
+     *
+     * @since 3.23.0
+     */
+    public function rest_post_dispatch( $result ) {
+
+        // Get a reference to the actual data.
+        $data = &$result->data;
+
+        // Bail out if we don't have the required parameters, or if the type is not a valid entity.
+        if ( ! is_array( $data ) || ! isset( $data['id'] ) || ! isset( $data['type'] )
+             || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $data['type'] ) ) {
+            return $result;
+        }
+
+        // Add the `wl:entity_url`.
+        $data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri( $data['id'] );
+
+        return $result;
+    }
 
 }

Spacing +40 added lines, -40 removed lines

@@ -61,14 +61,14 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->configuration_service = $configuration_service;
 
 		// Add a filter to the `rest_post_dispatch` filter to add the wl_entity_url meta as `wl:entity_url`.
-		add_filter( 'rest_post_dispatch', array( $this, 'rest_post_dispatch' ) );
+		add_filter('rest_post_dispatch', array($this, 'rest_post_dispatch'));
 
 		self::$instance = $this;
 
@@ -96,26 +96,26 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function preload_uris( $uris ) {
+	public function preload_uris($uris) {
 
 		// Bail out if there are no URIs.
-		if ( 0 === count( $uris ) ) {
+		if (0 === count($uris)) {
 			return;
 		}
 
-		$this->log->trace( 'Preloading ' . count( $uris ) . ' URI(s)...' );
+		$this->log->trace('Preloading '.count($uris).' URI(s)...');
 
 		$that          = $this;
-		$external_uris = array_filter( $uris, function ( $item ) use ( $that ) {
-			return ! $that->is_internal( $item );
+		$external_uris = array_filter($uris, function($item) use ($that) {
+			return ! $that->is_internal($item);
 		} );
 
 		$query_args = array(
 			// See https://github.com/insideout10/wordlift-plugin/issues/654.
 			'ignore_sticky_posts' => 1,
 			'cache_results'       => false,
-			'numberposts'         => - 1,
-			'post_status'         => array( 'publish', 'draft', 'private', 'future' ),
+			'numberposts'         => -1,
+			'post_status'         => array('publish', 'draft', 'private', 'future'),
 			'post_type'           => Wordlift_Entity_Service::valid_entity_post_types(),
 			'meta_query'          => array(
 				array(
@@ -130,7 +130,7 @@ 
 		// performed also looking at sameAs values.
 		//
 		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( 0 < count( $external_uris ) ) {
+		if (0 < count($external_uris)) {
 
 			$query_args['meta_query']['relation'] = 'OR';
 			$query_args['meta_query'][]           = array(
@@ -142,25 +142,25 @@ 
 		}
 
 		// Get the posts.
-		$posts = get_posts( $query_args );
+		$posts = get_posts($query_args);
 
 		// Populate the array. We reinitialize the array on purpose because
 		// we don't want these data to long live.
-		$this->uri_to_post = array_reduce( $posts, function ( $carry, $item ) use ( $that ) {
+		$this->uri_to_post = array_reduce($posts, function($carry, $item) use ($that) {
 			$uris = array_merge(
-				get_post_meta( $item->ID, WL_ENTITY_URL_META_NAME ),
-				get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_SAME_AS )
+				get_post_meta($item->ID, WL_ENTITY_URL_META_NAME),
+				get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_SAME_AS)
 			);
 
 			return $carry
 			       // Get the URI related to the post and fill them with the item id.
-			       + array_fill_keys( $uris, $item );
-		}, array() );
+			       + array_fill_keys($uris, $item);
+		}, array());
 
 		// Add the not found URIs.
-		$this->uri_to_post += array_fill_keys( $uris, null );
+		$this->uri_to_post += array_fill_keys($uris, null);
 
-		$this->log->debug( count( $this->uri_to_post ) . " URI(s) preloaded." );
+		$this->log->debug(count($this->uri_to_post)." URI(s) preloaded.");
 
 	}
 
@@ -184,16 +184,16 @@ 
 	 * @since 3.2.0
 	 *
 	 */
-	public function get_entity( $uri ) {
+	public function get_entity($uri) {
 
-		$this->log->trace( "Getting an entity post for URI $uri..." );
+		$this->log->trace("Getting an entity post for URI $uri...");
 
 		// Check if we've been provided with a value otherwise return null.
-		if ( empty( $uri ) ) {
+		if (empty($uri)) {
 			return null;
 		}
 
-		$this->log->debug( "Querying post for $uri..." );
+		$this->log->debug("Querying post for $uri...");
 
 		$query_args = array(
 			// See https://github.com/insideout10/wordlift-plugin/issues/654.
@@ -214,7 +214,7 @@ 
 		// performed also looking at sameAs values.
 		//
 		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( ! $this->is_internal( $uri ) ) {
+		if ( ! $this->is_internal($uri)) {
 
 			$query_args['meta_query']['relation'] = 'OR';
 			$query_args['meta_query'][]           = array(
@@ -224,30 +224,30 @@ 
 			);
 		}
 
-		$posts = get_posts( $query_args );
+		$posts = get_posts($query_args);
 
 		// Attempt to find post by URI (only for local entity URLs)
-		if ( empty( $posts ) ) {
+		if (empty($posts)) {
 
-			$this->log->debug( "Finding post by $uri..." );
-			$postid = url_to_postid( $uri );
-			if ( $postid !== 0 ) {
-				$this->log->trace( "Found post $postid by URL" );
+			$this->log->debug("Finding post by $uri...");
+			$postid = url_to_postid($uri);
+			if ($postid !== 0) {
+				$this->log->trace("Found post $postid by URL");
 
-				return get_post( $postid );
+				return get_post($postid);
 			}
 
 		}
 
 		// Return null if no post is found.
-		if ( empty( $posts ) ) {
-			$this->log->warn( "No post for URI $uri." );
+		if (empty($posts)) {
+			$this->log->warn("No post for URI $uri.");
 
 			return null;
 		}
 
 		// Return the found post.
-		return current( $posts );
+		return current($posts);
 	}
 
 	/**
@@ -259,9 +259,9 @@ 
 	 * @since 3.16.3
 	 *
 	 */
-	public function is_internal( $uri ) {
+	public function is_internal($uri) {
 
-		return ( 0 === strrpos( $uri, (string) $this->configuration_service->get_dataset_uri() ) );
+		return (0 === strrpos($uri, (string) $this->configuration_service->get_dataset_uri()));
 	}
 
 	/**
@@ -276,19 +276,19 @@ 
 	 *
 	 * @since 3.23.0
 	 */
-	public function rest_post_dispatch( $result ) {
+	public function rest_post_dispatch($result) {
 
 		// Get a reference to the actual data.
 		$data = &$result->data;
 
 		// Bail out if we don't have the required parameters, or if the type is not a valid entity.
-		if ( ! is_array( $data ) || ! isset( $data['id'] ) || ! isset( $data['type'] )
-		     || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $data['type'] ) ) {
+		if ( ! is_array($data) || ! isset($data['id']) || ! isset($data['type'])
+		     || ! Wordlift_Entity_Type_Service::is_valid_entity_post_type($data['type'])) {
 			return $result;
 		}
 
 		// Add the `wl:entity_url`.
-		$data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri( $data['id'] );
+		$data['wl:entity_url'] = Wordlift_Entity_Service::get_instance()->get_uri($data['id']);
 
 		return $result;
 	}

src/wordlift/jsonld/class-jsonld-user-service.php

Indentation +71 added lines, -71 removed lines

@@ -6,76 +6,76 @@
 
 class Jsonld_User_Service {
 
-	/**
-	 * @var \Wordlift_User_Service $user_service
-	 */
-	private $user_service;
-
-	/**
-	 * @var Jsonld_Service
-	 */
-	private $jsonld_service;
-
-	/**
-	 * Jsonld_User_Service constructor.
-	 *
-	 * @param \Wordlift_User_Service $user_service
-	 */
-	function __construct( $user_service ) {
-		$this->user_service = $user_service;
-	}
-
-	/**
-	 * @param Jsonld_Service $jsonld_service
-	 */
-	function set_jsonld_service( $jsonld_service ) {
-		$this->jsonld_service = $jsonld_service;
-	}
-
-	function get( $user_id ) {
-		$userdata = get_userdata( $user_id );
-
-		// Bail out if user not found.
-		if ( ! ( $userdata instanceof \WP_User ) ) {
-			return array();
-		}
-
-		// Return the post JSON-LD if a post has been bound to this user.
-		$post_id = $this->user_service->get_entity( $user_id );
-		if ( ! empty( $post_id ) && isset( $this->jsonld_service ) ) {
-			return $this->jsonld_service->get( Object_Type_Enum::POST, $post_id );
-		}
-
-		// Bail out if the user doesn't have a valid URI.
-		$uri = $this->user_service->get_uri( $user_id );
-		if ( empty( $uri ) ) {
-			return array();
-		}
-
-		// Finally return the user's JSON-LD.
-		$data = array(
-			'@context' => 'http://schema.org',
-			'@id'      => $uri,
-			'@type'    => 'Person',
-		);
-
-		if ( ! empty( $userdata->display_name ) ) {
-			$data['name'] = $userdata->display_name;
-		}
-
-		if ( ! empty( $userdata->first_name ) ) {
-			$data['givenName'] = $userdata->first_name;
-		}
-
-		if ( ! empty( $userdata->last_name ) ) {
-			$data['familyName'] = $userdata->last_name;
-		}
-
-		if ( ! empty( $userdata->user_url ) ) {
-			$data['url'] = $userdata->user_url;
-		}
-
-		return array( $data );
-	}
+    /**
+     * @var \Wordlift_User_Service $user_service
+     */
+    private $user_service;
+
+    /**
+     * @var Jsonld_Service
+     */
+    private $jsonld_service;
+
+    /**
+     * Jsonld_User_Service constructor.
+     *
+     * @param \Wordlift_User_Service $user_service
+     */
+    function __construct( $user_service ) {
+        $this->user_service = $user_service;
+    }
+
+    /**
+     * @param Jsonld_Service $jsonld_service
+     */
+    function set_jsonld_service( $jsonld_service ) {
+        $this->jsonld_service = $jsonld_service;
+    }
+
+    function get( $user_id ) {
+        $userdata = get_userdata( $user_id );
+
+        // Bail out if user not found.
+        if ( ! ( $userdata instanceof \WP_User ) ) {
+            return array();
+        }
+
+        // Return the post JSON-LD if a post has been bound to this user.
+        $post_id = $this->user_service->get_entity( $user_id );
+        if ( ! empty( $post_id ) && isset( $this->jsonld_service ) ) {
+            return $this->jsonld_service->get( Object_Type_Enum::POST, $post_id );
+        }
+
+        // Bail out if the user doesn't have a valid URI.
+        $uri = $this->user_service->get_uri( $user_id );
+        if ( empty( $uri ) ) {
+            return array();
+        }
+
+        // Finally return the user's JSON-LD.
+        $data = array(
+            '@context' => 'http://schema.org',
+            '@id'      => $uri,
+            '@type'    => 'Person',
+        );
+
+        if ( ! empty( $userdata->display_name ) ) {
+            $data['name'] = $userdata->display_name;
+        }
+
+        if ( ! empty( $userdata->first_name ) ) {
+            $data['givenName'] = $userdata->first_name;
+        }
+
+        if ( ! empty( $userdata->last_name ) ) {
+            $data['familyName'] = $userdata->last_name;
+        }
+
+        if ( ! empty( $userdata->user_url ) ) {
+            $data['url'] = $userdata->user_url;
+        }
+
+        return array( $data );
+    }
 
 }

Spacing +15 added lines, -15 removed lines

@@ -21,34 +21,34 @@ 
 	 *
 	 * @param \Wordlift_User_Service $user_service
 	 */
-	function __construct( $user_service ) {
+	function __construct($user_service) {
 		$this->user_service = $user_service;
 	}
 
 	/**
 	 * @param Jsonld_Service $jsonld_service
 	 */
-	function set_jsonld_service( $jsonld_service ) {
+	function set_jsonld_service($jsonld_service) {
 		$this->jsonld_service = $jsonld_service;
 	}
 
-	function get( $user_id ) {
-		$userdata = get_userdata( $user_id );
+	function get($user_id) {
+		$userdata = get_userdata($user_id);
 
 		// Bail out if user not found.
-		if ( ! ( $userdata instanceof \WP_User ) ) {
+		if ( ! ($userdata instanceof \WP_User)) {
 			return array();
 		}
 
 		// Return the post JSON-LD if a post has been bound to this user.
-		$post_id = $this->user_service->get_entity( $user_id );
-		if ( ! empty( $post_id ) && isset( $this->jsonld_service ) ) {
-			return $this->jsonld_service->get( Object_Type_Enum::POST, $post_id );
+		$post_id = $this->user_service->get_entity($user_id);
+		if ( ! empty($post_id) && isset($this->jsonld_service)) {
+			return $this->jsonld_service->get(Object_Type_Enum::POST, $post_id);
 		}
 
 		// Bail out if the user doesn't have a valid URI.
-		$uri = $this->user_service->get_uri( $user_id );
-		if ( empty( $uri ) ) {
+		$uri = $this->user_service->get_uri($user_id);
+		if (empty($uri)) {
 			return array();
 		}
 
@@ -59,23 +59,23 @@ 
 			'@type'    => 'Person',
 		);
 
-		if ( ! empty( $userdata->display_name ) ) {
+		if ( ! empty($userdata->display_name)) {
 			$data['name'] = $userdata->display_name;
 		}
 
-		if ( ! empty( $userdata->first_name ) ) {
+		if ( ! empty($userdata->first_name)) {
 			$data['givenName'] = $userdata->first_name;
 		}
 
-		if ( ! empty( $userdata->last_name ) ) {
+		if ( ! empty($userdata->last_name)) {
 			$data['familyName'] = $userdata->last_name;
 		}
 
-		if ( ! empty( $userdata->user_url ) ) {
+		if ( ! empty($userdata->user_url)) {
 			$data['url'] = $userdata->user_url;
 		}
 
-		return array( $data );
+		return array($data);
 	}
 
 }

src/wordlift/autocomplete/class-local-autocomplete-service.php

Indentation +51 added lines, -51 removed lines

@@ -15,62 +15,62 @@
 
 class Local_Autocomplete_Service extends Abstract_Autocomplete_Service {
 
-	/**
-	 * @inheritDoc
-	 */
-	public function query( $query, $scope, $excludes ) {
-		global $wpdb;
+    /**
+     * @inheritDoc
+     */
+    public function query( $query, $scope, $excludes ) {
+        global $wpdb;
 
-		$posts = $wpdb->get_results( $wpdb->prepare(
-			"SELECT * FROM {$wpdb->posts} p"
-			. " INNER JOIN {$wpdb->term_relationships} tr"
-			. "  ON tr.object_id = p.ID"
-			. " INNER JOIN {$wpdb->term_taxonomy} tt"
-			. "  ON tt.taxonomy = %s AND tt.term_taxonomy_id = tr.term_taxonomy_id"
-			. " INNER JOIN {$wpdb->terms} t"
-			. "  ON t.term_id = tt.term_id AND t.name != %s"
-			. " LEFT OUTER JOIN {$wpdb->postmeta} pm"
-			. "  ON pm.meta_key = %s AND pm.post_id = p.ID"
-			. " WHERE p.post_type IN ( '" . implode( "', '", array_map( 'esc_sql', Wordlift_Entity_Service::valid_entity_post_types() ) ) . "' )"
-			. "  AND p.post_status IN ( 'publish', 'draft', 'private', 'future' ) "
-			. "  AND ( p.post_title LIKE %s OR pm.meta_value LIKE %s )"
-			. " LIMIT %d",
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-			'article',
-			Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
-			// `prepare` doesn't support argument number, hence we must repeat the query.
-			'%' . $wpdb->esc_like( $query ) . '%',
-			'%' . $wpdb->esc_like( $query ) . '%',
-			50
-		) );
+        $posts = $wpdb->get_results( $wpdb->prepare(
+            "SELECT * FROM {$wpdb->posts} p"
+            . " INNER JOIN {$wpdb->term_relationships} tr"
+            . "  ON tr.object_id = p.ID"
+            . " INNER JOIN {$wpdb->term_taxonomy} tt"
+            . "  ON tt.taxonomy = %s AND tt.term_taxonomy_id = tr.term_taxonomy_id"
+            . " INNER JOIN {$wpdb->terms} t"
+            . "  ON t.term_id = tt.term_id AND t.name != %s"
+            . " LEFT OUTER JOIN {$wpdb->postmeta} pm"
+            . "  ON pm.meta_key = %s AND pm.post_id = p.ID"
+            . " WHERE p.post_type IN ( '" . implode( "', '", array_map( 'esc_sql', Wordlift_Entity_Service::valid_entity_post_types() ) ) . "' )"
+            . "  AND p.post_status IN ( 'publish', 'draft', 'private', 'future' ) "
+            . "  AND ( p.post_title LIKE %s OR pm.meta_value LIKE %s )"
+            . " LIMIT %d",
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+            'article',
+            Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
+            // `prepare` doesn't support argument number, hence we must repeat the query.
+            '%' . $wpdb->esc_like( $query ) . '%',
+            '%' . $wpdb->esc_like( $query ) . '%',
+            50
+        ) );
 
-		$results = array_map( function ( $item ) {
+        $results = array_map( function ( $item ) {
 
-			$entity_service = Wordlift_Entity_Service::get_instance();
-			$uri            = $entity_service->get_uri( $item->ID );
+            $entity_service = Wordlift_Entity_Service::get_instance();
+            $uri            = $entity_service->get_uri( $item->ID );
 
-			return array(
-				// see #1074: The value property is needed for autocomplete in category page
-				// to function correctly, if value is not provided, then the entity
-				// wont be correctly saved.
-				'value'        => $uri,
-				'id'           => $uri,
-				'label'        => array( $item->post_title ),
-				'labels'       => $entity_service->get_alternative_labels( $item->ID ),
-				'descriptions' => array( Wordlift_Post_Excerpt_Helper::get_text_excerpt( $item ) ),
-				'scope'        => 'local',
-				'sameAss'      => get_post_meta( $item->ID, \Wordlift_Schema_Service::FIELD_SAME_AS ),
-				// The following properties are less relevant because we're linking entities that exist already in the
-				// vocabulary. That's why we don't make an effort to load the real data.
-				'types'        => array( 'http://schema.org/Thing' ),
-				'urls'         => array(),
-				'images'       => array(),
-			);
-		}, $posts );
+            return array(
+                // see #1074: The value property is needed for autocomplete in category page
+                // to function correctly, if value is not provided, then the entity
+                // wont be correctly saved.
+                'value'        => $uri,
+                'id'           => $uri,
+                'label'        => array( $item->post_title ),
+                'labels'       => $entity_service->get_alternative_labels( $item->ID ),
+                'descriptions' => array( Wordlift_Post_Excerpt_Helper::get_text_excerpt( $item ) ),
+                'scope'        => 'local',
+                'sameAss'      => get_post_meta( $item->ID, \Wordlift_Schema_Service::FIELD_SAME_AS ),
+                // The following properties are less relevant because we're linking entities that exist already in the
+                // vocabulary. That's why we don't make an effort to load the real data.
+                'types'        => array( 'http://schema.org/Thing' ),
+                'urls'         => array(),
+                'images'       => array(),
+            );
+        }, $posts );
 
-		$results = array_unique( $results, SORT_REGULAR );
+        $results = array_unique( $results, SORT_REGULAR );
 
-		return $this->filter( $results, $excludes );
-	}
+        return $this->filter( $results, $excludes );
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -18,10 +18,10 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function query( $query, $scope, $excludes ) {
+	public function query($query, $scope, $excludes) {
 		global $wpdb;
 
-		$posts = $wpdb->get_results( $wpdb->prepare(
+		$posts = $wpdb->get_results($wpdb->prepare(
 			"SELECT * FROM {$wpdb->posts} p"
 			. " INNER JOIN {$wpdb->term_relationships} tr"
 			. "  ON tr.object_id = p.ID"
@@ -31,7 +31,7 @@ 
 			. "  ON t.term_id = tt.term_id AND t.name != %s"
 			. " LEFT OUTER JOIN {$wpdb->postmeta} pm"
 			. "  ON pm.meta_key = %s AND pm.post_id = p.ID"
-			. " WHERE p.post_type IN ( '" . implode( "', '", array_map( 'esc_sql', Wordlift_Entity_Service::valid_entity_post_types() ) ) . "' )"
+			. " WHERE p.post_type IN ( '".implode("', '", array_map('esc_sql', Wordlift_Entity_Service::valid_entity_post_types()))."' )"
 			. "  AND p.post_status IN ( 'publish', 'draft', 'private', 'future' ) "
 			. "  AND ( p.post_title LIKE %s OR pm.meta_value LIKE %s )"
 			. " LIMIT %d",
@@ -39,15 +39,15 @@ 
 			'article',
 			Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
 			// `prepare` doesn't support argument number, hence we must repeat the query.
-			'%' . $wpdb->esc_like( $query ) . '%',
-			'%' . $wpdb->esc_like( $query ) . '%',
+			'%'.$wpdb->esc_like($query).'%',
+			'%'.$wpdb->esc_like($query).'%',
 			50
-		) );
+		));
 
-		$results = array_map( function ( $item ) {
+		$results = array_map(function($item) {
 
 			$entity_service = Wordlift_Entity_Service::get_instance();
-			$uri            = $entity_service->get_uri( $item->ID );
+			$uri            = $entity_service->get_uri($item->ID);
 
 			return array(
 				// see #1074: The value property is needed for autocomplete in category page
@@ -55,22 +55,22 @@ 
 				// wont be correctly saved.
 				'value'        => $uri,
 				'id'           => $uri,
-				'label'        => array( $item->post_title ),
-				'labels'       => $entity_service->get_alternative_labels( $item->ID ),
-				'descriptions' => array( Wordlift_Post_Excerpt_Helper::get_text_excerpt( $item ) ),
+				'label'        => array($item->post_title),
+				'labels'       => $entity_service->get_alternative_labels($item->ID),
+				'descriptions' => array(Wordlift_Post_Excerpt_Helper::get_text_excerpt($item)),
 				'scope'        => 'local',
-				'sameAss'      => get_post_meta( $item->ID, \Wordlift_Schema_Service::FIELD_SAME_AS ),
+				'sameAss'      => get_post_meta($item->ID, \Wordlift_Schema_Service::FIELD_SAME_AS),
 				// The following properties are less relevant because we're linking entities that exist already in the
 				// vocabulary. That's why we don't make an effort to load the real data.
-				'types'        => array( 'http://schema.org/Thing' ),
+				'types'        => array('http://schema.org/Thing'),
 				'urls'         => array(),
 				'images'       => array(),
 			);
-		}, $posts );
+		}, $posts);
 
-		$results = array_unique( $results, SORT_REGULAR );
+		$results = array_unique($results, SORT_REGULAR);
 
-		return $this->filter( $results, $excludes );
+		return $this->filter($results, $excludes);
 	}
 
 }

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

Indentation +320 added lines, -320 removed lines

@@ -18,326 +18,326 @@
 
 class Post_Adapter {
 
-	/**
-	 * A {@link Wordlift_Log_Service} logging instance.
-	 *
-	 * @access private
-	 * @var \Wordlift_Log_Service A {@link Wordlift_Log_Service} logging instance.
-	 */
-	private $log;
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @access private
-	 * @var \Wordlift_Entity_Service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Entity_Store} instance.
-	 *
-	 * @access private
-	 * @var Entity_Store $entity_store A {@link Entity_Store} instance.
-	 */
-	private $entity_store;
-
-	public function __construct() {
-
-		// Bail out if block editor's functions aren't available.
-		if ( ! function_exists( 'register_block_type' ) || ! function_exists( 'parse_blocks' ) ) {
-			return;
-		}
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->entity_service = \Wordlift_Entity_Service::get_instance();
-		$this->entity_store   = Entity_Store::get_instance();
-
-		add_action( 'init', array( $this, 'init' ) );
-		add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
-
-	}
-
-	/**
-	 * Initialize by registering our block type `wordlift/classification`, required for {@link parse_blocks) to work
-	 * correctly.
-	 */
-	public function init() {
-
-		register_block_type( 'wordlift/classification', array(
-			'editor_script' => 'wl-block-editor',
-			'attributes'    => array(
-				'entities' => array( 'type' => 'array' ),
-			),
-		) );
-
-	}
-
-	/**
-	 * A sample structure:
-	 *
-	 * {
-	 *   "entities": [
-	 *     {
-	 *       "annotations": {
-	 *         "urn:enhancement-7e8e66fc": {
-	 *           "start": 3480,
-	 *           "end": 3486,
-	 *           "text": "libero"
-	 *         }
-	 *       },
-	 *       "description": "Le libero ou libéro est un poste défensif du volley-ball. Des règles particulières le concernant ont été introduites à la fin des années 1990. De par sa spécificité, le libéro a un statut à part au sein d’une équipe de volley-ball. Pour être identifié, il doit porter un uniforme qui contraste avec ceux des autres membres de son équipe, titulaires ou remplaçants.",
-	 *       "id": "http://fr.dbpedia.org/resource/Libero_(volley-ball)",
-	 *       "label": "Libero (volley-ball)",
-	 *       "mainType": "other",
-	 *       "occurrences": ["urn:enhancement-7e8e66fc"],
-	 *       "sameAs": null,
-	 *       "synonyms": [],
-	 *       "types": ["other"]
-	 *     }
-	 *   ]
-	 * }
-	 *
-	 * @param array $data An array of slashed post data.
-	 * @param array $postarr An array of sanitized, but otherwise unmodified post data.
-	 *
-	 * @return array The data array.
-	 * @throws \Exception
-	 */
-	public function wp_insert_post_data( $data, $postarr ) {
-
-		//
-		$post_status = $data['post_status'];
-		if ( 'auto-draft' === $post_status || 'inherit' === $post_status ) {
-			return $data;
-		}
-
-		$this->log->trace( "The following data has been received by `wp_insert_post_data`:\n"
-		                   . var_export( $data, true ) );
-
-		try {
-			$entities = $this->parse_content( wp_unslash( $data['post_content'] ) );
-
-			foreach ( $entities as $entity ) {
-				$this->create_or_update_entity( $entity, $data['post_status'] );
-			}
-
-		} catch ( \Exception $e ) {
-			$this->log->error( $e->getMessage() );
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Parse the post content to find the `wordlift/classification` block and return the entities' data.
-	 *
-	 * @param string $post_content The post content.
-	 *
-	 * @return array An array of entities' structures.
-	 * @throws \Exception
-	 */
-	private function parse_content( $post_content ) {
-
-		$all_blocks = parse_blocks( $post_content );
-		$this->log->trace( "The following blocks have been parsed while in `wp_insert_post`:\n"
-		                   . var_export( $all_blocks, true ) );
-
-		$blocks = array_filter( $all_blocks, function ( $item ) {
-			return ! empty( $item['blockName'] ) && 'wordlift/classification' === $item['blockName'];
-		} );
-
-		// Bail out if the blocks' array is empty.
-		if ( empty( $blocks ) ) {
-			return array();
-		}
-
-		$block = current( $blocks );
-		$this->log->trace( "The following block has been found while in `wp_insert_post`:\n"
-		                   . var_export( $block, true ) );
-
-		// Bail out if the entities array is empty.
-		if ( empty( $block['attrs'] ) && empty( $block['attrs']['entities'] ) ) {
-			return array();
-		}
-
-		return $block['attrs']['entities'];
-	}
-
-	/**
-	 * Collect entity labels from the entity array.
-	 *
-	 * This function expects an array with the following keys:
-	 *
-	 * array(
-	 *   'label'       => ...,
-	 *   'synonyms'    => array( ... ),
-	 *   'annotations' => array(
-	 *     ...id...      => array( text => ... ),
-	 *   ),
-	 *   'occurrences' => array( ... ),
-	 * )
-	 *
-	 * and it is going to output an array with all the labels, keeping the `label` at first position:
-	 *
-	 * array(
-	 *   ...label...,
-	 *   ...synonyms...,
-	 *   ...texts...,
-	 * )
-	 *
-	 * This function is going to collect the label from the `label` property, from the `synonyms` property and from
-	 * `annotations` property. Since the `annotations` property contains all the annotations including those that
-	 * haven't been selected, this function is going to only get the `text` for the annotations property listed in
-	 * `occurrences`.
-	 *
-	 * @param array $entity {
-	 *  The entity data.
-	 *
-	 * @type string $label The entity label.
-	 * @type array $synonyms The entity synonyms.
-	 * @type array $occurrences The selected occurrences.
-	 * @type array $annotations The annotations.
-	 * }
-	 *
-	 * @return array An array of labels.
-	 */
-	public function get_labels( $entity ) {
-
-		$args = wp_parse_args( $entity, array(
-			'label'       => array(),
-			'synonyms'    => array(),
-			'annotations' => array(),
-			'occurrences' => array(),
-		) );
-
-		// We gather all the labels, occurrences texts and synonyms into one array.
-		$initial = array_merge(
-			(array) $args['label'],
-			(array) $args['synonyms']
-		);
-
-		$annotations = $args['annotations'];
-
-		return array_reduce( $args['occurrences'], function ( $carry, $item ) use ( $annotations ) {
-
-			// Bail out if occurrences->$item->text isn't set or its contents are already
-			// in `$carry`.
-			if ( ! isset( $annotations[ $item ]['text'] )
-			     || in_array( $annotations[ $item ]['text'], $carry ) ) {
-				return $carry;
-			}
-
-			// Push the label.
-			$carry[] = $annotations[ $item ]['text'];
-
-			return $carry;
-		}, $initial );
-	}
-
-	/**
-	 * Create or update the entity.
-	 *
-	 * An entity lookup is performed on the local vocabulary using the `id` and `sameAs` URIs. If an entity is found
-	 * the {@link Entity_Store} update function is called to update the `labels` and the `sameAs` values.
-	 *
-	 * If an entity is not found the {@link Entity_Store} create function is called to create a new entity.
-	 *
-	 * @param array $entity {
-	 * The entity parameters.
-	 *
-	 * @type string The entity item id URI.
-	 * @type string|array The entity sameAs URI(s).
-	 * @type string $description The entity description.
-	 * }
-	 *
-	 * @param       $string $post_status The post status, default 'draft'.
-	 *
-	 * @return int|\WP_Error
-	 * @throws \Exception
-	 */
-	private function create_or_update_entity( $entity, $post_status = 'draft' ) {
-
-		// Get only valid IDs.
-		$ids = array_filter( (array) $entity['id'], function ( $id ) {
-			return preg_match( '|^https?://|', $id );
-		} );
-
-		$uris = array_merge(
-			(array) $ids,
-			(array) $entity['sameAs']
-		);
-
-		$post = $this->get_first_matching_entity_by_uri( $uris );
-
-		$this->log->trace( 'Entity' . ( empty( $post ) ? ' not' : '' ) . " found with the following URIs:\n"
-		                   . var_export( $uris, true ) );
-
-		// Get the labels.
-		$labels = $this->get_labels( $entity );
-
-		if ( empty( $post ) ) {
-			// Create the entity if it doesn't exist.
-			$post_id = $this->entity_store->create( array(
-				'labels'      => $labels,
-				'description' => $entity['description'],
-				'same_as'     => $uris,
-			), $post_status );
-
-			// Return the WP_Error if we got one.
-			if ( is_wp_error( $post_id ) ) {
-				return $post_id;
-			}
-
-			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_set_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			}
-
-			if ( isset( $entity['properties'] ) && isset( $entity['properties']['latitude'] ) && isset( $entity['properties']['longitude'] ) ) {
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude'] );
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude'] );
-			}
-		} else {
-			// Update the entity otherwise.
-			$post_id = $this->entity_store->update( array(
-				'ID'      => $post->ID,
-				'labels'  => $labels,
-				'same_as' => $uris,
-			) );
-
-			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_add_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			}
-		}
-
-		return $post_id;
-	}
-
-	/**
-	 * Get the first matching entity for the provided URI array.
-	 *
-	 * Entities IDs and sameAs are searched.
-	 *
-	 * @param array $uris An array of URIs.
-	 *
-	 * @return \WP_Post|null The entity WP_Post if found or null if not found.
-	 */
-	private function get_first_matching_entity_by_uri( $uris ) {
-
-		foreach ( $uris as $uri ) {
-			$existing_entity = $this->entity_service->get_entity_post_by_uri( $uri );
-			if ( isset( $existing_entity ) ) {
-				return $existing_entity;
-			}
-		}
-
-		return null;
-	}
-
-	//	/**
+    /**
+     * A {@link Wordlift_Log_Service} logging instance.
+     *
+     * @access private
+     * @var \Wordlift_Log_Service A {@link Wordlift_Log_Service} logging instance.
+     */
+    private $log;
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @access private
+     * @var \Wordlift_Entity_Service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Entity_Store} instance.
+     *
+     * @access private
+     * @var Entity_Store $entity_store A {@link Entity_Store} instance.
+     */
+    private $entity_store;
+
+    public function __construct() {
+
+        // Bail out if block editor's functions aren't available.
+        if ( ! function_exists( 'register_block_type' ) || ! function_exists( 'parse_blocks' ) ) {
+            return;
+        }
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->entity_service = \Wordlift_Entity_Service::get_instance();
+        $this->entity_store   = Entity_Store::get_instance();
+
+        add_action( 'init', array( $this, 'init' ) );
+        add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
+
+    }
+
+    /**
+     * Initialize by registering our block type `wordlift/classification`, required for {@link parse_blocks) to work
+     * correctly.
+     */
+    public function init() {
+
+        register_block_type( 'wordlift/classification', array(
+            'editor_script' => 'wl-block-editor',
+            'attributes'    => array(
+                'entities' => array( 'type' => 'array' ),
+            ),
+        ) );
+
+    }
+
+    /**
+     * A sample structure:
+     *
+     * {
+     *   "entities": [
+     *     {
+     *       "annotations": {
+     *         "urn:enhancement-7e8e66fc": {
+     *           "start": 3480,
+     *           "end": 3486,
+     *           "text": "libero"
+     *         }
+     *       },
+     *       "description": "Le libero ou libéro est un poste défensif du volley-ball. Des règles particulières le concernant ont été introduites à la fin des années 1990. De par sa spécificité, le libéro a un statut à part au sein d’une équipe de volley-ball. Pour être identifié, il doit porter un uniforme qui contraste avec ceux des autres membres de son équipe, titulaires ou remplaçants.",
+     *       "id": "http://fr.dbpedia.org/resource/Libero_(volley-ball)",
+     *       "label": "Libero (volley-ball)",
+     *       "mainType": "other",
+     *       "occurrences": ["urn:enhancement-7e8e66fc"],
+     *       "sameAs": null,
+     *       "synonyms": [],
+     *       "types": ["other"]
+     *     }
+     *   ]
+     * }
+     *
+     * @param array $data An array of slashed post data.
+     * @param array $postarr An array of sanitized, but otherwise unmodified post data.
+     *
+     * @return array The data array.
+     * @throws \Exception
+     */
+    public function wp_insert_post_data( $data, $postarr ) {
+
+        //
+        $post_status = $data['post_status'];
+        if ( 'auto-draft' === $post_status || 'inherit' === $post_status ) {
+            return $data;
+        }
+
+        $this->log->trace( "The following data has been received by `wp_insert_post_data`:\n"
+                            . var_export( $data, true ) );
+
+        try {
+            $entities = $this->parse_content( wp_unslash( $data['post_content'] ) );
+
+            foreach ( $entities as $entity ) {
+                $this->create_or_update_entity( $entity, $data['post_status'] );
+            }
+
+        } catch ( \Exception $e ) {
+            $this->log->error( $e->getMessage() );
+        }
+
+        return $data;
+    }
+
+    /**
+     * Parse the post content to find the `wordlift/classification` block and return the entities' data.
+     *
+     * @param string $post_content The post content.
+     *
+     * @return array An array of entities' structures.
+     * @throws \Exception
+     */
+    private function parse_content( $post_content ) {
+
+        $all_blocks = parse_blocks( $post_content );
+        $this->log->trace( "The following blocks have been parsed while in `wp_insert_post`:\n"
+                            . var_export( $all_blocks, true ) );
+
+        $blocks = array_filter( $all_blocks, function ( $item ) {
+            return ! empty( $item['blockName'] ) && 'wordlift/classification' === $item['blockName'];
+        } );
+
+        // Bail out if the blocks' array is empty.
+        if ( empty( $blocks ) ) {
+            return array();
+        }
+
+        $block = current( $blocks );
+        $this->log->trace( "The following block has been found while in `wp_insert_post`:\n"
+                            . var_export( $block, true ) );
+
+        // Bail out if the entities array is empty.
+        if ( empty( $block['attrs'] ) && empty( $block['attrs']['entities'] ) ) {
+            return array();
+        }
+
+        return $block['attrs']['entities'];
+    }
+
+    /**
+     * Collect entity labels from the entity array.
+     *
+     * This function expects an array with the following keys:
+     *
+     * array(
+     *   'label'       => ...,
+     *   'synonyms'    => array( ... ),
+     *   'annotations' => array(
+     *     ...id...      => array( text => ... ),
+     *   ),
+     *   'occurrences' => array( ... ),
+     * )
+     *
+     * and it is going to output an array with all the labels, keeping the `label` at first position:
+     *
+     * array(
+     *   ...label...,
+     *   ...synonyms...,
+     *   ...texts...,
+     * )
+     *
+     * This function is going to collect the label from the `label` property, from the `synonyms` property and from
+     * `annotations` property. Since the `annotations` property contains all the annotations including those that
+     * haven't been selected, this function is going to only get the `text` for the annotations property listed in
+     * `occurrences`.
+     *
+     * @param array $entity {
+     *  The entity data.
+     *
+     * @type string $label The entity label.
+     * @type array $synonyms The entity synonyms.
+     * @type array $occurrences The selected occurrences.
+     * @type array $annotations The annotations.
+     * }
+     *
+     * @return array An array of labels.
+     */
+    public function get_labels( $entity ) {
+
+        $args = wp_parse_args( $entity, array(
+            'label'       => array(),
+            'synonyms'    => array(),
+            'annotations' => array(),
+            'occurrences' => array(),
+        ) );
+
+        // We gather all the labels, occurrences texts and synonyms into one array.
+        $initial = array_merge(
+            (array) $args['label'],
+            (array) $args['synonyms']
+        );
+
+        $annotations = $args['annotations'];
+
+        return array_reduce( $args['occurrences'], function ( $carry, $item ) use ( $annotations ) {
+
+            // Bail out if occurrences->$item->text isn't set or its contents are already
+            // in `$carry`.
+            if ( ! isset( $annotations[ $item ]['text'] )
+                 || in_array( $annotations[ $item ]['text'], $carry ) ) {
+                return $carry;
+            }
+
+            // Push the label.
+            $carry[] = $annotations[ $item ]['text'];
+
+            return $carry;
+        }, $initial );
+    }
+
+    /**
+     * Create or update the entity.
+     *
+     * An entity lookup is performed on the local vocabulary using the `id` and `sameAs` URIs. If an entity is found
+     * the {@link Entity_Store} update function is called to update the `labels` and the `sameAs` values.
+     *
+     * If an entity is not found the {@link Entity_Store} create function is called to create a new entity.
+     *
+     * @param array $entity {
+     * The entity parameters.
+     *
+     * @type string The entity item id URI.
+     * @type string|array The entity sameAs URI(s).
+     * @type string $description The entity description.
+     * }
+     *
+     * @param       $string $post_status The post status, default 'draft'.
+     *
+     * @return int|\WP_Error
+     * @throws \Exception
+     */
+    private function create_or_update_entity( $entity, $post_status = 'draft' ) {
+
+        // Get only valid IDs.
+        $ids = array_filter( (array) $entity['id'], function ( $id ) {
+            return preg_match( '|^https?://|', $id );
+        } );
+
+        $uris = array_merge(
+            (array) $ids,
+            (array) $entity['sameAs']
+        );
+
+        $post = $this->get_first_matching_entity_by_uri( $uris );
+
+        $this->log->trace( 'Entity' . ( empty( $post ) ? ' not' : '' ) . " found with the following URIs:\n"
+                            . var_export( $uris, true ) );
+
+        // Get the labels.
+        $labels = $this->get_labels( $entity );
+
+        if ( empty( $post ) ) {
+            // Create the entity if it doesn't exist.
+            $post_id = $this->entity_store->create( array(
+                'labels'      => $labels,
+                'description' => $entity['description'],
+                'same_as'     => $uris,
+            ), $post_status );
+
+            // Return the WP_Error if we got one.
+            if ( is_wp_error( $post_id ) ) {
+                return $post_id;
+            }
+
+            // Add the entity type.
+            if ( isset( $entity['mainType'] ) ) {
+                wp_set_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            }
+
+            if ( isset( $entity['properties'] ) && isset( $entity['properties']['latitude'] ) && isset( $entity['properties']['longitude'] ) ) {
+                add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude'] );
+                add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude'] );
+            }
+        } else {
+            // Update the entity otherwise.
+            $post_id = $this->entity_store->update( array(
+                'ID'      => $post->ID,
+                'labels'  => $labels,
+                'same_as' => $uris,
+            ) );
+
+            // Add the entity type.
+            if ( isset( $entity['mainType'] ) ) {
+                wp_add_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            }
+        }
+
+        return $post_id;
+    }
+
+    /**
+     * Get the first matching entity for the provided URI array.
+     *
+     * Entities IDs and sameAs are searched.
+     *
+     * @param array $uris An array of URIs.
+     *
+     * @return \WP_Post|null The entity WP_Post if found or null if not found.
+     */
+    private function get_first_matching_entity_by_uri( $uris ) {
+
+        foreach ( $uris as $uri ) {
+            $existing_entity = $this->entity_service->get_entity_post_by_uri( $uri );
+            if ( isset( $existing_entity ) ) {
+                return $existing_entity;
+            }
+        }
+
+        return null;
+    }
+
+    //	/**
 //	 * @param int      $post_ID Post ID.
 //	 * @param \WP_Post $post Post object.
 //	 * @param bool     $update Whether this is an existing post being updated or not.

Spacing +59 added lines, -59 removed lines

@@ -45,17 +45,17 @@ 
 	public function __construct() {
 
 		// Bail out if block editor's functions aren't available.
-		if ( ! function_exists( 'register_block_type' ) || ! function_exists( 'parse_blocks' ) ) {
+		if ( ! function_exists('register_block_type') || ! function_exists('parse_blocks')) {
 			return;
 		}
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 		$this->entity_service = \Wordlift_Entity_Service::get_instance();
 		$this->entity_store   = Entity_Store::get_instance();
 
-		add_action( 'init', array( $this, 'init' ) );
-		add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
+		add_action('init', array($this, 'init'));
+		add_filter('wp_insert_post_data', array($this, 'wp_insert_post_data'), 10, 2);
 
 	}
 
@@ -65,12 +65,12 @@ 
 	 */
 	public function init() {
 
-		register_block_type( 'wordlift/classification', array(
+		register_block_type('wordlift/classification', array(
 			'editor_script' => 'wl-block-editor',
 			'attributes'    => array(
-				'entities' => array( 'type' => 'array' ),
+				'entities' => array('type' => 'array'),
 			),
-		) );
+		));
 
 	}
 
@@ -105,26 +105,26 @@ 
 	 * @return array The data array.
 	 * @throws \Exception
 	 */
-	public function wp_insert_post_data( $data, $postarr ) {
+	public function wp_insert_post_data($data, $postarr) {
 
 		//
 		$post_status = $data['post_status'];
-		if ( 'auto-draft' === $post_status || 'inherit' === $post_status ) {
+		if ('auto-draft' === $post_status || 'inherit' === $post_status) {
 			return $data;
 		}
 
-		$this->log->trace( "The following data has been received by `wp_insert_post_data`:\n"
-		                   . var_export( $data, true ) );
+		$this->log->trace("The following data has been received by `wp_insert_post_data`:\n"
+		                   . var_export($data, true));
 
 		try {
-			$entities = $this->parse_content( wp_unslash( $data['post_content'] ) );
+			$entities = $this->parse_content(wp_unslash($data['post_content']));
 
-			foreach ( $entities as $entity ) {
-				$this->create_or_update_entity( $entity, $data['post_status'] );
+			foreach ($entities as $entity) {
+				$this->create_or_update_entity($entity, $data['post_status']);
 			}
 
-		} catch ( \Exception $e ) {
-			$this->log->error( $e->getMessage() );
+		} catch (\Exception $e) {
+			$this->log->error($e->getMessage());
 		}
 
 		return $data;
@@ -138,27 +138,27 @@ 
 	 * @return array An array of entities' structures.
 	 * @throws \Exception
 	 */
-	private function parse_content( $post_content ) {
+	private function parse_content($post_content) {
 
-		$all_blocks = parse_blocks( $post_content );
-		$this->log->trace( "The following blocks have been parsed while in `wp_insert_post`:\n"
-		                   . var_export( $all_blocks, true ) );
+		$all_blocks = parse_blocks($post_content);
+		$this->log->trace("The following blocks have been parsed while in `wp_insert_post`:\n"
+		                   . var_export($all_blocks, true));
 
-		$blocks = array_filter( $all_blocks, function ( $item ) {
-			return ! empty( $item['blockName'] ) && 'wordlift/classification' === $item['blockName'];
+		$blocks = array_filter($all_blocks, function($item) {
+			return ! empty($item['blockName']) && 'wordlift/classification' === $item['blockName'];
 		} );
 
 		// Bail out if the blocks' array is empty.
-		if ( empty( $blocks ) ) {
+		if (empty($blocks)) {
 			return array();
 		}
 
-		$block = current( $blocks );
-		$this->log->trace( "The following block has been found while in `wp_insert_post`:\n"
-		                   . var_export( $block, true ) );
+		$block = current($blocks);
+		$this->log->trace("The following block has been found while in `wp_insert_post`:\n"
+		                   . var_export($block, true));
 
 		// Bail out if the entities array is empty.
-		if ( empty( $block['attrs'] ) && empty( $block['attrs']['entities'] ) ) {
+		if (empty($block['attrs']) && empty($block['attrs']['entities'])) {
 			return array();
 		}
 
@@ -203,14 +203,14 @@ 
 	 *
 	 * @return array An array of labels.
 	 */
-	public function get_labels( $entity ) {
+	public function get_labels($entity) {
 
-		$args = wp_parse_args( $entity, array(
+		$args = wp_parse_args($entity, array(
 			'label'       => array(),
 			'synonyms'    => array(),
 			'annotations' => array(),
 			'occurrences' => array(),
-		) );
+		));
 
 		// We gather all the labels, occurrences texts and synonyms into one array.
 		$initial = array_merge(
@@ -220,20 +220,20 @@ 
 
 		$annotations = $args['annotations'];
 
-		return array_reduce( $args['occurrences'], function ( $carry, $item ) use ( $annotations ) {
+		return array_reduce($args['occurrences'], function($carry, $item) use ($annotations) {
 
 			// Bail out if occurrences->$item->text isn't set or its contents are already
 			// in `$carry`.
-			if ( ! isset( $annotations[ $item ]['text'] )
-			     || in_array( $annotations[ $item ]['text'], $carry ) ) {
+			if ( ! isset($annotations[$item]['text'])
+			     || in_array($annotations[$item]['text'], $carry)) {
 				return $carry;
 			}
 
 			// Push the label.
-			$carry[] = $annotations[ $item ]['text'];
+			$carry[] = $annotations[$item]['text'];
 
 			return $carry;
-		}, $initial );
+		}, $initial);
 	}
 
 	/**
@@ -257,11 +257,11 @@ 
 	 * @return int|\WP_Error
 	 * @throws \Exception
 	 */
-	private function create_or_update_entity( $entity, $post_status = 'draft' ) {
+	private function create_or_update_entity($entity, $post_status = 'draft') {
 
 		// Get only valid IDs.
-		$ids = array_filter( (array) $entity['id'], function ( $id ) {
-			return preg_match( '|^https?://|', $id );
+		$ids = array_filter((array) $entity['id'], function($id) {
+			return preg_match('|^https?://|', $id);
 		} );
 
 		$uris = array_merge(
@@ -269,47 +269,47 @@ 
 			(array) $entity['sameAs']
 		);
 
-		$post = $this->get_first_matching_entity_by_uri( $uris );
+		$post = $this->get_first_matching_entity_by_uri($uris);
 
-		$this->log->trace( 'Entity' . ( empty( $post ) ? ' not' : '' ) . " found with the following URIs:\n"
-		                   . var_export( $uris, true ) );
+		$this->log->trace('Entity'.(empty($post) ? ' not' : '')." found with the following URIs:\n"
+		                   . var_export($uris, true));
 
 		// Get the labels.
-		$labels = $this->get_labels( $entity );
+		$labels = $this->get_labels($entity);
 
-		if ( empty( $post ) ) {
+		if (empty($post)) {
 			// Create the entity if it doesn't exist.
-			$post_id = $this->entity_store->create( array(
+			$post_id = $this->entity_store->create(array(
 				'labels'      => $labels,
 				'description' => $entity['description'],
 				'same_as'     => $uris,
-			), $post_status );
+			), $post_status);
 
 			// Return the WP_Error if we got one.
-			if ( is_wp_error( $post_id ) ) {
+			if (is_wp_error($post_id)) {
 				return $post_id;
 			}
 
 			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_set_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			if (isset($entity['mainType'])) {
+				wp_set_object_terms($post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 			}
 
-			if ( isset( $entity['properties'] ) && isset( $entity['properties']['latitude'] ) && isset( $entity['properties']['longitude'] ) ) {
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude'] );
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude'] );
+			if (isset($entity['properties']) && isset($entity['properties']['latitude']) && isset($entity['properties']['longitude'])) {
+				add_post_meta($post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude']);
+				add_post_meta($post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude']);
 			}
 		} else {
 			// Update the entity otherwise.
-			$post_id = $this->entity_store->update( array(
+			$post_id = $this->entity_store->update(array(
 				'ID'      => $post->ID,
 				'labels'  => $labels,
 				'same_as' => $uris,
-			) );
+			));
 
 			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_add_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			if (isset($entity['mainType'])) {
+				wp_add_object_terms($post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 			}
 		}
 
@@ -325,11 +325,11 @@ 
 	 *
 	 * @return \WP_Post|null The entity WP_Post if found or null if not found.
 	 */
-	private function get_first_matching_entity_by_uri( $uris ) {
+	private function get_first_matching_entity_by_uri($uris) {
 
-		foreach ( $uris as $uri ) {
-			$existing_entity = $this->entity_service->get_entity_post_by_uri( $uri );
-			if ( isset( $existing_entity ) ) {
+		foreach ($uris as $uri) {
+			$existing_entity = $this->entity_service->get_entity_post_by_uri($uri);
+			if (isset($existing_entity)) {
 				return $existing_entity;
 			}
 		}