insideout10 / wordlift-plugin

src/admin/WL_Metabox/WL_Metabox_Field_coordinates.php

Indentation +62 added lines, -62 removed lines

@@ -3,51 +3,51 @@ 
 
 class WL_Metabox_Field_coordinates extends WL_Metabox_Field {
 
-	public function __construct( $args ) {
+    public function __construct( $args ) {
 
-		// Just set up the necessary info without calling the parent constructor.
-		// TODO: write a parent class for grouped properties
+        // Just set up the necessary info without calling the parent constructor.
+        // TODO: write a parent class for grouped properties
 
-		// we use 'coordinates' to namespace the Field in $_POST data.
-		// In  the DB the correct meta names will be used.
-		$this->meta_name = 'coordinates';
-	}
+        // we use 'coordinates' to namespace the Field in $_POST data.
+        // In  the DB the correct meta names will be used.
+        $this->meta_name = 'coordinates';
+    }
 
-	public function get_data() {
-		$entity_id  = get_the_ID();
-		$this->data = wl_get_coordinates( $entity_id );
-	}
+    public function get_data() {
+        $entity_id  = get_the_ID();
+        $this->data = wl_get_coordinates( $entity_id );
+    }
 
-	public function html() {
+    public function html() {
 
-		// Open main <div> for the Field
-		$html = $this->html_wrapper_open();
+        // Open main <div> for the Field
+        $html = $this->html_wrapper_open();
 
-		// Label
-		$html .= '<h3>coordinates</h3>';
+        // Label
+        $html .= '<h3>coordinates</h3>';
 
-		// print nonce
-		$html .= $this->html_nonce();
+        // print nonce
+        $html .= $this->html_nonce();
 
-		// Get coordinates
-		$data        = $this->data;
-		// TODO: We temporary use here 0,0 as default coordinates for the marker, but if no coordinates are given we
-		// want to use the current user location for the marker.
-		$coordinates = ( ! empty( $data['latitude'] ) && ! empty( $data['longitude'] ) ? sprintf( '[%f,%f]', $data['latitude'], $data['longitude'] ) : '[0,0]' );
-		$map_init    = '[0,0]' === $coordinates
-			? 'locate( {setView: true, maxZoom: 16} )'
-			: sprintf( "setView( [%f,%f], 9 )", $data['latitude'], $data['longitude'] );
+        // Get coordinates
+        $data        = $this->data;
+        // TODO: We temporary use here 0,0 as default coordinates for the marker, but if no coordinates are given we
+        // want to use the current user location for the marker.
+        $coordinates = ( ! empty( $data['latitude'] ) && ! empty( $data['longitude'] ) ? sprintf( '[%f,%f]', $data['latitude'], $data['longitude'] ) : '[0,0]' );
+        $map_init    = '[0,0]' === $coordinates
+            ? 'locate( {setView: true, maxZoom: 16} )'
+            : sprintf( "setView( [%f,%f], 9 )", $data['latitude'], $data['longitude'] );
 
-		// Print input fields
-		$html .= '<label for="wl_place_lat">' . __( 'Latitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="' . $data['latitude'] . '" style="width:100%" />';
+        // Print input fields
+        $html .= '<label for="wl_place_lat">' . __( 'Latitude', 'wordlift' ) . '</label>';
+        $html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="' . $data['latitude'] . '" style="width:100%" />';
 
-		$html .= '<label for="wl_place_lon">' . __( 'Longitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="' . $data['longitude'] . '" style="width:100%" />';
+        $html .= '<label for="wl_place_lon">' . __( 'Longitude', 'wordlift' ) . '</label>';
+        $html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="' . $data['longitude'] . '" style="width:100%" />';
 
-		// Show Leaflet map to pick coordinates
-		$element_id = uniqid( 'wl-geo-map-' );
-		$html .= <<<EOF
+        // Show Leaflet map to pick coordinates
+        $element_id = uniqid( 'wl-geo-map-' );
+        $html .= <<<EOF
 
 <div id="$element_id"></div>
 
@@ -79,44 +79,44 @@ 
 EOF;
 
 
-		$html .= $this->html_wrapper_close();
+        $html .= $this->html_wrapper_close();
 
-		return $html;
-	}
+        return $html;
+    }
 
-	public function save_data( $coords ) {
+    public function save_data( $coords ) {
 
-		$this->sanitize_data( $coords );
+        $this->sanitize_data( $coords );
 
-		$entity_id = get_the_ID();
+        $entity_id = get_the_ID();
 
-		// Take away old values
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE );
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE );
+        // Take away old values
+        delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE );
+        delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE );
 
-		$latitude  = $this->data[0];
-		$longitude = $this->data[1];
+        $latitude  = $this->data[0];
+        $longitude = $this->data[1];
 
-		// insert new coordinate values
-		if ( ! empty( $latitude ) && ! empty( $longitude ) ) {
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true );
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true );
-		}
+        // insert new coordinate values
+        if ( ! empty( $latitude ) && ! empty( $longitude ) ) {
+            add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true );
+            add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true );
+        }
 
-	}
+    }
 
-	/**
-	 * Only accept float numbers
-	 */
-	public function sanitize_data_filter( $value ) {
+    /**
+     * Only accept float numbers
+     */
+    public function sanitize_data_filter( $value ) {
 
-		// DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
-		// "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-		if ( ! is_numeric( $value ) ) {
-			return '';
-		}
+        // DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
+        // "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
+        if ( ! is_numeric( $value ) ) {
+            return '';
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 }
 

Spacing +18 added lines, -18 removed lines

@@ -3,7 +3,7 @@ 
 
 class WL_Metabox_Field_coordinates extends WL_Metabox_Field {
 
-	public function __construct( $args ) {
+	public function __construct($args) {
 
 		// Just set up the necessary info without calling the parent constructor.
 		// TODO: write a parent class for grouped properties
@@ -15,7 +15,7 @@ 
 
 	public function get_data() {
 		$entity_id  = get_the_ID();
-		$this->data = wl_get_coordinates( $entity_id );
+		$this->data = wl_get_coordinates($entity_id);
 	}
 
 	public function html() {
@@ -33,20 +33,20 @@ 
 		$data        = $this->data;
 		// TODO: We temporary use here 0,0 as default coordinates for the marker, but if no coordinates are given we
 		// want to use the current user location for the marker.
-		$coordinates = ( ! empty( $data['latitude'] ) && ! empty( $data['longitude'] ) ? sprintf( '[%f,%f]', $data['latitude'], $data['longitude'] ) : '[0,0]' );
+		$coordinates = ( ! empty($data['latitude']) && ! empty($data['longitude']) ? sprintf('[%f,%f]', $data['latitude'], $data['longitude']) : '[0,0]');
 		$map_init    = '[0,0]' === $coordinates
 			? 'locate( {setView: true, maxZoom: 16} )'
-			: sprintf( "setView( [%f,%f], 9 )", $data['latitude'], $data['longitude'] );
+			: sprintf("setView( [%f,%f], 9 )", $data['latitude'], $data['longitude']);
 
 		// Print input fields
-		$html .= '<label for="wl_place_lat">' . __( 'Latitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="' . $data['latitude'] . '" style="width:100%" />';
+		$html .= '<label for="wl_place_lat">'.__('Latitude', 'wordlift').'</label>';
+		$html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="'.$data['latitude'].'" style="width:100%" />';
 
-		$html .= '<label for="wl_place_lon">' . __( 'Longitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="' . $data['longitude'] . '" style="width:100%" />';
+		$html .= '<label for="wl_place_lon">'.__('Longitude', 'wordlift').'</label>';
+		$html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="'.$data['longitude'].'" style="width:100%" />';
 
 		// Show Leaflet map to pick coordinates
-		$element_id = uniqid( 'wl-geo-map-' );
+		$element_id = uniqid('wl-geo-map-');
 		$html .= <<<EOF
 
 <div id="$element_id"></div>
@@ -84,23 +84,23 @@ 
 		return $html;
 	}
 
-	public function save_data( $coords ) {
+	public function save_data($coords) {
 
-		$this->sanitize_data( $coords );
+		$this->sanitize_data($coords);
 
 		$entity_id = get_the_ID();
 
 		// Take away old values
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE );
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE );
+		delete_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE);
+		delete_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE);
 
 		$latitude  = $this->data[0];
 		$longitude = $this->data[1];
 
 		// insert new coordinate values
-		if ( ! empty( $latitude ) && ! empty( $longitude ) ) {
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true );
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true );
+		if ( ! empty($latitude) && ! empty($longitude)) {
+			add_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true);
+			add_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true);
 		}
 
 	}
@@ -108,11 +108,11 @@ 
 	/**
 	 * Only accept float numbers
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
 		// DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
 		// "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-		if ( ! is_numeric( $value ) ) {
+		if ( ! is_numeric($value)) {
 			return '';
 		}
 

src/public/class-wordlift-geomap-shortcode.php

Indentation +87 added lines, -87 removed lines

@@ -18,98 +18,98 @@
  */
 class Wordlift_Geomap_Shortcode extends Wordlift_Shortcode {
 
-	const SHORTCODE = 'wl_geomap';
-
-	/**
-	 * Create a {@link Wordlift_Geomap_Shortcode} instance.
-	 *
-	 * @since 3.5.4
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
-		// rendering.
-		add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css', ) );
-
-	}
-
-	/**
-	 * Render the shortcode.
-	 *
-	 * @param array $atts An array of shortcode attributes as set by the editor.
-	 *
-	 * @return string The output html code.
-	 * @since 3.5.4
-	 *
-	 */
-	public function render( $atts ) {
-
-		// Extract attributes and set default values.
-		$geomap_atts = shortcode_atts( array(
-			'width'  => '100%',
-			'height' => '300px',
-			'global' => false,
-		), $atts );
-
-		// Get id of the post
-		$post_id = get_the_ID();
-
-		if ( $geomap_atts['global'] || is_null( $post_id ) ) {
-			// Global geomap
-			$geomap_id = 'wl_geomap_global';
-			$post_id   = null;
-		} else {
-			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
-		}
-
-		wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
-		wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true );
-
-		// Use the registered style which define an optional dependency to font-awesome.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/699
-		//		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
-
-		$this->enqueue_scripts();
-
-		wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
-			'action'   => 'wl_geomap'            // Global param
-		) );
-
-		// Escaping atts.
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
-
-		// Return HTML template.
-		return <<<EOF
+    const SHORTCODE = 'wl_geomap';
+
+    /**
+     * Create a {@link Wordlift_Geomap_Shortcode} instance.
+     *
+     * @since 3.5.4
+     */
+    public function __construct() {
+        parent::__construct();
+
+        // Hook to the `amp_post_template_css` to hide ourselves when in AMP
+        // rendering.
+        add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css', ) );
+
+    }
+
+    /**
+     * Render the shortcode.
+     *
+     * @param array $atts An array of shortcode attributes as set by the editor.
+     *
+     * @return string The output html code.
+     * @since 3.5.4
+     *
+     */
+    public function render( $atts ) {
+
+        // Extract attributes and set default values.
+        $geomap_atts = shortcode_atts( array(
+            'width'  => '100%',
+            'height' => '300px',
+            'global' => false,
+        ), $atts );
+
+        // Get id of the post
+        $post_id = get_the_ID();
+
+        if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+            // Global geomap
+            $geomap_id = 'wl_geomap_global';
+            $post_id   = null;
+        } else {
+            // Post-specific geomap
+            $geomap_id = 'wl_geomap_' . $post_id;
+        }
+
+        wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
+        wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true );
+
+        // Use the registered style which define an optional dependency to font-awesome.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/699
+        //		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        wp_enqueue_style( 'wordlift-ui' );
+
+        $this->enqueue_scripts();
+
+        wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
+            'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+            'action'   => 'wl_geomap'            // Global param
+        ) );
+
+        // Escaping atts.
+        $esc_id      = esc_attr( $geomap_id );
+        $esc_width   = esc_attr( $geomap_atts['width'] );
+        $esc_height  = esc_attr( $geomap_atts['height'] );
+        $esc_post_id = esc_attr( $post_id );
+
+        // Return HTML template.
+        return <<<EOF
 <div class="wl-geomap"  id="$esc_id" data-post-id="$esc_post_id"
 	style="width:$esc_width; height:$esc_height; background-color: gray;">
 </div>
 EOF;
-	}
-
-	/**
-	 * Customize the CSS when in AMP.
-	 *
-	 * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
-	 *
-	 * @param object $amp_template The template.
-	 *
-	 * @since 3.13.0
-	 *
-	 */
-	public function amp_post_template_css( $amp_template ) {
-
-		// Hide the `wl-geomap` when in AMP.
-		?>
+    }
+
+    /**
+     * Customize the CSS when in AMP.
+     *
+     * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
+     *
+     * @param object $amp_template The template.
+     *
+     * @since 3.13.0
+     *
+     */
+    public function amp_post_template_css( $amp_template ) {
+
+        // Hide the `wl-geomap` when in AMP.
+        ?>
         .wl-geomap { display: none; }
 		<?php
-	}
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -30,7 +30,7 @@ 
 
 		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
 		// rendering.
-		add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css', ) );
+		add_action('amp_post_template_css', array($this, 'amp_post_template_css',));
 
 	}
 
@@ -43,48 +43,48 @@ 
 	 * @since 3.5.4
 	 *
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// Extract attributes and set default values.
-		$geomap_atts = shortcode_atts( array(
+		$geomap_atts = shortcode_atts(array(
 			'width'  => '100%',
 			'height' => '300px',
 			'global' => false,
-		), $atts );
+		), $atts);
 
 		// Get id of the post
 		$post_id = get_the_ID();
 
-		if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+		if ($geomap_atts['global'] || is_null($post_id)) {
 			// Global geomap
 			$geomap_id = 'wl_geomap_global';
 			$post_id   = null;
 		} else {
 			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
+			$geomap_id = 'wl_geomap_'.$post_id;
 		}
 
-		wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
-		wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true );
+		wp_enqueue_style('wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0');
+		wp_enqueue_script('wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true);
 
 		// Use the registered style which define an optional dependency to font-awesome.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/699
 		//		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
+		wp_enqueue_style('wordlift-ui');
 
 		$this->enqueue_scripts();
 
-		wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+		wp_localize_script('wordlift-ui', 'wl_geomap_params', array(
+			'ajax_url' => admin_url('admin-ajax.php'), // Global param
 			'action'   => 'wl_geomap'            // Global param
-		) );
+		));
 
 		// Escaping atts.
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
+		$esc_id      = esc_attr($geomap_id);
+		$esc_width   = esc_attr($geomap_atts['width']);
+		$esc_height  = esc_attr($geomap_atts['height']);
+		$esc_post_id = esc_attr($post_id);
 
 		// Return HTML template.
 		return <<<EOF
@@ -104,7 +104,7 @@ 
 	 * @since 3.13.0
 	 *
 	 */
-	public function amp_post_template_css( $amp_template ) {
+	public function amp_post_template_css($amp_template) {
 
 		// Hide the `wl-geomap` when in AMP.
 		?>

src/shortcodes/wordlift_shortcode_geomap.php

Indentation +103 added lines, -103 removed lines

@@ -11,42 +11,42 @@ 
  * Print both global or post related places in json. It's executed via Ajax
  */
 function wl_shortcode_geomap_ajax() {
-	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+    // Get the post Id.
+    $post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+    $map_data = ( is_numeric( $post_id )
+        ? wl_shortcode_geomap_ajax_single_post( $post_id )
+        : wl_shortcode_geomap_ajax_all_posts() );
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+    wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
 
 }
 
 function wl_shortcode_geomap_ajax_all_posts() {
-	global $wpdb;
-
-	return $wpdb->get_results( $wpdb->prepare(
-		"SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
-		. " FROM {$wpdb->posts} p1 "
-		. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
-		. "  ON ri.object_id = p1.ID AND ri.predicate = %s"
-		. " INNER JOIN {$wpdb->postmeta} pm1"
-		. "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
-		. " INNER JOIN {$wpdb->postmeta} pm2"
-		. "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
-		. " WHERE p1.post_status = %s",
-		'where',
-		'wl_geo_latitude',
-		'wl_geo_longitude',
-		'publish'
-	) );
+    global $wpdb;
+
+    return $wpdb->get_results( $wpdb->prepare(
+        "SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
+        . " FROM {$wpdb->posts} p1 "
+        . " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
+        . "  ON ri.object_id = p1.ID AND ri.predicate = %s"
+        . " INNER JOIN {$wpdb->postmeta} pm1"
+        . "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
+        . " INNER JOIN {$wpdb->postmeta} pm2"
+        . "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
+        . " WHERE p1.post_status = %s",
+        'where',
+        'wl_geo_latitude',
+        'wl_geo_longitude',
+        'publish'
+    ) );
 }
 
 function wl_shortcode_geomap_ajax_single_post( $post_id ) {
-	global $wpdb;
+    global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
-		"
+    return $wpdb->get_results( $wpdb->prepare(
+        "
 		SELECT p2.ID, p2.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude
 		 FROM {$wpdb->prefix}wl_relation_instances ri
 		 INNER JOIN {$wpdb->posts} p2
@@ -65,69 +65,69 @@ 
 		  ON pm2.post_id = p.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value
 		 WHERE p.ID = %s
 		",
-		'publish',
-		'wl_geo_latitude',
-		'wl_geo_longitude',
-		$post_id,
-		'where',
-		// UNION
-		'wl_geo_latitude',
-		'wl_geo_longitude',
-		$post_id
-	) );
+        'publish',
+        'wl_geo_latitude',
+        'wl_geo_longitude',
+        $post_id,
+        'where',
+        // UNION
+        'wl_geo_latitude',
+        'wl_geo_longitude',
+        $post_id
+    ) );
 }
 
 function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
 
-	global $wpdb;
-
-	return $wpdb->get_results( $wpdb->prepare(
-		"SELECT p.ID, p.post_title"
-		. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-		" INNER JOIN {$wpdb->posts} p" .
-		"  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d" .
-		" WHERE ri.object_id = %d AND ri.predicate = %s",
-		'publish',
-		$exclude_post_id,
-		$post_id,
-		'where'
-	) );
+    global $wpdb;
+
+    return $wpdb->get_results( $wpdb->prepare(
+        "SELECT p.ID, p.post_title"
+        . " FROM {$wpdb->prefix}wl_relation_instances ri" .
+        " INNER JOIN {$wpdb->posts} p" .
+        "  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d" .
+        " WHERE ri.object_id = %d AND ri.predicate = %s",
+        'publish',
+        $exclude_post_id,
+        $post_id,
+        'where'
+    ) );
 }
 
 function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
 
-	$boundaries = array();
-	$features   = array_map( function ( $item ) use ( &$boundaries, $post_id ) {
+    $boundaries = array();
+    $features   = array_map( function ( $item ) use ( &$boundaries, $post_id ) {
 
-		$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-		$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+        $thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
+        $thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
 
-		// Related posts.
-		$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
-		$subjects_inner_html = array_reduce( $subjects, function ( $carry, $subject ) {
+        // Related posts.
+        $subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
+        $subjects_inner_html = array_reduce( $subjects, function ( $carry, $subject ) {
 
-			$permalink = get_permalink( $subject->ID );
+            $permalink = get_permalink( $subject->ID );
 
-			return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
-		}, '' );
-		$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+            return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
+        }, '' );
+        $subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
 
-		$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-		$latitude      = floatval( $item->latitude );
-		$longitude     = floatval( $item->longitude );
-		$coordinates   = array( $latitude, $longitude, );
-		$geometry      = array( 'type' => 'Point', 'coordinates' => $coordinates, );
+        $popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
+        $latitude      = floatval( $item->latitude );
+        $longitude     = floatval( $item->longitude );
+        $coordinates   = array( $latitude, $longitude, );
+        $geometry      = array( 'type' => 'Point', 'coordinates' => $coordinates, );
 
-		$boundaries[] = array( $longitude, $latitude, );
+        $boundaries[] = array( $longitude, $latitude, );
 
-		return array(
-			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $popup_content ),
-			'geometry'   => $geometry,
-		);
-	}, $results );
+        return array(
+            'type'       => 'Feature',
+            'properties' => array( 'popupContent' => $popup_content ),
+            'geometry'   => $geometry,
+        );
+    }, $results );
 
