insideout10 / wordlift-plugin

src/modules/linked_data/wordlift_linked_data.php

Indentation +425 added lines, -425 removed lines

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

Spacing +132 added lines, -132 removed lines

@@ -18,15 +18,15 @@ 
  * @since 3.0.0
  *
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post');
 
-	$log->trace( "Saving post $post_id to Linked Data..." );
+	$log->trace("Saving post $post_id to Linked Data...");
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
+		$log->debug("Skipping $post_id, because id is not numeric or is a post revision.");
 
 		return;
 	}
@@ -34,7 +34,7 @@ 
 	// Get the post type and check whether it supports the editor.
 	//
 	// @see https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type = get_post_type( $post_id );
+	$post_type = get_post_type($post_id);
 	/**
 	 * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
 	 *
@@ -42,11 +42,11 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
 	 */
-	$is_editor_supported = wl_post_type_supports_editor( $post_type );
+	$is_editor_supported = wl_post_type_supports_editor($post_type);
 
 	// Bail out if it's not an entity.
-	if ( ! $is_editor_supported ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+	if ( ! $is_editor_supported) {
+		$log->debug("Skipping $post_id, because $post_type doesn't support the editor (content).");
 
 		return;
 	}
@@ -60,23 +60,23 @@ 
 	$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
 
 	// Bail out if it's not a valid entity.
-	if ( ! in_array( $post_type, $supported_types ) ) {
-		$log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
+	if ( ! in_array($post_type, $supported_types)) {
+		$log->debug("Skipping $post_id, because $post_type is not a valid entity.");
 
 		return;
 	}
 
 	// Unhook this function so it doesn't loop infinitely.
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+	remove_action('save_post', 'wl_linked_data_save_post');
 
 	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+	do_action('wl_linked_data_save_post', $post_id);
 
 	// Re-hook this function.
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+	add_action('save_post', 'wl_linked_data_save_post');
 }
 
-add_action( 'save_post', 'wl_linked_data_save_post' );
+add_action('save_post', 'wl_linked_data_save_post');
 
 /**
  * Save the post to the triple store. Also saves the entities locally and on the triple store.
@@ -86,23 +86,23 @@ 
  * @since 3.0.0
  *
  */
-function wl_linked_data_save_post_and_related_entities( $post_id ) {
+function wl_linked_data_save_post_and_related_entities($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post_and_related_entities');
 
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+	$log->trace("Saving $post_id to Linked Data along with related entities...");
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+		$log->trace('Doing autosave, skipping...');
 
 		return;
 	}
 
 	// get the current post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	remove_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
@@ -113,48 +113,48 @@ 
 	$entities_uri_mapping = array();
 
 	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+	if (isset($_POST['wl_entities']) && isset($_POST['wl_boxes'])) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+		wl_write_log("[ post id :: $post_id ][ POST(wl_entities) :: ");
+		wl_write_log(json_encode($_POST['wl_entities']));
+		wl_write_log("]");
+		wl_write_log("[ post id :: $post_id ][ POST(wl_boxes) :: ");
+		wl_write_log(json_encode($_POST['wl_boxes'], true));
+		wl_write_log("]");
 
 		$entities_via_post = $_POST['wl_entities'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+		foreach ($entities_via_post as $entity_uri => $entity) {
 
 			// Only if the current entity is created from scratch let's avoid to
 			// create more than one entity with same label & entity type.
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+			$entity_type = (preg_match('/^local-entity-.+/', $entity_uri) > 0) ?
 				$entity['main_type'] : null;
 
 			// Look if current entity uri matches an internal existing entity, meaning:
 			// 1. when $entity_uri is an internal uri
 			// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-			$ie = $entity_service->get_entity_post_by_uri( $entity_uri );
+			$ie = $entity_service->get_entity_post_by_uri($entity_uri);
 
 			// Dont save the entities which are not found, but also local.
-			if ( $ie === null &&  Wordlift_Entity_Uri_Service::get_instance()->is_internal( $entity_uri ) ) {
+			if ($ie === null && Wordlift_Entity_Uri_Service::get_instance()->is_internal($entity_uri)) {
 				continue;
 			}
 
 			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
+			$uri = (null === $ie) ?
 				Wordlift_Uri_Service::get_instance()->build_uri(
 					$entity['label'],
 					Wordlift_Entity_Service::TYPE_NAME,
 					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
+				) : wl_get_entity_uri($ie->ID);
 
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+			wl_write_log("Map $entity_uri on $uri");
+			$entities_uri_mapping[$entity_uri] = $uri;
 
 			// Local entities have a tmp uri with 'local-entity-' prefix
 			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+			if (preg_match('/^local-entity-.+/', $entity_uri) > 0) {
 				// Override the entity obj
 				$entity['uri'] = $uri;
 			}
@@ -163,8 +163,8 @@ 
 			$entity['related_post_id'] = $post_id;
 
 			// Save the entity if is a new entity
-			if ( null === $ie ) {
-				wl_save_entity( $entity );
+			if (null === $ie) {
+				wl_save_entity($entity);
 			}
 
 		}
@@ -175,14 +175,14 @@ 
 	$updated_post_content = $post->post_content;
 
 	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
+	if ( ! empty($entities_uri_mapping)) {
 		// Save each entity and store the post id.
-		foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-			if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
+		foreach ($entities_uri_mapping as $tmp_uri => $uri) {
+			if (1 !== preg_match('@^(https?://|local-entity-)@', $tmp_uri)) {
 				continue;
 			}
 
-			$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+			$updated_post_content = str_replace($tmp_uri, $uri, $updated_post_content);
 		}
 
 		// Update the post content.
@@ -191,20 +191,20 @@ 
 		 * content, so add the slashes to prevent back slash getting
 		 * removed.
 		 */
-		wp_update_post( array(
+		wp_update_post(array(
 			'ID'           => $post->ID,
-			'post_content' => addslashes( $updated_post_content ),
-		) );
+			'post_content' => addslashes($updated_post_content),
+		));
 	}
 	// Reset previously saved instances.
-	wl_core_delete_relation_instances( $post_id );
+	wl_core_delete_relation_instances($post_id);
 
 
 	$relations = Object_Relation_Service::get_instance()
-	                                    ->get_relations_from_content( $updated_post_content, Object_Type_Enum::POST );
+	                                    ->get_relations_from_content($updated_post_content, Object_Type_Enum::POST);
 
 	// Save relation instances
-	foreach ( $relations as $relation ) {
+	foreach ($relations as $relation) {
 
 		wl_core_add_relation_instance(
 			// subject id.
@@ -221,9 +221,9 @@ 
 
 	}
 
-	if ( isset( $_POST['wl_entities'] ) ) {
+	if (isset($_POST['wl_entities'])) {
 		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
+		$metadata_via_post = (isset($_POST['wl_metadata'])) ?
 			$_POST['wl_metadata'] : array();
 
 		$fields = array(
@@ -232,35 +232,35 @@ 
 		);
 
 		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for($post->ID);
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			// Delete current values
-			delete_post_meta( $post->ID, $field );
+			delete_post_meta($post->ID, $field);
 			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
+			$uri = (isset($metadata_via_post[$field])) ?
+				stripslashes($metadata_via_post[$field]) : '';
 
-			$entity = $entity_service->get_entity_post_by_uri( $uri );
+			$entity = $entity_service->get_entity_post_by_uri($uri);
 
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
+			if ($entity) {
+				add_post_meta($post->ID, $field, $entity->ID, true);
 				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+				if ($field === Wordlift_Schema_Service::FIELD_TOPIC) {
+					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for($post->ID, $entity);
 				}
 			}
 		}
 	}
 
 	// Push the post to Redlink.
-	do_action( 'wl_legacy_linked_data__push', $post->ID );
+	do_action('wl_legacy_linked_data__push', $post->ID);
 
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 }
 
-add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 /**
  * Save the specified data as an entity in WordPress. This method only create new entities. When an existing entity is
@@ -278,14 +278,14 @@ 
  *
  * @return null|WP_Post A post instance or null in case of failure.
  */
-function wl_save_entity( $entity_data ) {
+function wl_save_entity($entity_data) {
 
 	// Required for REST API calls
-	if ( ! function_exists( 'wp_crop_image' ) ) {
-		require_once( ABSPATH . 'wp-admin/includes/image.php' );
+	if ( ! function_exists('wp_crop_image')) {
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 	}
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+	$log = Wordlift_Log_Service::get_logger('wl_save_entity');
 
 	$uri = $entity_data['uri'];
 	/*
@@ -295,28 +295,28 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/841
 	 */
-	$label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
+	$label            = preg_replace('/\xEF\xBB\xBF/', '', sanitize_text_field($entity_data['label']));
 	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+	$entity_types     = isset($entity_data['type']) ? $entity_data['type'] : array();
 	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+	$images           = isset($entity_data['image']) ? (array) $entity_data['image'] : array();
+	$same_as          = isset($entity_data['sameas']) ? (array) $entity_data['sameas'] : array();
+	$related_post_id  = isset($entity_data['related_post_id']) ? $entity_data['related_post_id'] : null;
+	$other_properties = isset($entity_data['properties']) ? $entity_data['properties'] : array();
 
 	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+	$synonyms = isset($entity_data['synonym']) ? $entity_data['synonym'] : array();
 
 	// Check whether an entity already exists with the provided URI.
-	if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
-		$log->debug( "Post already exists for URI $uri." );
+	if (null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri)) {
+		$log->debug("Post already exists for URI $uri.");
 
 		return $post;
 	}
 
 	// Prepare properties of the new entity.
 	$params = array(
-		'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
+		'post_status'  => (is_numeric($related_post_id) ? get_post_status($related_post_id) : 'draft'),
 		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
 		'post_title'   => $label,
 		'post_content' => $description,
@@ -326,7 +326,7 @@ 
 		// new entities.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
+		'post_name'    => sanitize_title($label),
 	);
 
 	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
@@ -335,18 +335,18 @@ 
 	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
 	// is created when saving a post.
 	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		remove_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
-	if ( isset( $seo_ultimate ) ) {
-		remove_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		remove_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		) );
+		));
 	}
 
 	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
@@ -356,90 +356,90 @@ 
 	// see https://github.com/insideout10/wordlift-plugin/issues/156
 	// see https://github.com/insideout10/wordlift-plugin/issues/148
 	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
+	$save_post_filters = is_array($wp_filter['save_post']) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
 
 
-	$log->trace( 'Going to insert new post...' );
+	$log->trace('Going to insert new post...');
 
 	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
+	$post_id = wp_insert_post($params, true);
 
 	// Setting the alternative labels for this entity.
 	Wordlift_Entity_Service::get_instance()
-	                       ->set_alternative_labels( $post_id, $synonyms );
+	                       ->set_alternative_labels($post_id, $synonyms);
 
 	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
 
 	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		add_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
 	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		add_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		), 10, 2 );
+		), 10, 2);
 	}
 
 	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
+	if (is_wp_error($post_id)) {
+		$log->error('An error occurred: '.$post_id->get_error_message());
 
 		// inform an error occurred.
 		return null;
 	}
 
-	wl_set_entity_main_type( $post_id, $type_uri );
+	wl_set_entity_main_type($post_id, $type_uri);
 
 	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
+	wl_set_entity_rdf_types($post_id, $entity_types);
 
 	// Get a dataset URI for the entity.
-	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri($post_id);
 
 	// Add the uri to the sameAs data if it's not a local URI.
