insideout10 / wordlift-plugin

src/wordlift_redlink.php

Indentation +42 added lines, -42 removed lines

@@ -18,59 +18,59 @@
  */
 function rl_execute_sparql_update_query( $query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
 
-	if ( get_transient( 'DISABLE_ENTITY_PUSH') ) {
-		return true;
-	}
+    if ( get_transient( 'DISABLE_ENTITY_PUSH') ) {
+        return true;
+    }
 
-	// Queue the update query.
-	if ( $queue ) {
+    // Queue the update query.
+    if ( $queue ) {
 
-		if ( WP_DEBUG ) {
-			global $wl_logger;
-			$wl_logger->trace( "Buffering a query [ query :: $query ]" );
-		}
+        if ( WP_DEBUG ) {
+            global $wl_logger;
+            $wl_logger->trace( "Buffering a query [ query :: $query ]" );
+        }
 
-		wl_queue_sparql_update_query( $query );
+        wl_queue_sparql_update_query( $query );
 
-		return true;
-	}
+        return true;
+    }
 
-	// Get the update end-point.
-	$url = wl_configuration_get_query_update_url();
+    // Get the update end-point.
+    $url = wl_configuration_get_query_update_url();
 
-	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
-		'method'  => 'POST',
-		'headers' => array(
-			'Accept'       => 'application/json',
-			'Content-type' => 'application/sparql-update; charset=utf-8',
-		),
-		'body'    => $query,
-	) );
+    // Prepare the request.
+    $args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+        'method'  => 'POST',
+        'headers' => array(
+            'Accept'       => 'application/json',
+            'Content-type' => 'application/sparql-update; charset=utf-8',
+        ),
+        'body'    => $query,
+    ) );
 
-	// Send the request.
-	$response = wp_remote_post( $url, $args );
+    // Send the request.
+    $response = wp_remote_post( $url, $args );
 
-	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+    // If an error has been raised, return the error.
+    if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+        $body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
 
-		wl_write_log( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+        wl_write_log( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
+        wl_write_log( "\n" . var_export( $args, true ) );
+        wl_write_log( "[ response :: " );
+        wl_write_log( "\n" . var_export( $response, true ) );
+        wl_write_log( "][ body :: " );
+        wl_write_log( "\n" . $body );
+        wl_write_log( "]" );
 
-		return false;
-	}
+        return false;
+    }
 
-	if ( WP_DEBUG ) {
-		global $wl_logger;
-		$wl_logger->trace( "Query executed successfully [ query :: $query ]" );
-	}
+    if ( WP_DEBUG ) {
+        global $wl_logger;
+        $wl_logger->trace( "Query executed successfully [ query :: $query ]" );
+    }
 
-	return true;
+    return true;
 }

Spacing +20 added lines, -20 removed lines

@@ -16,21 +16,21 @@ 
  *
  * @return bool True if successful otherwise false.
  */
-function rl_execute_sparql_update_query( $query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+function rl_execute_sparql_update_query($query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING) {
 
-	if ( get_transient( 'DISABLE_ENTITY_PUSH') ) {
+	if (get_transient('DISABLE_ENTITY_PUSH')) {
 		return true;
 	}
 
 	// Queue the update query.
-	if ( $queue ) {
+	if ($queue) {
 
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			global $wl_logger;
-			$wl_logger->trace( "Buffering a query [ query :: $query ]" );
+			$wl_logger->trace("Buffering a query [ query :: $query ]");
 		}
 
-		wl_queue_sparql_update_query( $query );
+		wl_queue_sparql_update_query($query);
 
 		return true;
 	}
@@ -39,37 +39,37 @@ 
 	$url = wl_configuration_get_query_update_url();
 
 	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+	$args = array_merge_recursive(unserialize(WL_REDLINK_API_HTTP_OPTIONS), array(
 		'method'  => 'POST',
 		'headers' => array(
 			'Accept'       => 'application/json',
 			'Content-type' => 'application/sparql-update; charset=utf-8',
 		),
 		'body'    => $query,
-	) );
+	));
 
 	// Send the request.
-	$response = wp_remote_post( $url, $args );
+	$response = wp_remote_post($url, $args);
 
 	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+	if (is_wp_error($response) || 200 !== (int) $response['response']['code']) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+		$body = (is_wp_error($response) ? $response->get_error_message() : $response['body']);
 
-		wl_write_log( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+		wl_write_log("rl_execute_sparql_update_query : error [ url :: $url ][ args :: ");
+		wl_write_log("\n".var_export($args, true));
+		wl_write_log("[ response :: ");
+		wl_write_log("\n".var_export($response, true));
+		wl_write_log("][ body :: ");
+		wl_write_log("\n".$body);
+		wl_write_log("]");
 
 		return false;
 	}
 
-	if ( WP_DEBUG ) {
+	if (WP_DEBUG) {
 		global $wl_logger;
-		$wl_logger->trace( "Query executed successfully [ query :: $query ]" );
+		$wl_logger->trace("Query executed successfully [ query :: $query ]");
 	}
 
 	return true;

src/wordlift_entity_functions.php

Indentation +136 added lines, -136 removed lines

@@ -13,35 +13,35 @@ 
 function wl_get_entity_post_ids_by_uris( $uris ) {
 
 
-	if ( empty( $uris ) ) {
-		return array();
-	}
-
-	$query = new WP_Query( array(
-			'fields'      => 'ids',
-			'post_status' => 'any',
-			'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
-			'meta_query'  => array(
-				'relation' => 'OR',
-				array(
-					'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-					'value'   => $uris,
-					'compare' => 'IN',
-				),
-				array(
-					'key'     => 'entity_url',
-					'value'   => $uris,
-					'compare' => 'IN',
-				),
-			),
-		)
-	);
-
-	// Get the matching entity posts.
-	$posts = $query->get_posts();
-
-	// Return the array
-	return $posts;
+    if ( empty( $uris ) ) {
+        return array();
+    }
+
+    $query = new WP_Query( array(
+            'fields'      => 'ids',
+            'post_status' => 'any',
+            'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
+            'meta_query'  => array(
+                'relation' => 'OR',
+                array(
+                    'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                    'value'   => $uris,
+                    'compare' => 'IN',
+                ),
+                array(
+                    'key'     => 'entity_url',
+                    'value'   => $uris,
+                    'compare' => 'IN',
+                ),
+            ),
+        )
+    );
+
+    // Get the matching entity posts.
+    $posts = $query->get_posts();
+
+    // Return the array
+    return $posts;
 }
 
 /**
@@ -56,29 +56,29 @@ 
  */
 function wl_build_entity_uri( $post_id ) {
 
-	// Get the post.
-	$post = get_post( $post_id );
+    // Get the post.
+    $post = get_post( $post_id );
 
-	if ( NULL === $post ) {
-		wl_write_log( "wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]" );
+    if ( NULL === $post ) {
+        wl_write_log( "wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]" );
 
-		return NULL;
-	}
+        return NULL;
+    }
 
-	// Create an ID given the title.
-	$entity_slug = wl_sanitize_uri_path( $post->post_title );
-	// If the entity slug is empty, i.e. there's no title, use the post ID as path.
-	if ( empty( $entity_slug ) ) {
-		return sprintf( '%s/%s/%s',
-			wl_configuration_get_redlink_dataset_uri(),
-			$post->post_type,
-			"id/$post->ID"
-		);
-	}
+    // Create an ID given the title.
+    $entity_slug = wl_sanitize_uri_path( $post->post_title );
+    // If the entity slug is empty, i.e. there's no title, use the post ID as path.
+    if ( empty( $entity_slug ) ) {
+        return sprintf( '%s/%s/%s',
+            wl_configuration_get_redlink_dataset_uri(),
+            $post->post_type,
+            "id/$post->ID"
+        );
+    }
 
-	return Wordlift_Uri_Service::get_instance()->build_uri(
-		$entity_slug,
-		$post->post_type );
+    return Wordlift_Uri_Service::get_instance()->build_uri(
+        $entity_slug,
+        $post->post_type );
 
 }
 
@@ -96,7 +96,7 @@ 
  */
 function wl_get_entity_uri( $post_id ) {
 
-	return Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+    return Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
 }
 
 /**
@@ -109,9 +109,9 @@ 
  */
 function wl_set_entity_uri( $post_id, $uri ) {
 
-	// wl_write_log( "wl_set_entity_uri [ post id :: $post_id ][ uri :: $uri ]" );
+    // wl_write_log( "wl_set_entity_uri [ post id :: $post_id ][ uri :: $uri ]" );
 
-	return update_post_meta( $post_id, WL_ENTITY_URL_META_NAME, $uri );
+    return update_post_meta( $post_id, WL_ENTITY_URL_META_NAME, $uri );
 }
 
 
@@ -125,7 +125,7 @@ 
  * @return array An array of terms.
  */
 function wl_get_entity_rdf_types( $post_id ) {
-	return get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
+    return get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
 }
 
 /**
@@ -136,21 +136,21 @@ 
  */
 function wl_set_entity_rdf_types( $post_id, $type_uris = array() ) {
 
-	// Avoid errors because of null values.
-	if ( is_null( $type_uris ) ) {
-		$type_uris = array();
-	}
-
-	// Ensure there are no duplicates.
-	$type_uris = array_unique( $type_uris );
-
-	delete_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
-	foreach ( $type_uris as $type_uri ) {
-		if ( empty( $type_uri ) ) {
-			continue;
-		}
-		add_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri );
-	}
+    // Avoid errors because of null values.
+    if ( is_null( $type_uris ) ) {
+        $type_uris = array();
+    }
+
+    // Ensure there are no duplicates.
+    $type_uris = array_unique( $type_uris );
+
+    delete_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
+    foreach ( $type_uris as $type_uri ) {
+        if ( empty( $type_uri ) ) {
+            continue;
+        }
+        add_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri );
+    }
 }
 
 /**
@@ -163,33 +163,33 @@ 
  */
 function wl_get_meta_type( $property_name ) {
 
-	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
-		return NULL;
-	}
+    // Property name must be defined.
+    if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+        return NULL;
+    }
 