-	return array( 'features' => $features, 'boundaries' => $boundaries, );
+    return array( 'features' => $features, 'boundaries' => $boundaries, );
 }
 
 add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
@@ -138,34 +138,34 @@ 
  */
 add_action( 'init', function () {
 
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type( 'wordlift/geomap', array(
-		'editor_script'   => 'wl-block-editor',
-		'render_callback' => function ( $attributes ) {
-			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
-			}
-
-			return '[wl_geomap ' . $attr_code . ']';
-		},
-		'attributes'      => array(
-			'width'  => array(
-				'type'    => 'string',
-				'default' => '100%'
-			),
-			'height' => array(
-				'type'    => 'string',
-				'default' => '300px'
-			),
-			'global' => array(
-				'type'    => 'bool',
-				'default' => false
-			),
-		)
-	) );
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type( 'wordlift/geomap', array(
+        'editor_script'   => 'wl-block-editor',
+        'render_callback' => function ( $attributes ) {
+            $attr_code = '';
+            foreach ( $attributes as $key => $value ) {
+                $attr_code .= $key . '="' . $value . '" ';
+            }
+
+            return '[wl_geomap ' . $attr_code . ']';
+        },
+        'attributes'      => array(
+            'width'  => array(
+                'type'    => 'string',
+                'default' => '100%'
+            ),
+            'height' => array(
+                'type'    => 'string',
+                'default' => '300px'
+            ),
+            'global' => array(
+                'type'    => 'bool',
+                'default' => false
+            ),
+        )
+    ) );
 } );

Spacing +45 added lines, -45 removed lines

@@ -12,20 +12,20 @@ 
  */
 function wl_shortcode_geomap_ajax() {
 	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+	$post_id = (isset($_REQUEST['post_id']) ? $_REQUEST['post_id'] : null);
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+	$map_data = (is_numeric($post_id)
+		? wl_shortcode_geomap_ajax_single_post($post_id)
+		: wl_shortcode_geomap_ajax_all_posts());
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+	wl_core_send_json(wl_shortcode_geomap_format_results($map_data, $post_id));
 
 }
 
 function wl_shortcode_geomap_ajax_all_posts() {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		"SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
 		. " FROM {$wpdb->posts} p1 "
 		. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
@@ -39,13 +39,13 @@ 
 		'wl_geo_latitude',
 		'wl_geo_longitude',
 		'publish'
-	) );
+	));
 }
 
-function wl_shortcode_geomap_ajax_single_post( $post_id ) {
+function wl_shortcode_geomap_ajax_single_post($post_id) {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		"
 		SELECT p2.ID, p2.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude
 		 FROM {$wpdb->prefix}wl_relation_instances ri
@@ -74,84 +74,84 @@ 
 		'wl_geo_latitude',
 		'wl_geo_longitude',
 		$post_id
-	) );
+	));
 }
 
-function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
+function wl_shortcode_geomap_get_subjects($post_id, $exclude_post_id) {
 
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		"SELECT p.ID, p.post_title"
-		. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-		" INNER JOIN {$wpdb->posts} p" .
-		"  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d" .
+		. " FROM {$wpdb->prefix}wl_relation_instances ri".
+		" INNER JOIN {$wpdb->posts} p".
+		"  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d".
 		" WHERE ri.object_id = %d AND ri.predicate = %s",
 		'publish',
 		$exclude_post_id,
 		$post_id,
 		'where'
-	) );
+	));
 }
 
-function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
+function wl_shortcode_geomap_format_results($results, $post_id = null) {
 
 	$boundaries = array();
-	$features   = array_map( function ( $item ) use ( &$boundaries, $post_id ) {
+	$features   = array_map(function($item) use (&$boundaries, $post_id) {
 
-		$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-		$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+		$thumbnail_url  = get_the_post_thumbnail_url($item->ID);
+		$thumbnail_html = ($thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '');
 
 		// Related posts.
-		$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
-		$subjects_inner_html = array_reduce( $subjects, function ( $carry, $subject ) {
+		$subjects            = wl_shortcode_geomap_get_subjects($item->ID, $post_id);
+		$subjects_inner_html = array_reduce($subjects, function($carry, $subject) {
 
-			$permalink = get_permalink( $subject->ID );
+			$permalink = get_permalink($subject->ID);
 
-			return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
-		}, '' );
-		$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+			return $carry.sprintf('<li><a href="%s">%s</a></li>', $permalink, esc_html($subject->post_title));
+		}, '');
+		$subjects_html = ( ! empty($subjects_inner_html) ? '<ul>'.$subjects_inner_html.'</ul>' : '');
 
-		$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-		$latitude      = floatval( $item->latitude );
-		$longitude     = floatval( $item->longitude );
-		$coordinates   = array( $latitude, $longitude, );
-		$geometry      = array( 'type' => 'Point', 'coordinates' => $coordinates, );
+		$popup_content = sprintf('<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink($item->ID), $thumbnail_html, esc_html($item->post_title), $subjects_html);
+		$latitude      = floatval($item->latitude);
+		$longitude     = floatval($item->longitude);
+		$coordinates   = array($latitude, $longitude,);
+		$geometry      = array('type' => 'Point', 'coordinates' => $coordinates,);
 
-		$boundaries[] = array( $longitude, $latitude, );
+		$boundaries[] = array($longitude, $latitude,);
 
 		return array(
 			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $popup_content ),
+			'properties' => array('popupContent' => $popup_content),
 			'geometry'   => $geometry,
 		);
-	}, $results );
+	}, $results);
 
-	return array( 'features' => $features, 'boundaries' => $boundaries, );
+	return array('features' => $features, 'boundaries' => $boundaries,);
 }
 
-add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
-add_action( 'wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax' );
+add_action('wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax');
+add_action('wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax');
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function () {
+add_action('init', function() {
 
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
-	register_block_type( 'wordlift/geomap', array(
+	register_block_type('wordlift/geomap', array(
 		'editor_script'   => 'wl-block-editor',
-		'render_callback' => function ( $attributes ) {
+		'render_callback' => function($attributes) {
 			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
+			foreach ($attributes as $key => $value) {
+				$attr_code .= $key.'="'.$value.'" ';
 			}
 
-			return '[wl_geomap ' . $attr_code . ']';
+			return '[wl_geomap '.$attr_code.']';
 		},
 		'attributes'      => array(
 			'width'  => array(
@@ -167,5 +167,5 @@ 
 				'default' => false
 			),
 		)
-	) );
+	));
 } );

src/modules/geo_widget/wordlift_geo_widget.php

Indentation +58 added lines, -58 removed lines

@@ -9,32 +9,32 @@ 
 
 function wordlift_geo_widget_shortcode( $atts, $content = null ) {
 
-	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
-		'width'     => '100%',
-		'height'    => '300px',
-		'latitude'  => 0.0,
-		'longitude' => 0.0,
-		'zoom'      => 5,
-
-	), $atts );
-
-	// Add leaflet css and library.
-	wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
-	wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true );
-
-	ob_start(); // Collect the buffer.
-	wordlift_geo_widget_html(
-		$params['width'],
-		$params['height'],
-		$params['latitude'],
-		$params['longitude'],
-		$params['zoom'],
-		$content
-	);
-
-	// Return the accumulated buffer.
-	return ob_get_clean();
+    // Extract attributes and set default values.
+    $params = shortcode_atts( array(
+        'width'     => '100%',
+        'height'    => '300px',
+        'latitude'  => 0.0,
+        'longitude' => 0.0,
+        'zoom'      => 5,
+
+    ), $atts );
+
+    // Add leaflet css and library.
+    wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
+    wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true );
+
+    ob_start(); // Collect the buffer.
+    wordlift_geo_widget_html(
+        $params['width'],
+        $params['height'],
+        $params['latitude'],
+        $params['longitude'],
+        $params['zoom'],
+        $content
+    );
+
+    // Return the accumulated buffer.
+    return ob_get_clean();
 
 }
 
@@ -42,24 +42,24 @@ 
 
 function wl_geo_widget_layer_shortcode( $atts ) {
 
-	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
-		'name'  => '',
-		'label' => '',
-	), $atts );
+    // Extract attributes and set default values.
+    $params = shortcode_atts( array(
+        'name'  => '',
+        'label' => '',
+    ), $atts );
 
-	// Return if a SPARQL Query name hasn't been provided.
-	if ( empty( $params['name'] ) ) {
-		return;
-	}
+    // Return if a SPARQL Query name hasn't been provided.
+    if ( empty( $params['name'] ) ) {
+        return;
+    }
 
-	// Set the layer label.
-	$label_j = json_encode( empty( $params['label'] ) ? $params['name'] : $params['label'] );
+    // Set the layer label.
+    $label_j = json_encode( empty( $params['label'] ) ? $params['name'] : $params['label'] );
 
-	// Define the AJAX Url.
-	$ajax_url = admin_url( 'admin-ajax.php?action=wl_sparql&format=geojson&slug=' . urlencode( $params['name'] ) );
+    // Define the AJAX Url.
+    $ajax_url = admin_url( 'admin-ajax.php?action=wl_sparql&format=geojson&slug=' . urlencode( $params['name'] ) );
 
-	echo <<<EOF
+    echo <<<EOF
 
         $.ajax( '$ajax_url', {
             success: function( data ) {
@@ -90,21 +90,21 @@ 
 
 function wl_geo_widget_marker_shortcode( $atts ) {
 
-	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
-		'latitude'  => null,
-		'longitude' => null,
-	), $atts );
+    // Extract attributes and set default values.
+    $params = shortcode_atts( array(
+        'latitude'  => null,
+        'longitude' => null,
+    ), $atts );
 
-	// Return if either latitude or longitude haven't been provided.
-	if ( empty( $params['latitude'] ) || empty( $params['longitude'] ) ) {
-		return;
-	}
+    // Return if either latitude or longitude haven't been provided.
+    if ( empty( $params['latitude'] ) || empty( $params['longitude'] ) ) {
+        return;
+    }
 
-	$latitude_j  = json_encode( $params['latitude'] );
-	$longitude_j = json_encode( $params['longitude'] );
+    $latitude_j  = json_encode( $params['latitude'] );
+    $longitude_j = json_encode( $params['longitude'] );
 
-	echo <<<EOF
+    echo <<<EOF
 
 		L.marker([$latitude_j, $longitude_j]).addTo(map);
 EOF;
@@ -116,10 +116,10 @@ 
 
 function wordlift_geo_widget_html( $width, $height, $latitude, $longitude, $zoom, $content ) {
 
-	// Create a unique Id for this widget.
-	$div_id = uniqid( 'wl-geo-' );
+    // Create a unique Id for this widget.
+    $div_id = uniqid( 'wl-geo-' );
 
-	echo <<<EOF
+    echo <<<EOF
 <div id="$div_id" style="width: $width; height: $height;"></div>
 
 <script type="text/javascript">
@@ -144,10 +144,10 @@ 
 
 EOF;
 
-	// Run inner shortcodes.
-	do_shortcode( $content );
+    // Run inner shortcodes.
+    do_shortcode( $content );
 
-	echo <<<EOF
+    echo <<<EOF
 
     } );
 </script>

Spacing +23 added lines, -23 removed lines

@@ -7,21 +7,21 @@ 
  * @subpackage Wordlift/modules/geo_widget
  */
 
-function wordlift_geo_widget_shortcode( $atts, $content = null ) {
+function wordlift_geo_widget_shortcode($atts, $content = null) {
 
 	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
+	$params = shortcode_atts(array(
 		'width'     => '100%',
 		'height'    => '300px',
 		'latitude'  => 0.0,
 		'longitude' => 0.0,
 		'zoom'      => 5,
 
-	), $atts );
+	), $atts);
 
 	// Add leaflet css and library.
-	wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
-	wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true );
+	wp_enqueue_style('wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0');
+	wp_enqueue_script('wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0', true);
 
 	ob_start(); // Collect the buffer.
 	wordlift_geo_widget_html(
@@ -38,26 +38,26 @@ 
 
 }
 
-add_shortcode( 'wl_geo', 'wordlift_geo_widget_shortcode' );
+add_shortcode('wl_geo', 'wordlift_geo_widget_shortcode');
 
-function wl_geo_widget_layer_shortcode( $atts ) {
+function wl_geo_widget_layer_shortcode($atts) {
 
 	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
+	$params = shortcode_atts(array(
 		'name'  => '',
 		'label' => '',
-	), $atts );
+	), $atts);
 
 	// Return if a SPARQL Query name hasn't been provided.
-	if ( empty( $params['name'] ) ) {
+	if (empty($params['name'])) {
 		return;
 	}
 
 	// Set the layer label.
-	$label_j = json_encode( empty( $params['label'] ) ? $params['name'] : $params['label'] );
+	$label_j = json_encode(empty($params['label']) ? $params['name'] : $params['label']);
 
 	// Define the AJAX Url.
-	$ajax_url = admin_url( 'admin-ajax.php?action=wl_sparql&format=geojson&slug=' . urlencode( $params['name'] ) );
+	$ajax_url = admin_url('admin-ajax.php?action=wl_sparql&format=geojson&slug='.urlencode($params['name']));
 
 	echo <<<EOF
 
@@ -85,24 +85,24 @@ 
 
 }
 
-add_shortcode( 'wl_geo_layer', 'wl_geo_widget_layer_shortcode' );
+add_shortcode('wl_geo_layer', 'wl_geo_widget_layer_shortcode');
 
 
-function wl_geo_widget_marker_shortcode( $atts ) {
+function wl_geo_widget_marker_shortcode($atts) {
 
 	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
+	$params = shortcode_atts(array(
 		'latitude'  => null,
 		'longitude' => null,
-	), $atts );
+	), $atts);
 
 	// Return if either latitude or longitude haven't been provided.
-	if ( empty( $params['latitude'] ) || empty( $params['longitude'] ) ) {
+	if (empty($params['latitude']) || empty($params['longitude'])) {
 		return;
 	}
 
-	$latitude_j  = json_encode( $params['latitude'] );
-	$longitude_j = json_encode( $params['longitude'] );
+	$latitude_j  = json_encode($params['latitude']);
+	$longitude_j = json_encode($params['longitude']);
 
 	echo <<<EOF
 
@@ -111,13 +111,13 @@ 
 
 }
 
-add_shortcode( 'wl_geo_marker', 'wl_geo_widget_marker_shortcode' );
+add_shortcode('wl_geo_marker', 'wl_geo_widget_marker_shortcode');
 
 
-function wordlift_geo_widget_html( $width, $height, $latitude, $longitude, $zoom, $content ) {
+function wordlift_geo_widget_html($width, $height, $latitude, $longitude, $zoom, $content) {
 
 	// Create a unique Id for this widget.
-	$div_id = uniqid( 'wl-geo-' );
+	$div_id = uniqid('wl-geo-');
 
 	echo <<<EOF
 <div id="$div_id" style="width: $width; height: $height;"></div>
@@ -145,7 +145,7 @@ 
 EOF;
 
 	// Run inner shortcodes.
-	do_shortcode( $content );
+	do_shortcode($content);
 
 	echo <<<EOF
 

src/wordlift_entity_functions.php

Indentation +106 added lines, -106 removed lines

@@ -12,35 +12,35 @@ 
  */
 function wl_get_entity_post_ids_by_uris( $uris ) {
 
-	if ( empty( $uris ) ) {
-		return array();
-	}
-
-	$query = new WP_Query( array(
-			'fields'      => 'ids',
-			'post_status' => 'any',
-			'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-			'meta_query'  => array(
-				'relation' => 'OR',
-				array(
-					'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-					'value'   => $uris,
-					'compare' => 'IN',
-				),
-				array(
-					'key'     => 'entity_url',
-					'value'   => $uris,
-					'compare' => 'IN',
-				),
-			),
-		)
-	);
-
-	// Get the matching entity posts.
-	$posts = $query->get_posts();
-
-	// Return the array
-	return $posts;
+    if ( empty( $uris ) ) {
+        return array();
+    }
+
+    $query = new WP_Query( array(
+            'fields'      => 'ids',
+            'post_status' => 'any',
+            'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+            'meta_query'  => array(
+                'relation' => 'OR',
+                array(
+                    'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                    'value'   => $uris,
+                    'compare' => 'IN',
+                ),
+                array(
+                    'key'     => 'entity_url',
+                    'value'   => $uris,
+                    'compare' => 'IN',
+                ),
+            ),
+        )
+    );
+
+    // Get the matching entity posts.
+    $posts = $query->get_posts();
+
+    // Return the array
+    return $posts;
 }
 
 /**
@@ -55,29 +55,29 @@ 
  */
 function wl_build_entity_uri( $post_id ) {
 
-	// Get the post.
-	$post = get_post( $post_id );
+    // Get the post.
+    $post = get_post( $post_id );
 
-	if ( null === $post ) {
-		wl_write_log( "wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]" );
+    if ( null === $post ) {
+        wl_write_log( "wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]" );
 
-		return null;
-	}
+        return null;
+    }
 
-	// Create an ID given the title.
-	$entity_slug = wl_sanitize_uri_path( $post->post_title );
-	// If the entity slug is empty, i.e. there's no title, use the post ID as path.
-	if ( empty( $entity_slug ) ) {
-		return sprintf( '%s/%s/%s',
-			wl_configuration_get_redlink_dataset_uri(),
-			$post->post_type,
-			"id/$post->ID"
-		);
-	}
+    // Create an ID given the title.
+    $entity_slug = wl_sanitize_uri_path( $post->post_title );
+    // If the entity slug is empty, i.e. there's no title, use the post ID as path.
+    if ( empty( $entity_slug ) ) {
+        return sprintf( '%s/%s/%s',
+            wl_configuration_get_redlink_dataset_uri(),
+            $post->post_type,
+            "id/$post->ID"
+        );
+    }
 
-	return Wordlift_Uri_Service::get_instance()->build_uri(
-		$entity_slug,
-		$post->post_type );
+    return Wordlift_Uri_Service::get_instance()->build_uri(
+        $entity_slug,
+        $post->post_type );
 
 }
 
@@ -95,7 +95,7 @@ 
  */
 function wl_get_entity_uri( $post_id ) {
 
-	return Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+    return Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
 }
 
 /**
@@ -108,9 +108,9 @@ 
  */
 function wl_set_entity_uri( $post_id, $uri ) {
 
-	// wl_write_log( "wl_set_entity_uri [ post id :: $post_id ][ uri :: $uri ]" );
+    // wl_write_log( "wl_set_entity_uri [ post id :: $post_id ][ uri :: $uri ]" );
 
-	return update_post_meta( $post_id, WL_ENTITY_URL_META_NAME, $uri );
+    return update_post_meta( $post_id, WL_ENTITY_URL_META_NAME, $uri );
 }
 
 
@@ -125,7 +125,7 @@ 
  */
 function wl_get_entity_rdf_types( $post_id ) {
 
-	return get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
+    return get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
 }
 
 /**
@@ -136,21 +136,21 @@ 
  */
 function wl_set_entity_rdf_types( $post_id, $type_uris = array() ) {
 
-	// Avoid errors because of null values.
-	if ( is_null( $type_uris ) ) {
-		$type_uris = array();
-	}
-
-	// Ensure there are no duplicates.
-	$type_uris = array_unique( $type_uris );
-
-	delete_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
-	foreach ( $type_uris as $type_uri ) {
-		if ( empty( $type_uri ) ) {
-			continue;
-		}
-		add_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri );
-	}
+    // Avoid errors because of null values.
+    if ( is_null( $type_uris ) ) {
+        $type_uris = array();
+    }
+
+    // Ensure there are no duplicates.
+    $type_uris = array_unique( $type_uris );
+
+    delete_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
+    foreach ( $type_uris as $type_uri ) {
+        if ( empty( $type_uri ) ) {
+            continue;
+        }
+        add_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri );
+    }
 }
 
 ///**
@@ -199,59 +199,59 @@ 
  */
 function wl_entity_taxonomy_get_custom_fields( $entity_id = null ) {
 
-	if ( is_null( $entity_id ) ) {
+    if ( is_null( $entity_id ) ) {
 
-		// Return all custom fields.
-		// Get taxonomy terms
-		$terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'get' => 'all' ) );
+        // Return all custom fields.
+        // Get taxonomy terms
+        $terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'get' => 'all' ) );
 