-	if ( $wl_uri !== $uri ) {
-		array_push( $same_as, $uri );
+	if ($wl_uri !== $uri) {
+		array_push($same_as, $uri);
 	}
 
 	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
+	wl_schema_set_value($post_id, 'sameAs', $same_as);
 
 	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
+	foreach ($other_properties as $property_name => $property_value) {
+		wl_schema_set_value($post_id, $property_name, $property_value);
 	}
 
 	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
+	do_action('wl_save_entity', $post_id);
 
-	foreach ( $images as $image_remote_url ) {
+	foreach ($images as $image_remote_url) {
 
 		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
+		if (strpos($image_remote_url, site_url()) !== false) {
 			// Do nothing.
 			continue;
 		}
 
 		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+		$existing_image = wl_get_attachment_for_source_url($post_id, $image_remote_url);
 
 		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
+		if (null !== $existing_image) {
 			continue;
 		}
 
 		// Save the image and get the local path.
-		$image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+		$image = Wordlift_Remote_Image_Service::save_from_url($image_remote_url);
 
-		if ( false === $image || is_wp_error( $image ) ) {
+		if (false === $image || is_wp_error($image)) {
 			continue;
 		}
 
@@ -459,24 +459,24 @@ 
 		);
 
 		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+		$attachment_id = wp_insert_attachment($attachment, $filename, $post_id);
 
 		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
+		wl_set_source_url($attachment_id, $image_remote_url);
 
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+		$attachment_data = wp_generate_attachment_metadata($attachment_id, $filename);
+		wp_update_attachment_metadata($attachment_id, $attachment_data);
 
 		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
+		set_post_thumbnail($post_id, $attachment_id);
 	}
 
 	// The entity is pushed to Redlink on save by the function hooked to save_post.
 	// save the entity in the triple store.
-	do_action( 'wl_legacy_linked_data__push', $post_id );
+	do_action('wl_legacy_linked_data__push', $post_id);
 
 	// finally return the entity post.
-	return get_post( $post_id );
+	return get_post($post_id);
 }
 
 /**
@@ -488,10 +488,10 @@ 
  * @since 3.0.0
  *
  */
-function wl_linked_data_content_get_embedded_entities( $content ) {
+function wl_linked_data_content_get_embedded_entities($content) {
 
 	// Remove quote escapes.
-	$content = str_replace( '\\"', '"', $content );
+	$content = str_replace('\\"', '"', $content);
 
 	// Match all itemid attributes.
 	$pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
@@ -502,24 +502,24 @@ 
 	$matches = array();
 
 	// In case of errors, return an empty array.
-	if ( false === preg_match_all( $pattern, $content, $matches ) ) {
-		wl_write_log( "Found no entities embedded in content" );
+	if (false === preg_match_all($pattern, $content, $matches)) {
+		wl_write_log("Found no entities embedded in content");
 
 		return array();
 	}
 
 //    wl_write_log("wl_update_related_entities [ content :: $content ][ data :: " . var_export($data, true). " ][ matches :: " . var_export($matches, true) . " ]");
 
-	$uris  = $matches[1];
+	$uris = $matches[1];
 	// Collect the entities.
 	$entities = array();
-	foreach ( $uris as $uri ) {
-		$uri_d = html_entity_decode( $uri );
+	foreach ($uris as $uri) {
+		$uri_d = html_entity_decode($uri);
 
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri_d);
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
+		if (null !== $entity) {
+			array_push($entities, $entity->ID);
 		}
 	}
 

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

Indentation +158 added lines, -158 removed lines

@@ -20,132 +20,132 @@ 
  */
 class Wordlift_Rebuild_Service extends Wordlift_Listable {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * A {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
-	 */
-	private $sparql_service;
-
-	/**
-	 * The {@link Wordlift_Uri_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Uri_Service $uri_service The {@link Wordlift_Uri_Service} instance.
-	 */
-	private $uri_service;
-
-	/**
-	 * Create an instance of Wordlift_Rebuild_Service.
-	 *
-	 * @param \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance used to query the remote dataset.
-	 * @param \Wordlift_Uri_Service $uri_service
-	 *
-	 * @since 3.6.0
-	 *
-	 */
-	public function __construct( $sparql_service, $uri_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
-
-		$this->sparql_service = $sparql_service;
-		$this->uri_service    = $uri_service;
-	}
-
-	/**
-	 * Rebuild the Linked Data remote dataset by clearing it out and repopulating
-	 * it with local data.
-	 *
-	 * @since 3.6.0
-	 */
-	public function rebuild() {
-
-		ob_clean();
-
-		// Give ourselves some time to process the data.
-		set_time_limit( 21600 ); // 6 hours
-
-		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
-
-		// We start at 0 by default and get to max.
-		$offset = (int) $_GET['offset'] ?: 0;
-		$limit  = (int) $_GET['limit'] ?: 1;
-		$max    = $offset + $limit;
-
-		// Whether we should run queries asynchronously, this is handled in `wordlift_constants.php`.
-		$asynchronous = isset( $_GET['wl-async'] ) && 'true' === $_GET['wl-async'];
-
-		// If we're starting at offset 0, then delete existing URIs and data from
-		// the remote dataset.
-		if ( 0 === $offset ) {
-
-			// Clear out all generated URIs, since the dataset URI might have changed
-			// in the process.
-			$this->uri_service->delete_all();
-
-			// Delete all the triples in the remote dataset.
-			$this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
-
-		}
-
-		// Go through the list of published entities and posts and call the (legacy)
-		// `wl_linked_data_save_post` function for each one. We're using the `process`
-		// function which is provided by the parent `Wordlift_Listable` abstract class
-		// and will cycle through all the posts w/ a very small memory footprint
-		// in order to avoid memory errors.
-
-		$count = 0;
-		$log   = $this->log;
-		$this->process( function ( $post ) use ( &$count, $log ) {
-			$count ++;
-			$log->trace( "Going to save post $count, ID $post->ID..." );
-			if ( function_exists( 'wl_linked_data_save_post' ) ) {
-				wl_linked_data_save_post( $post->ID );
-			}
-		}, array(
-			'post_status' => 'publish',
-		), $offset, $max );
-
-		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&wl-async=' . ( $asynchronous ? 'true' : 'false' ) ) );
-		}
-
-		// Flush the cache.
-		Wordlift_File_Cache_Service::flush_all();
-
-		// Rebuild also the references.
-		$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild_references' ) );
-	}
-
-	/**
-	 * Redirect using a client-side meta to avoid browsers' redirect restrictions.
-	 *
-	 * @param string $url The URL to redirect to.
-	 *
-	 * @since 3.9.8
-	 *
-	 */
-	public function redirect( $url ) {
-
-		ob_clean();
-
-		@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-		?>
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * A {@link Wordlift_Sparql_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
+     */
+    private $sparql_service;
+
+    /**
+     * The {@link Wordlift_Uri_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Uri_Service $uri_service The {@link Wordlift_Uri_Service} instance.
+     */
+    private $uri_service;
+
+    /**
+     * Create an instance of Wordlift_Rebuild_Service.
+     *
+     * @param \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance used to query the remote dataset.
+     * @param \Wordlift_Uri_Service $uri_service
+     *
+     * @since 3.6.0
+     *
+     */
+    public function __construct( $sparql_service, $uri_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
+
+        $this->sparql_service = $sparql_service;
+        $this->uri_service    = $uri_service;
+    }
+
+    /**
+     * Rebuild the Linked Data remote dataset by clearing it out and repopulating
+     * it with local data.
+     *
+     * @since 3.6.0
+     */
+    public function rebuild() {
+
+        ob_clean();
+
+        // Give ourselves some time to process the data.
+        set_time_limit( 21600 ); // 6 hours
+
+        // Send textual output.
+        header( 'Content-type: text/plain; charset=utf-8' );
+
+        // We start at 0 by default and get to max.
+        $offset = (int) $_GET['offset'] ?: 0;
+        $limit  = (int) $_GET['limit'] ?: 1;
+        $max    = $offset + $limit;
+
+        // Whether we should run queries asynchronously, this is handled in `wordlift_constants.php`.
+        $asynchronous = isset( $_GET['wl-async'] ) && 'true' === $_GET['wl-async'];
+
+        // If we're starting at offset 0, then delete existing URIs and data from
+        // the remote dataset.
+        if ( 0 === $offset ) {
+
+            // Clear out all generated URIs, since the dataset URI might have changed
+            // in the process.
+            $this->uri_service->delete_all();
+
+            // Delete all the triples in the remote dataset.
+            $this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
+
+        }
+
+        // Go through the list of published entities and posts and call the (legacy)
+        // `wl_linked_data_save_post` function for each one. We're using the `process`
+        // function which is provided by the parent `Wordlift_Listable` abstract class
+        // and will cycle through all the posts w/ a very small memory footprint
+        // in order to avoid memory errors.
+
+        $count = 0;
+        $log   = $this->log;
+        $this->process( function ( $post ) use ( &$count, $log ) {
+            $count ++;
+            $log->trace( "Going to save post $count, ID $post->ID..." );
+            if ( function_exists( 'wl_linked_data_save_post' ) ) {
+                wl_linked_data_save_post( $post->ID );
+            }
+        }, array(
+            'post_status' => 'publish',
+        ), $offset, $max );
+
+        // Redirect to the next chunk.
+        if ( $count == $limit ) {
+            $log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
+            $this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&wl-async=' . ( $asynchronous ? 'true' : 'false' ) ) );
+        }
+
+        // Flush the cache.
+        Wordlift_File_Cache_Service::flush_all();
+
+        // Rebuild also the references.
+        $this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild_references' ) );
+    }
+
+    /**
+     * Redirect using a client-side meta to avoid browsers' redirect restrictions.
+     *
+     * @param string $url The URL to redirect to.
+     *
+     * @since 3.9.8
+     *
+     */
+    public function redirect( $url ) {
+
+        ob_clean();
+
+        @header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+        ?>
         <html>
         <head>
             <meta http-equiv="refresh"
@@ -157,37 +157,37 @@ 
         </html>
 		<?php
 
-		exit;
-
-	}
-
-	/**
-	 * List the items starting at the specified offset and up to the specified limit.
-	 *
-	 * @param int $offset The start offset.
-	 * @param int $limit The maximum number of items to return.
-	 * @param array $args Additional arguments.
-	 *
-	 * @return array A array of items (or an empty array if no items are found).
-	 * @since 3.19.5 remove Polylang hooks.
-	 * @since 3.6.0
-	 *
-	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
-
-		$actual_args = wp_parse_args( $args, Wordlift_Entity_Service::add_criterias( array(
-			'offset'        => $offset,
-			'numberposts'   => $limit,
-			'fields'        => 'all',
-			'orderby'       => 'ID',
-			'order'         => 'ASC',
-			'post_status'   => 'any',
-			'cache_results' => false,
-		) ) );
-
-		$this->log->trace( 'Using ' . var_export( $actual_args, true ) );
-
-		return get_posts( $actual_args );
-	}
+        exit;
+
+    }
+
+    /**
+     * List the items starting at the specified offset and up to the specified limit.
+     *
+     * @param int $offset The start offset.
+     * @param int $limit The maximum number of items to return.
+     * @param array $args Additional arguments.
+     *
+     * @return array A array of items (or an empty array if no items are found).
+     * @since 3.19.5 remove Polylang hooks.
+     * @since 3.6.0
+     *
+     */
+    function find( $offset = 0, $limit = 10, $args = array() ) {
+
+        $actual_args = wp_parse_args( $args, Wordlift_Entity_Service::add_criterias( array(
+            'offset'        => $offset,
+            'numberposts'   => $limit,
+            'fields'        => 'all',
+            'orderby'       => 'ID',
+            'order'         => 'ASC',
+            'post_status'   => 'any',
+            'cache_results' => false,
+        ) ) );
+
+        $this->log->trace( 'Using ' . var_export( $actual_args, true ) );
+
+        return get_posts( $actual_args );
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -56,9 +56,9 @@ 
 	 * @since 3.6.0
 	 *
 	 */
-	public function __construct( $sparql_service, $uri_service ) {
+	public function __construct($sparql_service, $uri_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rebuild_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Rebuild_Service');
 
 		$this->sparql_service = $sparql_service;
 		$this->uri_service    = $uri_service;
@@ -75,10 +75,10 @@ 
 		ob_clean();
 
 		// Give ourselves some time to process the data.
-		set_time_limit( 21600 ); // 6 hours
+		set_time_limit(21600); // 6 hours
 
 		// Send textual output.
-		header( 'Content-type: text/plain; charset=utf-8' );
+		header('Content-type: text/plain; charset=utf-8');
 
 		// We start at 0 by default and get to max.
 		$offset = (int) $_GET['offset'] ?: 0;
@@ -86,18 +86,18 @@ 
 		$max    = $offset + $limit;
 
 		// Whether we should run queries asynchronously, this is handled in `wordlift_constants.php`.
-		$asynchronous = isset( $_GET['wl-async'] ) && 'true' === $_GET['wl-async'];
+		$asynchronous = isset($_GET['wl-async']) && 'true' === $_GET['wl-async'];
 
 		// If we're starting at offset 0, then delete existing URIs and data from
 		// the remote dataset.
-		if ( 0 === $offset ) {
+		if (0 === $offset) {
 
 			// Clear out all generated URIs, since the dataset URI might have changed
 			// in the process.
 			$this->uri_service->delete_all();
 
 			// Delete all the triples in the remote dataset.
-			$this->sparql_service->execute( 'DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };' );
+			$this->sparql_service->execute('DELETE { ?s ?p ?o } WHERE { ?s ?p ?o };');
 
 		}
 
@@ -109,27 +109,27 @@ 
 
 		$count = 0;
 		$log   = $this->log;
-		$this->process( function ( $post ) use ( &$count, $log ) {
-			$count ++;
-			$log->trace( "Going to save post $count, ID $post->ID..." );
-			if ( function_exists( 'wl_linked_data_save_post' ) ) {
-				wl_linked_data_save_post( $post->ID );
+		$this->process(function($post) use (&$count, $log) {
+			$count++;
+			$log->trace("Going to save post $count, ID $post->ID...");
+			if (function_exists('wl_linked_data_save_post')) {
+				wl_linked_data_save_post($post->ID);
 			}
 		}, array(
 			'post_status' => 'publish',
-		), $offset, $max );
+		), $offset, $max);
 
 		// Redirect to the next chunk.
-		if ( $count == $limit ) {
-			$log->trace( 'Redirecting to post #' . ( $offset + 1 ) . '...' );
-			$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild&offset=' . ( $offset + $limit ) . '&limit=' . $limit . '&wl-async=' . ( $asynchronous ? 'true' : 'false' ) ) );
+		if ($count == $limit) {
+			$log->trace('Redirecting to post #'.($offset + 1).'...');
+			$this->redirect(admin_url('admin-ajax.php?action=wl_rebuild&offset='.($offset + $limit).'&limit='.$limit.'&wl-async='.($asynchronous ? 'true' : 'false')));
 		}
 
 		// Flush the cache.
 		Wordlift_File_Cache_Service::flush_all();
 
 		// Rebuild also the references.
-		$this->redirect( admin_url( 'admin-ajax.php?action=wl_rebuild_references' ) );
+		$this->redirect(admin_url('admin-ajax.php?action=wl_rebuild_references'));
 	}
 
 	/**
@@ -140,16 +140,16 @@ 
 	 * @since 3.9.8
 	 *
 	 */
-	public function redirect( $url ) {
+	public function redirect($url) {
 
 		ob_clean();
 
-		@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+		@header('Content-Type: text/html; charset='.get_option('blog_charset'));
 		?>
         <html>
         <head>
             <meta http-equiv="refresh"
-                  content="0; <?php echo esc_attr( $url ); ?>">
+                  content="0; <?php echo esc_attr($url); ?>">
         </head>
         <body>
         Rebuilding, please wait...
@@ -173,9 +173,9 @@ 
 	 * @since 3.6.0
 	 *
 	 */
-	function find( $offset = 0, $limit = 10, $args = array() ) {
+	function find($offset = 0, $limit = 10, $args = array()) {
 
-		$actual_args = wp_parse_args( $args, Wordlift_Entity_Service::add_criterias( array(
+		$actual_args = wp_parse_args($args, Wordlift_Entity_Service::add_criterias(array(
 			'offset'        => $offset,
 			'numberposts'   => $limit,
 			'fields'        => 'all',
@@ -183,11 +183,11 @@ 
 			'order'         => 'ASC',
 			'post_status'   => 'any',
 			'cache_results' => false,
-		) ) );
+		)));
 
-		$this->log->trace( 'Using ' . var_export( $actual_args, true ) );
+		$this->log->trace('Using '.var_export($actual_args, true));
 
-		return get_posts( $actual_args );
+		return get_posts($actual_args);
 	}
 
 }

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

Indentation +45 added lines, -45 removed lines

@@ -13,62 +13,62 @@
  */
 class Wordlift_Debug_Service {
 
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.7.2
-	 * @access private
-	 * @var Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.7.2
+     * @access private
+     * @var Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
 
-	/**
-	 * A {@link Wordlift_Uri_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Uri_Service $uri_service A {@link Wordlift_Uri_Service} instance.
-	 */
-	private $uri_service;
+    /**
+     * A {@link Wordlift_Uri_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Uri_Service $uri_service A {@link Wordlift_Uri_Service} instance.
+     */
+    private $uri_service;
 
-	/**
-	 * Wordlift_Debug_Service constructor.
-	 *
-	 * @since 3.7.2
-	 *
-	 * @param Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Uri_Service   $uri_service    A {@link Wordlift_Uri_Service} instance.
-	 */
-	public function __construct( $entity_service, $uri_service ) {
+    /**
+     * Wordlift_Debug_Service constructor.
+     *
+     * @since 3.7.2
+     *
+     * @param Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Uri_Service   $uri_service    A {@link Wordlift_Uri_Service} instance.
+     */
+    public function __construct( $entity_service, $uri_service ) {
 
-		$this->entity_service = $entity_service;
-		$this->uri_service    = $uri_service;
+        $this->entity_service = $entity_service;
+        $this->uri_service    = $uri_service;
 
-		add_action( 'wp_ajax_wl_dump_uri', array( $this, 'dump_uri' ) );
+        add_action( 'wp_ajax_wl_dump_uri', array( $this, 'dump_uri' ) );
 
-	}
+    }
 
-	public function dump_uri() {
+    public function dump_uri() {
 
-		if ( ! isset( $_GET['id'] ) ) {
-			wp_send_json_error( 'id not set' );
-		}
+        if ( ! isset( $_GET['id'] ) ) {
+            wp_send_json_error( 'id not set' );
+        }
 
-		$post_id = (int) $_GET['id'];
+        $post_id = (int) $_GET['id'];
 
-		$post = get_post( $post_id );
+        $post = get_post( $post_id );
 
-		$uri       = $this->entity_service->get_uri( $post_id );
-		$build_uri = $this->uri_service->build_uri( $post->post_title, $post->post_type );
+        $uri       = $this->entity_service->get_uri( $post_id );
+        $build_uri = $this->uri_service->build_uri( $post->post_title, $post->post_type );
 
-		wp_send_json_success( array(
-			'uri'               => $uri,
-			'post_title'        => sprintf( '%s (%s)', $post->post_title, mb_detect_encoding( $post->post_title ) ),
-			'post_title_ascii'  => mb_convert_encoding( $post->post_title, 'ASCII' ),
-			'build_uri'         => $build_uri,
-			'build_uri_convert' => mb_convert_encoding( $build_uri, 'ASCII' ),
-		) );
+        wp_send_json_success( array(
+            'uri'               => $uri,
+            'post_title'        => sprintf( '%s (%s)', $post->post_title, mb_detect_encoding( $post->post_title ) ),
+            'post_title_ascii'  => mb_convert_encoding( $post->post_title, 'ASCII' ),
+            'build_uri'         => $build_uri,
+            'build_uri_convert' => mb_convert_encoding( $build_uri, 'ASCII' ),
+        ) );
 
-	}
+    }
 
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -39,35 +39,35 @@
 	 * @param Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
 	 * @param \Wordlift_Uri_Service   $uri_service    A {@link Wordlift_Uri_Service} instance.
 	 */
-	public function __construct( $entity_service, $uri_service ) {
+	public function __construct($entity_service, $uri_service) {
 
 		$this->entity_service = $entity_service;
 		$this->uri_service    = $uri_service;
 
-		add_action( 'wp_ajax_wl_dump_uri', array( $this, 'dump_uri' ) );
+		add_action('wp_ajax_wl_dump_uri', array($this, 'dump_uri'));
 
 	}
 
 	public function dump_uri() {
 
-		if ( ! isset( $_GET['id'] ) ) {
-			wp_send_json_error( 'id not set' );
+		if ( ! isset($_GET['id'])) {
+			wp_send_json_error('id not set');
 		}
 
 		$post_id = (int) $_GET['id'];
 
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		$uri       = $this->entity_service->get_uri( $post_id );
-		$build_uri = $this->uri_service->build_uri( $post->post_title, $post->post_type );
+		$uri       = $this->entity_service->get_uri($post_id);
+		$build_uri = $this->uri_service->build_uri($post->post_title, $post->post_type);
 
-		wp_send_json_success( array(
+		wp_send_json_success(array(
 			'uri'               => $uri,
-			'post_title'        => sprintf( '%s (%s)', $post->post_title, mb_detect_encoding( $post->post_title ) ),
-			'post_title_ascii'  => mb_convert_encoding( $post->post_title, 'ASCII' ),
+			'post_title'        => sprintf('%s (%s)', $post->post_title, mb_detect_encoding($post->post_title)),
+			'post_title_ascii'  => mb_convert_encoding($post->post_title, 'ASCII'),
 			'build_uri'         => $build_uri,
-			'build_uri_convert' => mb_convert_encoding( $build_uri, 'ASCII' ),
-		) );
+			'build_uri_convert' => mb_convert_encoding($build_uri, 'ASCII'),
+		));
 
 	}
 

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

Indentation +362 added lines, -362 removed lines

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

Spacing +54 added lines, -54 removed lines

@@ -71,9 +71,9 @@ 
 	 * @since 3.1.0
 	 *
 	 */
-	public function __construct( $entity_service, $entity_type_service ) {
+	public function __construct($entity_service, $entity_type_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Timeline_Service');
 
 		$this->entity_service      = $entity_service;
 		$this->entity_type_service = $entity_type_service;
@@ -102,10 +102,10 @@ 
 	public function ajax_timeline() {
 
 		// Get the ID of the post who requested the timeline.
-		$post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
+		$post_id = (isset($_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : null);
 
 		// Get the events and transform them for the JSON response, then send them to the client.
-		wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
+		wp_send_json($this->to_json($this->get_events($post_id)));
 
 	}
 
@@ -120,33 +120,33 @@ 
 	 * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
 	 *
 	 */
-	public function get_events( $post_id = null ) {
+	public function get_events($post_id = null) {
 
 		// Get the entity IDs either from the entities related to the specified post or from the last 50 published
 		// posts if no post has been specified.
-		$ids = ( is_numeric( $post_id )
-			? wl_core_get_related_entity_ids( $post_id )
-			: $this->get_all_related_to_last_50_published_posts() );
+		$ids = (is_numeric($post_id)
+			? wl_core_get_related_entity_ids($post_id)
+			: $this->get_all_related_to_last_50_published_posts());
 
 		// Add the post itself if it's an entity.
-		if ( is_numeric( $post_id ) && $this->entity_service->is_entity( $post_id ) ) {
+		if (is_numeric($post_id) && $this->entity_service->is_entity($post_id)) {
 			$ids[] = $post_id;
 		}
 
 		// If there's no entities, return an empty array right away.
-		if ( 0 === sizeof( $ids ) ) {
-			$this->log->trace( "No events found [ post id :: $post_id ]" );
+		if (0 === sizeof($ids)) {
+			$this->log->trace("No events found [ post id :: $post_id ]");
 
 			return array();
 		}
 
-		$this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
+		$this->log->trace('Getting events [ entity ids :: '.join(', ', $ids).' ]');
 
 		$args = array(
 			'post__in'       => $ids,
 			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'meta_query'     => array(
 				'relation' => 'AND',
 				array(
@@ -172,7 +172,7 @@ 
 			'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
 		);
 
-		return get_posts( $args );
+		return get_posts($args);
 	}
 
 	/**
@@ -186,23 +186,23 @@ 
 	 * @since 3.1.0
 	 *
 	 */
-	public function to_json( $posts ) {
+	public function to_json($posts) {
 
 		// If there are no events, return empty JSON
-		if ( empty( $posts ) || is_null( $posts ) ) {
+		if (empty($posts) || is_null($posts)) {
 			return '';
 		}
 
 		// {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
-		$display_images_as = isset( $_REQUEST['display_images_as'] ) ? (string) $_REQUEST['display_images_as'] : 'media';
+		$display_images_as = isset($_REQUEST['display_images_as']) ? (string) $_REQUEST['display_images_as'] : 'media';
 
 		// The number of words for the excerpt (by default 55, as WordPress).
-		$this->excerpt_length = $excerpt_length = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? $_REQUEST['excerpt_length'] : 55;
-		add_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+		$this->excerpt_length = $excerpt_length = isset($_REQUEST['excerpt_length']) && is_numeric($_REQUEST['excerpt_length']) ? $_REQUEST['excerpt_length'] : 55;
+		add_filter('excerpt_length', array($this, 'excerpt_length'));
 
 		// Add a filter to remove the [...] after excerpts, since we're adding
 		// a link to the post itself.
-		add_filter( 'excerpt_more', array( $this, 'excerpt_more' ) );
+		add_filter('excerpt_more', array($this, 'excerpt_more'));
 
 		// Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
 		$start_at_slide = 0;
@@ -213,28 +213,28 @@ 
 		$timeline = array();
 
 		// Populate the arrays.
-		$timeline['events'] = array_map( function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
+		$timeline['events'] = array_map(function($item) use (&$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length) {
 
 			// Get the start and end dates.
-			$start_date = strtotime( get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) );
-			$end_date   = strtotime( get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) );
+			$start_date = strtotime(get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true));
+			$end_date   = strtotime(get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true));
 
 			// Set the starting slide.
-			$event_index ++;
-			if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
+			$event_index++;
+			if (0 === $start_at_slide && $now >= $start_date && $now <= $end_date) {
 				$start_at_slide = $event_index;
 			}
 
 			// Load thumbnail
-			$thumbnail_id = get_post_thumbnail_id( $item->ID );
-			if ( '' !== $thumbnail_id && 0 !== $thumbnail_id
-			     && false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+			$thumbnail_id = get_post_thumbnail_id($item->ID);
+			if ('' !== $thumbnail_id && 0 !== $thumbnail_id
+			     && false !== ($attachment = wp_get_attachment_image_src($thumbnail_id))
 			) {
 
 				// Set the thumbnail URL.
-				if ( 'background' === $display_images_as ) {
-					$date['background'] = array( 'url' => $attachment[0] );
-					$date['media']      = array( 'thumbnail' => $attachment[0] );
+				if ('background' === $display_images_as) {
+					$date['background'] = array('url' => $attachment[0]);
+					$date['media']      = array('thumbnail' => $attachment[0]);
 				} else {
 					$date['media'] = array(
 						'url'       => $attachment[0],
@@ -244,37 +244,37 @@ 
 			}
 
 			// Set the start/end dates by converting them to TimelineJS required format.
-			$date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
-			$date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
+			$date['start_date'] = Wordlift_Timeline_Service::date($start_date);
+			$date['end_date']   = Wordlift_Timeline_Service::date($end_date);
 
-			setup_postdata( $GLOBALS['post'] = $item );
+			setup_postdata($GLOBALS['post'] = $item);
 
 			$more_link_text = sprintf(
 				'<span aria-label="%1$s">%2$s</span>',
 				sprintf(
 				/* translators: %s: Name of current post */
-					__( 'Continue reading %s' ),
-					the_title_attribute( array( 'echo' => false ) )
+					__('Continue reading %s'),
+					the_title_attribute(array('echo' => false))
 				),
-				__( '(more&hellip;)' )
+				__('(more&hellip;)')
 			);
 
 			// Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
 			$date['text'] = array(
-				'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
+				'headline' => '<a href="'.get_permalink($item->ID).'">'.$item->post_title.'</a>',
 			);
 
 			// If we have an excerpt, set it.
-			if ( 0 < $excerpt_length ) {
-				$date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
+			if (0 < $excerpt_length) {
+				$date['text']['text'] = sprintf('%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text);
 			}
 
 			return $date;
 
-		}, $posts );
+		}, $posts);
 
 		// Finally remove the excerpt filter.
-		remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+		remove_filter('excerpt_length', array($this, 'excerpt_length'));
 
 		// The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
 		return array(
@@ -293,7 +293,7 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public function excerpt_more( $excerpt_more ) {
+	public function excerpt_more($excerpt_more) {
 
 		return '';
 	}
@@ -308,7 +308,7 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public function excerpt_length( $length ) {
+	public function excerpt_length($length) {
 
 		return $this->excerpt_length;
 	}
@@ -323,12 +323,12 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public static function date( $value ) {
+	public static function date($value) {
 
 		return array(
-			'year'  => (int) date( 'Y', $value ),
-			'month' => (int) date( 'm', $value ),
-			'day'   => (int) date( 'd', $value ),
+			'year'  => (int) date('Y', $value),
+			'month' => (int) date('m', $value),
+			'day'   => (int) date('d', $value),
 
 		);
 	}
@@ -344,7 +344,7 @@ 
 	public function get_all_related_to_last_50_published_posts() {
 
 		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
+		$latest_posts_ids = get_posts(array(
 			'numberposts' => 50,
 			'fields'      => 'ids', //only get post IDs
 			'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
@@ -361,19 +361,19 @@ 
 				),
 			),
 			'post_status' => 'publish',
-		) );
+		));
 
-		if ( empty( $latest_posts_ids ) ) {
+		if (empty($latest_posts_ids)) {
 			// There are no posts.
 			return array();
 		}
 
 		// Collect entities related to latest posts
 		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
+		foreach ($latest_posts_ids as $id) {
+			$entity_ids = array_merge($entity_ids, wl_core_get_related_entity_ids($id, array(
 				'status' => 'publish',
-			) ) );
+			)));
 		}
 
 		return $entity_ids;

src/includes/class-wordlift-key-validation-service.php

Indentation +181 added lines, -181 removed lines

@@ -20,189 +20,189 @@
  */
 class Wordlift_Key_Validation_Service {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * @var Ttl_Cache
-	 */
-	private $ttl_cache_service;
-
-	/**
-	 * Create a {@link Wordlift_Key_Validation_Service} instance.
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since 3.14.0
-	 */
-	public function __construct( $configuration_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Key_Validation_Service' );
-
-		$this->configuration_service = $configuration_service;
-
-		add_action( 'admin_init', array( $this, 'wl_load_plugin' ) );
-		/**
-		 * Filter: wl_feature__enable__notices.
-		 *
-		 * @param bool whether the notices needs to be enabled or not.
-		 *
-		 * @return bool
-		 * @since 3.27.6
-		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			add_action( 'admin_notices', array( $this, 'wl_key_update_notice' ) );
-		}
-
-		$this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification');
-
-	}
-
-	/**
-	 * Validate the provided key.
-	 *
-	 * @param string $key WordLift's key to validate.
-	 *
-	 * @return WP_Error|array The response or WP_Error on failure.
-	 * @since 3.9.0
-	 *
-	 */
-	public function get_account_info( $key ) {
-
-		$this->log->debug( 'Validating key...' );
-
-		return Default_Api_Service::get_instance()->get( '/accounts/info', array(
-			'Authorization' => "Key $key",
-		) )->get_response();
-	}
-
-	/**
-	 * Check if key is valid
-	 *
-	 * @param $key string
-	 *
-	 * @return bool
-	 */
-	public function is_key_valid( $key ) {
-
-		$response = $this->get_account_info( $key );
-
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
-			return false;
-		}
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
-
-		$url = $res_body['url'];
-
-		// Considering that production URL may be filtered.
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
-		if ( is_null( $url ) || $url === $site_url ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * This function is hooked to the `wl_validate_key` AJAX call.
-	 *
-	 * @since 3.9.0
-	 */
-	public function validate_key() {
-
-		// Ensure we don't have garbage before us.
-		ob_clean();
-
-		// Check if we have a key.
-		if ( ! isset( $_POST['key'] ) ) {
-			wp_send_json_error( 'The key parameter is required.' );
-		}
-
-		$response = $this->get_account_info( (string) $_POST['key'] );
-
-		// If we got an error, return invalid.
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
-			wp_send_json_success( array( 'valid' => false, 'message' => '' ) );
-		}
-
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
-
-		// The URL stored in WLS. If this is the initial install the URL may be null.
-		$url = $res_body['url'];
-
-		// Considering that production URL may be filtered.
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
-
-		// If the URL isn't set or matches, then it's valid.
-		if ( is_null( $url ) || $url === $site_url ) {
-		    // Invalidate the cache key
-			$this->ttl_cache_service->delete('is_key_valid' );
-			wp_send_json_success( array( 'valid' => true, 'message' => '' ) );
-		}
-
-		// If the URL doesn't match it means that this key has been configured elsewhere already.
-		if ( $url !== $site_url ) {
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			wp_send_json_success( array(
-				'valid'   => false,
-				'message' => __( 'The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift' ),
-			) );
-		}
-
-		// Set a response with valid set to true or false according to the key validity with message.
-		wp_send_json_success( array(
-			'valid'   => false,
-			'message' => __( 'An error occurred, please contact us at hello@wordlift.io', 'wordlift' ),
-		) );
-	}
-
-	/**
-	 * This function is hooked `admin_init` to check _wl_blog_url.
-	 *
-	 */
-	public function wl_load_plugin() {
-
-		$wl_blog_url = get_option( '_wl_blog_url' );
-		$home_url    = get_option( 'home' );
-
-		if ( ! $wl_blog_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-		} else if ( $wl_blog_url !== $home_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			set_transient( 'wl-key-error-msg', __( "Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift' ), 10 );
-		}
-
-	}
-
-	/**
-	 * This function is hooked to the `admin_notices` to show admin notification.
-	 *
-	 */
-	public function wl_key_update_notice() {
-		if ( get_transient( 'wl-key-error-msg' ) ) {
-			?>
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * @var Ttl_Cache
+     */
+    private $ttl_cache_service;
+
+    /**
+     * Create a {@link Wordlift_Key_Validation_Service} instance.
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since 3.14.0
+     */
+    public function __construct( $configuration_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Key_Validation_Service' );
+
+        $this->configuration_service = $configuration_service;
+
+        add_action( 'admin_init', array( $this, 'wl_load_plugin' ) );
+        /**
+         * Filter: wl_feature__enable__notices.
+         *
+         * @param bool whether the notices needs to be enabled or not.
+         *
+         * @return bool
+         * @since 3.27.6
+         */
+        if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+            add_action( 'admin_notices', array( $this, 'wl_key_update_notice' ) );
+        }
+
+        $this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification');
+
+    }
+
+    /**
+     * Validate the provided key.
+     *
+     * @param string $key WordLift's key to validate.
+     *
+     * @return WP_Error|array The response or WP_Error on failure.
+     * @since 3.9.0
+     *
+     */
+    public function get_account_info( $key ) {
+
+        $this->log->debug( 'Validating key...' );
+
+        return Default_Api_Service::get_instance()->get( '/accounts/info', array(
+            'Authorization' => "Key $key",
+        ) )->get_response();
+    }
+
+    /**
+     * Check if key is valid
+     *
+     * @param $key string
+     *
+     * @return bool
+     */
+    public function is_key_valid( $key ) {
+
+        $response = $this->get_account_info( $key );
+
+        if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+            return false;
+        }
+        $res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+
+        $url = $res_body['url'];
+
+        // Considering that production URL may be filtered.
+        $home_url = get_option( 'home' );
+        $site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
+        if ( is_null( $url ) || $url === $site_url ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * This function is hooked to the `wl_validate_key` AJAX call.
+     *
+     * @since 3.9.0
+     */
+    public function validate_key() {
+
+        // Ensure we don't have garbage before us.
+        ob_clean();
+
+        // Check if we have a key.
+        if ( ! isset( $_POST['key'] ) ) {
+            wp_send_json_error( 'The key parameter is required.' );
+        }
+
+        $response = $this->get_account_info( (string) $_POST['key'] );
+
+        // If we got an error, return invalid.
+        if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+            wp_send_json_success( array( 'valid' => false, 'message' => '' ) );
+        }
+
+        $res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+
+        // The URL stored in WLS. If this is the initial install the URL may be null.
+        $url = $res_body['url'];
+
+        // Considering that production URL may be filtered.
+        $home_url = get_option( 'home' );
+        $site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
+
+        // If the URL isn't set or matches, then it's valid.
+        if ( is_null( $url ) || $url === $site_url ) {
+            // Invalidate the cache key
+            $this->ttl_cache_service->delete('is_key_valid' );
+            wp_send_json_success( array( 'valid' => true, 'message' => '' ) );
+        }
+
+        // If the URL doesn't match it means that this key has been configured elsewhere already.
+        if ( $url !== $site_url ) {
+            Wordlift_Configuration_Service::get_instance()->set_key( '' );
+            wp_send_json_success( array(
+                'valid'   => false,
+                'message' => __( 'The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift' ),
+            ) );
+        }
+
+        // Set a response with valid set to true or false according to the key validity with message.
+        wp_send_json_success( array(
+            'valid'   => false,
+            'message' => __( 'An error occurred, please contact us at hello@wordlift.io', 'wordlift' ),
+        ) );
+    }
+
+    /**
+     * This function is hooked `admin_init` to check _wl_blog_url.
+     *
+     */
+    public function wl_load_plugin() {
+
+        $wl_blog_url = get_option( '_wl_blog_url' );
+        $home_url    = get_option( 'home' );
+
+        if ( ! $wl_blog_url ) {
+            update_option( '_wl_blog_url', $home_url, true );
+        } else if ( $wl_blog_url !== $home_url ) {
+            update_option( '_wl_blog_url', $home_url, true );
+            Wordlift_Configuration_Service::get_instance()->set_key( '' );
+            set_transient( 'wl-key-error-msg', __( "Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift' ), 10 );
+        }
+
+    }
+
+    /**
+     * This function is hooked to the `admin_notices` to show admin notification.
+     *
+     */
+    public function wl_key_update_notice() {
+        if ( get_transient( 'wl-key-error-msg' ) ) {
+            ?>
             <div class="updated notice is-dismissible error">
                 <p><?php _e( get_transient( 'wl-key-error-msg' ), 'wordlift' ); ?></p>
             </div>
 			<?php
-		}
-	}
+        }
+    }
 }

Spacing +46 added lines, -46 removed lines

@@ -50,13 +50,13 @@ 
 	 *
 	 * @since 3.14.0
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Key_Validation_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Key_Validation_Service');
 
 		$this->configuration_service = $configuration_service;
 
-		add_action( 'admin_init', array( $this, 'wl_load_plugin' ) );
+		add_action('admin_init', array($this, 'wl_load_plugin'));
 		/**
 		 * Filter: wl_feature__enable__notices.
 		 *
@@ -65,11 +65,11 @@ 
 		 * @return bool
 		 * @since 3.27.6
 		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			add_action( 'admin_notices', array( $this, 'wl_key_update_notice' ) );
+		if (apply_filters('wl_feature__enable__notices', true)) {
+			add_action('admin_notices', array($this, 'wl_key_update_notice'));
 		}
 
-		$this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification');
+		$this->ttl_cache_service = new Ttl_Cache('key-validation-notification');
 
 	}
 
@@ -82,13 +82,13 @@ 
 	 * @since 3.9.0
 	 *
 	 */
-	public function get_account_info( $key ) {
+	public function get_account_info($key) {
 
-		$this->log->debug( 'Validating key...' );
+		$this->log->debug('Validating key...');
 
-		return Default_Api_Service::get_instance()->get( '/accounts/info', array(
+		return Default_Api_Service::get_instance()->get('/accounts/info', array(
 			'Authorization' => "Key $key",
-		) )->get_response();
+		))->get_response();
 	}
 
 	/**
@@ -98,21 +98,21 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_key_valid( $key ) {
+	public function is_key_valid($key) {
 
-		$response = $this->get_account_info( $key );
+		$response = $this->get_account_info($key);
 
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+		if (is_wp_error($response) || 2 !== (int) $response['response']['code'] / 100) {
 			return false;
 		}
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+		$res_body = json_decode(wp_remote_retrieve_body($response), true);
 
 		$url = $res_body['url'];
 
 		// Considering that production URL may be filtered.
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
-		if ( is_null( $url ) || $url === $site_url ) {
+		$home_url = get_option('home');
+		$site_url = apply_filters('wl_production_site_url', untrailingslashit($home_url));
+		if (is_null($url) || $url === $site_url) {
 			return true;
 		}
 
@@ -130,47 +130,47 @@ 
 		ob_clean();
 
 		// Check if we have a key.
-		if ( ! isset( $_POST['key'] ) ) {
-			wp_send_json_error( 'The key parameter is required.' );
+		if ( ! isset($_POST['key'])) {
+			wp_send_json_error('The key parameter is required.');
 		}
 
-		$response = $this->get_account_info( (string) $_POST['key'] );
+		$response = $this->get_account_info((string) $_POST['key']);
 
 		// If we got an error, return invalid.
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
-			wp_send_json_success( array( 'valid' => false, 'message' => '' ) );
+		if (is_wp_error($response) || 2 !== (int) $response['response']['code'] / 100) {
+			wp_send_json_success(array('valid' => false, 'message' => ''));
 		}
 
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+		$res_body = json_decode(wp_remote_retrieve_body($response), true);
 
 		// The URL stored in WLS. If this is the initial install the URL may be null.
 		$url = $res_body['url'];
 
 		// Considering that production URL may be filtered.
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
+		$home_url = get_option('home');
+		$site_url = apply_filters('wl_production_site_url', untrailingslashit($home_url));
 
 		// If the URL isn't set or matches, then it's valid.
-		if ( is_null( $url ) || $url === $site_url ) {
+		if (is_null($url) || $url === $site_url) {
 		    // Invalidate the cache key
-			$this->ttl_cache_service->delete('is_key_valid' );
-			wp_send_json_success( array( 'valid' => true, 'message' => '' ) );
+			$this->ttl_cache_service->delete('is_key_valid');
+			wp_send_json_success(array('valid' => true, 'message' => ''));
 		}
 
 		// If the URL doesn't match it means that this key has been configured elsewhere already.
-		if ( $url !== $site_url ) {
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			wp_send_json_success( array(
+		if ($url !== $site_url) {
+			Wordlift_Configuration_Service::get_instance()->set_key('');
+			wp_send_json_success(array(
 				'valid'   => false,
-				'message' => __( 'The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift' ),
-			) );
+				'message' => __('The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift'),
+			));
 		}
 
 		// Set a response with valid set to true or false according to the key validity with message.
-		wp_send_json_success( array(
+		wp_send_json_success(array(
 			'valid'   => false,
-			'message' => __( 'An error occurred, please contact us at hello@wordlift.io', 'wordlift' ),
-		) );
+			'message' => __('An error occurred, please contact us at hello@wordlift.io', 'wordlift'),
+		));
 	}
 
 	/**
@@ -179,15 +179,15 @@ 
 	 */
 	public function wl_load_plugin() {
 
-		$wl_blog_url = get_option( '_wl_blog_url' );
-		$home_url    = get_option( 'home' );
+		$wl_blog_url = get_option('_wl_blog_url');
+		$home_url    = get_option('home');
 
-		if ( ! $wl_blog_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-		} else if ( $wl_blog_url !== $home_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			set_transient( 'wl-key-error-msg', __( "Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift' ), 10 );
+		if ( ! $wl_blog_url) {
+			update_option('_wl_blog_url', $home_url, true);
+		} else if ($wl_blog_url !== $home_url) {
+			update_option('_wl_blog_url', $home_url, true);
+			Wordlift_Configuration_Service::get_instance()->set_key('');
+			set_transient('wl-key-error-msg', __("Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift'), 10);
 		}
 
 	}
@@ -197,10 +197,10 @@ 
 	 *
 	 */
 	public function wl_key_update_notice() {
-		if ( get_transient( 'wl-key-error-msg' ) ) {
+		if (get_transient('wl-key-error-msg')) {
 			?>
             <div class="updated notice is-dismissible error">
-                <p><?php _e( get_transient( 'wl-key-error-msg' ), 'wordlift' ); ?></p>
+                <p><?php _e(get_transient('wl-key-error-msg'), 'wordlift'); ?></p>
             </div>
 			<?php
 		}

src/includes/class-wordlift-http-api.php

Indentation +171 added lines, -171 removed lines

@@ -16,176 +16,176 @@
  */
 class Wordlift_Http_Api {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.3
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create a {@link Wordlift_End_Point} instance.
-	 *
-	 * @since 3.15.3
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		add_action( 'init', array( $this, 'add_rewrite_endpoint' ) );
-		add_action( 'template_redirect', array( $this, 'template_redirect' ) );
-
-		//region SAMPLE ACTIONS.
-		add_action( 'admin_post_wl_hello_world', array(
-			$this,
-			'hello_world',
-		) );
-		add_action( 'admin_post_nopriv_wl_hello_world', array(
-			$this,
-			'nopriv_hello_world',
-		) );
-		//endregion
-
-	}
-
-	/**
-	 * Add the `wl-api` rewrite end-point.
-	 *
-	 * @since 3.15.3
-	 */
-	public function add_rewrite_endpoint() {
-
-		add_rewrite_endpoint( 'wl-api', EP_ROOT );
-		$this->ensure_rewrite_rules_are_flushed();
-
-	}
-
-	/**
-	 * Handle `template_redirect` hooks.
-	 *
-	 * @since 3.15.3
-	 */
-	public function template_redirect() {
-
-		global $wp_query;
-
-		if ( ! isset( $wp_query->query_vars['wl-api'] ) ) {
-			$this->log->trace( 'Skipping, not a `wl-api` call.' );
-
-			return;
-		}
-
-		$this->do_action( (string) $_REQUEST['action'] );
-
-		exit;
-
-	}
-
-	/**
-	 * Do the requested action.
-	 *
-	 * @since 3.15.3
-	 *
-	 * @param string $action The action to execute.
-	 */
-	private function do_action( $action ) {
-
-		if ( empty( $action ) ) {
-			return;
-		}
-
-		if ( ! wp_validate_auth_cookie( '', 'logged_in' ) ) {
-			/**
-			 * Fires on a non-authenticated admin post request for the given action.
-			 *
-			 * The dynamic portion of the hook name, `$action`, refers to the given
-			 * request action.
-			 *
-			 * @since 2.6.0
-			 */
-			do_action( "admin_post_nopriv_{$action}" );
-		} else {
-			/**
-			 * Fires on an authenticated admin post request for the given action.
-			 *
-			 * The dynamic portion of the hook name, `$action`, refers to the given
-			 * request action.
-			 *
-			 * @since 2.6.0
-			 */
-			do_action( "admin_post_{$action}" );
-		}
-
-	}
-
-	/**
-	 * Test function, anonymous.
-	 *
-	 * @since 3.15.3
-	 */
-	public function nopriv_hello_world() {
-
-		wp_die( 'Hello World! (from anonymous)' );
-
-	}
-
-	/**
-	 * Test function, authenticated.
-	 *
-	 * @since 3.15.3
-	 */
-	public function hello_world() {
-
-		wp_die( 'Hello World! (from authenticated)' );
-
-	}
-
-	/**
-	 * Ensure that the rewrite rules are flushed the first time.
-	 *
-	 * @since 3.16.0 changed the value from 1 to `yes` to avoid type juggling issues.
-	 * @since 3.15.3
-	 */
-	public static function ensure_rewrite_rules_are_flushed() {
-
-		// See https://github.com/insideout10/wordlift-plugin/issues/698.
-		if ( 'yes' !== get_option( 'wl_http_api' ) ) {
-			update_option( 'wl_http_api', 'yes' );
-			add_action( 'wp_loaded', function () {
-				flush_rewrite_rules();
-			} );
-		}
-
-	}
-
-	/**
-	 * Called by {@see activate_wordlift}, resets the `wl_http_api` option flag in order to force WordLift to
-	 * reinitialize the `wl-api` route.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
-	 *
-	 * @since 3.19.2
-	 */
-	public static function activate() {
-
-		// Force the plugin to reinitialize the rewrite rules.
-		update_option( 'wl_http_api', 'no' );
-
-	}
-
-	/**
-	 * Delete the option when the plugin is deactivated.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/846
-	 */
-	public static function deactivate() {
-
-		delete_option( 'wl_http_api' );
-
-	}
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.3
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create a {@link Wordlift_End_Point} instance.
+     *
+     * @since 3.15.3
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        add_action( 'init', array( $this, 'add_rewrite_endpoint' ) );
+        add_action( 'template_redirect', array( $this, 'template_redirect' ) );
+
+        //region SAMPLE ACTIONS.
+        add_action( 'admin_post_wl_hello_world', array(
+            $this,
+            'hello_world',
+        ) );
+        add_action( 'admin_post_nopriv_wl_hello_world', array(
+            $this,
+            'nopriv_hello_world',
+        ) );
+        //endregion
+
+    }
+
+    /**
+     * Add the `wl-api` rewrite end-point.
+     *
+     * @since 3.15.3
+     */
+    public function add_rewrite_endpoint() {
+
+        add_rewrite_endpoint( 'wl-api', EP_ROOT );
+        $this->ensure_rewrite_rules_are_flushed();
+
+    }
+
+    /**
+     * Handle `template_redirect` hooks.
+     *
+     * @since 3.15.3
+     */
+    public function template_redirect() {
+
+        global $wp_query;
+
+        if ( ! isset( $wp_query->query_vars['wl-api'] ) ) {
+            $this->log->trace( 'Skipping, not a `wl-api` call.' );
+
+            return;
+        }
+
+        $this->do_action( (string) $_REQUEST['action'] );
+
+        exit;
+
+    }
+
+    /**
+     * Do the requested action.
+     *
+     * @since 3.15.3
+     *
+     * @param string $action The action to execute.
+     */
+    private function do_action( $action ) {
+
+        if ( empty( $action ) ) {
+            return;
+        }
+
+        if ( ! wp_validate_auth_cookie( '', 'logged_in' ) ) {
+            /**
+             * Fires on a non-authenticated admin post request for the given action.
+             *
+             * The dynamic portion of the hook name, `$action`, refers to the given
+             * request action.
+             *
+             * @since 2.6.0
+             */
+            do_action( "admin_post_nopriv_{$action}" );
+        } else {
+            /**
+             * Fires on an authenticated admin post request for the given action.
+             *
+             * The dynamic portion of the hook name, `$action`, refers to the given
+             * request action.
+             *
+             * @since 2.6.0
+             */
+            do_action( "admin_post_{$action}" );
+        }
+
+    }
+
+    /**
+     * Test function, anonymous.
+     *
+     * @since 3.15.3
+     */
+    public function nopriv_hello_world() {
+
+        wp_die( 'Hello World! (from anonymous)' );
+
+    }
+
+    /**
+     * Test function, authenticated.
+     *
+     * @since 3.15.3
+     */
+    public function hello_world() {
+
+        wp_die( 'Hello World! (from authenticated)' );
+
+    }
+
+    /**
+     * Ensure that the rewrite rules are flushed the first time.
+     *
+     * @since 3.16.0 changed the value from 1 to `yes` to avoid type juggling issues.
+     * @since 3.15.3
+     */
+    public static function ensure_rewrite_rules_are_flushed() {
+
+        // See https://github.com/insideout10/wordlift-plugin/issues/698.
+        if ( 'yes' !== get_option( 'wl_http_api' ) ) {
+            update_option( 'wl_http_api', 'yes' );
+            add_action( 'wp_loaded', function () {
+                flush_rewrite_rules();
+            } );
+        }
+
+    }
+
+    /**
+     * Called by {@see activate_wordlift}, resets the `wl_http_api` option flag in order to force WordLift to
+     * reinitialize the `wl-api` route.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
+     *
+     * @since 3.19.2
+     */
+    public static function activate() {
+
+        // Force the plugin to reinitialize the rewrite rules.
+        update_option( 'wl_http_api', 'no' );
+
+    }
+
+    /**
+     * Delete the option when the plugin is deactivated.
+     *
+     * @since 3.19.4
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/846
+     */
+    public static function deactivate() {
+
+        delete_option( 'wl_http_api' );
+
+    }
 
 }

Spacing +23 added lines, -23 removed lines

@@ -32,20 +32,20 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
-		add_action( 'init', array( $this, 'add_rewrite_endpoint' ) );
-		add_action( 'template_redirect', array( $this, 'template_redirect' ) );
+		add_action('init', array($this, 'add_rewrite_endpoint'));
+		add_action('template_redirect', array($this, 'template_redirect'));
 
 		//region SAMPLE ACTIONS.
-		add_action( 'admin_post_wl_hello_world', array(
+		add_action('admin_post_wl_hello_world', array(
 			$this,
 			'hello_world',
-		) );
-		add_action( 'admin_post_nopriv_wl_hello_world', array(
+		));
+		add_action('admin_post_nopriv_wl_hello_world', array(
 			$this,
 			'nopriv_hello_world',
-		) );
+		));
 		//endregion
 
 	}
@@ -57,7 +57,7 @@ 
 	 */
 	public function add_rewrite_endpoint() {
 
-		add_rewrite_endpoint( 'wl-api', EP_ROOT );
+		add_rewrite_endpoint('wl-api', EP_ROOT);
 		$this->ensure_rewrite_rules_are_flushed();
 
 	}
@@ -71,13 +71,13 @@ 
 
 		global $wp_query;
 
-		if ( ! isset( $wp_query->query_vars['wl-api'] ) ) {
-			$this->log->trace( 'Skipping, not a `wl-api` call.' );
+		if ( ! isset($wp_query->query_vars['wl-api'])) {
+			$this->log->trace('Skipping, not a `wl-api` call.');
 
 			return;
 		}
 
-		$this->do_action( (string) $_REQUEST['action'] );
+		$this->do_action((string) $_REQUEST['action']);
 
 		exit;
 
@@ -90,13 +90,13 @@ 
 	 *
 	 * @param string $action The action to execute.
 	 */
-	private function do_action( $action ) {
+	private function do_action($action) {
 
-		if ( empty( $action ) ) {
+		if (empty($action)) {
 			return;
 		}
 
-		if ( ! wp_validate_auth_cookie( '', 'logged_in' ) ) {
+		if ( ! wp_validate_auth_cookie('', 'logged_in')) {
 			/**
 			 * Fires on a non-authenticated admin post request for the given action.
 			 *
@@ -105,7 +105,7 @@ 
 			 *
 			 * @since 2.6.0
 			 */
-			do_action( "admin_post_nopriv_{$action}" );
+			do_action("admin_post_nopriv_{$action}");
 		} else {
 			/**
 			 * Fires on an authenticated admin post request for the given action.
@@ -115,7 +115,7 @@ 
 			 *
 			 * @since 2.6.0
 			 */
-			do_action( "admin_post_{$action}" );
+			do_action("admin_post_{$action}");
 		}
 
 	}
@@ -127,7 +127,7 @@ 
 	 */
 	public function nopriv_hello_world() {
 
-		wp_die( 'Hello World! (from anonymous)' );
+		wp_die('Hello World! (from anonymous)');
 
 	}
 
@@ -138,7 +138,7 @@ 
 	 */
 	public function hello_world() {
 
-		wp_die( 'Hello World! (from authenticated)' );
+		wp_die('Hello World! (from authenticated)');
 
 	}
 
@@ -151,9 +151,9 @@ 
 	public static function ensure_rewrite_rules_are_flushed() {
 
 		// See https://github.com/insideout10/wordlift-plugin/issues/698.
-		if ( 'yes' !== get_option( 'wl_http_api' ) ) {
-			update_option( 'wl_http_api', 'yes' );
-			add_action( 'wp_loaded', function () {
+		if ('yes' !== get_option('wl_http_api')) {
+			update_option('wl_http_api', 'yes');
+			add_action('wp_loaded', function() {
 				flush_rewrite_rules();
 			} );
 		}
@@ -171,7 +171,7 @@ 
 	public static function activate() {
 
 		// Force the plugin to reinitialize the rewrite rules.
-		update_option( 'wl_http_api', 'no' );
+		update_option('wl_http_api', 'no');
 
 	}
 
@@ -184,7 +184,7 @@ 
 	 */
 	public static function deactivate() {
 
-		delete_option( 'wl_http_api' );
+		delete_option('wl_http_api');
 
 	}
 

src/includes/class-wordlift-publisher-ajax-adapter.php

Indentation +40 added lines, -40 removed lines

@@ -16,55 +16,55 @@
  */
 class Wordlift_Publisher_Ajax_Adapter {
 
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	private $publisher_service;
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    private $publisher_service;
 
-	/**
-	 * Create a {@link Wordlift_Publisher_Ajax_Adapter} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	function __construct( $publisher_service ) {
+    /**
+     * Create a {@link Wordlift_Publisher_Ajax_Adapter} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    function __construct( $publisher_service ) {
 
-		$this->publisher_service = $publisher_service;
+        $this->publisher_service = $publisher_service;
 
-	}
+    }
 
-	/**
-	 * The publisher AJAX action. This function is hook to the `wl_publisher`
-	 * action.
-	 *
-	 * @since 3.11.0
-	 */
-	public function publisher() {
+    /**
+     * The publisher AJAX action. This function is hook to the `wl_publisher`
+     * action.
+     *
+     * @since 3.11.0
+     */
+    public function publisher() {
 
-		// Ensure we don't have garbage before us.
-		ob_clean();
+        // Ensure we don't have garbage before us.
+        ob_clean();
 
-		// Check if the current user can `manage_options`.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_send_json_error( 'Access denied.' );
-		}
+        // Check if the current user can `manage_options`.
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_send_json_error( 'Access denied.' );
+        }
 
-		// No actual search parameter was passed, bail out.
-		if ( ! isset( $_POST['q'] ) || empty( $_POST['q'] ) ) {
-			wp_send_json_error( 'The q parameter is required.' );
-		}
+        // No actual search parameter was passed, bail out.
+        if ( ! isset( $_POST['q'] ) || empty( $_POST['q'] ) ) {
+            wp_send_json_error( 'The q parameter is required.' );
+        }
 
-		// Get the response.
-		$response = $this->publisher_service->query( (string) $_POST['q'] );
+        // Get the response.
+        $response = $this->publisher_service->query( (string) $_POST['q'] );
 
-		// Finally output the response.
-		wp_send_json_success( $response );
+        // Finally output the response.
+        wp_send_json_success( $response );
 
-	}
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
 	 */
-	function __construct( $publisher_service ) {
+	function __construct($publisher_service) {
 
 		$this->publisher_service = $publisher_service;
 
@@ -50,20 +50,20 @@ 
 		ob_clean();
 
 		// Check if the current user can `manage_options`.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_send_json_error( 'Access denied.' );
+		if ( ! current_user_can('manage_options')) {
+			wp_send_json_error('Access denied.');
 		}
 
 		// No actual search parameter was passed, bail out.
-		if ( ! isset( $_POST['q'] ) || empty( $_POST['q'] ) ) {
-			wp_send_json_error( 'The q parameter is required.' );
+		if ( ! isset($_POST['q']) || empty($_POST['q'])) {
+			wp_send_json_error('The q parameter is required.');
 		}
 
 		// Get the response.
-		$response = $this->publisher_service->query( (string) $_POST['q'] );
+		$response = $this->publisher_service->query((string) $_POST['q']);
 
 		// Finally output the response.
-		wp_send_json_success( $response );
+		wp_send_json_success($response);
 
 	}
 

src/includes/class-wordlift-deactivator-feedback.php

Indentation +157 added lines, -157 removed lines

@@ -21,161 +21,161 @@
  */
 class Wordlift_Deactivator_Feedback {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.19.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.19.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * Wordlift_Deactivator_Feedback constructor.
-	 *
-	 * @since 3.19.0
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	public function __construct( $configuration_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Deactivator_Feedback' );
-
-		$this->configuration_service = $configuration_service;
-
-	}
-	/**
-	 * Checks whether we have permissions to show the popup.
-	 *
-	 * @version 3.19.0
-	 *
-	 * @return  bool `true` if we have permissions, false otherwise.
-	 */
-	private function has_permission_to_show_popup() {
-		// Get the current page.
-		global $pagenow;
-
-		// Bail if the user doesn't have permissions
-		// or if it's not the plugins page.
-		if ( 'plugins.php' !== $pagenow ) {
-			return false;
-		}
-
-		// Get the user preferences. We shouldn't show the feedback popup
-		// if we don't have permissions for that.
-		$user_preferences = $this->configuration_service->get_diagnostic_preferences();
-
-		// Bail. We don't have preferences to show the popup.
-		if ( 'yes' !== $user_preferences ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Render the feedback popup in the footer.
-	 *
-	 * @version 3.19.0
-	 *
-	 * @return  void
-	 */
-	public function render_feedback_popup() {
-		// Bail if we don't have permissions to show the popup.
-		if ( ! $this->has_permission_to_show_popup() ) {
-			return;
-		}
-		// Include the partial.
-		include plugin_dir_path( __FILE__ ) . '../admin/partials/wordlift-admin-deactivation-feedback-popup.php';
-	}
-
-	/**
-	 * Enqueue required popup scripts and styles.
-	 *
-	 * @version 3.19.0
-	 *
-	 * @return  void
-	 */
-	public function enqueue_popup_scripts() {
-		// Bail if we don't have permissions to show the popup.
-		if ( ! $this->has_permission_to_show_popup() ) {
-			return;
-		}
-
-		wp_enqueue_style( 'wordlift-admin-feedback-popup', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/css/wordlift-admin-feedback-popup.css', array() );
-		wp_enqueue_script( 'wordlift-admin-feedback-popup', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-admin-feedback-popup.js', array( 'jquery' ) );
-	}
-
-	/**
-	 * Handle the deactivation ajax call
-	 * and perform a request to external server.
-	 *
-	 * @version 3.19.0
-	 *
-	 * @return  void
-	 */
-	public function wl_deactivation_feedback() {
-		// Bail if the nonce is not valid.
-		if (
-			empty( $_POST['wl_deactivation_feedback_nonce'] ) || // The nonce doens't exists.
-			! wp_verify_nonce( $_POST['wl_deactivation_feedback_nonce'], 'wl_deactivation_feedback_nonce' ) // The nonce is invalid.
-		) {
-			wp_send_json_error( __( 'Nonce Security Check Failed!', 'wordlift' ) );
-		}
-
-		// We allow user to deactivate without providing a reason
-		// so bail and send success response.
-		if ( empty( $_POST['code'] ) ) {
-			wp_send_json_success();
-		}
-
-		$plugin_data = get_plugin_data( plugin_dir_path( dirname( __FILE__ ) ) . 'wordlift.php', false, false );
-
-		// Prepare the options.
-		$options = array(
-			// The deactivation reason.
-			'code'             => (string) $_POST['code'],
-			// Additional information if provided.
-			'details'          => ( ! empty( $_POST['details'] ) ) ? (string) $_POST['details'] : '',
-			// The website url.
-			'url'              => get_bloginfo( 'url' ),
-			// WP version.
-			'wordpressVersion' => get_bloginfo( 'version' ),
-			// WL version.
-			'wordliftVersion'  => $plugin_data['Version'],
-			// The admin email.
-			'email'            => get_bloginfo( 'admin_email' ),
-		);
-
-		$response = wp_remote_post(
-			$this->configuration_service->get_deactivation_feedback_url(),
-			array(
-				'method'  => 'POST',
-				'body'    => json_encode( $options ),
-				'headers' => array( 'Content-Type' => 'application/json; charset=utf-8' ),
-			)
-		);
-
-		$code    = wp_remote_retrieve_response_code( $response );
-		$message = wp_remote_retrieve_response_message( $response );
-
-		// Add message to the error log if the response code is not 200.
-		if ( 201 !== $code ) {
-			// Write the error in the logs.
-			$this->log->error( 'An error occurred while requesting a feedback endpoint error_code: ' . $code . ' message: ' . $message );
-		}
-
-		// We should send success message even when the feedback is not
-		// send, because otherwise the plugin cannot be deactivated.
-		wp_send_json_success();
-	}
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.19.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.19.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * Wordlift_Deactivator_Feedback constructor.
+     *
+     * @since 3.19.0
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    public function __construct( $configuration_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Deactivator_Feedback' );
+
+        $this->configuration_service = $configuration_service;
+
+    }
+    /**
+     * Checks whether we have permissions to show the popup.
+     *
+     * @version 3.19.0
+     *
+     * @return  bool `true` if we have permissions, false otherwise.
+     */
+    private function has_permission_to_show_popup() {
+        // Get the current page.
+        global $pagenow;
+
+        // Bail if the user doesn't have permissions
+        // or if it's not the plugins page.
+        if ( 'plugins.php' !== $pagenow ) {
+            return false;
+        }
+
+        // Get the user preferences. We shouldn't show the feedback popup
+        // if we don't have permissions for that.
+        $user_preferences = $this->configuration_service->get_diagnostic_preferences();
+
+        // Bail. We don't have preferences to show the popup.
+        if ( 'yes' !== $user_preferences ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Render the feedback popup in the footer.
+     *
+     * @version 3.19.0
+     *
+     * @return  void
+     */
+    public function render_feedback_popup() {
+        // Bail if we don't have permissions to show the popup.
+        if ( ! $this->has_permission_to_show_popup() ) {
+            return;
+        }
+        // Include the partial.
+        include plugin_dir_path( __FILE__ ) . '../admin/partials/wordlift-admin-deactivation-feedback-popup.php';
+    }
+
+    /**
+     * Enqueue required popup scripts and styles.
+     *
+     * @version 3.19.0
+     *
+     * @return  void
+     */
+    public function enqueue_popup_scripts() {
+        // Bail if we don't have permissions to show the popup.
+        if ( ! $this->has_permission_to_show_popup() ) {
+            return;
+        }
+
+        wp_enqueue_style( 'wordlift-admin-feedback-popup', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/css/wordlift-admin-feedback-popup.css', array() );
+        wp_enqueue_script( 'wordlift-admin-feedback-popup', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-admin-feedback-popup.js', array( 'jquery' ) );
+    }
+
+    /**
+     * Handle the deactivation ajax call
+     * and perform a request to external server.
+     *
+     * @version 3.19.0
+     *
+     * @return  void
+     */
+    public function wl_deactivation_feedback() {
+        // Bail if the nonce is not valid.
+        if (
+            empty( $_POST['wl_deactivation_feedback_nonce'] ) || // The nonce doens't exists.
+            ! wp_verify_nonce( $_POST['wl_deactivation_feedback_nonce'], 'wl_deactivation_feedback_nonce' ) // The nonce is invalid.
+        ) {
+            wp_send_json_error( __( 'Nonce Security Check Failed!', 'wordlift' ) );
+        }
+
+        // We allow user to deactivate without providing a reason
+        // so bail and send success response.
+        if ( empty( $_POST['code'] ) ) {
+            wp_send_json_success();
+        }
+
+        $plugin_data = get_plugin_data( plugin_dir_path( dirname( __FILE__ ) ) . 'wordlift.php', false, false );
+
+        // Prepare the options.
+        $options = array(
+            // The deactivation reason.
+            'code'             => (string) $_POST['code'],
+            // Additional information if provided.
+            'details'          => ( ! empty( $_POST['details'] ) ) ? (string) $_POST['details'] : '',
+            // The website url.
+            'url'              => get_bloginfo( 'url' ),
+            // WP version.
+            'wordpressVersion' => get_bloginfo( 'version' ),
+            // WL version.
+            'wordliftVersion'  => $plugin_data['Version'],
+            // The admin email.
+            'email'            => get_bloginfo( 'admin_email' ),
+        );
+
+        $response = wp_remote_post(
+            $this->configuration_service->get_deactivation_feedback_url(),
+            array(
+                'method'  => 'POST',
+                'body'    => json_encode( $options ),
+                'headers' => array( 'Content-Type' => 'application/json; charset=utf-8' ),
+            )
+        );
+
+        $code    = wp_remote_retrieve_response_code( $response );
+        $message = wp_remote_retrieve_response_message( $response );
+
+        // Add message to the error log if the response code is not 200.
+        if ( 201 !== $code ) {
+            // Write the error in the logs.
+            $this->log->error( 'An error occurred while requesting a feedback endpoint error_code: ' . $code . ' message: ' . $message );
+        }
+
+        // We should send success message even when the feedback is not
+        // send, because otherwise the plugin cannot be deactivated.
+        wp_send_json_success();
+    }
 }

Spacing +24 added lines, -24 removed lines

@@ -46,9 +46,9 @@ 
 	 *
 	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Deactivator_Feedback' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Deactivator_Feedback');
 
 		$this->configuration_service = $configuration_service;
 
@@ -66,7 +66,7 @@ 
 
 		// Bail if the user doesn't have permissions
 		// or if it's not the plugins page.
-		if ( 'plugins.php' !== $pagenow ) {
+		if ('plugins.php' !== $pagenow) {
 			return false;
 		}
 
@@ -75,7 +75,7 @@ 
 		$user_preferences = $this->configuration_service->get_diagnostic_preferences();
 
 		// Bail. We don't have preferences to show the popup.
-		if ( 'yes' !== $user_preferences ) {
+		if ('yes' !== $user_preferences) {
 			return false;
 		}
 
@@ -91,11 +91,11 @@ 
 	 */
 	public function render_feedback_popup() {
 		// Bail if we don't have permissions to show the popup.
-		if ( ! $this->has_permission_to_show_popup() ) {
+		if ( ! $this->has_permission_to_show_popup()) {
 			return;
 		}
 		// Include the partial.
-		include plugin_dir_path( __FILE__ ) . '../admin/partials/wordlift-admin-deactivation-feedback-popup.php';
+		include plugin_dir_path(__FILE__).'../admin/partials/wordlift-admin-deactivation-feedback-popup.php';
 	}
 
 	/**
@@ -107,12 +107,12 @@ 
 	 */
 	public function enqueue_popup_scripts() {
 		// Bail if we don't have permissions to show the popup.
-		if ( ! $this->has_permission_to_show_popup() ) {
+		if ( ! $this->has_permission_to_show_popup()) {
 			return;
 		}
 
-		wp_enqueue_style( 'wordlift-admin-feedback-popup', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/css/wordlift-admin-feedback-popup.css', array() );
-		wp_enqueue_script( 'wordlift-admin-feedback-popup', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-admin-feedback-popup.js', array( 'jquery' ) );
+		wp_enqueue_style('wordlift-admin-feedback-popup', plugin_dir_url(dirname(__FILE__)).'admin/css/wordlift-admin-feedback-popup.css', array());
+		wp_enqueue_script('wordlift-admin-feedback-popup', plugin_dir_url(dirname(__FILE__)).'admin/js/wordlift-admin-feedback-popup.js', array('jquery'));
 	}
 
 	/**
@@ -126,52 +126,52 @@ 
 	public function wl_deactivation_feedback() {
 		// Bail if the nonce is not valid.
 		if (
-			empty( $_POST['wl_deactivation_feedback_nonce'] ) || // The nonce doens't exists.
-			! wp_verify_nonce( $_POST['wl_deactivation_feedback_nonce'], 'wl_deactivation_feedback_nonce' ) // The nonce is invalid.
+			empty($_POST['wl_deactivation_feedback_nonce']) || // The nonce doens't exists.
+			! wp_verify_nonce($_POST['wl_deactivation_feedback_nonce'], 'wl_deactivation_feedback_nonce') // The nonce is invalid.
 		) {
-			wp_send_json_error( __( 'Nonce Security Check Failed!', 'wordlift' ) );
+			wp_send_json_error(__('Nonce Security Check Failed!', 'wordlift'));
 		}
 
 		// We allow user to deactivate without providing a reason
 		// so bail and send success response.
-		if ( empty( $_POST['code'] ) ) {
+		if (empty($_POST['code'])) {
 			wp_send_json_success();
 		}
 
-		$plugin_data = get_plugin_data( plugin_dir_path( dirname( __FILE__ ) ) . 'wordlift.php', false, false );
+		$plugin_data = get_plugin_data(plugin_dir_path(dirname(__FILE__)).'wordlift.php', false, false);
 
 		// Prepare the options.
 		$options = array(
 			// The deactivation reason.
 			'code'             => (string) $_POST['code'],
 			// Additional information if provided.
-			'details'          => ( ! empty( $_POST['details'] ) ) ? (string) $_POST['details'] : '',
+			'details'          => ( ! empty($_POST['details'])) ? (string) $_POST['details'] : '',
 			// The website url.
-			'url'              => get_bloginfo( 'url' ),
+			'url'              => get_bloginfo('url'),
 			// WP version.
-			'wordpressVersion' => get_bloginfo( 'version' ),
+			'wordpressVersion' => get_bloginfo('version'),
 			// WL version.
 			'wordliftVersion'  => $plugin_data['Version'],
 			// The admin email.
-			'email'            => get_bloginfo( 'admin_email' ),
+			'email'            => get_bloginfo('admin_email'),
 		);
 
 		$response = wp_remote_post(
 			$this->configuration_service->get_deactivation_feedback_url(),
 			array(
 				'method'  => 'POST',
-				'body'    => json_encode( $options ),
-				'headers' => array( 'Content-Type' => 'application/json; charset=utf-8' ),
+				'body'    => json_encode($options),
+				'headers' => array('Content-Type' => 'application/json; charset=utf-8'),
 			)
 		);
 
-		$code    = wp_remote_retrieve_response_code( $response );
-		$message = wp_remote_retrieve_response_message( $response );
+		$code    = wp_remote_retrieve_response_code($response);
+		$message = wp_remote_retrieve_response_message($response);
 
 		// Add message to the error log if the response code is not 200.
-		if ( 201 !== $code ) {
+		if (201 !== $code) {
 			// Write the error in the logs.
-			$this->log->error( 'An error occurred while requesting a feedback endpoint error_code: ' . $code . ' message: ' . $message );
+			$this->log->error('An error occurred while requesting a feedback endpoint error_code: '.$code.' message: '.$message);
 		}
 
 		// We should send success message even when the feedback is not

src/admin/class-wordlift-admin-schemaorg-property-metabox.php

Indentation +302 added lines, -302 removed lines

@@ -16,266 +16,266 @@ 
  */
 class Wordlift_Admin_Schemaorg_Property_Metabox {
 
-	/**
-	 * The action name used for `nonce` checks.
-	 *
-	 * @since 3.20.0
-	 */
-	const ACTION_NAME = '_wl_save_schemaorg_props';
-
-	/**
-	 * The `nonce` field name.
-	 *
-	 * @since 3.20.0
-	 */
-	const NONCE_NAME = '_wl_save_schemaorg_props_nonce';
-
-	/**
-	 * The following properties are the properties defined by the `Thing` entity type.
-	 *
-	 * Any change here must be reflected in {@link Wordlift_Entity_Post_To_Jsonld_Converter::convert()}, where
-	 * the `Thing` properties are loaded using the entity type's `custom_fields` entry provided by the
-	 * {@link Wordlift_Schema_Service}.
-	 *
-	 * @since 3.20.0
-	 */
-	private static $unsupported_properties = array(
-		'additionalType',
-		'alternateName',
-		'description',
-		'disambiguatingDescription',
-		'identifier',
-		'image',
-		'mainEntityOfPage',
-		'name',
-		'potentialAction',
-		'sameAs',
-		'subjectOf',
-		'url',
-	);
-
-	/**
-	 * The following array defines the ranges currently supported. In particular we currently support only
-	 * the basic data types.
-	 *
-	 * @since 3.20.0
-	 */
-	private static $supported_ranges = array(
-		'Boolean',
-		'False',
-		'True',
-		'Date',
-		'DateTime',
-		'Number',
-		'Float',
-		'Integer',
-		'Time',
-		'Text',
-		'URL',
-	);
-
-	/**
-	 * The {@link Wordlift_Schemaorg_Property_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Schemaorg_Property_Service $schemaorg_property_service The {@link Wordlift_Schemaorg_Property_Service} instance.
-	 */
-	private $schemaorg_property_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Schemaorg_Property_Metabox} instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service The {@link Wordlift_Schemaorg_Property_Service} instance.
-	 */
-	public function __construct( $schemaorg_property_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		// Add a hook to display the Schema.org properties metabox.
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ) );
-
-		// Add a hook to save the properties.
-		add_action( 'save_post', array( $this, 'save_post' ) );
-
-		// Add a hook to provide an Ajax end-point to load the Schema.org properties.
-		add_action( 'wp_ajax_wl_schemaorg_property', array( $this, 'schemaorg_property' ) );
-
-		$this->schemaorg_property_service = $schemaorg_property_service;
+    /**
+     * The action name used for `nonce` checks.
+     *
+     * @since 3.20.0
+     */
+    const ACTION_NAME = '_wl_save_schemaorg_props';
+
+    /**
+     * The `nonce` field name.
+     *
+     * @since 3.20.0
+     */
+    const NONCE_NAME = '_wl_save_schemaorg_props_nonce';
+
+    /**
+     * The following properties are the properties defined by the `Thing` entity type.
+     *
+     * Any change here must be reflected in {@link Wordlift_Entity_Post_To_Jsonld_Converter::convert()}, where
+     * the `Thing` properties are loaded using the entity type's `custom_fields` entry provided by the
+     * {@link Wordlift_Schema_Service}.
+     *
+     * @since 3.20.0
+     */
+    private static $unsupported_properties = array(
+        'additionalType',
+        'alternateName',
+        'description',
+        'disambiguatingDescription',
+        'identifier',
+        'image',
+        'mainEntityOfPage',
+        'name',
+        'potentialAction',
+        'sameAs',
+        'subjectOf',
+        'url',
+    );
+
+    /**
+     * The following array defines the ranges currently supported. In particular we currently support only
+     * the basic data types.
+     *
+     * @since 3.20.0
+     */
+    private static $supported_ranges = array(
+        'Boolean',
+        'False',
+        'True',
+        'Date',
+        'DateTime',
+        'Number',
+        'Float',
+        'Integer',
+        'Time',
+        'Text',
+        'URL',
+    );
+
+    /**
+     * The {@link Wordlift_Schemaorg_Property_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Schemaorg_Property_Service $schemaorg_property_service The {@link Wordlift_Schemaorg_Property_Service} instance.
+     */
+    private $schemaorg_property_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create a {@link Wordlift_Admin_Schemaorg_Property_Metabox} instance.
+     *
+     * @since 3.20.0
+     *
+     * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service The {@link Wordlift_Schemaorg_Property_Service} instance.
+     */
+    public function __construct( $schemaorg_property_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        // Add a hook to display the Schema.org properties metabox.
+        add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ) );
+
+        // Add a hook to save the properties.
+        add_action( 'save_post', array( $this, 'save_post' ) );
+
+        // Add a hook to provide an Ajax end-point to load the Schema.org properties.
+        add_action( 'wp_ajax_wl_schemaorg_property', array( $this, 'schemaorg_property' ) );
+
+        $this->schemaorg_property_service = $schemaorg_property_service;
+
+    }
+
+    /**
+     * Hook `add_meta_boxes`.
+     *
+     * @since 3.20.0
+     *
+     * @param string $post_type The current post type.
+     */
+    public function add_meta_boxes( $post_type ) {
+
+        // Bail out if the `post_type` isn't a valid entity post type.
+        if ( ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $post_type ) ) {
+            return;
+        }
 
-	}
+        // Add our metabox configuration.
+        add_meta_box(
+            'wl-schemaorg-property',
+            __( 'Schema.org Properties', 'wordlift' ),
+            array( $this, 'render' ),
+            $post_type,
+            'normal',
+            'default'
+        );
+
+    }
+
+    /**
+     * Hook `save_post`.
+     *
+     * The hook will receive the property data in the `$_POST` array.
+     *
+     * @since 3.20.0
+     *
+     * @param int $post_id The post id.
+     */
+    public function save_post( $post_id ) {
+
+        //region ## CHECKS.
+        // Add nonce for security and authentication.
+        $nonce_name = isset( $_POST[ self::NONCE_NAME ] ) ? (string) $_POST[ self::NONCE_NAME ] : '';
+
+        // Check if nonce is set.
+        if ( ! isset( $nonce_name ) ) {
+            $this->log->warn( '`nonce` not set.' );
+
+            return;
+        }
 
-	/**
-	 * Hook `add_meta_boxes`.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $post_type The current post type.
-	 */
-	public function add_meta_boxes( $post_type ) {
-
-		// Bail out if the `post_type` isn't a valid entity post type.
-		if ( ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $post_type ) ) {
-			return;
-		}
-
-		// Add our metabox configuration.
-		add_meta_box(
-			'wl-schemaorg-property',
-			__( 'Schema.org Properties', 'wordlift' ),
-			array( $this, 'render' ),
-			$post_type,
-			'normal',
-			'default'
-		);
+        // Check if nonce is valid.
+        if ( ! wp_verify_nonce( $nonce_name, self::ACTION_NAME ) ) {
+            $this->log->warn( 'Invalid `nonce`.' );
 
-	}
+            return;
+        }
 
-	/**
-	 * Hook `save_post`.
-	 *
-	 * The hook will receive the property data in the `$_POST` array.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param int $post_id The post id.
-	 */
-	public function save_post( $post_id ) {
+        // Check if user has permissions to save data.
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+            $this->log->warn( "User can't edit posts." );
 
-		//region ## CHECKS.
-		// Add nonce for security and authentication.
-		$nonce_name = isset( $_POST[ self::NONCE_NAME ] ) ? (string) $_POST[ self::NONCE_NAME ] : '';
+            return;
+        }
+
+        /*
+		 * If this is an autosave, our form has not been submitted,
+		 * so we don't want to do anything.
+		 */
+        if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+            $this->log->trace( "Doing autosave." );
 
-		// Check if nonce is set.
-		if ( ! isset( $nonce_name ) ) {
-			$this->log->warn( '`nonce` not set.' );
+            return;
+        }
 
-			return;
-		}
+        // Check if not an autosave.
+        if ( wp_is_post_autosave( $post_id ) ) {
+            $this->log->trace( "It's an autosave." );
 
-		// Check if nonce is valid.
-		if ( ! wp_verify_nonce( $nonce_name, self::ACTION_NAME ) ) {
-			$this->log->warn( 'Invalid `nonce`.' );
+            return;
+        }
 
-			return;
-		}
+        // Check if not a revision.
+        if ( wp_is_post_revision( $post_id ) ) {
+            $this->log->trace( "It's a revision." );
 
-		// Check if user has permissions to save data.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			$this->log->warn( "User can't edit posts." );
+            return;
+        }
 
-			return;
-		}
+        // check if there was a multisite switch before
+        if ( is_multisite() && ms_is_switched() ) {
+            $this->log->trace( "It's multisite and has been switched." );
 
-		/*
-		 * If this is an autosave, our form has not been submitted,
-		 * so we don't want to do anything.
-		 */
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-			$this->log->trace( "Doing autosave." );
-
-			return;
-		}
-
-		// Check if not an autosave.
-		if ( wp_is_post_autosave( $post_id ) ) {
-			$this->log->trace( "It's an autosave." );
-
-			return;
-		}
-
-		// Check if not a revision.
-		if ( wp_is_post_revision( $post_id ) ) {
-			$this->log->trace( "It's a revision." );
-
-			return;
-		}
-
-		// check if there was a multisite switch before
-		if ( is_multisite() && ms_is_switched() ) {
-			$this->log->trace( "It's multisite and has been switched." );
-
-			return;
-		}
-		//endregion
-
-		// Get only the `_wl_prop` keys.
-		$prop_keys = $this->schemaorg_property_service->get_keys( $post_id );
-
-		// Delete the existing properties.
-		foreach ( $prop_keys as $key ) {
-			delete_post_meta( $post_id, $key );
-		}
-
-		// Save the new props. The structure is:
-		//  - prop name
-		//    - instance uuid
-		//      - type: the prop data type.
-		//      - language: the prop value language.
-		//      - value: the prop value.
-		//
-		// `_wl_prop` is *not* Wordlift_Schemaorg_Property_Service::PREFIX.
-		foreach ( $_POST['_wl_prop'] as $name => $instances ) {
-			foreach ( $instances as $uuid => $meta ) {
-				foreach ( $meta as $meta_key => $meta_value ) {
-					if ( ! empty( $meta_value ) ) {
-						add_post_meta( $post_id, Wordlift_Schemaorg_Property_Service::PREFIX . "{$name}_{$uuid}_{$meta_key}", $meta_value );
-					}
-				}
-			}
-		}
+            return;
+        }
+        //endregion
 
-	}
+        // Get only the `_wl_prop` keys.
+        $prop_keys = $this->schemaorg_property_service->get_keys( $post_id );
 
-	/**
-	 * The Ajax end-point used to retrieve Schema.org properties data.
-	 *
-	 * @since 3.20.0
-	 */
-	public function schemaorg_property() {
-
-		//region ## NONCE VALIDATION.
-		// Check nonce, we don't send back a valid nonce if this one isn't valid, of course.
-		if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'wl_schemaorg_property' ) ) {
-			wp_send_json_error( array(
-				'message' => '`nonce` missing or invalid.',
-			) );
-		}
-
-		$next_nonce = wp_create_nonce( 'wl_schemaorg_property' );
-		//endregion
-
-		// Check that a `term_id` has been provided.
-		if ( empty( $_REQUEST['term_id'] ) ) {
-			wp_send_json_error( array(
-				'_wpnonce' => $next_nonce,
-				'message'  => '`term_id` missing or invalid.',
-			) );
-		}
-
-		// Get the class names from the term ids.
-		$class_names = array_map( function ( $term_id ) {
-			$sanitized = intval( $term_id );
-
-			return get_term_meta( $sanitized, Wordlift_Schemaorg_Class_Service::NAME_META_KEY, true );
-		}, $_REQUEST['term_id'] );
-
-		// Encode the class names as a json array.
-		$class_names_as_json_array = wp_json_encode( $class_names );
-
-		// Prepare the GraphQL query.
-		$query = "query {
+        // Delete the existing properties.
+        foreach ( $prop_keys as $key ) {
+            delete_post_meta( $post_id, $key );
+        }
+
+        // Save the new props. The structure is:
+        //  - prop name
+        //    - instance uuid
+        //      - type: the prop data type.
+        //      - language: the prop value language.
+        //      - value: the prop value.
+        //
+        // `_wl_prop` is *not* Wordlift_Schemaorg_Property_Service::PREFIX.
+        foreach ( $_POST['_wl_prop'] as $name => $instances ) {
+            foreach ( $instances as $uuid => $meta ) {
+                foreach ( $meta as $meta_key => $meta_value ) {
+                    if ( ! empty( $meta_value ) ) {
+                        add_post_meta( $post_id, Wordlift_Schemaorg_Property_Service::PREFIX . "{$name}_{$uuid}_{$meta_key}", $meta_value );
+                    }
+                }
+            }
+        }
+
+    }
+
+    /**
+     * The Ajax end-point used to retrieve Schema.org properties data.
+     *
+     * @since 3.20.0
+     */
+    public function schemaorg_property() {
+
+        //region ## NONCE VALIDATION.
+        // Check nonce, we don't send back a valid nonce if this one isn't valid, of course.
+        if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'wl_schemaorg_property' ) ) {
+            wp_send_json_error( array(
+                'message' => '`nonce` missing or invalid.',
+            ) );
+        }
+
+        $next_nonce = wp_create_nonce( 'wl_schemaorg_property' );
+        //endregion
+
+        // Check that a `term_id` has been provided.
+        if ( empty( $_REQUEST['term_id'] ) ) {
+            wp_send_json_error( array(
+                '_wpnonce' => $next_nonce,
+                'message'  => '`term_id` missing or invalid.',
+            ) );
+        }
+
+        // Get the class names from the term ids.
+        $class_names = array_map( function ( $term_id ) {
+            $sanitized = intval( $term_id );
+
+            return get_term_meta( $sanitized, Wordlift_Schemaorg_Class_Service::NAME_META_KEY, true );
+        }, $_REQUEST['term_id'] );
+
+        // Encode the class names as a json array.
+        $class_names_as_json_array = wp_json_encode( $class_names );
+
+        // Prepare the GraphQL query.
+        $query = "query {
 	schemaProperties(classes: $class_names_as_json_array) {
 		name label description weight ranges {
             name label
@@ -283,66 +283,66 @@ 
 	}
 }";
 
-		// Send the request to the remote server.
-		$reply = wp_remote_post( 'http://turin.wordlift.it:41660/graphql', array(
-			'headers' => array(
-				'Content-Type' => 'application/json; charset=UTF-8',
-			),
-			'body'    => wp_json_encode( array(
-				'query'     => $query,
-				'variables' => null,
-			) ),
-		) );
-
-		// If the response is empty return an error.
-		if ( empty( $reply['body'] ) ) {
-			wp_send_json_error();
-		}
-
-		// Decode the response.
-		$json = json_decode( $reply['body'], true );
-
-		// Remove unsupported ranges.
-		$json['schemaProperties'] = array_map( function ( $item ) {
-			// Remove unsupported ranges.
-			$item['ranges'] = array_values( array_filter( $item['ranges'], function ( $range ) {
-				return in_array( $range['name'], Wordlift_Admin_Schemaorg_Property_Metabox::$supported_ranges );
-			} ) );
-
-			return $item;
-		}, $json['schemaProperties'] );
-
-		// Remove unwanted properties (properties from the `Thing` entity type).
-		$json['schemaProperties'] = array_values( array_filter( $json['schemaProperties'], function ( $item ) {
-			return 0 < count( $item['ranges'] ) && ! in_array( $item['name'], Wordlift_Admin_Schemaorg_Property_Metabox::$unsupported_properties );
-		} ) );
-
-		/**
-		 * Filter: wl_schemaorg_properties_for_classes.
-		 *
-		 * @since 3.20.0
-		 *
-		 * @param array $json A json instance as array.
-		 * @param array $classes An array of Schema.org classes.
-		 */
-		$properties = apply_filters( 'wl_schemaorg_properties_for_classes', $json, $class_names );
-
-		// Finally output the response.
-		wp_send_json_success( $properties );
-
-	}
+        // Send the request to the remote server.
+        $reply = wp_remote_post( 'http://turin.wordlift.it:41660/graphql', array(
+            'headers' => array(
+                'Content-Type' => 'application/json; charset=UTF-8',
+            ),
+            'body'    => wp_json_encode( array(
+                'query'     => $query,
+                'variables' => null,
+            ) ),
+        ) );
+
+        // If the response is empty return an error.
+        if ( empty( $reply['body'] ) ) {
+            wp_send_json_error();
+        }
 
-	/**
-	 * Render the metabox.
-	 *
-	 * @since 3.20.0
-	 */
-	public function render() {
-		?>
+        // Decode the response.
+        $json = json_decode( $reply['body'], true );
+
+        // Remove unsupported ranges.
+        $json['schemaProperties'] = array_map( function ( $item ) {
+            // Remove unsupported ranges.
+            $item['ranges'] = array_values( array_filter( $item['ranges'], function ( $range ) {
+                return in_array( $range['name'], Wordlift_Admin_Schemaorg_Property_Metabox::$supported_ranges );
+            } ) );
+
+            return $item;
+        }, $json['schemaProperties'] );
+
+        // Remove unwanted properties (properties from the `Thing` entity type).
+        $json['schemaProperties'] = array_values( array_filter( $json['schemaProperties'], function ( $item ) {
+            return 0 < count( $item['ranges'] ) && ! in_array( $item['name'], Wordlift_Admin_Schemaorg_Property_Metabox::$unsupported_properties );
+        } ) );
+
+        /**
+         * Filter: wl_schemaorg_properties_for_classes.
+         *
+         * @since 3.20.0
+         *
+         * @param array $json A json instance as array.
+         * @param array $classes An array of Schema.org classes.
+         */
+        $properties = apply_filters( 'wl_schemaorg_properties_for_classes', $json, $class_names );
+
+        // Finally output the response.
+        wp_send_json_success( $properties );
+
+    }
+
+    /**
+     * Render the metabox.
+     *
+     * @since 3.20.0
+     */
+    public function render() {
+        ?>
         <input type="hidden" name="<?php echo self::NONCE_NAME; ?>"
                value="<?php echo wp_create_nonce( self::ACTION_NAME ); ?>"/>
         <div id="wl-schema-properties-form"></div>
 		<?php
-	}
+    }
 
 }

Spacing +62 added lines, -62 removed lines

@@ -99,18 +99,18 @@ 
 	 *
 	 * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service The {@link Wordlift_Schemaorg_Property_Service} instance.
 	 */
-	public function __construct( $schemaorg_property_service ) {
+	public function __construct($schemaorg_property_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		// Add a hook to display the Schema.org properties metabox.
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ) );
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'));
 
 		// Add a hook to save the properties.
-		add_action( 'save_post', array( $this, 'save_post' ) );
+		add_action('save_post', array($this, 'save_post'));
 
 		// Add a hook to provide an Ajax end-point to load the Schema.org properties.
-		add_action( 'wp_ajax_wl_schemaorg_property', array( $this, 'schemaorg_property' ) );
+		add_action('wp_ajax_wl_schemaorg_property', array($this, 'schemaorg_property'));
 
 		$this->schemaorg_property_service = $schemaorg_property_service;
 
@@ -123,18 +123,18 @@ 
 	 *
 	 * @param string $post_type The current post type.
 	 */
-	public function add_meta_boxes( $post_type ) {
+	public function add_meta_boxes($post_type) {
 
 		// Bail out if the `post_type` isn't a valid entity post type.
-		if ( ! Wordlift_Entity_Type_Service::is_valid_entity_post_type( $post_type ) ) {
+		if ( ! Wordlift_Entity_Type_Service::is_valid_entity_post_type($post_type)) {
 			return;
 		}
 
 		// Add our metabox configuration.
 		add_meta_box(
 			'wl-schemaorg-property',
-			__( 'Schema.org Properties', 'wordlift' ),
-			array( $this, 'render' ),
+			__('Schema.org Properties', 'wordlift'),
+			array($this, 'render'),
 			$post_type,
 			'normal',
 			'default'
@@ -151,29 +151,29 @@ 
 	 *
 	 * @param int $post_id The post id.
 	 */
-	public function save_post( $post_id ) {
+	public function save_post($post_id) {
 
 		//region ## CHECKS.
 		// Add nonce for security and authentication.
-		$nonce_name = isset( $_POST[ self::NONCE_NAME ] ) ? (string) $_POST[ self::NONCE_NAME ] : '';
+		$nonce_name = isset($_POST[self::NONCE_NAME]) ? (string) $_POST[self::NONCE_NAME] : '';
 
 		// Check if nonce is set.
-		if ( ! isset( $nonce_name ) ) {
-			$this->log->warn( '`nonce` not set.' );
+		if ( ! isset($nonce_name)) {
+			$this->log->warn('`nonce` not set.');
 
 			return;
 		}
 
 		// Check if nonce is valid.
-		if ( ! wp_verify_nonce( $nonce_name, self::ACTION_NAME ) ) {
-			$this->log->warn( 'Invalid `nonce`.' );
+		if ( ! wp_verify_nonce($nonce_name, self::ACTION_NAME)) {
+			$this->log->warn('Invalid `nonce`.');
 
 			return;
 		}
 
 		// Check if user has permissions to save data.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			$this->log->warn( "User can't edit posts." );
+		if ( ! current_user_can('edit_post', $post_id)) {
+			$this->log->warn("User can't edit posts.");
 
 			return;
 		}
@@ -182,40 +182,40 @@ 
 		 * If this is an autosave, our form has not been submitted,
 		 * so we don't want to do anything.
 		 */
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-			$this->log->trace( "Doing autosave." );
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+			$this->log->trace("Doing autosave.");
 
 			return;
 		}
 
 		// Check if not an autosave.
-		if ( wp_is_post_autosave( $post_id ) ) {
-			$this->log->trace( "It's an autosave." );
+		if (wp_is_post_autosave($post_id)) {
+			$this->log->trace("It's an autosave.");
 
 			return;
 		}
 
 		// Check if not a revision.
-		if ( wp_is_post_revision( $post_id ) ) {
-			$this->log->trace( "It's a revision." );
+		if (wp_is_post_revision($post_id)) {
+			$this->log->trace("It's a revision.");
 
 			return;
 		}
 
 		// check if there was a multisite switch before
-		if ( is_multisite() && ms_is_switched() ) {
-			$this->log->trace( "It's multisite and has been switched." );
+		if (is_multisite() && ms_is_switched()) {
+			$this->log->trace("It's multisite and has been switched.");
 
 			return;
 		}
 		//endregion
 
 		// Get only the `_wl_prop` keys.
-		$prop_keys = $this->schemaorg_property_service->get_keys( $post_id );
+		$prop_keys = $this->schemaorg_property_service->get_keys($post_id);
 
 		// Delete the existing properties.
-		foreach ( $prop_keys as $key ) {
-			delete_post_meta( $post_id, $key );
+		foreach ($prop_keys as $key) {
+			delete_post_meta($post_id, $key);
 		}
 
 		// Save the new props. The structure is:
@@ -226,11 +226,11 @@ 
 		//      - value: the prop value.
 		//
 		// `_wl_prop` is *not* Wordlift_Schemaorg_Property_Service::PREFIX.
-		foreach ( $_POST['_wl_prop'] as $name => $instances ) {
-			foreach ( $instances as $uuid => $meta ) {
-				foreach ( $meta as $meta_key => $meta_value ) {
-					if ( ! empty( $meta_value ) ) {
-						add_post_meta( $post_id, Wordlift_Schemaorg_Property_Service::PREFIX . "{$name}_{$uuid}_{$meta_key}", $meta_value );
+		foreach ($_POST['_wl_prop'] as $name => $instances) {
+			foreach ($instances as $uuid => $meta) {
+				foreach ($meta as $meta_key => $meta_value) {
+					if ( ! empty($meta_value)) {
+						add_post_meta($post_id, Wordlift_Schemaorg_Property_Service::PREFIX."{$name}_{$uuid}_{$meta_key}", $meta_value);
 					}
 				}
 			}
@@ -247,32 +247,32 @@ 
 
 		//region ## NONCE VALIDATION.
 		// Check nonce, we don't send back a valid nonce if this one isn't valid, of course.
-		if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'wl_schemaorg_property' ) ) {
-			wp_send_json_error( array(
+		if ( ! wp_verify_nonce($_REQUEST['_wpnonce'], 'wl_schemaorg_property')) {
+			wp_send_json_error(array(
 				'message' => '`nonce` missing or invalid.',
-			) );
+			));
 		}
 
-		$next_nonce = wp_create_nonce( 'wl_schemaorg_property' );
+		$next_nonce = wp_create_nonce('wl_schemaorg_property');
 		//endregion
 
 		// Check that a `term_id` has been provided.
-		if ( empty( $_REQUEST['term_id'] ) ) {
-			wp_send_json_error( array(
+		if (empty($_REQUEST['term_id'])) {
+			wp_send_json_error(array(
 				'_wpnonce' => $next_nonce,
 				'message'  => '`term_id` missing or invalid.',
-			) );
+			));
 		}
 
 		// Get the class names from the term ids.
-		$class_names = array_map( function ( $term_id ) {
-			$sanitized = intval( $term_id );
+		$class_names = array_map(function($term_id) {
+			$sanitized = intval($term_id);
 
-			return get_term_meta( $sanitized, Wordlift_Schemaorg_Class_Service::NAME_META_KEY, true );
-		}, $_REQUEST['term_id'] );
+			return get_term_meta($sanitized, Wordlift_Schemaorg_Class_Service::NAME_META_KEY, true);
+		}, $_REQUEST['term_id']);
 
 		// Encode the class names as a json array.
-		$class_names_as_json_array = wp_json_encode( $class_names );
+		$class_names_as_json_array = wp_json_encode($class_names);
 
 		// Prepare the GraphQL query.
 		$query = "query {
@@ -284,38 +284,38 @@ 
 }";
 
 		// Send the request to the remote server.
-		$reply = wp_remote_post( 'http://turin.wordlift.it:41660/graphql', array(
+		$reply = wp_remote_post('http://turin.wordlift.it:41660/graphql', array(
 			'headers' => array(
 				'Content-Type' => 'application/json; charset=UTF-8',
 			),
-			'body'    => wp_json_encode( array(
+			'body'    => wp_json_encode(array(
 				'query'     => $query,
 				'variables' => null,
-			) ),
-		) );
+			)),
+		));
 
 		// If the response is empty return an error.
-		if ( empty( $reply['body'] ) ) {
+		if (empty($reply['body'])) {
 			wp_send_json_error();
 		}
 
 		// Decode the response.
-		$json = json_decode( $reply['body'], true );
+		$json = json_decode($reply['body'], true);
 
 		// Remove unsupported ranges.
-		$json['schemaProperties'] = array_map( function ( $item ) {
+		$json['schemaProperties'] = array_map(function($item) {
 			// Remove unsupported ranges.
-			$item['ranges'] = array_values( array_filter( $item['ranges'], function ( $range ) {
-				return in_array( $range['name'], Wordlift_Admin_Schemaorg_Property_Metabox::$supported_ranges );
-			} ) );
+			$item['ranges'] = array_values(array_filter($item['ranges'], function($range) {
+				return in_array($range['name'], Wordlift_Admin_Schemaorg_Property_Metabox::$supported_ranges);
+			} ));
 
 			return $item;
-		}, $json['schemaProperties'] );
+		}, $json['schemaProperties']);
 
 		// Remove unwanted properties (properties from the `Thing` entity type).
-		$json['schemaProperties'] = array_values( array_filter( $json['schemaProperties'], function ( $item ) {
-			return 0 < count( $item['ranges'] ) && ! in_array( $item['name'], Wordlift_Admin_Schemaorg_Property_Metabox::$unsupported_properties );
-		} ) );
+		$json['schemaProperties'] = array_values(array_filter($json['schemaProperties'], function($item) {
+			return 0 < count($item['ranges']) && ! in_array($item['name'], Wordlift_Admin_Schemaorg_Property_Metabox::$unsupported_properties);
+		} ));
 
 		/**
 		 * Filter: wl_schemaorg_properties_for_classes.
@@ -325,10 +325,10 @@ 
 		 * @param array $json A json instance as array.
 		 * @param array $classes An array of Schema.org classes.
 		 */
-		$properties = apply_filters( 'wl_schemaorg_properties_for_classes', $json, $class_names );
+		$properties = apply_filters('wl_schemaorg_properties_for_classes', $json, $class_names);
 
 		// Finally output the response.
-		wp_send_json_success( $properties );
+		wp_send_json_success($properties);
 
 	}
 
@@ -340,7 +340,7 @@ 
 	public function render() {
 		?>
         <input type="hidden" name="<?php echo self::NONCE_NAME; ?>"
-               value="<?php echo wp_create_nonce( self::ACTION_NAME ); ?>"/>
+               value="<?php echo wp_create_nonce(self::ACTION_NAME); ?>"/>
         <div id="wl-schema-properties-form"></div>
 		<?php
 	}