-	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+    // store eventual schema name in  different variable
+    $property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
 
-	// Loop over custom_fields
-	$entity_terms = wl_entity_taxonomy_get_custom_fields();
+    // Loop over custom_fields
+    $entity_terms = wl_entity_taxonomy_get_custom_fields();
 
-	foreach ( $entity_terms as $term ) {
+    foreach ( $entity_terms as $term ) {
 
-		foreach ( $term as $wl_constant => $field ) {
+        foreach ( $term as $wl_constant => $field ) {
 
-			// Is this the predicate we are searching for?
-			if ( isset( $field['type'] ) ) {
-				$found_predicate = isset( $field['predicate'] ) && ( $field['predicate'] == $property_schema_name );
-				$found_constant  = ( $wl_constant == $property_name );
-				if ( $found_predicate || $found_constant ) {
-					return $field['type'];
-				}
-			}
-		}
-	}
+            // Is this the predicate we are searching for?
+            if ( isset( $field['type'] ) ) {
+                $found_predicate = isset( $field['predicate'] ) && ( $field['predicate'] == $property_schema_name );
+                $found_constant  = ( $wl_constant == $property_name );
+                if ( $found_predicate || $found_constant ) {
+                    return $field['type'];
+                }
+            }
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
 /**
@@ -202,31 +202,31 @@ 
  */
 function wl_get_meta_constraints( $property_name ) {
 
-	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
-		return NULL;
-	}
-
-	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
-
-	// Get WL taxonomy mapping.
-	$types = wl_entity_taxonomy_get_custom_fields();
-
-	// Loop over types
-	foreach ( $types as $type ) {
-		// Loop over custom fields of this type
-		foreach ( $type as $property => $field ) {
-			if ( isset( $field['constraints'] ) && ! empty( $field['constraints'] ) ) {
-				// Is this the property we are searhing for?
-				if ( ( $property == $property_name ) || ( $field['predicate'] == $property_schema_name ) ) {
-					return $field['constraints'];
-				}
-			}
-		}
-	}
-
-	return NULL;
+    // Property name must be defined.
+    if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+        return NULL;
+    }
+
+    // store eventual schema name in  different variable
+    $property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+
+    // Get WL taxonomy mapping.
+    $types = wl_entity_taxonomy_get_custom_fields();
+
+    // Loop over types
+    foreach ( $types as $type ) {
+        // Loop over custom fields of this type
+        foreach ( $type as $property => $field ) {
+            if ( isset( $field['constraints'] ) && ! empty( $field['constraints'] ) ) {
+                // Is this the property we are searhing for?
+                if ( ( $property == $property_name ) || ( $field['predicate'] == $property_schema_name ) ) {
+                    return $field['constraints'];
+                }
+            }
+        }
+    }
+
+    return NULL;
 }
 
 /**
@@ -238,36 +238,36 @@ 
  */
 function wl_entity_taxonomy_get_custom_fields( $entity_id = NULL ) {
 
-	if ( is_null( $entity_id ) ) {
+    if ( is_null( $entity_id ) ) {
 
-		// Return all custom fields.
-		// Get taxonomy terms
-		$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array( 'hide_empty' => 0 ) );
+        // Return all custom fields.
+        // Get taxonomy terms
+        $terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array( 'hide_empty' => 0 ) );
 
-		if ( is_wp_error( $terms ) ) {
-			return NULL;
-		}
+        if ( is_wp_error( $terms ) ) {
+            return NULL;
+        }
 
-		$custom_fields = array();
-		foreach ( $terms as $term ) {
-			// Get custom_fields
-			$term_options                          = Wordlift_Schema_Service::get_instance()
-			                                                                ->get_schema( $term->slug );
-			$custom_fields[ $term_options['uri'] ] = $term_options['custom_fields'];
-		}
+        $custom_fields = array();
+        foreach ( $terms as $term ) {
+            // Get custom_fields
+            $term_options                          = Wordlift_Schema_Service::get_instance()
+                                                                            ->get_schema( $term->slug );
+            $custom_fields[ $term_options['uri'] ] = $term_options['custom_fields'];
+        }
 
-		return $custom_fields;
+        return $custom_fields;
 
-	}
+    }
 
-	// Return custom fields for this specific entity's type.
-	$type = wl_entity_type_taxonomy_get_type( $entity_id );
+    // Return custom fields for this specific entity's type.
+    $type = wl_entity_type_taxonomy_get_type( $entity_id );
 
-	if ( ! isset( $type['custom_fields'] ) ) {
-		Wordlift_Log_Service::get_logger( 'wl_entity_taxonomy_get_custom_fields' )
-		                    ->error( "custom_fields not set [ entity id :: $entity_id ]" );
-	}
+    if ( ! isset( $type['custom_fields'] ) ) {
+        Wordlift_Log_Service::get_logger( 'wl_entity_taxonomy_get_custom_fields' )
+                            ->error( "custom_fields not set [ entity id :: $entity_id ]" );
+    }
 
-	return $type['custom_fields'];
+    return $type['custom_fields'];
 
 }

src/includes/class-wordlift-post-to-jsonld-converter.php

Indentation +155 added lines, -155 removed lines