-		if ( is_wp_error( $terms ) ) {
-			return null;
-		}
+        if ( is_wp_error( $terms ) ) {
+            return null;
+        }
 
-		$custom_fields = array();
-		foreach ( $terms as $term ) {
-			// Get custom_fields
-			$term_options = Wordlift_Schema_Service::get_instance()
-			                                       ->get_schema( $term->slug );
+        $custom_fields = array();
+        foreach ( $terms as $term ) {
+            // Get custom_fields
+            $term_options = Wordlift_Schema_Service::get_instance()
+                                                    ->get_schema( $term->slug );
 
-			if ( ! isset( $term_options['uri'] ) || ! isset( $term_options['custom_fields'] ) ) {
-				continue;
-			}
+            if ( ! isset( $term_options['uri'] ) || ! isset( $term_options['custom_fields'] ) ) {
+                continue;
+            }
 
-			$custom_fields[ $term_options['uri'] ] = $term_options['custom_fields'];
-		}
+            $custom_fields[ $term_options['uri'] ] = $term_options['custom_fields'];
+        }
 
-		return $custom_fields;
+        return $custom_fields;
 
-	}
+    }
 
-	// Return custom fields for this specific entity's type.
-	$types = Wordlift_Entity_Type_Service::get_instance()->get_ids( $entity_id );
+    // Return custom fields for this specific entity's type.
+    $types = Wordlift_Entity_Type_Service::get_instance()->get_ids( $entity_id );
 
-	/** @var WP_Term[] $terms */
-	$terms = array_filter( array_map( function ( $item ) {
-		return get_term( $item );
-	}, $types ), function ( $item ) {
-		return isset( $item ) && is_a( $item, 'WP_Term' );
-	} );
+    /** @var WP_Term[] $terms */
+    $terms = array_filter( array_map( function ( $item ) {
+        return get_term( $item );
+    }, $types ), function ( $item ) {
+        return isset( $item ) && is_a( $item, 'WP_Term' );
+    } );
 
-	$term_slugs = array_map( function ( $item ) {
-		return $item->slug;
-	}, $terms );
+    $term_slugs = array_map( function ( $item ) {
+        return $item->slug;
+    }, $terms );
 
-	$term_slugs[] = 'thing';
+    $term_slugs[] = 'thing';
 
-	$schema_service = Wordlift_Schema_Service::get_instance();
+    $schema_service = Wordlift_Schema_Service::get_instance();
 
-	return array_reduce( $term_slugs, function ( $carry, $item ) use ( $schema_service ) {
+    return array_reduce( $term_slugs, function ( $carry, $item ) use ( $schema_service ) {
 
-		$schema = $schema_service->get_schema( $item );
+        $schema = $schema_service->get_schema( $item );
 
-		if ( ! isset( $schema['custom_fields'] ) ) {
-			return $carry;
-		}
+        if ( ! isset( $schema['custom_fields'] ) ) {
+            return $carry;
+        }
 
-		return $carry + $schema['custom_fields'];
-	}, array() );
+        return $carry + $schema['custom_fields'];
+    }, array() );
 }

Spacing +42 added lines, -42 removed lines

@@ -10,13 +10,13 @@ 
  *
  * @return array A WP_Post instance or null if not found.
  */
