insideout10 / wordlift-plugin

src/modules/include-exclude/includes/Plugin_Enabled.php

Indentation +89 added lines, -89 removed lines

@@ -16,94 +16,94 @@
  */
 class Plugin_Enabled {
 
-	/**
-	 * @var Configuration $configuration
-	 */
-	private $configuration;
-
-	public function __construct( $configuration ) {
-		$this->configuration = $configuration;
-	}
-
-	/**
-	 * Register hooks.
-	 */
-	public function register_hooks() {
-		add_filter( 'wl_is_enabled', array( $this, 'wl_is_enabled' ) );
-	}
-
-	/**
-	 * Enable/Disable WordLift Plugin.
-	 *
-	 * @param $enabled
-	 *
-	 * @return bool|mixed
-	 */
-	public function wl_is_enabled( $enabled ) {
-
-		// Always enable wordlift on admin and rest api pages.
-		if ( is_admin() || $this->is_rest_request() ) {
-			return $enabled;
-		}
-
-		$path    = strtok( (string) $_SERVER['REQUEST_URI'], '?' ); // phpcs:ignore
-		$options = get_option( 'wl_exclude_include_urls_settings' );
-
-		// Bail out if URLs are not set.
-		if ( empty( $options['urls'] ) ) {
-			return $enabled;
-		}
-
-		$current_url = trailingslashit( home_url( $path ) );
-
-		return $this->are_urls_included( $current_url );
-	}
-
-	public function are_urls_included( $urls ) {
-		// Ensure we deal with an array. We `trailingslashit` all URLs to avoid issues with missing slashes.
-		$urls = array_map( 'trailingslashit', (array) $urls );
-
-		// Set a default state.
-		$include_by_default = ( $this->configuration->get_default() === 'include' );
-
-		// Get URLs into an array from settings, trim them and make absolute if needed.
-		$configured_urls = array_map(
-			function ( $url ) {
-				$url = trim( $url );
-				if ( substr( $url, 0, 4 ) !== 'http' ) {
-					return trailingslashit( home_url( $url ) );
-				}
-
-				// Add a trailing slash and return the url
-				return trailingslashit( $url );
-			},
-			explode( PHP_EOL, $this->configuration->get_urls() )
-		);
-
-		// Check if any of the provided URLs is in the configured URLs.
-		$intersection = array_intersect( $urls, $configured_urls );
-		if ( ! empty( $intersection ) ) {
-			return ! $include_by_default;
-		}
-
-		return $include_by_default;
-	}
-
-	/**
-	 * We cant rely on WP_REST_REQUEST constant here since it is loaded after init hook
-	 *
-	 * @return bool
-	 */
-	protected function is_rest_request() {
-		if ( empty( $_SERVER['REQUEST_URI'] ) ) {
-			// Probably a CLI request.
-			return false;
-		}
-
-		$rest_prefix = trailingslashit( rest_get_url_prefix() );
-		$path        = strtok( (string) $_SERVER['REQUEST_URI'], '?' ); // phpcs:ignore
-
-		return strpos( $path, $rest_prefix ) !== false;
-	}
+    /**
+     * @var Configuration $configuration
+     */
+    private $configuration;
+
+    public function __construct( $configuration ) {
+        $this->configuration = $configuration;
+    }
+
+    /**
+     * Register hooks.
+     */
+    public function register_hooks() {
+        add_filter( 'wl_is_enabled', array( $this, 'wl_is_enabled' ) );
+    }
+
+    /**
+     * Enable/Disable WordLift Plugin.
+     *
+     * @param $enabled
+     *
+     * @return bool|mixed
+     */
+    public function wl_is_enabled( $enabled ) {
+
+        // Always enable wordlift on admin and rest api pages.
+        if ( is_admin() || $this->is_rest_request() ) {
+            return $enabled;
+        }
+
+        $path    = strtok( (string) $_SERVER['REQUEST_URI'], '?' ); // phpcs:ignore
+        $options = get_option( 'wl_exclude_include_urls_settings' );
+
+        // Bail out if URLs are not set.
+        if ( empty( $options['urls'] ) ) {
+            return $enabled;
+        }
+
+        $current_url = trailingslashit( home_url( $path ) );
+
+        return $this->are_urls_included( $current_url );
+    }
+
+    public function are_urls_included( $urls ) {
+        // Ensure we deal with an array. We `trailingslashit` all URLs to avoid issues with missing slashes.
+        $urls = array_map( 'trailingslashit', (array) $urls );
+
+        // Set a default state.
+        $include_by_default = ( $this->configuration->get_default() === 'include' );
+
+        // Get URLs into an array from settings, trim them and make absolute if needed.
+        $configured_urls = array_map(
+            function ( $url ) {
+                $url = trim( $url );
+                if ( substr( $url, 0, 4 ) !== 'http' ) {
+                    return trailingslashit( home_url( $url ) );
+                }
+
+                // Add a trailing slash and return the url
+                return trailingslashit( $url );
+            },
+            explode( PHP_EOL, $this->configuration->get_urls() )
+        );
+
+        // Check if any of the provided URLs is in the configured URLs.
+        $intersection = array_intersect( $urls, $configured_urls );
+        if ( ! empty( $intersection ) ) {
+            return ! $include_by_default;
+        }
+
+        return $include_by_default;
+    }
+
+    /**
+     * We cant rely on WP_REST_REQUEST constant here since it is loaded after init hook
+     *
+     * @return bool
+     */
+    protected function is_rest_request() {
+        if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+            // Probably a CLI request.
+            return false;
+        }
+
+        $rest_prefix = trailingslashit( rest_get_url_prefix() );
+        $path        = strtok( (string) $_SERVER['REQUEST_URI'], '?' ); // phpcs:ignore
+
+        return strpos( $path, $rest_prefix ) !== false;
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	private $configuration;
 
-	public function __construct( $configuration ) {
+	public function __construct($configuration) {
 		$this->configuration = $configuration;
 	}
 
@@ -29,7 +29,7 @@ 
 	 * Register hooks.
 	 */
 	public function register_hooks() {
-		add_filter( 'wl_is_enabled', array( $this, 'wl_is_enabled' ) );
+		add_filter('wl_is_enabled', array($this, 'wl_is_enabled'));
 	}
 
 	/**
@@ -39,50 +39,50 @@ 
 	 *
 	 * @return bool|mixed
 	 */
-	public function wl_is_enabled( $enabled ) {
+	public function wl_is_enabled($enabled) {
 
 		// Always enable wordlift on admin and rest api pages.
-		if ( is_admin() || $this->is_rest_request() ) {
+		if (is_admin() || $this->is_rest_request()) {
 			return $enabled;
 		}
 
-		$path    = strtok( (string) $_SERVER['REQUEST_URI'], '?' ); // phpcs:ignore
-		$options = get_option( 'wl_exclude_include_urls_settings' );
+		$path    = strtok((string) $_SERVER['REQUEST_URI'], '?'); // phpcs:ignore
+		$options = get_option('wl_exclude_include_urls_settings');
 
 		// Bail out if URLs are not set.
-		if ( empty( $options['urls'] ) ) {
+		if (empty($options['urls'])) {
 			return $enabled;
 		}
 
-		$current_url = trailingslashit( home_url( $path ) );
+		$current_url = trailingslashit(home_url($path));
 
-		return $this->are_urls_included( $current_url );
+		return $this->are_urls_included($current_url);
 	}
 
-	public function are_urls_included( $urls ) {
+	public function are_urls_included($urls) {
 		// Ensure we deal with an array. We `trailingslashit` all URLs to avoid issues with missing slashes.
-		$urls = array_map( 'trailingslashit', (array) $urls );
+		$urls = array_map('trailingslashit', (array) $urls);
 
 		// Set a default state.
-		$include_by_default = ( $this->configuration->get_default() === 'include' );
+		$include_by_default = ($this->configuration->get_default() === 'include');
 
 		// Get URLs into an array from settings, trim them and make absolute if needed.
 		$configured_urls = array_map(
-			function ( $url ) {
-				$url = trim( $url );
-				if ( substr( $url, 0, 4 ) !== 'http' ) {
-					return trailingslashit( home_url( $url ) );
+			function($url) {
+				$url = trim($url);
+				if (substr($url, 0, 4) !== 'http') {
+					return trailingslashit(home_url($url));
 				}
 
 				// Add a trailing slash and return the url
-				return trailingslashit( $url );
+				return trailingslashit($url);
 			},
-			explode( PHP_EOL, $this->configuration->get_urls() )
+			explode(PHP_EOL, $this->configuration->get_urls())
 		);
 
 		// Check if any of the provided URLs is in the configured URLs.
-		$intersection = array_intersect( $urls, $configured_urls );
-		if ( ! empty( $intersection ) ) {
+		$intersection = array_intersect($urls, $configured_urls);
+		if ( ! empty($intersection)) {
 			return ! $include_by_default;
 		}
 
@@ -95,15 +95,15 @@ 
 	 * @return bool
 	 */
 	protected function is_rest_request() {
-		if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+		if (empty($_SERVER['REQUEST_URI'])) {
 			// Probably a CLI request.
 			return false;
 		}
 
-		$rest_prefix = trailingslashit( rest_get_url_prefix() );
-		$path        = strtok( (string) $_SERVER['REQUEST_URI'], '?' ); // phpcs:ignore
+		$rest_prefix = trailingslashit(rest_get_url_prefix());
+		$path        = strtok((string) $_SERVER['REQUEST_URI'], '?'); // phpcs:ignore
 
-		return strpos( $path, $rest_prefix ) !== false;
+		return strpos($path, $rest_prefix) !== false;
 	}
 
 }

src/modules/include-exclude/includes/Configuration.php

Indentation +45 added lines, -45 removed lines

@@ -4,50 +4,50 @@
 
 class Configuration {
 
-	private static $instance;
-
-	private $type;
-	private $urls;
-
-	protected function __construct() {
-		$include_exclude_data = get_option( 'wl_exclude_include_urls_settings', array() );
-		$include_exclude      = isset( $include_exclude_data['include_exclude'] ) ? (array) $include_exclude_data['include_exclude'] : array();
-
-		$this->type = in_array(
-			$include_exclude,
-			array(
-				'include',
-				'exclude',
-			),
-			true
-		)
-			? $include_exclude : 'exclude';
-		$this->urls = $include_exclude_data['urls'];
-	}
-
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	public function get_type() {
-		return $this->type;
-	}
-
-	/**
-	 * Gets the default action, which is the inverse of the configuration type.
-	 *
-	 * @return string
-	 */
-	public function get_default() {
-		return ( $this->type === 'exclude' ? 'include' : 'exclude' );
-	}
-
-	public function get_urls() {
-		return $this->urls;
-	}
+    private static $instance;
+
+    private $type;
+    private $urls;
+
+    protected function __construct() {
+        $include_exclude_data = get_option( 'wl_exclude_include_urls_settings', array() );
+        $include_exclude      = isset( $include_exclude_data['include_exclude'] ) ? (array) $include_exclude_data['include_exclude'] : array();
+
+        $this->type = in_array(
+            $include_exclude,
+            array(
+                'include',
+                'exclude',
+            ),
+            true
+        )
+            ? $include_exclude : 'exclude';
+        $this->urls = $include_exclude_data['urls'];
+    }
+
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    public function get_type() {
+        return $this->type;
+    }
+
+    /**
+     * Gets the default action, which is the inverse of the configuration type.
+     *
+     * @return string
+     */
+    public function get_default() {
+        return ( $this->type === 'exclude' ? 'include' : 'exclude' );
+    }
+
+    public function get_urls() {
+        return $this->urls;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
 	private $urls;
 
 	protected function __construct() {
-		$include_exclude_data = get_option( 'wl_exclude_include_urls_settings', array() );
-		$include_exclude      = isset( $include_exclude_data['include_exclude'] ) ? (array) $include_exclude_data['include_exclude'] : array();
+		$include_exclude_data = get_option('wl_exclude_include_urls_settings', array());
+		$include_exclude      = isset($include_exclude_data['include_exclude']) ? (array) $include_exclude_data['include_exclude'] : array();
 
 		$this->type = in_array(
 			$include_exclude,
@@ -26,7 +26,7 @@ 
 	}
 
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -43,7 +43,7 @@ 
 	 * @return string
 	 */
 	public function get_default() {
-		return ( $this->type === 'exclude' ? 'include' : 'exclude' );
+		return ($this->type === 'exclude' ? 'include' : 'exclude');
 	}
 
 	public function get_urls() {

src/modules/include-exclude/includes/Jsonld_Interceptor.php

Indentation +18 added lines, -18 removed lines

@@ -4,28 +4,28 @@
 
 class Jsonld_Interceptor {
 
-	/** @var Plugin_Enabled $plugin_enabled */
-	private $plugin_enabled;
+    /** @var Plugin_Enabled $plugin_enabled */
+    private $plugin_enabled;
 
-	public function __construct( $plugin_enabled ) {
-		$this->plugin_enabled = $plugin_enabled;
-	}
+    public function __construct( $plugin_enabled ) {
+        $this->plugin_enabled = $plugin_enabled;
+    }
 
-	public function register_hooks() {
-		add_filter( 'wl_after_get_jsonld', array( $this, 'after_get_jsonld' ) );
-	}
+    public function register_hooks() {
+        add_filter( 'wl_after_get_jsonld', array( $this, 'after_get_jsonld' ) );
+    }
 
-	public function after_get_jsonld( $jsonld_arr ) {
-		if ( ! is_array( $jsonld_arr ) || empty( $jsonld_arr ) || ! isset( $jsonld_arr[0]['url'] ) ) {
-			return $jsonld_arr;
-		}
+    public function after_get_jsonld( $jsonld_arr ) {
+        if ( ! is_array( $jsonld_arr ) || empty( $jsonld_arr ) || ! isset( $jsonld_arr[0]['url'] ) ) {
+            return $jsonld_arr;
+        }
 
-		// If the URLs are included then publish them.
-		if ( $this->plugin_enabled->are_urls_included( $jsonld_arr[0]['url'] ) ) {
-			return $jsonld_arr;
-		}
+        // If the URLs are included then publish them.
+        if ( $this->plugin_enabled->are_urls_included( $jsonld_arr[0]['url'] ) ) {
+            return $jsonld_arr;
+        }
 
-		return array();
-	}
+        return array();
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -7,21 +7,21 @@
 	/** @var Plugin_Enabled $plugin_enabled */
 	private $plugin_enabled;
 
-	public function __construct( $plugin_enabled ) {
+	public function __construct($plugin_enabled) {
 		$this->plugin_enabled = $plugin_enabled;
 	}
 
 	public function register_hooks() {
-		add_filter( 'wl_after_get_jsonld', array( $this, 'after_get_jsonld' ) );
+		add_filter('wl_after_get_jsonld', array($this, 'after_get_jsonld'));
 	}
 
-	public function after_get_jsonld( $jsonld_arr ) {
-		if ( ! is_array( $jsonld_arr ) || empty( $jsonld_arr ) || ! isset( $jsonld_arr[0]['url'] ) ) {
+	public function after_get_jsonld($jsonld_arr) {
+		if ( ! is_array($jsonld_arr) || empty($jsonld_arr) || ! isset($jsonld_arr[0]['url'])) {
 			return $jsonld_arr;
 		}
 
 		// If the URLs are included then publish them.
-		if ( $this->plugin_enabled->are_urls_included( $jsonld_arr[0]['url'] ) ) {
+		if ($this->plugin_enabled->are_urls_included($jsonld_arr[0]['url'])) {
 			return $jsonld_arr;
 		}
 

src/modules/include-exclude/load.php

Indentation +20 added lines, -20 removed lines

@@ -13,7 +13,7 @@ 
 use Wordlift\Modules\Common\Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -22,7 +22,7 @@ 
  */
 $wl_features = get_option( '_wl_features', array() );
 if ( ! apply_filters( 'wl_feature__enable__include-exclude', isset( $wl_features['include-exclude'] ) && $wl_features['include-exclude'] ) ) { // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	return;
+    return;
 }
 
 /**
@@ -32,29 +32,29 @@ 
  */
 function __wl_include_exclude__load() {
 
-	// Autoloader for plugin itself.
-	if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-		require_once __DIR__ . '/vendor/autoload.php';
-	}
+    // Autoloader for plugin itself.
+    if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+        require_once __DIR__ . '/vendor/autoload.php';
+    }
 
-	$container_builder = new ContainerBuilder();
-	$loader            = new YamlFileLoader( $container_builder, new FileLocator( __DIR__ ) );
-	$loader->load( 'services.yml' );
-	$container_builder->compile();
+    $container_builder = new ContainerBuilder();
+    $loader            = new YamlFileLoader( $container_builder, new FileLocator( __DIR__ ) );
+    $loader->load( 'services.yml' );
+    $container_builder->compile();
 
-	$enabled = $container_builder->get( 'Wordlift\Modules\Include_Exclude\Plugin_Enabled' );
-	$enabled->register_hooks();
+    $enabled = $container_builder->get( 'Wordlift\Modules\Include_Exclude\Plugin_Enabled' );
+    $enabled->register_hooks();
 
-	if ( apply_filters( 'wl_is_enabled', true ) ) {
-		$settings = $container_builder->get( 'Wordlift\Modules\Include_Exclude\Admin\Settings' );
-		$settings->register_hooks();
+    if ( apply_filters( 'wl_is_enabled', true ) ) {
+        $settings = $container_builder->get( 'Wordlift\Modules\Include_Exclude\Admin\Settings' );
+        $settings->register_hooks();
 
-		$api = $container_builder->get( 'Wordlift\Modules\Include_Exclude\API' );
-		$api->register_hooks();
+        $api = $container_builder->get( 'Wordlift\Modules\Include_Exclude\API' );
+        $api->register_hooks();
 
-		$jsonld_interceptor = $container_builder->get( 'Wordlift\Modules\Include_Exclude\Jsonld_Interceptor' );
-		$jsonld_interceptor->register_hooks();
-	}
+        $jsonld_interceptor = $container_builder->get( 'Wordlift\Modules\Include_Exclude\Jsonld_Interceptor' );
+        $jsonld_interceptor->register_hooks();
+    }
 
 }
 

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
 use Wordlift\Modules\Common\Symfony\Component\DependencyInjection\ContainerBuilder;
 use Wordlift\Modules\Common\Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,8 +20,8 @@ 
  * This module loads very early since it needs to tell WLP whether to load itself or not. Therefore we need to load the
  * feature settings by ourselves.
  */
-$wl_features = get_option( '_wl_features', array() );
-if ( ! apply_filters( 'wl_feature__enable__include-exclude', isset( $wl_features['include-exclude'] ) && $wl_features['include-exclude'] ) ) { // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+$wl_features = get_option('_wl_features', array());
+if ( ! apply_filters('wl_feature__enable__include-exclude', isset($wl_features['include-exclude']) && $wl_features['include-exclude'])) { // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 	return;
 }
 
@@ -33,26 +33,26 @@ 
 function __wl_include_exclude__load() {
 
 	// Autoloader for plugin itself.
-	if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-		require_once __DIR__ . '/vendor/autoload.php';
+	if (file_exists(__DIR__.'/vendor/autoload.php')) {
+		require_once __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();
 
-	$enabled = $container_builder->get( 'Wordlift\Modules\Include_Exclude\Plugin_Enabled' );
+	$enabled = $container_builder->get('Wordlift\Modules\Include_Exclude\Plugin_Enabled');
 	$enabled->register_hooks();
 
-	if ( apply_filters( 'wl_is_enabled', true ) ) {
-		$settings = $container_builder->get( 'Wordlift\Modules\Include_Exclude\Admin\Settings' );
+	if (apply_filters('wl_is_enabled', true)) {
+		$settings = $container_builder->get('Wordlift\Modules\Include_Exclude\Admin\Settings');
 		$settings->register_hooks();
 
-		$api = $container_builder->get( 'Wordlift\Modules\Include_Exclude\API' );
+		$api = $container_builder->get('Wordlift\Modules\Include_Exclude\API');
 		$api->register_hooks();
 
-		$jsonld_interceptor = $container_builder->get( 'Wordlift\Modules\Include_Exclude\Jsonld_Interceptor' );
+		$jsonld_interceptor = $container_builder->get('Wordlift\Modules\Include_Exclude\Jsonld_Interceptor');
 		$jsonld_interceptor->register_hooks();
 	}
 

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

Indentation +435 added lines, -435 removed lines

@@ -18,465 +18,465 @@
  */
 class Wordlift_Post_To_Jsonld_Converter extends Wordlift_Abstract_Post_To_Jsonld_Converter {
 
-	/**
-	 * @var Wordlift_Post_To_Jsonld_Converter
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * @var false
-	 */
-	private $disable_convert_filters;
-
-	/**
-	 * Wordlift_Post_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.
-	 *
-	 * @since 3.10.0
-	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false ) {
-		parent::__construct( $entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create() );
-		$this->disable_convert_filters = $disable_convert_filters;
-		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
-
-		self::$instance = $this;
-
-	}
-
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	public function new_instance_with_filters_disabled() {
-		return new static( $this->entity_type_service, $this->user_service, $this->attachment_service, true );
-	}
-
-	/**
-	 * 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 post id.
-	 * @param array<Reference> $references An array of entity references.
-	 * @param array            $references_infos
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.10.0
-	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
-
-		// 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.
-		$jsonld = parent::convert( $post_id, $references, $references_infos, $relations );
-
-		// Set WebPage by default.
-		if ( empty( $jsonld['@type'] ) ) {
-			$jsonld['@type'] = 'WebPage';
-		}
-
-		// Get the entity name.
-		$jsonld['headline'] = $post->post_title;
-
-		$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 );
-		}
-
-		// Set the published and modified dates.
-		/*
+    /**
+     * @var Wordlift_Post_To_Jsonld_Converter
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * @var false
+     */
+    private $disable_convert_filters;
+
+    /**
+     * Wordlift_Post_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.
+     *
+     * @since 3.10.0
+     */
+    public function __construct( $entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false ) {
+        parent::__construct( $entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create() );
+        $this->disable_convert_filters = $disable_convert_filters;
+        // Set a reference to the logger.
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
+
+        self::$instance = $this;
+
+    }
+
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    public function new_instance_with_filters_disabled() {
+        return new static( $this->entity_type_service, $this->user_service, $this->attachment_service, true );
+    }
+
+    /**
+     * 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 post id.
+     * @param array<Reference> $references An array of entity references.
+     * @param array            $references_infos
+     *
+     * @return array A JSON-LD array.
+     * @since 3.10.0
+     */
+    public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
+
+        // 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.
+        $jsonld = parent::convert( $post_id, $references, $references_infos, $relations );
+
+        // Set WebPage by default.
+        if ( empty( $jsonld['@type'] ) ) {
+            $jsonld['@type'] = 'WebPage';
+        }
+
+        // Get the entity name.
+        $jsonld['headline'] = $post->post_title;
+
+        $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 );
+        }
+
+        // Set the published and modified dates.
+        /*
 		 * Set the `datePublished` and `dateModified` using the local timezone.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/887
 		 *
 		 * @since 3.20.0
 		 */
-		try {
-			$default_timezone = date_default_timezone_get();
-			$timezone         = get_option( 'timezone_string' );
-			if ( ! empty( $timezone ) ) {
-				date_default_timezone_set( $timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
-				date_default_timezone_set( $default_timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
-			} else {
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
-			}
-		} catch ( Exception $e ) {
-			$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-			$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
-		}
-
-		// Get the word count for the post.
-		/*
+        try {
+            $default_timezone = date_default_timezone_get();
+            $timezone         = get_option( 'timezone_string' );
+            if ( ! empty( $timezone ) ) {
+                date_default_timezone_set( $timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+                $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
+                $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
+                date_default_timezone_set( $default_timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+            } else {
+                $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
+                $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+            }
+        } catch ( Exception $e ) {
+            $jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
+            $jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+        }
+
+        // Get the word count for the post.
+        /*
 		 * Do not display the `wordCount` on a `WebPage`.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/888
 		 *
 		 * @since 3.20.0
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter        = new Wordlift_Post_Adapter( $post_id );
-			$jsonld['wordCount'] = $post_adapter->word_count();
-		}
+        if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
+            $post_adapter        = new Wordlift_Post_Adapter( $post_id );
+            $jsonld['wordCount'] = $post_adapter->word_count();
+        }
 
-		/*
+        /*
 		 * Add keywords, articleSection, commentCount and inLanguage properties to `Article` JSON-LD
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/1140
 		 *
 		 * @since 3.27.2
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter    = new Wordlift_Post_Adapter( $post_id );
-			$keywords        = $post_adapter->keywords();
-			$article_section = $post_adapter->article_section();
-			$comment_count   = $post_adapter->comment_count();
-			$locale          = $post_adapter->locale();
-
-			if ( isset( $keywords ) ) {
-				$jsonld['keywords'] = $keywords;
-			}
-			if ( ! empty( $article_section ) ) {
-				$jsonld['articleSection'] = $article_section;
-			}
-			$jsonld['commentCount'] = $comment_count;
-			$jsonld['inLanguage']   = $locale;
-		}
-
-		// Set the publisher.
-		$this->set_publisher( $jsonld );
-
-		/**
-		 * Call the `wl_post_jsonld_author` filter.
-		 *
-		 * This filter checks if there are co-authors or a single author and
-		 * returns a JSON-LD fragment for the author(s).
-		 *
-		 * @param array $value {
-		 *
-		 * @type array $jsonld The JSON-LD structure.
-		 * @type int[] $references An array of post IDs.
-		 * }
-		 *
-		 * @param int $post_id The {@link WP_Post} `id`.
-		 *
-		 * @since 3.51.4
-		 *
-		 * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
-		 */
-		$ret_val = apply_filters(
-			'wl_jsonld_author',
-			array(
-				'author'     => $this->get_author( $post->post_author, $references ),
-				'references' => $references,
-			),
-			$post_id
-		);
-
-		// Set the values returned by the author filter.
-		/*
+        if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
+            $post_adapter    = new Wordlift_Post_Adapter( $post_id );
+            $keywords        = $post_adapter->keywords();
+            $article_section = $post_adapter->article_section();
+            $comment_count   = $post_adapter->comment_count();
+            $locale          = $post_adapter->locale();
+
+            if ( isset( $keywords ) ) {
+                $jsonld['keywords'] = $keywords;
+            }
+            if ( ! empty( $article_section ) ) {
+                $jsonld['articleSection'] = $article_section;
+            }
+            $jsonld['commentCount'] = $comment_count;
+            $jsonld['inLanguage']   = $locale;
+        }
+
+        // Set the publisher.
+        $this->set_publisher( $jsonld );
+
+        /**
+         * Call the `wl_post_jsonld_author` filter.
+         *
+         * This filter checks if there are co-authors or a single author and
+         * returns a JSON-LD fragment for the author(s).
+         *
+         * @param array $value {
+         *
+         * @type array $jsonld The JSON-LD structure.
+         * @type int[] $references An array of post IDs.
+         * }
+         *
+         * @param int $post_id The {@link WP_Post} `id`.
+         *
+         * @since 3.51.4
+         *
+         * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
+         */
+        $ret_val = apply_filters(
+            'wl_jsonld_author',
+            array(
+                'author'     => $this->get_author( $post->post_author, $references ),
+                'references' => $references,
+            ),
+            $post_id
+        );
+
+        // Set the values returned by the author filter.
+        /*
 		 * Do not add the author JSON-LD if an invalid author was referenced in a post.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/1728
 		 *
 		 * @since 3.53.2
 		 */
-		if ( ! empty( $ret_val['author'] ) ) {
-			$jsonld['author'] = $ret_val['author'];
-			$references       = $ret_val['references'];
-		}
-
-		// Return the JSON-LD if filters are disabled by the client.
-		if ( $this->disable_convert_filters ) {
-			return $jsonld;
-		}
-
-		/**
-		 * 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.
-		 * @type Relations $relations A set of `Relation`s.
-		 * }
-		 * @since 3.25.0
-		 * @since 3.43.0 The filter provides a `Relations` instance.
-		 *
-		 * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
-		 *
-		 * @api
-		 */
-		$ret_val = apply_filters(
-			'wl_post_jsonld_array',
-			array(
-				'jsonld'           => $jsonld,
-				'references'       => $references, // This one is only an array of post IDs.
-				'references_infos' => $references_infos,
-				'relations'        => $relations,
-			),
-			$post_id
-		);
-
-		$jsonld     = $ret_val['jsonld'];
-		$references = $ret_val['references'];
-
-		/**
-		 * Call the `wl_post_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.14.0
-		 *
-		 * @api
-		 */
-		return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
-	}
-
-	/**
-	 * Get the author's JSON-LD fragment.
-	 *
-	 * The JSON-LD fragment is generated using the {@link WP_User}'s data or
-	 * the referenced entity if configured for the {@link WP_User}.
-	 *
-	 * @param int   $author_id The author {@link WP_User}'s `id`.
-	 * @param array $references An array of referenced entities.
-	 *
-	 * @return string|array A JSON-LD structure.
-	 * @since 3.14.0
-	 */
-	public function get_author( $author_id, &$references ) {
-
-		// Get the entity bound to this user.
-		$entity_id = $this->user_service->get_entity( $author_id );
-
-		if ( ! empty( $entity_id ) && 'publish' === get_post_status( $entity_id ) ) {
-			// Add the author to the references.
-			$author_uri   = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
-			$references[] = $entity_id;
-
-			// Return the JSON-LD for the referenced entity.
-			return array(
-				'@id' => $author_uri,
-			);
-		}
-
-		// If there's no entity bound return a simple author structure.
-		if ( false !== get_userdata( $author_id ) ) {
-			$author            = get_the_author_meta( 'display_name', $author_id );
-			$author_first_name = get_the_author_meta( 'first_name', $author_id );
-			$author_last_name  = get_the_author_meta( 'last_name', $author_id );
-			$author_uri        = $this->user_service->get_uri( $author_id );
-
-			return array(
-				'@type'      => 'Person',
-				'@id'        => $author_uri,
-				'name'       => $author,
-				'givenName'  => $author_first_name,
-				'familyName' => $author_last_name,
-				'url'        => get_author_posts_url( $author_id ),
-			);
-		}
-
-		// No valid entity or author so return empty array
-		return array();
-	}
-
-	/**
-	 * Enrich the provided params array with publisher data, if available.
-	 *
-	 * @param array $params The parameters array.
-	 *
-	 * @since 3.10.0
-	 */
-	protected function set_publisher( &$params ) {
-
-		// If the publisher id isn't set don't do anything.
-		$publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-		if ( empty( $publisher_id ) ) {
-			return;
-		}
-
-		// Get the post instance.
-		$post = get_post( $publisher_id );
-		if ( ! is_a( $post, '\WP_Post' ) ) {
-			// Publisher not found.
-			return;
-		}
-
-		// Get the item id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $publisher_id );
-
-		// Get the type.
-		$type = $this->entity_type_service->get( $publisher_id );
-
-		// Get the name.
-		$name = $post->post_title;
-
-		// Set the publisher data.
-		$params['publisher'] = array(
-			'@type' => $this->relative_to_context( $type['uri'] ),
-			'@id'   => $id,
-			'name'  => $name,
-		);
-
-		// Add the sameAs values associated with the publisher.
-		$storage_factory = Wordlift_Storage_Factory::get_instance();
-		$sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
-		if ( ! empty( $sameas ) ) {
-			$params['publisher']['sameAs'] = $sameas;
-		}
-
-		// Set the logo, only for http://schema.org/Organization as Person doesn't
-		// support the logo property.
-		//
-		// See http://schema.org/logo.
-		if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
-			return;
-		}
-
-		// Get the publisher logo.
-		$publisher_logo = $this->get_publisher_logo( $post->ID );
-
-		// Bail out if the publisher logo isn't set.
-		if ( false === $publisher_logo ) {
-			return;
-		}
-
-		// Copy over some useful properties.
-		//
-		// See https://developers.google.com/search/docs/data-types/articles.
-		$params['publisher']['logo']['@type'] = 'ImageObject';
-		$params['publisher']['logo']['url']   = $publisher_logo['url'];
-
-		// If you specify a "width" or "height" value you should leave out
-		// 'px'. For example: "width":"4608px" should be "width":"4608".
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/451.
-		$params['publisher']['logo']['width']  = $publisher_logo['width'];
-		$params['publisher']['logo']['height'] = $publisher_logo['height'];
-
-	}
-
-	/**
-	 * Get the publisher logo structure.
-	 *
-	 * The function returns false when the publisher logo cannot be determined, i.e.:
-	 *  - the post has no featured image.
-	 *  - the featured image has no file.
-	 *  - a wp_image_editor instance cannot be instantiated on the original file or on the publisher logo file.
-	 *
-	 * @param int $post_id The post id.
-	 *
-	 * @return array|false Returns an array with the `url`, `width` and `height` for the publisher logo or false in case
-	 *  of errors.
-	 * @since 3.19.2
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
-	 */
-	private function get_publisher_logo( $post_id ) {
-
-		// Get the featured image for the post.
-		$thumbnail_id = get_post_thumbnail_id( $post_id );
-
-		// Bail out if thumbnail not available.
-		if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
-			$this->log->info( "Featured image not set for post $post_id." );
-
-			return false;
-		}
-
-		// Get the uploads base URL.
-		$uploads_dir = wp_upload_dir();
-
-		// Get the attachment metadata.
-		$metadata = wp_get_attachment_metadata( $thumbnail_id );
-
-		// Bail out if the file isn't set.
-		if ( ! isset( $metadata['file'] ) ) {
-			$this->log->warn( "Featured image file not found for post $post_id." );
-
-			return false;
-		}
-
-		// Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
-		$path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
-
-		// Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
-		if ( ! file_exists( $path ) ) {
-			$this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
-
-			$attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
-			if ( $attachment_image_src ) {
-				return array(
-					'url'    => $attachment_image_src[0],
-					'width'  => $attachment_image_src[1],
-					'height' => $attachment_image_src[2],
-				);
-			}
-
-			// Bail out if we cant fetch wp_get_attachment_image_src
-			return false;
-
-		}
-
-		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$original_file_editor = wp_get_image_editor( $path );
-		if ( is_wp_error( $original_file_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
-
-			return false;
-		}
-
-		// Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
-		// and we don't actually know the end values.
-		$publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
-
-		// If the file doesn't exist yet, create it.
-		if ( ! file_exists( $publisher_logo_path ) ) {
-			$original_file_editor->resize( 600, 60 );
-			$original_file_editor->save( $publisher_logo_path );
-		}
-
-		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
-		if ( is_wp_error( $publisher_logo_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
-
-			return false;
-		}
-
-		// Get the actual size.
-		$size = $publisher_logo_editor->get_size();
-
-		// Finally return the array with data.
-		return array(
-			'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
-			'width'  => $size['width'],
-			'height' => $size['height'],
-		);
-	}
+        if ( ! empty( $ret_val['author'] ) ) {
+            $jsonld['author'] = $ret_val['author'];
+            $references       = $ret_val['references'];
+        }
+
+        // Return the JSON-LD if filters are disabled by the client.
+        if ( $this->disable_convert_filters ) {
+            return $jsonld;
+        }
+
+        /**
+         * 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.
+         * @type Relations $relations A set of `Relation`s.
+         * }
+         * @since 3.25.0
+         * @since 3.43.0 The filter provides a `Relations` instance.
+         *
+         * @see https://www.geeklab.info/2010/04/wordpress-pass-variables-by-reference-with-apply_filter/
+         *
+         * @api
+         */
+        $ret_val = apply_filters(
+            'wl_post_jsonld_array',
+            array(
+                'jsonld'           => $jsonld,
+                'references'       => $references, // This one is only an array of post IDs.
+                'references_infos' => $references_infos,
+                'relations'        => $relations,
+            ),
+            $post_id
+        );
+
+        $jsonld     = $ret_val['jsonld'];
+        $references = $ret_val['references'];
+
+        /**
+         * Call the `wl_post_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.14.0
+         *
+         * @api
+         */
+        return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
+    }
+
+    /**
+     * Get the author's JSON-LD fragment.
+     *
+     * The JSON-LD fragment is generated using the {@link WP_User}'s data or
+     * the referenced entity if configured for the {@link WP_User}.
+     *
+     * @param int   $author_id The author {@link WP_User}'s `id`.
+     * @param array $references An array of referenced entities.
+     *
+     * @return string|array A JSON-LD structure.
+     * @since 3.14.0
+     */
+    public function get_author( $author_id, &$references ) {
+
+        // Get the entity bound to this user.
+        $entity_id = $this->user_service->get_entity( $author_id );
+
+        if ( ! empty( $entity_id ) && 'publish' === get_post_status( $entity_id ) ) {
+            // Add the author to the references.
+            $author_uri   = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
+            $references[] = $entity_id;
+
+            // Return the JSON-LD for the referenced entity.
+            return array(
+                '@id' => $author_uri,
+            );
+        }
+
+        // If there's no entity bound return a simple author structure.
+        if ( false !== get_userdata( $author_id ) ) {
+            $author            = get_the_author_meta( 'display_name', $author_id );
+            $author_first_name = get_the_author_meta( 'first_name', $author_id );
+            $author_last_name  = get_the_author_meta( 'last_name', $author_id );
+            $author_uri        = $this->user_service->get_uri( $author_id );
+
+            return array(
+                '@type'      => 'Person',
+                '@id'        => $author_uri,
+                'name'       => $author,
+                'givenName'  => $author_first_name,
+                'familyName' => $author_last_name,
+                'url'        => get_author_posts_url( $author_id ),
+            );
+        }
+
+        // No valid entity or author so return empty array
+        return array();
+    }
+
+    /**
+     * Enrich the provided params array with publisher data, if available.
+     *
+     * @param array $params The parameters array.
+     *
+     * @since 3.10.0
+     */
+    protected function set_publisher( &$params ) {
+
+        // If the publisher id isn't set don't do anything.
+        $publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
+        if ( empty( $publisher_id ) ) {
+            return;
+        }
+
+        // Get the post instance.
+        $post = get_post( $publisher_id );
+        if ( ! is_a( $post, '\WP_Post' ) ) {
+            // Publisher not found.
+            return;
+        }
+
+        // Get the item id.
+        $id = Wordlift_Entity_Service::get_instance()->get_uri( $publisher_id );
+
+        // Get the type.
+        $type = $this->entity_type_service->get( $publisher_id );
+
+        // Get the name.
+        $name = $post->post_title;
+
+        // Set the publisher data.
+        $params['publisher'] = array(
+            '@type' => $this->relative_to_context( $type['uri'] ),
+            '@id'   => $id,
+            'name'  => $name,
+        );
+
+        // Add the sameAs values associated with the publisher.
+        $storage_factory = Wordlift_Storage_Factory::get_instance();
+        $sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
+        if ( ! empty( $sameas ) ) {
+            $params['publisher']['sameAs'] = $sameas;
+        }
+
+        // Set the logo, only for http://schema.org/Organization as Person doesn't
+        // support the logo property.
+        //
+        // See http://schema.org/logo.
+        if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
+            return;
+        }
+
+        // Get the publisher logo.
+        $publisher_logo = $this->get_publisher_logo( $post->ID );
+
+        // Bail out if the publisher logo isn't set.
+        if ( false === $publisher_logo ) {
+            return;
+        }
+
+        // Copy over some useful properties.
+        //
+        // See https://developers.google.com/search/docs/data-types/articles.
+        $params['publisher']['logo']['@type'] = 'ImageObject';
+        $params['publisher']['logo']['url']   = $publisher_logo['url'];
+
+        // If you specify a "width" or "height" value you should leave out
+        // 'px'. For example: "width":"4608px" should be "width":"4608".
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/451.
+        $params['publisher']['logo']['width']  = $publisher_logo['width'];
+        $params['publisher']['logo']['height'] = $publisher_logo['height'];
+
+    }
+
+    /**
+     * Get the publisher logo structure.
+     *
+     * The function returns false when the publisher logo cannot be determined, i.e.:
+     *  - the post has no featured image.
+     *  - the featured image has no file.
+     *  - a wp_image_editor instance cannot be instantiated on the original file or on the publisher logo file.
+     *
+     * @param int $post_id The post id.
+     *
+     * @return array|false Returns an array with the `url`, `width` and `height` for the publisher logo or false in case
+     *  of errors.
+     * @since 3.19.2
+     * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
+     */
+    private function get_publisher_logo( $post_id ) {
+
+        // Get the featured image for the post.
+        $thumbnail_id = get_post_thumbnail_id( $post_id );
+
+        // Bail out if thumbnail not available.
+        if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
+            $this->log->info( "Featured image not set for post $post_id." );
+
+            return false;
+        }
+
+        // Get the uploads base URL.
+        $uploads_dir = wp_upload_dir();
+
+        // Get the attachment metadata.
+        $metadata = wp_get_attachment_metadata( $thumbnail_id );
+
+        // Bail out if the file isn't set.
+        if ( ! isset( $metadata['file'] ) ) {
+            $this->log->warn( "Featured image file not found for post $post_id." );
+
+            return false;
+        }
+
+        // Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
+        $path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
+
+        // Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
+        if ( ! file_exists( $path ) ) {
+            $this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
+
+            $attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
+            if ( $attachment_image_src ) {
+                return array(
+                    'url'    => $attachment_image_src[0],
+                    'width'  => $attachment_image_src[1],
+                    'height' => $attachment_image_src[2],
+                );
+            }
+
+            // Bail out if we cant fetch wp_get_attachment_image_src
+            return false;
+
+        }
+
+        // Try to get the image editor and bail out if the editor cannot be instantiated.
+        $original_file_editor = wp_get_image_editor( $path );
+        if ( is_wp_error( $original_file_editor ) ) {
+            $this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
+
+            return false;
+        }
+
+        // Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
+        // and we don't actually know the end values.
+        $publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
+
+        // If the file doesn't exist yet, create it.
+        if ( ! file_exists( $publisher_logo_path ) ) {
+            $original_file_editor->resize( 600, 60 );
+            $original_file_editor->save( $publisher_logo_path );
+        }
+
+        // Try to get the image editor and bail out if the editor cannot be instantiated.
+        $publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
+        if ( is_wp_error( $publisher_logo_editor ) ) {
+            $this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
+
+            return false;
+        }
+
+        // Get the actual size.
+        $size = $publisher_logo_editor->get_size();
+
+        // Finally return the array with data.
+        return array(
+            'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
+            'width'  => $size['width'],
+            'height' => $size['height'],
+        );
+    }
 
 }

Spacing +79 added lines, -79 removed lines

@@ -46,11 +46,11 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	public function __construct( $entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false ) {
-		parent::__construct( $entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create() );
+	public function __construct($entity_type_service, $user_service, $attachment_service, $disable_convert_filters = false) {
+		parent::__construct($entity_type_service, $user_service, $attachment_service, Wordlift_Property_Getter_Factory::create());
 		$this->disable_convert_filters = $disable_convert_filters;
 		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Post_To_Jsonld_Converter' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Post_To_Jsonld_Converter');
 
 		self::$instance = $this;
 
@@ -62,7 +62,7 @@ 
 	}
 
 	public function new_instance_with_filters_disabled() {
-		return new static( $this->entity_type_service, $this->user_service, $this->attachment_service, true );
+		return new static($this->entity_type_service, $this->user_service, $this->attachment_service, true);
 	}
 
 	/**
@@ -76,30 +76,30 @@ 
 	 * @return array A JSON-LD array.
 	 * @since 3.10.0
 	 */
-	public function convert( $post_id, &$references = array(), &$references_infos = array(), $relations = null ) {
+	public function convert($post_id, &$references = array(), &$references_infos = array(), $relations = null) {
 
 		// 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.
-		$jsonld = parent::convert( $post_id, $references, $references_infos, $relations );
+		$jsonld = parent::convert($post_id, $references, $references_infos, $relations);
 
 		// Set WebPage by default.
-		if ( empty( $jsonld['@type'] ) ) {
+		if (empty($jsonld['@type'])) {
 			$jsonld['@type'] = 'WebPage';
 		}
 
 		// Get the entity name.
 		$jsonld['headline'] = $post->post_title;
 
-		$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);
 		}
 
 		// Set the published and modified dates.
@@ -112,19 +112,19 @@ 
 		 */
 		try {
 			$default_timezone = date_default_timezone_get();
-			$timezone         = get_option( 'timezone_string' );
-			if ( ! empty( $timezone ) ) {
-				date_default_timezone_set( $timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i:sP', false, $post );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i:sP', false, $post );
-				date_default_timezone_set( $default_timezone ); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+			$timezone         = get_option('timezone_string');
+			if ( ! empty($timezone)) {
+				date_default_timezone_set($timezone); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
+				$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i:sP', false, $post);
+				$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i:sP', false, $post);
+				date_default_timezone_set($default_timezone); //phpcs:ignore WordPress.DateTime.RestrictedFunctions.timezone_change_date_default_timezone_set
 			} else {
-				$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-				$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+				$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i', true, $post, false);
+				$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i', true, $post, false);
 			}
-		} catch ( Exception $e ) {
-			$jsonld['datePublished'] = get_post_time( 'Y-m-d\TH:i', true, $post, false );
-			$jsonld['dateModified']  = get_post_modified_time( 'Y-m-d\TH:i', true, $post, false );
+		} catch (Exception $e) {
+			$jsonld['datePublished'] = get_post_time('Y-m-d\TH:i', true, $post, false);
+			$jsonld['dateModified']  = get_post_modified_time('Y-m-d\TH:i', true, $post, false);
 		}
 
 		// Get the word count for the post.
@@ -135,8 +135,8 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter        = new Wordlift_Post_Adapter( $post_id );
+		if ( ! empty($jsonld['@type']) && 'WebPage' !== $jsonld['@type']) {
+			$post_adapter        = new Wordlift_Post_Adapter($post_id);
 			$jsonld['wordCount'] = $post_adapter->word_count();
 		}
 
@@ -147,17 +147,17 @@ 
 		 *
 		 * @since 3.27.2
 		 */
-		if ( ! empty( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
-			$post_adapter    = new Wordlift_Post_Adapter( $post_id );
+		if ( ! empty($jsonld['@type']) && 'WebPage' !== $jsonld['@type']) {
+			$post_adapter    = new Wordlift_Post_Adapter($post_id);
 			$keywords        = $post_adapter->keywords();
 			$article_section = $post_adapter->article_section();
 			$comment_count   = $post_adapter->comment_count();
 			$locale          = $post_adapter->locale();
 
-			if ( isset( $keywords ) ) {
+			if (isset($keywords)) {
 				$jsonld['keywords'] = $keywords;
 			}
-			if ( ! empty( $article_section ) ) {
+			if ( ! empty($article_section)) {
 				$jsonld['articleSection'] = $article_section;
 			}
 			$jsonld['commentCount'] = $comment_count;
@@ -165,7 +165,7 @@ 
 		}
 
 		// Set the publisher.
-		$this->set_publisher( $jsonld );
+		$this->set_publisher($jsonld);
 
 		/**
 		 * Call the `wl_post_jsonld_author` filter.
@@ -188,7 +188,7 @@ 
 		$ret_val = apply_filters(
 			'wl_jsonld_author',
 			array(
-				'author'     => $this->get_author( $post->post_author, $references ),
+				'author'     => $this->get_author($post->post_author, $references),
 				'references' => $references,
 			),
 			$post_id
@@ -202,13 +202,13 @@ 
 		 *
 		 * @since 3.53.2
 		 */
-		if ( ! empty( $ret_val['author'] ) ) {
+		if ( ! empty($ret_val['author'])) {
 			$jsonld['author'] = $ret_val['author'];
 			$references       = $ret_val['references'];
 		}
 
 		// Return the JSON-LD if filters are disabled by the client.
-		if ( $this->disable_convert_filters ) {
+		if ($this->disable_convert_filters) {
 			return $jsonld;
 		}
 
@@ -253,7 +253,7 @@ 
 		 *
 		 * @api
 		 */
-		return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
+		return apply_filters('wl_post_jsonld', $jsonld, $post_id, $references);
 	}
 
 	/**
@@ -268,14 +268,14 @@ 
 	 * @return string|array A JSON-LD structure.
 	 * @since 3.14.0
 	 */
-	public function get_author( $author_id, &$references ) {
+	public function get_author($author_id, &$references) {
 
 		// Get the entity bound to this user.
-		$entity_id = $this->user_service->get_entity( $author_id );
+		$entity_id = $this->user_service->get_entity($author_id);
 
-		if ( ! empty( $entity_id ) && 'publish' === get_post_status( $entity_id ) ) {
+		if ( ! empty($entity_id) && 'publish' === get_post_status($entity_id)) {
 			// Add the author to the references.
-			$author_uri   = Wordlift_Entity_Service::get_instance()->get_uri( $entity_id );
+			$author_uri   = Wordlift_Entity_Service::get_instance()->get_uri($entity_id);
 			$references[] = $entity_id;
 
 			// Return the JSON-LD for the referenced entity.
@@ -285,11 +285,11 @@ 
 		}
 
 		// If there's no entity bound return a simple author structure.
-		if ( false !== get_userdata( $author_id ) ) {
-			$author            = get_the_author_meta( 'display_name', $author_id );
-			$author_first_name = get_the_author_meta( 'first_name', $author_id );
-			$author_last_name  = get_the_author_meta( 'last_name', $author_id );
-			$author_uri        = $this->user_service->get_uri( $author_id );
+		if (false !== get_userdata($author_id)) {
+			$author            = get_the_author_meta('display_name', $author_id);
+			$author_first_name = get_the_author_meta('first_name', $author_id);
+			$author_last_name  = get_the_author_meta('last_name', $author_id);
+			$author_uri        = $this->user_service->get_uri($author_id);
 
 			return array(
 				'@type'      => 'Person',
@@ -297,7 +297,7 @@ 
 				'name'       => $author,
 				'givenName'  => $author_first_name,
 				'familyName' => $author_last_name,
-				'url'        => get_author_posts_url( $author_id ),
+				'url'        => get_author_posts_url($author_id),
 			);
 		}
 
@@ -312,41 +312,41 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	protected function set_publisher( &$params ) {
+	protected function set_publisher(&$params) {
 
 		// If the publisher id isn't set don't do anything.
 		$publisher_id = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-		if ( empty( $publisher_id ) ) {
+		if (empty($publisher_id)) {
 			return;
 		}
 
 		// Get the post instance.
-		$post = get_post( $publisher_id );
-		if ( ! is_a( $post, '\WP_Post' ) ) {
+		$post = get_post($publisher_id);
+		if ( ! is_a($post, '\WP_Post')) {
 			// Publisher not found.
 			return;
 		}
 
 		// Get the item id.
-		$id = Wordlift_Entity_Service::get_instance()->get_uri( $publisher_id );
+		$id = Wordlift_Entity_Service::get_instance()->get_uri($publisher_id);
 
 		// Get the type.
-		$type = $this->entity_type_service->get( $publisher_id );
+		$type = $this->entity_type_service->get($publisher_id);
 
 		// Get the name.
 		$name = $post->post_title;
 
 		// Set the publisher data.
 		$params['publisher'] = array(
-			'@type' => $this->relative_to_context( $type['uri'] ),
+			'@type' => $this->relative_to_context($type['uri']),
 			'@id'   => $id,
 			'name'  => $name,
 		);
 
 		// Add the sameAs values associated with the publisher.
 		$storage_factory = Wordlift_Storage_Factory::get_instance();
-		$sameas          = $storage_factory->post_meta( Wordlift_Schema_Service::FIELD_SAME_AS )->get( $publisher_id );
-		if ( ! empty( $sameas ) ) {
+		$sameas          = $storage_factory->post_meta(Wordlift_Schema_Service::FIELD_SAME_AS)->get($publisher_id);
+		if ( ! empty($sameas)) {
 			$params['publisher']['sameAs'] = $sameas;
 		}
 
@@ -354,15 +354,15 @@ 
 		// support the logo property.
 		//
 		// See http://schema.org/logo.
-		if ( 1 !== preg_match( '~Organization$~', $type['uri'] ) ) {
+		if (1 !== preg_match('~Organization$~', $type['uri'])) {
 			return;
 		}
 
 		// Get the publisher logo.
-		$publisher_logo = $this->get_publisher_logo( $post->ID );
+		$publisher_logo = $this->get_publisher_logo($post->ID);
 
 		// Bail out if the publisher logo isn't set.
-		if ( false === $publisher_logo ) {
+		if (false === $publisher_logo) {
 			return;
 		}
 
@@ -396,14 +396,14 @@ 
 	 * @since 3.19.2
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/823 related issue.
 	 */
-	private function get_publisher_logo( $post_id ) {
+	private function get_publisher_logo($post_id) {
 
 		// Get the featured image for the post.
-		$thumbnail_id = get_post_thumbnail_id( $post_id );
+		$thumbnail_id = get_post_thumbnail_id($post_id);
 
 		// Bail out if thumbnail not available.
-		if ( empty( $thumbnail_id ) || 0 === $thumbnail_id ) {
-			$this->log->info( "Featured image not set for post $post_id." );
+		if (empty($thumbnail_id) || 0 === $thumbnail_id) {
+			$this->log->info("Featured image not set for post $post_id.");
 
 			return false;
 		}
@@ -412,24 +412,24 @@ 
 		$uploads_dir = wp_upload_dir();
 
 		// Get the attachment metadata.
-		$metadata = wp_get_attachment_metadata( $thumbnail_id );
+		$metadata = wp_get_attachment_metadata($thumbnail_id);
 
 		// Bail out if the file isn't set.
-		if ( ! isset( $metadata['file'] ) ) {
-			$this->log->warn( "Featured image file not found for post $post_id." );
+		if ( ! isset($metadata['file'])) {
+			$this->log->warn("Featured image file not found for post $post_id.");
 
 			return false;
 		}
 
 		// Retrieve the relative filename, e.g. "2018/05/logo_publisher.png"
-		$path = $uploads_dir['basedir'] . DIRECTORY_SEPARATOR . $metadata['file'];
+		$path = $uploads_dir['basedir'].DIRECTORY_SEPARATOR.$metadata['file'];
 
 		// Use image src, if local file does not exist. @see https://github.com/insideout10/wordlift-plugin/issues/1149
-		if ( ! file_exists( $path ) ) {
-			$this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
+		if ( ! file_exists($path)) {
+			$this->log->warn("Featured image file $path doesn't exist for post $post_id.");
 
-			$attachment_image_src = wp_get_attachment_image_src( $thumbnail_id, '' );
-			if ( $attachment_image_src ) {
+			$attachment_image_src = wp_get_attachment_image_src($thumbnail_id, '');
+			if ($attachment_image_src) {
 				return array(
 					'url'    => $attachment_image_src[0],
 					'width'  => $attachment_image_src[1],
@@ -443,27 +443,27 @@ 
 		}
 
 		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$original_file_editor = wp_get_image_editor( $path );
-		if ( is_wp_error( $original_file_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $path for post $post_id." );
+		$original_file_editor = wp_get_image_editor($path);
+		if (is_wp_error($original_file_editor)) {
+			$this->log->warn("Cannot instantiate WP Image Editor on file $path for post $post_id.");
 
 			return false;
 		}
 
 		// Generate the publisher logo filename, we cannot use the `width` and `height` because we're scaling
 		// and we don't actually know the end values.
-		$publisher_logo_path = $original_file_editor->generate_filename( '-publisher-logo' );
+		$publisher_logo_path = $original_file_editor->generate_filename('-publisher-logo');
 
 		// If the file doesn't exist yet, create it.
-		if ( ! file_exists( $publisher_logo_path ) ) {
-			$original_file_editor->resize( 600, 60 );
-			$original_file_editor->save( $publisher_logo_path );
+		if ( ! file_exists($publisher_logo_path)) {
+			$original_file_editor->resize(600, 60);
+			$original_file_editor->save($publisher_logo_path);
 		}
 
 		// Try to get the image editor and bail out if the editor cannot be instantiated.
-		$publisher_logo_editor = wp_get_image_editor( $publisher_logo_path );
-		if ( is_wp_error( $publisher_logo_editor ) ) {
-			$this->log->warn( "Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id." );
+		$publisher_logo_editor = wp_get_image_editor($publisher_logo_path);
+		if (is_wp_error($publisher_logo_editor)) {
+			$this->log->warn("Cannot instantiate WP Image Editor on file $publisher_logo_path for post $post_id.");
 
 			return false;
 		}
@@ -473,7 +473,7 @@ 
 
 		// Finally return the array with data.
 		return array(
-			'url'    => $uploads_dir['baseurl'] . substr( $publisher_logo_path, strlen( $uploads_dir['basedir'] ) ),
+			'url'    => $uploads_dir['baseurl'].substr($publisher_logo_path, strlen($uploads_dir['basedir'])),
 			'width'  => $size['width'],
 			'height' => $size['height'],
 		);