@@ -15,160 +15,160 @@
  */
 class Wordlift_Post_To_Jsonld_Converter extends Wordlift_Abstract_Post_To_Jsonld_Converter {
 
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Wordlift_Post_To_Jsonld_Converter constructor.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param \Wordlift_Entity_Type_Service   $entity_type_service   A {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_Entity_Service        $entity_service        A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_User_Service          $user_service          A {@link Wordlift_User_Service} instance.
-	 * @param \Wordlift_Attachment_Service    $attachment_service    A {@link Wordlift_Attachment_Service} instance.
-	 * @param \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
-
-		$this->configuration_service = $configuration_service;
-
-		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
-	}
-
-	/**
-	 * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
-	 * found while processing the post is set in the $references array.
-	 *
-	 * @since 3.10.0
-	 *
-	 *
-	 * @param int   $post_id    The post id.
-	 * @param array $references An array of entity references.
-	 *
-	 * @return array A JSON-LD array.
-	 */
-	public function convert( $post_id, &$references = array() ) {
-
-		// Get the post instance.
-		if ( null === $post = get_post( $post_id ) ) {
-			// Post not found.
-			return null;
-		}
-
-		// Get the base JSON-LD and the list of entities referenced by this entity.
-		$jsonld = parent::convert( $post_id, $references );
-
-		// Get the entity name.
-		$jsonld['headline'] = $post->post_title;
-
-		// Get the author.
-		$author    = get_the_author_meta( 'display_name', $post->post_author );
-		$author_id = $this->user_service->get_uri( $post->post_author );
-
-		$jsonld['author'] = array(
-			'@type' => 'Person',
-			'@id'   => $author_id,
-			'name'  => $author,
-		);
-
-		// Set the published and modified dates.
-		$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-		$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
-
-		// Set the publisher.
-		$this->set_publisher( $jsonld );
-
-		// Add the references ids as mentions.
-		$entity_service = $this->entity_service;
-		if ( 0 < sizeof( $references ) ) {
-			$jsonld['mentions'] = array_map( function ( $item ) use ( $entity_service ) {
-				return array( '@id' => $entity_service->get_uri( $item ) );
-			}, $references );
-		}
-
-		return $jsonld;
-	}
-
-	/**
-	 * Enrich the provided params array with publisher data, if available.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param array $params The parameters array.
-	 */
-	private function set_publisher( &$params ) {
-
-		// If the publisher id isn't set don't do anything.
-		if ( null === $publisher_id = $this->configuration_service->get_publisher_id() ) {
-			return;
-		}
-
-		// Get the post instance.
-		if ( null === $post = get_post( $publisher_id ) ) {
-			// Publisher not found.
-			return;
-		}
-
-		// Get the item id
-		$id = $this->entity_service->get_uri( $publisher_id );
-
-		// Get the type.
-		$type = $this->entity_type_service->get( $publisher_id );
-
-		// Get the name.
-		$name = $post->post_title;
-
-		// Set the publisher data.
-		$params['publisher'] = array(
-			'@type' => $this->relative_to_context( $type['uri'] ),
-			'@id'   => $id,
-			'name'  => $name,
-		);
-
-		// Set the logo, only for http://schema.org/Organization as Person doesn't
-		// support the logo property.
-		//
-		// See http://schema.org/logo
-		if ( 'http://schema.org/Organization' !== $type['uri'] ) {
-			return;
-		}
-
-		// Get the logo, WP < 4.4 way: only post ID accepted here.
-		if ( '' === $thumbnail_id = get_post_thumbnail_id( $post->ID ) ) {
-			return;
-		}
-
-		// Get the image URL.
-		if ( false === $attachment = wp_get_attachment_image_src( $thumbnail_id, 'full' ) ) {
-			return;
-		}
-
-		// Copy over some useful properties.
-		//
-		// See https://developers.google.com/search/docs/data-types/articles
-		$params['publisher']['logo']['@type']  = 'ImageObject';
-		$params['publisher']['logo']['url']    = $attachment[0];
-		$params['publisher']['logo']['width']  = $attachment[1] . 'px';
-		$params['publisher']['logo']['height'] = $attachment[2] . 'px';
-
-	}
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Wordlift_Post_To_Jsonld_Converter constructor.
+     *
+     * @since 3.10.0
+     *
+     * @param \Wordlift_Entity_Type_Service   $entity_type_service   A {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_Entity_Service        $entity_service        A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_User_Service          $user_service          A {@link Wordlift_User_Service} instance.
+     * @param \Wordlift_Attachment_Service    $attachment_service    A {@link Wordlift_Attachment_Service} instance.
+     * @param \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service ) {
+        parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+
+        $this->configuration_service = $configuration_service;
+
+        // Set a reference to the logger.
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
+    }
+
+    /**
+     * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
+     * found while processing the post is set in the $references array.
+     *
+     * @since 3.10.0
+     *
+     *
+     * @param int   $post_id    The post id.
+     * @param array $references An array of entity references.
+     *
+     * @return array A JSON-LD array.
+     */
+    public function convert( $post_id, &$references = array() ) {
+
+        // Get the post instance.
+        if ( null === $post = get_post( $post_id ) ) {
+            // Post not found.
+            return null;
+        }
+
+        // Get the base JSON-LD and the list of entities referenced by this entity.
+        $jsonld = parent::convert( $post_id, $references );
+
+        // Get the entity name.
+        $jsonld['headline'] = $post->post_title;
+
+        // Get the author.
+        $author    = get_the_author_meta( 'display_name', $post->post_author );
+        $author_id = $this->user_service->get_uri( $post->post_author );
+
+        $jsonld['author'] = array(
+            '@type' => 'Person',
+            '@id'   => $author_id,
+            'name'  => $author,
+        );
+
+        // Set the published and modified dates.
+        $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
+        $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+
+        // Set the publisher.
+        $this->set_publisher( $jsonld );
+
+        // Add the references ids as mentions.
+        $entity_service = $this->entity_service;
+        if ( 0 < sizeof( $references ) ) {
+            $jsonld['mentions'] = array_map( function ( $item ) use ( $entity_service ) {
+                return array( '@id' => $entity_service->get_uri( $item ) );
+            }, $references );
+        }
+
+        return $jsonld;
+    }
+
+    /**
+     * Enrich the provided params array with publisher data, if available.
+     *
+     * @since 3.10.0
+     *
+     * @param array $params The parameters array.
+     */
+    private function set_publisher( &$params ) {
+
+        // If the publisher id isn't set don't do anything.
+        if ( null === $publisher_id = $this->configuration_service->get_publisher_id() ) {
+            return;
+        }
+
+        // Get the post instance.
+        if ( null === $post = get_post( $publisher_id ) ) {
+            // Publisher not found.
+            return;
+        }
+
+        // Get the item id
+        $id = $this->entity_service->get_uri( $publisher_id );
+
+        // Get the type.
+        $type = $this->entity_type_service->get( $publisher_id );
+
+        // Get the name.
+        $name = $post->post_title;
+
+        // Set the publisher data.
+        $params['publisher'] = array(
+            '@type' => $this->relative_to_context( $type['uri'] ),
+            '@id'   => $id,
+            'name'  => $name,
+        );
+
+        // Set the logo, only for http://schema.org/Organization as Person doesn't
+        // support the logo property.
+        //
+        // See http://schema.org/logo
+        if ( 'http://schema.org/Organization' !== $type['uri'] ) {
+            return;
+        }
+
+        // Get the logo, WP < 4.4 way: only post ID accepted here.
+        if ( '' === $thumbnail_id = get_post_thumbnail_id( $post->ID ) ) {
+            return;
+        }
+
+        // Get the image URL.
+        if ( false === $attachment = wp_get_attachment_image_src( $thumbnail_id, 'full' ) ) {
+            return;
+        }
+
+        // Copy over some useful properties.
+        //
+        // See https://developers.google.com/search/docs/data-types/articles
+        $params['publisher']['logo']['@type']  = 'ImageObject';
+        $params['publisher']['logo']['url']    = $attachment[0];
+        $params['publisher']['logo']['width']  = $attachment[1] . 'px';
+        $params['publisher']['logo']['height'] = $attachment[2] . 'px';
+
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -44,13 +44,13 @@ 
 	 * @param \Wordlift_Attachment_Service    $attachment_service    A {@link Wordlift_Attachment_Service} instance.
 	 * @param \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
 	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+	public function __construct($entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service) {
+		parent::__construct($entity_type_service, $entity_service, $user_service, $attachment_service);
 
 		$this->configuration_service = $configuration_service;
 
 		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Post_To_Jsonld_Converter');
 	}
 
 	/**
@@ -65,23 +65,23 @@ 
 	 *
 	 * @return array A JSON-LD array.
 	 */
-	public function convert( $post_id, &$references = array() ) {
+	public function convert($post_id, &$references = array()) {
 
 		// Get the post instance.
-		if ( null === $post = get_post( $post_id ) ) {
+		if (null === $post = get_post($post_id)) {
 			// Post not found.
 			return null;
 		}
 
 		// Get the base JSON-LD and the list of entities referenced by this entity.
-		$jsonld = parent::convert( $post_id, $references );
+		$jsonld = parent::convert($post_id, $references);
 
 		// Get the entity name.
 		$jsonld['headline'] = $post->post_title;
 
 		// Get the author.
-		$author    = get_the_author_meta( 'display_name', $post->post_author );
-		$author_id = $this->user_service->get_uri( $post->post_author );
+		$author    = get_the_author_meta('display_name', $post->post_author);
+		$author_id = $this->user_service->get_uri($post->post_author);
 
 		$jsonld['author'] = array(
 			'@type' => 'Person',
@@ -90,18 +90,18 @@ 
 		);
 
 		// Set the published and modified dates.
-		$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-		$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+		$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i', true, $post, false);
+		$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i', true, $post, false);
 
 		// Set the publisher.
-		$this->set_publisher( $jsonld );
+		$this->set_publisher($jsonld);
 
 		// Add the references ids as mentions.
 		$entity_service = $this->entity_service;
-		if ( 0 < sizeof( $references ) ) {
-			$jsonld['mentions'] = array_map( function ( $item ) use ( $entity_service ) {
-				return array( '@id' => $entity_service->get_uri( $item ) );
-			}, $references );
+		if (0 < sizeof($references)) {
+			$jsonld['mentions'] = array_map(function($item) use ($entity_service) {
+				return array('@id' => $entity_service->get_uri($item));
+			}, $references);
 		}
 
 		return $jsonld;
@@ -114,31 +114,31 @@ 
 	 *
 	 * @param array $params The parameters array.
 	 */
-	private function set_publisher( &$params ) {
+	private function set_publisher(&$params) {
 
 		// If the publisher id isn't set don't do anything.
-		if ( null === $publisher_id = $this->configuration_service->get_publisher_id() ) {
+		if (null === $publisher_id = $this->configuration_service->get_publisher_id()) {
 			return;
 		}
 
 		// Get the post instance.
-		if ( null === $post = get_post( $publisher_id ) ) {
+		if (null === $post = get_post($publisher_id)) {
 			// Publisher not found.
 			return;
 		}
 
 		// Get the item id
-		$id = $this->entity_service->get_uri( $publisher_id );
+		$id = $this->entity_service->get_uri($publisher_id);
 
 		// Get the type.
-		$type = $this->entity_type_service->get( $publisher_id );
+		$type = $this->entity_type_service->get($publisher_id);
 
 		// Get the name.
 		$name = $post->post_title;
 
 		// Set the publisher data.
 		$params['publisher'] = array(
-			'@type' => $this->relative_to_context( $type['uri'] ),
+			'@type' => $this->relative_to_context($type['uri']),
 			'@id'   => $id,
 			'name'  => $name,
 		);
@@ -147,17 +147,17 @@ 
 		// support the logo property.
 		//
 		// See http://schema.org/logo
-		if ( 'http://schema.org/Organization' !== $type['uri'] ) {
+		if ('http://schema.org/Organization' !== $type['uri']) {
 			return;
 		}
 
 		// Get the logo, WP < 4.4 way: only post ID accepted here.
-		if ( '' === $thumbnail_id = get_post_thumbnail_id( $post->ID ) ) {
+		if ('' === $thumbnail_id = get_post_thumbnail_id($post->ID)) {
 			return;
 		}
 
 		// Get the image URL.
-		if ( false === $attachment = wp_get_attachment_image_src( $thumbnail_id, 'full' ) ) {
+		if (false === $attachment = wp_get_attachment_image_src($thumbnail_id, 'full')) {
 			return;
 		}
 
@@ -166,8 +166,8 @@ 
 		// See https://developers.google.com/search/docs/data-types/articles
 		$params['publisher']['logo']['@type']  = 'ImageObject';
 		$params['publisher']['logo']['url']    = $attachment[0];
-		$params['publisher']['logo']['width']  = $attachment[1] . 'px';
-		$params['publisher']['logo']['height'] = $attachment[2] . 'px';
+		$params['publisher']['logo']['width']  = $attachment[1].'px';
+		$params['publisher']['logo']['height'] = $attachment[2].'px';
 
 	}
 

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

Indentation +145 added lines, -145 removed lines

@@ -16,150 +16,150 @@
  */
 class Wordlift_Attachment_Service {
 
-	/**
-	 * Get an attachment ID given a URL.
-	 *
-	 * Inspired from https://wpscholar.com/blog/get-attachment-id-from-wp-image-url/
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param string $url The attachment URL.
-	 *
-	 * @return int|false Attachment ID on success, false on failure
-	 */
-	public function get_attachment_id( $url ) {
-
-		// Get the upload directory data, we need the base URL to check whether
-		// the URL we received is within WP.
-		$dir = wp_upload_dir();
-
-		// If the image is not inside WP's base url, return.
-		if ( false === strpos( $url, $dir['baseurl'] . '/' ) ) {
-			return false;
-		}
-
-		// Get the filename, the extension is kept.
-		$filename = basename( $url );
-
-		// Query for attachments with the specified filename.
-		$query = new WP_Query( array(
-			'post_type'   => 'attachment',
-			'post_status' => 'inherit',
-			'fields'      => 'ids',
-			'meta_query'  => array(
-				array(
-					'value'   => $filename,
-					'compare' => 'LIKE',
-					'key'     => '_wp_attachment_metadata',
-				),
-			),
-		) );
-
-		// If there are no posts, return.
-		if ( $query->have_posts() ) {
-			foreach ( $query->posts as $attachment_id ) {
-
-				// Get the attachment metadata, we need the filename.
-				$metadata          = wp_get_attachment_metadata( $attachment_id );
-				$original_filename = basename( $metadata['file'] );
-
-				// Get the cropped filenames, or an empty array in case there are no files.
-				$sizes_filenames = isset( $metadata['sizes'] ) ? wp_list_pluck( $metadata['sizes'], 'file' ) : array();
-
-				// If the provided filename matches the attachment filename (or one of its resized images), return the id.
-				if ( $original_filename === $filename || in_array( $filename, $sizes_filenames ) ) {
-					return $attachment_id;
-				}
-			}
-		}
-
-		// If we got here, we couldn't find any attachment.
-		return false;
-	}
-
-	/**
-	 * Get images embedded in the post content.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param string $content The post content.
-	 *
-	 * @return array An array of attachment ids.
-	 */
-	public function get_image_embeds( $content ) {
-
-		// Go over all the images included in the post content, check if they are
-		// in the DB, and if so include them.
-		$images = array();
-		if ( false === preg_match_all( '#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images ) ) {
-			return array();
-		}
-
-		// Map the image URLs to attachment ids.
-		$that = $this;
-		$ids  = array_map( function ( $url ) use ( $that ) {
-			return $that->get_attachment_id( $url );
-		}, $images[1] );
-
-		// Filter out not found ids (i.e. id is false).
-		return array_filter( $ids, function ( $item ) {
-			return false !== $item;
-		} );
-	}
-
-	/**
-	 * Get images linked via the `gallery` shortcode.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param \WP_Post $post A {@link WP_Post} instance.
-	 *
-	 * @return array An array of attachment ids.
-	 */
-	public function get_gallery( $post ) {
-
-		// @todo: the `gallery` shortcode has an `exclude` attribute which isn't
-		// checked at the moment.
-
-		// Prepare the return value.
-		$ids = array();
-
-		// As the above for images in galleries.
-		// Code inspired by http://wordpress.stackexchange.com/questions/80408/how-to-get-page-post-gallery-attachment-images-in-order-they-are-set-in-backend
-		$pattern = get_shortcode_regex();
-
-		if ( preg_match_all( '/' . $pattern . '/s', $post->post_content, $matches )
-		     && array_key_exists( 2, $matches )
-		     && in_array( 'gallery', $matches[2] )
-		) {
-
-			$keys = array_keys( $matches[2], 'gallery' );
-
-			foreach ( $keys as $key ) {
-				$atts = shortcode_parse_atts( $matches[3][ $key ] );
-
-				if ( is_array( $atts ) && array_key_exists( 'ids', $atts ) ) {
-					// gallery images insert explicitly by their ids.
-
-					foreach ( explode( ',', $atts['ids'] ) as $attachment_id ) {
-						// Since we do not check for actual image existence
-						// when generating the json content, check it now.
-						if ( wp_get_attachment_image_src( $attachment_id, 'full' ) ) {
-							$ids[ $attachment_id ] = true;
-						}
-					}
-				} else {
-					// gallery shortcode with no ids uses all the images
-					// attached to the post.
-					$images = get_attached_media( 'image', $post->ID );
-					foreach ( $images as $attachment ) {
-						$ids[ $attachment->ID ] = true;
-					}
-				}
-			}
-		}
-
-		return array_keys( $ids );
-	}
+    /**
+     * Get an attachment ID given a URL.
+     *
+     * Inspired from https://wpscholar.com/blog/get-attachment-id-from-wp-image-url/
+     *
+     * @since 3.10.0
+     *
+     * @param string $url The attachment URL.
+     *
+     * @return int|false Attachment ID on success, false on failure
+     */
+    public function get_attachment_id( $url ) {
+
+        // Get the upload directory data, we need the base URL to check whether
+        // the URL we received is within WP.
+        $dir = wp_upload_dir();
+
+        // If the image is not inside WP's base url, return.
+        if ( false === strpos( $url, $dir['baseurl'] . '/' ) ) {
+            return false;
+        }
+
+        // Get the filename, the extension is kept.
+        $filename = basename( $url );
+
+        // Query for attachments with the specified filename.
+        $query = new WP_Query( array(
+            'post_type'   => 'attachment',
+            'post_status' => 'inherit',
+            'fields'      => 'ids',
+            'meta_query'  => array(
+                array(
+                    'value'   => $filename,
+                    'compare' => 'LIKE',
+                    'key'     => '_wp_attachment_metadata',
+                ),
+            ),
+        ) );
+
+        // If there are no posts, return.
+        if ( $query->have_posts() ) {
+            foreach ( $query->posts as $attachment_id ) {
+
+                // Get the attachment metadata, we need the filename.
+                $metadata          = wp_get_attachment_metadata( $attachment_id );
+                $original_filename = basename( $metadata['file'] );
+
+                // Get the cropped filenames, or an empty array in case there are no files.
+                $sizes_filenames = isset( $metadata['sizes'] ) ? wp_list_pluck( $metadata['sizes'], 'file' ) : array();
+
+                // If the provided filename matches the attachment filename (or one of its resized images), return the id.
+                if ( $original_filename === $filename || in_array( $filename, $sizes_filenames ) ) {
+                    return $attachment_id;
+                }
+            }
+        }
+
+        // If we got here, we couldn't find any attachment.
+        return false;
+    }
+
+    /**
+     * Get images embedded in the post content.
+     *
+     * @since 3.10.0
+     *
+     * @param string $content The post content.
+     *
+     * @return array An array of attachment ids.
+     */
+    public function get_image_embeds( $content ) {
+
+        // Go over all the images included in the post content, check if they are
+        // in the DB, and if so include them.
+        $images = array();
+        if ( false === preg_match_all( '#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images ) ) {
+            return array();
+        }
+
+        // Map the image URLs to attachment ids.
+        $that = $this;
+        $ids  = array_map( function ( $url ) use ( $that ) {
+            return $that->get_attachment_id( $url );
+        }, $images[1] );
+
+        // Filter out not found ids (i.e. id is false).
+        return array_filter( $ids, function ( $item ) {
+            return false !== $item;
+        } );
+    }
+
+    /**
+     * Get images linked via the `gallery` shortcode.
+     *
+     * @since 3.10.0
+     *
+     * @param \WP_Post $post A {@link WP_Post} instance.
+     *
+     * @return array An array of attachment ids.
+     */
+    public function get_gallery( $post ) {
+
+        // @todo: the `gallery` shortcode has an `exclude` attribute which isn't
+        // checked at the moment.
+
+        // Prepare the return value.
+        $ids = array();
+
+        // As the above for images in galleries.
+        // Code inspired by http://wordpress.stackexchange.com/questions/80408/how-to-get-page-post-gallery-attachment-images-in-order-they-are-set-in-backend
+        $pattern = get_shortcode_regex();
+
+        if ( preg_match_all( '/' . $pattern . '/s', $post->post_content, $matches )
+             && array_key_exists( 2, $matches )
+             && in_array( 'gallery', $matches[2] )
+        ) {
+
+            $keys = array_keys( $matches[2], 'gallery' );
+
+            foreach ( $keys as $key ) {
+                $atts = shortcode_parse_atts( $matches[3][ $key ] );
+
+                if ( is_array( $atts ) && array_key_exists( 'ids', $atts ) ) {
+                    // gallery images insert explicitly by their ids.
+
+                    foreach ( explode( ',', $atts['ids'] ) as $attachment_id ) {
+                        // Since we do not check for actual image existence
+                        // when generating the json content, check it now.
+                        if ( wp_get_attachment_image_src( $attachment_id, 'full' ) ) {
+                            $ids[ $attachment_id ] = true;
+                        }
+                    }
+                } else {
+                    // gallery shortcode with no ids uses all the images
+                    // attached to the post.
+                    $images = get_attached_media( 'image', $post->ID );
+                    foreach ( $images as $attachment ) {
+                        $ids[ $attachment->ID ] = true;
+                    }
+                }
+            }
+        }
+
+        return array_keys( $ids );
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -27,22 +27,22 @@ 
 	 *
 	 * @return int|false Attachment ID on success, false on failure
 	 */
-	public function get_attachment_id( $url ) {
+	public function get_attachment_id($url) {
 
 		// Get the upload directory data, we need the base URL to check whether
 		// the URL we received is within WP.
 		$dir = wp_upload_dir();
 
 		// If the image is not inside WP's base url, return.
-		if ( false === strpos( $url, $dir['baseurl'] . '/' ) ) {
+		if (false === strpos($url, $dir['baseurl'].'/')) {
 			return false;
 		}
 
 		// Get the filename, the extension is kept.
-		$filename = basename( $url );
+		$filename = basename($url);
 
 		// Query for attachments with the specified filename.
-		$query = new WP_Query( array(
+		$query = new WP_Query(array(
 			'post_type'   => 'attachment',
 			'post_status' => 'inherit',
 			'fields'      => 'ids',
@@ -53,21 +53,21 @@ 
 					'key'     => '_wp_attachment_metadata',
 				),
 			),
-		) );
+		));
 
 		// If there are no posts, return.
-		if ( $query->have_posts() ) {
-			foreach ( $query->posts as $attachment_id ) {
+		if ($query->have_posts()) {
+			foreach ($query->posts as $attachment_id) {
 
 				// Get the attachment metadata, we need the filename.
-				$metadata          = wp_get_attachment_metadata( $attachment_id );
-				$original_filename = basename( $metadata['file'] );
+				$metadata          = wp_get_attachment_metadata($attachment_id);
+				$original_filename = basename($metadata['file']);
 
 				// Get the cropped filenames, or an empty array in case there are no files.
-				$sizes_filenames = isset( $metadata['sizes'] ) ? wp_list_pluck( $metadata['sizes'], 'file' ) : array();
+				$sizes_filenames = isset($metadata['sizes']) ? wp_list_pluck($metadata['sizes'], 'file') : array();
 
 				// If the provided filename matches the attachment filename (or one of its resized images), return the id.
-				if ( $original_filename === $filename || in_array( $filename, $sizes_filenames ) ) {
+				if ($original_filename === $filename || in_array($filename, $sizes_filenames)) {
 					return $attachment_id;
 				}
 			}
@@ -86,23 +86,23 @@ 
 	 *
 	 * @return array An array of attachment ids.
 	 */
-	public function get_image_embeds( $content ) {
+	public function get_image_embeds($content) {
 
 		// Go over all the images included in the post content, check if they are
 		// in the DB, and if so include them.
 		$images = array();
-		if ( false === preg_match_all( '#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images ) ) {
+		if (false === preg_match_all('#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images)) {
 			return array();
 		}
 
 		// Map the image URLs to attachment ids.
 		$that = $this;
-		$ids  = array_map( function ( $url ) use ( $that ) {
-			return $that->get_attachment_id( $url );
-		}, $images[1] );
+		$ids  = array_map(function($url) use ($that) {
+			return $that->get_attachment_id($url);
+		}, $images[1]);
 
 		// Filter out not found ids (i.e. id is false).
-		return array_filter( $ids, function ( $item ) {
+		return array_filter($ids, function($item) {
 			return false !== $item;
 		} );
 	}
@@ -116,7 +116,7 @@ 
 	 *
 	 * @return array An array of attachment ids.
 	 */
-	public function get_gallery( $post ) {
+	public function get_gallery($post) {
 
 		// @todo: the `gallery` shortcode has an `exclude` attribute which isn't
 		// checked at the moment.
@@ -128,38 +128,38 @@ 
 		// Code inspired by http://wordpress.stackexchange.com/questions/80408/how-to-get-page-post-gallery-attachment-images-in-order-they-are-set-in-backend
 		$pattern = get_shortcode_regex();
 
-		if ( preg_match_all( '/' . $pattern . '/s', $post->post_content, $matches )
-		     && array_key_exists( 2, $matches )
-		     && in_array( 'gallery', $matches[2] )
+		if (preg_match_all('/'.$pattern.'/s', $post->post_content, $matches)
+		     && array_key_exists(2, $matches)
+		     && in_array('gallery', $matches[2])
 		) {
 
-			$keys = array_keys( $matches[2], 'gallery' );
+			$keys = array_keys($matches[2], 'gallery');
 
-			foreach ( $keys as $key ) {
-				$atts = shortcode_parse_atts( $matches[3][ $key ] );
+			foreach ($keys as $key) {
+				$atts = shortcode_parse_atts($matches[3][$key]);
 
-				if ( is_array( $atts ) && array_key_exists( 'ids', $atts ) ) {
+				if (is_array($atts) && array_key_exists('ids', $atts)) {
 					// gallery images insert explicitly by their ids.
 
-					foreach ( explode( ',', $atts['ids'] ) as $attachment_id ) {
+					foreach (explode(',', $atts['ids']) as $attachment_id) {
 						// Since we do not check for actual image existence
 						// when generating the json content, check it now.
-						if ( wp_get_attachment_image_src( $attachment_id, 'full' ) ) {
-							$ids[ $attachment_id ] = true;
+						if (wp_get_attachment_image_src($attachment_id, 'full')) {
+							$ids[$attachment_id] = true;
 						}
 					}
 				} else {
 					// gallery shortcode with no ids uses all the images
 					// attached to the post.
-					$images = get_attached_media( 'image', $post->ID );
-					foreach ( $images as $attachment ) {
-						$ids[ $attachment->ID ] = true;
+					$images = get_attached_media('image', $post->ID);
+					foreach ($images as $attachment) {
+						$ids[$attachment->ID] = true;
 					}
 				}
 			}
 		}
 
-		return array_keys( $ids );
+		return array_keys($ids);
 	}
 
 }

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

Indentation +169 added lines, -169 removed lines

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

Spacing +18 added lines, -19 removed lines

@@ -64,9 +64,9 @@ 
 	 *
 	 * @param \wpdb $wpdb The global WordPress database connection.
 	 */
-	public function __construct( $wpdb ) {
+	public function __construct($wpdb) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Uri_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Uri_Service');
 
 		$this->wpdb = $wpdb;
 
@@ -93,10 +93,10 @@ 
 	public function delete_all() {
 
 		// Delete URIs associated with posts/entities.
-		$this->wpdb->delete( $this->wpdb->postmeta, array( 'meta_key' => 'entity_url' ) );
+		$this->wpdb->delete($this->wpdb->postmeta, array('meta_key' => 'entity_url'));
 
 		// Delete URIs associated with authors.
-		$this->wpdb->delete( $this->wpdb->usermeta, array( 'meta_key' => '_wl_uri' ) );
+		$this->wpdb->delete($this->wpdb->usermeta, array('meta_key' => '_wl_uri'));
 
 	}
 
@@ -113,13 +113,13 @@ 
 	 *
 	 * @return string The sanitized path.
 	 */
-	public function sanitize_path( $path, $char = '_' ) {
+	public function sanitize_path($path, $char = '_') {
 
 		// Ensure the path is ASCII.
 		// see https://github.com/insideout10/wordlift-plugin/issues/386
 //		$path_ascii = mb_convert_encoding( $path, 'ASCII' );
 
-		return sanitize_title( preg_replace( self::INVALID_CHARACTERS, $char, stripslashes( $path ) ) );
+		return sanitize_title(preg_replace(self::INVALID_CHARACTERS, $char, stripslashes($path)));
 	}
 
 	/**
@@ -137,24 +137,23 @@ 
 	 *
 	 * @return string Returns an uri.
 	 */
-	public function build_uri( $title, $post_type, $schema_type = null, $increment_digit = 0 ) {
+	public function build_uri($title, $post_type, $schema_type = null, $increment_digit = 0) {
 
 		// Get the entity slug suffix digit
 		$suffix_digit = $increment_digit + 1;
 
 		// Get a sanitized uri for a given title
-		$entity_slug = ( 0 == $increment_digit ) ?
-			wl_sanitize_uri_path( $title ) :
-			wl_sanitize_uri_path( $title . '_' . $suffix_digit );
+		$entity_slug = (0 == $increment_digit) ?
+			wl_sanitize_uri_path($title) : wl_sanitize_uri_path($title.'_'.$suffix_digit);
 
 		// Compose a candidate uri.
-		$new_entity_uri = sprintf( '%s/%s/%s',
+		$new_entity_uri = sprintf('%s/%s/%s',
 			wl_configuration_get_redlink_dataset_uri(),
 			$post_type,
 			$entity_slug
 		);
 
-		$this->log->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+		$this->log->trace("Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]");
 
 		global $wpdb;
 
@@ -166,27 +165,27 @@ 
 		);
 
 		// Perform the query
-		$post_id = $wpdb->get_var( $stmt );
+		$post_id = $wpdb->get_var($stmt);
 
 		// If the post does not exist, then the new uri is returned
-		if ( ! is_numeric( $post_id ) ) {
-			$this->log->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ( ! is_numeric($post_id)) {
+			$this->log->trace("Going to return uri [ new_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// If schema_type is equal to schema org type of post x, then the new uri is returned
-		$schema_post_type = wl_entity_type_taxonomy_get_type( $post_id );
+		$schema_post_type = wl_entity_type_taxonomy_get_type($post_id);
 
 		// @todo: we shouldn't rely on css classes to take such decisions.
-		if ( $schema_type === $schema_post_type['css_class'] ) {
-			$this->log->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ($schema_type === $schema_post_type['css_class']) {
+			$this->log->trace("An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]");
 
 			return $new_entity_uri;
 		}
 
 		// Otherwise the same function is called recursively
-		return $this->build_uri( $title, $post_type, $schema_type, ++ $increment_digit );
+		return $this->build_uri($title, $post_type, $schema_type, ++ $increment_digit);
 	}
 
 }

src/includes/properties/class-wordlift-property-entity-reference.php

Indentation +48 added lines, -48 removed lines

@@ -16,61 +16,61 @@
  */
 class Wordlift_Property_Entity_Reference {
 
-	/**
-	 * The URL associated with this entity reference.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var string $url The URL associated with the entity reference.
-	 */
-	private $url;
+    /**
+     * The URL associated with this entity reference.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var string $url The URL associated with the entity reference.
+     */
+    private $url;
 
-	/**
-	 * The entity post id.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var int $id The entity post id.
-	 */
-	private $id;
+    /**
+     * The entity post id.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var int $id The entity post id.
+     */
+    private $id;
 
-	/**
-	 * Create a Wordlift_Property_Entity_Reference instance with the provided URL.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param string $url The URL.
-	 * @param int    $id  The entity post id.
-	 */
-	public function __construct( $url, $id ) {
+    /**
+     * Create a Wordlift_Property_Entity_Reference instance with the provided URL.
+     *
+     * @since 3.8.0
+     *
+     * @param string $url The URL.
+     * @param int    $id  The entity post id.
+     */
+    public function __construct( $url, $id ) {
 
-		$this->url = $url;
-		$this->id  = $id;
+        $this->url = $url;
+        $this->id  = $id;
 
-	}
+    }
 
-	/**
-	 * Get the URL associated with this entity reference.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @return string The URL associated with the entity reference.
-	 */
-	public function getURL() {
+    /**
+     * Get the URL associated with this entity reference.
+     *
+     * @since 3.8.0
+     *
+     * @return string The URL associated with the entity reference.
+     */
+    public function getURL() {
 
-		return $this->url;
-	}
+        return $this->url;
+    }
 
-	/**
-	 * Get the entity id.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @return int The entity id.
-	 */
-	public function getID() {
+    /**
+     * Get the entity id.
+     *
+     * @since 3.10.0
+     *
+     * @return int The entity id.
+     */
+    public function getID() {
 
-		return $this->id;
-	}
+        return $this->id;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 * @param string $url The URL.
 	 * @param int    $id  The entity post id.
 	 */
-	public function __construct( $url, $id ) {
+	public function __construct($url, $id) {
 
 		$this->url = $url;
 		$this->id  = $id;

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

Indentation +33 added lines, -33 removed lines

@@ -7,38 +7,38 @@
  * @since 3.8.0
  */
 class Wordlift_Entity_Property_Service extends Wordlift_Simple_Property_Service {
-	/**
-	 * @var \Wordlift_Entity_Service $entity_service
-	 */
-	private $entity_service;
-
-	/**
-	 * Wordlift_Entity_Property_Service constructor.
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service
-	 */
-	public function __construct( $entity_service ) {
-
-		$this->entity_service = $entity_service;
-
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get( $post_id, $meta_key ) {
-
-		$entity_service = $this->entity_service;
-
-		// Map each returned value to a Wordlift_Property_Entity_Reference.
-		return array_map( function ( $item ) use ( $entity_service ) {
-
-			// If the $item is a number and it's an existing post, return the
-			// URI of the referenced entity. Otherwise return the value.
-			return is_numeric( $item ) && null !== get_post( $item )
-				? new Wordlift_Property_Entity_Reference( $entity_service->get_uri( $item ), $item )
-				: $item;
-		}, get_post_meta( $post_id, $meta_key ) );
-	}
+    /**
+     * @var \Wordlift_Entity_Service $entity_service
+     */
+    private $entity_service;
+
+    /**
+     * Wordlift_Entity_Property_Service constructor.
+     *
+     * @param \Wordlift_Entity_Service $entity_service
+     */
+    public function __construct( $entity_service ) {
+
+        $this->entity_service = $entity_service;
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get( $post_id, $meta_key ) {
+
+        $entity_service = $this->entity_service;
+
+        // Map each returned value to a Wordlift_Property_Entity_Reference.
+        return array_map( function ( $item ) use ( $entity_service ) {
+
+            // If the $item is a number and it's an existing post, return the
+            // URI of the referenced entity. Otherwise return the value.
+            return is_numeric( $item ) && null !== get_post( $item )
+                ? new Wordlift_Property_Entity_Reference( $entity_service->get_uri( $item ), $item )
+                : $item;
+        }, get_post_meta( $post_id, $meta_key ) );
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 	 *
 	 * @param \Wordlift_Entity_Service $entity_service
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
 		$this->entity_service = $entity_service;
 
@@ -26,19 +26,19 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function get( $post_id, $meta_key ) {
+	public function get($post_id, $meta_key) {
 
 		$entity_service = $this->entity_service;
 
 		// Map each returned value to a Wordlift_Property_Entity_Reference.
-		return array_map( function ( $item ) use ( $entity_service ) {
+		return array_map(function($item) use ($entity_service) {
 
 			// If the $item is a number and it's an existing post, return the
 			// URI of the referenced entity. Otherwise return the value.
-			return is_numeric( $item ) && null !== get_post( $item )
-				? new Wordlift_Property_Entity_Reference( $entity_service->get_uri( $item ), $item )
+			return is_numeric($item) && null !== get_post($item)
+				? new Wordlift_Property_Entity_Reference($entity_service->get_uri($item), $item)
 				: $item;
-		}, get_post_meta( $post_id, $meta_key ) );
+		}, get_post_meta($post_id, $meta_key));
 	}
 
 }

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

Indentation +156 added lines, -156 removed lines

@@ -14,161 +14,161 @@
  */
 class Wordlift_Entity_Type_Service {
 
-	/**
-	 * The {@link Wordlift_Schema_Service} instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 */
-	private $schema_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $instance The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Wordlift_Entity_Type_Service constructor.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 */
-	public function __construct( $schema_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
-
-		$this->schema_service = $schema_service;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the {@link Wordlift_Entity_Type_Service} singleton instance.
-	 *
-	 * @since 3.7.0
-	 * @return \Wordlift_Entity_Type_Service The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the types associated with the specified entity post id.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|null An array of type properties or null if no term is associated
-	 */
-	public function get( $post_id ) {
-
-		// Return the correct entity type according to the post type.
-		switch ( get_post_type( $post_id ) ) {
-
-			case 'entity':
-				// Get the type from the associated classification.
-
-				$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-				if ( is_wp_error( $terms ) ) {
-					// TODO: handle error
-					return null;
-				}
-
-				// If there are not terms associated, return null.
-				if ( 0 === count( $terms ) ) {
-					return null;
-				}
-
-				// Return the entity type with the specified id.
-				return $this->schema_service->get_schema( $terms[0]->slug );
-
-			case 'post':
-			case 'page':
-				// Posts and pages are considered Articles.
-				return array(
-					'uri'       => 'http://schema.org/Article',
-					'css_class' => 'wl-post',
-				);
-
-			default:
-				// Everything else is considered a Creative Work.
-				return array(
-					'uri'       => 'http://schema.org/CreativeWork',
-					'css_class' => 'wl-creative-work',
-				);
-		}
-
-	}
-
-	/**
-	 * Set the main type for the specified entity post, given the type URI.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param int    $post_id  The post id.
-	 * @param string $type_uri The type URI.
-	 */
-	public function set( $post_id, $type_uri ) {
-
-		// If the type URI is empty we remove the type.
-		if ( empty( $type_uri ) ) {
-
-			wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-			return;
-		}
-
-		// Get all the terms bound to the wl_entity_type taxonomy.
-		$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-			'hide_empty' => false,
-			// Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
-			// An issue has been opened with the AAM plugin author as well.
-			//
-			// see https://github.com/insideout10/wordlift-plugin/issues/334
-			// see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
-			'fields'     => 'all',
-		) );
-
-		$this->log->error( "Type not found [ post id :: $post_id ][ type uri :: $type_uri ]" );
-
-		// Check which term matches the specified URI.
-		foreach ( $terms as $term ) {
-
-			$term_id   = $term->term_id;
-			$term_slug = $term->slug;
-
-			// Load the type data.
-			$type = $this->schema_service->get_schema( $term_slug );
-			// Set the related term ID.
-			if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
-
-				$this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term_id ][ term slug :: $term_slug ][ type uri :: {$type['uri']} ][ type css class :: {$type['css_class']} ]" );
-
-				wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-				return;
-			}
-		}
-
-	}
+    /**
+     * The {@link Wordlift_Schema_Service} instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     */
+    private $schema_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} singleton instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $instance The {@link Wordlift_Entity_Type_Service} singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Wordlift_Entity_Type_Service constructor.
+     *
+     * @since 3.7.0
+     *
+     * @param \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     */
+    public function __construct( $schema_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
+
+        $this->schema_service = $schema_service;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the {@link Wordlift_Entity_Type_Service} singleton instance.
+     *
+     * @since 3.7.0
+     * @return \Wordlift_Entity_Type_Service The {@link Wordlift_Entity_Type_Service} singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the types associated with the specified entity post id.
+     *
+     * @since 3.7.0
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|null An array of type properties or null if no term is associated
+     */
+    public function get( $post_id ) {
+
+        // Return the correct entity type according to the post type.
+        switch ( get_post_type( $post_id ) ) {
+
+            case 'entity':
+                // Get the type from the associated classification.
+
+                $terms = wp_get_object_terms( $post_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+                if ( is_wp_error( $terms ) ) {
+                    // TODO: handle error
+                    return null;
+                }
+
+                // If there are not terms associated, return null.
+                if ( 0 === count( $terms ) ) {
+                    return null;
+                }
+
+                // Return the entity type with the specified id.
+                return $this->schema_service->get_schema( $terms[0]->slug );
+
+            case 'post':
+            case 'page':
+                // Posts and pages are considered Articles.
+                return array(
+                    'uri'       => 'http://schema.org/Article',
+                    'css_class' => 'wl-post',
+                );
+
+            default:
+                // Everything else is considered a Creative Work.
+                return array(
+                    'uri'       => 'http://schema.org/CreativeWork',
+                    'css_class' => 'wl-creative-work',
+                );
+        }
+
+    }
+
+    /**
+     * Set the main type for the specified entity post, given the type URI.
+     *
+     * @since 3.8.0
+     *
+     * @param int    $post_id  The post id.
+     * @param string $type_uri The type URI.
+     */
+    public function set( $post_id, $type_uri ) {
+
+        // If the type URI is empty we remove the type.
+        if ( empty( $type_uri ) ) {
+
+            wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+            return;
+        }
+
+        // Get all the terms bound to the wl_entity_type taxonomy.
+        $terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+            'hide_empty' => false,
+            // Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
+            // An issue has been opened with the AAM plugin author as well.
+            //
+            // see https://github.com/insideout10/wordlift-plugin/issues/334
+            // see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
+            'fields'     => 'all',
+        ) );
+
+        $this->log->error( "Type not found [ post id :: $post_id ][ type uri :: $type_uri ]" );
+
+        // Check which term matches the specified URI.
+        foreach ( $terms as $term ) {
+
+            $term_id   = $term->term_id;
+            $term_slug = $term->slug;
+
+            // Load the type data.
+            $type = $this->schema_service->get_schema( $term_slug );
+            // Set the related term ID.
+            if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
+
+                $this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term_id ][ term slug :: $term_slug ][ type uri :: {$type['uri']} ][ type css class :: {$type['css_class']} ]" );
+
+                wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+                return;
+            }
+        }
+
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -48,9 +48,9 @@ 
 	 *
 	 * @param \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
 	 */
-	public function __construct( $schema_service ) {
+	public function __construct($schema_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Type_Service');
 
 		$this->schema_service = $schema_service;
 
@@ -78,28 +78,28 @@ 
 	 *
 	 * @return array|null An array of type properties or null if no term is associated
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
 		// Return the correct entity type according to the post type.
-		switch ( get_post_type( $post_id ) ) {
+		switch (get_post_type($post_id)) {
 
 			case 'entity':
 				// Get the type from the associated classification.
 
-				$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+				$terms = wp_get_object_terms($post_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
-				if ( is_wp_error( $terms ) ) {
+				if (is_wp_error($terms)) {
 					// TODO: handle error
 					return null;
 				}
 
 				// If there are not terms associated, return null.
-				if ( 0 === count( $terms ) ) {
+				if (0 === count($terms)) {
 					return null;
 				}
 
 				// Return the entity type with the specified id.
-				return $this->schema_service->get_schema( $terms[0]->slug );
+				return $this->schema_service->get_schema($terms[0]->slug);
 
 			case 'post':
 			case 'page':
@@ -127,18 +127,18 @@ 
 	 * @param int    $post_id  The post id.
 	 * @param string $type_uri The type URI.
 	 */
-	public function set( $post_id, $type_uri ) {
+	public function set($post_id, $type_uri) {
 
 		// If the type URI is empty we remove the type.
-		if ( empty( $type_uri ) ) {
+		if (empty($type_uri)) {
 
-			wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+			wp_set_object_terms($post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 			return;
 		}
 
 		// Get all the terms bound to the wl_entity_type taxonomy.
-		$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+		$terms = get_terms(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 			'hide_empty' => false,
 			// Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
 			// An issue has been opened with the AAM plugin author as well.
@@ -146,24 +146,24 @@ 
 			// see https://github.com/insideout10/wordlift-plugin/issues/334
 			// see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
 			'fields'     => 'all',
-		) );
+		));
 
-		$this->log->error( "Type not found [ post id :: $post_id ][ type uri :: $type_uri ]" );
+		$this->log->error("Type not found [ post id :: $post_id ][ type uri :: $type_uri ]");
 
 		// Check which term matches the specified URI.
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 
 			$term_id   = $term->term_id;
 			$term_slug = $term->slug;
 
 			// Load the type data.
-			$type = $this->schema_service->get_schema( $term_slug );
+			$type = $this->schema_service->get_schema($term_slug);
 			// Set the related term ID.
-			if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
+			if ($type_uri === $type['uri'] || $type_uri === $type['css_class']) {
 
-				$this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term_id ][ term slug :: $term_slug ][ type uri :: {$type['uri']} ][ type css class :: {$type['css_class']} ]" );
+				$this->log->debug("Setting entity type [ post id :: $post_id ][ term id :: $term_id ][ term slug :: $term_slug ][ type uri :: {$type['uri']} ][ type css class :: {$type['css_class']} ]");
 
-				wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+				wp_set_object_terms($post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 				return;
 			}

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

Indentation +138 added lines, -138 removed lines

@@ -16,143 +16,143 @@
  */
 class Wordlift_Entity_Post_Type_Service {
 
-	/**
-	 * The entity post type.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $post_type The entity post type.
-	 */
-	private $post_type;
-
-	/**
-	 * The entity type slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $slug The entity type slug.
-	 */
-	private $slug;
-
-	/**
-	 * A singleton instance of the entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var Wordlift_Entity_Post_Type_Service
-	 */
-	private static $instance;
-
-	/**
-	 * Create an entity type service instance.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $post_type The post type, e.g. entity.
-	 * @param string $slug      The entity type slug, if the slug is empty, the default slug will be used.
-	 */
-	public function __construct( $post_type, $slug ) {
-
-
-		$this->post_type = $post_type;
-
-		// We cannot assign an empty slug to the register_post_type function, therefore if the slug is empty we default
-		// to the type name.
-		$this->slug = $slug ?: $post_type;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the entity type service singleton instance.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return Wordlift_Entity_Post_Type_Service The entity type service singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the entity type slug.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return string The entity type slug.
-	 */
-	public function get_slug() {
-
-		return $this->slug;
-	}
-
-	/**
-	 * Get the entity post type name.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return string The entity post type.
-	 */
-	public function get_post_type() {
-
-		return $this->post_type;
-	}
-
-
-	/**
-	 * Register the WordLift entity post type. This method is hooked to WordPress' init action.
-	 *
-	 * @since 3.6.0
-	 */
-	public function register() {
-
-		$labels = array(
-			'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
-			'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
-			'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
-			'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
-			'edit_item'          => __( 'Edit Entity', 'wordlift' ),
-			'new_item'           => __( 'New Entity', 'wordlift' ),
-			'all_items'          => __( 'All Entities', 'wordlift' ),
-			'view_item'          => __( 'View Entity', 'wordlift' ),
-			'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
-			'not_found'          => __( 'No entities found', 'wordlift' ),
-			'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
-			'parent_item_colon'  => '',
-			'menu_name'          => __( 'Vocabulary', 'wordlift' ),
-		);
-
-		$args = array(
-			'labels'        => $labels,
-			'description'   => 'Holds our vocabulary (set of entities) and entity specific data',
-			'public'        => true,
-			'menu_position' => 20,
-			// after the pages menu.
-			// Add support for 'authors' and 'revisions':
-			// * see https://github.com/insideout10/wordlift-plugin/issues/395
-			// * see https://github.com/insideout10/wordlift-plugin/issues/376
-			'supports'      => array(
-				'title',
-				'editor',
-				'thumbnail',
-				'excerpt',
-				'comments',
-				'author',
-				// Disabling revisions support.
-				//
-				// See https://github.com/insideout10/wordlift-plugin/issues/462
-				// 'revisions',
-			),
-			'has_archive'   => true,
-			'menu_icon'     => WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
-			// Although we define our slug here, we further manage linking to entities using the Wordlift_Entity_Link_Service.
-			'rewrite'       => array( 'slug' => $this->slug ),
-		);
-
-		register_post_type( $this->post_type, $args );
-
-	}
+    /**
+     * The entity post type.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $post_type The entity post type.
+     */
+    private $post_type;
+
+    /**
+     * The entity type slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $slug The entity type slug.
+     */
+    private $slug;
+
+    /**
+     * A singleton instance of the entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var Wordlift_Entity_Post_Type_Service
+     */
+    private static $instance;
+
+    /**
+     * Create an entity type service instance.
+     *
+     * @since 3.6.0
+     *
+     * @param string $post_type The post type, e.g. entity.
+     * @param string $slug      The entity type slug, if the slug is empty, the default slug will be used.
+     */
+    public function __construct( $post_type, $slug ) {
+
+
+        $this->post_type = $post_type;
+
+        // We cannot assign an empty slug to the register_post_type function, therefore if the slug is empty we default
+        // to the type name.
+        $this->slug = $slug ?: $post_type;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the entity type service singleton instance.
+     *
+     * @since 3.6.0
+     *
+     * @return Wordlift_Entity_Post_Type_Service The entity type service singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the entity type slug.
+     *
+     * @since 3.6.0
+     *
+     * @return string The entity type slug.
+     */
+    public function get_slug() {
+
+        return $this->slug;
+    }
+
+    /**
+     * Get the entity post type name.
+     *
+     * @since 3.6.0
+     *
+     * @return string The entity post type.
+     */
+    public function get_post_type() {
+
+        return $this->post_type;
+    }
+
+
+    /**
+     * Register the WordLift entity post type. This method is hooked to WordPress' init action.
+     *
+     * @since 3.6.0
+     */
+    public function register() {
+
+        $labels = array(
+            'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
+            'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
+            'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
+            'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
+            'edit_item'          => __( 'Edit Entity', 'wordlift' ),
+            'new_item'           => __( 'New Entity', 'wordlift' ),
+            'all_items'          => __( 'All Entities', 'wordlift' ),
+            'view_item'          => __( 'View Entity', 'wordlift' ),
+            'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
+            'not_found'          => __( 'No entities found', 'wordlift' ),
+            'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
+            'parent_item_colon'  => '',
+            'menu_name'          => __( 'Vocabulary', 'wordlift' ),
+        );
+
+        $args = array(
+            'labels'        => $labels,
+            'description'   => 'Holds our vocabulary (set of entities) and entity specific data',
+            'public'        => true,
+            'menu_position' => 20,
+            // after the pages menu.
+            // Add support for 'authors' and 'revisions':
+            // * see https://github.com/insideout10/wordlift-plugin/issues/395
+            // * see https://github.com/insideout10/wordlift-plugin/issues/376
+            'supports'      => array(
+                'title',
+                'editor',
+                'thumbnail',
+                'excerpt',
+                'comments',
+                'author',
+                // Disabling revisions support.
+                //
+                // See https://github.com/insideout10/wordlift-plugin/issues/462
+                // 'revisions',
+            ),
+            'has_archive'   => true,
+            'menu_icon'     => WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
+            // Although we define our slug here, we further manage linking to entities using the Wordlift_Entity_Link_Service.
+            'rewrite'       => array( 'slug' => $this->slug ),
+        );
+
+        register_post_type( $this->post_type, $args );
+
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -51,7 +51,7 @@ 
 	 * @param string $post_type The post type, e.g. entity.
 	 * @param string $slug      The entity type slug, if the slug is empty, the default slug will be used.
 	 */
-	public function __construct( $post_type, $slug ) {
+	public function __construct($post_type, $slug) {
 
 
 		$this->post_type = $post_type;
@@ -109,19 +109,19 @@ 
 	public function register() {
 
 		$labels = array(
-			'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
-			'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
-			'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
-			'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
-			'edit_item'          => __( 'Edit Entity', 'wordlift' ),
-			'new_item'           => __( 'New Entity', 'wordlift' ),
-			'all_items'          => __( 'All Entities', 'wordlift' ),
-			'view_item'          => __( 'View Entity', 'wordlift' ),
-			'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
-			'not_found'          => __( 'No entities found', 'wordlift' ),
-			'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
+			'name'               => _x('Vocabulary', 'post type general name', 'wordlift'),
+			'singular_name'      => _x('Entity', 'post type singular name', 'wordlift'),
+			'add_new'            => _x('Add New Entity', 'entity', 'wordlift'),
+			'add_new_item'       => __('Add New Entity', 'wordlift'),
+			'edit_item'          => __('Edit Entity', 'wordlift'),
+			'new_item'           => __('New Entity', 'wordlift'),
+			'all_items'          => __('All Entities', 'wordlift'),
+			'view_item'          => __('View Entity', 'wordlift'),
+			'search_items'       => __('Search in Vocabulary', 'wordlift'),
+			'not_found'          => __('No entities found', 'wordlift'),
+			'not_found_in_trash' => __('No entities found in the Trash', 'wordlift'),
 			'parent_item_colon'  => '',
-			'menu_name'          => __( 'Vocabulary', 'wordlift' ),
+			'menu_name'          => __('Vocabulary', 'wordlift'),
 		);
 
 		$args = array(
@@ -146,12 +146,12 @@ 
 				// 'revisions',
 			),
 			'has_archive'   => true,
-			'menu_icon'     => WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
+			'menu_icon'     => WP_CONTENT_URL.'/plugins/wordlift/images/svg/wl-vocabulary-icon.svg',
 			// Although we define our slug here, we further manage linking to entities using the Wordlift_Entity_Link_Service.
-			'rewrite'       => array( 'slug' => $this->slug ),
+			'rewrite'       => array('slug' => $this->slug),
 		);
 
-		register_post_type( $this->post_type, $args );
+		register_post_type($this->post_type, $args);
 
 	}