-function wl_get_entity_post_ids_by_uris( $uris ) {
+function wl_get_entity_post_ids_by_uris($uris) {
 
-	if ( empty( $uris ) ) {
+	if (empty($uris)) {
 		return array();
 	}
 
-	$query = new WP_Query( array(
+	$query = new WP_Query(array(
 			'fields'      => 'ids',
 			'post_status' => 'any',
 			'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
@@ -53,22 +53,22 @@ 
  * @uses wl_configuration_get_redlink_dataset_uri() to get the dataset base URI.
  *
  */
-function wl_build_entity_uri( $post_id ) {
+function wl_build_entity_uri($post_id) {
 
 	// Get the post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	if ( null === $post ) {
-		wl_write_log( "wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]" );
+	if (null === $post) {
+		wl_write_log("wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]");
 
 		return null;
 	}
 
 	// Create an ID given the title.
-	$entity_slug = wl_sanitize_uri_path( $post->post_title );
+	$entity_slug = wl_sanitize_uri_path($post->post_title);
 	// If the entity slug is empty, i.e. there's no title, use the post ID as path.
-	if ( empty( $entity_slug ) ) {
-		return sprintf( '%s/%s/%s',
+	if (empty($entity_slug)) {
+		return sprintf('%s/%s/%s',
 			wl_configuration_get_redlink_dataset_uri(),
 			$post->post_type,
 			"id/$post->ID"
@@ -93,9 +93,9 @@ 
  *
  * @uses       wl_build_entity_uri() to create a new URI if the entity doesn't have an URI yet.
  */
-function wl_get_entity_uri( $post_id ) {
+function wl_get_entity_uri($post_id) {
 
-	return Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+	return Wordlift_Entity_Service::get_instance()->get_uri($post_id);
 }
 
 /**
@@ -106,11 +106,11 @@ 
  *
  * @return bool True if successful, otherwise false.
  */
-function wl_set_entity_uri( $post_id, $uri ) {
+function wl_set_entity_uri($post_id, $uri) {
 
 	// wl_write_log( "wl_set_entity_uri [ post id :: $post_id ][ uri :: $uri ]" );
 
-	return update_post_meta( $post_id, WL_ENTITY_URL_META_NAME, $uri );
+	return update_post_meta($post_id, WL_ENTITY_URL_META_NAME, $uri);
 }
 
 
@@ -123,9 +123,9 @@ 
  * @since 3.0.0
  *
  */
-function wl_get_entity_rdf_types( $post_id ) {
+function wl_get_entity_rdf_types($post_id) {
 
-	return get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
+	return get_post_meta($post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE);
 }
 
 /**
@@ -134,22 +134,22 @@ 
  * @param int $post_id The entity post ID.
  * @param array $type_uris An array of type URIs.
  */
-function wl_set_entity_rdf_types( $post_id, $type_uris = array() ) {
+function wl_set_entity_rdf_types($post_id, $type_uris = array()) {
 
 	// Avoid errors because of null values.
-	if ( is_null( $type_uris ) ) {
+	if (is_null($type_uris)) {
 		$type_uris = array();
 	}
 
 	// Ensure there are no duplicates.
-	$type_uris = array_unique( $type_uris );
+	$type_uris = array_unique($type_uris);
 
-	delete_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
-	foreach ( $type_uris as $type_uri ) {
-		if ( empty( $type_uri ) ) {
+	delete_post_meta($post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE);
+	foreach ($type_uris as $type_uri) {
+		if (empty($type_uri)) {
 			continue;
 		}
-		add_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri );
+		add_post_meta($post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri);
 	}
 }
 
@@ -197,29 +197,29 @@ 
  *
  * @return array|null if $entity_id was specified, return custom_fields for that entity's type. Otherwise returns all custom_fields
  */
-function wl_entity_taxonomy_get_custom_fields( $entity_id = null ) {
+function wl_entity_taxonomy_get_custom_fields($entity_id = null) {
 
-	if ( is_null( $entity_id ) ) {
+	if (is_null($entity_id)) {
 
 		// Return all custom fields.
 		// Get taxonomy terms
-		$terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'get' => 'all' ) );
+		$terms = get_terms(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array('get' => 'all'));
 
-		if ( is_wp_error( $terms ) ) {
+		if (is_wp_error($terms)) {
 			return null;
 		}
 
 		$custom_fields = array();
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 			// Get custom_fields
 			$term_options = Wordlift_Schema_Service::get_instance()
-			                                       ->get_schema( $term->slug );
+			                                       ->get_schema($term->slug);
 
-			if ( ! isset( $term_options['uri'] ) || ! isset( $term_options['custom_fields'] ) ) {
+			if ( ! isset($term_options['uri']) || ! isset($term_options['custom_fields'])) {
 				continue;
 			}
 
-			$custom_fields[ $term_options['uri'] ] = $term_options['custom_fields'];
+			$custom_fields[$term_options['uri']] = $term_options['custom_fields'];
 		}
 
 		return $custom_fields;
@@ -227,31 +227,31 @@ 
 	}
 
 	// Return custom fields for this specific entity's type.
-	$types = Wordlift_Entity_Type_Service::get_instance()->get_ids( $entity_id );
+	$types = Wordlift_Entity_Type_Service::get_instance()->get_ids($entity_id);
 
 	/** @var WP_Term[] $terms */
-	$terms = array_filter( array_map( function ( $item ) {
-		return get_term( $item );
-	}, $types ), function ( $item ) {
-		return isset( $item ) && is_a( $item, 'WP_Term' );
+	$terms = array_filter(array_map(function($item) {
+		return get_term($item);
+	}, $types), function($item) {
+		return isset($item) && is_a($item, 'WP_Term');
 	} );
 
-	$term_slugs = array_map( function ( $item ) {
+	$term_slugs = array_map(function($item) {
 		return $item->slug;
-	}, $terms );
+	}, $terms);
 
 	$term_slugs[] = 'thing';
 
 	$schema_service = Wordlift_Schema_Service::get_instance();
 
-	return array_reduce( $term_slugs, function ( $carry, $item ) use ( $schema_service ) {
+	return array_reduce($term_slugs, function($carry, $item) use ($schema_service) {
 
-		$schema = $schema_service->get_schema( $item );
+		$schema = $schema_service->get_schema($item);
 
-		if ( ! isset( $schema['custom_fields'] ) ) {
+		if ( ! isset($schema['custom_fields'])) {
 			return $carry;
 		}
 
 		return $carry + $schema['custom_fields'];
-	}, array() );
+	}, array());
 }

src/admin/WL_Metabox/class-wl-metabox.php

Indentation +298 added lines, -298 removed lines

@@ -27,346 +27,346 @@
  */
 class WL_Metabox {
 
-	/**
-	 * The metabox custom fields for the current {@link WP_Post}.
-	 *
-	 * @since  3.1.0
-	 * @access public
-	 * @var array $fields The metabox custom fields.
-	 */
-	public $fields;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.4
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * WL_Metabox constructor.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		// Add hooks to print metaboxes and save submitted data.
-		add_action( 'add_meta_boxes', array( $this, 'add_main_metabox' ) );
-		add_action( 'wl_linked_data_save_post', array( $this, 'save_form_data', ) );
-
-		// Enqueue js and css.
-		$this->enqueue_scripts_and_styles();
-
-	}
-
-	/**
-	 * Add a callback to print the metabox in page.
-	 * Wordpress will fire the $this->html() callback at the right time.
-	 */
-	public function add_main_metabox() {
-
-		// Build the fields we need to print.
-		$this->instantiate_fields( get_the_ID() );
-
-		// Bailout if there are no actual fields, we do not need a metabox in that case.
-		if ( empty( $this->fields ) ) {
-			return;
-		}
-
-		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
-
-		// WordPress 4.2 do not accept an array of screens as parameter, have to do be explicit.
-		foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $screen ) {
-			add_meta_box( $id, $title, array(
-				$this,
-				'html',
-			), $screen, 'normal', 'high' );
-		}
-
-		// Add filter to change the metabox CSS class.
-		//
-		// @since 3.20.0 Since we support post types other than `entity` for entities, we need to set the `screen`
-		//  dynamically according to the `get_current_screen()` function.
-		$current_screen = get_current_screen();
-		$screen         = $current_screen ? $current_screen->post_type : 'entity';
-		add_filter( "postbox_classes_{$screen}_$id", 'wl_admin_metaboxes_add_css_class' );
-
-	}
-
-	/**
-	 * Called from WP to print the metabox content in page.
-	 *
-	 * @param WP_Post $post The post.
-	 *
-	 * @since 3.1.0
-	 *
-	 */
-	public function html( $post ) {
-
-		// Loop over the fields.
-		foreach ( $this->fields as $field ) {
-
-			// load data from DB (values will be available in $field->data).
-			$field->get_data();
-
-			// print field HTML (nonce included).
-			echo $field->html();
-		}
-
-	}
-
-	/**
-	 * Read the WL <-> Schema mapping and build the Fields for the entity being edited.
-	 *
-	 * Note: the first function that calls this method will instantiate the fields.
-	 * Why it isn't called from the constructor? Because we need to hook this process as late as possible.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @since 3.1.0
-	 *
-	 */
-	public function instantiate_fields( $post_id ) {
-
-		$this->log->trace( "Instantiating fields for entity post $post_id..." );
-
-		// This function must be called only once. Not called from the constructor because WP hooks have a rococo ordering.
-		if ( isset( $this->fields ) ) {
-			return;
-		}
-
-		$entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
-
-		if ( isset( $entity_type ) ) {
-
-			/*
+    /**
+     * The metabox custom fields for the current {@link WP_Post}.
+     *
+     * @since  3.1.0
+     * @access public
+     * @var array $fields The metabox custom fields.
+     */
+    public $fields;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.4
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * WL_Metabox constructor.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        // Add hooks to print metaboxes and save submitted data.
+        add_action( 'add_meta_boxes', array( $this, 'add_main_metabox' ) );
+        add_action( 'wl_linked_data_save_post', array( $this, 'save_form_data', ) );
+
+        // Enqueue js and css.
+        $this->enqueue_scripts_and_styles();
+
+    }
+
+    /**
+     * Add a callback to print the metabox in page.
+     * Wordpress will fire the $this->html() callback at the right time.
+     */
+    public function add_main_metabox() {
+
+        // Build the fields we need to print.
+        $this->instantiate_fields( get_the_ID() );
+
+        // Bailout if there are no actual fields, we do not need a metabox in that case.
+        if ( empty( $this->fields ) ) {
+            return;
+        }
+
+        // Add main metabox (will print also the inner fields).
+        $id    = uniqid( 'wl-metabox-' );
+        $title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
+
+        // WordPress 4.2 do not accept an array of screens as parameter, have to do be explicit.
+        foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $screen ) {
+            add_meta_box( $id, $title, array(
+                $this,
+                'html',
+            ), $screen, 'normal', 'high' );
+        }
+
+        // Add filter to change the metabox CSS class.
+        //
+        // @since 3.20.0 Since we support post types other than `entity` for entities, we need to set the `screen`
+        //  dynamically according to the `get_current_screen()` function.
+        $current_screen = get_current_screen();
+        $screen         = $current_screen ? $current_screen->post_type : 'entity';
+        add_filter( "postbox_classes_{$screen}_$id", 'wl_admin_metaboxes_add_css_class' );
+
+    }
+
+    /**
+     * Called from WP to print the metabox content in page.
+     *
+     * @param WP_Post $post The post.
+     *
+     * @since 3.1.0
+     *
+     */
+    public function html( $post ) {
+
+        // Loop over the fields.
+        foreach ( $this->fields as $field ) {
+
+            // load data from DB (values will be available in $field->data).
+            $field->get_data();
+
+            // print field HTML (nonce included).
+            echo $field->html();
+        }
+
+    }
+
+    /**
+     * Read the WL <-> Schema mapping and build the Fields for the entity being edited.
+     *
+     * Note: the first function that calls this method will instantiate the fields.
+     * Why it isn't called from the constructor? Because we need to hook this process as late as possible.
+     *
+     * @param int $post_id The post id.
+     *
+     * @since 3.1.0
+     *
+     */
+    public function instantiate_fields( $post_id ) {
+
+        $this->log->trace( "Instantiating fields for entity post $post_id..." );
+
+        // This function must be called only once. Not called from the constructor because WP hooks have a rococo ordering.
+        if ( isset( $this->fields ) ) {
+            return;
+        }
+
+        $entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
+
+        if ( isset( $entity_type ) ) {
+
+            /*
 			 * Might not have any relevant meta box field, for example for articles,
 			 * therefor make sure fields are at least an empty array to help the considered
 			 * in other functions using it.
 			 */
-			$this->fields = array();
+            $this->fields = array();
 
-			/**
-			 * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
-			 * We must divide fields in two groups:
-			 * - simple: accept values for one property
-			 * - grouped: accept values for more properties, or for one property that needs a specific metabox.
-			 */
-			$metaboxes         = $this->group_properties_by_input_field( $entity_type );
-			$simple_metaboxes  = $metaboxes[0];
-			$grouped_metaboxes = $metaboxes[1];
+            /**
+             * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
+             * We must divide fields in two groups:
+             * - simple: accept values for one property
+             * - grouped: accept values for more properties, or for one property that needs a specific metabox.
+             */
+            $metaboxes         = $this->group_properties_by_input_field( $entity_type );
+            $simple_metaboxes  = $metaboxes[0];
+            $grouped_metaboxes = $metaboxes[1];
 
-			// Loop over simple entity properties.
-			foreach ( $simple_metaboxes as $key => $property ) {
+            // Loop over simple entity properties.
+            foreach ( $simple_metaboxes as $key => $property ) {
 
-				// Info passed to the metabox.
-				$info         = array();
-				$info[ $key ] = $property;
+                // Info passed to the metabox.
+                $info         = array();
+                $info[ $key ] = $property;
 
-				// Build the requested field as WL_Metabox_Field_ object.
-				$this->add_field( $info );
+                // Build the requested field as WL_Metabox_Field_ object.
+                $this->add_field( $info );
 
-			}
+            }
 
-			// Loop over grouped properties.
-			foreach ( $grouped_metaboxes as $key => $property ) {
+            // Loop over grouped properties.
+            foreach ( $grouped_metaboxes as $key => $property ) {
 
-				// Info passed to the metabox.
-				$info         = array();
-				$info[ $key ] = $property;
+                // Info passed to the metabox.
+                $info         = array();
+                $info[ $key ] = $property;
 
-				// Build the requested field group as WL_Metabox_Field_ object.
-				$this->add_field( $info, true );
+                // Build the requested field group as WL_Metabox_Field_ object.
+                $this->add_field( $info, true );
 
-			}
-		}
+            }
+        }
 
-	}
+    }
 
-	/**
-	 * Separates metaboxes in simple and grouped.
-	 *
-	 * @param array $custom_fields Information on the entity type.
-	 *
-	 * @return array
-	 */
-	public function group_properties_by_input_field( $custom_fields ) {
+    /**
+     * Separates metaboxes in simple and grouped.
+     *
+     * @param array $custom_fields Information on the entity type.
+     *
+     * @return array
+     */
+    public function group_properties_by_input_field( $custom_fields ) {
 
-		$simple_properties  = array();
-		$grouped_properties = array();
+        $simple_properties  = array();
+        $grouped_properties = array();
 
-		// Loop over possible entity properties.
-		foreach ( $custom_fields as $key => $property ) {
+        // Loop over possible entity properties.
+        foreach ( $custom_fields as $key => $property ) {
 
-			// Check presence of predicate and type.
-			if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
+            // Check presence of predicate and type.
+            if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
 
-				// Check if input_field is defined.
-				if ( isset( $property['input_field'] ) && '' !== $property['input_field'] ) {
+                // Check if input_field is defined.
+                if ( isset( $property['input_field'] ) && '' !== $property['input_field'] ) {
 
-					$grouped_key = $property['input_field'];
+                    $grouped_key = $property['input_field'];
 
-					// Update list of grouped properties.
-					$grouped_properties[ $grouped_key ][ $key ] = $property;
+                    // Update list of grouped properties.
+                    $grouped_properties[ $grouped_key ][ $key ] = $property;
 
-				} else {
+                } else {
 
-					// input_field not defined, add simple metabox.
-					$simple_properties[ $key ] = $property;
-				}
-			}
-		}
+                    // input_field not defined, add simple metabox.
+                    $simple_properties[ $key ] = $property;
+                }
+            }
+        }
 
-		return array( $simple_properties, $grouped_properties );
-	}
+        return array( $simple_properties, $grouped_properties );
+    }
 
-	/**
-	 * Add a Field to the current Metabox, based on the description of the Field.
-	 * This method is a rude factory for Field objects.
-	 *
-	 * @param array $args The field's information.
-	 * @param bool $grouped Flag to distinguish between simple and grouped fields.
-	 */
-	public function add_field( $args, $grouped = false ) {
+    /**
+     * Add a Field to the current Metabox, based on the description of the Field.
+     * This method is a rude factory for Field objects.
+     *
+     * @param array $args The field's information.
+     * @param bool $grouped Flag to distinguish between simple and grouped fields.
+     */
+    public function add_field( $args, $grouped = false ) {
 
-		if ( $grouped ) {
+        if ( $grouped ) {
 
-			// Special fields (sameas, coordinates, etc.).
-			//
-			// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-			$field_class = 'WL_Metabox_Field_' . key( $args );
+            // Special fields (sameas, coordinates, etc.).
+            //
+            // Build Field with a custom class (e.g. WL_Metabox_Field_date).
+            $field_class = 'WL_Metabox_Field_' . key( $args );
 
-		} else {
+        } else {
 
-			// Simple fields (string, uri, boolean, etc.).
-			//
-			// Which field? We want to use the class that is specific for the field.
-			$meta      = key( $args );
-			$this_meta = $args[ $meta ];
+            // Simple fields (string, uri, boolean, etc.).
+            //
+            // Which field? We want to use the class that is specific for the field.
+            $meta      = key( $args );
+            $this_meta = $args[ $meta ];
 
-			// If the field declares what metabox it wants, use that one.
-			if ( isset( $this_meta['metabox']['class'] ) ) {
+            // If the field declares what metabox it wants, use that one.
+            if ( isset( $this_meta['metabox']['class'] ) ) {
 
-				$field_class = $this_meta['metabox']['class'];
+                $field_class = $this_meta['metabox']['class'];
 
-			} elseif ( ! isset( $this_meta['type'] ) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type'] ) {
+            } elseif ( ! isset( $this_meta['type'] ) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type'] ) {
 
-				// TODO: all fields should explicitly declare the required WL_Metabox.
-				// When they will remove this.
-				//
-				// Use default WL_Metabox_Field (manages strings).
-				$field_class = 'WL_Metabox_Field';
+                // TODO: all fields should explicitly declare the required WL_Metabox.
+                // When they will remove this.
+                //
+                // Use default WL_Metabox_Field (manages strings).
+                $field_class = 'WL_Metabox_Field';
 
-			} else {
+            } else {
 
-				// TODO: all fields should explicitly declare the required WL_Metabox.
-				// When they will remove this.
-				//
-				// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-				$field_class = 'WL_Metabox_Field_' . $this_meta['type'];
+                // TODO: all fields should explicitly declare the required WL_Metabox.
+                // When they will remove this.
+                //
+                // Build Field with a custom class (e.g. WL_Metabox_Field_date).
+                $field_class = 'WL_Metabox_Field_' . $this_meta['type'];
 
-			}
+            }
 
-		}
-		// End if().
+        }
+        // End if().
 
-		// Call apropriate constructor (e.g. WL_Metabox_Field_... ).
-		$this->fields[] = new $field_class( $args );
-	}
+        // Call apropriate constructor (e.g. WL_Metabox_Field_... ).
+        $this->fields[] = new $field_class( $args );
+    }
 
-	/**
-	 * Save the form data for the specified entity {@link WP_Post}'s id.
-	 *
-	 * @param int $entity_id The entity's {@link WP_Post}'s id.
-	 *
-	 * @since 3.5.4
-	 *
-	 */
-	public function save_form_data( $entity_id ) {
-
-		$this->log->trace( "Saving form data for entity post $entity_id..." );
-
-		// Build Field objects.
-		$this->instantiate_fields( $entity_id );
+    /**
+     * Save the form data for the specified entity {@link WP_Post}'s id.
+     *
+     * @param int $entity_id The entity's {@link WP_Post}'s id.
+     *
+     * @since 3.5.4
+     *
+     */
+    public function save_form_data( $entity_id ) {
+
+        $this->log->trace( "Saving form data for entity post $entity_id..." );
+
+        // Build Field objects.
+        $this->instantiate_fields( $entity_id );
 
-		// Check if WL metabox form was posted.
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
-			$this->log->debug( "`wl_metaboxes`, skipping..." );
+        // Check if WL metabox form was posted.
+        if ( ! isset( $_POST['wl_metaboxes'] ) ) {
+            $this->log->debug( "`wl_metaboxes`, skipping..." );
 
-			return;
-		}
+            return;
+        }
 
-		foreach ( $this->fields as $field ) {
+        foreach ( $this->fields as $field ) {
 
-			// Verify nonce.
-			$valid_nonce = $field->verify_nonce();
-			if ( $valid_nonce ) {
-
-				$posted_data = $_POST['wl_metaboxes'];
-				$field_name  = $field->meta_name;
-
-				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
-
-					$values = $posted_data[ $field_name ];
-					if ( ! is_array( $values ) ) {
-						$values = array( $values );
-					}
-
-					// Save data permanently
-					$field->save_data( $values );
-				}
-			}
-		}
-
-		/**
-		 * Filter: 'wl_save_form_pre_push_entity' - Allow to hook right
-		 * before the triples are pushed to the linked dataset.
-		 *
-		 * @param int $entity_id The entity id.
-		 * @param int $id The post data.
-		 *
-		 * @since  3.18.2
-		 *
-		 */
-		do_action( 'wl_save_form_pre_push_entity', $entity_id, $_POST );
-
-		Wordlift_Linked_Data_Service::get_instance()->push( $entity_id );
-
-	}
-
-	/**
-	 * Enqueue scripts and styles.
-	 *
-	 * @since 3.0.0
-	 */
-	public function enqueue_scripts_and_styles() {
-
-		// Use the minified version if PW_DEBUG isn't set.
-		$min = ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ? '.min' : '';
-
-		// Load the jquery-ui-timepicker-addon library.
-		wp_enqueue_style( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
-		wp_enqueue_script( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
-
-		// Leaflet.
-		wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
-		wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0' );
-
-		// Add AJAX autocomplete to facilitate metabox editing.
-		wp_enqueue_script( 'wl-entity-metabox-utility', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wl_entity_metabox_utilities.js' );
-		wp_localize_script( 'wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
-				'action'   => 'entity_by_title',
-			)
-		);
-
-	}
+            // Verify nonce.
+            $valid_nonce = $field->verify_nonce();
+            if ( $valid_nonce ) {
+
+                $posted_data = $_POST['wl_metaboxes'];
+                $field_name  = $field->meta_name;
+
+                // Each Filed only deals with its values.
+                if ( isset( $posted_data[ $field_name ] ) ) {
+
+                    $values = $posted_data[ $field_name ];
+                    if ( ! is_array( $values ) ) {
+                        $values = array( $values );
+                    }
+
+                    // Save data permanently
+                    $field->save_data( $values );
+                }
+            }
+        }
+
+        /**
+         * Filter: 'wl_save_form_pre_push_entity' - Allow to hook right
+         * before the triples are pushed to the linked dataset.
+         *
+         * @param int $entity_id The entity id.
+         * @param int $id The post data.
+         *
+         * @since  3.18.2
+         *
+         */
+        do_action( 'wl_save_form_pre_push_entity', $entity_id, $_POST );
+
+        Wordlift_Linked_Data_Service::get_instance()->push( $entity_id );
+
+    }
+
+    /**
+     * Enqueue scripts and styles.
+     *
+     * @since 3.0.0
+     */
+    public function enqueue_scripts_and_styles() {
+
+        // Use the minified version if PW_DEBUG isn't set.
+        $min = ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ? '.min' : '';
+
+        // Load the jquery-ui-timepicker-addon library.
+        wp_enqueue_style( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
+        wp_enqueue_script( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
+
+        // Leaflet.
+        wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
+        wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0' );
+
+        // Add AJAX autocomplete to facilitate metabox editing.
+        wp_enqueue_script( 'wl-entity-metabox-utility', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wl_entity_metabox_utilities.js' );
+        wp_localize_script( 'wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
+                'ajax_url' => admin_url( 'admin-ajax.php' ),
+                'action'   => 'entity_by_title',
+            )
+        );
+
+    }
 
 }

Spacing +73 added lines, -73 removed lines

@@ -7,16 +7,16 @@ 
  * @subpackage Wordlift/admin/WL_Metabox
  */
 
-require_once( 'class-wl-metabox-field.php' );
-require_once( 'class-wl-metabox-field-uri.php' );
-require_once( 'class-wl-metabox-field-sameas.php' );
-require_once( 'WL_Metabox_Field_date.php' );
-require_once( 'WL_Metabox_Field_coordinates.php' );
-require_once( 'WL_Metabox_Field_address.php' );
-require_once( 'class-wordlift-metabox-field-duration.php' );
-require_once( 'class-wordlift-metabox-field-multiline.php' );
-require_once( 'class-wordlift-metabox-field-integer.php' );
-require_once( 'class-wordlift-metabox-field-select.php' );
+require_once('class-wl-metabox-field.php');
+require_once('class-wl-metabox-field-uri.php');
+require_once('class-wl-metabox-field-sameas.php');
+require_once('WL_Metabox_Field_date.php');
+require_once('WL_Metabox_Field_coordinates.php');
+require_once('WL_Metabox_Field_address.php');
+require_once('class-wordlift-metabox-field-duration.php');
+require_once('class-wordlift-metabox-field-multiline.php');
+require_once('class-wordlift-metabox-field-integer.php');
+require_once('class-wordlift-metabox-field-select.php');
 
 /**
  * Define the {@link WL_Metabox} class.
@@ -52,11 +52,11 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		// Add hooks to print metaboxes and save submitted data.
-		add_action( 'add_meta_boxes', array( $this, 'add_main_metabox' ) );
-		add_action( 'wl_linked_data_save_post', array( $this, 'save_form_data', ) );
+		add_action('add_meta_boxes', array($this, 'add_main_metabox'));
+		add_action('wl_linked_data_save_post', array($this, 'save_form_data',));
 
 		// Enqueue js and css.
 		$this->enqueue_scripts_and_styles();
@@ -70,23 +70,23 @@ 
 	public function add_main_metabox() {
 
 		// Build the fields we need to print.
-		$this->instantiate_fields( get_the_ID() );
+		$this->instantiate_fields(get_the_ID());
 
 		// Bailout if there are no actual fields, we do not need a metabox in that case.
-		if ( empty( $this->fields ) ) {
+		if (empty($this->fields)) {
 			return;
 		}
 
 		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
+		$id    = uniqid('wl-metabox-');
+		$title = get_the_title().' '.__('properties', 'wordlift');
 
 		// WordPress 4.2 do not accept an array of screens as parameter, have to do be explicit.
-		foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $screen ) {
-			add_meta_box( $id, $title, array(
+		foreach (Wordlift_Entity_Service::valid_entity_post_types() as $screen) {
+			add_meta_box($id, $title, array(
 				$this,
 				'html',
-			), $screen, 'normal', 'high' );
+			), $screen, 'normal', 'high');
 		}
 
 		// Add filter to change the metabox CSS class.
@@ -95,7 +95,7 @@ 
 		//  dynamically according to the `get_current_screen()` function.
 		$current_screen = get_current_screen();
 		$screen         = $current_screen ? $current_screen->post_type : 'entity';
-		add_filter( "postbox_classes_{$screen}_$id", 'wl_admin_metaboxes_add_css_class' );
+		add_filter("postbox_classes_{$screen}_$id", 'wl_admin_metaboxes_add_css_class');
 
 	}
 
@@ -107,10 +107,10 @@ 
 	 * @since 3.1.0
 	 *
 	 */
-	public function html( $post ) {
+	public function html($post) {
 
 		// Loop over the fields.
-		foreach ( $this->fields as $field ) {
+		foreach ($this->fields as $field) {
 
 			// load data from DB (values will be available in $field->data).
 			$field->get_data();
@@ -132,18 +132,18 @@ 
 	 * @since 3.1.0
 	 *
 	 */
-	public function instantiate_fields( $post_id ) {
+	public function instantiate_fields($post_id) {
 
-		$this->log->trace( "Instantiating fields for entity post $post_id..." );
+		$this->log->trace("Instantiating fields for entity post $post_id...");
 
 		// This function must be called only once. Not called from the constructor because WP hooks have a rococo ordering.
-		if ( isset( $this->fields ) ) {
+		if (isset($this->fields)) {
 			return;
 		}
 
-		$entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
+		$entity_type = wl_entity_taxonomy_get_custom_fields($post_id);
 
-		if ( isset( $entity_type ) ) {
+		if (isset($entity_type)) {
 
 			/*
 			 * Might not have any relevant meta box field, for example for articles,
@@ -158,31 +158,31 @@ 
 			 * - simple: accept values for one property
 			 * - grouped: accept values for more properties, or for one property that needs a specific metabox.
 			 */
-			$metaboxes         = $this->group_properties_by_input_field( $entity_type );
+			$metaboxes         = $this->group_properties_by_input_field($entity_type);
 			$simple_metaboxes  = $metaboxes[0];
 			$grouped_metaboxes = $metaboxes[1];
 
 			// Loop over simple entity properties.
-			foreach ( $simple_metaboxes as $key => $property ) {
+			foreach ($simple_metaboxes as $key => $property) {
 
 				// Info passed to the metabox.
 				$info         = array();
-				$info[ $key ] = $property;
+				$info[$key] = $property;
 
 				// Build the requested field as WL_Metabox_Field_ object.
-				$this->add_field( $info );
+				$this->add_field($info);
 
 			}
 
 			// Loop over grouped properties.
-			foreach ( $grouped_metaboxes as $key => $property ) {
+			foreach ($grouped_metaboxes as $key => $property) {
 
 				// Info passed to the metabox.
 				$info         = array();
-				$info[ $key ] = $property;
+				$info[$key] = $property;
 
 				// Build the requested field group as WL_Metabox_Field_ object.
-				$this->add_field( $info, true );
+				$this->add_field($info, true);
 
 			}
 		}
@@ -196,34 +196,34 @@ 
 	 *
 	 * @return array
 	 */
-	public function group_properties_by_input_field( $custom_fields ) {
+	public function group_properties_by_input_field($custom_fields) {
 
 		$simple_properties  = array();
 		$grouped_properties = array();
 
 		// Loop over possible entity properties.
-		foreach ( $custom_fields as $key => $property ) {
+		foreach ($custom_fields as $key => $property) {
 
 			// Check presence of predicate and type.
-			if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
+			if (isset($property['predicate']) && isset($property['type'])) {
 
 				// Check if input_field is defined.
-				if ( isset( $property['input_field'] ) && '' !== $property['input_field'] ) {
+				if (isset($property['input_field']) && '' !== $property['input_field']) {
 
 					$grouped_key = $property['input_field'];
 
 					// Update list of grouped properties.
-					$grouped_properties[ $grouped_key ][ $key ] = $property;
+					$grouped_properties[$grouped_key][$key] = $property;
 
 				} else {
 
 					// input_field not defined, add simple metabox.
-					$simple_properties[ $key ] = $property;
+					$simple_properties[$key] = $property;
 				}
 			}
 		}
 
-		return array( $simple_properties, $grouped_properties );
+		return array($simple_properties, $grouped_properties);
 	}
 
 	/**
@@ -233,29 +233,29 @@ 
 	 * @param array $args The field's information.
 	 * @param bool $grouped Flag to distinguish between simple and grouped fields.
 	 */
-	public function add_field( $args, $grouped = false ) {
+	public function add_field($args, $grouped = false) {
 
-		if ( $grouped ) {
+		if ($grouped) {
 
 			// Special fields (sameas, coordinates, etc.).
 			//
 			// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-			$field_class = 'WL_Metabox_Field_' . key( $args );
+			$field_class = 'WL_Metabox_Field_'.key($args);
 
 		} else {
 
 			// Simple fields (string, uri, boolean, etc.).
 			//
 			// Which field? We want to use the class that is specific for the field.
-			$meta      = key( $args );
-			$this_meta = $args[ $meta ];
+			$meta      = key($args);
+			$this_meta = $args[$meta];
 
 			// If the field declares what metabox it wants, use that one.
-			if ( isset( $this_meta['metabox']['class'] ) ) {
+			if (isset($this_meta['metabox']['class'])) {
 
 				$field_class = $this_meta['metabox']['class'];
 
-			} elseif ( ! isset( $this_meta['type'] ) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type'] ) {
+			} elseif ( ! isset($this_meta['type']) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type']) {
 
 				// TODO: all fields should explicitly declare the required WL_Metabox.
 				// When they will remove this.
@@ -269,7 +269,7 @@ 
 				// When they will remove this.
 				//
 				// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-				$field_class = 'WL_Metabox_Field_' . $this_meta['type'];
+				$field_class = 'WL_Metabox_Field_'.$this_meta['type'];
 
 			}
 
@@ -277,7 +277,7 @@ 
 		// End if().
 
 		// Call apropriate constructor (e.g. WL_Metabox_Field_... ).
-		$this->fields[] = new $field_class( $args );
+		$this->fields[] = new $field_class($args);
 	}
 
 	/**
@@ -288,39 +288,39 @@ 
 	 * @since 3.5.4
 	 *
 	 */
-	public function save_form_data( $entity_id ) {
+	public function save_form_data($entity_id) {
 
-		$this->log->trace( "Saving form data for entity post $entity_id..." );
+		$this->log->trace("Saving form data for entity post $entity_id...");
 
 		// Build Field objects.
-		$this->instantiate_fields( $entity_id );
+		$this->instantiate_fields($entity_id);
 
 		// Check if WL metabox form was posted.
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
-			$this->log->debug( "`wl_metaboxes`, skipping..." );
+		if ( ! isset($_POST['wl_metaboxes'])) {
+			$this->log->debug("`wl_metaboxes`, skipping...");
 
 			return;
 		}
 
-		foreach ( $this->fields as $field ) {
+		foreach ($this->fields as $field) {
 
 			// Verify nonce.
 			$valid_nonce = $field->verify_nonce();
-			if ( $valid_nonce ) {
+			if ($valid_nonce) {
 
 				$posted_data = $_POST['wl_metaboxes'];
 				$field_name  = $field->meta_name;
 
 				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
+				if (isset($posted_data[$field_name])) {
 
-					$values = $posted_data[ $field_name ];
-					if ( ! is_array( $values ) ) {
-						$values = array( $values );
+					$values = $posted_data[$field_name];
+					if ( ! is_array($values)) {
+						$values = array($values);
 					}
 
 					// Save data permanently
-					$field->save_data( $values );
+					$field->save_data($values);
 				}
 			}
 		}
@@ -335,9 +335,9 @@ 
 		 * @since  3.18.2
 		 *
 		 */
-		do_action( 'wl_save_form_pre_push_entity', $entity_id, $_POST );
+		do_action('wl_save_form_pre_push_entity', $entity_id, $_POST);
 
-		Wordlift_Linked_Data_Service::get_instance()->push( $entity_id );
+		Wordlift_Linked_Data_Service::get_instance()->push($entity_id);
 
 	}
 
@@ -349,20 +349,20 @@ 
 	public function enqueue_scripts_and_styles() {
 
 		// Use the minified version if PW_DEBUG isn't set.
-		$min = ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ? '.min' : '';
+		$min = ! defined('WP_DEBUG') || ! WP_DEBUG ? '.min' : '';
 
 		// Load the jquery-ui-timepicker-addon library.
-		wp_enqueue_style( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
-		wp_enqueue_script( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
+		wp_enqueue_style('wl-flatpickr', dirname(plugin_dir_url(__FILE__))."/js/flatpickr/flatpickr$min.css", array(), '3.0.6');
+		wp_enqueue_script('wl-flatpickr', dirname(plugin_dir_url(__FILE__))."/js/flatpickr/flatpickr$min.js", array('jquery'), '3.0.6', true);
 
 		// Leaflet.
-		wp_enqueue_style( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0' );
-		wp_enqueue_script( 'wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0' );
+		wp_enqueue_style('wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.css', array(), '1.6.0');
+		wp_enqueue_script('wl-leaflet', 'https://unpkg.com/leaflet@1.6.0/dist/leaflet.js', array(), '1.6.0');
 
 		// Add AJAX autocomplete to facilitate metabox editing.
-		wp_enqueue_script( 'wl-entity-metabox-utility', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wl_entity_metabox_utilities.js' );
-		wp_localize_script( 'wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
+		wp_enqueue_script('wl-entity-metabox-utility', dirname(plugin_dir_url(__FILE__)).'/js/wl_entity_metabox_utilities.js');
+		wp_localize_script('wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
+				'ajax_url' => admin_url('admin-ajax.php'),
 				'action'   => 'entity_by_title',
 			)
 		);

src/admin/wordlift_admin_meta_box_entities.php

Indentation +152 added lines, -152 removed lines

@@ -10,16 +10,16 @@ 
  */
 function wl_register_metaboxes() {
 
-	// Load metabox classes.
-	require_once( 'WL_Metabox/class-wl-metabox.php' );
+    // Load metabox classes.
+    require_once( 'WL_Metabox/class-wl-metabox.php' );
 
-	new WL_Metabox();     // Everything is done inside here with the correct timing.
+    new WL_Metabox();     // Everything is done inside here with the correct timing.
 
 }
 
 if ( is_admin() ) {
-	add_action( 'load-post.php', 'wl_register_metaboxes' );
-	add_action( 'load-post-new.php', 'wl_register_metaboxes' );
+    add_action( 'load-post.php', 'wl_register_metaboxes' );
+    add_action( 'load-post-new.php', 'wl_register_metaboxes' );
 }
 
 /**
@@ -29,28 +29,28 @@ 
  */
 function wl_admin_add_entities_meta_box( $post_type ) {
 
-	/*
+    /*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
 	 *
 	 * @since 3.20.3
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
-		return;
-	}
-
-	// Bail out if the post type doesn't support a TinyMCE editor.
-	if ( ! wl_post_type_supports_editor( $post_type ) ) {
-		return;
-	}
-
-	if ( ! Wordlift_Admin::is_gutenberg() ) {
-		// Add main meta box for related entities and 4W only if not Gutenberg
-		add_meta_box(
-			'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
-		);
-	}
+    if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+        return;
+    }
+
+    // Bail out if the post type doesn't support a TinyMCE editor.
+    if ( ! wl_post_type_supports_editor( $post_type ) ) {
+        return;
+    }
+
+    if ( ! Wordlift_Admin::is_gutenberg() ) {
+        // Add main meta box for related entities and 4W only if not Gutenberg
+        add_meta_box(
+            'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
+        );
+    }
 
 }
 
@@ -67,19 +67,19 @@ 
  */
 function wl_post_type_supports_editor( $post_type ) {
 
-	$default = post_type_supports( $post_type, 'editor' );
-
-	/**
-	 * Allow 3rd parties to force the classification to load.
-	 *
-	 * @param bool $default The preset value as gathered by the `post_type_supports` call.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
-	 *
-	 * @since 3.19.4
-	 *
-	 */
-	return apply_filters( 'wl_post_type_supports_editor', $default, $post_type );
+    $default = post_type_supports( $post_type, 'editor' );
+
+    /**
+     * Allow 3rd parties to force the classification to load.
+     *
+     * @param bool $default The preset value as gathered by the `post_type_supports` call.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/847.
+     *
+     * @since 3.19.4
+     *
+     */
+    return apply_filters( 'wl_post_type_supports_editor', $default, $post_type );
 }
 
 /**
@@ -89,135 +89,135 @@ 
  */
 function wl_entities_box_content( $post, $wrapper = true ) {
 
-	// Angularjs edit-post widget wrapper.
-	if ( $wrapper ) {
-		echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
-	}
+    // Angularjs edit-post widget wrapper.
+    if ( $wrapper ) {
+        echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
+    }
 }
 
 function wl_entities_box_content_scripts() {
-	$post = get_post();
+    $post = get_post();
 
-	// Angularjs edit-post widget classification boxes configuration.
-	$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+    // Angularjs edit-post widget classification boxes configuration.
+    $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
 
-	// Array to store all related entities ids.
-	$all_referenced_entities_ids = array();
+    // Array to store all related entities ids.
+    $all_referenced_entities_ids = array();
 
-	// Add selected entities to classification_boxes.
-	foreach ( $classification_boxes as $i => $box ) {
-		// Build the proper relation name.
-		$relation_name = $box['id'];
+    // Add selected entities to classification_boxes.
+    foreach ( $classification_boxes as $i => $box ) {
+        // Build the proper relation name.
+        $relation_name = $box['id'];
 
-		// Get the entity referenced from the post content.
-		/*
+        // Get the entity referenced from the post content.
+        /*
 		 * Allow 3rd parties to provide another post content.
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		$entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris( $post_content );
-
-		// Enhance current box selected entities.
-		$classification_boxes[ $i ]['selectedEntities'] = $entity_uris;
-
-		// Maps the URIs to entity posts.
-		$entity_service = Wordlift_Entity_Service::get_instance();
-
-		// Replace all entity URI's with post ID's if found or null if there is no related post.
-		$entity_ids = array_map( function ( $item ) use ( $entity_service ) {
-			// Return entity post by the entity URI or null.
-			$post = $entity_service->get_entity_post_by_uri( $item );
-
-			// Check that the post object is not null.
-			if ( ! empty( $post ) ) {
-				return $post->ID;
-			}
-		}, $entity_uris );
-		// Store the entity ids for all the 4W.
-		$all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
-
-	}
-
-	// Json encoding for classification boxes structure.
-	$classification_boxes = wp_json_encode( $classification_boxes );
-
-	// Ensure there are no repetitions of the referenced entities.
-	$all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
-
-	// Remove all null, false and empty strings.
-	// NULL is being returned in some cases, when there is not related post, so we need to remove it.
-	$all_referenced_entities_ids = array_filter( $all_referenced_entities_ids );
-
-	// Build the entity storage object.
-	$referenced_entities_obj = array();
-	foreach ( $all_referenced_entities_ids as $referenced_entity ) {
-		$entity = wl_serialize_entity( $referenced_entity );
-		// Set a default confidence of `PHP_INT_MAX` for already annotated entities.
-		$referenced_entities_obj[ $entity['id'] ] = $entity
-		                                            + array( 'confidence' => PHP_INT_MAX );
-	}
-
-	$referenced_entities_obj = empty( $referenced_entities_obj ) ?
-		'{}' : wp_json_encode( $referenced_entities_obj );
-
-	$published_place_id  = get_post_meta(
-		$post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
-	);
-	$published_place_obj = ( $published_place_id ) ?
-		wp_json_encode( wl_serialize_entity( $published_place_id ) ) :
-		null;
-
-	$topic_id  = get_post_meta(
-		$post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
-	);
-	$topic_obj = ( $topic_id ) ?
-		wp_json_encode( wl_serialize_entity( $topic_id ) ) :
-		null;
-
-	$configuration_service = Wordlift_Configuration_Service::get_instance();
-
-	$default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
-	$default_path           = WL_DEFAULT_PATH;
-	$dataset_uri            = $configuration_service->get_dataset_uri();
-	$current_post_uri       = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-	$is_entity              = Wordlift_Entity_Service::get_instance()->is_entity( $post->ID );
-
-	// Retrieve the current post author.
-	$post_author = get_userdata( $post->post_author )->display_name;
-	// Retrive the published date.
-	$published_date = get_the_time( 'Y-m-d', $post->ID );
-	// Current language.
-	$current_language            = $configuration_service->get_language_code();
-	$wordlift_timeline_shortcode = new Wordlift_Timeline_Shortcode();
-	$timelinejs_default_options  = json_encode( $wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT );
-	$addslashes_post_author      = addslashes( $post_author );
-
-	$metabox_settings = array(
-		"classificationBoxes"      => json_decode( $classification_boxes ),
-		"entities"                 => json_decode( $referenced_entities_obj ),
-		"currentPostId"            => intval( $post->ID ),
-		"currentPostUri"           => $current_post_uri,
-		"currentPostType"          => $post->post_type,
-		"isEntity"                 => ! empty( $is_entity ),
-		"defaultThumbnailPath"     => $default_thumbnail_path,
-		"defaultWordLiftPath"      => $default_path,
-		"datasetUri"               => $dataset_uri,
-		"currentUser"              => $addslashes_post_author,
-		"publishedDate"            => $published_date,
-		"publishedPlace"           => $published_place_obj,
-		"topic"                    => json_decode( $topic_obj ),
-		"currentLanguage"          => $current_language,
-		"timelinejsDefaultOptions" => json_decode( $timelinejs_default_options ),
-		"ajax_url"                 => admin_url( 'admin-ajax.php' ),
-	);
-
-	// Allow Classic and Block Editor scripts to register first.
-	// Hook to the Block Editor script.
-	wp_localize_script( 'wl-block-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
-
-	// Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
-	wp_localize_script( 'wl-classic-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
+        $post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+        $entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris( $post_content );
+
+        // Enhance current box selected entities.
+        $classification_boxes[ $i ]['selectedEntities'] = $entity_uris;
+
+        // Maps the URIs to entity posts.
+        $entity_service = Wordlift_Entity_Service::get_instance();
+
+        // Replace all entity URI's with post ID's if found or null if there is no related post.
+        $entity_ids = array_map( function ( $item ) use ( $entity_service ) {
+            // Return entity post by the entity URI or null.
+            $post = $entity_service->get_entity_post_by_uri( $item );
+
+            // Check that the post object is not null.
+            if ( ! empty( $post ) ) {
+                return $post->ID;
+            }
+        }, $entity_uris );
+        // Store the entity ids for all the 4W.
+        $all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
+
+    }
+
+    // Json encoding for classification boxes structure.
+    $classification_boxes = wp_json_encode( $classification_boxes );
+
+    // Ensure there are no repetitions of the referenced entities.
+    $all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
+
+    // Remove all null, false and empty strings.
+    // NULL is being returned in some cases, when there is not related post, so we need to remove it.
+    $all_referenced_entities_ids = array_filter( $all_referenced_entities_ids );
+
+    // Build the entity storage object.
+    $referenced_entities_obj = array();
+    foreach ( $all_referenced_entities_ids as $referenced_entity ) {
+        $entity = wl_serialize_entity( $referenced_entity );
+        // Set a default confidence of `PHP_INT_MAX` for already annotated entities.
+        $referenced_entities_obj[ $entity['id'] ] = $entity
+                                                    + array( 'confidence' => PHP_INT_MAX );
+    }
+
+    $referenced_entities_obj = empty( $referenced_entities_obj ) ?
+        '{}' : wp_json_encode( $referenced_entities_obj );
+
+    $published_place_id  = get_post_meta(
+        $post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
+    );
+    $published_place_obj = ( $published_place_id ) ?
+        wp_json_encode( wl_serialize_entity( $published_place_id ) ) :
+        null;
+
+    $topic_id  = get_post_meta(
+        $post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
+    );
+    $topic_obj = ( $topic_id ) ?
+        wp_json_encode( wl_serialize_entity( $topic_id ) ) :
+        null;
+
+    $configuration_service = Wordlift_Configuration_Service::get_instance();
+
+    $default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
+    $default_path           = WL_DEFAULT_PATH;
+    $dataset_uri            = $configuration_service->get_dataset_uri();
+    $current_post_uri       = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
+    $is_entity              = Wordlift_Entity_Service::get_instance()->is_entity( $post->ID );
+
+    // Retrieve the current post author.
+    $post_author = get_userdata( $post->post_author )->display_name;
+    // Retrive the published date.
+    $published_date = get_the_time( 'Y-m-d', $post->ID );
+    // Current language.
+    $current_language            = $configuration_service->get_language_code();
+    $wordlift_timeline_shortcode = new Wordlift_Timeline_Shortcode();
+    $timelinejs_default_options  = json_encode( $wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT );
+    $addslashes_post_author      = addslashes( $post_author );
+
+    $metabox_settings = array(
+        "classificationBoxes"      => json_decode( $classification_boxes ),
+        "entities"                 => json_decode( $referenced_entities_obj ),
+        "currentPostId"            => intval( $post->ID ),
+        "currentPostUri"           => $current_post_uri,
+        "currentPostType"          => $post->post_type,
+        "isEntity"                 => ! empty( $is_entity ),
+        "defaultThumbnailPath"     => $default_thumbnail_path,
+        "defaultWordLiftPath"      => $default_path,
+        "datasetUri"               => $dataset_uri,
+        "currentUser"              => $addslashes_post_author,
+        "publishedDate"            => $published_date,
+        "publishedPlace"           => $published_place_obj,
+        "topic"                    => json_decode( $topic_obj ),
+        "currentLanguage"          => $current_language,
+        "timelinejsDefaultOptions" => json_decode( $timelinejs_default_options ),
+        "ajax_url"                 => admin_url( 'admin-ajax.php' ),
+    );
+
+    // Allow Classic and Block Editor scripts to register first.
+    // Hook to the Block Editor script.
+    wp_localize_script( 'wl-block-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
+
+    // Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
+    wp_localize_script( 'wl-classic-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
 
 }
 

Spacing +56 added lines, -58 removed lines

@@ -11,15 +11,15 @@ 
 function wl_register_metaboxes() {
 
 	// Load metabox classes.
-	require_once( 'WL_Metabox/class-wl-metabox.php' );
+	require_once('WL_Metabox/class-wl-metabox.php');
 
-	new WL_Metabox();     // Everything is done inside here with the correct timing.
+	new WL_Metabox(); // Everything is done inside here with the correct timing.
 
 }
 
-if ( is_admin() ) {
-	add_action( 'load-post.php', 'wl_register_metaboxes' );
-	add_action( 'load-post-new.php', 'wl_register_metaboxes' );
+if (is_admin()) {
+	add_action('load-post.php', 'wl_register_metaboxes');
+	add_action('load-post-new.php', 'wl_register_metaboxes');
 }
 
 /**
@@ -27,7 +27,7 @@ 
  *
  * @param string $post_type The type of the current open post.
  */
-function wl_admin_add_entities_meta_box( $post_type ) {
+function wl_admin_add_entities_meta_box($post_type) {
 
 	/*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
@@ -36,25 +36,25 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+	if ( ! apply_filters('wl_can_see_classification_box', true)) {
 		return;
 	}
 
 	// Bail out if the post type doesn't support a TinyMCE editor.
-	if ( ! wl_post_type_supports_editor( $post_type ) ) {
+	if ( ! wl_post_type_supports_editor($post_type)) {
 		return;
 	}
 
-	if ( ! Wordlift_Admin::is_gutenberg() ) {
+	if ( ! Wordlift_Admin::is_gutenberg()) {
 		// Add main meta box for related entities and 4W only if not Gutenberg
 		add_meta_box(
-			'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
+			'wordlift_entities_box', __('WordLift', 'wordlift'), 'wl_entities_box_content', $post_type, 'side', 'high'
 		);
 	}
 
 }
 
-add_action( 'add_meta_boxes', 'wl_admin_add_entities_meta_box' );
+add_action('add_meta_boxes', 'wl_admin_add_entities_meta_box');
 
 /**
  * Whether the post type supports the editor UI.
@@ -65,9 +65,9 @@ 
  *
  * @return bool True if the editor UI is supported otherwise false.
  */
-function wl_post_type_supports_editor( $post_type ) {
+function wl_post_type_supports_editor($post_type) {
 
-	$default = post_type_supports( $post_type, 'editor' );
+	$default = post_type_supports($post_type, 'editor');
 
 	/**
 	 * Allow 3rd parties to force the classification to load.
@@ -79,7 +79,7 @@ 
 	 * @since 3.19.4
 	 *
 	 */
-	return apply_filters( 'wl_post_type_supports_editor', $default, $post_type );
+	return apply_filters('wl_post_type_supports_editor', $default, $post_type);
 }
 
 /**
@@ -87,10 +87,10 @@ 
  *
  * @param WP_Post $post The current post.
  */
-function wl_entities_box_content( $post, $wrapper = true ) {
+function wl_entities_box_content($post, $wrapper = true) {
 
 	// Angularjs edit-post widget wrapper.
-	if ( $wrapper ) {
+	if ($wrapper) {
 		echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
 	}
 }
@@ -99,13 +99,13 @@ 
 	$post = get_post();
 
 	// Angularjs edit-post widget classification boxes configuration.
-	$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+	$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
 
 	// Array to store all related entities ids.
 	$all_referenced_entities_ids = array();
 
 	// Add selected entities to classification_boxes.
-	foreach ( $classification_boxes as $i => $box ) {
+	foreach ($classification_boxes as $i => $box) {
 		// Build the proper relation name.
 		$relation_name = $box['id'];
 
@@ -115,111 +115,109 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		$entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris( $post_content );
+		$post_content = apply_filters('wl_post_content', $post->post_content, $post);
+		$entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris($post_content);
 
 		// Enhance current box selected entities.
-		$classification_boxes[ $i ]['selectedEntities'] = $entity_uris;
+		$classification_boxes[$i]['selectedEntities'] = $entity_uris;
 
 		// Maps the URIs to entity posts.
 		$entity_service = Wordlift_Entity_Service::get_instance();
 
 		// Replace all entity URI's with post ID's if found or null if there is no related post.
-		$entity_ids = array_map( function ( $item ) use ( $entity_service ) {
+		$entity_ids = array_map(function($item) use ($entity_service) {
 			// Return entity post by the entity URI or null.
-			$post = $entity_service->get_entity_post_by_uri( $item );
+			$post = $entity_service->get_entity_post_by_uri($item);
 
 			// Check that the post object is not null.
-			if ( ! empty( $post ) ) {
+			if ( ! empty($post)) {
 				return $post->ID;
 			}
-		}, $entity_uris );
+		}, $entity_uris);
 		// Store the entity ids for all the 4W.
-		$all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
+		$all_referenced_entities_ids = array_merge($all_referenced_entities_ids, $entity_ids);
 
 	}
 
 	// Json encoding for classification boxes structure.
-	$classification_boxes = wp_json_encode( $classification_boxes );
+	$classification_boxes = wp_json_encode($classification_boxes);
 
 	// Ensure there are no repetitions of the referenced entities.
-	$all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
+	$all_referenced_entities_ids = array_unique($all_referenced_entities_ids);
 
 	// Remove all null, false and empty strings.
 	// NULL is being returned in some cases, when there is not related post, so we need to remove it.
-	$all_referenced_entities_ids = array_filter( $all_referenced_entities_ids );
+	$all_referenced_entities_ids = array_filter($all_referenced_entities_ids);
 
 	// Build the entity storage object.
 	$referenced_entities_obj = array();
-	foreach ( $all_referenced_entities_ids as $referenced_entity ) {
-		$entity = wl_serialize_entity( $referenced_entity );
+	foreach ($all_referenced_entities_ids as $referenced_entity) {
+		$entity = wl_serialize_entity($referenced_entity);
 		// Set a default confidence of `PHP_INT_MAX` for already annotated entities.
-		$referenced_entities_obj[ $entity['id'] ] = $entity
-		                                            + array( 'confidence' => PHP_INT_MAX );
+		$referenced_entities_obj[$entity['id']] = $entity
+		                                            + array('confidence' => PHP_INT_MAX);
 	}
 
-	$referenced_entities_obj = empty( $referenced_entities_obj ) ?
-		'{}' : wp_json_encode( $referenced_entities_obj );
+	$referenced_entities_obj = empty($referenced_entities_obj) ?
+		'{}' : wp_json_encode($referenced_entities_obj);
 
 	$published_place_id  = get_post_meta(
 		$post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
 	);
-	$published_place_obj = ( $published_place_id ) ?
-		wp_json_encode( wl_serialize_entity( $published_place_id ) ) :
-		null;
+	$published_place_obj = ($published_place_id) ?
+		wp_json_encode(wl_serialize_entity($published_place_id)) : null;
 
 	$topic_id  = get_post_meta(
 		$post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
 	);
-	$topic_obj = ( $topic_id ) ?
-		wp_json_encode( wl_serialize_entity( $topic_id ) ) :
-		null;
+	$topic_obj = ($topic_id) ?
+		wp_json_encode(wl_serialize_entity($topic_id)) : null;
 
 	$configuration_service = Wordlift_Configuration_Service::get_instance();
 
 	$default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
 	$default_path           = WL_DEFAULT_PATH;
 	$dataset_uri            = $configuration_service->get_dataset_uri();
-	$current_post_uri       = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-	$is_entity              = Wordlift_Entity_Service::get_instance()->is_entity( $post->ID );
+	$current_post_uri       = Wordlift_Entity_Service::get_instance()->get_uri($post->ID);
+	$is_entity              = Wordlift_Entity_Service::get_instance()->is_entity($post->ID);
 
 	// Retrieve the current post author.
-	$post_author = get_userdata( $post->post_author )->display_name;
+	$post_author = get_userdata($post->post_author)->display_name;
 	// Retrive the published date.
-	$published_date = get_the_time( 'Y-m-d', $post->ID );
+	$published_date = get_the_time('Y-m-d', $post->ID);
 	// Current language.
 	$current_language            = $configuration_service->get_language_code();
 	$wordlift_timeline_shortcode = new Wordlift_Timeline_Shortcode();
-	$timelinejs_default_options  = json_encode( $wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT );
-	$addslashes_post_author      = addslashes( $post_author );
+	$timelinejs_default_options  = json_encode($wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT);
+	$addslashes_post_author      = addslashes($post_author);
 
 	$metabox_settings = array(
-		"classificationBoxes"      => json_decode( $classification_boxes ),
-		"entities"                 => json_decode( $referenced_entities_obj ),
-		"currentPostId"            => intval( $post->ID ),
+		"classificationBoxes"      => json_decode($classification_boxes),
+		"entities"                 => json_decode($referenced_entities_obj),
+		"currentPostId"            => intval($post->ID),
 		"currentPostUri"           => $current_post_uri,
 		"currentPostType"          => $post->post_type,
-		"isEntity"                 => ! empty( $is_entity ),
+		"isEntity"                 => ! empty($is_entity),
 		"defaultThumbnailPath"     => $default_thumbnail_path,
 		"defaultWordLiftPath"      => $default_path,
 		"datasetUri"               => $dataset_uri,
 		"currentUser"              => $addslashes_post_author,
 		"publishedDate"            => $published_date,
 		"publishedPlace"           => $published_place_obj,
-		"topic"                    => json_decode( $topic_obj ),
+		"topic"                    => json_decode($topic_obj),
 		"currentLanguage"          => $current_language,
-		"timelinejsDefaultOptions" => json_decode( $timelinejs_default_options ),
-		"ajax_url"                 => admin_url( 'admin-ajax.php' ),
+		"timelinejsDefaultOptions" => json_decode($timelinejs_default_options),
+		"ajax_url"                 => admin_url('admin-ajax.php'),
 	);
 
 	// Allow Classic and Block Editor scripts to register first.
 	// Hook to the Block Editor script.
-	wp_localize_script( 'wl-block-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
+	wp_localize_script('wl-block-editor', '_wlMetaBoxSettings', array('settings' => $metabox_settings));
 
 	// Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
-	wp_localize_script( 'wl-classic-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
+	wp_localize_script('wl-classic-editor', '_wlMetaBoxSettings', array('settings' => $metabox_settings));
 
 }
 
-add_action( 'admin_print_scripts-post.php', 'wl_entities_box_content_scripts', 11 );
-add_action( 'admin_print_scripts-post-new.php', 'wl_entities_box_content_scripts', 11 );
+add_action('admin_print_scripts-post.php', 'wl_entities_box_content_scripts', 11);
+add_action('admin_print_scripts-post-new.php', 'wl_entities_box_content_scripts', 11);

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

Indentation +415 added lines, -415 removed lines

@@ -19,129 +19,129 @@ 
  */
 class Wordlift_Entity_Type_Service {
 
-	/**
-	 * The {@link Wordlift_Schema_Service} instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 */
-	private $schema_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $instance The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Wordlift_Entity_Type_Service constructor.
-	 *
-	 * @param \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
-	 *
-	 * @since 3.7.0
-	 *
-	 */
-	public function __construct( $schema_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
-
-		$this->schema_service = $schema_service;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the {@link Wordlift_Entity_Type_Service} singleton instance.
-	 *
-	 * @return \Wordlift_Entity_Type_Service The {@link Wordlift_Entity_Type_Service} singleton instance.
-	 * @since 3.7.0
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the types associated with the specified entity post id.
-	 *
-	 * We have a strategy to define the entity type, given that everything is
-	 * an entity, i.e. also posts/pages and custom post types.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|null {
-	 * An array of type properties or null if no term is associated
-	 *
-	 * @type string css_class     The css class, e.g. `wl-thing`.
-	 * @type string uri           The schema.org class URI, e.g. `http://schema.org/Thing`.
-	 * @type array  same_as       An array of same as attributes.
-	 * @type array  custom_fields An array of custom fields.
-	 * @type array  linked_data   An array of {@link Wordlift_Sparql_Tuple_Rendition}.
-	 * }
-	 * @since 3.7.0
-	 *
-	 * @since 3.20.0 This function will **not** return entity types introduced with 3.20.0.
-	 *
-	 * @since 3.18.0 The cases are the following:
-	 *  1. the post has a term from the Entity Types Taxonomy: the term defines
-	 *     the entity type, e.g. Organization, Person, ...
-	 *  2. the post doesn't have a term from the Entity Types Taxonomy:
-	 *      a) the post is a `wl_entity` custom post type, then the post is
-	 *           assigned the `Thing` entity type by default.
-	 *      b) the post is a `post` post type, then the post is
-	 *           assigned the `Article` entity type by default.
-	 *      c) the post is a custom post type then it is
-	 *          assigned the `WebPage` entity type by default.
-	 *
-	 */
-	public function get( $post_id ) {
-
-		$this->log->trace( "Getting the post type for post $post_id..." );
-
-		// Get the post type.
-		$post_type = get_post_type( $post_id );
-
-		// Return `web-page` for non entities.
-		if ( ! self::is_valid_entity_post_type( $post_type ) ) {
-			$this->log->info( "Returning `web-page` for post $post_id." );
-
-			return $this->schema_service->get_schema( 'web-page' );
-		}
-
-		// Get the type from the associated classification.
-		$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-		// Return the schema type if there is a term found.
-		if ( ! is_wp_error( $terms ) && ! empty( $terms ) ) {
-			// Cycle through the terms and return the first one with a valid schema.
-			foreach ( $terms as $term ) {
-				$this->log->debug( "Found `{$term->slug}` term for post $post_id." );
-
-				// Try to get the schema for the term.
-				$schema = $this->schema_service->get_schema( $term->slug );
-
-				// If found, return it, ignoring the other types.
-				if ( null !== $schema ) {
-					// Return the entity type with the specified id.
-					return $schema;
-				}
-			}
-
-			/*
+    /**
+     * The {@link Wordlift_Schema_Service} instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     */
+    private $schema_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} singleton instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $instance The {@link Wordlift_Entity_Type_Service} singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Wordlift_Entity_Type_Service constructor.
+     *
+     * @param \Wordlift_Schema_Service $schema_service The {@link Wordlift_Schema_Service} instance.
+     *
+     * @since 3.7.0
+     *
+     */
+    public function __construct( $schema_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
+
+        $this->schema_service = $schema_service;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the {@link Wordlift_Entity_Type_Service} singleton instance.
+     *
+     * @return \Wordlift_Entity_Type_Service The {@link Wordlift_Entity_Type_Service} singleton instance.
+     * @since 3.7.0
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the types associated with the specified entity post id.
+     *
+     * We have a strategy to define the entity type, given that everything is
+     * an entity, i.e. also posts/pages and custom post types.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|null {
+     * An array of type properties or null if no term is associated
+     *
+     * @type string css_class     The css class, e.g. `wl-thing`.
+     * @type string uri           The schema.org class URI, e.g. `http://schema.org/Thing`.
+     * @type array  same_as       An array of same as attributes.
+     * @type array  custom_fields An array of custom fields.
+     * @type array  linked_data   An array of {@link Wordlift_Sparql_Tuple_Rendition}.
+     * }
+     * @since 3.7.0
+     *
+     * @since 3.20.0 This function will **not** return entity types introduced with 3.20.0.
+     *
+     * @since 3.18.0 The cases are the following:
+     *  1. the post has a term from the Entity Types Taxonomy: the term defines
+     *     the entity type, e.g. Organization, Person, ...
+     *  2. the post doesn't have a term from the Entity Types Taxonomy:
+     *      a) the post is a `wl_entity` custom post type, then the post is
+     *           assigned the `Thing` entity type by default.
+     *      b) the post is a `post` post type, then the post is
+     *           assigned the `Article` entity type by default.
+     *      c) the post is a custom post type then it is
+     *          assigned the `WebPage` entity type by default.
+     *
+     */
+    public function get( $post_id ) {
+
+        $this->log->trace( "Getting the post type for post $post_id..." );
+
+        // Get the post type.
+        $post_type = get_post_type( $post_id );
+
+        // Return `web-page` for non entities.
+        if ( ! self::is_valid_entity_post_type( $post_type ) ) {
+            $this->log->info( "Returning `web-page` for post $post_id." );
+
+            return $this->schema_service->get_schema( 'web-page' );
+        }
+
+        // Get the type from the associated classification.
+        $terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+        // Return the schema type if there is a term found.
+        if ( ! is_wp_error( $terms ) && ! empty( $terms ) ) {
+            // Cycle through the terms and return the first one with a valid schema.
+            foreach ( $terms as $term ) {
+                $this->log->debug( "Found `{$term->slug}` term for post $post_id." );
+
+                // Try to get the schema for the term.
+                $schema = $this->schema_service->get_schema( $term->slug );
+
+                // If found, return it, ignoring the other types.
+                if ( null !== $schema ) {
+                    // Return the entity type with the specified id.
+                    return $schema;
+                }
+            }
+
+            /*
 			 * When a schema isn't found, we return `thing`. Schema may not be found because
 			 * the new schema classes that we support since #852 aren't configured in the schema
 			 * service.
@@ -151,88 +151,88 @@ 
 			 * @since 3.20.0
 			 */
 
-			return $this->schema_service->get_schema( 'thing' );
-		}
-
-		// If it's a page or post return `Article`.
-		if ( in_array( $post_type, array( 'post', 'page' ) ) ) {
-			$this->log->debug( "Post $post_id has no terms, and it's a `post` type, returning `Article`." );
-
-			// Return "Article" schema type for posts.
-			return $this->schema_service->get_schema( 'article' );
-		}
-
-		// Return "Thing" schema type for entities.
-		$this->log->debug( "Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`." );
-
-		// Return the entity type with the specified id.
-		return $this->schema_service->get_schema( 'thing' );
-
-	}
-
-	/**
-	 * Get the term ids of the entity types associated to the specified post.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|WP_Error An array of entity types ids or a {@link WP_Error}.
-	 * @since 3.20.0
-	 *
-	 */
-	public function get_ids( $post_id ) {
-
-		return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'fields' => 'ids', ) );
-	}
-
-	/**
-	 * Get the camel case names of the entity types associated to the specified post.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|WP_Error An array of entity types camel case names or a {@link WP_Error}.
-	 * @since 3.20.0
-	 *
-	 */
-	public function get_names( $post_id ) {
-
-		$ids = $this->get_ids( $post_id );
-
-		return array_map( function ( $id ) {
-			return get_term_meta( $id, '_wl_name', true );
-		}, $ids );
-	}
-
-	/**
-	 * Set the main type for the specified entity post, given the type URI.
-	 *
-	 * @param int $post_id The post id.
-	 * @param string $type_uri The type URI.
-	 * @param bool $replace Whether the provided type must replace the existing types, by default `true`.
-	 *
-	 * @since 3.8.0
-	 *
-	 */
-	public function set( $post_id, $type_uri, $replace = true ) {
-
-		// If the type URI is empty we remove the type.
-		if ( empty( $type_uri ) ) {
-			$this->log->debug( "Removing entity type for post $post_id..." );
-
-			wp_set_object_terms( $post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-
-			return;
-		}
-
-		$this->log->debug( "Setting entity type for post $post_id..." );
-
-		// if the `$type_uri` starts with `wl-`, we're looking at the class name, which is `wl-` + slug.
-		$term = ( 0 === strpos( $type_uri, 'wl-' ) )
-			// Get term by slug.
-			? $this->get_term_by_slug( substr( $type_uri, 3 ) )
-			// Get term by URI.
-			: $this->get_term_by_uri( $type_uri );
-
-		/*
+            return $this->schema_service->get_schema( 'thing' );
+        }
+
+        // If it's a page or post return `Article`.
+        if ( in_array( $post_type, array( 'post', 'page' ) ) ) {
+            $this->log->debug( "Post $post_id has no terms, and it's a `post` type, returning `Article`." );
+
+            // Return "Article" schema type for posts.
+            return $this->schema_service->get_schema( 'article' );
+        }
+
+        // Return "Thing" schema type for entities.
+        $this->log->debug( "Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`." );
+
+        // Return the entity type with the specified id.
+        return $this->schema_service->get_schema( 'thing' );
+
+    }
+
+    /**
+     * Get the term ids of the entity types associated to the specified post.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|WP_Error An array of entity types ids or a {@link WP_Error}.
+     * @since 3.20.0
+     *
+     */
+    public function get_ids( $post_id ) {
+
+        return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'fields' => 'ids', ) );
+    }
+
+    /**
+     * Get the camel case names of the entity types associated to the specified post.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|WP_Error An array of entity types camel case names or a {@link WP_Error}.
+     * @since 3.20.0
+     *
+     */
+    public function get_names( $post_id ) {
+
+        $ids = $this->get_ids( $post_id );
+
+        return array_map( function ( $id ) {
+            return get_term_meta( $id, '_wl_name', true );
+        }, $ids );
+    }
+
+    /**
+     * Set the main type for the specified entity post, given the type URI.
+     *
+     * @param int $post_id The post id.
+     * @param string $type_uri The type URI.
+     * @param bool $replace Whether the provided type must replace the existing types, by default `true`.
+     *
+     * @since 3.8.0
+     *
+     */
+    public function set( $post_id, $type_uri, $replace = true ) {
+
+        // If the type URI is empty we remove the type.
+        if ( empty( $type_uri ) ) {
+            $this->log->debug( "Removing entity type for post $post_id..." );
+
+            wp_set_object_terms( $post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+
+            return;
+        }
+
+        $this->log->debug( "Setting entity type for post $post_id..." );
+
+        // if the `$type_uri` starts with `wl-`, we're looking at the class name, which is `wl-` + slug.
+        $term = ( 0 === strpos( $type_uri, 'wl-' ) )
+            // Get term by slug.
+            ? $this->get_term_by_slug( substr( $type_uri, 3 ) )
+            // Get term by URI.
+            : $this->get_term_by_uri( $type_uri );
+
+        /*
 		 * We always want to assign a type to an entity otherwise it won't show in the Vocabulary and it won't be
 		 * connected to Articles via mentions. We realized that the client JS code is passing `wl-other` when the
 		 * entity type isn't "notable". In which case we couldn't find an entity type.
@@ -243,215 +243,215 @@ 
 		 *
 		 * @since 3.23.4
 		 */
-		if ( false === $term ) {
-			$this->log->warn( "No term found for URI $type_uri, will use Thing." );
-
-			$term = $this->get_term_by_slug( 'thing' );
-
-			// We still need to be able to bali out here, for example WordPress 5.1 tests create posts before our taxonomy
-			// is installed.
-			if ( false === $term ) {
-				return;
-			}
-		}
-
-		$this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]..." );
-
-		// `$replace` is passed to decide whether to replace or append the term.
-		wp_set_object_terms( $post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace );
-
-	}
-
-	/**
-	 * Get an entity type term given its slug.
-	 *
-	 * @param string $slug The slug.
-	 *
-	 * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
-	 *                             or `$term` was not found.
-	 * @since 3.20.0
-	 *
-	 */
-	private function get_term_by_slug( $slug ) {
-
-		return get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-	}
-
-	/**
-	 * Get an entity type term given its URI.
-	 *
-	 * @param string $uri The uri.
-	 *
-	 * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
-	 *                             or `$term` was not found.
-	 * @since 3.20.0
-	 *
-	 */
-	public function get_term_by_uri( $uri ) {
-
-		$terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array(
-			'fields'     => 'all',
-			'get'        => 'all',
-			'number'     => 1,
-			'meta_query' => array(
-				array(
-					// Don't use a reference to Wordlift_Schemaorg_Class_Service, unless
-					// `WL_ALL_ENTITY_TYPES` is set to true.
-					'key'   => '_wl_uri',
-					'value' => $uri,
-				),
-			),
-			'orderby'    => 'term_id',
-			'order'      => 'ASC',
-		) );
-
-		return is_array( $terms ) && ! empty( $terms ) ? $terms[0] : false;
-	}
-
-	/**
-	 * Check whether an entity type is set for the {@link WP_Post} with the
-	 * specified id.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s `id`.
-	 * @param string $uri The entity type URI.
-	 *
-	 * @return bool True if an entity type is set otherwise false.
-	 * @since 3.15.0
-	 *
-	 */
-	public function has_entity_type( $post_id, $uri = null ) {
-
-		$this->log->debug( "Checking if post $post_id has an entity type [ $uri ]..." );
-
-		// If an URI hasn't been specified just check whether we have at least
-		// one entity type.
-		if ( null === $uri ) {
-
-			// Get the post terms for the specified post ID.
-			$terms = $this->get_post_terms( $post_id );
-
-			$this->log->debug( "Post $post_id has " . count( $terms ) . ' type(s).' );
-
-			// True if there's at least one term bound to the post.
-			return ( 0 < count( $terms ) );
-		}
-
-		$has_entity_type = ( null !== $this->has_post_term_by_uri( $post_id, $uri ) );
-
-		$this->log->debug( "Post $post_id has $uri type: " . ( $has_entity_type ? 'yes' : 'no' ) );
-
-		// Check whether the post has an entity type with that URI.
-		return $has_entity_type;
-	}
-
-	/**
-	 * Get the list of entity types' terms for the specified {@link WP_Post}.
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 *
-	 * @return array|WP_Error An array of entity types' terms or {@link WP_Error}.
-	 * @since 3.15.0
-	 *
-	 */
-	private function get_post_terms( $post_id ) {
-
-		return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array(
-			'hide_empty' => false,
-			// Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
-			// An issue has been opened with the AAM plugin author as well.
-			//
-			// see https://github.com/insideout10/wordlift-plugin/issues/334
-			// see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
-			'fields'     => 'all',
-		) );
-	}
-
-	/**
-	 * Get an entity type term given its URI.
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 * @param string $uri The entity type URI.
-	 *
-	 * @return bool True if the post has that type URI bound to it otherwise false.
-	 * @since 3.15.0
-	 *
-	 * @since 3.20.0 function renamed to `has_post_term_by_uri` and return type changed to `bool`.
-	 */
-	private function has_post_term_by_uri( $post_id, $uri ) {
-
-		// Get the post terms bound to the specified post.
-		$terms = $this->get_post_terms( $post_id );
-
-		// Look for a term if the specified URI.
-		foreach ( $terms as $term ) {
-			$term_uri = get_term_meta( $term->term_id, '_wl_uri', true );
-
-			if ( $uri === $term_uri ) {
-				return true;
-			}
-		}
-
-		// Return null.
-		return false;
-	}
-
-	/**
-	 * Get the custom fields for a specific post.
-	 *
-	 * @param int $post_id The post ID.
-	 *
-	 * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
-	 * @since 3.25.2
-	 *
-	 */
-	public function get_custom_fields( $post_id ) {
-
-		// Return custom fields for this specific entity's type.
-		$types = $this->get_ids( $post_id );
-
-		/** @var WP_Term[] $terms */
-		$terms = array_filter( array_map( function ( $item ) {
-			return get_term( $item );
-		}, $types ), function ( $item ) {
-			return isset( $item ) && is_a( $item, 'WP_Term' );
-		} );
-
-		$term_slugs = array_map( function ( $item ) {
-			return $item->slug;
-		}, $terms );
-
-		$term_slugs[] = 'thing';
-
-		$schema_service = Wordlift_Schema_Service::get_instance();
-
-		return array_reduce( $term_slugs, function ( $carry, $item ) use ( $schema_service ) {
-
-			$schema = $schema_service->get_schema( $item );
-
-			if ( ! isset( $schema['custom_fields'] ) ) {
-				return $carry;
-			}
-
-			return $carry + $schema['custom_fields'];
-		}, array() );
-	}
-
-
-	/**
-	 * Determines whether a post type can be used for entities.
-	 *
-	 * Criteria is that the post type is public. The list of valid post types
-	 * can be overridden with a filter.
-	 *
-	 * @param string $post_type A post type name.
-	 *
-	 * @return bool Return true if the post type can be used for entities, otherwise false.
-	 * @since 3.15.0
-	 *
-	 */
-	public static function is_valid_entity_post_type( $post_type ) {
-
-		return in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true );
-	}
+        if ( false === $term ) {
+            $this->log->warn( "No term found for URI $type_uri, will use Thing." );
+
+            $term = $this->get_term_by_slug( 'thing' );
+
+            // We still need to be able to bali out here, for example WordPress 5.1 tests create posts before our taxonomy
+            // is installed.
+            if ( false === $term ) {
+                return;
+            }
+        }
+
+        $this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]..." );
+
+        // `$replace` is passed to decide whether to replace or append the term.
+        wp_set_object_terms( $post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace );
+
+    }
+
+    /**
+     * Get an entity type term given its slug.
+     *
+     * @param string $slug The slug.
+     *
+     * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
+     *                             or `$term` was not found.
+     * @since 3.20.0
+     *
+     */
+    private function get_term_by_slug( $slug ) {
+
+        return get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+    }
+
+    /**
+     * Get an entity type term given its URI.
+     *
+     * @param string $uri The uri.
+     *
+     * @return false|WP_Term WP_Term instance on success. Will return false if `$taxonomy` does not exist
+     *                             or `$term` was not found.
+     * @since 3.20.0
+     *
+     */
+    public function get_term_by_uri( $uri ) {
+
+        $terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array(
+            'fields'     => 'all',
+            'get'        => 'all',
+            'number'     => 1,
+            'meta_query' => array(
+                array(
+                    // Don't use a reference to Wordlift_Schemaorg_Class_Service, unless
+                    // `WL_ALL_ENTITY_TYPES` is set to true.
+                    'key'   => '_wl_uri',
+                    'value' => $uri,
+                ),
+            ),
+            'orderby'    => 'term_id',
+            'order'      => 'ASC',
+        ) );
+
+        return is_array( $terms ) && ! empty( $terms ) ? $terms[0] : false;
+    }
+
+    /**
+     * Check whether an entity type is set for the {@link WP_Post} with the
+     * specified id.
+     *
+     * @param int $post_id The {@link WP_Post}'s `id`.
+     * @param string $uri The entity type URI.
+     *
+     * @return bool True if an entity type is set otherwise false.
+     * @since 3.15.0
+     *
+     */
+    public function has_entity_type( $post_id, $uri = null ) {
+
+        $this->log->debug( "Checking if post $post_id has an entity type [ $uri ]..." );
+
+        // If an URI hasn't been specified just check whether we have at least
+        // one entity type.
+        if ( null === $uri ) {
+
+            // Get the post terms for the specified post ID.
+            $terms = $this->get_post_terms( $post_id );
+
+            $this->log->debug( "Post $post_id has " . count( $terms ) . ' type(s).' );
+
+            // True if there's at least one term bound to the post.
+            return ( 0 < count( $terms ) );
+        }
+
+        $has_entity_type = ( null !== $this->has_post_term_by_uri( $post_id, $uri ) );
+
+        $this->log->debug( "Post $post_id has $uri type: " . ( $has_entity_type ? 'yes' : 'no' ) );
+
+        // Check whether the post has an entity type with that URI.
+        return $has_entity_type;
+    }
+
+    /**
+     * Get the list of entity types' terms for the specified {@link WP_Post}.
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     *
+     * @return array|WP_Error An array of entity types' terms or {@link WP_Error}.
+     * @since 3.15.0
+     *
+     */
+    private function get_post_terms( $post_id ) {
+
+        return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array(
+            'hide_empty' => false,
+            // Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
+            // An issue has been opened with the AAM plugin author as well.
+            //
+            // see https://github.com/insideout10/wordlift-plugin/issues/334
+            // see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
+            'fields'     => 'all',
+        ) );
+    }
+
+    /**
+     * Get an entity type term given its URI.
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     * @param string $uri The entity type URI.
+     *
+     * @return bool True if the post has that type URI bound to it otherwise false.
+     * @since 3.15.0
+     *
+     * @since 3.20.0 function renamed to `has_post_term_by_uri` and return type changed to `bool`.
+     */
+    private function has_post_term_by_uri( $post_id, $uri ) {
+
+        // Get the post terms bound to the specified post.
+        $terms = $this->get_post_terms( $post_id );
+
+        // Look for a term if the specified URI.
+        foreach ( $terms as $term ) {
+            $term_uri = get_term_meta( $term->term_id, '_wl_uri', true );
+
+            if ( $uri === $term_uri ) {
+                return true;
+            }
+        }
+
+        // Return null.
+        return false;
+    }
+
+    /**
+     * Get the custom fields for a specific post.
+     *
+     * @param int $post_id The post ID.
+     *
+     * @return array An array of custom fields (see `custom_fields` in Wordlift_Schema_Service).
+     * @since 3.25.2
+     *
+     */
+    public function get_custom_fields( $post_id ) {
+
+        // Return custom fields for this specific entity's type.
+        $types = $this->get_ids( $post_id );
+
+        /** @var WP_Term[] $terms */
+        $terms = array_filter( array_map( function ( $item ) {
+            return get_term( $item );
+        }, $types ), function ( $item ) {
+            return isset( $item ) && is_a( $item, 'WP_Term' );
+        } );
+
+        $term_slugs = array_map( function ( $item ) {
+            return $item->slug;
+        }, $terms );
+
+        $term_slugs[] = 'thing';
+
+        $schema_service = Wordlift_Schema_Service::get_instance();
+
+        return array_reduce( $term_slugs, function ( $carry, $item ) use ( $schema_service ) {
+
+            $schema = $schema_service->get_schema( $item );
+
+            if ( ! isset( $schema['custom_fields'] ) ) {
+                return $carry;
+            }
+
+            return $carry + $schema['custom_fields'];
+        }, array() );
+    }
+
+
+    /**
+     * Determines whether a post type can be used for entities.
+     *
+     * Criteria is that the post type is public. The list of valid post types
+     * can be overridden with a filter.
+     *
+     * @param string $post_type A post type name.
+     *
+     * @return bool Return true if the post type can be used for entities, otherwise false.
+     * @since 3.15.0
+     *
+     */
+    public static function is_valid_entity_post_type( $post_type ) {
+
+        return in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true );
+    }
 
 }

Spacing +77 added lines, -77 removed lines

@@ -54,9 +54,9 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public function __construct( $schema_service ) {
+	public function __construct($schema_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Type_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Type_Service');
 
 		$this->schema_service = $schema_service;
 
@@ -108,34 +108,34 @@ 
 	 *          assigned the `WebPage` entity type by default.
 	 *
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
-		$this->log->trace( "Getting the post type for post $post_id..." );
+		$this->log->trace("Getting the post type for post $post_id...");
 
 		// Get the post type.
-		$post_type = get_post_type( $post_id );
+		$post_type = get_post_type($post_id);
 
 		// Return `web-page` for non entities.
-		if ( ! self::is_valid_entity_post_type( $post_type ) ) {
-			$this->log->info( "Returning `web-page` for post $post_id." );
+		if ( ! self::is_valid_entity_post_type($post_type)) {
+			$this->log->info("Returning `web-page` for post $post_id.");
 
-			return $this->schema_service->get_schema( 'web-page' );
+			return $this->schema_service->get_schema('web-page');
 		}
 
 		// Get the type from the associated classification.
-		$terms = wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		$terms = wp_get_object_terms($post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
 		// Return the schema type if there is a term found.
-		if ( ! is_wp_error( $terms ) && ! empty( $terms ) ) {
+		if ( ! is_wp_error($terms) && ! empty($terms)) {
 			// Cycle through the terms and return the first one with a valid schema.
-			foreach ( $terms as $term ) {
-				$this->log->debug( "Found `{$term->slug}` term for post $post_id." );
+			foreach ($terms as $term) {
+				$this->log->debug("Found `{$term->slug}` term for post $post_id.");
 
 				// Try to get the schema for the term.
-				$schema = $this->schema_service->get_schema( $term->slug );
+				$schema = $this->schema_service->get_schema($term->slug);
 
 				// If found, return it, ignoring the other types.
-				if ( null !== $schema ) {
+				if (null !== $schema) {
 					// Return the entity type with the specified id.
 					return $schema;
 				}
@@ -151,22 +151,22 @@ 
 			 * @since 3.20.0
 			 */
 
-			return $this->schema_service->get_schema( 'thing' );
+			return $this->schema_service->get_schema('thing');
 		}
 
 		// If it's a page or post return `Article`.
-		if ( in_array( $post_type, array( 'post', 'page' ) ) ) {
-			$this->log->debug( "Post $post_id has no terms, and it's a `post` type, returning `Article`." );
+		if (in_array($post_type, array('post', 'page'))) {
+			$this->log->debug("Post $post_id has no terms, and it's a `post` type, returning `Article`.");
 
 			// Return "Article" schema type for posts.
-			return $this->schema_service->get_schema( 'article' );
+			return $this->schema_service->get_schema('article');
 		}
 
 		// Return "Thing" schema type for entities.
-		$this->log->debug( "Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`." );
+		$this->log->debug("Post $post_id has no terms, but it's a `wl_entity` type, returning `Thing`.");
 
 		// Return the entity type with the specified id.
-		return $this->schema_service->get_schema( 'thing' );
+		return $this->schema_service->get_schema('thing');
 
 	}
 
@@ -179,9 +179,9 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function get_ids( $post_id ) {
+	public function get_ids($post_id) {
 
-		return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'fields' => 'ids', ) );
+		return wp_get_object_terms($post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array('fields' => 'ids',));
 	}
 
 	/**
@@ -193,13 +193,13 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function get_names( $post_id ) {
+	public function get_names($post_id) {
 
-		$ids = $this->get_ids( $post_id );
+		$ids = $this->get_ids($post_id);
 
-		return array_map( function ( $id ) {
-			return get_term_meta( $id, '_wl_name', true );
-		}, $ids );
+		return array_map(function($id) {
+			return get_term_meta($id, '_wl_name', true);
+		}, $ids);
 	}
 
 	/**
@@ -212,25 +212,25 @@ 
 	 * @since 3.8.0
 	 *
 	 */
-	public function set( $post_id, $type_uri, $replace = true ) {
+	public function set($post_id, $type_uri, $replace = true) {
 
 		// If the type URI is empty we remove the type.
-		if ( empty( $type_uri ) ) {
-			$this->log->debug( "Removing entity type for post $post_id..." );
+		if (empty($type_uri)) {
+			$this->log->debug("Removing entity type for post $post_id...");
 
-			wp_set_object_terms( $post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			wp_set_object_terms($post_id, null, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
 			return;
 		}
 
-		$this->log->debug( "Setting entity type for post $post_id..." );
+		$this->log->debug("Setting entity type for post $post_id...");
 
 		// if the `$type_uri` starts with `wl-`, we're looking at the class name, which is `wl-` + slug.
-		$term = ( 0 === strpos( $type_uri, 'wl-' ) )
+		$term = (0 === strpos($type_uri, 'wl-'))
 			// Get term by slug.
-			? $this->get_term_by_slug( substr( $type_uri, 3 ) )
+			? $this->get_term_by_slug(substr($type_uri, 3))
 			// Get term by URI.
-			: $this->get_term_by_uri( $type_uri );
+			: $this->get_term_by_uri($type_uri);
 
 		/*
 		 * We always want to assign a type to an entity otherwise it won't show in the Vocabulary and it won't be
@@ -243,22 +243,22 @@ 
 		 *
 		 * @since 3.23.4
 		 */
-		if ( false === $term ) {
-			$this->log->warn( "No term found for URI $type_uri, will use Thing." );
+		if (false === $term) {
+			$this->log->warn("No term found for URI $type_uri, will use Thing.");
 
-			$term = $this->get_term_by_slug( 'thing' );
+			$term = $this->get_term_by_slug('thing');
 
 			// We still need to be able to bali out here, for example WordPress 5.1 tests create posts before our taxonomy
 			// is installed.
-			if ( false === $term ) {
+			if (false === $term) {
 				return;
 			}
 		}
 
-		$this->log->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]..." );
+		$this->log->debug("Setting entity type [ post id :: $post_id ][ term id :: $term->term_id ][ term slug :: $term->slug ][ type uri :: $type_uri ]...");
 
 		// `$replace` is passed to decide whether to replace or append the term.
-		wp_set_object_terms( $post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace );
+		wp_set_object_terms($post_id, $term->term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, ! $replace);
 
 	}
 
@@ -272,9 +272,9 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	private function get_term_by_slug( $slug ) {
+	private function get_term_by_slug($slug) {
 
-		return get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		return get_term_by('slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 	}
 
 	/**
@@ -287,9 +287,9 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function get_term_by_uri( $uri ) {
+	public function get_term_by_uri($uri) {
 
-		$terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array(
+		$terms = get_terms(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array(
 			'fields'     => 'all',
 			'get'        => 'all',
 			'number'     => 1,
@@ -303,9 +303,9 @@ 
 			),
 			'orderby'    => 'term_id',
 			'order'      => 'ASC',
-		) );
+		));
 
-		return is_array( $terms ) && ! empty( $terms ) ? $terms[0] : false;
+		return is_array($terms) && ! empty($terms) ? $terms[0] : false;
 	}
 
 	/**
@@ -319,26 +319,26 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public function has_entity_type( $post_id, $uri = null ) {
+	public function has_entity_type($post_id, $uri = null) {
 
-		$this->log->debug( "Checking if post $post_id has an entity type [ $uri ]..." );
+		$this->log->debug("Checking if post $post_id has an entity type [ $uri ]...");
 
 		// If an URI hasn't been specified just check whether we have at least
 		// one entity type.
-		if ( null === $uri ) {
+		if (null === $uri) {
 
 			// Get the post terms for the specified post ID.
-			$terms = $this->get_post_terms( $post_id );
+			$terms = $this->get_post_terms($post_id);
 
-			$this->log->debug( "Post $post_id has " . count( $terms ) . ' type(s).' );
+			$this->log->debug("Post $post_id has ".count($terms).' type(s).');
 
 			// True if there's at least one term bound to the post.
-			return ( 0 < count( $terms ) );
+			return (0 < count($terms));
 		}
 
-		$has_entity_type = ( null !== $this->has_post_term_by_uri( $post_id, $uri ) );
+		$has_entity_type = (null !== $this->has_post_term_by_uri($post_id, $uri));
 
-		$this->log->debug( "Post $post_id has $uri type: " . ( $has_entity_type ? 'yes' : 'no' ) );
+		$this->log->debug("Post $post_id has $uri type: ".($has_entity_type ? 'yes' : 'no'));
 
 		// Check whether the post has an entity type with that URI.
 		return $has_entity_type;
@@ -353,9 +353,9 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	private function get_post_terms( $post_id ) {
+	private function get_post_terms($post_id) {
 
-		return wp_get_object_terms( $post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array(
+		return wp_get_object_terms($post_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array(
 			'hide_empty' => false,
 			// Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
 			// An issue has been opened with the AAM plugin author as well.
@@ -363,7 +363,7 @@ 
 			// see https://github.com/insideout10/wordlift-plugin/issues/334
 			// see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
 			'fields'     => 'all',
-		) );
+		));
 	}
 
 	/**
@@ -377,16 +377,16 @@ 
 	 *
 	 * @since 3.20.0 function renamed to `has_post_term_by_uri` and return type changed to `bool`.
 	 */
-	private function has_post_term_by_uri( $post_id, $uri ) {
+	private function has_post_term_by_uri($post_id, $uri) {
 
 		// Get the post terms bound to the specified post.
-		$terms = $this->get_post_terms( $post_id );
+		$terms = $this->get_post_terms($post_id);
 
 		// Look for a term if the specified URI.
-		foreach ( $terms as $term ) {
-			$term_uri = get_term_meta( $term->term_id, '_wl_uri', true );
+		foreach ($terms as $term) {
+			$term_uri = get_term_meta($term->term_id, '_wl_uri', true);
 
-			if ( $uri === $term_uri ) {
+			if ($uri === $term_uri) {
 				return true;
 			}
 		}
@@ -404,36 +404,36 @@ 
 	 * @since 3.25.2
 	 *
 	 */
-	public function get_custom_fields( $post_id ) {
+	public function get_custom_fields($post_id) {
 
 		// Return custom fields for this specific entity's type.
-		$types = $this->get_ids( $post_id );
+		$types = $this->get_ids($post_id);
 
 		/** @var WP_Term[] $terms */
-		$terms = array_filter( array_map( function ( $item ) {
-			return get_term( $item );
-		}, $types ), function ( $item ) {
-			return isset( $item ) && is_a( $item, 'WP_Term' );
+		$terms = array_filter(array_map(function($item) {
+			return get_term($item);
+		}, $types), function($item) {
+			return isset($item) && is_a($item, 'WP_Term');
 		} );
 
-		$term_slugs = array_map( function ( $item ) {
+		$term_slugs = array_map(function($item) {
 			return $item->slug;
-		}, $terms );
+		}, $terms);
 
 		$term_slugs[] = 'thing';
 
 		$schema_service = Wordlift_Schema_Service::get_instance();
 
-		return array_reduce( $term_slugs, function ( $carry, $item ) use ( $schema_service ) {
+		return array_reduce($term_slugs, function($carry, $item) use ($schema_service) {
 
-			$schema = $schema_service->get_schema( $item );
+			$schema = $schema_service->get_schema($item);
 
-			if ( ! isset( $schema['custom_fields'] ) ) {
+			if ( ! isset($schema['custom_fields'])) {
 				return $carry;
 			}
 
 			return $carry + $schema['custom_fields'];
-		}, array() );
+		}, array());
 	}
 
 
@@ -449,9 +449,9 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public static function is_valid_entity_post_type( $post_type ) {
+	public static function is_valid_entity_post_type($post_type) {
 
-		return in_array( $post_type, Wordlift_Entity_Service::valid_entity_post_types(), true );
+		return in_array($post_type, Wordlift_Entity_Service::valid_entity_post_types(), true);
 	}
 
 }

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

Indentation +264 added lines, -264 removed lines

@@ -13,275 +13,275 @@
  */
 class Wordlift_Entity_Post_To_Jsonld_Converter extends Wordlift_Abstract_Post_To_Jsonld_Converter {
 
-	/**
-	 * A {@link Wordlift_Property_Getter} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Property_Getter $property_getter A {@link Wordlift_Property_Getter} instance.
-	 */
-	private $property_getter;
-
-	/**
-	 * The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var null|Wordlift_Schemaorg_Property_Service The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
-	 */
-	private $schemaorg_property_service;
-
-	/**
-	 * The {@link Wordlift_Post_To_Jsonld_Converter} is used to convert entities that also have the `article` term.
-	 *
-	 * @since 3.25.2
-	 * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter The {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 */
-	private $post_to_jsonld_converter;
-
-	/**
-	 * Wordlift_Entity_To_Jsonld_Converter constructor.
-	 *
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
-	 * @param \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
-	 * @param \Wordlift_Property_Getter $property_getter A {@link Wordlift_Property_Getter} instance.
-	 * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service A {@link Wordlift_Schemaorg_Property_Service} instance.
-	 * @param \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter The {@link Wordlift_Post_To_Jsonld_Converter} instance.
-	 *
-	 * @since 3.8.0
-	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
-
-		$this->property_getter            = $property_getter;
-		$this->schemaorg_property_service = $schemaorg_property_service;
-		$this->post_to_jsonld_converter   = $post_to_jsonld_converter;
-
-	}
-
-	/**
-	 * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
-	 * found while processing the post is set in the $references array.
-	 *
-	 * @param int $post_id The {@link WP_Post} id.
-	 *
-	 * @param array $references An array of entity references.
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.8.0
-	 *
-	 */
-	public function convert( $post_id, &$references = array() ) {
-
-		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
-			// Post not found.
-			return null;
-		}
-
-		// Get the base JSON-LD and the list of entities referenced by this entity.
-		if ( has_term( 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id ) ) {
-			$jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references );
-		} else {
-			$jsonld = parent::convert( $post_id, $references );
-		}
-
-		// Get the entity name.
-		$jsonld['name'] = $post->post_title;
-
-		// 3.13.0, add alternate names.
-		$alternative_labels = $this->entity_service->get_alternative_labels( $post_id );
-		if ( 0 < count( $alternative_labels ) ) {
-			$jsonld['alternateName'] = $alternative_labels;
-		}
-
-		// Get the entity `@type` with custom fields set by the Wordlift_Schema_Service.
-		//
-		// This allows us to gather the basic properties as defined by the `Thing` entity type.
-		// Get the configured type custom fields.
-		$custom_fields = $this->entity_type_service->get_custom_fields( $post_id );
-
-		if ( isset( $custom_fields ) ) {
-			$this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references );
-		}
-
-		/*
+    /**
+     * A {@link Wordlift_Property_Getter} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Property_Getter $property_getter A {@link Wordlift_Property_Getter} instance.
+     */
+    private $property_getter;
+
+    /**
+     * The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var null|Wordlift_Schemaorg_Property_Service The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
+     */
+    private $schemaorg_property_service;
+
+    /**
+     * The {@link Wordlift_Post_To_Jsonld_Converter} is used to convert entities that also have the `article` term.
+     *
+     * @since 3.25.2
+     * @var \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter The {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     */
+    private $post_to_jsonld_converter;
+
+    /**
+     * Wordlift_Entity_To_Jsonld_Converter constructor.
+     *
+     * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
+     * @param \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
+     * @param \Wordlift_Property_Getter $property_getter A {@link Wordlift_Property_Getter} instance.
+     * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service A {@link Wordlift_Schemaorg_Property_Service} instance.
+     * @param \Wordlift_Post_To_Jsonld_Converter $post_to_jsonld_converter The {@link Wordlift_Post_To_Jsonld_Converter} instance.
+     *
+     * @since 3.8.0
+     */
+    public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter ) {
+        parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+
+        $this->property_getter            = $property_getter;
+        $this->schemaorg_property_service = $schemaorg_property_service;
+        $this->post_to_jsonld_converter   = $post_to_jsonld_converter;
+
+    }
+
+    /**
+     * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
+     * found while processing the post is set in the $references array.
+     *
+     * @param int $post_id The {@link WP_Post} id.
+     *
+     * @param array $references An array of entity references.
+     *
+     * @return array A JSON-LD array.
+     * @since 3.8.0
+     *
+     */
+    public function convert( $post_id, &$references = array() ) {
+
+        // Get the post instance.
+        $post = get_post( $post_id );
+        if ( null === $post ) {
+            // Post not found.
+            return null;
+        }
+
+        // Get the base JSON-LD and the list of entities referenced by this entity.
+        if ( has_term( 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id ) ) {
+            $jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references );
+        } else {
+            $jsonld = parent::convert( $post_id, $references );
+        }
+
+        // Get the entity name.
+        $jsonld['name'] = $post->post_title;
+
+        // 3.13.0, add alternate names.
+        $alternative_labels = $this->entity_service->get_alternative_labels( $post_id );
+        if ( 0 < count( $alternative_labels ) ) {
+            $jsonld['alternateName'] = $alternative_labels;
+        }
+
+        // Get the entity `@type` with custom fields set by the Wordlift_Schema_Service.
+        //
+        // This allows us to gather the basic properties as defined by the `Thing` entity type.
+        // Get the configured type custom fields.
+        $custom_fields = $this->entity_type_service->get_custom_fields( $post_id );
+
+        if ( isset( $custom_fields ) ) {
+            $this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references );
+        }
+
+        /*
 		 * Get the properties attached to the post.
 		 *
 		 * @since 3.20.0 We attach properties directly to the posts.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			$this->process_post_properties( $jsonld, $post_id );
-		}
-
-		/**
-		 * Call the `wl_post_jsonld_array` filter. This filter allows 3rd parties to also modify the references.
-		 *
-		 * @param array $value {
-		 *
-		 * @type array $jsonld The JSON-LD structure.
-		 * @type int[] $references An array of post IDs.
-		 * }
-		 * @since 3.25.0
-		 *
-		 * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
-		 *
-		 * @api
-		 */
-		$ret_val    = apply_filters( 'wl_entity_jsonld_array', array(
-			'jsonld'     => $jsonld,
-			'references' => $references,
-		), $post_id );
-		$jsonld     = $ret_val['jsonld'];
-		$references = $ret_val['references'];
-
-		/**
-		 * Call the `wl_entity_jsonld` filter.
-		 *
-		 * @param array $jsonld The JSON-LD structure.
-		 * @param int $post_id The {@link WP_Post} `id`.
-		 * @param array $references The array of referenced entities.
-		 *
-		 * @since 3.20.0
-		 *
-		 * @api
-		 */
-		return apply_filters( 'wl_entity_jsonld', $this->post_process( $jsonld ), $post_id, $references );
-	}
-
-	/**
-	 * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
-	 * for the post entity type.
-	 *
-	 * @param array $jsonld The JSON-LD array.
-	 * @param array $fields The entity types field array.
-	 * @param WP_Post $post The target {@link WP_Post} instance.
-	 * @param array $references The references array.
-	 *
-	 * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
-	 *  the {@link Wordlift_Schema_Service} class.
-	 *
-	 */
-	private function process_type_custom_fields( &$jsonld, $fields, $post, &$references ) {
-
-		// Set a reference to use in closures.
-		$converter = $this;
-
-		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
-
-			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
-
-			// Get the value, the property service will get the right extractor
-			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key );
-
-			if ( empty( $value ) ) {
-				continue;
-			}
-
-			// Map the value to the property name.
-			// If we got an array with just one value, we return that one value.
-			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one( array_map( function ( $item ) use ( $converter, &$references ) {
-
-				if ( $item instanceof Wordlift_Property_Entity_Reference ) {
-
-					$url = $item->getURL();
-
-					// The refactored converters require the entity id.
-					$references[] = $item->getID();
-
-					return array(
-						'@id' => $url,
-					);
-				}
-
-				return $converter->relative_to_context( $item );
-			}, $value ) );
-
-		}
-
-	}
-
-	/**
-	 * Process the properties attached to the {@link WP_Post}.
-	 *
-	 * @param array $jsonld The JSON-LD array.
-	 * @param int $post_id The target {@link WP_Post} id.
-	 *
-	 * @since 3.20.0
-	 *
-	 */
-	private function process_post_properties( &$jsonld, $post_id ) {
-
-		// Get all the props.
-		$props = $this->schemaorg_property_service->get_all( $post_id );
-
-		// Process all the props.
-		foreach ( $props as $name => $instances ) {
-
-			// Get the values.
-			$values = array_map( function ( $instance ) {
-				return $instance['value'];
-			}, $instances );
-
-			// We might receive empty values, remove them.
-			$non_empty_values = array_filter( $values, function ( $value ) {
-				return ! empty( $value );
-			} );
-
-			// Skip empty properties.
-			if ( empty( $non_empty_values ) ) {
-				continue;
-			}
-
-			// @@todo: need to handle maybe Numbers and URLs differently.
-			// Make an array a single value when possible.
-			$jsonld[ $name ] = self::make_one( $non_empty_values );
-		}
-
-	}
-
-	/**
-	 * Post process the generated JSON to reorganize values which are stored as 1st
-	 * level in WP but are really 2nd level.
-	 *
-	 * @param array $jsonld An array of JSON-LD properties and values.
-	 *
-	 * @return array The array remapped.
-	 * @since 3.8.0
-	 *
-	 */
-	private function post_process( $jsonld ) {
-
-		foreach ( $jsonld as $key => $value ) {
-			if ( 'streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key ) {
-				$jsonld['address']['@type'] = 'PostalAddress';
-				$jsonld['address'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
-			}
-
-			if ( 'latitude' === $key || 'longitude' === $key ) {
-				$jsonld['geo']['@type'] = 'GeoCoordinates';
-				$jsonld['geo'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
-			}
-
-			if ( 'calories' === $key ) {
-				$jsonld['nutrition']['@type'] = 'NutritionInformation';
-				$jsonld['nutrition'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
-			}
-		}
-
-		return $jsonld;
-	}
+        if ( WL_ALL_ENTITY_TYPES ) {
+            $this->process_post_properties( $jsonld, $post_id );
+        }
+
+        /**
+         * Call the `wl_post_jsonld_array` filter. This filter allows 3rd parties to also modify the references.
+         *
+         * @param array $value {
+         *
+         * @type array $jsonld The JSON-LD structure.
+         * @type int[] $references An array of post IDs.
+         * }
+         * @since 3.25.0
+         *
+         * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
+         *
+         * @api
+         */
+        $ret_val    = apply_filters( 'wl_entity_jsonld_array', array(
+            'jsonld'     => $jsonld,
+            'references' => $references,
+        ), $post_id );
+        $jsonld     = $ret_val['jsonld'];
+        $references = $ret_val['references'];
+
+        /**
+         * Call the `wl_entity_jsonld` filter.
+         *
+         * @param array $jsonld The JSON-LD structure.
+         * @param int $post_id The {@link WP_Post} `id`.
+         * @param array $references The array of referenced entities.
+         *
+         * @since 3.20.0
+         *
+         * @api
+         */
+        return apply_filters( 'wl_entity_jsonld', $this->post_process( $jsonld ), $post_id, $references );
+    }
+
+    /**
+     * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
+     * for the post entity type.
+     *
+     * @param array $jsonld The JSON-LD array.
+     * @param array $fields The entity types field array.
+     * @param WP_Post $post The target {@link WP_Post} instance.
+     * @param array $references The references array.
+     *
+     * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
+     *  the {@link Wordlift_Schema_Service} class.
+     *
+     */
+    private function process_type_custom_fields( &$jsonld, $fields, $post, &$references ) {
+
+        // Set a reference to use in closures.
+        $converter = $this;
+
+        // Try each field on the entity.
+        foreach ( $fields as $key => $value ) {
+
+            // Get the predicate.
+            $name = $this->relative_to_context( $value['predicate'] );
+
+            // Get the value, the property service will get the right extractor
+            // for that property.
+            $value = $this->property_getter->get( $post->ID, $key );
+
+            if ( empty( $value ) ) {
+                continue;
+            }
+
+            // Map the value to the property name.
+            // If we got an array with just one value, we return that one value.
+            // If we got a Wordlift_Property_Entity_Reference we get the URL.
+            $jsonld[ $name ] = self::make_one( array_map( function ( $item ) use ( $converter, &$references ) {
+
+                if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+
+                    $url = $item->getURL();
+
+                    // The refactored converters require the entity id.
+                    $references[] = $item->getID();
+
+                    return array(
+                        '@id' => $url,
+                    );
+                }
+
+                return $converter->relative_to_context( $item );
+            }, $value ) );
+
+        }
+
+    }
+
+    /**
+     * Process the properties attached to the {@link WP_Post}.
+     *
+     * @param array $jsonld The JSON-LD array.
+     * @param int $post_id The target {@link WP_Post} id.
+     *
+     * @since 3.20.0
+     *
+     */
+    private function process_post_properties( &$jsonld, $post_id ) {
+
+        // Get all the props.
+        $props = $this->schemaorg_property_service->get_all( $post_id );
+
+        // Process all the props.
+        foreach ( $props as $name => $instances ) {
+
+            // Get the values.
+            $values = array_map( function ( $instance ) {
+                return $instance['value'];
+            }, $instances );
+
+            // We might receive empty values, remove them.
+            $non_empty_values = array_filter( $values, function ( $value ) {
+                return ! empty( $value );
+            } );
+
+            // Skip empty properties.
+            if ( empty( $non_empty_values ) ) {
+                continue;
+            }
+
+            // @@todo: need to handle maybe Numbers and URLs differently.
+            // Make an array a single value when possible.
+            $jsonld[ $name ] = self::make_one( $non_empty_values );
+        }
+
+    }
+
+    /**
+     * Post process the generated JSON to reorganize values which are stored as 1st
+     * level in WP but are really 2nd level.
+     *
+     * @param array $jsonld An array of JSON-LD properties and values.
+     *
+     * @return array The array remapped.
+     * @since 3.8.0
+     *
+     */
+    private function post_process( $jsonld ) {
+
+        foreach ( $jsonld as $key => $value ) {
+            if ( 'streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key ) {
+                $jsonld['address']['@type'] = 'PostalAddress';
+                $jsonld['address'][ $key ]  = $value;
+                unset( $jsonld[ $key ] );
+            }
+
+            if ( 'latitude' === $key || 'longitude' === $key ) {
+                $jsonld['geo']['@type'] = 'GeoCoordinates';
+                $jsonld['geo'][ $key ]  = $value;
+                unset( $jsonld[ $key ] );
+            }
+
+            if ( 'calories' === $key ) {
+                $jsonld['nutrition']['@type'] = 'NutritionInformation';
+                $jsonld['nutrition'][ $key ]  = $value;
+                unset( $jsonld[ $key ] );
+            }
+        }
+
+        return $jsonld;
+    }
 
 }

Spacing +47 added lines, -47 removed lines

@@ -52,8 +52,8 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+	public function __construct($entity_type_service, $entity_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter) {
+		parent::__construct($entity_type_service, $entity_service, $user_service, $attachment_service);
 
 		$this->property_getter            = $property_getter;
 		$this->schemaorg_property_service = $schemaorg_property_service;
@@ -73,28 +73,28 @@ 
 	 * @since 3.8.0
 	 *
 	 */
-	public function convert( $post_id, &$references = array() ) {
+	public function convert($post_id, &$references = array()) {
 
 		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
+		$post = get_post($post_id);
+		if (null === $post) {
 			// Post not found.
 			return null;
 		}
 
 		// Get the base JSON-LD and the list of entities referenced by this entity.
-		if ( has_term( 'article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id ) ) {
-			$jsonld = $this->post_to_jsonld_converter->convert( $post_id, $references );
+		if (has_term('article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id)) {
+			$jsonld = $this->post_to_jsonld_converter->convert($post_id, $references);
 		} else {
-			$jsonld = parent::convert( $post_id, $references );
+			$jsonld = parent::convert($post_id, $references);
 		}
 
 		// Get the entity name.
 		$jsonld['name'] = $post->post_title;
 
 		// 3.13.0, add alternate names.
-		$alternative_labels = $this->entity_service->get_alternative_labels( $post_id );
-		if ( 0 < count( $alternative_labels ) ) {
+		$alternative_labels = $this->entity_service->get_alternative_labels($post_id);
+		if (0 < count($alternative_labels)) {
 			$jsonld['alternateName'] = $alternative_labels;
 		}
 
@@ -102,10 +102,10 @@ 
 		//
 		// This allows us to gather the basic properties as defined by the `Thing` entity type.
 		// Get the configured type custom fields.
-		$custom_fields = $this->entity_type_service->get_custom_fields( $post_id );
+		$custom_fields = $this->entity_type_service->get_custom_fields($post_id);
 
-		if ( isset( $custom_fields ) ) {
-			$this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references );
+		if (isset($custom_fields)) {
+			$this->process_type_custom_fields($jsonld, $custom_fields, $post, $references);
 		}
 
 		/*
@@ -115,8 +115,8 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			$this->process_post_properties( $jsonld, $post_id );
+		if (WL_ALL_ENTITY_TYPES) {
+			$this->process_post_properties($jsonld, $post_id);
 		}
 
 		/**
@@ -133,10 +133,10 @@ 
 		 *
 		 * @api
 		 */
-		$ret_val    = apply_filters( 'wl_entity_jsonld_array', array(
+		$ret_val = apply_filters('wl_entity_jsonld_array', array(
 			'jsonld'     => $jsonld,
 			'references' => $references,
-		), $post_id );
+		), $post_id);
 		$jsonld     = $ret_val['jsonld'];
 		$references = $ret_val['references'];
 
@@ -151,7 +151,7 @@ 
 		 *
 		 * @api
 		 */
-		return apply_filters( 'wl_entity_jsonld', $this->post_process( $jsonld ), $post_id, $references );
+		return apply_filters('wl_entity_jsonld', $this->post_process($jsonld), $post_id, $references);
 	}
 
 	/**
@@ -167,31 +167,31 @@ 
 	 *  the {@link Wordlift_Schema_Service} class.
 	 *
 	 */
-	private function process_type_custom_fields( &$jsonld, $fields, $post, &$references ) {
+	private function process_type_custom_fields(&$jsonld, $fields, $post, &$references) {
 
 		// Set a reference to use in closures.
 		$converter = $this;
 
 		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
+		foreach ($fields as $key => $value) {
 
 			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
+			$name = $this->relative_to_context($value['predicate']);
 
 			// Get the value, the property service will get the right extractor
 			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key );
+			$value = $this->property_getter->get($post->ID, $key);
 
-			if ( empty( $value ) ) {
+			if (empty($value)) {
 				continue;
 			}
 
 			// Map the value to the property name.
 			// If we got an array with just one value, we return that one value.
 			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one( array_map( function ( $item ) use ( $converter, &$references ) {
+			$jsonld[$name] = self::make_one(array_map(function($item) use ($converter, &$references) {
 
-				if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+				if ($item instanceof Wordlift_Property_Entity_Reference) {
 
 					$url = $item->getURL();
 
@@ -203,8 +203,8 @@ 
 					);
 				}
 
-				return $converter->relative_to_context( $item );
-			}, $value ) );
+				return $converter->relative_to_context($item);
+			}, $value));
 
 		}
 
@@ -219,32 +219,32 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	private function process_post_properties( &$jsonld, $post_id ) {
+	private function process_post_properties(&$jsonld, $post_id) {
 
 		// Get all the props.
-		$props = $this->schemaorg_property_service->get_all( $post_id );
+		$props = $this->schemaorg_property_service->get_all($post_id);
 
 		// Process all the props.
-		foreach ( $props as $name => $instances ) {
+		foreach ($props as $name => $instances) {
 
 			// Get the values.
-			$values = array_map( function ( $instance ) {
+			$values = array_map(function($instance) {
 				return $instance['value'];
-			}, $instances );
+			}, $instances);
 
 			// We might receive empty values, remove them.
-			$non_empty_values = array_filter( $values, function ( $value ) {
-				return ! empty( $value );
+			$non_empty_values = array_filter($values, function($value) {
+				return ! empty($value);
 			} );
 
 			// Skip empty properties.
-			if ( empty( $non_empty_values ) ) {
+			if (empty($non_empty_values)) {
 				continue;
 			}
 
 			// @@todo: need to handle maybe Numbers and URLs differently.
 			// Make an array a single value when possible.
-			$jsonld[ $name ] = self::make_one( $non_empty_values );
+			$jsonld[$name] = self::make_one($non_empty_values);
 		}
 
 	}
@@ -259,25 +259,25 @@ 
 	 * @since 3.8.0
 	 *
 	 */
-	private function post_process( $jsonld ) {
+	private function post_process($jsonld) {
 
-		foreach ( $jsonld as $key => $value ) {
-			if ( 'streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key ) {
+		foreach ($jsonld as $key => $value) {
+			if ('streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key) {
 				$jsonld['address']['@type'] = 'PostalAddress';
-				$jsonld['address'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
+				$jsonld['address'][$key]  = $value;
+				unset($jsonld[$key]);
 			}
 
-			if ( 'latitude' === $key || 'longitude' === $key ) {
+			if ('latitude' === $key || 'longitude' === $key) {
 				$jsonld['geo']['@type'] = 'GeoCoordinates';
-				$jsonld['geo'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
+				$jsonld['geo'][$key]  = $value;
+				unset($jsonld[$key]);
 			}
 
-			if ( 'calories' === $key ) {
+			if ('calories' === $key) {
 				$jsonld['nutrition']['@type'] = 'NutritionInformation';
-				$jsonld['nutrition'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
+				$jsonld['nutrition'][$key]  = $value;
+				unset($jsonld[$key]);
 			}
 		}