insideout10 / wordlift-plugin

src/modules/core/wordlift_core_entity_api.php

Indentation +80 added lines, -80 removed lines

@@ -20,51 +20,51 @@ 
  */
 function wl_entity_get_by_title( $title, $autocomplete = FALSE, $include_alias = TRUE ) {
 
-	global $wpdb;
-
-	// Search by substring
-	if ( $autocomplete ) {
-		$title = '%' . $title . '%';
-	}
-
-	// The title is a LIKE query.
-	$query = "SELECT DISTINCT p.ID AS id, p.post_title AS title, t.name AS schema_type_name, t.slug AS type_slug"
-	         . " FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t"
-	         . "  WHERE p.post_type = %s"
-	         . "   AND p.post_title LIKE %s"
-	         . "   AND t.term_id = tt.term_id"
-	         . "   AND tt.taxonomy = %s"
-	         . "   AND tt.term_taxonomy_id = tr.term_taxonomy_id"
-	         . "   AND tr.object_id = p.ID"
-	         // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
-	         . "   AND p.post_status != 'trash'";
-
-	if ( $include_alias ) {
-
-		$query .= " UNION"
-		          . "  SELECT DISTINCT p.ID AS id, CONCAT( m.meta_value, ' (', p.post_title, ')' ) AS title, t.name AS schema_type_name, t.slug AS type_slug"
-		          . "  FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t, $wpdb->postmeta m"
-		          . "   WHERE p.post_type = %s"
-		          . "    AND m.meta_key = %s AND m.meta_value LIKE %s"
-		          . "    AND m.post_id = p.ID"
-		          . "    AND t.term_id = tt.term_id"
-		          . "    AND tt.taxonomy = %s"
-		          . "    AND tt.term_taxonomy_id = tr.term_taxonomy_id"
-		          . "    AND tr.object_id = p.ID"
-		          // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
-		          . "    AND p.post_status != 'trash'";
-	}
-
-	return $wpdb->get_results( $wpdb->prepare(
-		$query,
-		Wordlift_Entity_Service::TYPE_NAME,
-		$title,
-		Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-		Wordlift_Entity_Service::TYPE_NAME,
-		Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
-		$title,
-		Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME
-	) );
+    global $wpdb;
+
+    // Search by substring
+    if ( $autocomplete ) {
+        $title = '%' . $title . '%';
+    }
+
+    // The title is a LIKE query.
+    $query = "SELECT DISTINCT p.ID AS id, p.post_title AS title, t.name AS schema_type_name, t.slug AS type_slug"
+                . " FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t"
+                . "  WHERE p.post_type = %s"
+                . "   AND p.post_title LIKE %s"
+                . "   AND t.term_id = tt.term_id"
+                . "   AND tt.taxonomy = %s"
+                . "   AND tt.term_taxonomy_id = tr.term_taxonomy_id"
+                . "   AND tr.object_id = p.ID"
+                // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
+                . "   AND p.post_status != 'trash'";
+
+    if ( $include_alias ) {
+
+        $query .= " UNION"
+                    . "  SELECT DISTINCT p.ID AS id, CONCAT( m.meta_value, ' (', p.post_title, ')' ) AS title, t.name AS schema_type_name, t.slug AS type_slug"
+                    . "  FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t, $wpdb->postmeta m"
+                    . "   WHERE p.post_type = %s"
+                    . "    AND m.meta_key = %s AND m.meta_value LIKE %s"
+                    . "    AND m.post_id = p.ID"
+                    . "    AND t.term_id = tt.term_id"
+                    . "    AND tt.taxonomy = %s"
+                    . "    AND tt.term_taxonomy_id = tr.term_taxonomy_id"
+                    . "    AND tr.object_id = p.ID"
+                    // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
+                    . "    AND p.post_status != 'trash'";
+    }
+
+    return $wpdb->get_results( $wpdb->prepare(
+        $query,
+        Wordlift_Entity_Service::TYPE_NAME,
+        $title,
+        Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+        Wordlift_Entity_Service::TYPE_NAME,
+        Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
+        $title,
+        Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME
+    ) );
 }
 
 /**
@@ -74,41 +74,41 @@ 
  */
 function wl_entity_ajax_get_by_title() {
 
-	// `wl_entity_metaboxes_utilities.js` still uses `GET`.
-	//
-	// See https://github.com/insideout10/wordlift-plugin/issues/438.
-	// Get the title to search.
-	if ( empty( $_POST['title'] ) && empty( $_GET['title'] ) ) {
-		ob_clean();
-		wp_send_json_error( 'The title parameter is required.' );
-	}
-
-	// `wl_entity_metaboxes_utilities.js` still uses `GET`.
-	//
-	// See https://github.com/insideout10/wordlift-plugin/issues/438.
-	$title = $_POST['title'] ?: $_GET['title'];
-
-	// Are we searching for a specific title or for a containing title?
-	$autocomplete = isset( $_GET['autocomplete'] );
-
-	// Are we searching also for the aliases?
-	$include_alias = isset( $_GET['alias'] );
-
-	// Get the edit link.
-	$post_type_object = get_post_type_object( Wordlift_Entity_Service::TYPE_NAME );
-	$edit_link        = $post_type_object->_edit_link . '&action=edit';
-
-	// Prepare the response with the edit link.
-	$response = array(
-		'edit_link' => $edit_link,
-		'results'   => wl_entity_get_by_title( $title, $autocomplete, $include_alias ),
-	);
-
-	// Clean any buffer.
-	ob_clean();
-
-	// Send the success response.
-	wp_send_json_success( $response );
+    // `wl_entity_metaboxes_utilities.js` still uses `GET`.
+    //
+    // See https://github.com/insideout10/wordlift-plugin/issues/438.
+    // Get the title to search.
+    if ( empty( $_POST['title'] ) && empty( $_GET['title'] ) ) {
+        ob_clean();
+        wp_send_json_error( 'The title parameter is required.' );
+    }
+
+    // `wl_entity_metaboxes_utilities.js` still uses `GET`.
+    //
+    // See https://github.com/insideout10/wordlift-plugin/issues/438.
+    $title = $_POST['title'] ?: $_GET['title'];
+
+    // Are we searching for a specific title or for a containing title?
+    $autocomplete = isset( $_GET['autocomplete'] );
+
+    // Are we searching also for the aliases?
+    $include_alias = isset( $_GET['alias'] );
+
+    // Get the edit link.
+    $post_type_object = get_post_type_object( Wordlift_Entity_Service::TYPE_NAME );
+    $edit_link        = $post_type_object->_edit_link . '&action=edit';
+
+    // Prepare the response with the edit link.
+    $response = array(
+        'edit_link' => $edit_link,
+        'results'   => wl_entity_get_by_title( $title, $autocomplete, $include_alias ),
+    );
+
+    // Clean any buffer.
+    ob_clean();
+
+    // Send the success response.
+    wp_send_json_success( $response );
 
 }
 

Spacing +15 added lines, -15 removed lines

@@ -18,13 +18,13 @@ 
  *
  * @return array An array of WP_Post instances.
  */
