insideout10 / wordlift-plugin

src/wordlift/jsonld/class-reference-processor.php

Indentation +38 added lines, -38 removed lines

@@ -12,43 +12,43 @@
 
 class Reference_Processor  extends  Singleton {
 
-	/**
-	 * @return Reference_Processor
-	 */
-	public static function get_instance() {
-		return parent::get_instance();
-	}
-
-
-	public function serialize_references( $references ) {
-
-		return array_map( function ( $reference ) {
-			if ( $reference instanceof Post_Reference ) {
-				return 'post_' . $reference->get_id();
-			} else if ( $reference instanceof Term_Reference ) {
-				return 'term_' . $reference->get_id();
-			}
-			// Backward compatibility with other hooks pushing
-			// references in to the cache.
-			return $reference;
-		}, $references );
-	}
-
-	public function deserialize_references( $references ) {
-
-		return array_map( function ( $reference ) {
-
-			if ( strpos( $reference, 'post_' ) !== false ) {
-				return new Post_Reference( (int) str_replace('post_', '', $reference ) );
-			} else if ( strpos( $reference, 'term_' ) !== false  ) {
-				return new Term_Reference( (int) str_replace('term_', '', $reference ) );
-			}
-			// Backward compatibility with other hooks pushing
-			// references in to the cache.
-			return new Post_Reference( (int) $reference );
-		}, $references );
-
-
-	}
+    /**
+     * @return Reference_Processor
+     */
+    public static function get_instance() {
+        return parent::get_instance();
+    }
+
+
+    public function serialize_references( $references ) {
+
+        return array_map( function ( $reference ) {
+            if ( $reference instanceof Post_Reference ) {
+                return 'post_' . $reference->get_id();
+            } else if ( $reference instanceof Term_Reference ) {
+                return 'term_' . $reference->get_id();
+            }
+            // Backward compatibility with other hooks pushing
+            // references in to the cache.
+            return $reference;
+        }, $references );
+    }
+
+    public function deserialize_references( $references ) {
+
+        return array_map( function ( $reference ) {
+
+            if ( strpos( $reference, 'post_' ) !== false ) {
+                return new Post_Reference( (int) str_replace('post_', '', $reference ) );
+            } else if ( strpos( $reference, 'term_' ) !== false  ) {
+                return new Term_Reference( (int) str_replace('term_', '', $reference ) );
+            }
+            // Backward compatibility with other hooks pushing
+            // references in to the cache.
+            return new Post_Reference( (int) $reference );
+        }, $references );
+
+
+    }
 
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -20,33 +20,33 @@
 	}
 
 
