insideout10 / wordlift-plugin

src/wordlift/google-addon-integration/pages/class-import-page.php

Indentation +74 added lines, -74 removed lines

@@ -6,79 +6,79 @@
 
 class Import_Page extends Wordlift_Admin_Page {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_page_title() {
-
-		return __( 'Google Addon Import', 'wordlift' );
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_menu_title() {
-
-		return __( 'Google Addon Import', 'wordlift' );
-	}
-
-	protected function get_parent_slug() {
-		return null;
-	}
-
-	public function render() {
-
-		wp_enqueue_script(
-			'wl-gaddon-import-page',
-			plugin_dir_url( __FILE__ ) . 'assets/gaddon-import-page.js',
-			array(),
-			WORDLIFT_VERSION,
-			false
-		);
-
-		wp_localize_script(
-			'wl-gaddon-import-page',
-			'_wlGaddonImportSettings',
-			array(
-				'restUrl'    => get_rest_url(),
-				'nonce'      => wp_create_nonce( 'wp_rest' ),
-				'entityUrls' => $this->get_entity_urls(),
-			)
-		);
-
-		parent::render();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_menu_slug() {
-
-		return 'wl_google_addon_import';
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_partial_name() {
-		return 'wordlift-admin-google-addon-import.php';
-	}
-
-	private function get_entity_urls() {
-		if ( ! isset( $_GET['e'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			return array();
-		}
-
-		$entities = esc_url_raw( wp_unslash( $_GET['e'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
-
-		if ( empty( $entities ) ) {
-			return array();
-		}
-		if ( ! is_string( $entities ) ) {
-			return array();
-		}
-
-		return explode( ',', $entities );
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function get_page_title() {
+
+        return __( 'Google Addon Import', 'wordlift' );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_menu_title() {
+
+        return __( 'Google Addon Import', 'wordlift' );
+    }
+
+    protected function get_parent_slug() {
+        return null;
+    }
+
+    public function render() {
+
+        wp_enqueue_script(
+            'wl-gaddon-import-page',
+            plugin_dir_url( __FILE__ ) . 'assets/gaddon-import-page.js',
+            array(),
+            WORDLIFT_VERSION,
+            false
+        );
+
+        wp_localize_script(
+            'wl-gaddon-import-page',
+            '_wlGaddonImportSettings',
+            array(
+                'restUrl'    => get_rest_url(),
+                'nonce'      => wp_create_nonce( 'wp_rest' ),
+                'entityUrls' => $this->get_entity_urls(),
+            )
+        );
+
+        parent::render();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_menu_slug() {
+
+        return 'wl_google_addon_import';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_partial_name() {
+        return 'wordlift-admin-google-addon-import.php';
+    }
+
+    private function get_entity_urls() {
+        if ( ! isset( $_GET['e'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            return array();
+        }
+
+        $entities = esc_url_raw( wp_unslash( $_GET['e'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+        if ( empty( $entities ) ) {
+            return array();
+        }
+        if ( ! is_string( $entities ) ) {
+            return array();
+        }
+
+        return explode( ',', $entities );
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,7 @@ 
 	 */
 	public function get_page_title() {
 
-		return __( 'Google Addon Import', 'wordlift' );
+		return __('Google Addon Import', 'wordlift');
 	}
 
 	/**
@@ -19,7 +19,7 @@ 
 	 */
 	public function get_menu_title() {
 
-		return __( 'Google Addon Import', 'wordlift' );
+		return __('Google Addon Import', 'wordlift');
 	}
 
 	protected function get_parent_slug() {
@@ -30,7 +30,7 @@ 
 
 		wp_enqueue_script(
 			'wl-gaddon-import-page',
-			plugin_dir_url( __FILE__ ) . 'assets/gaddon-import-page.js',
+			plugin_dir_url(__FILE__).'assets/gaddon-import-page.js',
 			array(),
 			WORDLIFT_VERSION,
 			false
@@ -41,7 +41,7 @@ 
 			'_wlGaddonImportSettings',
 			array(
 				'restUrl'    => get_rest_url(),
-				'nonce'      => wp_create_nonce( 'wp_rest' ),
+				'nonce'      => wp_create_nonce('wp_rest'),
 				'entityUrls' => $this->get_entity_urls(),
 			)
 		);
@@ -65,20 +65,20 @@ 
 	}
 
 	private function get_entity_urls() {
-		if ( ! isset( $_GET['e'] ) ) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if ( ! isset($_GET['e'])) { //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return array();
 		}
 
-		$entities = esc_url_raw( wp_unslash( $_GET['e'] ) ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$entities = esc_url_raw(wp_unslash($_GET['e'])); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
-		if ( empty( $entities ) ) {
+		if (empty($entities)) {
 			return array();
 		}
-		if ( ! is_string( $entities ) ) {
+		if ( ! is_string($entities)) {
 			return array();
 		}
 
-		return explode( ',', $entities );
+		return explode(',', $entities);
 	}
 
 }

src/modules/pods/load.php

Indentation +23 added lines, -23 removed lines

@@ -17,16 +17,16 @@ 
 use Wordlift\Modules\Pods\WlEntityField\Filters;
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! apply_filters( 'wl_feature__enable__pods-integration', false ) ) { //phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	return;
+    return;
 }
 
 // Autoloader for plugin itself.
 if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-	require __DIR__ . '/vendor/autoload.php';
+    require __DIR__ . '/vendor/autoload.php';
 }
 
 $container_builder = new ContainerBuilder();
@@ -35,32 +35,32 @@ 
 $container_builder->compile();
 
 add_action(
-	'plugins_loaded',
-	function () use ( $container_builder ) {
+    'plugins_loaded',
+    function () use ( $container_builder ) {
 
-		if ( ! defined( 'PODS_VERSION' ) ) {
-			return;
-		}
+        if ( ! defined( 'PODS_VERSION' ) ) {
+            return;
+        }
 
-		$factory          = $container_builder->get( FieldDefinitionFactory::class );
-		$field_definition = $factory->get_field_definition();
-		$field_definition->register();
+        $factory          = $container_builder->get( FieldDefinitionFactory::class );
+        $field_definition = $factory->get_field_definition();
+        $field_definition->register();
 
-		/**
-		 * @var $installer \Wordlift\Modules\Pods\Installer
-		 */
-		$installer = $container_builder->get( Installer::class );
-		$installer->register_hooks();
+        /**
+         * @var $installer \Wordlift\Modules\Pods\Installer
+         */
+        $installer = $container_builder->get( Installer::class );
+        $installer->register_hooks();
 
-		/**
-		 * @var $notices \Wordlift\Modules\Pods\Notices
-		 */
-		$notices = $container_builder->get( Notices::class );
-		$notices->register_hooks();
+        /**
+         * @var $notices \Wordlift\Modules\Pods\Notices
+         */
+        $notices = $container_builder->get( Notices::class );
+        $notices->register_hooks();
 
-		$container_builder->get( Filters::class );
+        $container_builder->get( Filters::class );
 
-	}
+    }
 );
 
 

Spacing +12 added lines, -12 removed lines

@@ -16,49 +16,49 @@
 use Wordlift\Modules\Pods\Notices;
 use Wordlift\Modules\Pods\WlEntityField\Filters;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! apply_filters( 'wl_feature__enable__pods-integration', false ) ) { //phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+if ( ! apply_filters('wl_feature__enable__pods-integration', false)) { //phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 	return;
 }
 
 // Autoloader for plugin itself.
-if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-	require __DIR__ . '/vendor/autoload.php';
+if (file_exists(__DIR__.'/vendor/autoload.php')) {
+	require __DIR__.'/vendor/autoload.php';
 }
 
 $container_builder = new ContainerBuilder();
-$loader            = new YamlFileLoader( $container_builder, new FileLocator( __DIR__ ) );
-$loader->load( 'services.yml' );
+$loader            = new YamlFileLoader($container_builder, new FileLocator(__DIR__));
+$loader->load('services.yml');
 $container_builder->compile();
 
 add_action(
 	'plugins_loaded',
-	function () use ( $container_builder ) {
+	function() use ($container_builder) {
 
-		if ( ! defined( 'PODS_VERSION' ) ) {
+		if ( ! defined('PODS_VERSION')) {
 			return;
 		}
 
-		$factory          = $container_builder->get( FieldDefinitionFactory::class );
+		$factory          = $container_builder->get(FieldDefinitionFactory::class);
 		$field_definition = $factory->get_field_definition();
 		$field_definition->register();
 
 		/**
 		 * @var $installer \Wordlift\Modules\Pods\Installer
 		 */
-		$installer = $container_builder->get( Installer::class );
+		$installer = $container_builder->get(Installer::class);
 		$installer->register_hooks();
 
 		/**
 		 * @var $notices \Wordlift\Modules\Pods\Notices
 		 */
-		$notices = $container_builder->get( Notices::class );
+		$notices = $container_builder->get(Notices::class);
 		$notices->register_hooks();
 
-		$container_builder->get( Filters::class );
+		$container_builder->get(Filters::class);
 
 	}
 );

src/wordlift/jsonld/class-jsonld-adapter.php

Indentation +30 added lines, -30 removed lines

@@ -21,45 +21,45 @@
  */
 class Jsonld_Adapter {
 
-	/**
-	 * @var Wordlift_Jsonld_Service
-	 */
-	private $jsonld_service;
+    /**
+     * @var Wordlift_Jsonld_Service
+     */
+    private $jsonld_service;
 
-	/**
-	 * Jsonld_Adapter constructor.
-	 *
-	 * @param \Wordlift_Jsonld_Service $jsonld_service
-	 */
-	public function __construct( $jsonld_service ) {
+    /**
+     * Jsonld_Adapter constructor.
+     *
+     * @param \Wordlift_Jsonld_Service $jsonld_service
+     */
+    public function __construct( $jsonld_service ) {
 
-		$this->jsonld_service = $jsonld_service;
+        $this->jsonld_service = $jsonld_service;
 
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'amp_post_template_head', array( $this, 'wp_head' ) );
+        add_action( 'wp_head', array( $this, 'wp_head' ) );
+        add_action( 'amp_post_template_head', array( $this, 'wp_head' ) );
 
-	}
+    }
 
-	public function wp_head() {
+    public function wp_head() {
 
-		// Bail out if `wl_jsonld_enabled` isn't enabled.
-		if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
-			return;
-		}
+        // Bail out if `wl_jsonld_enabled` isn't enabled.
+        if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
+            return;
+        }
 
-		// 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;
+        // 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;
 
-		// Get the JSON-LD.
-		$jsonld = wp_json_encode( $this->jsonld_service->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
-		// Finally print the JSON-LD out.
-		$jsonld_post_html_output = '<script type="application/ld+json" id="wl-jsonld">' . $jsonld . '</script>';
-		$jsonld_post_html_output = apply_filters( 'wl_jsonld_post_html_output', $jsonld_post_html_output, $post_id );
+        // Get the JSON-LD.
+        $jsonld = wp_json_encode( $this->jsonld_service->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+        // Finally print the JSON-LD out.
+        $jsonld_post_html_output = '<script type="application/ld+json" id="wl-jsonld">' . $jsonld . '</script>';
+        $jsonld_post_html_output = apply_filters( 'wl_jsonld_post_html_output', $jsonld_post_html_output, $post_id );
 
-		// We don't need to escape this one since it's a JSON-LD output.
-		echo $jsonld_post_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+        // We don't need to escape this one since it's a JSON-LD output.
+        echo $jsonld_post_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 
-	}
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -31,19 +31,19 @@ 
 	 *
 	 * @param \Wordlift_Jsonld_Service $jsonld_service
 	 */
-	public function __construct( $jsonld_service ) {
+	public function __construct($jsonld_service) {
 
 		$this->jsonld_service = $jsonld_service;
 
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'amp_post_template_head', array( $this, 'wp_head' ) );
+		add_action('wp_head', array($this, 'wp_head'));
+		add_action('amp_post_template_head', array($this, 'wp_head'));
 
 	}
 
 	public function wp_head() {
 
 		// Bail out if `wl_jsonld_enabled` isn't enabled.
-		if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
+		if ( ! apply_filters('wl_jsonld_enabled', true)) {
 			return;
 		}
 
@@ -52,10 +52,10 @@ 
 		$post_id     = is_singular() ? get_the_ID() : null;
 
 		// Get the JSON-LD.
-		$jsonld = wp_json_encode( $this->jsonld_service->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
+		$jsonld = wp_json_encode($this->jsonld_service->get_jsonld($is_homepage, $post_id, Jsonld_Context_Enum::PAGE));
 		// Finally print the JSON-LD out.
-		$jsonld_post_html_output = '<script type="application/ld+json" id="wl-jsonld">' . $jsonld . '</script>';
-		$jsonld_post_html_output = apply_filters( 'wl_jsonld_post_html_output', $jsonld_post_html_output, $post_id );
+		$jsonld_post_html_output = '<script type="application/ld+json" id="wl-jsonld">'.$jsonld.'</script>';
+		$jsonld_post_html_output = apply_filters('wl_jsonld_post_html_output', $jsonld_post_html_output, $post_id);
 
 		// We don't need to escape this one since it's a JSON-LD output.
 		echo $jsonld_post_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

src/public/class-wordlift-term-jsonld-adapter.php

Indentation +269 added lines, -269 removed lines

@@ -20,274 +20,274 @@
  */
 class Wordlift_Term_JsonLd_Adapter {
 
-	/**
-	 * The {@link Wordlift_Entity_Uri_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 */
-	private $entity_uri_service;
-
-	private static $instance;
-
-	/**
-	 * @var Wordlift_Post_Converter
-	 */
-	private $post_id_to_jsonld_converter;
-
-	/**
-	 * Wordlift_Term_JsonLd_Adapter constructor.
-	 *
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 * @param \Wordlift_Post_Converter     $post_id_to_jsonld_converter The {@link Wordlift_Post_Converter} instance.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct( $entity_uri_service, $post_id_to_jsonld_converter ) {
-
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-
-		$this->entity_uri_service          = $entity_uri_service;
-		$this->post_id_to_jsonld_converter = $post_id_to_jsonld_converter;
-
-		self::$instance = $this;
-	}
-
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Adds carousel json ld data to term page if the conditions match
-	 *
-	 * @return array|boolean
-	 */
-	public function get_carousel_jsonld( $id = null ) {
-		$posts       = $this->get_posts( $id );
-		$post_jsonld = array();
-		if ( ! is_array( $posts ) || count( $posts ) < 2 ) {
-			// Bail out if no posts are present.
-			return false;
-		}
-
-		if ( $id !== null ) {
-			$term                       = get_term( $id );
-			$post_jsonld['description'] = wp_strip_all_tags( strip_shortcodes( $term->description ) );
-			$thumbnail_id               = get_term_meta( $id, 'thumbnail_id', true );
-			if ( ! empty( $thumbnail_id ) ) {
-				$post_jsonld['image'] = wp_get_attachment_url( $thumbnail_id );
-			}
-		}
-
-		// More than 2 items are present, so construct the post_jsonld data
-		$post_jsonld['@context']        = 'https://schema.org';
-		$post_jsonld['@type']           = 'ItemList';
-		$post_jsonld['url']             = $this->get_term_url( $id );
-		$post_jsonld['itemListElement'] = array();
-		$position                       = 1;
-
-		foreach ( $posts as $post_id ) {
-			$result = array(
-				'@type'    => 'ListItem',
-				'position' => $position,
-				/**
-				 * We can't use `item` here unless we change the URL for the item to point to the current page.
-				 *
-				 * See https://developers.google.com/search/docs/data-types/carousel
-				 */
-				'url'      => apply_filters( 'wl_carousel_post_list_item_url', get_permalink( $post_id ), $post_id ),
-			);
-			array_push( $post_jsonld['itemListElement'], $result );
-			++ $position;
-		}
-
-		return $post_jsonld;
-	}
-
-	private function get_posts( $id ) {
-		global $wp_query;
-
-		if ( $wp_query->posts !== null ) {
-			return array_map(
-				function ( $post ) {
-					return $post->ID;
-				},
-				$wp_query->posts
-			);
-		}
-
-		if ( $id === null ) {
-			return null;
-		}
-
-		$term = get_term( $id );
-
-		return get_objects_in_term( $id, $term->taxonomy );
-	}
-
-	/**
-	 * Hook to `wp_head` to print the JSON-LD.
-	 *
-	 * @since 3.20.0
-	 */
-	public function wp_head() {
-		$query_object = get_queried_object();
-
-		// Check if it is a term page.
-		if ( ! $query_object instanceof WP_Term ) {
-			return;
-		}
-
-		// Bail out if `wl_jsonld_enabled` isn't enabled.
-		if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
-			return;
-		}
-
-		$term_id = $query_object->term_id;
-
-		$jsonld = $this->get( $term_id, Jsonld_Context_Enum::PAGE );
-
-		// Bail out if the JSON-LD is empty.
-		if ( empty( $jsonld ) ) {
-			return;
-		}
-
-		$jsonld_string = wp_json_encode( $jsonld );
-
-		$jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">' . $jsonld_string . '</script>';
-		$jsonld_term_html_output = apply_filters( 'wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id );
-
-		echo $jsonld_term_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- It's an application/ld+json output.
-
-	}
-
-	public function get( $id, $context, $is_recursive_call = false ) {
-		/**
-		 * Support for carousel rich snippet, get jsonld data present
-		 * for all the posts shown in the term page, and add the jsonld data
-		 * to list
-		 *
-		 * see here: https://developers.google.com/search/docs/data-types/carousel
-		 *
-		 * @since 3.26.0
-		 */
-		$jsonld_array = array();
-
-		if ( Jsonld_Context_Enum::PAGE === $context ) {
-			$carousel_data = $this->get_carousel_jsonld( $id );
-			if ( $carousel_data ) {
-				$jsonld_array[] = $carousel_data;
-			}
-		}
-
-		$entities_jsonld_array = $this->get_entity_jsonld( $id, $context );
-
-		$result = array(
-			'jsonld'     => array_merge( $jsonld_array, $entities_jsonld_array ),
-			'references' => array(),
-		);
-
-		/**
-		 * @since 3.26.3
-		 * Filter: wl_term_jsonld_array
-		 * @var $id int Term id
-		 * @var $jsonld_array array An array containing jsonld for term and entities.
-		 */
-		$arr = apply_filters( 'wl_term_jsonld_array', $result, $id );
-
-		$references = array();
-
-		// Don't expand nested references, it will lead to an infinite loop.
-		if ( ! $is_recursive_call ) {
-			/**
-			 * @since 3.32.0
-			 * Expand the references returned by this filter.
-			 */
-			$references = $this->expand_references( $arr['references'] );
-		}
-
-		$jsonld_array = array_merge( $arr['jsonld'], $references );
-
-		return $jsonld_array;
-	}
-
-	private function get_term_url( $id ) {
-		if ( null === $id ) {
-			return isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ), FILTER_SANITIZE_URL ) : '';
-		}
-
-		$maybe_url = get_term_meta( $id, Wordlift_Url_Property_Service::META_KEY, true );
-		if ( ! empty( $maybe_url ) ) {
-			return $maybe_url;
-		}
-
-		return get_term_link( $id );
-	}
-
-	/**
-	 * Return jsonld for entities bound to terms.
-	 *
-	 * @param int $term_id Term ID.
-	 * @param int $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
-	 *
-	 * @return array
-	 */
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	private function get_entity_jsonld( $term_id, $context ) {
-
-		// The `_wl_entity_id` are URIs.
-		$entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
-		$entity_uri_service = $this->entity_uri_service;
-
-		$wordlift_jsonld_service = Wordlift_Jsonld_Service::get_instance();
-
-		$local_entity_ids = array_filter(
-			$entity_ids,
-			function ( $uri ) use ( $entity_uri_service ) {
-				return $entity_uri_service->is_internal( $uri );
-			}
-		);
-
-		// Bail out if there are no entities.
-		if ( empty( $local_entity_ids ) ) {
-			return array();
-		}
-
-		$post            = $this->entity_uri_service->get_entity( array_shift( $local_entity_ids ) );
-		$entities_jsonld = $wordlift_jsonld_service->get_jsonld( false, $post->ID );
-		// Reset the `url` to the term page.
-		$entities_jsonld[0]['url'] = get_term_link( $term_id );
-
-		return $entities_jsonld;
-	}
-
-	/**
-	 * @param $references
-	 *
-	 * @return array
-	 */
-	private function expand_references( $references ) {
-		if ( ! is_array( $references ) ) {
-			return array();
-		}
-		$references_jsonld = array();
-		// Expand the references.
-		foreach ( $references as $reference ) {
-			if ( $reference instanceof Post_Reference ) {
-				$post_id             = $reference->get_id();
-				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $post_id );
-			} elseif ( $reference instanceof Term_Reference ) {
-				// Second level references won't be expanded.
-				$references_jsonld[] = current( $this->get( $reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true ) );
-			} elseif ( is_numeric( $reference ) ) {
-				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $reference );
-			}
-		}
-
-		return $references_jsonld;
-
-	}
+    /**
+     * The {@link Wordlift_Entity_Uri_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     */
+    private $entity_uri_service;
+
+    private static $instance;
+
+    /**
+     * @var Wordlift_Post_Converter
+     */
+    private $post_id_to_jsonld_converter;
+
+    /**
+     * Wordlift_Term_JsonLd_Adapter constructor.
+     *
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     * @param \Wordlift_Post_Converter     $post_id_to_jsonld_converter The {@link Wordlift_Post_Converter} instance.
+     *
+     * @since 3.20.0
+     */
+    public function __construct( $entity_uri_service, $post_id_to_jsonld_converter ) {
+
+        add_action( 'wp_head', array( $this, 'wp_head' ) );
+
+        $this->entity_uri_service          = $entity_uri_service;
+        $this->post_id_to_jsonld_converter = $post_id_to_jsonld_converter;
+
+        self::$instance = $this;
+    }
+
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Adds carousel json ld data to term page if the conditions match
+     *
+     * @return array|boolean
+     */
+    public function get_carousel_jsonld( $id = null ) {
+        $posts       = $this->get_posts( $id );
+        $post_jsonld = array();
+        if ( ! is_array( $posts ) || count( $posts ) < 2 ) {
+            // Bail out if no posts are present.
+            return false;
+        }
+
+        if ( $id !== null ) {
+            $term                       = get_term( $id );
+            $post_jsonld['description'] = wp_strip_all_tags( strip_shortcodes( $term->description ) );
+            $thumbnail_id               = get_term_meta( $id, 'thumbnail_id', true );
+            if ( ! empty( $thumbnail_id ) ) {
+                $post_jsonld['image'] = wp_get_attachment_url( $thumbnail_id );
+            }
+        }
+
+        // More than 2 items are present, so construct the post_jsonld data
+        $post_jsonld['@context']        = 'https://schema.org';
+        $post_jsonld['@type']           = 'ItemList';
+        $post_jsonld['url']             = $this->get_term_url( $id );
+        $post_jsonld['itemListElement'] = array();
+        $position                       = 1;
+
+        foreach ( $posts as $post_id ) {
+            $result = array(
+                '@type'    => 'ListItem',
+                'position' => $position,
+                /**
+                 * We can't use `item` here unless we change the URL for the item to point to the current page.
+                 *
+                 * See https://developers.google.com/search/docs/data-types/carousel
+                 */
+                'url'      => apply_filters( 'wl_carousel_post_list_item_url', get_permalink( $post_id ), $post_id ),
+            );
+            array_push( $post_jsonld['itemListElement'], $result );
+            ++ $position;
+        }
+
+        return $post_jsonld;
+    }
+
+    private function get_posts( $id ) {
+        global $wp_query;
+
+        if ( $wp_query->posts !== null ) {
+            return array_map(
+                function ( $post ) {
+                    return $post->ID;
+                },
+                $wp_query->posts
+            );
+        }
+
+        if ( $id === null ) {
+            return null;
+        }
+
+        $term = get_term( $id );
+
+        return get_objects_in_term( $id, $term->taxonomy );
+    }
+
+    /**
+     * Hook to `wp_head` to print the JSON-LD.
+     *
+     * @since 3.20.0
+     */
+    public function wp_head() {
+        $query_object = get_queried_object();
+
+        // Check if it is a term page.
+        if ( ! $query_object instanceof WP_Term ) {
+            return;
+        }
+
+        // Bail out if `wl_jsonld_enabled` isn't enabled.
+        if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
+            return;
+        }
+
+        $term_id = $query_object->term_id;
+
+        $jsonld = $this->get( $term_id, Jsonld_Context_Enum::PAGE );
+
+        // Bail out if the JSON-LD is empty.
+        if ( empty( $jsonld ) ) {
+            return;
+        }
+
+        $jsonld_string = wp_json_encode( $jsonld );
+
+        $jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">' . $jsonld_string . '</script>';
+        $jsonld_term_html_output = apply_filters( 'wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id );
+
+        echo $jsonld_term_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- It's an application/ld+json output.
+
+    }
+
+    public function get( $id, $context, $is_recursive_call = false ) {
+        /**
+         * Support for carousel rich snippet, get jsonld data present
+         * for all the posts shown in the term page, and add the jsonld data
+         * to list
+         *
+         * see here: https://developers.google.com/search/docs/data-types/carousel
+         *
+         * @since 3.26.0
+         */
+        $jsonld_array = array();
+
+        if ( Jsonld_Context_Enum::PAGE === $context ) {
+            $carousel_data = $this->get_carousel_jsonld( $id );
+            if ( $carousel_data ) {
+                $jsonld_array[] = $carousel_data;
+            }
+        }
+
+        $entities_jsonld_array = $this->get_entity_jsonld( $id, $context );
+
+        $result = array(
+            'jsonld'     => array_merge( $jsonld_array, $entities_jsonld_array ),
+            'references' => array(),
+        );
+
+        /**
+         * @since 3.26.3
+         * Filter: wl_term_jsonld_array
+         * @var $id int Term id
+         * @var $jsonld_array array An array containing jsonld for term and entities.
+         */
+        $arr = apply_filters( 'wl_term_jsonld_array', $result, $id );
+
+        $references = array();
+
+        // Don't expand nested references, it will lead to an infinite loop.
+        if ( ! $is_recursive_call ) {
+            /**
+             * @since 3.32.0
+             * Expand the references returned by this filter.
+             */
+            $references = $this->expand_references( $arr['references'] );
+        }
+
+        $jsonld_array = array_merge( $arr['jsonld'], $references );
+
+        return $jsonld_array;
+    }
+
+    private function get_term_url( $id ) {
+        if ( null === $id ) {
+            return isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ), FILTER_SANITIZE_URL ) : '';
+        }
+
+        $maybe_url = get_term_meta( $id, Wordlift_Url_Property_Service::META_KEY, true );
+        if ( ! empty( $maybe_url ) ) {
+            return $maybe_url;
+        }
+
+        return get_term_link( $id );
+    }
+
+    /**
+     * Return jsonld for entities bound to terms.
+     *
+     * @param int $term_id Term ID.
+     * @param int $context A context for the JSON-LD generation, valid values in Jsonld_Context_Enum.
+     *
+     * @return array
+     */
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    private function get_entity_jsonld( $term_id, $context ) {
+
+        // The `_wl_entity_id` are URIs.
+        $entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
+        $entity_uri_service = $this->entity_uri_service;
+
+        $wordlift_jsonld_service = Wordlift_Jsonld_Service::get_instance();
+
+        $local_entity_ids = array_filter(
+            $entity_ids,
+            function ( $uri ) use ( $entity_uri_service ) {
+                return $entity_uri_service->is_internal( $uri );
+            }
+        );
+
+        // Bail out if there are no entities.
+        if ( empty( $local_entity_ids ) ) {
+            return array();
+        }
+
+        $post            = $this->entity_uri_service->get_entity( array_shift( $local_entity_ids ) );
+        $entities_jsonld = $wordlift_jsonld_service->get_jsonld( false, $post->ID );
+        // Reset the `url` to the term page.
+        $entities_jsonld[0]['url'] = get_term_link( $term_id );
+
+        return $entities_jsonld;
+    }
+
+    /**
+     * @param $references
+     *
+     * @return array
+     */
+    private function expand_references( $references ) {
+        if ( ! is_array( $references ) ) {
+            return array();
+        }
+        $references_jsonld = array();
+        // Expand the references.
+        foreach ( $references as $reference ) {
+            if ( $reference instanceof Post_Reference ) {
+                $post_id             = $reference->get_id();
+                $references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $post_id );
+            } elseif ( $reference instanceof Term_Reference ) {
+                // Second level references won't be expanded.
+                $references_jsonld[] = current( $this->get( $reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true ) );
+            } elseif ( is_numeric( $reference ) ) {
+                $references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $reference );
+            }
+        }
+
+        return $references_jsonld;
+
+    }
 
 }

Spacing +62 added lines, -62 removed lines

@@ -44,9 +44,9 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	public function __construct( $entity_uri_service, $post_id_to_jsonld_converter ) {
+	public function __construct($entity_uri_service, $post_id_to_jsonld_converter) {
 
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
+		add_action('wp_head', array($this, 'wp_head'));
 
 		$this->entity_uri_service          = $entity_uri_service;
 		$this->post_id_to_jsonld_converter = $post_id_to_jsonld_converter;
@@ -64,31 +64,31 @@ 
 	 *
 	 * @return array|boolean
 	 */
-	public function get_carousel_jsonld( $id = null ) {
-		$posts       = $this->get_posts( $id );
+	public function get_carousel_jsonld($id = null) {
+		$posts       = $this->get_posts($id);
 		$post_jsonld = array();
-		if ( ! is_array( $posts ) || count( $posts ) < 2 ) {
+		if ( ! is_array($posts) || count($posts) < 2) {
 			// Bail out if no posts are present.
 			return false;
 		}
 
-		if ( $id !== null ) {
-			$term                       = get_term( $id );
-			$post_jsonld['description'] = wp_strip_all_tags( strip_shortcodes( $term->description ) );
-			$thumbnail_id               = get_term_meta( $id, 'thumbnail_id', true );
-			if ( ! empty( $thumbnail_id ) ) {
-				$post_jsonld['image'] = wp_get_attachment_url( $thumbnail_id );
+		if ($id !== null) {
+			$term                       = get_term($id);
+			$post_jsonld['description'] = wp_strip_all_tags(strip_shortcodes($term->description));
+			$thumbnail_id               = get_term_meta($id, 'thumbnail_id', true);
+			if ( ! empty($thumbnail_id)) {
+				$post_jsonld['image'] = wp_get_attachment_url($thumbnail_id);
 			}
 		}
 
 		// More than 2 items are present, so construct the post_jsonld data
 		$post_jsonld['@context']        = 'https://schema.org';
 		$post_jsonld['@type']           = 'ItemList';
-		$post_jsonld['url']             = $this->get_term_url( $id );
+		$post_jsonld['url']             = $this->get_term_url($id);
 		$post_jsonld['itemListElement'] = array();
 		$position                       = 1;
 
-		foreach ( $posts as $post_id ) {
+		foreach ($posts as $post_id) {
 			$result = array(
 				'@type'    => 'ListItem',
 				'position' => $position,
@@ -97,34 +97,34 @@ 
 				 *
 				 * See https://developers.google.com/search/docs/data-types/carousel
 				 */
-				'url'      => apply_filters( 'wl_carousel_post_list_item_url', get_permalink( $post_id ), $post_id ),
+				'url'      => apply_filters('wl_carousel_post_list_item_url', get_permalink($post_id), $post_id),
 			);
-			array_push( $post_jsonld['itemListElement'], $result );
-			++ $position;
+			array_push($post_jsonld['itemListElement'], $result);
+			++$position;
 		}
 
 		return $post_jsonld;
 	}
 
-	private function get_posts( $id ) {
+	private function get_posts($id) {
 		global $wp_query;
 
-		if ( $wp_query->posts !== null ) {
+		if ($wp_query->posts !== null) {
 			return array_map(
-				function ( $post ) {
+				function($post) {
 					return $post->ID;
 				},
 				$wp_query->posts
 			);
 		}
 
-		if ( $id === null ) {
+		if ($id === null) {
 			return null;
 		}
 
-		$term = get_term( $id );
+		$term = get_term($id);
 
-		return get_objects_in_term( $id, $term->taxonomy );
+		return get_objects_in_term($id, $term->taxonomy);
 	}
 
 	/**
@@ -136,34 +136,34 @@ 
 		$query_object = get_queried_object();
 
 		// Check if it is a term page.
-		if ( ! $query_object instanceof WP_Term ) {
+		if ( ! $query_object instanceof WP_Term) {
 			return;
 		}
 
 		// Bail out if `wl_jsonld_enabled` isn't enabled.
-		if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
+		if ( ! apply_filters('wl_jsonld_enabled', true)) {
 			return;
 		}
 
 		$term_id = $query_object->term_id;
 
-		$jsonld = $this->get( $term_id, Jsonld_Context_Enum::PAGE );
+		$jsonld = $this->get($term_id, Jsonld_Context_Enum::PAGE);
 
 		// Bail out if the JSON-LD is empty.
-		if ( empty( $jsonld ) ) {
+		if (empty($jsonld)) {
 			return;
 		}
 
-		$jsonld_string = wp_json_encode( $jsonld );
+		$jsonld_string = wp_json_encode($jsonld);
 
-		$jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">' . $jsonld_string . '</script>';
-		$jsonld_term_html_output = apply_filters( 'wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id );
+		$jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">'.$jsonld_string.'</script>';
+		$jsonld_term_html_output = apply_filters('wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id);
 
 		echo $jsonld_term_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- It's an application/ld+json output.
 
 	}
 
-	public function get( $id, $context, $is_recursive_call = false ) {
+	public function get($id, $context, $is_recursive_call = false) {
 		/**
 		 * Support for carousel rich snippet, get jsonld data present
 		 * for all the posts shown in the term page, and add the jsonld data
@@ -175,17 +175,17 @@ 
 		 */
 		$jsonld_array = array();
 
-		if ( Jsonld_Context_Enum::PAGE === $context ) {
-			$carousel_data = $this->get_carousel_jsonld( $id );
-			if ( $carousel_data ) {
+		if (Jsonld_Context_Enum::PAGE === $context) {
+			$carousel_data = $this->get_carousel_jsonld($id);
+			if ($carousel_data) {
 				$jsonld_array[] = $carousel_data;
 			}
 		}
 
-		$entities_jsonld_array = $this->get_entity_jsonld( $id, $context );
+		$entities_jsonld_array = $this->get_entity_jsonld($id, $context);
 
 		$result = array(
-			'jsonld'     => array_merge( $jsonld_array, $entities_jsonld_array ),
+			'jsonld'     => array_merge($jsonld_array, $entities_jsonld_array),
 			'references' => array(),
 		);
 
@@ -195,35 +195,35 @@ 
 		 * @var $id int Term id
 		 * @var $jsonld_array array An array containing jsonld for term and entities.
 		 */
-		$arr = apply_filters( 'wl_term_jsonld_array', $result, $id );
+		$arr = apply_filters('wl_term_jsonld_array', $result, $id);
 
 		$references = array();
 
 		// Don't expand nested references, it will lead to an infinite loop.
-		if ( ! $is_recursive_call ) {
+		if ( ! $is_recursive_call) {
 			/**
 			 * @since 3.32.0
 			 * Expand the references returned by this filter.
 			 */
-			$references = $this->expand_references( $arr['references'] );
+			$references = $this->expand_references($arr['references']);
 		}
 
-		$jsonld_array = array_merge( $arr['jsonld'], $references );
+		$jsonld_array = array_merge($arr['jsonld'], $references);
 
 		return $jsonld_array;
 	}
 
-	private function get_term_url( $id ) {
-		if ( null === $id ) {
-			return isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ), FILTER_SANITIZE_URL ) : '';
+	private function get_term_url($id) {
+		if (null === $id) {
+			return isset($_SERVER['REQUEST_URI']) ? filter_var(wp_unslash($_SERVER['REQUEST_URI']), FILTER_SANITIZE_URL) : '';
 		}
 
-		$maybe_url = get_term_meta( $id, Wordlift_Url_Property_Service::META_KEY, true );
-		if ( ! empty( $maybe_url ) ) {
+		$maybe_url = get_term_meta($id, Wordlift_Url_Property_Service::META_KEY, true);
+		if ( ! empty($maybe_url)) {
 			return $maybe_url;
 		}
 
-		return get_term_link( $id );
+		return get_term_link($id);
 	}
 
 	/**
@@ -235,30 +235,30 @@ 
 	 * @return array
 	 */
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	private function get_entity_jsonld( $term_id, $context ) {
+	private function get_entity_jsonld($term_id, $context) {
 
 		// The `_wl_entity_id` are URIs.
-		$entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
+		$entity_ids         = get_term_meta($term_id, '_wl_entity_id');
 		$entity_uri_service = $this->entity_uri_service;
 
 		$wordlift_jsonld_service = Wordlift_Jsonld_Service::get_instance();
 
 		$local_entity_ids = array_filter(
 			$entity_ids,
-			function ( $uri ) use ( $entity_uri_service ) {
-				return $entity_uri_service->is_internal( $uri );
+			function($uri) use ($entity_uri_service) {
+				return $entity_uri_service->is_internal($uri);
 			}
 		);
 
 		// Bail out if there are no entities.
-		if ( empty( $local_entity_ids ) ) {
+		if (empty($local_entity_ids)) {
 			return array();
 		}
 
-		$post            = $this->entity_uri_service->get_entity( array_shift( $local_entity_ids ) );
-		$entities_jsonld = $wordlift_jsonld_service->get_jsonld( false, $post->ID );
+		$post            = $this->entity_uri_service->get_entity(array_shift($local_entity_ids));
+		$entities_jsonld = $wordlift_jsonld_service->get_jsonld(false, $post->ID);
 		// Reset the `url` to the term page.
-		$entities_jsonld[0]['url'] = get_term_link( $term_id );
+		$entities_jsonld[0]['url'] = get_term_link($term_id);
 
 		return $entities_jsonld;
 	}
@@ -268,21 +268,21 @@ 
 	 *
 	 * @return array
 	 */
-	private function expand_references( $references ) {
-		if ( ! is_array( $references ) ) {
+	private function expand_references($references) {
+		if ( ! is_array($references)) {
 			return array();
 		}
 		$references_jsonld = array();
 		// Expand the references.
-		foreach ( $references as $reference ) {
-			if ( $reference instanceof Post_Reference ) {
+		foreach ($references as $reference) {
+			if ($reference instanceof Post_Reference) {
 				$post_id             = $reference->get_id();
-				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $post_id );
-			} elseif ( $reference instanceof Term_Reference ) {
+				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert($post_id);
+			} elseif ($reference instanceof Term_Reference) {
 				// Second level references won't be expanded.
-				$references_jsonld[] = current( $this->get( $reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true ) );
-			} elseif ( is_numeric( $reference ) ) {
-				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $reference );
+				$references_jsonld[] = current($this->get($reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true));
+			} elseif (is_numeric($reference)) {
+				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert($reference);
 			}
 		}
 

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

Indentation +203 added lines, -203 removed lines

@@ -13,214 +13,214 @@
  */
 class Wordlift_Entity_Post_To_Jsonld_Converter extends Wordlift_Abstract_Post_To_Jsonld_Converter {
 
-	/**
-	 * 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_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, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter ) {
-		parent::__construct( $entity_type_service, $user_service, $attachment_service, $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.
-	 * @param array $references_infos
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.8.0
-	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = 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, $references_infos );
-		} else {
-			$jsonld = parent::convert( $post_id, $references, $references_infos );
-		}
-
-		// Get the entity name.
-		$jsonld['name'] = html_entity_decode( $post->post_title );
-
-		// 3.13.0, add alternate names.
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->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_for_post( $post_id );
-
-		if ( isset( $custom_fields ) ) {
-			$this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references, $references_infos );
-		}
-
-		/*
+    /**
+     * 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_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, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter ) {
+        parent::__construct( $entity_type_service, $user_service, $attachment_service, $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.
+     * @param array $references_infos
+     *
+     * @return array A JSON-LD array.
+     * @since 3.8.0
+     */
+    public function convert( $post_id, &$references = array(), &$references_infos = 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, $references_infos );
+        } else {
+            $jsonld = parent::convert( $post_id, $references, $references_infos );
+        }
+
+        // Get the entity name.
+        $jsonld['name'] = html_entity_decode( $post->post_title );
+
+        // 3.13.0, add alternate names.
+        $alternative_labels = Wordlift_Entity_Service::get_instance()->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_for_post( $post_id );
+
+        if ( isset( $custom_fields ) ) {
+            $this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references, $references_infos );
+        }
+
+        /*
 		 * 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
 		 */
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__all-entity-types', 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 );
-	}
-
-	/**
-	 * 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
-	 */
-	public static 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;
-	}
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        if ( apply_filters( 'wl_feature__enable__all-entity-types', 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 );
+    }
+
+    /**
+     * 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
+     */
+    public static 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 +37 added lines, -37 removed lines

@@ -42,8 +42,8 @@ 
 	 *
 	 * @since 3.8.0
 	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter ) {
-		parent::__construct( $entity_type_service, $user_service, $attachment_service, $property_getter );
+	public function __construct($entity_type_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service, $post_to_jsonld_converter) {
+		parent::__construct($entity_type_service, $user_service, $attachment_service, $property_getter);
 		$this->schemaorg_property_service = $schemaorg_property_service;
 		$this->post_to_jsonld_converter   = $post_to_jsonld_converter;
 	}
@@ -59,28 +59,28 @@ 
 	 * @return array A JSON-LD array.
 	 * @since 3.8.0
 	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array() ) {
+	public function convert($post_id, &$references = array(), &$references_infos = 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, $references_infos );
+		if (has_term('article', Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, $post_id)) {
+			$jsonld = $this->post_to_jsonld_converter->convert($post_id, $references, $references_infos);
 		} else {
-			$jsonld = parent::convert( $post_id, $references, $references_infos );
+			$jsonld = parent::convert($post_id, $references, $references_infos);
 		}
 
 		// Get the entity name.
-		$jsonld['name'] = html_entity_decode( $post->post_title );
+		$jsonld['name'] = html_entity_decode($post->post_title);
 
 		// 3.13.0, add alternate names.
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
-		if ( 0 < count( $alternative_labels ) ) {
+		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels($post_id);
+		if (0 < count($alternative_labels)) {
 			$jsonld['alternateName'] = $alternative_labels;
 		}
 
@@ -88,10 +88,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_for_post( $post_id );
+		$custom_fields = $this->entity_type_service->get_custom_fields_for_post($post_id);
 
-		if ( isset( $custom_fields ) ) {
-			$this->process_type_custom_fields( $jsonld, $custom_fields, $post, $references, $references_infos );
+		if (isset($custom_fields)) {
+			$this->process_type_custom_fields($jsonld, $custom_fields, $post, $references, $references_infos);
 		}
 
 		/*
@@ -102,8 +102,8 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		if ( apply_filters( 'wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES ) ) {
-			$this->process_post_properties( $jsonld, $post_id );
+		if (apply_filters('wl_feature__enable__all-entity-types', WL_ALL_ENTITY_TYPES)) {
+			$this->process_post_properties($jsonld, $post_id);
 		}
 
 		/**
@@ -120,7 +120,7 @@ 
 		 *
 		 * @api
 		 */
-		$ret_val    = apply_filters(
+		$ret_val = apply_filters(
 			'wl_entity_jsonld_array',
 			array(
 				'jsonld'     => $jsonld,
@@ -142,7 +142,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);
 	}
 
 	/**
@@ -153,17 +153,17 @@ 
 	 *
 	 * @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 ) {
+				function($instance) {
 					return $instance['value'];
 				},
 				$instances
@@ -172,19 +172,19 @@ 
 			// We might receive empty values, remove them.
 			$non_empty_values = array_filter(
 				$values,
-				function ( $value ) {
-					return ! empty( $value );
+				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);
 		}
 
 	}
@@ -198,25 +198,25 @@ 
 	 * @return array The array remapped.
 	 * @since 3.8.0
 	 */
-	public static function post_process( $jsonld ) {
+	public static 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]);
 			}
 		}
 

src/wordlift/vocabulary-terms/jsonld/class-jsonld-generator.php

Indentation +148 added lines, -148 removed lines

@@ -11,153 +11,153 @@
 
 class Jsonld_Generator {
 
-	/**
-	 * @var \Wordlift_Entity_Type_Service
-	 */
-	private $entity_type_service;
-	/**
-	 * @var \Wordlift_Property_Getter
-	 */
-	private $property_getter;
-	/**
-	 * @var Type_Service
-	 */
-	private $term_entity_type_service;
-	/**
-	 * @var \Wordlift_Entity_Service
-	 */
-	private $entity_service;
-
-	public function __construct( $entity_type_service, $property_getter ) {
-		$this->entity_type_service      = $entity_type_service;
-		$this->property_getter          = $property_getter;
-		$this->term_entity_type_service = Type_Service::get_instance();
-		$this->entity_service           = \Wordlift_Entity_Service::get_instance();
-	}
-
-	public function init() {
-		add_filter( 'wl_term_jsonld_array', array( $this, 'wl_term_jsonld_array' ), 10, 2 );
-	}
-
-	public function wl_term_jsonld_array( $data, $term_id ) {
-		$jsonld     = $data['jsonld'];
-		$references = $data['references'];
-
-		$term_jsonld_data = $this->get_jsonld_data_for_term( $term_id );
-
-		// Return early if we dont have the entity data
-		// for the term.
-		if ( ! $term_jsonld_data ) {
-			return $data;
-		}
-
-		$term_jsonld = $term_jsonld_data['jsonld'];
-
-		$references = array_merge( $references, $term_jsonld_data['references'] );
-
-		array_unshift( $jsonld, $term_jsonld );
-
-		return array(
-			'jsonld'     => $jsonld,
-			'references' => $references,
-		);
-	}
-
-	private function get_jsonld_data_for_term( $term_id ) {
-
-		$id = $this->entity_service->get_uri( $term_id, Object_Type_Enum::TERM );
-
-		// If we don't have a dataset  URI, then don't publish the term data
-		// on this page.
-		if ( ! $id ) {
-			return false;
-		}
-
-		$references = array();
-		$term       = get_term( $term_id );
-		$permalink  = get_term_link( $term );
-
-		$custom_fields = $this->entity_type_service->get_custom_fields_for_term( $term_id );
-		$term          = get_term( $term_id );
-		$jsonld        = array(
-			'@context'    => 'http://schema.org',
-			'name'        => $term->name,
-			'@type'       => $this->term_entity_type_service->get_entity_types_labels( $term_id ),
-			'@id'         => $id,
-			'description' => $term->description,
-		);
-
-		if ( ! $custom_fields || ! is_array( $custom_fields ) ) {
-			return $jsonld;
-		}
-
-		foreach ( $custom_fields as $key => $value ) {
-			$name  = $this->relative_to_schema_context( $value['predicate'] );
-			$value = $this->property_getter->get( $term_id, $key, Object_Type_Enum::TERM );
-			$value = $this->process_value( $value, $references );
-			if ( ! isset( $value ) ||
-				 is_array( $value ) && empty( $value ) ||
-				 is_string( $value ) && empty( $value ) ) {
-				continue;
-			}
-			$jsonld[ $name ] = $value;
-
-		}
-
-		$jsonld = \Wordlift_Entity_Post_To_Jsonld_Converter::post_process( $jsonld );
-
-		if ( $permalink ) {
-			$jsonld['mainEntityOfPage'] = $permalink;
-		}
-
-		return apply_filters(
-			'wl_no_vocabulary_term_jsonld_array',
-			array(
-				'jsonld'     => $jsonld,
-				'references' => $references,
-			),
-			$term_id
-		);
-
-	}
-
-	private function relative_to_schema_context( $predicate ) {
-		return str_replace( 'http://schema.org/', '', $predicate );
-	}
-
-	private function process_value( $value, &$references ) {
-
-		if ( is_array( $value )
-			 && count( $value ) > 0
-			 && $value[0] instanceof \Wordlift_Property_Entity_Reference ) {
-
-			// All of the references from the custom fields are post references.
-			$references = array_merge(
-				$references,
-				array_map(
-					function ( $property_entity_reference ) {
-						/**
-						 * @var $property_entity_reference \Wordlift_Property_Entity_Reference
-						 */
-						return $property_entity_reference->to_reference();
-					},
-					$value
-				)
-			);
-
-			return array_map(
-				function ( $reference ) {
-					/**
-					 * @var $reference \Wordlift_Property_Entity_Reference
-					 */
-					return array( '@id' => $reference->get_url() );
-				},
-				$value
-			);
-
-		}
-
-		return $value;
-	}
+    /**
+     * @var \Wordlift_Entity_Type_Service
+     */
+    private $entity_type_service;
+    /**
+     * @var \Wordlift_Property_Getter
+     */
+    private $property_getter;
+    /**
+     * @var Type_Service
+     */
+    private $term_entity_type_service;
+    /**
+     * @var \Wordlift_Entity_Service
+     */
+    private $entity_service;
+
+    public function __construct( $entity_type_service, $property_getter ) {
+        $this->entity_type_service      = $entity_type_service;
+        $this->property_getter          = $property_getter;
+        $this->term_entity_type_service = Type_Service::get_instance();
+        $this->entity_service           = \Wordlift_Entity_Service::get_instance();
+    }
+
+    public function init() {
+        add_filter( 'wl_term_jsonld_array', array( $this, 'wl_term_jsonld_array' ), 10, 2 );
+    }
+
+    public function wl_term_jsonld_array( $data, $term_id ) {
+        $jsonld     = $data['jsonld'];
+        $references = $data['references'];
+
+        $term_jsonld_data = $this->get_jsonld_data_for_term( $term_id );
+
+        // Return early if we dont have the entity data
+        // for the term.
+        if ( ! $term_jsonld_data ) {
+            return $data;
+        }
+
+        $term_jsonld = $term_jsonld_data['jsonld'];
+
+        $references = array_merge( $references, $term_jsonld_data['references'] );
+
+        array_unshift( $jsonld, $term_jsonld );
+
+        return array(
+            'jsonld'     => $jsonld,
+            'references' => $references,
+        );
+    }
+
+    private function get_jsonld_data_for_term( $term_id ) {
+
+        $id = $this->entity_service->get_uri( $term_id, Object_Type_Enum::TERM );
+
+        // If we don't have a dataset  URI, then don't publish the term data
+        // on this page.
+        if ( ! $id ) {
+            return false;
+        }
+
+        $references = array();
+        $term       = get_term( $term_id );
+        $permalink  = get_term_link( $term );
+
+        $custom_fields = $this->entity_type_service->get_custom_fields_for_term( $term_id );
+        $term          = get_term( $term_id );
+        $jsonld        = array(
+            '@context'    => 'http://schema.org',
+            'name'        => $term->name,
+            '@type'       => $this->term_entity_type_service->get_entity_types_labels( $term_id ),
+            '@id'         => $id,
+            'description' => $term->description,
+        );
+
+        if ( ! $custom_fields || ! is_array( $custom_fields ) ) {
+            return $jsonld;
+        }
+
+        foreach ( $custom_fields as $key => $value ) {
+            $name  = $this->relative_to_schema_context( $value['predicate'] );
+            $value = $this->property_getter->get( $term_id, $key, Object_Type_Enum::TERM );
+            $value = $this->process_value( $value, $references );
+            if ( ! isset( $value ) ||
+                 is_array( $value ) && empty( $value ) ||
+                 is_string( $value ) && empty( $value ) ) {
+                continue;
+            }
+            $jsonld[ $name ] = $value;
+
+        }
+
+        $jsonld = \Wordlift_Entity_Post_To_Jsonld_Converter::post_process( $jsonld );
+
+        if ( $permalink ) {
+            $jsonld['mainEntityOfPage'] = $permalink;
+        }
+
+        return apply_filters(
+            'wl_no_vocabulary_term_jsonld_array',
+            array(
+                'jsonld'     => $jsonld,
+                'references' => $references,
+            ),
+            $term_id
+        );
+
+    }
+
+    private function relative_to_schema_context( $predicate ) {
+        return str_replace( 'http://schema.org/', '', $predicate );
+    }
+
+    private function process_value( $value, &$references ) {
+
+        if ( is_array( $value )
+             && count( $value ) > 0
+             && $value[0] instanceof \Wordlift_Property_Entity_Reference ) {
+
+            // All of the references from the custom fields are post references.
+            $references = array_merge(
+                $references,
+                array_map(
+                    function ( $property_entity_reference ) {
+                        /**
+                         * @var $property_entity_reference \Wordlift_Property_Entity_Reference
+                         */
+                        return $property_entity_reference->to_reference();
+                    },
+                    $value
+                )
+            );
+
+            return array_map(
+                function ( $reference ) {
+                    /**
+                     * @var $reference \Wordlift_Property_Entity_Reference
+                     */
+                    return array( '@id' => $reference->get_url() );
+                },
+                $value
+            );
+
+        }
+
+        return $value;
+    }
 
 }

Spacing +35 added lines, -35 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	private $entity_service;
 
-	public function __construct( $entity_type_service, $property_getter ) {
+	public function __construct($entity_type_service, $property_getter) {
 		$this->entity_type_service      = $entity_type_service;
 		$this->property_getter          = $property_getter;
 		$this->term_entity_type_service = Type_Service::get_instance();
@@ -36,26 +36,26 @@ 
 	}
 
 	public function init() {
-		add_filter( 'wl_term_jsonld_array', array( $this, 'wl_term_jsonld_array' ), 10, 2 );
+		add_filter('wl_term_jsonld_array', array($this, 'wl_term_jsonld_array'), 10, 2);
 	}
 
-	public function wl_term_jsonld_array( $data, $term_id ) {
+	public function wl_term_jsonld_array($data, $term_id) {
 		$jsonld     = $data['jsonld'];
 		$references = $data['references'];
 
-		$term_jsonld_data = $this->get_jsonld_data_for_term( $term_id );
+		$term_jsonld_data = $this->get_jsonld_data_for_term($term_id);
 
 		// Return early if we dont have the entity data
 		// for the term.
-		if ( ! $term_jsonld_data ) {
+		if ( ! $term_jsonld_data) {
 			return $data;
 		}
 
 		$term_jsonld = $term_jsonld_data['jsonld'];
 
-		$references = array_merge( $references, $term_jsonld_data['references'] );
+		$references = array_merge($references, $term_jsonld_data['references']);
 
-		array_unshift( $jsonld, $term_jsonld );
+		array_unshift($jsonld, $term_jsonld);
 
 		return array(
 			'jsonld'     => $jsonld,
@@ -63,50 +63,50 @@ 
 		);
 	}
 
-	private function get_jsonld_data_for_term( $term_id ) {
+	private function get_jsonld_data_for_term($term_id) {
 
-		$id = $this->entity_service->get_uri( $term_id, Object_Type_Enum::TERM );
+		$id = $this->entity_service->get_uri($term_id, Object_Type_Enum::TERM);
 
 		// If we don't have a dataset  URI, then don't publish the term data
 		// on this page.
-		if ( ! $id ) {
+		if ( ! $id) {
 			return false;
 		}
 
 		$references = array();
-		$term       = get_term( $term_id );
-		$permalink  = get_term_link( $term );
+		$term       = get_term($term_id);
+		$permalink  = get_term_link($term);
 
-		$custom_fields = $this->entity_type_service->get_custom_fields_for_term( $term_id );
-		$term          = get_term( $term_id );
+		$custom_fields = $this->entity_type_service->get_custom_fields_for_term($term_id);
+		$term          = get_term($term_id);
 		$jsonld        = array(
 			'@context'    => 'http://schema.org',
 			'name'        => $term->name,
-			'@type'       => $this->term_entity_type_service->get_entity_types_labels( $term_id ),
+			'@type'       => $this->term_entity_type_service->get_entity_types_labels($term_id),
 			'@id'         => $id,
 			'description' => $term->description,
 		);
 
-		if ( ! $custom_fields || ! is_array( $custom_fields ) ) {
+		if ( ! $custom_fields || ! is_array($custom_fields)) {
 			return $jsonld;
 		}
 
-		foreach ( $custom_fields as $key => $value ) {
-			$name  = $this->relative_to_schema_context( $value['predicate'] );
-			$value = $this->property_getter->get( $term_id, $key, Object_Type_Enum::TERM );
-			$value = $this->process_value( $value, $references );
-			if ( ! isset( $value ) ||
-				 is_array( $value ) && empty( $value ) ||
-				 is_string( $value ) && empty( $value ) ) {
+		foreach ($custom_fields as $key => $value) {
+			$name  = $this->relative_to_schema_context($value['predicate']);
+			$value = $this->property_getter->get($term_id, $key, Object_Type_Enum::TERM);
+			$value = $this->process_value($value, $references);
+			if ( ! isset($value) ||
+				 is_array($value) && empty($value) ||
+				 is_string($value) && empty($value)) {
 				continue;
 			}
-			$jsonld[ $name ] = $value;
+			$jsonld[$name] = $value;
 
 		}
 
-		$jsonld = \Wordlift_Entity_Post_To_Jsonld_Converter::post_process( $jsonld );
+		$jsonld = \Wordlift_Entity_Post_To_Jsonld_Converter::post_process($jsonld);
 
-		if ( $permalink ) {
+		if ($permalink) {
 			$jsonld['mainEntityOfPage'] = $permalink;
 		}
 
@@ -121,21 +121,21 @@ 
 
 	}
 
-	private function relative_to_schema_context( $predicate ) {
-		return str_replace( 'http://schema.org/', '', $predicate );
+	private function relative_to_schema_context($predicate) {
+		return str_replace('http://schema.org/', '', $predicate);
 	}
 
-	private function process_value( $value, &$references ) {
+	private function process_value($value, &$references) {
 
-		if ( is_array( $value )
-			 && count( $value ) > 0
-			 && $value[0] instanceof \Wordlift_Property_Entity_Reference ) {
+		if (is_array($value)
+			 && count($value) > 0
+			 && $value[0] instanceof \Wordlift_Property_Entity_Reference) {
 
 			// All of the references from the custom fields are post references.
 			$references = array_merge(
 				$references,
 				array_map(
-					function ( $property_entity_reference ) {
+					function($property_entity_reference) {
 						/**
 						 * @var $property_entity_reference \Wordlift_Property_Entity_Reference
 						 */
@@ -146,11 +146,11 @@ 
 			);
 
 			return array_map(
-				function ( $reference ) {
+				function($reference) {
 					/**
 					 * @var $reference \Wordlift_Property_Entity_Reference
 					 */
-					return array( '@id' => $reference->get_url() );
+					return array('@id' => $reference->get_url());
 				},
 				$value
 			);

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

Indentation +116 added lines, -116 removed lines

@@ -15,122 +15,122 @@
 
 class Entity_Query_Service {
 
-	private static $instance = null;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @return Entity_Query_Service
-	 */
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	private function query_posts( $query, $schema_types, $limit ) {
-		return wl_entity_get_by_title( $query, true, true, $limit, $schema_types );
-	}
-
-	private function query_terms( $query, $schema_types, $limit ) {
-		global $wpdb;
-		$schema_types = join(
-			',',
-			array_map(
-				function ( $schema_type ) {
-					return "'" . esc_sql( strtolower( $schema_type ) ) . "'";
-				},
-				$schema_types
-			)
-		);
-
-		return $wpdb->get_results(
-			$wpdb->prepare(
-				"SELECT DISTINCT t.term_id as id, t.name as title, tm.meta_value as schema_type_name FROM $wpdb->terms t INNER JOIN $wpdb->termmeta tm
+    private static $instance = null;
+
+    /**
+     * The singleton instance.
+     *
+     * @return Entity_Query_Service
+     */
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    private function query_posts( $query, $schema_types, $limit ) {
+        return wl_entity_get_by_title( $query, true, true, $limit, $schema_types );
+    }
+
+    private function query_terms( $query, $schema_types, $limit ) {
+        global $wpdb;
+        $schema_types = join(
+            ',',
+            array_map(
+                function ( $schema_type ) {
+                    return "'" . esc_sql( strtolower( $schema_type ) ) . "'";
+                },
+                $schema_types
+            )
+        );
+
+        return $wpdb->get_results(
+            $wpdb->prepare(
+                "SELECT DISTINCT t.term_id as id, t.name as title, tm.meta_value as schema_type_name FROM $wpdb->terms t INNER JOIN $wpdb->termmeta tm
     ON t.term_id=tm.term_id WHERE t.name LIKE %s AND (tm.meta_key = %s AND tm.meta_value IN ($schema_types)) LIMIT %d", // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-				'%' . $wpdb->esc_like( $query ) . '%',
-				\Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				$limit
-			)
-		);
-
-	}
-
-	/**
-	 * @param $results
-	 * @param $object_type
-	 *
-	 * @return  Entity[]
-	 */
-	private function transform_posts( $results ) {
-		return array_map(
-			function ( $item ) {
-				return new Entity( $item->schema_type_name, new Wordpress_Content( get_post( $item->id ) ) );
-			},
-			$results
-		);
-	}
-
-	private function transform_terms( $results ) {
-		return array_map(
-			function ( $item ) {
-				return new Entity( $item->schema_type_name, new Wordpress_Content( get_term( $item->id ) ) );
-			},
-			$results
-		);
-	}
-
-	/**
-	 * @param $query
-	 * @param $schema_types
-	 * @param $limit
-	 *
-	 * @return Entity[]
-	 */
-	public function query( $query, $schema_types = array(), $limit = 10 ) {
-
-		$results = $this->transform_posts( $this->query_posts( $query, $schema_types, $limit ) );
-
-		if ( count( $results ) >= $limit ) {
-			return $results;
-		}
-
-		$results = array_merge( $results, $this->transform_terms( $this->query_terms( $query, $schema_types, $limit ) ) );
-
-		return $results;
-
-	}
-
-	public function get( $linked_entities ) {
-
-		/**
-		 * @var $term_type_service Type_Service
-		 */
-		$term_type_service        = Type_Service::get_instance();
-		$post_entity_type_service = \Wordlift_Entity_Type_Service::get_instance();
-
-		return array_filter(
-			array_map(
-				function ( $item ) use ( $term_type_service, $post_entity_type_service ) {
-					$parts      = explode( '_', $item );
-					$type       = Object_Type_Enum::from_string( $parts[0] );
-					$identifier = $parts[1];
-
-					if ( Object_Type_Enum::POST === $type ) {
-						return new Entity( join( ',', $post_entity_type_service->get_names( $identifier ) ), new Wordpress_Content( get_post( $identifier ) ) );
-					} elseif ( Object_Type_Enum::TERM === $type ) {
-
-						return new Entity( join( ',', $term_type_service->get_entity_types_labels( $identifier ) ), new Wordpress_Content( get_term( $identifier ) ) );
-					}
-
-					// return new Entity( $item->schema_type_name, new Wordpress_Content( get_term( $item->id ) ) );
-				},
-				$linked_entities
-			)
-		);
-
-	}
+                '%' . $wpdb->esc_like( $query ) . '%',
+                \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                $limit
+            )
+        );
+
+    }
+
+    /**
+     * @param $results
+     * @param $object_type
+     *
+     * @return  Entity[]
+     */
+    private function transform_posts( $results ) {
+        return array_map(
+            function ( $item ) {
+                return new Entity( $item->schema_type_name, new Wordpress_Content( get_post( $item->id ) ) );
+            },
+            $results
+        );
+    }
+
+    private function transform_terms( $results ) {
+        return array_map(
+            function ( $item ) {
+                return new Entity( $item->schema_type_name, new Wordpress_Content( get_term( $item->id ) ) );
+            },
+            $results
+        );
+    }
+
+    /**
+     * @param $query
+     * @param $schema_types
+     * @param $limit
+     *
+     * @return Entity[]
+     */
+    public function query( $query, $schema_types = array(), $limit = 10 ) {
+
+        $results = $this->transform_posts( $this->query_posts( $query, $schema_types, $limit ) );
+
+        if ( count( $results ) >= $limit ) {
+            return $results;
+        }
+
+        $results = array_merge( $results, $this->transform_terms( $this->query_terms( $query, $schema_types, $limit ) ) );
+
+        return $results;
+
+    }
+
+    public function get( $linked_entities ) {
+
+        /**
+         * @var $term_type_service Type_Service
+         */
+        $term_type_service        = Type_Service::get_instance();
+        $post_entity_type_service = \Wordlift_Entity_Type_Service::get_instance();
+
+        return array_filter(
+            array_map(
+                function ( $item ) use ( $term_type_service, $post_entity_type_service ) {
+                    $parts      = explode( '_', $item );
+                    $type       = Object_Type_Enum::from_string( $parts[0] );
+                    $identifier = $parts[1];
+
+                    if ( Object_Type_Enum::POST === $type ) {
+                        return new Entity( join( ',', $post_entity_type_service->get_names( $identifier ) ), new Wordpress_Content( get_post( $identifier ) ) );
+                    } elseif ( Object_Type_Enum::TERM === $type ) {
+
+                        return new Entity( join( ',', $term_type_service->get_entity_types_labels( $identifier ) ), new Wordpress_Content( get_term( $identifier ) ) );
+                    }
+
+                    // return new Entity( $item->schema_type_name, new Wordpress_Content( get_term( $item->id ) ) );
+                },
+                $linked_entities
+            )
+        );
+
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -23,24 +23,24 @@ 
 	 * @return Entity_Query_Service
 	 */
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
 		return self::$instance;
 	}
 
-	private function query_posts( $query, $schema_types, $limit ) {
-		return wl_entity_get_by_title( $query, true, true, $limit, $schema_types );
+	private function query_posts($query, $schema_types, $limit) {
+		return wl_entity_get_by_title($query, true, true, $limit, $schema_types);
 	}
 
-	private function query_terms( $query, $schema_types, $limit ) {
+	private function query_terms($query, $schema_types, $limit) {
 		global $wpdb;
 		$schema_types = join(
 			',',
 			array_map(
-				function ( $schema_type ) {
-					return "'" . esc_sql( strtolower( $schema_type ) ) . "'";
+				function($schema_type) {
+					return "'".esc_sql(strtolower($schema_type))."'";
 				},
 				$schema_types
 			)
@@ -50,7 +50,7 @@ 
 			$wpdb->prepare(
 				"SELECT DISTINCT t.term_id as id, t.name as title, tm.meta_value as schema_type_name FROM $wpdb->terms t INNER JOIN $wpdb->termmeta tm
     ON t.term_id=tm.term_id WHERE t.name LIKE %s AND (tm.meta_key = %s AND tm.meta_value IN ($schema_types)) LIMIT %d", // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-				'%' . $wpdb->esc_like( $query ) . '%',
+				'%'.$wpdb->esc_like($query).'%',
 				\Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 				$limit
 			)
@@ -64,19 +64,19 @@ 
 	 *
 	 * @return  Entity[]
 	 */
-	private function transform_posts( $results ) {
+	private function transform_posts($results) {
 		return array_map(
-			function ( $item ) {
-				return new Entity( $item->schema_type_name, new Wordpress_Content( get_post( $item->id ) ) );
+			function($item) {
+				return new Entity($item->schema_type_name, new Wordpress_Content(get_post($item->id)));
 			},
 			$results
 		);
 	}
 
-	private function transform_terms( $results ) {
+	private function transform_terms($results) {
 		return array_map(
-			function ( $item ) {
-				return new Entity( $item->schema_type_name, new Wordpress_Content( get_term( $item->id ) ) );
+			function($item) {
+				return new Entity($item->schema_type_name, new Wordpress_Content(get_term($item->id)));
 			},
 			$results
 		);
@@ -89,21 +89,21 @@ 
 	 *
 	 * @return Entity[]
 	 */
-	public function query( $query, $schema_types = array(), $limit = 10 ) {
+	public function query($query, $schema_types = array(), $limit = 10) {
 
-		$results = $this->transform_posts( $this->query_posts( $query, $schema_types, $limit ) );
+		$results = $this->transform_posts($this->query_posts($query, $schema_types, $limit));
 
-		if ( count( $results ) >= $limit ) {
+		if (count($results) >= $limit) {
 			return $results;
 		}
 
-		$results = array_merge( $results, $this->transform_terms( $this->query_terms( $query, $schema_types, $limit ) ) );
+		$results = array_merge($results, $this->transform_terms($this->query_terms($query, $schema_types, $limit)));
 
 		return $results;
 
 	}
 
-	public function get( $linked_entities ) {
+	public function get($linked_entities) {
 
 		/**
 		 * @var $term_type_service Type_Service
@@ -113,16 +113,16 @@ 
 
 		return array_filter(
 			array_map(
-				function ( $item ) use ( $term_type_service, $post_entity_type_service ) {
-					$parts      = explode( '_', $item );
-					$type       = Object_Type_Enum::from_string( $parts[0] );
+				function($item) use ($term_type_service, $post_entity_type_service) {
+					$parts      = explode('_', $item);
+					$type       = Object_Type_Enum::from_string($parts[0]);
 					$identifier = $parts[1];
 
-					if ( Object_Type_Enum::POST === $type ) {
-						return new Entity( join( ',', $post_entity_type_service->get_names( $identifier ) ), new Wordpress_Content( get_post( $identifier ) ) );
-					} elseif ( Object_Type_Enum::TERM === $type ) {
+					if (Object_Type_Enum::POST === $type) {
+						return new Entity(join(',', $post_entity_type_service->get_names($identifier)), new Wordpress_Content(get_post($identifier)));
+					} elseif (Object_Type_Enum::TERM === $type) {
 
-						return new Entity( join( ',', $term_type_service->get_entity_types_labels( $identifier ) ), new Wordpress_Content( get_term( $identifier ) ) );
+						return new Entity(join(',', $term_type_service->get_entity_types_labels($identifier)), new Wordpress_Content(get_term($identifier)));
 					}
 
 					// return new Entity( $item->schema_type_name, new Wordpress_Content( get_term( $item->id ) ) );

src/wordlift/api-data/class-api-data-hooks.php

Indentation +121 added lines, -121 removed lines

@@ -14,126 +14,126 @@
 
 class Api_Data_Hooks {
 
-	const META_KEY = 'wl_schema_url';
-
-	protected $cache_requests = array();
-
-	public function __construct() {
-
-		/**
-		 * Hook for Post Save
-		 */
-		add_action( 'save_post', array( $this, 'post_save_request_delete_cache' ) );
-
-		/**
-		 * Check for Meta Key change on Post Save
-		 */
-		add_action( 'updated_post_meta', array( $this, 'post_meta_request_delete_cache' ), 10, 4 );
-
-		/**
-		 * Initiate the purge cache requests
-		 */
-		add_action( 'shutdown', array( $this, 'init_purge_cache_requests' ) );
-	}
-
-	public function post_save_request_delete_cache( $post_id ) {
-		$this->delete_cache_for_meta_values( $post_id );
-	}
-
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function post_meta_request_delete_cache( $meta_id, $post_id, $meta_key, $_meta_value ) {
-		$this->cache_requests[] = $post_id;
-	}
-
-	public function init_purge_cache_requests() {
-		// Bail early.
-		if ( empty( $this->cache_requests ) ) {
-			return;
-		}
-
-		// Avoid duplicate cache requests.
-		$unique_requests = array_unique( $this->cache_requests );
-
-		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		foreach ( $unique_requests as $key => $post_id ) {
-			$this->delete_cache_for_meta_values( $post_id );
-		}
-	}
-
-	/**
-	 * @param integer $post_id
-	 */
-	private function delete_cache_for_meta_values( $post_id ) {
-
-		/**
-		 * Get Post Meta Values
-		 */
-		$values = get_post_meta( $post_id, self::META_KEY, false );
-
-		/**
-		 * Iterate over $values array
-		 */
-		if ( ! empty( $values ) ) {
-			foreach ( $values as $link ) {
-
-				/**
-				 * Skip the <permalink>
-				 */
-				if ( '<permalink>' === $link || 'http://<permalink>/' === $link ) {
-					$link = get_permalink();
-				}
-
-				/**
-				 * Sanitize the link
-				 */
-				$link = $this->sanitize( $link );
-				/**
-				 * Make actual API DELETE cache request
-				 */
-				$this->api_call_delete_cache( $link );
-			}
-		}
-	}
-
-	/**
-	 * @desc Sanitize the $link
-	 *
-	 * @param string $link
-	 *
-	 * @return string
-	 */
-	private function sanitize( $link ) {
-		return preg_replace( '/:\//i', '', $link );
-	}
-
-	/**
-	 * @desc Do a DELETE request with WP request function
-	 *
-	 * @param string $path path that goes after the URL eg. "/user/login"
-	 *
-	 * @return bool  True if successful otherwise false
-	 */
-	private function api_call_delete_cache( $path ) {
-
-		// Bailout if path is empty
-		if ( empty( $path ) ) {
-			return false;
-		}
-
-		$log = \Wordlift_Log_Service::get_logger( 'api_call_delete_cache' );
-
-		$log->debug( "Delete cache request started:: '$path'" );
-
-		$url  = Wordlift_Configuration_Service::get_instance()->get_api_url() . 'data/' . $path;
-		$args = array(
-			'method'   => 'DELETE',
-			'blocking' => false,
-			'timeout'  => 0.01,
-		);
-
-		// Execute the request
-		wp_remote_request( $url, $args );
-
-	}
+    const META_KEY = 'wl_schema_url';
+
+    protected $cache_requests = array();
+
+    public function __construct() {
+
+        /**
+         * Hook for Post Save
+         */
+        add_action( 'save_post', array( $this, 'post_save_request_delete_cache' ) );
+
+        /**
+         * Check for Meta Key change on Post Save
+         */
+        add_action( 'updated_post_meta', array( $this, 'post_meta_request_delete_cache' ), 10, 4 );
+
+        /**
+         * Initiate the purge cache requests
+         */
+        add_action( 'shutdown', array( $this, 'init_purge_cache_requests' ) );
+    }
+
+    public function post_save_request_delete_cache( $post_id ) {
+        $this->delete_cache_for_meta_values( $post_id );
+    }
+
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function post_meta_request_delete_cache( $meta_id, $post_id, $meta_key, $_meta_value ) {
+        $this->cache_requests[] = $post_id;
+    }
+
+    public function init_purge_cache_requests() {
+        // Bail early.
+        if ( empty( $this->cache_requests ) ) {
+            return;
+        }
+
+        // Avoid duplicate cache requests.
+        $unique_requests = array_unique( $this->cache_requests );
+
+        // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+        foreach ( $unique_requests as $key => $post_id ) {
+            $this->delete_cache_for_meta_values( $post_id );
+        }
+    }
+
+    /**
+     * @param integer $post_id
+     */
+    private function delete_cache_for_meta_values( $post_id ) {
+
+        /**
+         * Get Post Meta Values
+         */
+        $values = get_post_meta( $post_id, self::META_KEY, false );
+
+        /**
+         * Iterate over $values array
+         */
+        if ( ! empty( $values ) ) {
+            foreach ( $values as $link ) {
+
+                /**
+                 * Skip the <permalink>
+                 */
+                if ( '<permalink>' === $link || 'http://<permalink>/' === $link ) {
+                    $link = get_permalink();
+                }
+
+                /**
+                 * Sanitize the link
+                 */
+                $link = $this->sanitize( $link );
+                /**
+                 * Make actual API DELETE cache request
+                 */
+                $this->api_call_delete_cache( $link );
+            }
+        }
+    }
+
+    /**
+     * @desc Sanitize the $link
+     *
+     * @param string $link
+     *
+     * @return string
+     */
+    private function sanitize( $link ) {
+        return preg_replace( '/:\//i', '', $link );
+    }
+
+    /**
+     * @desc Do a DELETE request with WP request function
+     *
+     * @param string $path path that goes after the URL eg. "/user/login"
+     *
+     * @return bool  True if successful otherwise false
+     */
+    private function api_call_delete_cache( $path ) {
+
+        // Bailout if path is empty
+        if ( empty( $path ) ) {
+            return false;
+        }
+
+        $log = \Wordlift_Log_Service::get_logger( 'api_call_delete_cache' );
+
+        $log->debug( "Delete cache request started:: '$path'" );
+
+        $url  = Wordlift_Configuration_Service::get_instance()->get_api_url() . 'data/' . $path;
+        $args = array(
+            'method'   => 'DELETE',
+            'blocking' => false,
+            'timeout'  => 0.01,
+        );
+
+        // Execute the request
+        wp_remote_request( $url, $args );
+
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -23,74 +23,74 @@ 
 		/**
 		 * Hook for Post Save
 		 */
-		add_action( 'save_post', array( $this, 'post_save_request_delete_cache' ) );
+		add_action('save_post', array($this, 'post_save_request_delete_cache'));
 
 		/**
 		 * Check for Meta Key change on Post Save
 		 */
-		add_action( 'updated_post_meta', array( $this, 'post_meta_request_delete_cache' ), 10, 4 );
+		add_action('updated_post_meta', array($this, 'post_meta_request_delete_cache'), 10, 4);
 
 		/**
 		 * Initiate the purge cache requests
 		 */
-		add_action( 'shutdown', array( $this, 'init_purge_cache_requests' ) );
+		add_action('shutdown', array($this, 'init_purge_cache_requests'));
 	}
 
-	public function post_save_request_delete_cache( $post_id ) {
-		$this->delete_cache_for_meta_values( $post_id );
+	public function post_save_request_delete_cache($post_id) {
+		$this->delete_cache_for_meta_values($post_id);
 	}
 
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function post_meta_request_delete_cache( $meta_id, $post_id, $meta_key, $_meta_value ) {
+	public function post_meta_request_delete_cache($meta_id, $post_id, $meta_key, $_meta_value) {
 		$this->cache_requests[] = $post_id;
 	}
 
 	public function init_purge_cache_requests() {
 		// Bail early.
-		if ( empty( $this->cache_requests ) ) {
+		if (empty($this->cache_requests)) {
 			return;
 		}
 
 		// Avoid duplicate cache requests.
-		$unique_requests = array_unique( $this->cache_requests );
+		$unique_requests = array_unique($this->cache_requests);
 
 		// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		foreach ( $unique_requests as $key => $post_id ) {
-			$this->delete_cache_for_meta_values( $post_id );
+		foreach ($unique_requests as $key => $post_id) {
+			$this->delete_cache_for_meta_values($post_id);
 		}
 	}
 
 	/**
 	 * @param integer $post_id
 	 */
-	private function delete_cache_for_meta_values( $post_id ) {
+	private function delete_cache_for_meta_values($post_id) {
 
 		/**
 		 * Get Post Meta Values
 		 */
-		$values = get_post_meta( $post_id, self::META_KEY, false );
+		$values = get_post_meta($post_id, self::META_KEY, false);
 
 		/**
 		 * Iterate over $values array
 		 */
-		if ( ! empty( $values ) ) {
-			foreach ( $values as $link ) {
+		if ( ! empty($values)) {
+			foreach ($values as $link) {
 
 				/**
 				 * Skip the <permalink>
 				 */
-				if ( '<permalink>' === $link || 'http://<permalink>/' === $link ) {
+				if ('<permalink>' === $link || 'http://<permalink>/' === $link) {
 					$link = get_permalink();
 				}
 
 				/**
 				 * Sanitize the link
 				 */
-				$link = $this->sanitize( $link );
+				$link = $this->sanitize($link);
 				/**
 				 * Make actual API DELETE cache request
 				 */
-				$this->api_call_delete_cache( $link );
+				$this->api_call_delete_cache($link);
 			}
 		}
 	}
@@ -102,8 +102,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function sanitize( $link ) {
-		return preg_replace( '/:\//i', '', $link );
+	private function sanitize($link) {
+		return preg_replace('/:\//i', '', $link);
 	}
 
 	/**
@@ -113,18 +113,18 @@ 
 	 *
 	 * @return bool  True if successful otherwise false
 	 */
-	private function api_call_delete_cache( $path ) {
+	private function api_call_delete_cache($path) {
 
 		// Bailout if path is empty
-		if ( empty( $path ) ) {
+		if (empty($path)) {
 			return false;
 		}
 
-		$log = \Wordlift_Log_Service::get_logger( 'api_call_delete_cache' );
+		$log = \Wordlift_Log_Service::get_logger('api_call_delete_cache');
 
-		$log->debug( "Delete cache request started:: '$path'" );
+		$log->debug("Delete cache request started:: '$path'");
 
-		$url  = Wordlift_Configuration_Service::get_instance()->get_api_url() . 'data/' . $path;
+		$url  = Wordlift_Configuration_Service::get_instance()->get_api_url().'data/'.$path;
 		$args = array(
 			'method'   => 'DELETE',
 			'blocking' => false,
@@ -132,7 +132,7 @@ 
 		);
 
 		// Execute the request
-		wp_remote_request( $url, $args );
+		wp_remote_request($url, $args);
 
 	}
 

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

Indentation +38 added lines, -38 removed lines

@@ -16,37 +16,37 @@ 
  */
 class Wordlift_Url_Property_Service extends Wordlift_Simple_Property_Service {
 
-	/**
-	 * The meta key for the schema:url property.
-	 */
-	const META_KEY = 'wl_schema_url';
+    /**
+     * The meta key for the schema:url property.
+     */
+    const META_KEY = 'wl_schema_url';
 
-	/**
-	 * Get the URLs associated with the post.
-	 *
-	 * @param int    $id The post id.
-	 * @param string $meta_key The meta key.
-	 *
-	 * @return array An array of URLs.
-	 */
-	public function get( $id, $meta_key, $type ) {
+    /**
+     * Get the URLs associated with the post.
+     *
+     * @param int    $id The post id.
+     * @param string $meta_key The meta key.
+     *
+     * @return array An array of URLs.
+     */
+    public function get( $id, $meta_key, $type ) {
 
-		// Get the meta values and push the <permalink> to
-		// ensure that default url will be added to the schema:url's.
-		/*
+        // Get the meta values and push the <permalink> to
+        // ensure that default url will be added to the schema:url's.
+        /*
 		 * Do not add `<permalink>` if one or more URLs have been provided by the editor.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/913
 		 *
 		 * @since 3.21.1
 		 */
-		$urls = parent::get( $id, $meta_key, $type );
-		$urls = array_filter( $urls ? $urls : array( '<permalink>' ) );
+        $urls = parent::get( $id, $meta_key, $type );
+        $urls = array_filter( $urls ? $urls : array( '<permalink>' ) );
 
-		// Convert <permalink> in actual permalink values.
-		return array_map(
-			function ( $item ) use ( $id, $type ) {
-				/*
+        // Convert <permalink> in actual permalink values.
+        return array_map(
+            function ( $item ) use ( $id, $type ) {
+                /*
 					* If `<permalink>` get the production permalink.
 					*
 					* @since 3.20.0
@@ -54,22 +54,22 @@ 
 					* @see https://github.com/insideout10/wordlift-plugin/issues/850.
 					*/
 
-				if ( '<permalink>' !== $item && 'http://<permalink>/' !== $item ) {
-					  return $item;
-				}
+                if ( '<permalink>' !== $item && 'http://<permalink>/' !== $item ) {
+                        return $item;
+                }
 
-				// Permalinks.
-				switch ( $type ) {
-					case Object_Type_Enum::POST:
-						return Wordlift_Post_Adapter::get_production_permalink( $id );
-					case Object_Type_Enum::TERM:
-						return get_term_link( $id );
-					default:
-						return $item;
-				}
-			},
-			array_unique( $urls )
-		);
-	}
+                // Permalinks.
+                switch ( $type ) {
+                    case Object_Type_Enum::POST:
+                        return Wordlift_Post_Adapter::get_production_permalink( $id );
+                    case Object_Type_Enum::TERM:
+                        return get_term_link( $id );
+                    default:
+                        return $item;
+                }
+            },
+            array_unique( $urls )
+        );
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @return array An array of URLs.
 	 */
-	public function get( $id, $meta_key, $type ) {
+	public function get($id, $meta_key, $type) {
 
 		// Get the meta values and push the <permalink> to
 		// ensure that default url will be added to the schema:url's.
@@ -40,12 +40,12 @@ 
 		 *
 		 * @since 3.21.1
 		 */
-		$urls = parent::get( $id, $meta_key, $type );
-		$urls = array_filter( $urls ? $urls : array( '<permalink>' ) );
+		$urls = parent::get($id, $meta_key, $type);
+		$urls = array_filter($urls ? $urls : array('<permalink>'));
 
 		// Convert <permalink> in actual permalink values.
 		return array_map(
-			function ( $item ) use ( $id, $type ) {
+			function($item) use ($id, $type) {
 				/*
 					* If `<permalink>` get the production permalink.
 					*
@@ -54,21 +54,21 @@ 
 					* @see https://github.com/insideout10/wordlift-plugin/issues/850.
 					*/
 
-				if ( '<permalink>' !== $item && 'http://<permalink>/' !== $item ) {
+				if ('<permalink>' !== $item && 'http://<permalink>/' !== $item) {
 					  return $item;
 				}
 
 				// Permalinks.
-				switch ( $type ) {
+				switch ($type) {
 					case Object_Type_Enum::POST:
-						return Wordlift_Post_Adapter::get_production_permalink( $id );
+						return Wordlift_Post_Adapter::get_production_permalink($id);
 					case Object_Type_Enum::TERM:
-						return get_term_link( $id );
+						return get_term_link($id);
 					default:
 						return $item;
 				}
 			},
-			array_unique( $urls )
+			array_unique($urls)
 		);
 	}