-function wl_entity_get_by_title( $title, $autocomplete = FALSE, $include_alias = TRUE ) {
+function wl_entity_get_by_title($title, $autocomplete = FALSE, $include_alias = TRUE) {
 
 	global $wpdb;
 
 	// Search by substring
-	if ( $autocomplete ) {
-		$title = '%' . $title . '%';
+	if ($autocomplete) {
+		$title = '%'.$title.'%';
 	}
 
 	// The title is a LIKE query.
@@ -39,7 +39,7 @@ 
 	         // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
 	         . "   AND p.post_status != 'trash'";
 
-	if ( $include_alias ) {
+	if ($include_alias) {
 
 		$query .= " UNION"
 		          . "  SELECT DISTINCT p.ID AS id, CONCAT( m.meta_value, ' (', p.post_title, ')' ) AS title, t.name AS schema_type_name, t.slug AS type_slug"
@@ -55,7 +55,7 @@ 
 		          . "    AND p.post_status != 'trash'";
 	}
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		$query,
 		Wordlift_Entity_Service::TYPE_NAME,
 		$title,
@@ -64,7 +64,7 @@ 
 		Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
 		$title,
 		Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME
-	) );
+	));
 }
 
 /**
@@ -78,9 +78,9 @@ 
 	//
 	// See https://github.com/insideout10/wordlift-plugin/issues/438.
 	// Get the title to search.
-	if ( empty( $_POST['title'] ) && empty( $_GET['title'] ) ) {
+	if (empty($_POST['title']) && empty($_GET['title'])) {
 		ob_clean();
-		wp_send_json_error( 'The title parameter is required.' );
+		wp_send_json_error('The title parameter is required.');
 	}
 
 	// `wl_entity_metaboxes_utilities.js` still uses `GET`.
@@ -89,27 +89,27 @@ 
 	$title = $_POST['title'] ?: $_GET['title'];
 
 	// Are we searching for a specific title or for a containing title?
-	$autocomplete = isset( $_GET['autocomplete'] );
+	$autocomplete = isset($_GET['autocomplete']);
 
 	// Are we searching also for the aliases?
-	$include_alias = isset( $_GET['alias'] );
+	$include_alias = isset($_GET['alias']);
 
 	// Get the edit link.
-	$post_type_object = get_post_type_object( Wordlift_Entity_Service::TYPE_NAME );
-	$edit_link        = $post_type_object->_edit_link . '&action=edit';
+	$post_type_object = get_post_type_object(Wordlift_Entity_Service::TYPE_NAME);
+	$edit_link        = $post_type_object->_edit_link.'&action=edit';
 
 	// Prepare the response with the edit link.
 	$response = array(
 		'edit_link' => $edit_link,
-		'results'   => wl_entity_get_by_title( $title, $autocomplete, $include_alias ),
+		'results'   => wl_entity_get_by_title($title, $autocomplete, $include_alias),
 	);
 
 	// Clean any buffer.
 	ob_clean();
 
 	// Send the success response.
-	wp_send_json_success( $response );
+	wp_send_json_success($response);
 
 }
 
-add_action( 'wp_ajax_entity_by_title', 'wl_entity_ajax_get_by_title' );
+add_action('wp_ajax_entity_by_title', 'wl_entity_ajax_get_by_title');

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

Indentation +786 added lines, -786 removed lines

@@ -15,791 +15,791 @@
  */
 class Wordlift_Schema_Service {
 
-	/**
-	 * The 'location created' field name.
-	 *
-	 * @since 3.5.0
-	 */
-	const FIELD_LOCATION_CREATED = 'wl_location_created';
-
-	/**
-	 * The 'topic' field name.
-	 *
-	 * @since 3.5.0
-	 */
-	const FIELD_TOPIC = 'wl_topic';
-
-	/**
-	 * The 'author' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_AUTHOR = 'wl_author';
-
-	/**
-	 * The 'same as' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_SAME_AS = 'entity_same_as';
-
-	/**
-	 * The 'date start' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_DATE_START = 'wl_cal_date_start';
-
-	/**
-	 * The 'date end' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_DATE_END = 'wl_cal_date_end';
-
-	/**
-	 * The 'location' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_LOCATION = 'wl_location';
-
-	/**
-	 * The 'founder' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_FOUNDER = 'wl_founder';
-
-	/**
-	 * The 'knows' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_KNOWS = 'wl_knows';
-
-	/**
-	 * The 'birth date' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_BIRTH_DATE = 'wl_birth_date';
-
-	/**
-	 * The 'birth place' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_BIRTH_PLACE = 'wl_birth_place';
-
-	/**
-	 * The 'latitude' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_GEO_LATITUDE = 'wl_geo_latitude';
-
-	/**
-	 * The 'longitude' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_GEO_LONGITUDE = 'wl_geo_longitude';
-
-	/**
-	 * The 'streetAddress' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_ADDRESS = 'wl_address';
-
-	/**
-	 * The 'postOfficeBoxNumber' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_PO_BOX = 'wl_address_post_office_box';
-
-	/**
-	 * The 'postalCode' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_POSTAL_CODE = 'wl_address_postal_code';
-
-	/**
-	 * The 'addressLocality' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_LOCALITY = 'wl_address_locality';
-	/**
-	 * The 'addressRegion' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_REGION = 'wl_address_region';
-
-	/**
-	 * The 'addressCountry' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_COUNTRY = 'wl_address_country';
-
-	/**
-	 * The 'entity type' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_ENTITY_TYPE = 'wl_entity_type_uri';
-
-	/**
-	 * The 'email' field name.
-	 *
-	 * @since 3.2.0
-	 */
-	const FIELD_EMAIL = 'wl_email';
-
-	/**
-	 * The 'affiliation' field name.
-	 *
-	 * @since 3.2.0
-	 */
-	const FIELD_AFFILIATION = 'wl_affiliation';
-
-	/**
-	 * The 'telephone' field name.
-	 *
-	 * @since 3.8.0
-	 */
-	const FIELD_TELEPHONE = 'wl_schema_telephone';
-
-	/**
-	 * The 'URI' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_URI = 'uri';
-
-	/**
-	 * The 'date' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_DATE = 'date';
-
-	/**
-	 * The 'double' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_DOUBLE = 'double';
-
-	/**
-	 * The 'string' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_STRING = 'string';
-
-	/**
-	 * The 'integer' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_INTEGER = 'int';
-
-	/**
-	 * The 'boolean' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_BOOLEAN = 'bool';
-
-	/**
-	 * The schema.org Event type URI.
-	 *
-	 * @since 3.1.0
-	 */
-	const SCHEMA_EVENT_TYPE = 'http://schema.org/Event';
-
-	/**
-	 * The Schema service singleton instance.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $instance The Schema service singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * WordLift's schema.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var array $schema WordLift's schema.
-	 */
-	private $schema;
-
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Wordlift_Schema_Service constructor.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Schema_Service' );
-
-		// Create a singleton instance of the Schema service, useful to provide static functions to global functions.
-		self::$instance = $this;
-
-		// Set the taxonomy data.
-		// Note: parent types must be defined before child types.
-		$this->schema = array(
-			'thing'         => $this->get_thing_schema(),
-			'creative-work' => $this->get_creative_work_schema(),
-			'event'         => $this->get_event_schema(),
-			'organization'  => $this->get_organization_schema(),
-			'person'        => $this->get_person_schema(),
-			'place'         => $this->get_place_schema(),
-			'localbusiness' => $this->get_local_business_schema(),
-		);
-
-	}
-
-	/**
-	 * Get a reference to the Schema service.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return Wordlift_Schema_Service A reference to the Schema service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the properties for a field with the specified key. The key is used as
-	 * meta key when the field's value is stored in WordPress meta data table.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $key The field's key.
-	 *
-	 * @return null|array An array of field's properties or null if the field is not found.
-	 */
-	public function get_field( $key ) {
-
-		// Parse each schema's fields until we find the one we're looking for, then
-		// return its properties.
-		foreach ( $this->schema as $_ => $schema ) {
-
-			if ( ! isset( $schema['custom_fields'] ) ) {
-				break;
-			}
-
-			foreach ( $schema['custom_fields'] as $field => $props ) {
-				if ( $key === $field ) {
-					return $props;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the WordLift's schema.
-	 *
-	 * @param string $name The schema name.
-	 *
-	 * @return array|null An array with the schema configuration or NULL if the schema is not found.
-	 *
-	 * @since 3.1.0
-	 */
-	public function get_schema( $name ) {
-
-		// Check if the schema exists and, if not, return NULL.
-		if ( ! isset( $this->schema[ $name ] ) ) {
-			return null;
-		}
-
-		// Return the requested schema.
-		return $this->schema[ $name ];
-	}
-
-	/**
-	 * Get the WordLift's schema trough schema type uri.
-	 *
-	 * @param string $uri The schema uri.
-	 *
-	 * @return array|null An array with the schema configuration or NULL if the schema is not found.
-	 *
-	 * @since 3.3.0
-	 */
-	public function get_schema_by_uri( $uri ) {
-
-		foreach ( $this->schema as $name => $schema ) {
-			if ( $schema['uri'] === $uri ) {
-				return $schema;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the 'thing' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_thing_schema() {
-
-		return array(
-			'css_class'     => 'wl-thing',
-			'uri'           => 'http://schema.org/Thing',
-			'same_as'       => array( '*' ),
-			// set as default.
-			'custom_fields' => array(
-				self::FIELD_SAME_AS                            => array(
-					'predicate'   => 'http://schema.org/sameAs',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Thing',
-					'constraints' => array(
-						'cardinality' => INF,
-					),
-					// We need a custom metabox.
-					'input_field' => 'sameas',
-				),
-				// Add the schema:url property.
-				Wordlift_Schema_Url_Property_Service::META_KEY => Wordlift_Schema_Url_Property_Service::get_instance()
-				                                                                                      ->get_compat_definition(),
-			),
-			// {{sameAs}} not present in the microdata template,
-			// because it is treated separately in *wl_content_embed_item_microdata*
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-	}
-
-	/**
-	 * Get the 'creative work' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_creative_work_schema() {
-
-		$schema = array(
-			'label'         => 'CreativeWork',
-			'description'   => 'A creative work (or a Music Album).',
-			'parents'       => array( 'thing' ),
-			// Give term slug as parent.
-			'css_class'     => 'wl-creative-work',
-			'uri'           => 'http://schema.org/CreativeWork',
-			'same_as'       => array(
-				'http://schema.org/MusicAlbum',
-				'http://schema.org/Product',
-			),
-			'custom_fields' => array(
-				self::FIELD_AUTHOR => array(
-					'predicate'   => 'http://schema.org/author',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Person',
-					'constraints' => array(
-						'uri_type'    => array( 'Person', 'Organization' ),
-						'cardinality' => INF,
-					),
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'event' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_event_schema() {
-
-		$schema = array(
-			'label'         => 'Event',
-			'description'   => 'An event . ',
-			'parents'       => array( 'thing' ),
-			'css_class'     => 'wl-event',
-			'uri'           => self::SCHEMA_EVENT_TYPE,
-			'same_as'       => array( 'http://dbpedia.org/ontology/Event' ),
-			'custom_fields' => array(
-				self::FIELD_DATE_START => array(
-					'predicate'   => 'http://schema.org/startDate',
-					'type'        => self::DATA_TYPE_DATE,
-					'export_type' => 'xsd:datetime',
-					'constraints' => '',
-				),
-				self::FIELD_DATE_END   => array(
-					'predicate'   => 'http://schema.org/endDate',
-					'type'        => self::DATA_TYPE_DATE,
-					'export_type' => 'xsd:datetime',
-					'constraints' => '',
-				),
-				self::FIELD_LOCATION   => array(
-					'predicate'   => 'http://schema.org/location',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/PostalAddress',
-					'constraints' => array(
-						'uri_type'    => array( 'Place', 'LocalBusiness' ),
-						'cardinality' => INF,
-					),
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'organization' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_organization_schema() {
-
-		$schema = array(
-			'label'         => 'Organization',
-			'description'   => 'An organization, including a government or a newspaper.',
-			'parents'       => array( 'thing' ),
-			'css_class'     => 'wl-organization',
-			'uri'           => 'http://schema.org/Organization',
-			'same_as'       => array(
-				'http://rdf.freebase.com/ns/organization.organization',
-				'http://rdf.freebase.com/ns/government.government',
-				'http://schema.org/Newspaper',
-			),
-			'custom_fields' => array(
-				self::FIELD_FOUNDER             => array(
-					'predicate'   => 'http://schema.org/founder',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Person',
-					'constraints' => array(
-						'uri_type'    => 'Person',
-						'cardinality' => INF,
-					),
-				),
-				self::FIELD_ADDRESS             => array(
-					'predicate'   => 'http://schema.org/streetAddress',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_PO_BOX      => array(
-					'predicate'   => 'http://schema.org/postOfficeBoxNumber',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_POSTAL_CODE => array(
-					'predicate'   => 'http://schema.org/postalCode',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_LOCALITY    => array(
-					'predicate'   => 'http://schema.org/addressLocality',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_REGION      => array(
-					'predicate'   => 'http://schema.org/addressRegion',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_COUNTRY     => array(
-					'predicate'   => 'http://schema.org/addressCountry',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_EMAIL               => array(
-					'predicate'   => 'http://schema.org/email',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-				),
-				self::FIELD_TELEPHONE           => array(
-					'predicate'   => 'http://schema.org/telephone',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'person' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_person_schema() {
-
-		$schema = array(
-			'label'         => 'Person',
-			'description'   => 'A person (or a music artist).',
-			'parents'       => array( 'thing' ),
-			'css_class'     => 'wl-person',
-			'uri'           => 'http://schema.org/Person',
-			'same_as'       => array(
-				'http://rdf.freebase.com/ns/people.person',
-				'http://rdf.freebase.com/ns/music.artist',
-				'http://dbpedia.org/class/yago/LivingPeople',
-			),
-			'custom_fields' => array(
-				self::FIELD_KNOWS       => array(
-					'predicate'   => 'http://schema.org/knows',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Person',
-					'constraints' => array(
-						'uri_type'    => 'Person',
-						'cardinality' => INF,
-					),
-				),
-				self::FIELD_BIRTH_DATE  => array(
-					'predicate'   => 'http://schema.org/birthDate',
-					'type'        => self::DATA_TYPE_DATE,
-					'export_type' => 'xsd:date',
-					'constraints' => '',
-				),
-				self::FIELD_BIRTH_PLACE => array(
-					'predicate'   => 'http://schema.org/birthPlace',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Place',
-					'constraints' => array(
-						'uri_type' => 'Place',
-					),
-				),
-				self::FIELD_AFFILIATION => array(
-					'predicate'   => 'http://schema.org/affiliation',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Organization',
-					'constraints' => array(
-						'uri_type'    => array(
-							'Organization',
-							'LocalBusiness',
-						),
-						'cardinality' => INF,
-					),
-				),
-				self::FIELD_EMAIL       => array(
-					'predicate'   => 'http://schema.org/email',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => array(
-						'cardinality' => INF,
-					),
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-
-	}
-
-	/**
-	 * Get the 'place' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_place_schema() {
-
-		$schema = array(
-			'label'         => 'Place',
-			'description'   => 'A place.',
-			'parents'       => array( 'thing' ),
-			'css_class'     => 'wl-place',
-			'uri'           => 'http://schema.org/Place',
-			'same_as'       => array(
-				'http://rdf.freebase.com/ns/location.location',
-				'http://www.opengis.net/gml/_Feature',
-			),
-			'custom_fields' => array(
-				self::FIELD_GEO_LATITUDE        => array(
-					'predicate'   => 'http://schema.org/latitude',
-					'type'        => self::DATA_TYPE_DOUBLE,
-					'export_type' => 'xsd:double',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'coordinates',
-				),
-				self::FIELD_GEO_LONGITUDE       => array(
-					'predicate'   => 'http://schema.org/longitude',
-					'type'        => self::DATA_TYPE_DOUBLE,
-					'export_type' => 'xsd:double',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'coordinates',
-				),
-				self::FIELD_ADDRESS             => array(
-					'predicate'   => 'http://schema.org/streetAddress',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_PO_BOX      => array(
-					'predicate'   => 'http://schema.org/postOfficeBoxNumber',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_POSTAL_CODE => array(
-					'predicate'   => 'http://schema.org/postalCode',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_LOCALITY    => array(
-					'predicate'   => 'http://schema.org/addressLocality',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_REGION      => array(
-					'predicate'   => 'http://schema.org/addressRegion',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-				self::FIELD_ADDRESS_COUNTRY     => array(
-					'predicate'   => 'http://schema.org/addressCountry',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					// To build custom metabox.
-					'input_field' => 'address',
-				),
-			),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'local business' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_local_business_schema() {
-
-		$schema = array(
-			'label'         => 'LocalBusiness',
-			'description'   => 'A local business.',
-			'parents'       => array( 'place', 'organization' ),
-			'css_class'     => 'wl-local-business',
-			'uri'           => 'http://schema.org/LocalBusiness',
-			'same_as'       => array(
-				'http://rdf.freebase.com/ns/business/business_location',
-				'https://schema.org/Store',
-			),
-			'custom_fields' => array(),
-			'templates'     => array(
-				'subtitle' => '{{id}}',
-			),
-		);
-
-		// Merge the custom fields with those provided by the place and organization schema.
-		$place_schema            = $this->get_place_schema();
-		$organization_schema     = $this->get_organization_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields'] );
-
-		return $schema;
-	}
+    /**
+     * The 'location created' field name.
+     *
+     * @since 3.5.0
+     */
+    const FIELD_LOCATION_CREATED = 'wl_location_created';
+
+    /**
+     * The 'topic' field name.
+     *
+     * @since 3.5.0
+     */
+    const FIELD_TOPIC = 'wl_topic';
+
+    /**
+     * The 'author' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_AUTHOR = 'wl_author';
+
+    /**
+     * The 'same as' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_SAME_AS = 'entity_same_as';
+
+    /**
+     * The 'date start' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_DATE_START = 'wl_cal_date_start';
+
+    /**
+     * The 'date end' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_DATE_END = 'wl_cal_date_end';
+
+    /**
+     * The 'location' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_LOCATION = 'wl_location';
+
+    /**
+     * The 'founder' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_FOUNDER = 'wl_founder';
+
+    /**
+     * The 'knows' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_KNOWS = 'wl_knows';
+
+    /**
+     * The 'birth date' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_BIRTH_DATE = 'wl_birth_date';
+
+    /**
+     * The 'birth place' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_BIRTH_PLACE = 'wl_birth_place';
+
+    /**
+     * The 'latitude' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_GEO_LATITUDE = 'wl_geo_latitude';
+
+    /**
+     * The 'longitude' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_GEO_LONGITUDE = 'wl_geo_longitude';
+
+    /**
+     * The 'streetAddress' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_ADDRESS = 'wl_address';
+
+    /**
+     * The 'postOfficeBoxNumber' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_PO_BOX = 'wl_address_post_office_box';
+
+    /**
+     * The 'postalCode' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_POSTAL_CODE = 'wl_address_postal_code';
+
+    /**
+     * The 'addressLocality' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_LOCALITY = 'wl_address_locality';
+    /**
+     * The 'addressRegion' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_REGION = 'wl_address_region';
+
+    /**
+     * The 'addressCountry' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_COUNTRY = 'wl_address_country';
+
+    /**
+     * The 'entity type' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_ENTITY_TYPE = 'wl_entity_type_uri';
+
+    /**
+     * The 'email' field name.
+     *
+     * @since 3.2.0
+     */
+    const FIELD_EMAIL = 'wl_email';
+
+    /**
+     * The 'affiliation' field name.
+     *
+     * @since 3.2.0
+     */
+    const FIELD_AFFILIATION = 'wl_affiliation';
+
+    /**
+     * The 'telephone' field name.
+     *
+     * @since 3.8.0
+     */
+    const FIELD_TELEPHONE = 'wl_schema_telephone';
+
+    /**
+     * The 'URI' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_URI = 'uri';
+
+    /**
+     * The 'date' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_DATE = 'date';
+
+    /**
+     * The 'double' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_DOUBLE = 'double';
+
+    /**
+     * The 'string' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_STRING = 'string';
+
+    /**
+     * The 'integer' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_INTEGER = 'int';
+
+    /**
+     * The 'boolean' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_BOOLEAN = 'bool';
+
+    /**
+     * The schema.org Event type URI.
+     *
+     * @since 3.1.0
+     */
+    const SCHEMA_EVENT_TYPE = 'http://schema.org/Event';
+
+    /**
+     * The Schema service singleton instance.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Schema_Service $instance The Schema service singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * WordLift's schema.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var array $schema WordLift's schema.
+     */
+    private $schema;
+
+    /**
+     * The Log service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Wordlift_Schema_Service constructor.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Schema_Service' );
+
+        // Create a singleton instance of the Schema service, useful to provide static functions to global functions.
+        self::$instance = $this;
+
+        // Set the taxonomy data.
+        // Note: parent types must be defined before child types.
+        $this->schema = array(
+            'thing'         => $this->get_thing_schema(),
+            'creative-work' => $this->get_creative_work_schema(),
+            'event'         => $this->get_event_schema(),
+            'organization'  => $this->get_organization_schema(),
+            'person'        => $this->get_person_schema(),
+            'place'         => $this->get_place_schema(),
+            'localbusiness' => $this->get_local_business_schema(),
+        );
+
+    }
+
+    /**
+     * Get a reference to the Schema service.
+     *
+     * @since 3.1.0
+     *
+     * @return Wordlift_Schema_Service A reference to the Schema service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the properties for a field with the specified key. The key is used as
+     * meta key when the field's value is stored in WordPress meta data table.
+     *
+     * @since 3.6.0
+     *
+     * @param string $key The field's key.
+     *
+     * @return null|array An array of field's properties or null if the field is not found.
+     */
+    public function get_field( $key ) {
+
+        // Parse each schema's fields until we find the one we're looking for, then
+        // return its properties.
+        foreach ( $this->schema as $_ => $schema ) {
+
+            if ( ! isset( $schema['custom_fields'] ) ) {
+                break;
+            }
+
+            foreach ( $schema['custom_fields'] as $field => $props ) {
+                if ( $key === $field ) {
+                    return $props;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the WordLift's schema.
+     *
+     * @param string $name The schema name.
+     *
+     * @return array|null An array with the schema configuration or NULL if the schema is not found.
+     *
+     * @since 3.1.0
+     */
+    public function get_schema( $name ) {
+
+        // Check if the schema exists and, if not, return NULL.
+        if ( ! isset( $this->schema[ $name ] ) ) {
+            return null;
+        }
+
+        // Return the requested schema.
+        return $this->schema[ $name ];
+    }
+
+    /**
+     * Get the WordLift's schema trough schema type uri.
+     *
+     * @param string $uri The schema uri.
+     *
+     * @return array|null An array with the schema configuration or NULL if the schema is not found.
+     *
+     * @since 3.3.0
+     */
+    public function get_schema_by_uri( $uri ) {
+
+        foreach ( $this->schema as $name => $schema ) {
+            if ( $schema['uri'] === $uri ) {
+                return $schema;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the 'thing' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_thing_schema() {
+
+        return array(
+            'css_class'     => 'wl-thing',
+            'uri'           => 'http://schema.org/Thing',
+            'same_as'       => array( '*' ),
+            // set as default.
+            'custom_fields' => array(
+                self::FIELD_SAME_AS                            => array(
+                    'predicate'   => 'http://schema.org/sameAs',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Thing',
+                    'constraints' => array(
+                        'cardinality' => INF,
+                    ),
+                    // We need a custom metabox.
+                    'input_field' => 'sameas',
+                ),
+                // Add the schema:url property.
+                Wordlift_Schema_Url_Property_Service::META_KEY => Wordlift_Schema_Url_Property_Service::get_instance()
+                                                                                                        ->get_compat_definition(),
+            ),
+            // {{sameAs}} not present in the microdata template,
+            // because it is treated separately in *wl_content_embed_item_microdata*
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+    }
+
+    /**
+     * Get the 'creative work' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_creative_work_schema() {
+
+        $schema = array(
+            'label'         => 'CreativeWork',
+            'description'   => 'A creative work (or a Music Album).',
+            'parents'       => array( 'thing' ),
+            // Give term slug as parent.
+            'css_class'     => 'wl-creative-work',
+            'uri'           => 'http://schema.org/CreativeWork',
+            'same_as'       => array(
+                'http://schema.org/MusicAlbum',
+                'http://schema.org/Product',
+            ),
+            'custom_fields' => array(
+                self::FIELD_AUTHOR => array(
+                    'predicate'   => 'http://schema.org/author',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Person',
+                    'constraints' => array(
+                        'uri_type'    => array( 'Person', 'Organization' ),
+                        'cardinality' => INF,
+                    ),
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'event' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_event_schema() {
+
+        $schema = array(
+            'label'         => 'Event',
+            'description'   => 'An event . ',
+            'parents'       => array( 'thing' ),
+            'css_class'     => 'wl-event',
+            'uri'           => self::SCHEMA_EVENT_TYPE,
+            'same_as'       => array( 'http://dbpedia.org/ontology/Event' ),
+            'custom_fields' => array(
+                self::FIELD_DATE_START => array(
+                    'predicate'   => 'http://schema.org/startDate',
+                    'type'        => self::DATA_TYPE_DATE,
+                    'export_type' => 'xsd:datetime',
+                    'constraints' => '',
+                ),
+                self::FIELD_DATE_END   => array(
+                    'predicate'   => 'http://schema.org/endDate',
+                    'type'        => self::DATA_TYPE_DATE,
+                    'export_type' => 'xsd:datetime',
+                    'constraints' => '',
+                ),
+                self::FIELD_LOCATION   => array(
+                    'predicate'   => 'http://schema.org/location',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/PostalAddress',
+                    'constraints' => array(
+                        'uri_type'    => array( 'Place', 'LocalBusiness' ),
+                        'cardinality' => INF,
+                    ),
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'organization' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_organization_schema() {
+
+        $schema = array(
+            'label'         => 'Organization',
+            'description'   => 'An organization, including a government or a newspaper.',
+            'parents'       => array( 'thing' ),
+            'css_class'     => 'wl-organization',
+            'uri'           => 'http://schema.org/Organization',
+            'same_as'       => array(
+                'http://rdf.freebase.com/ns/organization.organization',
+                'http://rdf.freebase.com/ns/government.government',
+                'http://schema.org/Newspaper',
+            ),
+            'custom_fields' => array(
+                self::FIELD_FOUNDER             => array(
+                    'predicate'   => 'http://schema.org/founder',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Person',
+                    'constraints' => array(
+                        'uri_type'    => 'Person',
+                        'cardinality' => INF,
+                    ),
+                ),
+                self::FIELD_ADDRESS             => array(
+                    'predicate'   => 'http://schema.org/streetAddress',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_PO_BOX      => array(
+                    'predicate'   => 'http://schema.org/postOfficeBoxNumber',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_POSTAL_CODE => array(
+                    'predicate'   => 'http://schema.org/postalCode',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_LOCALITY    => array(
+                    'predicate'   => 'http://schema.org/addressLocality',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_REGION      => array(
+                    'predicate'   => 'http://schema.org/addressRegion',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_COUNTRY     => array(
+                    'predicate'   => 'http://schema.org/addressCountry',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_EMAIL               => array(
+                    'predicate'   => 'http://schema.org/email',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                ),
+                self::FIELD_TELEPHONE           => array(
+                    'predicate'   => 'http://schema.org/telephone',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'person' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_person_schema() {
+
+        $schema = array(
+            'label'         => 'Person',
+            'description'   => 'A person (or a music artist).',
+            'parents'       => array( 'thing' ),
+            'css_class'     => 'wl-person',
+            'uri'           => 'http://schema.org/Person',
+            'same_as'       => array(
+                'http://rdf.freebase.com/ns/people.person',
+                'http://rdf.freebase.com/ns/music.artist',
+                'http://dbpedia.org/class/yago/LivingPeople',
+            ),
+            'custom_fields' => array(
+                self::FIELD_KNOWS       => array(
+                    'predicate'   => 'http://schema.org/knows',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Person',
+                    'constraints' => array(
+                        'uri_type'    => 'Person',
+                        'cardinality' => INF,
+                    ),
+                ),
+                self::FIELD_BIRTH_DATE  => array(
+                    'predicate'   => 'http://schema.org/birthDate',
+                    'type'        => self::DATA_TYPE_DATE,
+                    'export_type' => 'xsd:date',
+                    'constraints' => '',
+                ),
+                self::FIELD_BIRTH_PLACE => array(
+                    'predicate'   => 'http://schema.org/birthPlace',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Place',
+                    'constraints' => array(
+                        'uri_type' => 'Place',
+                    ),
+                ),
+                self::FIELD_AFFILIATION => array(
+                    'predicate'   => 'http://schema.org/affiliation',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Organization',
+                    'constraints' => array(
+                        'uri_type'    => array(
+                            'Organization',
+                            'LocalBusiness',
+                        ),
+                        'cardinality' => INF,
+                    ),
+                ),
+                self::FIELD_EMAIL       => array(
+                    'predicate'   => 'http://schema.org/email',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => array(
+                        'cardinality' => INF,
+                    ),
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+
+    }
+
+    /**
+     * Get the 'place' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_place_schema() {
+
+        $schema = array(
+            'label'         => 'Place',
+            'description'   => 'A place.',
+            'parents'       => array( 'thing' ),
+            'css_class'     => 'wl-place',
+            'uri'           => 'http://schema.org/Place',
+            'same_as'       => array(
+                'http://rdf.freebase.com/ns/location.location',
+                'http://www.opengis.net/gml/_Feature',
+            ),
+            'custom_fields' => array(
+                self::FIELD_GEO_LATITUDE        => array(
+                    'predicate'   => 'http://schema.org/latitude',
+                    'type'        => self::DATA_TYPE_DOUBLE,
+                    'export_type' => 'xsd:double',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'coordinates',
+                ),
+                self::FIELD_GEO_LONGITUDE       => array(
+                    'predicate'   => 'http://schema.org/longitude',
+                    'type'        => self::DATA_TYPE_DOUBLE,
+                    'export_type' => 'xsd:double',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'coordinates',
+                ),
+                self::FIELD_ADDRESS             => array(
+                    'predicate'   => 'http://schema.org/streetAddress',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_PO_BOX      => array(
+                    'predicate'   => 'http://schema.org/postOfficeBoxNumber',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_POSTAL_CODE => array(
+                    'predicate'   => 'http://schema.org/postalCode',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_LOCALITY    => array(
+                    'predicate'   => 'http://schema.org/addressLocality',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_REGION      => array(
+                    'predicate'   => 'http://schema.org/addressRegion',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+                self::FIELD_ADDRESS_COUNTRY     => array(
+                    'predicate'   => 'http://schema.org/addressCountry',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    // To build custom metabox.
+                    'input_field' => 'address',
+                ),
+            ),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'local business' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_local_business_schema() {
+
+        $schema = array(
+            'label'         => 'LocalBusiness',
+            'description'   => 'A local business.',
+            'parents'       => array( 'place', 'organization' ),
+            'css_class'     => 'wl-local-business',
+            'uri'           => 'http://schema.org/LocalBusiness',
+            'same_as'       => array(
+                'http://rdf.freebase.com/ns/business/business_location',
+                'https://schema.org/Store',
+            ),
+            'custom_fields' => array(),
+            'templates'     => array(
+                'subtitle' => '{{id}}',
+            ),
+        );
+
+        // Merge the custom fields with those provided by the place and organization schema.
+        $place_schema            = $this->get_place_schema();
+        $organization_schema     = $this->get_organization_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields'] );
+
+        return $schema;
+    }
 
 }

Spacing +28 added lines, -28 removed lines

@@ -258,7 +258,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Schema_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Schema_Service');
 
 		// Create a singleton instance of the Schema service, useful to provide static functions to global functions.
 		self::$instance = $this;
@@ -299,18 +299,18 @@ 
 	 *
 	 * @return null|array An array of field's properties or null if the field is not found.
 	 */
-	public function get_field( $key ) {
+	public function get_field($key) {
 
 		// Parse each schema's fields until we find the one we're looking for, then
 		// return its properties.
-		foreach ( $this->schema as $_ => $schema ) {
+		foreach ($this->schema as $_ => $schema) {
 
-			if ( ! isset( $schema['custom_fields'] ) ) {
+			if ( ! isset($schema['custom_fields'])) {
 				break;
 			}
 
-			foreach ( $schema['custom_fields'] as $field => $props ) {
-				if ( $key === $field ) {
+			foreach ($schema['custom_fields'] as $field => $props) {
+				if ($key === $field) {
 					return $props;
 				}
 			}
@@ -328,15 +328,15 @@ 
 	 *
 	 * @since 3.1.0
 	 */
-	public function get_schema( $name ) {
+	public function get_schema($name) {
 
 		// Check if the schema exists and, if not, return NULL.
-		if ( ! isset( $this->schema[ $name ] ) ) {
+		if ( ! isset($this->schema[$name])) {
 			return null;
 		}
 
 		// Return the requested schema.
-		return $this->schema[ $name ];
+		return $this->schema[$name];
 	}
 
 	/**
@@ -348,10 +348,10 @@ 
 	 *
 	 * @since 3.3.0
 	 */
-	public function get_schema_by_uri( $uri ) {
+	public function get_schema_by_uri($uri) {
 
-		foreach ( $this->schema as $name => $schema ) {
-			if ( $schema['uri'] === $uri ) {
+		foreach ($this->schema as $name => $schema) {
+			if ($schema['uri'] === $uri) {
 				return $schema;
 			}
 		}
@@ -371,7 +371,7 @@ 
 		return array(
 			'css_class'     => 'wl-thing',
 			'uri'           => 'http://schema.org/Thing',
-			'same_as'       => array( '*' ),
+			'same_as'       => array('*'),
 			// set as default.
 			'custom_fields' => array(
 				self::FIELD_SAME_AS                            => array(
@@ -409,7 +409,7 @@ 
 		$schema = array(
 			'label'         => 'CreativeWork',
 			'description'   => 'A creative work (or a Music Album).',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			// Give term slug as parent.
 			'css_class'     => 'wl-creative-work',
 			'uri'           => 'http://schema.org/CreativeWork',
@@ -423,7 +423,7 @@ 
 					'type'        => self::DATA_TYPE_URI,
 					'export_type' => 'http://schema.org/Person',
 					'constraints' => array(
-						'uri_type'    => array( 'Person', 'Organization' ),
+						'uri_type'    => array('Person', 'Organization'),
 						'cardinality' => INF,
 					),
 				),
@@ -435,7 +435,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -452,10 +452,10 @@ 
 		$schema = array(
 			'label'         => 'Event',
 			'description'   => 'An event . ',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			'css_class'     => 'wl-event',
 			'uri'           => self::SCHEMA_EVENT_TYPE,
-			'same_as'       => array( 'http://dbpedia.org/ontology/Event' ),
+			'same_as'       => array('http://dbpedia.org/ontology/Event'),
 			'custom_fields' => array(
 				self::FIELD_DATE_START => array(
 					'predicate'   => 'http://schema.org/startDate',
@@ -474,7 +474,7 @@ 
 					'type'        => self::DATA_TYPE_URI,
 					'export_type' => 'http://schema.org/PostalAddress',
 					'constraints' => array(
-						'uri_type'    => array( 'Place', 'LocalBusiness' ),
+						'uri_type'    => array('Place', 'LocalBusiness'),
 						'cardinality' => INF,
 					),
 				),
@@ -486,7 +486,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -503,7 +503,7 @@ 
 		$schema = array(
 			'label'         => 'Organization',
 			'description'   => 'An organization, including a government or a newspaper.',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			'css_class'     => 'wl-organization',
 			'uri'           => 'http://schema.org/Organization',
 			'same_as'       => array(
@@ -589,7 +589,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -606,7 +606,7 @@ 
 		$schema = array(
 			'label'         => 'Person',
 			'description'   => 'A person (or a music artist).',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			'css_class'     => 'wl-person',
 			'uri'           => 'http://schema.org/Person',
 			'same_as'       => array(
@@ -666,7 +666,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 
@@ -684,7 +684,7 @@ 
 		$schema = array(
 			'label'         => 'Place',
 			'description'   => 'A place.',
-			'parents'       => array( 'thing' ),
+			'parents'       => array('thing'),
 			'css_class'     => 'wl-place',
 			'uri'           => 'http://schema.org/Place',
 			'same_as'       => array(
@@ -764,7 +764,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -781,7 +781,7 @@ 
 		$schema = array(
 			'label'         => 'LocalBusiness',
 			'description'   => 'A local business.',
-			'parents'       => array( 'place', 'organization' ),
+			'parents'       => array('place', 'organization'),
 			'css_class'     => 'wl-local-business',
 			'uri'           => 'http://schema.org/LocalBusiness',
 			'same_as'       => array(
@@ -797,7 +797,7 @@ 
 		// Merge the custom fields with those provided by the place and organization schema.
 		$place_schema            = $this->get_place_schema();
 		$organization_schema     = $this->get_organization_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields']);
 
 		return $schema;
 	}

src/widgets/wordlift_widget_chord.php

Indentation +46 added lines, -46 removed lines

@@ -2,56 +2,56 @@
 
 class Wordlift_Chord_Widget extends WP_Widget {
 
-	/**
-	 * Sets up the widgets name etc
-	 */
-	public function __construct() {
-		// widget actual processes
-		parent::__construct(
-			'wl_chord_widget', // Base ID
-			__( 'Chord Widget', 'wordlift' ), // Name
-			array( 'description' => __( 'The Chord Widget depicts the main topics of your blog in concise graph.', 'wordlift' ), ) // Args
-		);
-	}
-
-	/**
-	 * Outputs the content of the widget
-	 *
-	 * @param array $args
-	 * @param array $instance
-	 */
-	public function widget( $args, $instance ) {
-		// outputs the content of the widget	
-		echo do_shortcode( '[wl_chord global=true]' );
-	}
-
-	/**
-	 * Outputs the options form on admin
-	 *
-	 * @param array $instance The widget options
-	 *
-	 * @return string|void
-	 */
-	public function form( $instance ) {
-		// outputs the options form on admin
-	}
-
-	/**
-	 * Processing widget options on save
-	 *
-	 * @param array $new_instance The new options
-	 * @param array $old_instance The previous options
-	 *
-	 * @return array|void
-	 */
-	public function update( $new_instance, $old_instance ) {
-		// processes widget options to be saved
-	}
+    /**
+     * Sets up the widgets name etc
+     */
+    public function __construct() {
+        // widget actual processes
+        parent::__construct(
+            'wl_chord_widget', // Base ID
+            __( 'Chord Widget', 'wordlift' ), // Name
+            array( 'description' => __( 'The Chord Widget depicts the main topics of your blog in concise graph.', 'wordlift' ), ) // Args
+        );
+    }
+
+    /**
+     * Outputs the content of the widget
+     *
+     * @param array $args
+     * @param array $instance
+     */
+    public function widget( $args, $instance ) {
+        // outputs the content of the widget	
+        echo do_shortcode( '[wl_chord global=true]' );
+    }
+
+    /**
+     * Outputs the options form on admin
+     *
+     * @param array $instance The widget options
+     *
+     * @return string|void
+     */
+    public function form( $instance ) {
+        // outputs the options form on admin
+    }
+
+    /**
+     * Processing widget options on save
+     *
+     * @param array $new_instance The new options
+     * @param array $old_instance The previous options
+     *
+     * @return array|void
+     */
+    public function update( $new_instance, $old_instance ) {
+        // processes widget options to be saved
+    }
 }
 
 function wl_register_chord_widget() {
 
-	register_widget( 'WordLift_Chord_Widget' );
+    register_widget( 'WordLift_Chord_Widget' );
 }
 
 add_action( 'widgets_init', 'wl_register_chord_widget' );

Spacing +9 added lines, -9 removed lines

@@ -9,8 +9,8 @@ 
 		// widget actual processes
 		parent::__construct(
 			'wl_chord_widget', // Base ID
-			__( 'Chord Widget', 'wordlift' ), // Name
-			array( 'description' => __( 'The Chord Widget depicts the main topics of your blog in concise graph.', 'wordlift' ), ) // Args
+			__('Chord Widget', 'wordlift'), // Name
+			array('description' => __('The Chord Widget depicts the main topics of your blog in concise graph.', 'wordlift'),) // Args
 		);
 	}
 
@@ -20,9 +20,9 @@ 
 	 * @param array $args
 	 * @param array $instance
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		// outputs the content of the widget	
-		echo do_shortcode( '[wl_chord global=true]' );
+		echo do_shortcode('[wl_chord global=true]');
 	}
 
 	/**
@@ -32,7 +32,7 @@ 
 	 *
 	 * @return string|void
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 		// outputs the options form on admin
 	}
 
@@ -44,15 +44,15 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		// processes widget options to be saved
 	}
 }
 
 function wl_register_chord_widget() {
 
-	register_widget( 'WordLift_Chord_Widget' );
+	register_widget('WordLift_Chord_Widget');
 }
 
-add_action( 'widgets_init', 'wl_register_chord_widget' );
-add_filter( 'widget_text', 'do_shortcode' );
+add_action('widgets_init', 'wl_register_chord_widget');
+add_filter('widget_text', 'do_shortcode');

src/modules/core/wordlift_core_schema_api.php

Indentation +115 added lines, -115 removed lines

@@ -10,28 +10,28 @@ 
  */
 function wl_schema_reset_value( $post_id, $property_name ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) ) {
-		return false;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || is_null( $property_name ) ) {
+        return false;
+    }
 
-	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+    // Build full schema uri if necessary
+    $property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
 
-	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Get accepted properties
+    $accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
 
-	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+    // Find the name of the custom-field managing the schema property
+    foreach ( $accepted_fields as $wl_constant => $field ) {
+        if ( $field['predicate'] == $property_name ) {
 
-			delete_post_meta( $post_id, $wl_constant );
+            delete_post_meta( $post_id, $wl_constant );
 
-			return true;
-		}
-	}
+            return true;
+        }
+    }
 
-	return false;
+    return false;
 }
 
 /**
@@ -44,34 +44,34 @@ 
  */
 function wl_schema_get_value( $post_id, $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 );
-
-	// Establish entity id.
-	if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
-		$post_id = get_the_ID();
-		if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
-			return null;
-		}
-	}
-
-	// Get custom fields.
-	$term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
-	// Search for the required meta value (by constant name or schema name)
-	foreach ( $term_mapping as $wl_constant => $property_info ) {
-		$found_constant  = ( $wl_constant == $property_name );
-		$found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
-		if ( $found_constant || $found_predicate ) {
-			return get_post_meta( $post_id, $wl_constant );
-		}
-	}
-
-	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 );
+
+    // Establish entity id.
+    if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+        $post_id = get_the_ID();
+        if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+            return null;
+        }
+    }
+
+    // Get custom fields.
+    $term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Search for the required meta value (by constant name or schema name)
+    foreach ( $term_mapping as $wl_constant => $property_info ) {
+        $found_constant  = ( $wl_constant == $property_name );
+        $found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
+        if ( $found_constant || $found_predicate ) {
+            return get_post_meta( $post_id, $wl_constant );
+        }
+    }
+
+    return null;
 }
 
 /**
@@ -85,16 +85,16 @@ 
  */
 function wl_schema_add_value( $post_id, $property_name, $property_value ) {
 
-	if ( ! is_array( $property_value ) ) {
-		$property_value = array( $property_value );
-	}
+    if ( ! is_array( $property_value ) ) {
+        $property_value = array( $property_value );
+    }
 
-	// Get the old values or set an empty array.
-	$old_values = wl_schema_get_value( $post_id, $property_name ) ?: array();
+    // Get the old values or set an empty array.
+    $old_values = wl_schema_get_value( $post_id, $property_name ) ?: array();
 
-	$merged_property_value = array_unique( array_merge( $property_value, $old_values ) );
+    $merged_property_value = array_unique( array_merge( $property_value, $old_values ) );
 
-	wl_schema_set_value( $post_id, $property_name, $merged_property_value );
+    wl_schema_set_value( $post_id, $property_name, $merged_property_value );
 
 }
 
@@ -109,38 +109,38 @@ 
  */
 function wl_schema_set_value( $post_id, $property_name, $property_value ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
-		return false;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
+        return false;
+    }
 
-	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+    // Build full schema uri if necessary
+    $property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
 
-	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Get accepted properties
+    $accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
 
-	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+    // Find the name of the custom-field managing the schema property
+    foreach ( $accepted_fields as $wl_constant => $field ) {
+        if ( $field['predicate'] == $property_name ) {
 
-			// Deal with single values
-			if ( ! is_array( $property_value ) ) {
-				$property_value = array( $property_value );
-			}
+            // Deal with single values
+            if ( ! is_array( $property_value ) ) {
+                $property_value = array( $property_value );
+            }
 
-			// Delete present meta
-			delete_post_meta( $post_id, $wl_constant );
+            // Delete present meta
+            delete_post_meta( $post_id, $wl_constant );
 
-			foreach ( $property_value as $value ) {
-				add_post_meta( $post_id, $wl_constant, $value );
-			}
+            foreach ( $property_value as $value ) {
+                add_post_meta( $post_id, $wl_constant, $value );
+            }
 
-			return true;
-		}
-	}
+            return true;
+        }
+    }
 
-	return false;
+    return false;
 }
 
 
@@ -154,18 +154,18 @@ 
  */
 function wl_schema_get_types( $post_id ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) ) {
-		return null;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) ) {
+        return null;
+    }
 
-	$type = wl_entity_type_taxonomy_get_type( $post_id );
+    $type = wl_entity_type_taxonomy_get_type( $post_id );
 
-	if ( isset( $type['uri'] ) ) {
-		return array( $type['uri'] );
-	}
+    if ( isset( $type['uri'] ) ) {
+        return array( $type['uri'] );
+    }
 
-	return null;
+    return null;
 }
 
 /**
@@ -178,21 +178,21 @@ 
  */
 function wl_schema_set_types( $post_id, $type_names ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
-		return null;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
+        return null;
+    }
 
-	// TODO: support more than one type.
-	if ( is_array( $type_names ) ) {
-		$type_names = $type_names[0];
-	}
+    // TODO: support more than one type.
+    if ( is_array( $type_names ) ) {
+        $type_names = $type_names[0];
+    }
 
-	// Get the schema URI (e.g. http://schema.org/Thing)
-	$type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
+    // Get the schema URI (e.g. http://schema.org/Thing)
+    $type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
 
-	// Actually sets the taxonomy type
-	wl_set_entity_main_type( $post_id, $type_names );
+    // Actually sets the taxonomy type
+    wl_set_entity_main_type( $post_id, $type_names );
 
 }
 
@@ -208,24 +208,24 @@ 
  */
 function wl_schema_get_type_properties( $type_name ) {
 
-	// Build full schema uri if necessary
-	$type_name = wl_build_full_schema_uri_from_schema_slug( $type_name );
+    // Build full schema uri if necessary
+    $type_name = wl_build_full_schema_uri_from_schema_slug( $type_name );
 
-	// Get all custom fields
-	$all_types_and_fields = wl_entity_taxonomy_get_custom_fields();
+    // Get all custom fields
+    $all_types_and_fields = wl_entity_taxonomy_get_custom_fields();
 
-	$schema_root_address = 'http://schema.org/';
-	$type_properties     = array();
+    $schema_root_address = 'http://schema.org/';
+    $type_properties     = array();
 
-	// Search for the entity type which has the requested name as uri
-	if ( isset( $all_types_and_fields[ $type_name ] ) ) {
-		foreach ( $all_types_and_fields[ $type_name ] as $field ) {
-			// Convert to schema slug and store in array
-			$type_properties[] = str_replace( $schema_root_address, '', $field['predicate'] );
-		}
-	}
+    // Search for the entity type which has the requested name as uri
+    if ( isset( $all_types_and_fields[ $type_name ] ) ) {
+        foreach ( $all_types_and_fields[ $type_name ] as $field ) {
+            // Convert to schema slug and store in array
+            $type_properties[] = str_replace( $schema_root_address, '', $field['predicate'] );
+        }
+    }
 
-	return $type_properties;
+    return $type_properties;
 }
 
 /**
@@ -237,11 +237,11 @@ 
  */
 function wl_build_full_schema_uri_from_schema_slug( $schema_name ) {
 
-	$schema_root_address = 'http://schema.org/';
+    $schema_root_address = 'http://schema.org/';
 
-	if ( strpos( $schema_name, $schema_root_address ) === false ) {   // === necessary
-		$schema_name = $schema_root_address . $schema_name;
-	}
+    if ( strpos( $schema_name, $schema_root_address ) === false ) {   // === necessary
+        $schema_name = $schema_root_address . $schema_name;
+    }
 
-	return $schema_name;
+    return $schema_name;
 }
\ No newline at end of file

Spacing +53 added lines, -53 removed lines

@@ -8,24 +8,24 @@ 
  *
  * @return boolean The method returns true if everything went ok, false otherwise.
  */
-function wl_schema_reset_value( $post_id, $property_name ) {
+function wl_schema_reset_value($post_id, $property_name) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) ) {
+	if ( ! is_numeric($post_id) || is_null($property_name)) {
 		return false;
 	}
 
 	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+	$property_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+	$accepted_fields = wl_entity_taxonomy_get_custom_fields($post_id);
 
 	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+	foreach ($accepted_fields as $wl_constant => $field) {
+		if ($field['predicate'] == $property_name) {
 
-			delete_post_meta( $post_id, $wl_constant );
+			delete_post_meta($post_id, $wl_constant);
 
 			return true;
 		}
@@ -42,32 +42,32 @@ 
  *
  * @return array|null An array of values or NULL in case of no values (or error).
  */
-function wl_schema_get_value( $post_id, $property_name ) {
+function wl_schema_get_value($post_id, $property_name) {
 
 	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+	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 );
+	$property_schema_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Establish entity id.
-	if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+	if (is_null($post_id) || ! is_numeric($post_id)) {
 		$post_id = get_the_ID();
-		if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+		if (is_null($post_id) || ! is_numeric($post_id)) {
 			return null;
 		}
 	}
 
 	// Get custom fields.
-	$term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
+	$term_mapping = wl_entity_taxonomy_get_custom_fields($post_id);
 	// Search for the required meta value (by constant name or schema name)
-	foreach ( $term_mapping as $wl_constant => $property_info ) {
-		$found_constant  = ( $wl_constant == $property_name );
-		$found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
-		if ( $found_constant || $found_predicate ) {
-			return get_post_meta( $post_id, $wl_constant );
+	foreach ($term_mapping as $wl_constant => $property_info) {
+		$found_constant  = ($wl_constant == $property_name);
+		$found_predicate = (isset($property_info['predicate']) && $property_info['predicate'] == $property_schema_name);
+		if ($found_constant || $found_predicate) {
+			return get_post_meta($post_id, $wl_constant);
 		}
 	}
 
@@ -83,18 +83,18 @@ 
  *
  * @return array An array of values or NULL in case of no values (or error).
  */
-function wl_schema_add_value( $post_id, $property_name, $property_value ) {
+function wl_schema_add_value($post_id, $property_name, $property_value) {
 
-	if ( ! is_array( $property_value ) ) {
-		$property_value = array( $property_value );
+	if ( ! is_array($property_value)) {
+		$property_value = array($property_value);
 	}
 
 	// Get the old values or set an empty array.
-	$old_values = wl_schema_get_value( $post_id, $property_name ) ?: array();
+	$old_values = wl_schema_get_value($post_id, $property_name) ?: array();
 
-	$merged_property_value = array_unique( array_merge( $property_value, $old_values ) );
+	$merged_property_value = array_unique(array_merge($property_value, $old_values));
 
-	wl_schema_set_value( $post_id, $property_name, $merged_property_value );
+	wl_schema_set_value($post_id, $property_name, $merged_property_value);
 
 }
 
@@ -107,33 +107,33 @@ 
  *
  * @return boolean The method returns true if everything went ok, an error string otherwise.
  */
-function wl_schema_set_value( $post_id, $property_name, $property_value ) {
+function wl_schema_set_value($post_id, $property_name, $property_value) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
+	if ( ! is_numeric($post_id) || is_null($property_name) || empty($property_value) || is_null($property_value)) {
 		return false;
 	}
 
 	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+	$property_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+	$accepted_fields = wl_entity_taxonomy_get_custom_fields($post_id);
 
 	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+	foreach ($accepted_fields as $wl_constant => $field) {
+		if ($field['predicate'] == $property_name) {
 
 			// Deal with single values
-			if ( ! is_array( $property_value ) ) {
-				$property_value = array( $property_value );
+			if ( ! is_array($property_value)) {
+				$property_value = array($property_value);
 			}
 
 			// Delete present meta
-			delete_post_meta( $post_id, $wl_constant );
+			delete_post_meta($post_id, $wl_constant);
 
-			foreach ( $property_value as $value ) {
-				add_post_meta( $post_id, $wl_constant, $value );
+			foreach ($property_value as $value) {
+				add_post_meta($post_id, $wl_constant, $value);
 			}
 
 			return true;
@@ -152,17 +152,17 @@ 
  * @return array Array of type(s) (e.g. Type, for the http://schema.org/Type)
  * or NULL in case of no values (or error).
  */
-function wl_schema_get_types( $post_id ) {
+function wl_schema_get_types($post_id) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) ) {
+	if ( ! is_numeric($post_id)) {
 		return null;
 	}
 
-	$type = wl_entity_type_taxonomy_get_type( $post_id );
+	$type = wl_entity_type_taxonomy_get_type($post_id);
 
-	if ( isset( $type['uri'] ) ) {
-		return array( $type['uri'] );
+	if (isset($type['uri'])) {
+		return array($type['uri']);
 	}
 
 	return null;
@@ -176,23 +176,23 @@ 
  *
  * @return boolean True if everything went ok, an error string otherwise.
  */
-function wl_schema_set_types( $post_id, $type_names ) {
+function wl_schema_set_types($post_id, $type_names) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
+	if ( ! is_numeric($post_id) || empty($type_names) || is_null($type_names)) {
 		return null;
 	}
 
 	// TODO: support more than one type.
-	if ( is_array( $type_names ) ) {
+	if (is_array($type_names)) {
 		$type_names = $type_names[0];
 	}
 
 	// Get the schema URI (e.g. http://schema.org/Thing)
-	$type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
+	$type_names = wl_build_full_schema_uri_from_schema_slug($type_names);
 
 	// Actually sets the taxonomy type
-	wl_set_entity_main_type( $post_id, $type_names );
+	wl_set_entity_main_type($post_id, $type_names);
 
 }
 
@@ -206,10 +206,10 @@ 
  * @return array The method returns an array of supported properties for the type, e.g. (‘startDate’, ‘endDate’) for an Event.
  * You can call wl_schema_get_property_expected_type on each to know which data type they expect.
  */
-function wl_schema_get_type_properties( $type_name ) {
+function wl_schema_get_type_properties($type_name) {
 
 	// Build full schema uri if necessary
-	$type_name = wl_build_full_schema_uri_from_schema_slug( $type_name );
+	$type_name = wl_build_full_schema_uri_from_schema_slug($type_name);
 
 	// Get all custom fields
 	$all_types_and_fields = wl_entity_taxonomy_get_custom_fields();
@@ -218,10 +218,10 @@ 
 	$type_properties     = array();
 
 	// Search for the entity type which has the requested name as uri
-	if ( isset( $all_types_and_fields[ $type_name ] ) ) {
-		foreach ( $all_types_and_fields[ $type_name ] as $field ) {
+	if (isset($all_types_and_fields[$type_name])) {
+		foreach ($all_types_and_fields[$type_name] as $field) {
 			// Convert to schema slug and store in array
-			$type_properties[] = str_replace( $schema_root_address, '', $field['predicate'] );
+			$type_properties[] = str_replace($schema_root_address, '', $field['predicate']);
 		}
 	}
 
@@ -235,12 +235,12 @@ 
  *
  * @return string The full schema uri (es. 'latitude' returns 'http://schema.org/latitude')
  */
-function wl_build_full_schema_uri_from_schema_slug( $schema_name ) {
+function wl_build_full_schema_uri_from_schema_slug($schema_name) {
 
 	$schema_root_address = 'http://schema.org/';
 
-	if ( strpos( $schema_name, $schema_root_address ) === false ) {   // === necessary
-		$schema_name = $schema_root_address . $schema_name;
+	if (strpos($schema_name, $schema_root_address) === false) {   // === necessary
+		$schema_name = $schema_root_address.$schema_name;
 	}
 
 	return $schema_name;

Doc Comments +2 added lines, -2 removed lines

@@ -172,9 +172,9 @@
  * Sets the entity type(s) for the specified post ID. Support is now for only one type per entity.
  *
  * @param $post_id    numeric The numeric post ID
- * @param $type_names array An array of strings, each defining a type (e.g. Type, for the http://schema.org/Type)
+ * @param string $type_names array An array of strings, each defining a type (e.g. Type, for the http://schema.org/Type)
  *
- * @return boolean True if everything went ok, an error string otherwise.
+ * @return boolean|null True if everything went ok, an error string otherwise.
  */
 function wl_schema_set_types( $post_id, $type_names ) {
 

src/admin/class-wordlift-admin.php

Indentation +107 added lines, -107 removed lines

@@ -22,112 +22,112 @@
  */
 class Wordlift_Admin {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @param      string $plugin_name The name of this plugin.
-	 * @param      string $version     The version of this plugin.
-	 */
-	public function __construct( $plugin_name, $version ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-	}
-
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		// Enqueue our script.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wordlift-admin.bundle.js', array( 'jquery' ), $this->version, false );
-
-		// Set the basic params.
-		$params = array(
-			// @todo scripts in admin should use wp.post.
-			'ajax_url' => admin_url( 'admin-ajax.php' ),
-			// @todo remove specific actions from settings.
-			'action'   => 'entity_by_title',
-			'language' => Wordlift_Configuration_Service::get_instance()->get_language_code(),
-			'l10n'     => array(
-				'You already published an entity with the same name' => __( 'You already published an entity with the same name: ', 'wordlift' ),
-			),
-		);
-
-		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
-
-			$params['post_id']           = $entity_being_edited->ID;
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_being_edited->post_type == Wordlift_Entity_Service::TYPE_NAME && is_numeric( get_the_ID() );
-			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
-			// from the results, since we don't want the current entity to be discovered by the analysis.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_being_edited->ID );
-
-		}
-
-		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
-
-	}
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since    1.0.0
+     *
+     * @param      string $plugin_name The name of this plugin.
+     * @param      string $version     The version of this plugin.
+     */
+    public function __construct( $plugin_name, $version ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+    }
+
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        // Enqueue our script.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wordlift-admin.bundle.js', array( 'jquery' ), $this->version, false );
+
+        // Set the basic params.
+        $params = array(
+            // @todo scripts in admin should use wp.post.
+            'ajax_url' => admin_url( 'admin-ajax.php' ),
+            // @todo remove specific actions from settings.
+            'action'   => 'entity_by_title',
+            'language' => Wordlift_Configuration_Service::get_instance()->get_language_code(),
+            'l10n'     => array(
+                'You already published an entity with the same name' => __( 'You already published an entity with the same name: ', 'wordlift' ),
+            ),
+        );
+
+        // Set post-related values if there's a current post.
+        if ( null !== $post = $entity_being_edited = get_post() ) {
+
+            $params['post_id']           = $entity_being_edited->ID;
+            $params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_being_edited->post_type == Wordlift_Entity_Service::TYPE_NAME && is_numeric( get_the_ID() );
+            // We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
+            // from the results, since we don't want the current entity to be discovered by the analysis.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/345
+            $params['itemId'] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_being_edited->ID );
+
+        }
+
+        // Finally output the params as `wlSettings` for JavaScript code.
+        wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param      string $plugin_name The name of this plugin.
 	 * @param      string $version     The version of this plugin.
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -74,7 +74,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -98,35 +98,35 @@ 
 		 */
 
 		// Enqueue our script.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wordlift-admin.bundle.js', array( 'jquery' ), $this->version, false );
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/wordlift-admin.bundle.js', array('jquery'), $this->version, false);
 
 		// Set the basic params.
 		$params = array(
 			// @todo scripts in admin should use wp.post.
-			'ajax_url' => admin_url( 'admin-ajax.php' ),
+			'ajax_url' => admin_url('admin-ajax.php'),
 			// @todo remove specific actions from settings.
 			'action'   => 'entity_by_title',
 			'language' => Wordlift_Configuration_Service::get_instance()->get_language_code(),
 			'l10n'     => array(
-				'You already published an entity with the same name' => __( 'You already published an entity with the same name: ', 'wordlift' ),
+				'You already published an entity with the same name' => __('You already published an entity with the same name: ', 'wordlift'),
 			),
 		);
 
 		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
+		if (null !== $post = $entity_being_edited = get_post()) {
 
 			$params['post_id']           = $entity_being_edited->ID;
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_being_edited->post_type == Wordlift_Entity_Service::TYPE_NAME && is_numeric( get_the_ID() );
+			$params['entityBeingEdited'] = isset($entity_being_edited->post_type) && $entity_being_edited->post_type == Wordlift_Entity_Service::TYPE_NAME && is_numeric(get_the_ID());
 			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
 			// from the results, since we don't want the current entity to be discovered by the analysis.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = Wordlift_Entity_Service::get_instance()->get_uri( $entity_being_edited->ID );
+			$params['itemId'] = Wordlift_Entity_Service::get_instance()->get_uri($entity_being_edited->ID);
 
 		}
 
 		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+		wp_localize_script($this->plugin_name, 'wlSettings', $params);
 
 	}
 

src/admin/class-wordlift-admin-dashboard.php

Doc Comments +7 added lines, -1 removed lines

@@ -206,7 +206,7 @@ 
 	 *
 	 * @since 3.4.0
 	 *
-	 * @return int Average entities rating.
+	 * @return double Average entities rating.
 	 */
 	private function average_entities_rating() {
 
@@ -265,6 +265,9 @@ 
 		return (int) false;
 	}
 
+	/**
+	 * @param string $query
+	 */
 	private function rl_sparql_select( $query ) {
 
 		// Prepare the SPARQL statement by prepending the default namespaces.
@@ -277,6 +280,9 @@ 
 		return wp_remote_get( $url, $args );
 	}
 
+	/**
+	 * @param string $param
+	 */
 	private function render_stat_param( $param ) {
 
 		return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';

Indentation +236 added lines, -236 removed lines

@@ -14,81 +14,81 @@ 
 class Wordlift_Dashboard_Service {
 
 
-	/**
-	 * Transient Name
-	 *
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_NAME = 'wl_dashboard_stats';
-
-	/**
-	 * Transient Expiration (in seconds)
-	 *
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_EXPIRATION = 86400;
-
-	/**
-	 * A {@link Wordlift_Rating_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
-	 */
-	private $rating_service;
-
-	/**
-	 * Create a Wordlift_Entity_List_Service.
-	 *
-	 * @since 3.4.0
-	 *
-	 * @param \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
-	 */
-	public function __construct( $rating_service ) {
-
-		$this->rating_service = $rating_service;
-
-	}
-
-	/**
-	 * Return stats layout
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string Dashboard widget html markup
-	 */
-	public function dashboard_widget_callback( $post ) {
-
-		$enriched_posts_title   = __( 'enriched posts', 'wordlift' );
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'annotated_posts_percentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'annotated_posts' ),
-			$this->render_stat_param( 'posts' )
-		);
-
-		$rating_title   = __( 'average entity rating', 'wordlift' );
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
-		);
-
-		$graph_title   = __( 'triples in your graph', 'wordlift' );
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
-		);
-
-		$triples_label = __( 'triples', 'wordlift' );
-
-		echo <<<EOF
+    /**
+     * Transient Name
+     *
+     * @since  3.4.0
+     */
+    const TRANSIENT_NAME = 'wl_dashboard_stats';
+
+    /**
+     * Transient Expiration (in seconds)
+     *
+     * @since  3.4.0
+     */
+    const TRANSIENT_EXPIRATION = 86400;
+
+    /**
+     * A {@link Wordlift_Rating_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
+     */
+    private $rating_service;
+
+    /**
+     * Create a Wordlift_Entity_List_Service.
+     *
+     * @since 3.4.0
+     *
+     * @param \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
+     */
+    public function __construct( $rating_service ) {
+
+        $this->rating_service = $rating_service;
+
+    }
+
+    /**
+     * Return stats layout
+     *
+     * @since 3.4.0
+     *
+     * @return string Dashboard widget html markup
+     */
+    public function dashboard_widget_callback( $post ) {
+
+        $enriched_posts_title   = __( 'enriched posts', 'wordlift' );
+        $enriched_posts_caption = sprintf( wp_kses(
+            __( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ),
+            array( 'a' => array( 'href' => array() ) ) ),
+            $this->render_stat_param( 'annotated_posts_percentage' ),
+            esc_url( admin_url( 'edit.php' ) ),
+            $this->render_stat_param( 'annotated_posts' ),
+            $this->render_stat_param( 'posts' )
+        );
+
+        $rating_title   = __( 'average entity rating', 'wordlift' );
+        $rating_caption = sprintf( wp_kses(
+            __( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift' ),
+            array( 'a' => array( 'href' => array() ) ) ),
+            $this->render_stat_param( 'entities' ),
+            esc_url( admin_url( 'edit.php?post_type=entity' ) ),
+            $this->render_stat_param( 'rating' )
+        );
+
+        $graph_title   = __( 'triples in your graph', 'wordlift' );
+        $graph_caption = sprintf( wp_kses(
+            __( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ),
+            array( 'a' => array( 'href' => array() ) ) ),
+            $this->render_stat_param( 'wikidata' ),
+            esc_url( 'https://www.wikidata.org/' )
+        );
+
+        $triples_label = __( 'triples', 'wordlift' );
+
+        echo <<<EOF
 	<div id="wl-dashboard-widget-inner-wrapper">
 		<div class="wl-stat-card">
 			<div class="wl-stat-graph-wrapper">
@@ -117,169 +117,169 @@ 
 	</div>
 EOF;
 
-	}
-
-	/**
-	 * Return stats
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string markup
-	 */
-	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget( 'wordlift-dashboard-widget', 'WordLift Dashboard', array(
-			$this,
-			'dashboard_widget_callback',
-		) );
-	}
-
-	/**
-	 * Return stats
-	 * @uses  https://codex.wordpress.org/Function_Reference/set_transient
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string JSON obj with all available stats.
-	 */
-	public function ajax_get_stats() {
-
-		// If needed, the transient is force to reloaed
-		if ( isset( $_GET['force_reload'] ) ) {
-			delete_transient( self::TRANSIENT_NAME );
-		}
-
-		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
-
-		if ( ! $stats ) {
-			// Calculate stats
-			$stats = array(
-				'entities'        => $this->count_entities(),
-				'posts'           => $this->count_posts(),
-				'annotated_posts' => $this->count_annotated_posts(),
-				'triples'         => $this->count_triples() ?: '-',
-				'rating'          => $this->average_entities_rating(),
-			);
-			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
-		}
-		// Return stats as json object
-		wl_core_send_json( $stats );
-	}
-
-	/**
-	 * Calculate total number of published posts
-	 * @uses  https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of published posts.
-	 */
-	public function count_posts() {
-
-		return (int) wp_count_posts()->publish;
-	}
-
-	/**
-	 * Calculate total number of annotated published posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of annotated published posts.
-	 */
-	public function count_annotated_posts() {
-
-		// Prepare interaction with db
-		global $wpdb;
-		// Retrieve Wordlift relation instances table name
-		$table_name = wl_core_get_relation_instances_table_name();
-		// Calculate sql statement
-		$sql_statement = <<<EOF
+    }
+
+    /**
+     * Return stats
+     *
+     * @since 3.4.0
+     *
+     * @return string markup
+     */
+    public function add_dashboard_widgets() {
+        wp_add_dashboard_widget( 'wordlift-dashboard-widget', 'WordLift Dashboard', array(
+            $this,
+            'dashboard_widget_callback',
+        ) );
+    }
+
+    /**
+     * Return stats
+     * @uses  https://codex.wordpress.org/Function_Reference/set_transient
+     *
+     * @since 3.4.0
+     *
+     * @return string JSON obj with all available stats.
+     */
+    public function ajax_get_stats() {
+
+        // If needed, the transient is force to reloaed
+        if ( isset( $_GET['force_reload'] ) ) {
+            delete_transient( self::TRANSIENT_NAME );
+        }
+
+        // Try to retrieve the transient
+        $stats = get_transient( self::TRANSIENT_NAME );
+
+        if ( ! $stats ) {
+            // Calculate stats
+            $stats = array(
+                'entities'        => $this->count_entities(),
+                'posts'           => $this->count_posts(),
+                'annotated_posts' => $this->count_annotated_posts(),
+                'triples'         => $this->count_triples() ?: '-',
+                'rating'          => $this->average_entities_rating(),
+            );
+            // Cache stats results trough transient
+            set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+        }
+        // Return stats as json object
+        wl_core_send_json( $stats );
+    }
+
+    /**
+     * Calculate total number of published posts
+     * @uses  https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
+     * @since 3.4.0
+     *
+     * @return int Total number of published posts.
+     */
+    public function count_posts() {
+
+        return (int) wp_count_posts()->publish;
+    }
+
+    /**
+     * Calculate total number of annotated published posts
+     * @since 3.4.0
+     *
+     * @return int Total number of annotated published posts.
+     */
+    public function count_annotated_posts() {
+
+        // Prepare interaction with db
+        global $wpdb;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+        // Calculate sql statement
+        $sql_statement = <<<EOF
     		SELECT COUNT(distinct(p.id)) FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.subject_id AND p.post_type = 'post' AND p.post_status = 'publish';
 EOF;
 
-		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement );
-
-	}
-
-	/**
-	 * Calculate the average entities rating.
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return int Average entities rating.
-	 */
-	private function average_entities_rating() {
-
-		// Prepare interaction with db
-		global $wpdb;
-		$query = $wpdb->prepare(
-			"SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
-			Wordlift_Rating_Service::RATING_RAW_SCORE_META_KEY
-		);
-
-		// Perform the query.
-		return $this->rating_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) );
-	}
-
-	/**
-	 * Calculate total number of published entities.
-	 *
-	 * @uses  https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of posts.
-	 */
-	private function count_entities() {
-
-		return (int) wp_count_posts( Wordlift_Entity_Service::TYPE_NAME )->publish;
-	}
-
-	/**
-	 * Calculate total number of published rdf triples
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of triples.
-	 */
-	public function count_triples() {
-
-		// Set the SPARQL query.
-		$sparql = 'SELECT (COUNT(*) AS ?no) { ?s ?p ?o  }';
-		// Send the request.
-		$response = $this->rl_sparql_select( $sparql );
-
-		// Return the error in case of failure.
-		if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
-			return (int) false;
-		}
-
-		// Get the body.
-		$body = $response['body'];
-		// Get the values.
-		$matches = array();
-		if ( 1 === preg_match( '/(\d+)/im', $body, $matches ) && 2 === count( $matches ) ) {
-			// Return the counts.
-			return (int) $matches[1];
-		}
-
-		return (int) false;
-	}
-
-	private function rl_sparql_select( $query ) {
-
-		// Prepare the SPARQL statement by prepending the default namespaces.
-		$sparql = rl_sparql_prefixes() . "\n" . $query;
-		// Get the SPARQL SELECT URL.
-		$url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
-		// Prepare the request.
-		$args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
-
-		return wp_remote_get( $url, $args );
-	}
-
-	private function render_stat_param( $param ) {
-
-		return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';
-	}
+        // Perform the query
+        return (int) $wpdb->get_var( $sql_statement );
+
+    }
+
+    /**
+     * Calculate the average entities rating.
+     *
+     * @since 3.4.0
+     *
+     * @return int Average entities rating.
+     */
+    private function average_entities_rating() {
+
+        // Prepare interaction with db
+        global $wpdb;
+        $query = $wpdb->prepare(
+            "SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
+            Wordlift_Rating_Service::RATING_RAW_SCORE_META_KEY
+        );
+
+        // Perform the query.
+        return $this->rating_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) );
+    }
+
+    /**
+     * Calculate total number of published entities.
+     *
+     * @uses  https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
+     *
+     * @since 3.4.0
+     *
+     * @return int Total number of posts.
+     */
+    private function count_entities() {
+
+        return (int) wp_count_posts( Wordlift_Entity_Service::TYPE_NAME )->publish;
+    }
+
+    /**
+     * Calculate total number of published rdf triples
+     * @since 3.4.0
+     *
+     * @return int Total number of triples.
+     */
+    public function count_triples() {
+
+        // Set the SPARQL query.
+        $sparql = 'SELECT (COUNT(*) AS ?no) { ?s ?p ?o  }';
+        // Send the request.
+        $response = $this->rl_sparql_select( $sparql );
+
+        // Return the error in case of failure.
+        if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+            return (int) false;
+        }
+
+        // Get the body.
+        $body = $response['body'];
+        // Get the values.
+        $matches = array();
+        if ( 1 === preg_match( '/(\d+)/im', $body, $matches ) && 2 === count( $matches ) ) {
+            // Return the counts.
+            return (int) $matches[1];
+        }
+
+        return (int) false;
+    }
+
+    private function rl_sparql_select( $query ) {
+
+        // Prepare the SPARQL statement by prepending the default namespaces.
+        $sparql = rl_sparql_prefixes() . "\n" . $query;
+        // Get the SPARQL SELECT URL.
+        $url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
+        // Prepare the request.
+        $args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
+
+        return wp_remote_get( $url, $args );
+    }
+
+    private function render_stat_param( $param ) {
+
+        return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';
+    }
 
 }

Spacing +46 added lines, -46 removed lines

@@ -44,7 +44,7 @@ 
 	 *
 	 * @param \Wordlift_Rating_Service $rating_service A {@link Wordlift_Rating_Service} instance.
 	 */
-	public function __construct( $rating_service ) {
+	public function __construct($rating_service) {
 
 		$this->rating_service = $rating_service;
 
@@ -57,36 +57,36 @@ 
 	 *
 	 * @return string Dashboard widget html markup
 	 */
-	public function dashboard_widget_callback( $post ) {
-
-		$enriched_posts_title   = __( 'enriched posts', 'wordlift' );
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'annotated_posts_percentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'annotated_posts' ),
-			$this->render_stat_param( 'posts' )
+	public function dashboard_widget_callback($post) {
+
+		$enriched_posts_title   = __('enriched posts', 'wordlift');
+		$enriched_posts_caption = sprintf(wp_kses(
+			__('%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift'),
+			array('a' => array('href' => array())) ),
+			$this->render_stat_param('annotated_posts_percentage'),
+			esc_url(admin_url('edit.php')),
+			$this->render_stat_param('annotated_posts'),
+			$this->render_stat_param('posts')
 		);
 
-		$rating_title   = __( 'average entity rating', 'wordlift' );
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
+		$rating_title   = __('average entity rating', 'wordlift');
+		$rating_caption = sprintf(wp_kses(
+			__('You have %1$s entities in your <a href="%2$s">vocabulary</a> with an average rating of %3$s.', 'wordlift'),
+			array('a' => array('href' => array())) ),
+			$this->render_stat_param('entities'),
+			esc_url(admin_url('edit.php?post_type=entity')),
+			$this->render_stat_param('rating')
 		);
 
-		$graph_title   = __( 'triples in your graph', 'wordlift' );
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ),
-			array( 'a' => array( 'href' => array() ) ) ),
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
+		$graph_title   = __('triples in your graph', 'wordlift');
+		$graph_caption = sprintf(wp_kses(
+			__('Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift'),
+			array('a' => array('href' => array())) ),
+			$this->render_stat_param('wikidata'),
+			esc_url('https://www.wikidata.org/')
 		);
 
-		$triples_label = __( 'triples', 'wordlift' );
+		$triples_label = __('triples', 'wordlift');
 
 		echo <<<EOF
 	<div id="wl-dashboard-widget-inner-wrapper">
@@ -127,10 +127,10 @@ 
 	 * @return string markup
 	 */
 	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget( 'wordlift-dashboard-widget', 'WordLift Dashboard', array(
+		wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array(
 			$this,
 			'dashboard_widget_callback',
-		) );
+		));
 	}
 
 	/**
@@ -144,14 +144,14 @@ 
 	public function ajax_get_stats() {
 
 		// If needed, the transient is force to reloaed
-		if ( isset( $_GET['force_reload'] ) ) {
-			delete_transient( self::TRANSIENT_NAME );
+		if (isset($_GET['force_reload'])) {
+			delete_transient(self::TRANSIENT_NAME);
 		}
 
 		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
+		$stats = get_transient(self::TRANSIENT_NAME);
 
-		if ( ! $stats ) {
+		if ( ! $stats) {
 			// Calculate stats
 			$stats = array(
 				'entities'        => $this->count_entities(),
@@ -161,10 +161,10 @@ 
 				'rating'          => $this->average_entities_rating(),
 			);
 			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+			set_transient(self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION);
 		}
 		// Return stats as json object
-		wl_core_send_json( $stats );
+		wl_core_send_json($stats);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 EOF;
 
 		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement );
+		return (int) $wpdb->get_var($sql_statement);
 
 	}
 
@@ -218,7 +218,7 @@ 
 		);
 
 		// Perform the query.
-		return $this->rating_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) );
+		return $this->rating_service->convert_raw_score_to_percentage($wpdb->get_var($query));
 	}
 
 	/**
@@ -232,7 +232,7 @@ 
 	 */
 	private function count_entities() {
 
-		return (int) wp_count_posts( Wordlift_Entity_Service::TYPE_NAME )->publish;
+		return (int) wp_count_posts(Wordlift_Entity_Service::TYPE_NAME)->publish;
 	}
 
 	/**
@@ -246,10 +246,10 @@ 
 		// Set the SPARQL query.
 		$sparql = 'SELECT (COUNT(*) AS ?no) { ?s ?p ?o  }';
 		// Send the request.
-		$response = $this->rl_sparql_select( $sparql );
+		$response = $this->rl_sparql_select($sparql);
 
 		// Return the error in case of failure.
-		if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+		if (is_wp_error($response) || 200 !== (int) $response['response']['code']) {
 			return (int) false;
 		}
 
@@ -257,7 +257,7 @@ 
 		$body = $response['body'];
 		// Get the values.
 		$matches = array();
-		if ( 1 === preg_match( '/(\d+)/im', $body, $matches ) && 2 === count( $matches ) ) {
+		if (1 === preg_match('/(\d+)/im', $body, $matches) && 2 === count($matches)) {
 			// Return the counts.
 			return (int) $matches[1];
 		}
@@ -265,21 +265,21 @@ 
 		return (int) false;
 	}
 
-	private function rl_sparql_select( $query ) {
+	private function rl_sparql_select($query) {
 
 		// Prepare the SPARQL statement by prepending the default namespaces.
-		$sparql = rl_sparql_prefixes() . "\n" . $query;
+		$sparql = rl_sparql_prefixes()."\n".$query;
 		// Get the SPARQL SELECT URL.
-		$url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
+		$url = wl_configuration_get_query_select_url('csv').urlencode($sparql);
 		// Prepare the request.
-		$args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
+		$args = unserialize(WL_REDLINK_API_HTTP_OPTIONS);
 
-		return wp_remote_get( $url, $args );
+		return wp_remote_get($url, $args);
 	}
 
-	private function render_stat_param( $param ) {
+	private function render_stat_param($param) {
 
-		return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';
+		return '<span id="wl-dashboard-widget-'.$param.'" class="wl-stat-value"></span>';
 	}
 
 }

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

Doc Comments +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@ 
 	 *
 	 * @param int $uri An uri.
 	 *
-	 * @return true if the uri internal to the current dataset otherwise false.
+	 * @return boolean if the uri internal to the current dataset otherwise false.
 	 */
 	public function is_internal_uri( $uri ) {
 
@@ -424,7 +424,7 @@ 
 	 * @param null   $logo     The entity logo id (or NULL if none).
 	 * @param string $status   The post status, by default 'publish'.
 	 *
-	 * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
+	 * @return integer The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
 	 */
 	public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
 

Indentation +455 added lines, -455 removed lines

@@ -7,465 +7,465 @@
  */
 class Wordlift_Entity_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log The Log service.
-	 */
-	private $log;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The entity post type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const TYPE_NAME = 'entity';
-
-	/**
-	 * The alternative label meta key.
-	 *
-	 * @since 3.2.0
-	 */
-	const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
-
-	/**
-	 * The alternative label input template.
-	 *
-	 * @since 3.2.0
-	 */
-	// TODO: this should be moved to a class that deals with HTML code.
-	const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
+    /**
+     * The Log service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Log_Service $log The Log service.
+     */
+    private $log;
+
+    /**
+     * The UI service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The entity post type name.
+     *
+     * @since 3.1.0
+     */
+    const TYPE_NAME = 'entity';
+
+    /**
+     * The alternative label meta key.
+     *
+     * @since 3.2.0
+     */
+    const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
+
+    /**
+     * The alternative label input template.
+     *
+     * @since 3.2.0
+     */
+    // TODO: this should be moved to a class that deals with HTML code.
+    const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
                 <label class="screen-reader-text" id="wl-alternative-label-prompt-text" for="wl-alternative-label">Enter alternative label here</label>
                 <input name="wl_alternative_label[]" size="30" value="%s" id="wl-alternative-label" type="text">
                 <button class="button wl-delete-button">%s</button>
                 </div>';
 
-	/**
-	 * A singleton instance of the Entity service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $instance A singleton instance of the Entity service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Entity_Service instance.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	public function __construct( $ui_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
-
-		// Set the UI service.
-		$this->ui_service = $ui_service;
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the Entity service.
-	 *
-	 * @since 3.2.0
-	 * @return \Wordlift_Entity_Service The singleton instance of the Entity service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Determines whether a post is an entity or not.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param int $post_id A post id.
-	 *
-	 * @return bool Return true if the post is an entity otherwise false.
-	 */
-	public function is_entity( $post_id ) {
-
-		return ( self::TYPE_NAME === get_post_type( $post_id ) );
-	}
-
-	/**
-	 * Get the proper classification scope for a given entity post
-	 *
-	 * @since 3.5.0
-	 *
-	 * @param integer $post_id An entity post id.
-	 *
-	 * @return string Returns an uri.
-	 */
-	public function get_classification_scope_for( $post_id ) {
-
-		if ( false === $this->is_entity( $post_id ) ) {
-			return null;
-		}
-		// Retrieve the entity type
-		$entity_type_arr = wl_entity_type_taxonomy_get_type( $post_id );
-		$entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
-		// Retrieve classification boxes configuration
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
-				return $cb['id'];
-			}
-		}
-
-		// or null
-		return null;
-
-	}
-
-
-	public function is_used( $post_id ) {
-
-		if ( false === $this->is_entity( $post_id ) ) {
-			return null;
-		}
-		// Retrieve the post
-		$entity = get_post( $post_id );
-
-		global $wpdb;
-		// Retrieve Wordlift relation instances table name
-		$table_name = wl_core_get_relation_instances_table_name();
-
-		// Check is it's referenced / related to another post / entity
-		$stmt = $wpdb->prepare(
-			"SELECT COUNT(*) FROM $table_name WHERE  object_id = %d",
-			$entity->ID
-		);
-
-		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt );
-		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {
-			return true;
-		}
-
-		// Check if the entity uri is used as meta_value
-		$stmt = $wpdb->prepare(
-			"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
-			$entity->ID,
-			wl_get_entity_uri( $entity->ID )
-		);
-		// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt );
-
-		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
-			return true;
-		}
-
-		// If we are here, it means the current entity is not used at the moment
-		return false;
-	}
-
-	/**
-	 * Determines whether a given uri is an internal uri or not.
-	 *
-	 * @since 3.3.2
-	 *
-	 * @param int $uri An uri.
-	 *
-	 * @return true if the uri internal to the current dataset otherwise false.
-	 */
-	public function is_internal_uri( $uri ) {
-
-		return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
-	}
-
-	/**
-	 * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $uri The entity URI.
-	 *
-	 * @return WP_Post|null A WP_Post instance or null if not found.
-	 */
-	public function get_entity_post_by_uri( $uri ) {
-
-		// Check if we've been provided with a value otherwise return null.
-		if ( empty( $uri ) ) {
-			return null;
-		}
-
-		$query_args = array(
-			'posts_per_page' => 1,
-			'post_status'    => 'any',
-			'post_type'      => self::TYPE_NAME,
-			'meta_query'     => array(
-				array(
-					'key'     => WL_ENTITY_URL_META_NAME,
-					'value'   => $uri,
-					'compare' => '=',
-				),
-			),
-		);
-
-		// Only if the current uri is not an internal uri 
-		// entity search is performed also looking at sameAs values
-		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( ! $this->is_internal_uri( $uri ) ) {
-
-			$query_args['meta_query']['relation'] = 'OR';
-			$query_args['meta_query'][]           = array(
-				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-				'value'   => $uri,
-				'compare' => '=',
-			);
-		}
-
-		$query = new WP_Query( $query_args );
-
-		// Get the matching entity posts.
-		$posts = $query->get_posts();
-
-		// Return null if no post is found.
-		if ( 0 === count( $posts ) ) {
-			return null;
-		}
-
-		// Return the found post.
-		return $posts[0];
-	}
-
-	/**
-	 * Fires once a post has been saved. This function uses the $_REQUEST, therefore
-	 * we check that the post we're saving is the current post.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/363
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int     $post_id Post ID.
-	 * @param WP_Post $post    Post object.
-	 * @param bool    $update  Whether this is an existing post being updated or not.
-	 */
-	public function save_post( $post_id, $post, $update ) {
-
-		// We're setting the alternative label that have been provided via the UI
-		// (in fact we're using $_REQUEST), while save_post may be also called
-		// programmatically by some other function: we need to check therefore if
-		// the $post_id in the save_post call matches the post id set in the request.
-		//
-		// If this is not the current post being saved or if it's not an entity, return.
-		if ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
-			return;
-		}
-
-		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? $_REQUEST['wl_alternative_label'] : array();
-
-		// Set the alternative labels.
-		$this->set_alternative_labels( $post_id, $alt_labels );
-
-	}
-
-	/**
-	 * Set the alternative labels.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int   $post_id    The post id.
-	 * @param array $alt_labels An array of labels.
-	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
-
-		// Force $alt_labels to be an array
-		if ( ! is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
-		}
-
-		$this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
-
-		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-
-		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
-			}
-		}
-
-	}
-
-	/**
-	 * Retrieve the alternate labels.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int $post_id Post id.
-	 *
-	 * @return mixed An array  of alternative labels.
-	 */
-	public function get_alternative_labels( $post_id ) {
-
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-	}
-
-	/**
-	 * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param WP_Post $post Post object.
-	 */
-	public function edit_form_before_permalink( $post ) {
-
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
-			return;
-		}
-
-		// Print the input template.
-		$this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
-
-		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
-
-			echo $this->get_alternative_label_input( $alt_label );
-
-		};
-
-		// Print the button.
-		$this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
-
-	}
-
-	/**
-	 * Get the URI for the entity with the specified post id.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return null|string The entity URI or NULL if not found or the dataset URI is not configured.
-	 */
-	public function get_uri( $post_id ) {
-
-		// If a null is given, nothing to do
-		if ( null == $post_id ) {
-			return null;
-		}
-
-		$uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
-
-		// If the dataset uri is not properly configured, null is returned
-		if ( '' === wl_configuration_get_redlink_dataset_uri() ) {
-			return null;
-		}
-
-		// Set the URI if it isn't set yet.
-		$post_status = get_post_status( $post_id );
-		if ( empty( $uri ) && 'auto-draft' !== $post_status && 'revision' !== $post_status ) {
-			$uri = wl_build_entity_uri( $post_id );
-			wl_set_entity_uri( $post_id, $uri );
-		}
-
-		return $uri;
-	}
-
-
-	/**
-	 * Get the alternative label input HTML code.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $value The input value.
-	 *
-	 * @return string The input HTML code.
-	 */
-	private function get_alternative_label_input( $value = '' ) {
-
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
-	}
-
-	/**
-	 * Get the number of entity posts published in this blog.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return int The number of published entity posts.
-	 */
-	public function count() {
-
-		$count = wp_count_posts( self::TYPE_NAME );
-
-		return $count->publish;
-	}
-
-	/**
-	 * Create a new entity.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $name     The entity name.
-	 * @param string $type_uri The entity's type URI.
-	 * @param null   $logo     The entity logo id (or NULL if none).
-	 * @param string $status   The post status, by default 'publish'.
-	 *
-	 * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
-	 */
-	public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
-
-		// Create an entity for the publisher.
-		$post_id = wp_insert_post( array(
-			'post_type'    => self::TYPE_NAME,
-			'post_title'   => $name,
-			'post_status'  => $status,
-			'post_content' => '',
-		) );
-
-		// Return the error if any.
-		if ( is_wp_error( $post_id ) ) {
-			return $post_id;
-		}
-
-		// Set the entity logo.
-		if ( $logo && is_numeric( $logo ) ) {
-			set_post_thumbnail( $post_id, $logo );
-		}
-
-		// Set the entity type.
-		Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
-
-		return $post_id;
-	}
-
-	/**
-	 * Get the entities related to the one with the specified id. By default only
-	 * published entities will be returned.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param int    $id          The post id.
-	 * @param string $post_status The target post status (default = publish).
-	 *
-	 * @return array An array of post ids.
-	 */
-	public function get_related_entities( $id, $post_status = 'publish' ) {
-
-		return wl_core_inner_get_related_entities( 'post_ids', $id, null, $post_status );
-	}
+    /**
+     * A singleton instance of the Entity service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Entity_Service $instance A singleton instance of the Entity service.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Entity_Service instance.
+     *
+     * @since 3.2.0
+     *
+     * @param \Wordlift_UI_Service $ui_service The UI service.
+     */
+    public function __construct( $ui_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+
+        // Set the UI service.
+        $this->ui_service = $ui_service;
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the Entity service.
+     *
+     * @since 3.2.0
+     * @return \Wordlift_Entity_Service The singleton instance of the Entity service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Determines whether a post is an entity or not.
+     *
+     * @since 3.1.0
+     *
+     * @param int $post_id A post id.
+     *
+     * @return bool Return true if the post is an entity otherwise false.
+     */
+    public function is_entity( $post_id ) {
+
+        return ( self::TYPE_NAME === get_post_type( $post_id ) );
+    }
+
+    /**
+     * Get the proper classification scope for a given entity post
+     *
+     * @since 3.5.0
+     *
+     * @param integer $post_id An entity post id.
+     *
+     * @return string Returns an uri.
+     */
+    public function get_classification_scope_for( $post_id ) {
+
+        if ( false === $this->is_entity( $post_id ) ) {
+            return null;
+        }
+        // Retrieve the entity type
+        $entity_type_arr = wl_entity_type_taxonomy_get_type( $post_id );
+        $entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
+        // Retrieve classification boxes configuration
+        $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+        foreach ( $classification_boxes as $cb ) {
+            if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
+                return $cb['id'];
+            }
+        }
+
+        // or null
+        return null;
+
+    }
+
+
+    public function is_used( $post_id ) {
+
+        if ( false === $this->is_entity( $post_id ) ) {
+            return null;
+        }
+        // Retrieve the post
+        $entity = get_post( $post_id );
+
+        global $wpdb;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+
+        // Check is it's referenced / related to another post / entity
+        $stmt = $wpdb->prepare(
+            "SELECT COUNT(*) FROM $table_name WHERE  object_id = %d",
+            $entity->ID
+        );
+
+        // Perform the query
+        $relation_instances = (int) $wpdb->get_var( $stmt );
+        // If there is at least one relation instance for the current entity, then it's used
+        if ( 0 < $relation_instances ) {
+            return true;
+        }
+
+        // Check if the entity uri is used as meta_value
+        $stmt = $wpdb->prepare(
+            "SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
+            $entity->ID,
+            wl_get_entity_uri( $entity->ID )
+        );
+        // Perform the query
+        $meta_instances = (int) $wpdb->get_var( $stmt );
+
+        // If there is at least one meta that refers the current entity uri, then current entity is used
+        if ( 0 < $meta_instances ) {
+            return true;
+        }
+
+        // If we are here, it means the current entity is not used at the moment
+        return false;
+    }
+
+    /**
+     * Determines whether a given uri is an internal uri or not.
+     *
+     * @since 3.3.2
+     *
+     * @param int $uri An uri.
+     *
+     * @return true if the uri internal to the current dataset otherwise false.
+     */
+    public function is_internal_uri( $uri ) {
+
+        return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
+    }
+
+    /**
+     * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
+     *
+     * @since 3.2.0
+     *
+     * @param string $uri The entity URI.
+     *
+     * @return WP_Post|null A WP_Post instance or null if not found.
+     */
+    public function get_entity_post_by_uri( $uri ) {
+
+        // Check if we've been provided with a value otherwise return null.
+        if ( empty( $uri ) ) {
+            return null;
+        }
+
+        $query_args = array(
+            'posts_per_page' => 1,
+            'post_status'    => 'any',
+            'post_type'      => self::TYPE_NAME,
+            'meta_query'     => array(
+                array(
+                    'key'     => WL_ENTITY_URL_META_NAME,
+                    'value'   => $uri,
+                    'compare' => '=',
+                ),
+            ),
+        );
+
+        // Only if the current uri is not an internal uri 
+        // entity search is performed also looking at sameAs values
+        // This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
+        if ( ! $this->is_internal_uri( $uri ) ) {
+
+            $query_args['meta_query']['relation'] = 'OR';
+            $query_args['meta_query'][]           = array(
+                'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                'value'   => $uri,
+                'compare' => '=',
+            );
+        }
+
+        $query = new WP_Query( $query_args );
+
+        // Get the matching entity posts.
+        $posts = $query->get_posts();
+
+        // Return null if no post is found.
+        if ( 0 === count( $posts ) ) {
+            return null;
+        }
+
+        // Return the found post.
+        return $posts[0];
+    }
+
+    /**
+     * Fires once a post has been saved. This function uses the $_REQUEST, therefore
+     * we check that the post we're saving is the current post.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/363
+     *
+     * @since 3.2.0
+     *
+     * @param int     $post_id Post ID.
+     * @param WP_Post $post    Post object.
+     * @param bool    $update  Whether this is an existing post being updated or not.
+     */
+    public function save_post( $post_id, $post, $update ) {
+
+        // We're setting the alternative label that have been provided via the UI
+        // (in fact we're using $_REQUEST), while save_post may be also called
+        // programmatically by some other function: we need to check therefore if
+        // the $post_id in the save_post call matches the post id set in the request.
+        //
+        // If this is not the current post being saved or if it's not an entity, return.
+        if ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
+            return;
+        }
+
+        // Get the alt labels from the request (or empty array).
+        $alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? $_REQUEST['wl_alternative_label'] : array();
+
+        // Set the alternative labels.
+        $this->set_alternative_labels( $post_id, $alt_labels );
+
+    }
+
+    /**
+     * Set the alternative labels.
+     *
+     * @since 3.2.0
+     *
+     * @param int   $post_id    The post id.
+     * @param array $alt_labels An array of labels.
+     */
+    public function set_alternative_labels( $post_id, $alt_labels ) {
+
+        // Force $alt_labels to be an array
+        if ( ! is_array( $alt_labels ) ) {
+            $alt_labels = array( $alt_labels );
+        }
+
+        $this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
+
+        // Delete all the existing alternate labels.
+        delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+
+        // Set the alternative labels.
+        foreach ( $alt_labels as $alt_label ) {
+            if ( ! empty( $alt_label ) ) {
+                add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
+            }
+        }
+
+    }
+
+    /**
+     * Retrieve the alternate labels.
+     *
+     * @since 3.2.0
+     *
+     * @param int $post_id Post id.
+     *
+     * @return mixed An array  of alternative labels.
+     */
+    public function get_alternative_labels( $post_id ) {
+
+        return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+    }
+
+    /**
+     * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
+     *
+     * @since 3.2.0
+     *
+     * @param WP_Post $post Post object.
+     */
+    public function edit_form_before_permalink( $post ) {
+
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post->ID ) ) {
+            return;
+        }
+
+        // Print the input template.
+        $this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+
+        // Print all the currently set alternative labels.
+        foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+
+            echo $this->get_alternative_label_input( $alt_label );
+
+        };
+
+        // Print the button.
+        $this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+
+    }
+
+    /**
+     * Get the URI for the entity with the specified post id.
+     *
+     * @since 3.6.0
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return null|string The entity URI or NULL if not found or the dataset URI is not configured.
+     */
+    public function get_uri( $post_id ) {
+
+        // If a null is given, nothing to do
+        if ( null == $post_id ) {
+            return null;
+        }
+
+        $uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
+
+        // If the dataset uri is not properly configured, null is returned
+        if ( '' === wl_configuration_get_redlink_dataset_uri() ) {
+            return null;
+        }
+
+        // Set the URI if it isn't set yet.
+        $post_status = get_post_status( $post_id );
+        if ( empty( $uri ) && 'auto-draft' !== $post_status && 'revision' !== $post_status ) {
+            $uri = wl_build_entity_uri( $post_id );
+            wl_set_entity_uri( $post_id, $uri );
+        }
+
+        return $uri;
+    }
+
+
+    /**
+     * Get the alternative label input HTML code.
+     *
+     * @since 3.2.0
+     *
+     * @param string $value The input value.
+     *
+     * @return string The input HTML code.
+     */
+    private function get_alternative_label_input( $value = '' ) {
+
+        return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
+    }
+
+    /**
+     * Get the number of entity posts published in this blog.
+     *
+     * @since 3.6.0
+     *
+     * @return int The number of published entity posts.
+     */
+    public function count() {
+
+        $count = wp_count_posts( self::TYPE_NAME );
+
+        return $count->publish;
+    }
+
+    /**
+     * Create a new entity.
+     *
+     * @since 3.9.0
+     *
+     * @param string $name     The entity name.
+     * @param string $type_uri The entity's type URI.
+     * @param null   $logo     The entity logo id (or NULL if none).
+     * @param string $status   The post status, by default 'publish'.
+     *
+     * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
+     */
+    public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
+
+        // Create an entity for the publisher.
+        $post_id = wp_insert_post( array(
+            'post_type'    => self::TYPE_NAME,
+            'post_title'   => $name,
+            'post_status'  => $status,
+            'post_content' => '',
+        ) );
+
+        // Return the error if any.
+        if ( is_wp_error( $post_id ) ) {
+            return $post_id;
+        }
+
+        // Set the entity logo.
+        if ( $logo && is_numeric( $logo ) ) {
+            set_post_thumbnail( $post_id, $logo );
+        }
+
+        // Set the entity type.
+        Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
+
+        return $post_id;
+    }
+
+    /**
+     * Get the entities related to the one with the specified id. By default only
+     * published entities will be returned.
+     *
+     * @since 3.10.0
+     *
+     * @param int    $id          The post id.
+     * @param string $post_status The target post status (default = publish).
+     *
+     * @return array An array of post ids.
+     */
+    public function get_related_entities( $id, $post_status = 'publish' ) {
+
+        return wl_core_inner_get_related_entities( 'post_ids', $id, null, $post_status );
+    }
 
 }

Spacing +66 added lines, -66 removed lines

@@ -67,9 +67,9 @@ 
 	 *
 	 * @param \Wordlift_UI_Service $ui_service The UI service.
 	 */
-	public function __construct( $ui_service ) {
+	public function __construct($ui_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Service');
 
 		// Set the UI service.
 		$this->ui_service = $ui_service;
@@ -99,9 +99,9 @@ 
 	 *
 	 * @return bool Return true if the post is an entity otherwise false.
 	 */
-	public function is_entity( $post_id ) {
+	public function is_entity($post_id) {
 
-		return ( self::TYPE_NAME === get_post_type( $post_id ) );
+		return (self::TYPE_NAME === get_post_type($post_id));
 	}
 
 	/**
@@ -113,18 +113,18 @@ 
 	 *
 	 * @return string Returns an uri.
 	 */
-	public function get_classification_scope_for( $post_id ) {
+	public function get_classification_scope_for($post_id) {
 
-		if ( false === $this->is_entity( $post_id ) ) {
+		if (false === $this->is_entity($post_id)) {
 			return null;
 		}
 		// Retrieve the entity type
-		$entity_type_arr = wl_entity_type_taxonomy_get_type( $post_id );
-		$entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
+		$entity_type_arr = wl_entity_type_taxonomy_get_type($post_id);
+		$entity_type     = str_replace('wl-', '', $entity_type_arr['css_class']);
 		// Retrieve classification boxes configuration
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
+		$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
+		foreach ($classification_boxes as $cb) {
+			if (in_array($entity_type, $cb['registeredTypes'])) {
 				return $cb['id'];
 			}
 		}
@@ -135,13 +135,13 @@ 
 	}
 
 
-	public function is_used( $post_id ) {
+	public function is_used($post_id) {
 
-		if ( false === $this->is_entity( $post_id ) ) {
+		if (false === $this->is_entity($post_id)) {
 			return null;
 		}
 		// Retrieve the post
-		$entity = get_post( $post_id );
+		$entity = get_post($post_id);
 
 		global $wpdb;
 		// Retrieve Wordlift relation instances table name
@@ -154,9 +154,9 @@ 
 		);
 
 		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt );
+		$relation_instances = (int) $wpdb->get_var($stmt);
 		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {
+		if (0 < $relation_instances) {
 			return true;
 		}
 
@@ -164,13 +164,13 @@ 
 		$stmt = $wpdb->prepare(
 			"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
 			$entity->ID,
-			wl_get_entity_uri( $entity->ID )
+			wl_get_entity_uri($entity->ID)
 		);
 		// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt );
+		$meta_instances = (int) $wpdb->get_var($stmt);
 
 		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
+		if (0 < $meta_instances) {
 			return true;
 		}
 
@@ -187,9 +187,9 @@ 
 	 *
 	 * @return true if the uri internal to the current dataset otherwise false.
 	 */
-	public function is_internal_uri( $uri ) {
+	public function is_internal_uri($uri) {
 
-		return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
+		return (0 === strrpos($uri, wl_configuration_get_redlink_dataset_uri()));
 	}
 
 	/**
@@ -201,10 +201,10 @@ 
 	 *
 	 * @return WP_Post|null A WP_Post instance or null if not found.
 	 */
-	public function get_entity_post_by_uri( $uri ) {
+	public function get_entity_post_by_uri($uri) {
 
 		// Check if we've been provided with a value otherwise return null.
-		if ( empty( $uri ) ) {
+		if (empty($uri)) {
 			return null;
 		}
 
@@ -224,7 +224,7 @@ 
 		// Only if the current uri is not an internal uri 
 		// entity search is performed also looking at sameAs values
 		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( ! $this->is_internal_uri( $uri ) ) {
+		if ( ! $this->is_internal_uri($uri)) {
 
 			$query_args['meta_query']['relation'] = 'OR';
 			$query_args['meta_query'][]           = array(
@@ -234,13 +234,13 @@ 
 			);
 		}
 
-		$query = new WP_Query( $query_args );
+		$query = new WP_Query($query_args);
 
 		// Get the matching entity posts.
 		$posts = $query->get_posts();
 
 		// Return null if no post is found.
-		if ( 0 === count( $posts ) ) {
+		if (0 === count($posts)) {
 			return null;
 		}
 
@@ -260,7 +260,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	public function save_post( $post_id, $post, $update ) {
+	public function save_post($post_id, $post, $update) {
 
 		// We're setting the alternative label that have been provided via the UI
 		// (in fact we're using $_REQUEST), while save_post may be also called
@@ -268,15 +268,15 @@ 
 		// the $post_id in the save_post call matches the post id set in the request.
 		//
 		// If this is not the current post being saved or if it's not an entity, return.
-		if ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
+		if ( ! isset($_REQUEST['post_ID']) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity($post_id)) {
 			return;
 		}
 
 		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? $_REQUEST['wl_alternative_label'] : array();
+		$alt_labels = isset($_REQUEST['wl_alternative_label']) ? $_REQUEST['wl_alternative_label'] : array();
 
 		// Set the alternative labels.
-		$this->set_alternative_labels( $post_id, $alt_labels );
+		$this->set_alternative_labels($post_id, $alt_labels);
 
 	}
 
@@ -288,22 +288,22 @@ 
 	 * @param int   $post_id    The post id.
 	 * @param array $alt_labels An array of labels.
 	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
+	public function set_alternative_labels($post_id, $alt_labels) {
 
 		// Force $alt_labels to be an array
-		if ( ! is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
+		if ( ! is_array($alt_labels)) {
+			$alt_labels = array($alt_labels);
 		}
 
-		$this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
+		$this->log->debug("Setting alternative labels [ post id :: $post_id ][ alt labels :: ".implode(',', $alt_labels)." ]");
 
 		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		delete_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 
 		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
+		foreach ($alt_labels as $alt_label) {
+			if ( ! empty($alt_label)) {
+				add_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label);
 			}
 		}
 
@@ -318,9 +318,9 @@ 
 	 *
 	 * @return mixed An array  of alternative labels.
 	 */
-	public function get_alternative_labels( $post_id ) {
+	public function get_alternative_labels($post_id) {
 
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		return get_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 	}
 
 	/**
@@ -330,25 +330,25 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function edit_form_before_permalink( $post ) {
+	public function edit_form_before_permalink($post) {
 
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
+		if ( ! $this->is_entity($post->ID)) {
 			return;
 		}
 
 		// Print the input template.
-		$this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+		$this->ui_service->print_template('wl-tmpl-alternative-label-input', $this->get_alternative_label_input());
 
 		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+		foreach ($this->get_alternative_labels($post->ID) as $alt_label) {
 
-			echo $this->get_alternative_label_input( $alt_label );
+			echo $this->get_alternative_label_input($alt_label);
 
 		};
 
 		// Print the button.
-		$this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+		$this->ui_service->print_button('wl-add-alternative-labels-button', __('Add more titles', 'wordlift'));
 
 	}
 
@@ -361,25 +361,25 @@ 
 	 *
 	 * @return null|string The entity URI or NULL if not found or the dataset URI is not configured.
 	 */
-	public function get_uri( $post_id ) {
+	public function get_uri($post_id) {
 
 		// If a null is given, nothing to do
-		if ( null == $post_id ) {
+		if (null == $post_id) {
 			return null;
 		}
 
-		$uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
+		$uri = get_post_meta($post_id, WL_ENTITY_URL_META_NAME, true);
 
 		// If the dataset uri is not properly configured, null is returned
-		if ( '' === wl_configuration_get_redlink_dataset_uri() ) {
+		if ('' === wl_configuration_get_redlink_dataset_uri()) {
 			return null;
 		}
 
 		// Set the URI if it isn't set yet.
-		$post_status = get_post_status( $post_id );
-		if ( empty( $uri ) && 'auto-draft' !== $post_status && 'revision' !== $post_status ) {
-			$uri = wl_build_entity_uri( $post_id );
-			wl_set_entity_uri( $post_id, $uri );
+		$post_status = get_post_status($post_id);
+		if (empty($uri) && 'auto-draft' !== $post_status && 'revision' !== $post_status) {
+			$uri = wl_build_entity_uri($post_id);
+			wl_set_entity_uri($post_id, $uri);
 		}
 
 		return $uri;
@@ -395,9 +395,9 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	private function get_alternative_label_input( $value = '' ) {
+	private function get_alternative_label_input($value = '') {
 
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
+		return sprintf(self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr($value), __('Delete', 'wordlift'));
 	}
 
 	/**
@@ -409,7 +409,7 @@ 
 	 */
 	public function count() {
 
-		$count = wp_count_posts( self::TYPE_NAME );
+		$count = wp_count_posts(self::TYPE_NAME);
 
 		return $count->publish;
 	}
@@ -426,28 +426,28 @@ 
 	 *
 	 * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
 	 */
-	public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
+	public function create($name, $type_uri, $logo = null, $status = 'publish') {
 
 		// Create an entity for the publisher.
-		$post_id = wp_insert_post( array(
+		$post_id = wp_insert_post(array(
 			'post_type'    => self::TYPE_NAME,
 			'post_title'   => $name,
 			'post_status'  => $status,
 			'post_content' => '',
-		) );
+		));
 
 		// Return the error if any.
-		if ( is_wp_error( $post_id ) ) {
+		if (is_wp_error($post_id)) {
 			return $post_id;
 		}
 
 		// Set the entity logo.
-		if ( $logo && is_numeric( $logo ) ) {
-			set_post_thumbnail( $post_id, $logo );
+		if ($logo && is_numeric($logo)) {
+			set_post_thumbnail($post_id, $logo);
 		}
 
 		// Set the entity type.
-		Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
+		Wordlift_Entity_Type_Service::get_instance()->set($post_id, $type_uri);
 
 		return $post_id;
 	}
@@ -463,9 +463,9 @@ 
 	 *
 	 * @return array An array of post ids.
 	 */
-	public function get_related_entities( $id, $post_status = 'publish' ) {
+	public function get_related_entities($id, $post_status = 'publish') {
 
-		return wl_core_inner_get_related_entities( 'post_ids', $id, null, $post_status );
+		return wl_core_inner_get_related_entities('post_ids', $id, null, $post_status);
 	}
 
 }

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

Doc Comments +1 added lines, -2 removed lines

@@ -173,7 +173,6 @@ 
 	 * @since 3.3.0
 	 *
 	 * @param int $post_id      The entity post id.
-	 * @param     $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
 	 *
 	 * @return array An array representing the rating obj.
 	 */
@@ -332,7 +331,7 @@ 
 	 *
 	 * @param int $score The rating score for a given entity.
 	 *
-	 * @return string The input HTML code.
+	 * @return double The input HTML code.
 	 */
 	public function convert_raw_score_to_percentage( $score ) {
 

Indentation +365 added lines, -365 removed lines

@@ -14,370 +14,370 @@
  */
 class Wordlift_Rating_Service {
 
-	/**
-	 * Entity rating max.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_MAX = 7;
-
-	/**
-	 * Entity rating score meta key.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_RAW_SCORE_META_KEY = '_wl_entity_rating_raw_score';
-
-	/**
-	 * Entity rating warnings meta key.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNINGS_META_KEY = '_wl_entity_rating_warnings';
-
-	/**
-	 * Entity warning has related post identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_RELATED_POSTS = 'There are no related posts for the current entity.';
-
-	/**
-	 * Entity warning has content post identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_CONTENT_POST = 'This entity has not description.';
-
-	/**
-	 * Entity warning has related entities identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_RELATED_ENTITIES = 'There are no related entities for the current entity.';
-
-	/**
-	 * Entity warning is published identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_IS_PUBLISHED = 'This entity is not published. It will not appear within analysis results.';
-
-	/**
-	 * Entity warning has thumbnail identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_THUMBNAIL = 'This entity has no featured image yet.';
-
-	/**
-	 * Entity warning has same as identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_SAME_AS = 'There are no sameAs configured for this entity.';
-
-	/**
-	 * Entity warning has completed metadata identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_COMPLETED_METADATA = 'Schema.org metadata for this entity are not completed.';
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 *  A {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_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;
-
-	/**
-	 * Create a {@link Wordlift_Rating_Service} instance.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param \Wordlift_Entity_Service      $entity_service      A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_Notice_Service      $notice_service      A {@link Wordlift_Notice_Service} instance.
-	 */
-	public function __construct( $entity_service, $entity_type_service, $notice_service ) {
-
-		$this->entity_service      = $entity_service;
-		$this->entity_type_service = $entity_type_service;
-		$this->notice_service      = $notice_service;
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rating_Service' );
-
-	}
-
-	/**
-	 * Set rating for a given entity.
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return array An array representing the rating obj.
-	 */
-	public function set_rating_for( $post_id ) {
-
-		// Calculate rating for the given post.
-		$rating = $this->calculate_rating_for( $post_id );
-
-		// Store the rating on db as post meta. Please notice that RATING_RAW_SCORE_META_KEY
-		// is saved on a different meta to allow score sorting. Both meta are managed as unique.
-		//
-		// See https://codex.wordpress.org/Function_Reference/update_post_meta
-		update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score'] );
-		update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings'] );
-
-		$this->log->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score'] ) );
-
-		// Finally returns the rating
-		return $rating;
-	}
-
-
-	/**
-	 * Get or calculate rating for a given entity
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $post_id      The entity post id.
-	 * @param     $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
-	 *
-	 * @return array An array representing the rating obj.
-	 */
-	public function get_rating_for( $post_id, $force_reload = false ) {
-
-		// If forced reload is required or rating is missing.
-		if ( $force_reload ) {
-			$this->log->trace( "Force rating reload [ post_id :: $post_id ]" );
-
-			return $this->set_rating_for( $post_id );
-		}
-
-		$current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );
-
-		if ( ! is_numeric( $current_raw_score ) ) {
-			$this->log->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
-
-			return $this->set_rating_for( $post_id );
-		}
-
-		$current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );
-
-		// Finally return score and warnings
-		return array(
-			'raw_score'           => $current_raw_score,
-			'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $current_raw_score ),
-			'percentage_score'    => $this->convert_raw_score_to_percentage( $current_raw_score ),
-			'warnings'            => $current_warnings,
-		);
-
-	}
-
-	/**
-	 * Calculate rating for a given entity.
-	 *
-	 * Rating depends from following criteria:
-	 *
-	 * 1. Is the current entity related to at least 1 post?
-	 * 2. Is the current entity content post not empty?
-	 * 3. Is the current entity related to at least 1 entity?
-	 * 4. Is the entity published?
-	 * 5. There is a a thumbnail associated to the entity?
-	 * 6. Has the entity a sameas defined?
-	 * 7. Are all schema.org required metadata compiled?
-	 *
-	 * Each positive check means +1 in terms of rating score.
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return array An array representing the rating obj.
-	 */
-	private function calculate_rating_for( $post_id ) {
-
-		// If it's not an entity, return.
-		if ( ! $this->entity_service->is_entity( $post_id ) ) {
-			return array();
-		}
-		// Retrieve the post object.
-		$post = get_post( $post_id );
-
-		// Rating value.
-		$score = 0;
-
-		// Store warning messages.
-		$warnings = array();
-
-		// Is the current entity related to at least 1 post?
-		( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
-
-		// Is the post content not empty?
-		( ! empty( $post->post_content ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
-
-		// Is the current entity related to at least 1 entity?
-		// Was the current entity already disambiguated?
-		( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
-
-		// Is the entity published?
-		( 'publish' === get_post_status( $post->ID ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
-
-		// Has a thumbnail?
-		( has_post_thumbnail( $post->ID ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
-
-		// Get all post meta keys for the current post
-		global $wpdb;
-
-		$query = $wpdb->prepare(
-			"SELECT DISTINCT (meta_key) FROM $wpdb->postmeta  WHERE post_id = %d", $post->ID
-		);
-
-		// Check intersection between available meta keys and expected ones
-		// arrays to detect missing values.
-		$available_meta_keys = $wpdb->get_col( $query );
-
-		// If each expected key is contained in available keys array ...
-		( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
-
-		$schema = $this->entity_type_service->get( $post_id );
-
-		$expected_meta_keys = ( null === $schema['custom_fields'] ) ?
-			array() :
-			array_keys( $schema['custom_fields'] );
-
-		$intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
-		// If each expected key is contained in available keys array ...
-		( count( $intersection ) === count( $expected_meta_keys ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
-
-		// Finally return score and warnings
-		return array(
-			'raw_score'           => $score,
-			'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $score ),
-			'percentage_score'    => $this->convert_raw_score_to_percentage( $score ),
-			'warnings'            => $warnings,
-		);
-
-	}
-
-	/**
-	 * Get as rating as input and convert in a traffic-light rating
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $score The rating score for a given entity.
-	 *
-	 * @return string The input HTML code.
-	 */
-	private function convert_raw_score_to_traffic_light( $score ) {
-		// RATING_MAX : $score = 3 : x
-		// See http://php.net/manual/en/function.round.php
-		$rating = round( ( $score * 3 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
-
-		// If rating is 0, return 1, otherwise return rating
-		return ( 0 == $rating ) ? 1 : $rating;
-
-	}
-
-	/**
-	 * Get as rating as input and convert in a traffic-light rating
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $score The rating score for a given entity.
-	 *
-	 * @return string The input HTML code.
-	 */
-	public function convert_raw_score_to_percentage( $score ) {
-
-		// RATING_MAX : $score = 100 : x
-		return round( ( $score * 100 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
-	}
-
-
-	/**
-	 * Add admin notices for the current entity depending on the current rating.
-	 *
-	 * @since 3.3.0
-	 */
-	public function in_admin_header() {
-
-		// Return safely if get_current_screen() is not defined (yet)
-		if ( false === function_exists( 'get_current_screen' ) ) {
-			return;
-		}
-
-		$screen = get_current_screen();
-		// If there is any valid screen nothing to do
-		if ( null === $screen ) {
-			return;
-		}
-
-		// If you're not in the entity post edit page, return.
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $screen->id ) {
-			return;
-		}
-		// Retrieve the current global post
-		global $post;
-		// If it's not an entity, return.
-		if ( ! $this->entity_service->is_entity( $post->ID ) ) {
-			return;
-		}
-		// Retrieve an updated rating for the current entity
-		$rating = $this->get_rating_for( $post->ID, true );
-
-		// If there is at least 1 warning
-		if ( isset( $rating['warnings'] ) && 0 < count( $rating['warnings'] ) ) {
-			// TODO - Pass Wordlift_Notice_Service trough the service constructor
-			$this->notice_service->add_suggestion( $rating['warnings'] );
-		}
-
-	}
+    /**
+     * Entity rating max.
+     *
+     * @since 3.3.0
+     */
+    const RATING_MAX = 7;
+
+    /**
+     * Entity rating score meta key.
+     *
+     * @since 3.3.0
+     */
+    const RATING_RAW_SCORE_META_KEY = '_wl_entity_rating_raw_score';
+
+    /**
+     * Entity rating warnings meta key.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNINGS_META_KEY = '_wl_entity_rating_warnings';
+
+    /**
+     * Entity warning has related post identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_RELATED_POSTS = 'There are no related posts for the current entity.';
+
+    /**
+     * Entity warning has content post identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_CONTENT_POST = 'This entity has not description.';
+
+    /**
+     * Entity warning has related entities identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_RELATED_ENTITIES = 'There are no related entities for the current entity.';
+
+    /**
+     * Entity warning is published identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_IS_PUBLISHED = 'This entity is not published. It will not appear within analysis results.';
+
+    /**
+     * Entity warning has thumbnail identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_THUMBNAIL = 'This entity has no featured image yet.';
+
+    /**
+     * Entity warning has same as identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_SAME_AS = 'There are no sameAs configured for this entity.';
+
+    /**
+     * Entity warning has completed metadata identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_COMPLETED_METADATA = 'Schema.org metadata for this entity are not completed.';
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     *  A {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_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;
+
+    /**
+     * Create a {@link Wordlift_Rating_Service} instance.
+     *
+     * @since 3.10.0
+     *
+     * @param \Wordlift_Entity_Service      $entity_service      A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_Notice_Service      $notice_service      A {@link Wordlift_Notice_Service} instance.
+     */
+    public function __construct( $entity_service, $entity_type_service, $notice_service ) {
+
+        $this->entity_service      = $entity_service;
+        $this->entity_type_service = $entity_type_service;
+        $this->notice_service      = $notice_service;
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rating_Service' );
+
+    }
+
+    /**
+     * Set rating for a given entity.
+     *
+     * @since 3.3.0
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return array An array representing the rating obj.
+     */
+    public function set_rating_for( $post_id ) {
+
+        // Calculate rating for the given post.
+        $rating = $this->calculate_rating_for( $post_id );
+
+        // Store the rating on db as post meta. Please notice that RATING_RAW_SCORE_META_KEY
+        // is saved on a different meta to allow score sorting. Both meta are managed as unique.
+        //
+        // See https://codex.wordpress.org/Function_Reference/update_post_meta
+        update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score'] );
+        update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings'] );
+
+        $this->log->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score'] ) );
+
+        // Finally returns the rating
+        return $rating;
+    }
+
+
+    /**
+     * Get or calculate rating for a given entity
+     *
+     * @since 3.3.0
+     *
+     * @param int $post_id      The entity post id.
+     * @param     $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
+     *
+     * @return array An array representing the rating obj.
+     */
+    public function get_rating_for( $post_id, $force_reload = false ) {
+
+        // If forced reload is required or rating is missing.
+        if ( $force_reload ) {
+            $this->log->trace( "Force rating reload [ post_id :: $post_id ]" );
+
+            return $this->set_rating_for( $post_id );
+        }
+
+        $current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );
+
+        if ( ! is_numeric( $current_raw_score ) ) {
+            $this->log->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
+
+            return $this->set_rating_for( $post_id );
+        }
+
+        $current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );
+
+        // Finally return score and warnings
+        return array(
+            'raw_score'           => $current_raw_score,
+            'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $current_raw_score ),
+            'percentage_score'    => $this->convert_raw_score_to_percentage( $current_raw_score ),
+            'warnings'            => $current_warnings,
+        );
+
+    }
+
+    /**
+     * Calculate rating for a given entity.
+     *
+     * Rating depends from following criteria:
+     *
+     * 1. Is the current entity related to at least 1 post?
+     * 2. Is the current entity content post not empty?
+     * 3. Is the current entity related to at least 1 entity?
+     * 4. Is the entity published?
+     * 5. There is a a thumbnail associated to the entity?
+     * 6. Has the entity a sameas defined?
+     * 7. Are all schema.org required metadata compiled?
+     *
+     * Each positive check means +1 in terms of rating score.
+     *
+     * @since 3.3.0
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return array An array representing the rating obj.
+     */
+    private function calculate_rating_for( $post_id ) {
+
+        // If it's not an entity, return.
+        if ( ! $this->entity_service->is_entity( $post_id ) ) {
+            return array();
+        }
+        // Retrieve the post object.
+        $post = get_post( $post_id );
+
+        // Rating value.
+        $score = 0;
+
+        // Store warning messages.
+        $warnings = array();
+
+        // Is the current entity related to at least 1 post?
+        ( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
+            $score ++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
+
+        // Is the post content not empty?
+        ( ! empty( $post->post_content ) ) ?
+            $score ++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
+
+        // Is the current entity related to at least 1 entity?
+        // Was the current entity already disambiguated?
+        ( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
+            $score ++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
+
+        // Is the entity published?
+        ( 'publish' === get_post_status( $post->ID ) ) ?
+            $score ++ :
+            array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
+
+        // Has a thumbnail?
+        ( has_post_thumbnail( $post->ID ) ) ?
+            $score ++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
+
+        // Get all post meta keys for the current post
+        global $wpdb;
+
+        $query = $wpdb->prepare(
+            "SELECT DISTINCT (meta_key) FROM $wpdb->postmeta  WHERE post_id = %d", $post->ID
+        );
+
+        // Check intersection between available meta keys and expected ones
+        // arrays to detect missing values.
+        $available_meta_keys = $wpdb->get_col( $query );
+
+        // If each expected key is contained in available keys array ...
+        ( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
+            $score ++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
+
+        $schema = $this->entity_type_service->get( $post_id );
+
+        $expected_meta_keys = ( null === $schema['custom_fields'] ) ?
+            array() :
+            array_keys( $schema['custom_fields'] );
+
+        $intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
+        // If each expected key is contained in available keys array ...
+        ( count( $intersection ) === count( $expected_meta_keys ) ) ?
+            $score ++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
+
+        // Finally return score and warnings
+        return array(
+            'raw_score'           => $score,
+            'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $score ),
+            'percentage_score'    => $this->convert_raw_score_to_percentage( $score ),
+            'warnings'            => $warnings,
+        );
+
+    }
+
+    /**
+     * Get as rating as input and convert in a traffic-light rating
+     *
+     * @since 3.3.0
+     *
+     * @param int $score The rating score for a given entity.
+     *
+     * @return string The input HTML code.
+     */
+    private function convert_raw_score_to_traffic_light( $score ) {
+        // RATING_MAX : $score = 3 : x
+        // See http://php.net/manual/en/function.round.php
+        $rating = round( ( $score * 3 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
+
+        // If rating is 0, return 1, otherwise return rating
+        return ( 0 == $rating ) ? 1 : $rating;
+
+    }
+
+    /**
+     * Get as rating as input and convert in a traffic-light rating
+     *
+     * @since 3.3.0
+     *
+     * @param int $score The rating score for a given entity.
+     *
+     * @return string The input HTML code.
+     */
+    public function convert_raw_score_to_percentage( $score ) {
+
+        // RATING_MAX : $score = 100 : x
+        return round( ( $score * 100 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
+    }
+
+
+    /**
+     * Add admin notices for the current entity depending on the current rating.
+     *
+     * @since 3.3.0
+     */
+    public function in_admin_header() {
+
+        // Return safely if get_current_screen() is not defined (yet)
+        if ( false === function_exists( 'get_current_screen' ) ) {
+            return;
+        }
+
+        $screen = get_current_screen();
+        // If there is any valid screen nothing to do
+        if ( null === $screen ) {
+            return;
+        }
+
+        // If you're not in the entity post edit page, return.
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $screen->id ) {
+            return;
+        }
+        // Retrieve the current global post
+        global $post;
+        // If it's not an entity, return.
+        if ( ! $this->entity_service->is_entity( $post->ID ) ) {
+            return;
+        }
+        // Retrieve an updated rating for the current entity
+        $rating = $this->get_rating_for( $post->ID, true );
+
+        // If there is at least 1 warning
+        if ( isset( $rating['warnings'] ) && 0 < count( $rating['warnings'] ) ) {
+            // TODO - Pass Wordlift_Notice_Service trough the service constructor
+            $this->notice_service->add_suggestion( $rating['warnings'] );
+        }
+
+    }
 
 }

Spacing +54 added lines, -62 removed lines

@@ -129,13 +129,13 @@ 
 	 * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
 	 * @param \Wordlift_Notice_Service      $notice_service      A {@link Wordlift_Notice_Service} instance.
 	 */
-	public function __construct( $entity_service, $entity_type_service, $notice_service ) {
+	public function __construct($entity_service, $entity_type_service, $notice_service) {
 
 		$this->entity_service      = $entity_service;
 		$this->entity_type_service = $entity_type_service;
 		$this->notice_service      = $notice_service;
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Rating_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Rating_Service');
 
 	}
 
@@ -148,19 +148,19 @@ 
 	 *
 	 * @return array An array representing the rating obj.
 	 */
-	public function set_rating_for( $post_id ) {
+	public function set_rating_for($post_id) {
 
 		// Calculate rating for the given post.
-		$rating = $this->calculate_rating_for( $post_id );
+		$rating = $this->calculate_rating_for($post_id);
 
 		// Store the rating on db as post meta. Please notice that RATING_RAW_SCORE_META_KEY
 		// is saved on a different meta to allow score sorting. Both meta are managed as unique.
 		//
 		// See https://codex.wordpress.org/Function_Reference/update_post_meta
-		update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score'] );
-		update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings'] );
+		update_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score']);
+		update_post_meta($post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings']);
 
-		$this->log->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score'] ) );
+		$this->log->trace(sprintf("Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score']));
 
 		// Finally returns the rating
 		return $rating;
@@ -177,30 +177,30 @@ 
 	 *
 	 * @return array An array representing the rating obj.
 	 */
-	public function get_rating_for( $post_id, $force_reload = false ) {
+	public function get_rating_for($post_id, $force_reload = false) {
 
 		// If forced reload is required or rating is missing.
-		if ( $force_reload ) {
-			$this->log->trace( "Force rating reload [ post_id :: $post_id ]" );
+		if ($force_reload) {
+			$this->log->trace("Force rating reload [ post_id :: $post_id ]");
 
-			return $this->set_rating_for( $post_id );
+			return $this->set_rating_for($post_id);
 		}
 
-		$current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );
+		$current_raw_score = get_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, true);
 
-		if ( ! is_numeric( $current_raw_score ) ) {
-			$this->log->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
+		if ( ! is_numeric($current_raw_score)) {
+			$this->log->trace("Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]");
 
-			return $this->set_rating_for( $post_id );
+			return $this->set_rating_for($post_id);
 		}
 
-		$current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );
+		$current_warnings = get_post_meta($post_id, self::RATING_WARNINGS_META_KEY, true);
 
 		// Finally return score and warnings
 		return array(
 			'raw_score'           => $current_raw_score,
-			'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $current_raw_score ),
-			'percentage_score'    => $this->convert_raw_score_to_percentage( $current_raw_score ),
+			'traffic_light_score' => $this->convert_raw_score_to_traffic_light($current_raw_score),
+			'percentage_score'    => $this->convert_raw_score_to_percentage($current_raw_score),
 			'warnings'            => $current_warnings,
 		);
 
@@ -227,14 +227,14 @@ 
 	 *
 	 * @return array An array representing the rating obj.
 	 */
-	private function calculate_rating_for( $post_id ) {
+	private function calculate_rating_for($post_id) {
 
 		// If it's not an entity, return.
-		if ( ! $this->entity_service->is_entity( $post_id ) ) {
+		if ( ! $this->entity_service->is_entity($post_id)) {
 			return array();
 		}
 		// Retrieve the post object.
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
 		// Rating value.
 		$score = 0;
@@ -243,30 +243,25 @@ 
 		$warnings = array();
 
 		// Is the current entity related to at least 1 post?
-		( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
+		(0 < count(wl_core_get_related_post_ids($post->ID))) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift'));
 
 		// Is the post content not empty?
-		( ! empty( $post->post_content ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
+		( ! empty($post->post_content)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift'));
 
 		// Is the current entity related to at least 1 entity?
 		// Was the current entity already disambiguated?
-		( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
+		(0 < count(wl_core_get_related_entity_ids($post->ID))) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift'));
 
 		// Is the entity published?
-		( 'publish' === get_post_status( $post->ID ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
+		('publish' === get_post_status($post->ID)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_IS_PUBLISHED, 'wordlift'));
 
 		// Has a thumbnail?
-		( has_post_thumbnail( $post->ID ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
+		(has_post_thumbnail($post->ID)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift'));
 
 		// Get all post meta keys for the current post
 		global $wpdb;
@@ -277,30 +272,27 @@ 
 
 		// Check intersection between available meta keys and expected ones
 		// arrays to detect missing values.
-		$available_meta_keys = $wpdb->get_col( $query );
+		$available_meta_keys = $wpdb->get_col($query);
 
 		// If each expected key is contained in available keys array ...
-		( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
+		(in_array(Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_SAME_AS, 'wordlift'));
 
-		$schema = $this->entity_type_service->get( $post_id );
+		$schema = $this->entity_type_service->get($post_id);
 
-		$expected_meta_keys = ( null === $schema['custom_fields'] ) ?
-			array() :
-			array_keys( $schema['custom_fields'] );
+		$expected_meta_keys = (null === $schema['custom_fields']) ?
+			array() : array_keys($schema['custom_fields']);
 
-		$intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
+		$intersection = array_intersect($expected_meta_keys, $available_meta_keys);
 		// If each expected key is contained in available keys array ...
-		( count( $intersection ) === count( $expected_meta_keys ) ) ?
-			$score ++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
+		(count($intersection) === count($expected_meta_keys)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift'));
 
 		// Finally return score and warnings
 		return array(
 			'raw_score'           => $score,
-			'traffic_light_score' => $this->convert_raw_score_to_traffic_light( $score ),
-			'percentage_score'    => $this->convert_raw_score_to_percentage( $score ),
+			'traffic_light_score' => $this->convert_raw_score_to_traffic_light($score),
+			'percentage_score'    => $this->convert_raw_score_to_percentage($score),
 			'warnings'            => $warnings,
 		);
 
@@ -315,13 +307,13 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	private function convert_raw_score_to_traffic_light( $score ) {
+	private function convert_raw_score_to_traffic_light($score) {
 		// RATING_MAX : $score = 3 : x
 		// See http://php.net/manual/en/function.round.php
-		$rating = round( ( $score * 3 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
+		$rating = round(($score * 3) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP);
 
 		// If rating is 0, return 1, otherwise return rating
-		return ( 0 == $rating ) ? 1 : $rating;
+		return (0 == $rating) ? 1 : $rating;
 
 	}
 
@@ -334,10 +326,10 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	public function convert_raw_score_to_percentage( $score ) {
+	public function convert_raw_score_to_percentage($score) {
 
 		// RATING_MAX : $score = 100 : x
-		return round( ( $score * 100 ) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP );
+		return round(($score * 100) / self::RATING_MAX, 0, PHP_ROUND_HALF_UP);
 	}
 
 
@@ -349,33 +341,33 @@ 
 	public function in_admin_header() {
 
 		// Return safely if get_current_screen() is not defined (yet)
-		if ( false === function_exists( 'get_current_screen' ) ) {
+		if (false === function_exists('get_current_screen')) {
 			return;
 		}
 
 		$screen = get_current_screen();
 		// If there is any valid screen nothing to do
-		if ( null === $screen ) {
+		if (null === $screen) {
 			return;
 		}
 
 		// If you're not in the entity post edit page, return.
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $screen->id ) {
+		if (Wordlift_Entity_Service::TYPE_NAME !== $screen->id) {
 			return;
 		}
 		// Retrieve the current global post
 		global $post;
 		// If it's not an entity, return.
-		if ( ! $this->entity_service->is_entity( $post->ID ) ) {
+		if ( ! $this->entity_service->is_entity($post->ID)) {
 			return;
 		}
 		// Retrieve an updated rating for the current entity
-		$rating = $this->get_rating_for( $post->ID, true );
+		$rating = $this->get_rating_for($post->ID, true);
 
 		// If there is at least 1 warning
-		if ( isset( $rating['warnings'] ) && 0 < count( $rating['warnings'] ) ) {
+		if (isset($rating['warnings']) && 0 < count($rating['warnings'])) {
 			// TODO - Pass Wordlift_Notice_Service trough the service constructor
-			$this->notice_service->add_suggestion( $rating['warnings'] );
+			$this->notice_service->add_suggestion($rating['warnings']);
 		}
 
 	}

src/modules/core/wordlift_core_post_entity_relations.php

Doc Comments +4 added lines, -3 removed lines

@@ -269,8 +269,8 @@ 
  * If $predicate is omitted, $predicate filter is not applied
  * Do not use it directly. Use wl_core_get_related_entities or wl_core_get_related_entity_ids instead.
  *
- * @param        $get
- * @param        $item_id
+ * @param        string $get
+ * @param        integer $item_id
  * @param string $predicate   Name of the relation: null | 'what' | 'where' | 'when' | 'who'
  * @param string $post_status Filter by post status null | 'publish' | 'draft' | 'pending' | 'trash'. null means *any* post status
  *
@@ -345,9 +345,10 @@ 
  * If $predicate is omitted, $predicate filter is not applied
  * Not use it directly. Use wl_core_get_related_posts or wl_core_get_related_posts_ids instead.
  *
- * @param int    $object_id   The entity ID or the post ID.
  * @param string $predicate   Name of the relation: null | 'what' | 'where' | 'when' | 'who'
  * @param string $post_status Filter by post status null | 'publish' | 'draft' | 'pending' | 'trash'. null means *any* post status
+ * @param string $get
+ * @param integer $item_id
  *
  * @return array Array of objects.
  */

Indentation +307 added lines, -307 removed lines

@@ -9,12 +9,12 @@ 
  */
 function wl_core_check_relation_predicate_is_supported( $predicate ) {
 
-	return in_array( $predicate, array(
-		WL_WHAT_RELATION,
-		WL_WHEN_RELATION,
-		WL_WHERE_RELATION,
-		WL_WHO_RELATION,
-	) );
+    return in_array( $predicate, array(
+        WL_WHAT_RELATION,
+        WL_WHEN_RELATION,
+        WL_WHERE_RELATION,
+        WL_WHO_RELATION,
+    ) );
 }
 
 /**
@@ -24,7 +24,7 @@ 
  */
 function wl_core_get_validation_rules() {
 
-	return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
+    return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
 }
 
 /**
@@ -34,10 +34,10 @@ 
  */
 function wl_core_get_relation_instances_table_name() {
 
-	global $wpdb;
-	$table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+    global $wpdb;
+    $table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
 
-	return $table_name;
+    return $table_name;
 }
 
 /**
@@ -52,33 +52,33 @@ 
  */
 function wl_core_add_relation_instance( $subject_id, $predicate, $object_id ) {
 
-	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) || ! is_numeric( $object_id ) ) {
-		return false;
-	}
-
-	// Checks on the given relation
-	if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
-		return false;
-	}
-
-	// Prepare interaction with db
-	global $wpdb;
-
-	// Checks passed. Add relation if not exists:
-	// See https://codex.wordpress.org/Class_Reference/wpdb#REPLACE_row
-	$wpdb->replace(
-		wl_core_get_relation_instances_table_name(),
-		array(
-			'subject_id' => $subject_id,
-			'predicate'  => $predicate,
-			'object_id'  => $object_id,
-		),
-		array( '%d', '%s', '%d' )
-	);
-
-	// Return record id
-	return $wpdb->insert_id;
+    // Checks on subject and object
+    if ( ! is_numeric( $subject_id ) || ! is_numeric( $object_id ) ) {
+        return false;
+    }
+
+    // Checks on the given relation
+    if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+        return false;
+    }
+
+    // Prepare interaction with db
+    global $wpdb;
+
+    // Checks passed. Add relation if not exists:
+    // See https://codex.wordpress.org/Class_Reference/wpdb#REPLACE_row
+    $wpdb->replace(
+        wl_core_get_relation_instances_table_name(),
+        array(
+            'subject_id' => $subject_id,
+            'predicate'  => $predicate,
+            'object_id'  => $object_id,
+        ),
+        array( '%d', '%s', '%d' )
+    );
+
+    // Return record id
+    return $wpdb->insert_id;
 }
 
 /**
@@ -93,33 +93,33 @@ 
  */
 function wl_core_delete_relation_instance( $subject_id, $predicate, $object_id ) {
 
-	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) || ! is_numeric( $object_id ) ) {
-		return false;
-	}
-
-	// Checks on the given relation
-	if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
-		return false;
-	}
-
-	// Prepare interaction with db
-	global $wpdb;
-
-	wl_write_log( "Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]" );
-
-	// @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
-	$wpdb->delete(
-		wl_core_get_relation_instances_table_name(),
-		array(
-			'subject_id' => $subject_id,
-			'predicate'  => $predicate,
-			'object_id'  => $object_id,
-		),
-		array( '%d', '%s', '%d' )
-	);
-
-	return true;
+    // Checks on subject and object
+    if ( ! is_numeric( $subject_id ) || ! is_numeric( $object_id ) ) {
+        return false;
+    }
+
+    // Checks on the given relation
+    if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+        return false;
+    }
+
+    // Prepare interaction with db
+    global $wpdb;
+
+    wl_write_log( "Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]" );
+
+    // @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
+    $wpdb->delete(
+        wl_core_get_relation_instances_table_name(),
+        array(
+            'subject_id' => $subject_id,
+            'predicate'  => $predicate,
+            'object_id'  => $object_id,
+        ),
+        array( '%d', '%s', '%d' )
+    );
+
+    return true;
 }
 
 /**
@@ -134,29 +134,29 @@ 
  */
 function wl_core_add_relation_instances( $subject_id, $predicate, $object_ids ) {
 
-	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) ) {
-		return false;
-	}
-
-	// Checks on the given relation
-	if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
-		return false;
-	}
-
-	// Check $object_ids is an array
-	if ( ! is_array( $object_ids ) || empty( $object_ids ) ) {
-		return false;
-	}
-
-	// Call method to check and add each single relation
-	$inserted_records_ids = array();
-	foreach ( $object_ids as $object_id ) {
-		$new_record_id          = wl_core_add_relation_instance( $subject_id, $predicate, $object_id );
-		$inserted_records_ids[] = $new_record_id;
-	}
-
-	return $inserted_records_ids;
+    // Checks on subject and object
+    if ( ! is_numeric( $subject_id ) ) {
+        return false;
+    }
+
+    // Checks on the given relation
+    if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+        return false;
+    }
+
+    // Check $object_ids is an array
+    if ( ! is_array( $object_ids ) || empty( $object_ids ) ) {
+        return false;
+    }
+
+    // Call method to check and add each single relation
+    $inserted_records_ids = array();
+    foreach ( $object_ids as $object_id ) {
+        $new_record_id          = wl_core_add_relation_instance( $subject_id, $predicate, $object_id );
+        $inserted_records_ids[] = $new_record_id;
+    }
+
+    return $inserted_records_ids;
 }
 
 /**
@@ -169,26 +169,26 @@ 
  */
 function wl_core_delete_relation_instances( $subject_id ) {
 
-	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) ) {
-		return false;
-	}
+    // Checks on subject and object
+    if ( ! is_numeric( $subject_id ) ) {
+        return false;
+    }
 
-	// Prepare interaction with db
-	global $wpdb;
+    // Prepare interaction with db
+    global $wpdb;
 
-	// wl_write_log( "Going to delete relation instances [ subject_id :: $subject_id ]");
+    // wl_write_log( "Going to delete relation instances [ subject_id :: $subject_id ]");
 
-	// @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
-	$wpdb->delete(
-		wl_core_get_relation_instances_table_name(),
-		array(
-			'subject_id' => $subject_id,
-		),
-		array( '%d' )
-	);
+    // @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
+    $wpdb->delete(
+        wl_core_get_relation_instances_table_name(),
+        array(
+            'subject_id' => $subject_id,
+        ),
+        array( '%d' )
+    );
 
-	return true;
+    return true;
 }
 
 /**
@@ -204,18 +204,18 @@ 
  */
 function wl_core_validate_filters_for_related( $filters ) {
 
-	if ( ! is_array( $filters ) ) {
-		$filters = array();
-	}
+    if ( ! is_array( $filters ) ) {
+        $filters = array();
+    }
 
-	if ( ! isset( $filters['predicate'] ) ) {
-		$filters['predicate'] = null;
-	}
-	if ( ! isset( $filters['status'] ) ) {
-		$filters['status'] = null;
-	}
+    if ( ! isset( $filters['predicate'] ) ) {
+        $filters['predicate'] = null;
+    }
+    if ( ! isset( $filters['status'] ) ) {
+        $filters['status'] = null;
+    }
 
-	return $filters;
+    return $filters;
 }
 
 /**
@@ -236,9 +236,9 @@ 
  */
 function wl_core_get_related_entities( $subject_id, $filters = array() ) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related( $filters );
 
-	return wl_core_inner_get_related_entities( "posts", $subject_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_entities( "posts", $subject_id, $filters['predicate'], $filters['status'] );
 }
 
 /**
@@ -259,9 +259,9 @@ 
  */
 function wl_core_get_related_entity_ids( $subject_id, $filters = array() ) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related( $filters );
 
-	return wl_core_inner_get_related_entities( "post_ids", $subject_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_entities( "post_ids", $subject_id, $filters['predicate'], $filters['status'] );
 }
 
 /**
@@ -278,20 +278,20 @@ 
  */
 function wl_core_inner_get_related_entities( $get, $item_id, $predicate = null, $post_status = null ) {
 
-	if ( $results = wl_core_get_posts( array(
-		'get'            => $get,
-		'post_type'      => 'entity',
-		'post_status'    => $post_status,
-		'related_to'     => $item_id,
-		'as'             => 'object',
-		'with_predicate' => $predicate,
-	) )
-	) {
-		return $results;
-	}
-
-	// If wl_core_get_posts return false then an empty array is returned
-	return array();
+    if ( $results = wl_core_get_posts( array(
+        'get'            => $get,
+        'post_type'      => 'entity',
+        'post_status'    => $post_status,
+        'related_to'     => $item_id,
+        'as'             => 'object',
+        'with_predicate' => $predicate,
+    ) )
+    ) {
+        return $results;
+    }
+
+    // If wl_core_get_posts return false then an empty array is returned
+    return array();
 }
 
 /**
@@ -312,9 +312,9 @@ 
  */
 function wl_core_get_related_posts( $object_id, $filters = array() ) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related( $filters );
 
-	return wl_core_inner_get_related_posts( "posts", $object_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_posts( "posts", $object_id, $filters['predicate'], $filters['status'] );
 }
 
 /**
@@ -335,9 +335,9 @@ 
  */
 function wl_core_get_related_post_ids( $object_id, $filters = array() ) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related( $filters );
 
-	return wl_core_inner_get_related_posts( "post_ids", $object_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_posts( "post_ids", $object_id, $filters['predicate'], $filters['status'] );
 }
 
 /**
@@ -353,41 +353,41 @@ 
  */
 function wl_core_inner_get_related_posts( $get, $item_id, $predicate = null, $post_status = null ) {
 
-	// Retrieve the post object
-	$post = get_post( $item_id );
-	if ( null === $post ) {
-		return array();
-	}
-
-	if ( "entity" === $post->post_type ) {
-		if ( $results = wl_core_get_posts( array(
-			'get'            => $get,
-			'post_type'      => 'post',
-			'post_status'    => $post_status,
-			'related_to'     => $item_id,
-			'as'             => 'subject',
-			'with_predicate' => $predicate,
-		) )
-		) {
-			return $results;
-		}
-	} else {
-		if ( $results = wl_core_get_posts( array(
-			'get'            => $get,
-			'post_type'      => 'post',
-			'post_status'    => $post_status,
-			'post__not_in'   => array( $item_id ),
-			'related_to__in' => wl_core_get_related_entity_ids( $post->ID ),
-			'as'             => 'subject',
-			'with_predicate' => $predicate,
-		) )
-		) {
-			return $results;
-		}
-	}
-
-	// If wl_core_get_posts return false then an empty array is returned
-	return array();
+    // Retrieve the post object
+    $post = get_post( $item_id );
+    if ( null === $post ) {
+        return array();
+    }
+
+    if ( "entity" === $post->post_type ) {
+        if ( $results = wl_core_get_posts( array(
+            'get'            => $get,
+            'post_type'      => 'post',
+            'post_status'    => $post_status,
+            'related_to'     => $item_id,
+            'as'             => 'subject',
+            'with_predicate' => $predicate,
+        ) )
+        ) {
+            return $results;
+        }
+    } else {
+        if ( $results = wl_core_get_posts( array(
+            'get'            => $get,
+            'post_type'      => 'post',
+            'post_status'    => $post_status,
+            'post__not_in'   => array( $item_id ),
+            'related_to__in' => wl_core_get_related_entity_ids( $post->ID ),
+            'as'             => 'subject',
+            'with_predicate' => $predicate,
+        ) )
+        ) {
+            return $results;
+        }
+    }
+
+    // If wl_core_get_posts return false then an empty array is returned
+    return array();
 }
 
 /**
@@ -417,75 +417,75 @@ 
  */
 function wl_core_sql_query_builder( $args ) {
 
-	// Prepare interaction with db
-	global $wpdb;
-	// Retrieve Wordlift relation instances table name
-	$table_name = wl_core_get_relation_instances_table_name();
-
-	// Sql Action
-	$sql = "SELECT ";
-	// Determine what has to be returned depending on 'get' argument value
-	switch ( $args['get'] ) {
-		case 'posts':
-			$sql .= "p.*";
-			break;
-		case 'post_ids':
-			$sql .= "p.id";
-			break;
-	}
-
-	// If we look for posts related as objects the JOIN has to be done with the object_id column and viceversa
-	$join_column = $args['as'] . "_id";
-
-	$sql .= " FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.$join_column";
-
-	// Sql add post type filter
-	$sql .= $wpdb->prepare( " AND p.post_type = %s AND", $args['post_type'] );
-
-	// Sql add post status filter
-	if ( isset( $args['post_status'] ) && ! is_null( $args['post_status'] ) ) {
-		$sql .= $wpdb->prepare( " p.post_status = %s AND", $args['post_status'] );
-	}
-
-	// Add filtering conditions
-	// If we look for posts related as objects this means that
-	// related_to is a reference for a subject: subject_id is the filtering column
-	// If we look for posts related as subject this means that
-	// related_to is reference for an object: object_id is the filtering column
-
-	$filtering_column = ( 'object' == $args['as'] ) ? "subject_id" : "object_id";
-
-	if ( isset( $args['related_to'] ) ) {
-		$sql .= $wpdb->prepare( " r.$filtering_column = %d", $args['related_to'] );
-	}
-	if ( isset( $args['related_to'] ) && isset( $args['related_to__in'] ) ) {
-		$sql .= " AND";
-	}
-	if ( isset( $args['related_to__in'] ) ) {
-		$sql .= " r.$filtering_column IN (" . implode( ",", $args['related_to__in'] ) . ")";
-	}
-	if ( isset( $args['post__not_in'] ) ) {
-		$sql .= " AND r." . $args['as'] . "_id NOT IN (" . implode( ",", $args['post__not_in'] ) . ")";
-	}
-	if ( isset( $args['post__in'] ) ) {
-		$sql .= " AND r." . $args['as'] . "_id IN (" . implode( ",", $args['post__in'] ) . ")";
-	}
-	// Add predicate filter if required
-	if ( isset( $args['with_predicate'] ) ) {
-		// Sql Inner Join clausole
-		$sql .= $wpdb->prepare( " AND r.predicate = %s", $args['with_predicate'] );
-	}
-	// Add a group by clousole to avoid duplicated rows
-	$sql .= " GROUP BY p.id";
-
-	if ( isset( $args['first'] ) && is_numeric( $args['first'] ) ) {
-		// Sql Inner Join clausole
-		$sql .= $wpdb->prepare( " LIMIT %d", $args['first'] );
-	}
-	// Close sql statement
-	$sql .= ";";
-
-	return $sql;
+    // Prepare interaction with db
+    global $wpdb;
+    // Retrieve Wordlift relation instances table name
+    $table_name = wl_core_get_relation_instances_table_name();
+
+    // Sql Action
+    $sql = "SELECT ";
+    // Determine what has to be returned depending on 'get' argument value
+    switch ( $args['get'] ) {
+        case 'posts':
+            $sql .= "p.*";
+            break;
+        case 'post_ids':
+            $sql .= "p.id";
+            break;
+    }
+
+    // If we look for posts related as objects the JOIN has to be done with the object_id column and viceversa
+    $join_column = $args['as'] . "_id";
+
+    $sql .= " FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.$join_column";
+
+    // Sql add post type filter
+    $sql .= $wpdb->prepare( " AND p.post_type = %s AND", $args['post_type'] );
+
+    // Sql add post status filter
+    if ( isset( $args['post_status'] ) && ! is_null( $args['post_status'] ) ) {
+        $sql .= $wpdb->prepare( " p.post_status = %s AND", $args['post_status'] );
+    }
+
+    // Add filtering conditions
+    // If we look for posts related as objects this means that
+    // related_to is a reference for a subject: subject_id is the filtering column
+    // If we look for posts related as subject this means that
+    // related_to is reference for an object: object_id is the filtering column
+
+    $filtering_column = ( 'object' == $args['as'] ) ? "subject_id" : "object_id";
+
+    if ( isset( $args['related_to'] ) ) {
+        $sql .= $wpdb->prepare( " r.$filtering_column = %d", $args['related_to'] );
+    }
+    if ( isset( $args['related_to'] ) && isset( $args['related_to__in'] ) ) {
+        $sql .= " AND";
+    }
+    if ( isset( $args['related_to__in'] ) ) {
+        $sql .= " r.$filtering_column IN (" . implode( ",", $args['related_to__in'] ) . ")";
+    }
+    if ( isset( $args['post__not_in'] ) ) {
+        $sql .= " AND r." . $args['as'] . "_id NOT IN (" . implode( ",", $args['post__not_in'] ) . ")";
+    }
+    if ( isset( $args['post__in'] ) ) {
+        $sql .= " AND r." . $args['as'] . "_id IN (" . implode( ",", $args['post__in'] ) . ")";
+    }
+    // Add predicate filter if required
+    if ( isset( $args['with_predicate'] ) ) {
+        // Sql Inner Join clausole
+        $sql .= $wpdb->prepare( " AND r.predicate = %s", $args['with_predicate'] );
+    }
+    // Add a group by clousole to avoid duplicated rows
+    $sql .= " GROUP BY p.id";
+
+    if ( isset( $args['first'] ) && is_numeric( $args['first'] ) ) {
+        // Sql Inner Join clausole
+        $sql .= $wpdb->prepare( " LIMIT %d", $args['first'] );
+    }
+    // Close sql statement
+    $sql .= ";";
+
+    return $sql;
 
 }
 
@@ -501,72 +501,72 @@ 
  */
 function wl_core_get_posts( $args, $returned_type = OBJECT ) {
 
-	// Merge given args with defaults args value
-	$args = array_merge( array(
-		'with_predicate' => null,
-		'as'             => 'subject',
-		'post_type'      => 'post',
-		'get'            => 'posts',
-		'post_status'    => null,
-	), $args );
-
-	// Arguments validation rules
-	// At least one between related_to and related_to__in has to be set
-	if ( ! isset( $args['related_to'] ) && ! isset( $args['related_to__in'] ) ) {
-		return false;
-	}
-	if ( isset( $args['related_to'] ) && ! is_numeric( $args['related_to'] ) ) {
-		return false;
-	}
-
-	// The same check is applied to post_in, post__not_in and related_to__in options
-	// Only arrays with at least one numeric value are considerad valid
-	// The argument value is further sanitized in order to clean up not numeric values
-	foreach (
-		array(
-			'post__in',
-			'post__not_in',
-			'related_to__in',
-		) as $option_name
-	) {
-		if ( isset( $args[ $option_name ] ) ) {
-			if ( ! is_array( $args[ $option_name ] ) || 0 == count( array_filter( $args[ $option_name ], "is_numeric" ) ) ) {
-				return false;
-			}
-			// Sanitize value removing non numeric values from the array
-			$args[ $option_name ] = array_filter( $args[ $option_name ], "is_numeric" );
-		}
-	}
-	// Performing validation rules
-	foreach ( wl_core_get_validation_rules() as $option_name => $accepeted_values ) {
-		if ( isset( $args[ $option_name ] ) && ! is_null( $args[ $option_name ] ) ) {
-			if ( ! in_array( $args[ $option_name ], $accepeted_values ) ) {
-				return false;
-			}
-		}
-	}
-
-	// Prepare interaction with db
-	global $wpdb;
-	// Build sql statement with given arguments
-	$sql_statement = wl_core_sql_query_builder( $args );
-
-	// wl_write_log( "Going to execute sql statement: $sql_statement " );
-	// $results = array();
-
-	// If ids are required, returns a one-dimensional array containing ids.
-	// Otherwise an array of associative arrays representing the post | relation object
-	if ( 'post_ids' == $args['get'] ) {
-		# See https://codex.wordpress.org/Class_Reference/wpdb#SELECT_a_Column
-		$results = $wpdb->get_col( $sql_statement );
-	} else {
-		$results = $wpdb->get_results( $sql_statement, $returned_type );
-	}
-	// If there were an error performing the query then false is returned
-	if ( ! empty( $wpdb->last_error ) ) {
-		return false;
-	}
-
-	// Finally
-	return $results;
+    // Merge given args with defaults args value
+    $args = array_merge( array(
+        'with_predicate' => null,
+        'as'             => 'subject',
+        'post_type'      => 'post',
+        'get'            => 'posts',
+        'post_status'    => null,
+    ), $args );
+
+    // Arguments validation rules
+    // At least one between related_to and related_to__in has to be set
+    if ( ! isset( $args['related_to'] ) && ! isset( $args['related_to__in'] ) ) {
+        return false;
+    }
+    if ( isset( $args['related_to'] ) && ! is_numeric( $args['related_to'] ) ) {
+        return false;
+    }
+
+    // The same check is applied to post_in, post__not_in and related_to__in options
+    // Only arrays with at least one numeric value are considerad valid
+    // The argument value is further sanitized in order to clean up not numeric values
+    foreach (
+        array(
+            'post__in',
+            'post__not_in',
+            'related_to__in',
+        ) as $option_name
+    ) {
+        if ( isset( $args[ $option_name ] ) ) {
+            if ( ! is_array( $args[ $option_name ] ) || 0 == count( array_filter( $args[ $option_name ], "is_numeric" ) ) ) {
+                return false;
+            }
+            // Sanitize value removing non numeric values from the array
+            $args[ $option_name ] = array_filter( $args[ $option_name ], "is_numeric" );
+        }
+    }
+    // Performing validation rules
+    foreach ( wl_core_get_validation_rules() as $option_name => $accepeted_values ) {
+        if ( isset( $args[ $option_name ] ) && ! is_null( $args[ $option_name ] ) ) {
+            if ( ! in_array( $args[ $option_name ], $accepeted_values ) ) {
+                return false;
+            }
+        }
+    }
+
+    // Prepare interaction with db
+    global $wpdb;
+    // Build sql statement with given arguments
+    $sql_statement = wl_core_sql_query_builder( $args );
+
+    // wl_write_log( "Going to execute sql statement: $sql_statement " );
+    // $results = array();
+
+    // If ids are required, returns a one-dimensional array containing ids.
+    // Otherwise an array of associative arrays representing the post | relation object
+    if ( 'post_ids' == $args['get'] ) {
+        # See https://codex.wordpress.org/Class_Reference/wpdb#SELECT_a_Column
+        $results = $wpdb->get_col( $sql_statement );
+    } else {
+        $results = $wpdb->get_results( $sql_statement, $returned_type );
+    }
+    // If there were an error performing the query then false is returned
+    if ( ! empty( $wpdb->last_error ) ) {
+        return false;
+    }
+
+    // Finally
+    return $results;
 }

Spacing +88 added lines, -88 removed lines

@@ -7,14 +7,14 @@ 
  *
  * @return boolean Return true if supported, false otherwise
  */
-function wl_core_check_relation_predicate_is_supported( $predicate ) {
+function wl_core_check_relation_predicate_is_supported($predicate) {
 
-	return in_array( $predicate, array(
+	return in_array($predicate, array(
 		WL_WHAT_RELATION,
 		WL_WHEN_RELATION,
 		WL_WHERE_RELATION,
 		WL_WHO_RELATION,
-	) );
+	));
 }
 
 /**
@@ -24,7 +24,7 @@ 
  */
 function wl_core_get_validation_rules() {
 
-	return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
+	return unserialize(WL_CORE_GET_POSTS_VALIDATION_RULES);
 }
 
 /**
@@ -35,7 +35,7 @@ 
 function wl_core_get_relation_instances_table_name() {
 
 	global $wpdb;
-	$table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+	$table_name = $wpdb->prefix.WL_DB_RELATION_INSTANCES_TABLE_NAME;
 
 	return $table_name;
 }
@@ -50,15 +50,15 @@ 
  * @uses   $wpdb->replace() to perform the query
  * @return (integer|boolean) Return then relation instance ID or false
  */
-function wl_core_add_relation_instance( $subject_id, $predicate, $object_id ) {
+function wl_core_add_relation_instance($subject_id, $predicate, $object_id) {
 
 	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) || ! is_numeric( $object_id ) ) {
+	if ( ! is_numeric($subject_id) || ! is_numeric($object_id)) {
 		return false;
 	}
 
 	// Checks on the given relation
-	if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+	if ( ! wl_core_check_relation_predicate_is_supported($predicate)) {
 		return false;
 	}
 
@@ -74,7 +74,7 @@ 
 			'predicate'  => $predicate,
 			'object_id'  => $object_id,
 		),
-		array( '%d', '%s', '%d' )
+		array('%d', '%s', '%d')
 	);
 
 	// Return record id
@@ -91,22 +91,22 @@ 
  *
  * @return (boolean) False for failure. True for success.
  */
-function wl_core_delete_relation_instance( $subject_id, $predicate, $object_id ) {
+function wl_core_delete_relation_instance($subject_id, $predicate, $object_id) {
 
 	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) || ! is_numeric( $object_id ) ) {
+	if ( ! is_numeric($subject_id) || ! is_numeric($object_id)) {
 		return false;
 	}
 
 	// Checks on the given relation
-	if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+	if ( ! wl_core_check_relation_predicate_is_supported($predicate)) {
 		return false;
 	}
 
 	// Prepare interaction with db
 	global $wpdb;
 
-	wl_write_log( "Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]" );
+	wl_write_log("Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]");
 
 	// @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
 	$wpdb->delete(
@@ -116,7 +116,7 @@ 
 			'predicate'  => $predicate,
 			'object_id'  => $object_id,
 		),
-		array( '%d', '%s', '%d' )
+		array('%d', '%s', '%d')
 	);
 
 	return true;
@@ -132,27 +132,27 @@ 
  *
  * @return (integer|boolean) Return the relation instances IDs or false
  */
-function wl_core_add_relation_instances( $subject_id, $predicate, $object_ids ) {
+function wl_core_add_relation_instances($subject_id, $predicate, $object_ids) {
 
 	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) ) {
+	if ( ! is_numeric($subject_id)) {
 		return false;
 	}
 
 	// Checks on the given relation
-	if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+	if ( ! wl_core_check_relation_predicate_is_supported($predicate)) {
 		return false;
 	}
 
 	// Check $object_ids is an array
-	if ( ! is_array( $object_ids ) || empty( $object_ids ) ) {
+	if ( ! is_array($object_ids) || empty($object_ids)) {
 		return false;
 	}
 
 	// Call method to check and add each single relation
 	$inserted_records_ids = array();
-	foreach ( $object_ids as $object_id ) {
-		$new_record_id          = wl_core_add_relation_instance( $subject_id, $predicate, $object_id );
+	foreach ($object_ids as $object_id) {
+		$new_record_id          = wl_core_add_relation_instance($subject_id, $predicate, $object_id);
 		$inserted_records_ids[] = $new_record_id;
 	}
 
@@ -167,10 +167,10 @@ 
  *
  * @return (boolean) False for failure. True for success.
  */
-function wl_core_delete_relation_instances( $subject_id ) {
+function wl_core_delete_relation_instances($subject_id) {
 
 	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) ) {
+	if ( ! is_numeric($subject_id)) {
 		return false;
 	}
 
@@ -185,7 +185,7 @@ 
 		array(
 			'subject_id' => $subject_id,
 		),
-		array( '%d' )
+		array('%d')
 	);
 
 	return true;
@@ -202,16 +202,16 @@ 
  *      'status'    => null
  *  );
  */
-function wl_core_validate_filters_for_related( $filters ) {
+function wl_core_validate_filters_for_related($filters) {
 
-	if ( ! is_array( $filters ) ) {
+	if ( ! is_array($filters)) {
 		$filters = array();
 	}
 
-	if ( ! isset( $filters['predicate'] ) ) {
+	if ( ! isset($filters['predicate'])) {
 		$filters['predicate'] = null;
 	}
-	if ( ! isset( $filters['status'] ) ) {
+	if ( ! isset($filters['status'])) {
 		$filters['status'] = null;
 	}
 
@@ -234,11 +234,11 @@ 
  *
  * @return array Array of post entity objects.
  */
-function wl_core_get_related_entities( $subject_id, $filters = array() ) {
+function wl_core_get_related_entities($subject_id, $filters = array()) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+	$filters = wl_core_validate_filters_for_related($filters);
 
-	return wl_core_inner_get_related_entities( "posts", $subject_id, $filters['predicate'], $filters['status'] );
+	return wl_core_inner_get_related_entities("posts", $subject_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -257,11 +257,11 @@ 
  *
  * @return array Array of post entity objects.
  */
-function wl_core_get_related_entity_ids( $subject_id, $filters = array() ) {
+function wl_core_get_related_entity_ids($subject_id, $filters = array()) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+	$filters = wl_core_validate_filters_for_related($filters);
 
-	return wl_core_inner_get_related_entities( "post_ids", $subject_id, $filters['predicate'], $filters['status'] );
+	return wl_core_inner_get_related_entities("post_ids", $subject_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -276,16 +276,16 @@ 
  *
  * @return array Array of ids.
  */
-function wl_core_inner_get_related_entities( $get, $item_id, $predicate = null, $post_status = null ) {
+function wl_core_inner_get_related_entities($get, $item_id, $predicate = null, $post_status = null) {
 
-	if ( $results = wl_core_get_posts( array(
+	if ($results = wl_core_get_posts(array(
 		'get'            => $get,
 		'post_type'      => 'entity',
 		'post_status'    => $post_status,
 		'related_to'     => $item_id,
 		'as'             => 'object',
 		'with_predicate' => $predicate,
-	) )
+	))
 	) {
 		return $results;
 	}
@@ -310,11 +310,11 @@ 
  *
  * @return array Array of objects.
  */
-function wl_core_get_related_posts( $object_id, $filters = array() ) {
+function wl_core_get_related_posts($object_id, $filters = array()) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+	$filters = wl_core_validate_filters_for_related($filters);
 
-	return wl_core_inner_get_related_posts( "posts", $object_id, $filters['predicate'], $filters['status'] );
+	return wl_core_inner_get_related_posts("posts", $object_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -333,11 +333,11 @@ 
  *
  * @return array Array of objects.
  */
-function wl_core_get_related_post_ids( $object_id, $filters = array() ) {
+function wl_core_get_related_post_ids($object_id, $filters = array()) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+	$filters = wl_core_validate_filters_for_related($filters);
 
-	return wl_core_inner_get_related_posts( "post_ids", $object_id, $filters['predicate'], $filters['status'] );
+	return wl_core_inner_get_related_posts("post_ids", $object_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -351,36 +351,36 @@ 
  *
  * @return array Array of objects.
  */
-function wl_core_inner_get_related_posts( $get, $item_id, $predicate = null, $post_status = null ) {
+function wl_core_inner_get_related_posts($get, $item_id, $predicate = null, $post_status = null) {
 
 	// Retrieve the post object
-	$post = get_post( $item_id );
-	if ( null === $post ) {
+	$post = get_post($item_id);
+	if (null === $post) {
 		return array();
 	}
 
-	if ( "entity" === $post->post_type ) {
-		if ( $results = wl_core_get_posts( array(
+	if ("entity" === $post->post_type) {
+		if ($results = wl_core_get_posts(array(
 			'get'            => $get,
 			'post_type'      => 'post',
 			'post_status'    => $post_status,
 			'related_to'     => $item_id,
 			'as'             => 'subject',
 			'with_predicate' => $predicate,
-		) )
+		))
 		) {
 			return $results;
 		}
 	} else {
-		if ( $results = wl_core_get_posts( array(
+		if ($results = wl_core_get_posts(array(
 			'get'            => $get,
 			'post_type'      => 'post',
 			'post_status'    => $post_status,
-			'post__not_in'   => array( $item_id ),
-			'related_to__in' => wl_core_get_related_entity_ids( $post->ID ),
+			'post__not_in'   => array($item_id),
+			'related_to__in' => wl_core_get_related_entity_ids($post->ID),
 			'as'             => 'subject',
 			'with_predicate' => $predicate,
-		) )
+		))
 		) {
 			return $results;
 		}
@@ -415,7 +415,7 @@ 
  *
  * @return string | false String representing a sql statement, or false in case of error
  */
-function wl_core_sql_query_builder( $args ) {
+function wl_core_sql_query_builder($args) {
 
 	// Prepare interaction with db
 	global $wpdb;
@@ -425,7 +425,7 @@ 
 	// Sql Action
 	$sql = "SELECT ";
 	// Determine what has to be returned depending on 'get' argument value
-	switch ( $args['get'] ) {
+	switch ($args['get']) {
 		case 'posts':
 			$sql .= "p.*";
 			break;
@@ -435,16 +435,16 @@ 
 	}
 
 	// If we look for posts related as objects the JOIN has to be done with the object_id column and viceversa
-	$join_column = $args['as'] . "_id";
+	$join_column = $args['as']."_id";
 
 	$sql .= " FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.$join_column";
 
 	// Sql add post type filter
-	$sql .= $wpdb->prepare( " AND p.post_type = %s AND", $args['post_type'] );
+	$sql .= $wpdb->prepare(" AND p.post_type = %s AND", $args['post_type']);
 
 	// Sql add post status filter
-	if ( isset( $args['post_status'] ) && ! is_null( $args['post_status'] ) ) {
-		$sql .= $wpdb->prepare( " p.post_status = %s AND", $args['post_status'] );
+	if (isset($args['post_status']) && ! is_null($args['post_status'])) {
+		$sql .= $wpdb->prepare(" p.post_status = %s AND", $args['post_status']);
 	}
 
 	// Add filtering conditions
@@ -453,34 +453,34 @@ 
 	// If we look for posts related as subject this means that
 	// related_to is reference for an object: object_id is the filtering column
 
-	$filtering_column = ( 'object' == $args['as'] ) ? "subject_id" : "object_id";
+	$filtering_column = ('object' == $args['as']) ? "subject_id" : "object_id";
 
-	if ( isset( $args['related_to'] ) ) {
-		$sql .= $wpdb->prepare( " r.$filtering_column = %d", $args['related_to'] );
+	if (isset($args['related_to'])) {
+		$sql .= $wpdb->prepare(" r.$filtering_column = %d", $args['related_to']);
 	}
-	if ( isset( $args['related_to'] ) && isset( $args['related_to__in'] ) ) {
+	if (isset($args['related_to']) && isset($args['related_to__in'])) {
 		$sql .= " AND";
 	}
-	if ( isset( $args['related_to__in'] ) ) {
-		$sql .= " r.$filtering_column IN (" . implode( ",", $args['related_to__in'] ) . ")";
+	if (isset($args['related_to__in'])) {
+		$sql .= " r.$filtering_column IN (".implode(",", $args['related_to__in']).")";
 	}
-	if ( isset( $args['post__not_in'] ) ) {
-		$sql .= " AND r." . $args['as'] . "_id NOT IN (" . implode( ",", $args['post__not_in'] ) . ")";
+	if (isset($args['post__not_in'])) {
+		$sql .= " AND r.".$args['as']."_id NOT IN (".implode(",", $args['post__not_in']).")";
 	}
-	if ( isset( $args['post__in'] ) ) {
-		$sql .= " AND r." . $args['as'] . "_id IN (" . implode( ",", $args['post__in'] ) . ")";
+	if (isset($args['post__in'])) {
+		$sql .= " AND r.".$args['as']."_id IN (".implode(",", $args['post__in']).")";
 	}
 	// Add predicate filter if required
-	if ( isset( $args['with_predicate'] ) ) {
+	if (isset($args['with_predicate'])) {
 		// Sql Inner Join clausole
-		$sql .= $wpdb->prepare( " AND r.predicate = %s", $args['with_predicate'] );
+		$sql .= $wpdb->prepare(" AND r.predicate = %s", $args['with_predicate']);
 	}
 	// Add a group by clousole to avoid duplicated rows
 	$sql .= " GROUP BY p.id";
 
-	if ( isset( $args['first'] ) && is_numeric( $args['first'] ) ) {
+	if (isset($args['first']) && is_numeric($args['first'])) {
 		// Sql Inner Join clausole
-		$sql .= $wpdb->prepare( " LIMIT %d", $args['first'] );
+		$sql .= $wpdb->prepare(" LIMIT %d", $args['first']);
 	}
 	// Close sql statement
 	$sql .= ";";
@@ -499,23 +499,23 @@ 
  *
  * @return array|false List of WP_Post objects or list of WP_Post ids. False in case of error or invalid params
  */
-function wl_core_get_posts( $args, $returned_type = OBJECT ) {
+function wl_core_get_posts($args, $returned_type = OBJECT) {
 
 	// Merge given args with defaults args value
-	$args = array_merge( array(
+	$args = array_merge(array(
 		'with_predicate' => null,
 		'as'             => 'subject',
 		'post_type'      => 'post',
 		'get'            => 'posts',
 		'post_status'    => null,
-	), $args );
+	), $args);
 
 	// Arguments validation rules
 	// At least one between related_to and related_to__in has to be set
-	if ( ! isset( $args['related_to'] ) && ! isset( $args['related_to__in'] ) ) {
+	if ( ! isset($args['related_to']) && ! isset($args['related_to__in'])) {
 		return false;
 	}
-	if ( isset( $args['related_to'] ) && ! is_numeric( $args['related_to'] ) ) {
+	if (isset($args['related_to']) && ! is_numeric($args['related_to'])) {
 		return false;
 	}
 
@@ -529,18 +529,18 @@ 
 			'related_to__in',
 		) as $option_name
 	) {
-		if ( isset( $args[ $option_name ] ) ) {
-			if ( ! is_array( $args[ $option_name ] ) || 0 == count( array_filter( $args[ $option_name ], "is_numeric" ) ) ) {
+		if (isset($args[$option_name])) {
+			if ( ! is_array($args[$option_name]) || 0 == count(array_filter($args[$option_name], "is_numeric"))) {
 				return false;
 			}
 			// Sanitize value removing non numeric values from the array
-			$args[ $option_name ] = array_filter( $args[ $option_name ], "is_numeric" );
+			$args[$option_name] = array_filter($args[$option_name], "is_numeric");
 		}
 	}
 	// Performing validation rules
-	foreach ( wl_core_get_validation_rules() as $option_name => $accepeted_values ) {
-		if ( isset( $args[ $option_name ] ) && ! is_null( $args[ $option_name ] ) ) {
-			if ( ! in_array( $args[ $option_name ], $accepeted_values ) ) {
+	foreach (wl_core_get_validation_rules() as $option_name => $accepeted_values) {
+		if (isset($args[$option_name]) && ! is_null($args[$option_name])) {
+			if ( ! in_array($args[$option_name], $accepeted_values)) {
 				return false;
 			}
 		}
@@ -549,21 +549,21 @@ 
 	// Prepare interaction with db
 	global $wpdb;
 	// Build sql statement with given arguments
-	$sql_statement = wl_core_sql_query_builder( $args );
+	$sql_statement = wl_core_sql_query_builder($args);
 
 	// wl_write_log( "Going to execute sql statement: $sql_statement " );
 	// $results = array();
 
 	// If ids are required, returns a one-dimensional array containing ids.
 	// Otherwise an array of associative arrays representing the post | relation object
-	if ( 'post_ids' == $args['get'] ) {
+	if ('post_ids' == $args['get']) {
 		# See https://codex.wordpress.org/Class_Reference/wpdb#SELECT_a_Column
-		$results = $wpdb->get_col( $sql_statement );
+		$results = $wpdb->get_col($sql_statement);
 	} else {
-		$results = $wpdb->get_results( $sql_statement, $returned_type );
+		$results = $wpdb->get_results($sql_statement, $returned_type);
 	}
 	// If there were an error performing the query then false is returned
-	if ( ! empty( $wpdb->last_error ) ) {
+	if ( ! empty($wpdb->last_error)) {
 		return false;
 	}