-	public function serialize_references( $references ) {
+	public function serialize_references($references) {
 
-		return array_map( function ( $reference ) {
-			if ( $reference instanceof Post_Reference ) {
-				return 'post_' . $reference->get_id();
-			} else if ( $reference instanceof Term_Reference ) {
-				return 'term_' . $reference->get_id();
+		return array_map(function($reference) {
+			if ($reference instanceof Post_Reference) {
+				return 'post_'.$reference->get_id();
+			} else if ($reference instanceof Term_Reference) {
+				return 'term_'.$reference->get_id();
 			}
 			// Backward compatibility with other hooks pushing
 			// references in to the cache.
 			return $reference;
-		}, $references );
+		}, $references);
 	}
 
-	public function deserialize_references( $references ) {
+	public function deserialize_references($references) {
 
-		return array_map( function ( $reference ) {
+		return array_map(function($reference) {
 
-			if ( strpos( $reference, 'post_' ) !== false ) {
-				return new Post_Reference( (int) str_replace('post_', '', $reference ) );
-			} else if ( strpos( $reference, 'term_' ) !== false  ) {
-				return new Term_Reference( (int) str_replace('term_', '', $reference ) );
+			if (strpos($reference, 'post_') !== false) {
+				return new Post_Reference((int) str_replace('post_', '', $reference));
+			} else if (strpos($reference, 'term_') !== false) {
+				return new Term_Reference((int) str_replace('term_', '', $reference));
 			}
 			// Backward compatibility with other hooks pushing
 			// references in to the cache.
-			return new Post_Reference( (int) $reference );
-		}, $references );
+			return new Post_Reference((int) $reference);
+		}, $references);
 
 
 	}

src/wordlift/jsonld/class-term-reference.php

Indentation +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@
 
 class Term_Reference extends Abstract_Reference {
 
-	function get_type() {
-		return Object_Type_Enum::TERM;
-	}
+    function get_type() {
+        return Object_Type_Enum::TERM;
+    }
 }
\ No newline at end of file

src/wordlift/jsonld/class-reference.php

Indentation +8 added lines, -8 removed lines

@@ -10,15 +10,15 @@
 
 interface Reference {
 
-	/**
-	 * @return int
-	 */
-	public function get_type();
+    /**
+     * @return int
+     */
+    public function get_type();
 
-	/**
-	 * @return int Identifier
-	 */
-	public function get_id();
+    /**
+     * @return int Identifier
+     */
+    public function get_id();
 
 }
 

src/wordlift/link/class-link-builder.php

Indentation +89 added lines, -89 removed lines

@@ -10,97 +10,97 @@
 
 class Link_Builder {
 
-	private $id;
-	private $type;
-	private $label;
-	private $href;
-	private $entity_url;
-	/**
-	 * @var Object_Link_Provider
-	 */
-	private $object_link_provider;
-
-	public function __construct( $entity_url, $id ) {
-		$this->entity_url           = $entity_url;
-		$this->id                   = $id;
-		$this->object_link_provider = Object_Link_Provider::get_instance();
-		$this->type                 = $this->object_link_provider->get_object_type( $entity_url );
-	}
-
-	public static function create( $entity_url, $id ) {
-		return new Link_Builder( $entity_url, $id );
-	}
-
-	public function label( $label ) {
-		$this->label = $label;
-
-		return $this;
-	}
-
-	public function href( $href ) {
-		$this->href = $href;
-
-		return $this;
-	}
-
-	private function get_attributes_for_link() {
-		/**
-		 * Allow 3rd parties to add additional attributes to the anchor link.
-		 *
-		 * @since 3.26.0
-		 */
-		$default_attributes = array(
-			'id' => implode( ';', $this->object_link_provider->get_same_as_uris( $this->id, $this->type ) )
-		);
-
-		/**
-		 * @since 3.32.0
-		 * Additional parameter {@link $this->type} is added to the filter denoting the type of
-		 * the entity url by the enum values {@link Object_Type_Enum}
-		 */
-		$attributes      = apply_filters( 'wl_anchor_data_attributes', $default_attributes, $this->id, $this->type );
-		$attributes_html = '';
-		foreach ( $attributes as $key => $value ) {
-			$attributes_html .= ' data-' . esc_html( $key ) . '="' . esc_attr( $value ) . '" ';
-		}
-
-		return $attributes_html;
-	}
-
-	/**
-	 * Get a `title` attribute with an alternative label for the link.
-	 *
-	 * If an alternative title isn't available an empty string is returned.
-	 *
-	 * @return string A `title` attribute with an alternative label or an empty
-	 *                string if none available.
-	 * @since 3.32.0
-	 *
-	 */
-	private function get_title_attribute() {
-
-		// Get an alternative title.
-		$title = $this->object_link_provider->get_link_title( $this->id, $this->label, $this->type );
-		if ( ! empty( $title ) ) {
-			return 'title="' . esc_attr( $title ) . '"';
-		}
-
-		return '';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function generate_link() {
-		// Get an alternative title attribute.
-		$title_attribute = $this->get_title_attribute();
-		$attributes_html = $this->get_attributes_for_link();
-
-		// Return the link.
-		return <<<EOF
+    private $id;
+    private $type;
+    private $label;
+    private $href;
+    private $entity_url;
+    /**
+     * @var Object_Link_Provider
+     */
+    private $object_link_provider;
+
+    public function __construct( $entity_url, $id ) {
+        $this->entity_url           = $entity_url;
+        $this->id                   = $id;
+        $this->object_link_provider = Object_Link_Provider::get_instance();
+        $this->type                 = $this->object_link_provider->get_object_type( $entity_url );
+    }
+
+    public static function create( $entity_url, $id ) {
+        return new Link_Builder( $entity_url, $id );
+    }
+
+    public function label( $label ) {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function href( $href ) {
+        $this->href = $href;
+
+        return $this;
+    }
+
+    private function get_attributes_for_link() {
+        /**
+         * Allow 3rd parties to add additional attributes to the anchor link.
+         *
+         * @since 3.26.0
+         */
+        $default_attributes = array(
+            'id' => implode( ';', $this->object_link_provider->get_same_as_uris( $this->id, $this->type ) )
+        );
+
+        /**
+         * @since 3.32.0
+         * Additional parameter {@link $this->type} is added to the filter denoting the type of
+         * the entity url by the enum values {@link Object_Type_Enum}
+         */
+        $attributes      = apply_filters( 'wl_anchor_data_attributes', $default_attributes, $this->id, $this->type );
+        $attributes_html = '';
+        foreach ( $attributes as $key => $value ) {
+            $attributes_html .= ' data-' . esc_html( $key ) . '="' . esc_attr( $value ) . '" ';
+        }
+
+        return $attributes_html;
+    }
+
+    /**
+     * Get a `title` attribute with an alternative label for the link.
+     *
+     * If an alternative title isn't available an empty string is returned.
+     *
+     * @return string A `title` attribute with an alternative label or an empty
+     *                string if none available.
+     * @since 3.32.0
+     *
+     */
+    private function get_title_attribute() {
+
+        // Get an alternative title.
+        $title = $this->object_link_provider->get_link_title( $this->id, $this->label, $this->type );
+        if ( ! empty( $title ) ) {
+            return 'title="' . esc_attr( $title ) . '"';
+        }
+
+        return '';
+    }
+
+    /**
+     * @return string
+     */
+    public function generate_link() {
+        // Get an alternative title attribute.
+        $title_attribute = $this->get_title_attribute();
+        $attributes_html = $this->get_attributes_for_link();
+
+        // Return the link.
+        return <<<EOF
 <a class="wl-entity-page-link" $title_attribute href="{$this->href}"$attributes_html>{$this->label}</a>
 EOF;
-	}
+    }
 
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -20,24 +20,24 @@ 
 	 */
 	private $object_link_provider;
 
-	public function __construct( $entity_url, $id ) {
+	public function __construct($entity_url, $id) {
 		$this->entity_url           = $entity_url;
 		$this->id                   = $id;
 		$this->object_link_provider = Object_Link_Provider::get_instance();
-		$this->type                 = $this->object_link_provider->get_object_type( $entity_url );
+		$this->type                 = $this->object_link_provider->get_object_type($entity_url);
 	}
 
-	public static function create( $entity_url, $id ) {
-		return new Link_Builder( $entity_url, $id );
+	public static function create($entity_url, $id) {
+		return new Link_Builder($entity_url, $id);
 	}
 
-	public function label( $label ) {
+	public function label($label) {
 		$this->label = $label;
 
 		return $this;
 	}
 
-	public function href( $href ) {
+	public function href($href) {
 		$this->href = $href;
 
 		return $this;
@@ -50,7 +50,7 @@ 
 		 * @since 3.26.0
 		 */
 		$default_attributes = array(
-			'id' => implode( ';', $this->object_link_provider->get_same_as_uris( $this->id, $this->type ) )
+			'id' => implode(';', $this->object_link_provider->get_same_as_uris($this->id, $this->type))
 		);
 
 		/**
@@ -58,10 +58,10 @@ 
 		 * Additional parameter {@link $this->type} is added to the filter denoting the type of
 		 * the entity url by the enum values {@link Object_Type_Enum}
 		 */
-		$attributes      = apply_filters( 'wl_anchor_data_attributes', $default_attributes, $this->id, $this->type );
+		$attributes      = apply_filters('wl_anchor_data_attributes', $default_attributes, $this->id, $this->type);
 		$attributes_html = '';
-		foreach ( $attributes as $key => $value ) {
-			$attributes_html .= ' data-' . esc_html( $key ) . '="' . esc_attr( $value ) . '" ';
+		foreach ($attributes as $key => $value) {
+			$attributes_html .= ' data-'.esc_html($key).'="'.esc_attr($value).'" ';
 		}
 
 		return $attributes_html;
@@ -80,9 +80,9 @@ 
 	private function get_title_attribute() {
 
 		// Get an alternative title.
-		$title = $this->object_link_provider->get_link_title( $this->id, $this->label, $this->type );
-		if ( ! empty( $title ) ) {
-			return 'title="' . esc_attr( $title ) . '"';
+		$title = $this->object_link_provider->get_link_title($this->id, $this->label, $this->type);
+		if ( ! empty($title)) {
+			return 'title="'.esc_attr($title).'"';
 		}
 
 		return '';

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

Indentation +238 added lines, -238 removed lines

@@ -17,261 +17,261 @@
  */
 class Wordlift_Jsonld_Service {
 
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Term_JsonLd_Adapter} instance.
-	 *
-	 * @since  3.32.0
-	 * @access private
-	 * @var Wordlift_Term_JsonLd_Adapter $entity_service A {@link Wordlift_Term_JsonLd_Adapter} instance.
-	 */
-	private $term_jsonld_adapter;
-
-	/**
-	 * A {@link Wordlift_Post_Converter} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Post_Converter A {@link Wordlift_Post_Converter} instance.
-	 */
-	private $converter;
-
-
-	/**
-	 * A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Website_Jsonld_Converter A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 */
-	private $website_converter;
-
-	/**
-	 * The singleton instance for the JSON-LD service.
-	 *
-	 * @since 3.15.1
-	 *
-	 * @var \Wordlift_Jsonld_Service $instance The singleton instance for the JSON-LD service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a JSON-LD service.
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Post_Converter $converter A {@link Wordlift_Uri_To_Jsonld_Converter} instance.
-	 * @param \Wordlift_Website_Jsonld_Converter $website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
-	 * @param \Wordlift_Term_JsonLd_Adapter $term_jsonld_adapter
-	 *
-	 * @since 3.8.0
-	 */
-	public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
-
-		$this->entity_service      = $entity_service;
-		$this->converter           = $converter;
-		$this->website_converter   = $website_converter;
-		$this->term_jsonld_adapter = $term_jsonld_adapter;
-		self::$instance            = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance for the JSON-LD service.
-	 *
-	 * @return \Wordlift_Jsonld_Service The singleton instance for the JSON-LD service.
-	 * @since 3.15.1
-	 *
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Process calls to the AJAX 'wl_jsonld' endpoint.
-	 *
-	 * @since 3.8.0
-	 */
-	public function get() {
-		// Clear the buffer to be sure someone doesn't mess with our response.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/406.
-		// See https://codex.wordpress.org/AJAX_in_Plugins.
-		@ob_clean();
-
-		// Get the parameter from the request.
-		$is_homepage = isset( $_REQUEST['homepage'] );
-		$post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null;
-
-		// Send the generated JSON-LD.
-		$this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
-
-	}
-
-	/**
-	 * A close of WP's own `wp_send_json` function which uses `application/ld+json` as content type.
-	 *
-	 * @param mixed $response Variable (usually an array or object) to encode as JSON,
-	 *                           then print and die.
-	 * @param int $status_code The HTTP status code to output.
-	 *
-	 * @since 3.18.5
-	 *
-	 */
-	private function send_jsonld( $response, $status_code = null ) {
-		@header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
-		echo wp_json_encode( $response );
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die();
-		} else {
-			die;
-		}
-	}
-
-	/**
-	 * Get the JSON-LD.
-	 *
-	 * @param bool $is_homepage Whether the JSON-LD for the homepage is being requested.
-	 * @param int|null $post_id The JSON-LD for the specified {@link WP_Post} id.
-	 * @param int $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
-	 *
-	 * @return array A JSON-LD structure.
-	 * @since 3.15.1
-	 *
-	 */
-	public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
-
-		// Tell NewRelic to ignore us, otherwise NewRelic customers might receive
-		// e-mails with a low apdex score.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/521
-		Wordlift_NewRelic_Adapter::ignore_apdex();
-
-		// Switch to Website converter if is home page.
-		if ( $is_homepage ) {
-			/**
-			 * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
-			 *
-			 * @since  3.14.0
-			 * @api    bool $display_search Whether or not to display json+ld search on the frontend.
-			 */
-			if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
-				return array();
-			}
-
-			// Set a reference to the website_converter.
-			$website_converter = $this->website_converter;
-
-			// Send JSON-LD.
-			return $website_converter->create_schema();
-		}
-
-		// If no id has been provided return an empty array.
-		if ( ! isset( $post_id ) ) {
-			return array();
-		}
-
-		// An array of references which is captured when converting an URI to a
-		// json which we gather to further expand our json-ld.
-		$references       = array();
-		$references_infos = array();
-
-		// Set a reference to the entity_to_jsonld_converter to use in the closures.
-		$entity_to_jsonld_converter = $this->converter;
-
-		$jsonld = array( $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos ) );
-
-
-		$that = $this;
-		$expanded_references_jsonld = array_map( function ( $item ) use ( $context, $entity_to_jsonld_converter, &$references_infos, $that ) {
-			// "2nd level properties" may not output here, e.g. a post
-			// mentioning an event, located in a place: the place is referenced
-			// via the `@id` but no other properties are loaded.
-			$ignored = array();
-			if ( $item instanceof Term_Reference ) {
-			    $term_jsonld =  $that->term_jsonld_adapter->get( $item->get_id(), $context );
-			    // For term references, we publish a jsonld array on the page, use only the first item.
-			    return count( $term_jsonld ) > 0 ? $term_jsonld[0] : false;
-			}
-			else if ( $item instanceof  Post_Reference) {
-			    $item = $item->get_id();
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Term_JsonLd_Adapter} instance.
+     *
+     * @since  3.32.0
+     * @access private
+     * @var Wordlift_Term_JsonLd_Adapter $entity_service A {@link Wordlift_Term_JsonLd_Adapter} instance.
+     */
+    private $term_jsonld_adapter;
+
+    /**
+     * A {@link Wordlift_Post_Converter} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Post_Converter A {@link Wordlift_Post_Converter} instance.
+     */
+    private $converter;
+
+
+    /**
+     * A {@link Wordlift_Website_Jsonld_Converter} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Website_Jsonld_Converter A {@link Wordlift_Website_Jsonld_Converter} instance.
+     */
+    private $website_converter;
+
+    /**
+     * The singleton instance for the JSON-LD service.
+     *
+     * @since 3.15.1
+     *
+     * @var \Wordlift_Jsonld_Service $instance The singleton instance for the JSON-LD service.
+     */
+    private static $instance;
+
+    /**
+     * Create a JSON-LD service.
+     *
+     * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Post_Converter $converter A {@link Wordlift_Uri_To_Jsonld_Converter} instance.
+     * @param \Wordlift_Website_Jsonld_Converter $website_converter A {@link Wordlift_Website_Jsonld_Converter} instance.
+     * @param \Wordlift_Term_JsonLd_Adapter $term_jsonld_adapter
+     *
+     * @since 3.8.0
+     */
+    public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
+
+        $this->entity_service      = $entity_service;
+        $this->converter           = $converter;
+        $this->website_converter   = $website_converter;
+        $this->term_jsonld_adapter = $term_jsonld_adapter;
+        self::$instance            = $this;
+
+    }
+
+    /**
+     * Get the singleton instance for the JSON-LD service.
+     *
+     * @return \Wordlift_Jsonld_Service The singleton instance for the JSON-LD service.
+     * @since 3.15.1
+     *
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Process calls to the AJAX 'wl_jsonld' endpoint.
+     *
+     * @since 3.8.0
+     */
+    public function get() {
+        // Clear the buffer to be sure someone doesn't mess with our response.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/406.
+        // See https://codex.wordpress.org/AJAX_in_Plugins.
+        @ob_clean();
+
+        // Get the parameter from the request.
+        $is_homepage = isset( $_REQUEST['homepage'] );
+        $post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null;
+
+        // Send the generated JSON-LD.
+        $this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
+
+    }
+
+    /**
+     * A close of WP's own `wp_send_json` function which uses `application/ld+json` as content type.
+     *
+     * @param mixed $response Variable (usually an array or object) to encode as JSON,
+     *                           then print and die.
+     * @param int $status_code The HTTP status code to output.
+     *
+     * @since 3.18.5
+     *
+     */
+    private function send_jsonld( $response, $status_code = null ) {
+        @header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
+        echo wp_json_encode( $response );
+        if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+            wp_die();
+        } else {
+            die;
+        }
+    }
+
+    /**
+     * Get the JSON-LD.
+     *
+     * @param bool $is_homepage Whether the JSON-LD for the homepage is being requested.
+     * @param int|null $post_id The JSON-LD for the specified {@link WP_Post} id.
+     * @param int $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
+     *
+     * @return array A JSON-LD structure.
+     * @since 3.15.1
+     *
+     */
+    public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
+
+        // Tell NewRelic to ignore us, otherwise NewRelic customers might receive
+        // e-mails with a low apdex score.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/521
+        Wordlift_NewRelic_Adapter::ignore_apdex();
+
+        // Switch to Website converter if is home page.
+        if ( $is_homepage ) {
+            /**
+             * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
+             *
+             * @since  3.14.0
+             * @api    bool $display_search Whether or not to display json+ld search on the frontend.
+             */
+            if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
+                return array();
             }
 
-			return $entity_to_jsonld_converter->convert( $item, $ignored, $references_infos );
-		}, array_unique( $references ) );
+            // Set a reference to the website_converter.
+            $website_converter = $this->website_converter;
 
+            // Send JSON-LD.
+            return $website_converter->create_schema();
+        }
 
-		// Convert each URI to a JSON-LD array, while gathering referenced entities.
-		// in the references array.
-		$jsonld = array_merge( $jsonld,
-			// Convert each URI in the references array to JSON-LD. We don't output
-			// entities already output above (hence the array_diff).
-			array_filter( $expanded_references_jsonld ) );
+        // If no id has been provided return an empty array.
+        if ( ! isset( $post_id ) ) {
+            return array();
+        }
 
-		$required_references = array_filter( $references_infos, function ( $item ) use ( $references ) {
+        // An array of references which is captured when converting an URI to a
+        // json which we gather to further expand our json-ld.
+        $references       = array();
+        $references_infos = array();
 
-			return isset( $item['reference'] ) &&
-			       // Check that the reference is required
-			       $item['reference']->get_required() &&
-			       // Check that the reference isn't being output already.
-			       ! in_array( $item['reference']->get_id(), $references );
-		} );
+        // Set a reference to the entity_to_jsonld_converter to use in the closures.
+        $entity_to_jsonld_converter = $this->converter;
 
+        $jsonld = array( $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos ) );
 
-		$jsonld = array_merge( $jsonld, array_filter( array_map( function ( $item ) use ( $references, $entity_to_jsonld_converter ) {
 
-			if ( ! isset( $item['reference'] ) ) {
-				return null;
-			}
+        $that = $this;
+        $expanded_references_jsonld = array_map( function ( $item ) use ( $context, $entity_to_jsonld_converter, &$references_infos, $that ) {
+            // "2nd level properties" may not output here, e.g. a post
+            // mentioning an event, located in a place: the place is referenced
+            // via the `@id` but no other properties are loaded.
+            $ignored = array();
+            if ( $item instanceof Term_Reference ) {
+                $term_jsonld =  $that->term_jsonld_adapter->get( $item->get_id(), $context );
+                // For term references, we publish a jsonld array on the page, use only the first item.
+                return count( $term_jsonld ) > 0 ? $term_jsonld[0] : false;
+            }
+            else if ( $item instanceof  Post_Reference) {
+                $item = $item->get_id();
+            }
+
+            return $entity_to_jsonld_converter->convert( $item, $ignored, $references_infos );
+        }, array_unique( $references ) );
 
-			$post_id = $item['reference']->get_id();
-			if ( in_array( $post_id, $references ) ) {
-				return null;
-			}
 
-			$references[] = $post_id;
+        // Convert each URI to a JSON-LD array, while gathering referenced entities.
+        // in the references array.
+        $jsonld = array_merge( $jsonld,
+            // Convert each URI in the references array to JSON-LD. We don't output
+            // entities already output above (hence the array_diff).
+            array_filter( $expanded_references_jsonld ) );
 
-			return $entity_to_jsonld_converter->convert( $post_id, $references );
-		}, $required_references ) ) );
+        $required_references = array_filter( $references_infos, function ( $item ) use ( $references ) {
 
-		/**
-		 * Filter name: wl_after_get_jsonld
-		 * @return array
-		 * @since 3.27.2
-		 * @var $jsonld array The final jsonld before outputting to page.
-		 * @var $post_id int The post id for which the jsonld is generated.
-		 *
-		 */
-		$jsonld = apply_filters( 'wl_after_get_jsonld', $jsonld, $post_id, $context );
+            return isset( $item['reference'] ) &&
+                   // Check that the reference is required
+                   $item['reference']->get_required() &&
+                   // Check that the reference isn't being output already.
+                   ! in_array( $item['reference']->get_id(), $references );
+        } );
 
-		return $jsonld;
-	}
 
-	/**
-	 * Write the JSON-LD in the head.
-	 *
-	 * This function isn't actually used, but may be used to quickly enable writing the JSON-LD synchronously to the
-	 * document head, using the `wp_head` hook.
-	 *
-	 * @since 3.18.5
-	 */
-	public function wp_head() {
+        $jsonld = array_merge( $jsonld, array_filter( array_map( function ( $item ) use ( $references, $entity_to_jsonld_converter ) {
 
-		// Determine whether this is the home page or whether we're displaying a single post.
-		$is_homepage = is_home() || is_front_page();
-		$post_id     = is_singular() ? get_the_ID() : null;
+            if ( ! isset( $item['reference'] ) ) {
+                return null;
+            }
+
+            $post_id = $item['reference']->get_id();
+            if ( in_array( $post_id, $references ) ) {
+                return null;
+            }
 
-		$jsonld = json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
-		?>
+            $references[] = $post_id;
+
+            return $entity_to_jsonld_converter->convert( $post_id, $references );
+        }, $required_references ) ) );
+
+        /**
+         * Filter name: wl_after_get_jsonld
+         * @return array
+         * @since 3.27.2
+         * @var $jsonld array The final jsonld before outputting to page.
+         * @var $post_id int The post id for which the jsonld is generated.
+         *
+         */
+        $jsonld = apply_filters( 'wl_after_get_jsonld', $jsonld, $post_id, $context );
+
+        return $jsonld;
+    }
+
+    /**
+     * Write the JSON-LD in the head.
+     *
+     * This function isn't actually used, but may be used to quickly enable writing the JSON-LD synchronously to the
+     * document head, using the `wp_head` hook.
+     *
+     * @since 3.18.5
+     */
+    public function wp_head() {
+
+        // Determine whether this is the home page or whether we're displaying a single post.
+        $is_homepage = is_home() || is_front_page();
+        $post_id     = is_singular() ? get_the_ID() : null;
+
+        $jsonld = json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+        ?>
         <script type="application/ld+json"><?php echo $jsonld; ?></script><?php
-	}
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -73,7 +73,7 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
+	public function __construct($entity_service, $converter, $website_converter, $term_jsonld_adapter) {
 
 		$this->entity_service      = $entity_service;
 		$this->converter           = $converter;
@@ -108,11 +108,11 @@ 
 		@ob_clean();
 
 		// Get the parameter from the request.
-		$is_homepage = isset( $_REQUEST['homepage'] );
-		$post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null;
+		$is_homepage = isset($_REQUEST['homepage']);
+		$post_id     = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? intval($_REQUEST['id']) : null;
 
 		// Send the generated JSON-LD.
-		$this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
+		$this->send_jsonld($this->get_jsonld($is_homepage, $post_id));
 
 	}
 
@@ -126,10 +126,10 @@ 
 	 * @since 3.18.5
 	 *
 	 */
-	private function send_jsonld( $response, $status_code = null ) {
-		@header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
-		echo wp_json_encode( $response );
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+	private function send_jsonld($response, $status_code = null) {
+		@header('Content-Type: application/ld+json; charset='.get_option('blog_charset'));
+		echo wp_json_encode($response);
+		if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX)) {
 			wp_die();
 		} else {
 			die;
@@ -147,7 +147,7 @@ 
 	 * @since 3.15.1
 	 *
 	 */
-	public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
+	public function get_jsonld($is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN) {
 
 		// Tell NewRelic to ignore us, otherwise NewRelic customers might receive
 		// e-mails with a low apdex score.
@@ -156,14 +156,14 @@ 
 		Wordlift_NewRelic_Adapter::ignore_apdex();
 
 		// Switch to Website converter if is home page.
-		if ( $is_homepage ) {
+		if ($is_homepage) {
 			/**
 			 * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
 			 *
 			 * @since  3.14.0
 			 * @api    bool $display_search Whether or not to display json+ld search on the frontend.
 			 */
-			if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
+			if (apply_filters('wordlift_disable_website_json_ld', false)) {
 				return array();
 			}
 
@@ -175,7 +175,7 @@ 
 		}
 
 		// If no id has been provided return an empty array.
-		if ( ! isset( $post_id ) ) {
+		if ( ! isset($post_id)) {
 			return array();
 		}
 
@@ -187,60 +187,60 @@ 
 		// Set a reference to the entity_to_jsonld_converter to use in the closures.
 		$entity_to_jsonld_converter = $this->converter;
 
-		$jsonld = array( $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos ) );
+		$jsonld = array($entity_to_jsonld_converter->convert($post_id, $references, $references_infos));
 
 
 		$that = $this;
-		$expanded_references_jsonld = array_map( function ( $item ) use ( $context, $entity_to_jsonld_converter, &$references_infos, $that ) {
+		$expanded_references_jsonld = array_map(function($item) use ($context, $entity_to_jsonld_converter, &$references_infos, $that) {
 			// "2nd level properties" may not output here, e.g. a post
 			// mentioning an event, located in a place: the place is referenced
 			// via the `@id` but no other properties are loaded.
 			$ignored = array();
-			if ( $item instanceof Term_Reference ) {
-			    $term_jsonld =  $that->term_jsonld_adapter->get( $item->get_id(), $context );
+			if ($item instanceof Term_Reference) {
+			    $term_jsonld = $that->term_jsonld_adapter->get($item->get_id(), $context);
 			    // For term references, we publish a jsonld array on the page, use only the first item.
-			    return count( $term_jsonld ) > 0 ? $term_jsonld[0] : false;
+			    return count($term_jsonld) > 0 ? $term_jsonld[0] : false;
 			}
-			else if ( $item instanceof  Post_Reference) {
+			else if ($item instanceof  Post_Reference) {
 			    $item = $item->get_id();
             }
 
-			return $entity_to_jsonld_converter->convert( $item, $ignored, $references_infos );
-		}, array_unique( $references ) );
+			return $entity_to_jsonld_converter->convert($item, $ignored, $references_infos);
+		}, array_unique($references));
 
 
 		// Convert each URI to a JSON-LD array, while gathering referenced entities.
 		// in the references array.
-		$jsonld = array_merge( $jsonld,
+		$jsonld = array_merge($jsonld,
 			// Convert each URI in the references array to JSON-LD. We don't output
 			// entities already output above (hence the array_diff).
-			array_filter( $expanded_references_jsonld ) );
+			array_filter($expanded_references_jsonld));
 
-		$required_references = array_filter( $references_infos, function ( $item ) use ( $references ) {
+		$required_references = array_filter($references_infos, function($item) use ($references) {
 
-			return isset( $item['reference'] ) &&
+			return isset($item['reference']) &&
 			       // Check that the reference is required
 			       $item['reference']->get_required() &&
 			       // Check that the reference isn't being output already.
-			       ! in_array( $item['reference']->get_id(), $references );
+			       ! in_array($item['reference']->get_id(), $references);
 		} );
 
 
-		$jsonld = array_merge( $jsonld, array_filter( array_map( function ( $item ) use ( $references, $entity_to_jsonld_converter ) {
+		$jsonld = array_merge($jsonld, array_filter(array_map(function($item) use ($references, $entity_to_jsonld_converter) {
 
-			if ( ! isset( $item['reference'] ) ) {
+			if ( ! isset($item['reference'])) {
 				return null;
 			}
 
 			$post_id = $item['reference']->get_id();
-			if ( in_array( $post_id, $references ) ) {
+			if (in_array($post_id, $references)) {
 				return null;
 			}
 
 			$references[] = $post_id;
 
-			return $entity_to_jsonld_converter->convert( $post_id, $references );
-		}, $required_references ) ) );
+			return $entity_to_jsonld_converter->convert($post_id, $references);
+		}, $required_references)));
 
 		/**
 		 * Filter name: wl_after_get_jsonld
@@ -250,7 +250,7 @@ 
 		 * @var $post_id int The post id for which the jsonld is generated.
 		 *
 		 */
-		$jsonld = apply_filters( 'wl_after_get_jsonld', $jsonld, $post_id, $context );
+		$jsonld = apply_filters('wl_after_get_jsonld', $jsonld, $post_id, $context);
 
 		return $jsonld;
 	}
@@ -269,7 +269,7 @@ 
 		$is_homepage = is_home() || is_front_page();
 		$post_id     = is_singular() ? get_the_ID() : null;
 
-		$jsonld = json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+		$jsonld = json_encode($this->get_jsonld($is_homepage, $post_id, Jsonld_Context_Enum::PAGE));
 		?>
         <script type="application/ld+json"><?php echo $jsonld; ?></script><?php
 	}

Braces +1 added lines, -2 removed lines

@@ -200,8 +200,7 @@
 			    $term_jsonld =  $that->term_jsonld_adapter->get( $item->get_id(), $context );
 			    // For term references, we publish a jsonld array on the page, use only the first item.
 			    return count( $term_jsonld ) > 0 ? $term_jsonld[0] : false;
-			}
-			else if ( $item instanceof  Post_Reference) {
+			} else if ( $item instanceof  Post_Reference) {
 			    $item = $item->get_id();
             }
 

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

Indentation +114 added lines, -114 removed lines

@@ -14,119 +14,119 @@
  */
 abstract class Wordlift_Property_Service {
 
-	// TODO: check that this is relative to the extending class.
-	protected static $instance;
-
-	public function __construct() {
-
-		static::$instance = $this;
-	}
-
-	/**
-	 * Get the field singleton.
-	 *
-	 * @since 3.6.0
-	 * @return \Wordlift_Schema_Url_Property_Service The singleton instance.
-	 */
-	public static function get_instance() {
-
-		return static::$instance;
-	}
-
-	/**
-	 * Get the value for the specified post/entity.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return mixed
-	 */
-	public abstract function get( $post_id );
-
-	/**
-	 * Sanitize the provided value.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param mixed $value The value to sanitize.
-	 *
-	 * @return mixed|NULL The sanitized value or NULL avoid saving this value (see {@link Wl_Metabox_Field}).
-	 */
-	public abstract function sanitize( $value );
-
-	/**
-	 * The RDF predicate for the property.
-	 *
-	 * @since 3.6.0
-	 * @return string The RDF predicate.
-	 */
-	public abstract function get_rdf_predicate();
-
-	/**
-	 * The RDF data type.
-	 *
-	 * @since 3.6.0
-	 * @return string The RDF data type.
-	 */
-	public abstract function get_rdf_data_type();
-
-	/**
-	 * The internal data type.
-	 *
-	 * @since 3.6.0
-	 * @return string The internal data type.
-	 */
-	public abstract function get_data_type();
-
-	/**
-	 * The cardinality.
-	 *
-	 * @since 3.6.0
-	 * @return mixed The cardinality.
-	 */
-	public abstract function get_cardinality();
-
-	/**
-	 * The metabox field class name.
-	 *
-	 * @since 3.6.0
-	 * @return string The metabox field class name.
-	 */
-	public abstract function get_metabox_class();
-
-	/**
-	 * The untranslated metabox field label.
-	 *
-	 * @since 3.6.0
-	 * @return string The untranslated metabox field label.
-	 */
-	public abstract function get_metabox_label();
-
-	/**
-	 * The definition of the property returned as a compatible array.
-	 *
-	 * @deprecated
-	 *
-	 * @since 3.6.0
-	 * @return array An array of property definitions.
-	 */
-	public function get_compat_definition() {
-
-		return array(
-			'type'        => $this->get_data_type(),
-			'predicate'   => $this->get_rdf_predicate(),
-			'export_type' => $this->get_rdf_data_type(),
-			'constraints' => array(
-				'cardinality' => $this->get_cardinality(),
-			),
-			// Use the standard metabox for these URI (the URI metabox creates local entities).
-			'metabox'     => array(
-				'class' => $this->get_metabox_class(),
-				'label' => $this->get_metabox_label(),
-			),
-			'sanitize'    => array( $this, 'sanitize' ),
-		);
-	}
+    // TODO: check that this is relative to the extending class.
+    protected static $instance;
+
+    public function __construct() {
+
+        static::$instance = $this;
+    }
+
+    /**
+     * Get the field singleton.
+     *
+     * @since 3.6.0
+     * @return \Wordlift_Schema_Url_Property_Service The singleton instance.
+     */
+    public static function get_instance() {
+
+        return static::$instance;
+    }
+
+    /**
+     * Get the value for the specified post/entity.
+     *
+     * @since 3.6.0
+     *
+     * @param int $post_id The post id.
+     *
+     * @return mixed
+     */
+    public abstract function get( $post_id );
+
+    /**
+     * Sanitize the provided value.
+     *
+     * @since 3.6.0
+     *
+     * @param mixed $value The value to sanitize.
+     *
+     * @return mixed|NULL The sanitized value or NULL avoid saving this value (see {@link Wl_Metabox_Field}).
+     */
+    public abstract function sanitize( $value );
+
+    /**
+     * The RDF predicate for the property.
+     *
+     * @since 3.6.0
+     * @return string The RDF predicate.
+     */
+    public abstract function get_rdf_predicate();
+
+    /**
+     * The RDF data type.
+     *
+     * @since 3.6.0
+     * @return string The RDF data type.
+     */
+    public abstract function get_rdf_data_type();
+
+    /**
+     * The internal data type.
+     *
+     * @since 3.6.0
+     * @return string The internal data type.
+     */
+    public abstract function get_data_type();
+
+    /**
+     * The cardinality.
+     *
+     * @since 3.6.0
+     * @return mixed The cardinality.
+     */
+    public abstract function get_cardinality();
+
+    /**
+     * The metabox field class name.
+     *
+     * @since 3.6.0
+     * @return string The metabox field class name.
+     */
+    public abstract function get_metabox_class();
+
+    /**
+     * The untranslated metabox field label.
+     *
+     * @since 3.6.0
+     * @return string The untranslated metabox field label.
+     */
+    public abstract function get_metabox_label();
+
+    /**
+     * The definition of the property returned as a compatible array.
+     *
+     * @deprecated
+     *
+     * @since 3.6.0
+     * @return array An array of property definitions.
+     */
+    public function get_compat_definition() {
+
+        return array(
+            'type'        => $this->get_data_type(),
+            'predicate'   => $this->get_rdf_predicate(),
+            'export_type' => $this->get_rdf_data_type(),
+            'constraints' => array(
+                'cardinality' => $this->get_cardinality(),
+            ),
+            // Use the standard metabox for these URI (the URI metabox creates local entities).
+            'metabox'     => array(
+                'class' => $this->get_metabox_class(),
+                'label' => $this->get_metabox_label(),
+            ),
+            'sanitize'    => array( $this, 'sanitize' ),
+        );
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public abstract function get( $post_id );
+	public abstract function get($post_id);
 
 	/**
 	 * Sanitize the provided value.
@@ -53,7 +53,7 @@ 
 	 *
 	 * @return mixed|NULL The sanitized value or NULL avoid saving this value (see {@link Wl_Metabox_Field}).
 	 */
-	public abstract function sanitize( $value );
+	public abstract function sanitize($value);
 
 	/**
 	 * The RDF predicate for the property.
@@ -125,7 +125,7 @@ 
 				'class' => $this->get_metabox_class(),
 				'label' => $this->get_metabox_label(),
 			),
-			'sanitize'    => array( $this, 'sanitize' ),
+			'sanitize'    => array($this, 'sanitize'),
 		);
 	}
 

src/includes/linked-data/storage/class-wordlift-url-property-storage.php

Indentation +37 added lines, -37 removed lines

@@ -18,42 +18,42 @@
  */
 class Wordlift_Url_Property_Storage extends Wordlift_Storage {
 
-	/**
-	 * The {@link Wordlift_Property_Getter} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Property_Getter The {@link Wordlift_Property_Getter}
-	 *                                     instance.
-	 */
-	private $property_getter;
-
-	/**
-	 * Create a {@link Wordlift_Property_Storage} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param \Wordlift_Property_Getter $property_getter The {@link Wordlift_Property_Getter}
-	 *                                                   instance.
-	 */
-	public function __construct( $property_getter ) {
-
-		$this->property_getter = $property_getter;
-
-	}
-
-	/**
-	 * Get the values for the property of the {@link WP_Post}.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return array
-	 */
-	public function get( $post_id ) {
-
-		return $this->property_getter->get( $post_id, Wordlift_Schema_Url_Property_Service::META_KEY, Object_Type_Enum::POST );
-	}
+    /**
+     * The {@link Wordlift_Property_Getter} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Property_Getter The {@link Wordlift_Property_Getter}
+     *                                     instance.
+     */
+    private $property_getter;
+
+    /**
+     * Create a {@link Wordlift_Property_Storage} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param \Wordlift_Property_Getter $property_getter The {@link Wordlift_Property_Getter}
+     *                                                   instance.
+     */
+    public function __construct( $property_getter ) {
+
+        $this->property_getter = $property_getter;
+
+    }
+
+    /**
+     * Get the values for the property of the {@link WP_Post}.
+     *
+     * @since 3.15.0
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return array
+     */
+    public function get( $post_id ) {
+
+        return $this->property_getter->get( $post_id, Wordlift_Schema_Url_Property_Service::META_KEY, Object_Type_Enum::POST );
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
 	 * @param \Wordlift_Property_Getter $property_getter The {@link Wordlift_Property_Getter}
 	 *                                                   instance.
 	 */
-	public function __construct( $property_getter ) {
+	public function __construct($property_getter) {
 
 		$this->property_getter = $property_getter;
 
@@ -51,9 +51,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
-		return $this->property_getter->get( $post_id, Wordlift_Schema_Url_Property_Service::META_KEY, Object_Type_Enum::POST );
+		return $this->property_getter->get($post_id, Wordlift_Schema_Url_Property_Service::META_KEY, Object_Type_Enum::POST);
 	}
 
 }

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

Indentation +28 added lines, -28 removed lines

@@ -13,35 +13,35 @@
  */
 class Wordlift_Simple_Property_Service {
 
-	/**
-	 * The meta key for this property service.
-	 *
-	 * @since 3.8.0
-	 */
-	const META_KEY = '*';
+    /**
+     * The meta key for this property service.
+     *
+     * @since 3.8.0
+     */
+    const META_KEY = '*';
 
-	/**
-	 * Get the property value for the specified post id and meta with the specified key.
-	 *
-	 * @param int $id The post id.
-	 * @param string $meta_key The meta key.
-	 *
-	 * @param $type int Post or Term
-	 *
-	 * @return mixed|null The property value.
-	 * @since 3.8.0
-	 *
-	 */
-	public function get( $id, $meta_key, $type ) {
+    /**
+     * Get the property value for the specified post id and meta with the specified key.
+     *
+     * @param int $id The post id.
+     * @param string $meta_key The meta key.
+     *
+     * @param $type int Post or Term
+     *
+     * @return mixed|null The property value.
+     * @since 3.8.0
+     *
+     */
+    public function get( $id, $meta_key, $type ) {
 
-		if ( Object_Type_Enum::POST === $type ) {
-			// Get the value stored in WP.
-			return get_post_meta( $id, $meta_key );
-		}
-		else if ( Object_Type_Enum::TERM === $type ) {
-			return get_term_meta( $id, $meta_key );
-		}
-		return null;
-	}
+        if ( Object_Type_Enum::POST === $type ) {
+            // Get the value stored in WP.
+            return get_post_meta( $id, $meta_key );
+        }
+        else if ( Object_Type_Enum::TERM === $type ) {
+            return get_term_meta( $id, $meta_key );
+        }
+        return null;
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -3,8 +3,8 @@ 
 // Require the Wordlift_Property_Not_Found class.
 use Wordlift\Object_Type_Enum;
 
-require_once( "class-wordlift-property-not-found.php" );
-require_once( "class-wordlift-property-entity-reference.php" );
+require_once("class-wordlift-property-not-found.php");
+require_once("class-wordlift-property-entity-reference.php");
 
 /**
  * A property service that just returns the value stored in WP's meta.
@@ -32,14 +32,14 @@ 
 	 * @since 3.8.0
 	 *
 	 */
-	public function get( $id, $meta_key, $type ) {
+	public function get($id, $meta_key, $type) {
 
-		if ( Object_Type_Enum::POST === $type ) {
+		if (Object_Type_Enum::POST === $type) {
 			// Get the value stored in WP.
-			return get_post_meta( $id, $meta_key );
+			return get_post_meta($id, $meta_key);
 		}
-		else if ( Object_Type_Enum::TERM === $type ) {
-			return get_term_meta( $id, $meta_key );
+		else if (Object_Type_Enum::TERM === $type) {
+			return get_term_meta($id, $meta_key);
 		}
 		return null;
 	}

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
 		if ( Object_Type_Enum::POST === $type ) {
 			// Get the value stored in WP.
 			return get_post_meta( $id, $meta_key );
-		}
-		else if ( Object_Type_Enum::TERM === $type ) {
+		} else if ( Object_Type_Enum::TERM === $type ) {
 			return get_term_meta( $id, $meta_key );
 		}
 		return null;

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

Indentation +12 added lines, -12 removed lines

@@ -6,20 +6,20 @@
  */
 class Wordlift_Required_Property_Service extends Wordlift_Entity_Property_Service {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get( $id, $meta_key, $type ) {
+    /**
+     * {@inheritdoc}
+     */
+    public function get( $id, $meta_key, $type ) {
 
-		return array_map( function ( $item ) {
+        return array_map( function ( $item ) {
 
-			// If this is an entity reference, set that this entity is always required in SD output.
-			if ( $item instanceof Wordlift_Property_Entity_Reference ) {
-				$item->set_required( true );
-			}
+            // If this is an entity reference, set that this entity is always required in SD output.
+            if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+                $item->set_required( true );
+            }
 
-			return $item;
-		}, parent::get( $id, $meta_key, $type ) );
-	}
+            return $item;
+        }, parent::get( $id, $meta_key, $type ) );
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -9,17 +9,17 @@
 	/**
 	 * {@inheritdoc}
 	 */
-	public function get( $id, $meta_key, $type ) {
+	public function get($id, $meta_key, $type) {
 
-		return array_map( function ( $item ) {
+		return array_map(function($item) {
 
 			// If this is an entity reference, set that this entity is always required in SD output.
-			if ( $item instanceof Wordlift_Property_Entity_Reference ) {
-				$item->set_required( true );
+			if ($item instanceof Wordlift_Property_Entity_Reference) {
+				$item->set_required(true);
 			}
 
 			return $item;
-		}, parent::get( $id, $meta_key, $type ) );
+		}, parent::get($id, $meta_key, $type));
 	}
 
 }