insideout10 / wordlift-plugin

src/modules/analyzer/wordlift_analyzer.php

Indentation +32 added lines, -32 removed lines

@@ -14,11 +14,11 @@ 
  */
 function wl_ajax_analyze_action() {
 
-	check_admin_referer( 'wl_analyze' );
+    check_admin_referer( 'wl_analyze' );
 
-	$data = filter_input( INPUT_POST, 'data' );
+    $data = filter_input( INPUT_POST, 'data' );
 
-	wp_send_json_success( wl_analyze_content( $data, 'application/json; charset=' . strtolower( get_bloginfo( 'charset' ) ) ) );
+    wp_send_json_success( wl_analyze_content( $data, 'application/json; charset=' . strtolower( get_bloginfo( 'charset' ) ) ) );
 
 }
 
@@ -45,47 +45,47 @@ 
 //	// Set the content type to the request content type or to text/plain by default.
 //	$content_type = isset( $_SERVER['CONTENT_TYPE'] ) ? $_SERVER['CONTENT_TYPE'] : 'text/plain';
 
-	add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
-	$json = Wordlift_Api_Service::get_instance()
-	                            ->post_custom_content_type( 'analysis/single', $data, $content_type );
-	remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+    add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+    $json = Wordlift_Api_Service::get_instance()
+                                ->post_custom_content_type( 'analysis/single', $data, $content_type );
+    remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
 
-	// If it's an error log it.
-	if ( is_wp_error( $json ) ) {
-		$request_body = json_decode( $data, true );
+    // If it's an error log it.
+    if ( is_wp_error( $json ) ) {
+        $request_body = json_decode( $data, true );
 
-		return Analysis_Response_Ops_Factory::get_instance()
-		                                    ->create( json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' ) )
-		                                    ->make_entities_local()
-		                                    ->add_occurrences( $request_body['content'] )
-		                                    ->get_json();
-	}
+        return Analysis_Response_Ops_Factory::get_instance()
+                                            ->create( json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' ) )
+                                            ->make_entities_local()
+                                            ->add_occurrences( $request_body['content'] )
+                                            ->get_json();
+    }
 
-	/*
+    /*
 	 * We pass the response to the Analysis_Response_Ops to ensure that we make remote entities local.
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/944
 	 * @since 3.21.5
 	 */
 
-	// Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
-	// the occurrences for the local entities.
-	if ( 0 === strpos( $content_type, 'application/json' ) ) {
-		$request_json    = json_decode( $data );
-		$request_content = $request_json->content;
-	} else {
-		$request_content = $data;
-	}
-
-	return Analysis_Response_Ops_Factory::get_instance()
-	                                    ->create( $json )
-	                                    ->make_entities_local()
-	                                    ->add_occurrences( $request_content )
-	                                    ->get_json();
+    // Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
+    // the occurrences for the local entities.
+    if ( 0 === strpos( $content_type, 'application/json' ) ) {
+        $request_json    = json_decode( $data );
+        $request_content = $request_json->content;
+    } else {
+        $request_content = $data;
+    }
+
+    return Analysis_Response_Ops_Factory::get_instance()
+                                        ->create( $json )
+                                        ->make_entities_local()
+                                        ->add_occurrences( $request_content )
+                                        ->get_json();
 
 }
 
 function wl_use_analysis_on_api_wordlift_io( $value ) {
 
-	return preg_replace( '|https://api\.wordlift\.it/|', 'https://api.wordlift.io/', $value );
+    return preg_replace( '|https://api\.wordlift\.it/|', 'https://api.wordlift.io/', $value );
 }

Spacing +18 added lines, -18 removed lines

@@ -14,15 +14,15 @@ 
  */
 function wl_ajax_analyze_action() {
 
-	check_admin_referer( 'wl_analyze' );
+	check_admin_referer('wl_analyze');
 
-	$data = filter_input( INPUT_POST, 'data' );
+	$data = filter_input(INPUT_POST, 'data');
 
-	wp_send_json_success( wl_analyze_content( $data, 'application/json; charset=' . strtolower( get_bloginfo( 'charset' ) ) ) );
+	wp_send_json_success(wl_analyze_content($data, 'application/json; charset='.strtolower(get_bloginfo('charset'))));
 
 }
 
-add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_action');
 
 /**
  * Analyze the provided content. The analysis will make use of the method *wl_ajax_analyze_action*
@@ -40,24 +40,24 @@ 
  * @since 3.24.2 We don't return an error anymore, but an empty analysis response. This is required to allow the editor
  *   to manage entities or to manually add them even when analysis isn't available.
  */
-function wl_analyze_content( $data, $content_type ) {
+function wl_analyze_content($data, $content_type) {
 
 //	// Set the content type to the request content type or to text/plain by default.
 //	$content_type = isset( $_SERVER['CONTENT_TYPE'] ) ? $_SERVER['CONTENT_TYPE'] : 'text/plain';
 
-	add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+	add_filter('wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io');
 	$json = Wordlift_Api_Service::get_instance()
-	                            ->post_custom_content_type( 'analysis/single', $data, $content_type );
-	remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+	                            ->post_custom_content_type('analysis/single', $data, $content_type);
+	remove_filter('wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io');
 
 	// If it's an error log it.
-	if ( is_wp_error( $json ) ) {
-		$request_body = json_decode( $data, true );
+	if (is_wp_error($json)) {
+		$request_body = json_decode($data, true);
 
 		return Analysis_Response_Ops_Factory::get_instance()
-		                                    ->create( json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' ) )
+		                                    ->create(json_decode('{ "entities": {}, "annotations": {}, "topics": {} }'))
 		                                    ->make_entities_local()
-		                                    ->add_occurrences( $request_body['content'] )
+		                                    ->add_occurrences($request_body['content'])
 		                                    ->get_json();
 	}
 
@@ -70,22 +70,22 @@ 
 
 	// Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
 	// the occurrences for the local entities.
-	if ( 0 === strpos( $content_type, 'application/json' ) ) {
-		$request_json    = json_decode( $data );
+	if (0 === strpos($content_type, 'application/json')) {
+		$request_json    = json_decode($data);
 		$request_content = $request_json->content;
 	} else {
 		$request_content = $data;
 	}
 
 	return Analysis_Response_Ops_Factory::get_instance()
-	                                    ->create( $json )
+	                                    ->create($json)
 	                                    ->make_entities_local()
-	                                    ->add_occurrences( $request_content )
+	                                    ->add_occurrences($request_content)
 	                                    ->get_json();
 
 }
 
-function wl_use_analysis_on_api_wordlift_io( $value ) {
+function wl_use_analysis_on_api_wordlift_io($value) {
 
-	return preg_replace( '|https://api\.wordlift\.it/|', 'https://api.wordlift.io/', $value );
+	return preg_replace('|https://api\.wordlift\.it/|', 'https://api.wordlift.io/', $value);
 }

src/includes/linked-data/storage/class-wordlift-post-image-storage.php

Indentation +40 added lines, -40 removed lines

@@ -18,45 +18,45 @@
  */
 class Wordlift_Post_Image_Storage extends Wordlift_Storage {
 
-	/**
-	 * Get the property value.
-	 *
-	 * @param int $post_id The {@link WP_Post}'s id.
-	 *
-	 * @return array|string|null A single string, or an array of values or null
-	 *                           if the property isn't recognized.
-	 * @since 3.15.0
-	 *
-	 */
-	public function get( $post_id ) {
-
-		// Prepare the return array.
-		$image_urls = array();
-
-		// If there is a featured image it has the priority.
-		$featured_image_id = get_post_thumbnail_id( $post_id );
-		if ( is_numeric( $featured_image_id ) && 0 < $featured_image_id ) {
-			$image_url = wp_get_attachment_url( $featured_image_id );
-
-			$image_urls[] = $image_url;
-		}
-
-		$images = get_children( array(
-			'post_parent'    => $post_id,
-			'post_type'      => 'attachment',
-			'post_mime_type' => 'image',
-		) );
-
-		// Collect the URLs.
-		foreach ( $images as $attachment_id => $attachment ) {
-			$image_url = wp_get_attachment_url( $attachment_id );
-			// Ensure the URL isn't collected already.
-			if ( ! in_array( $image_url, $image_urls ) ) {
-				array_push( $image_urls, $image_url );
-			}
-		}
-
-		return $image_urls;
-	}
+    /**
+     * Get the property value.
+     *
+     * @param int $post_id The {@link WP_Post}'s id.
+     *
+     * @return array|string|null A single string, or an array of values or null
+     *                           if the property isn't recognized.
+     * @since 3.15.0
+     *
+     */
+    public function get( $post_id ) {
+
+        // Prepare the return array.
+        $image_urls = array();
+
+        // If there is a featured image it has the priority.
+        $featured_image_id = get_post_thumbnail_id( $post_id );
+        if ( is_numeric( $featured_image_id ) && 0 < $featured_image_id ) {
+            $image_url = wp_get_attachment_url( $featured_image_id );
+
+            $image_urls[] = $image_url;
+        }
+
+        $images = get_children( array(
+            'post_parent'    => $post_id,
+            'post_type'      => 'attachment',
+            'post_mime_type' => 'image',
+        ) );
+
+        // Collect the URLs.
+        foreach ( $images as $attachment_id => $attachment ) {
+            $image_url = wp_get_attachment_url( $attachment_id );
+            // Ensure the URL isn't collected already.
+            if ( ! in_array( $image_url, $image_urls ) ) {
+                array_push( $image_urls, $image_url );
+            }
+        }
+
+        return $image_urls;
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -28,31 +28,31 @@
 	 * @since 3.15.0
 	 *
 	 */
-	public function get( $post_id ) {
+	public function get($post_id) {
 
 		// Prepare the return array.
 		$image_urls = array();
 
 		// If there is a featured image it has the priority.
-		$featured_image_id = get_post_thumbnail_id( $post_id );
-		if ( is_numeric( $featured_image_id ) && 0 < $featured_image_id ) {
-			$image_url = wp_get_attachment_url( $featured_image_id );
+		$featured_image_id = get_post_thumbnail_id($post_id);
+		if (is_numeric($featured_image_id) && 0 < $featured_image_id) {
+			$image_url = wp_get_attachment_url($featured_image_id);
 
 			$image_urls[] = $image_url;
 		}
 
-		$images = get_children( array(
+		$images = get_children(array(
 			'post_parent'    => $post_id,
 			'post_type'      => 'attachment',
 			'post_mime_type' => 'image',
-		) );
+		));
 
 		// Collect the URLs.
-		foreach ( $images as $attachment_id => $attachment ) {
-			$image_url = wp_get_attachment_url( $attachment_id );
+		foreach ($images as $attachment_id => $attachment) {
+			$image_url = wp_get_attachment_url($attachment_id);
 			// Ensure the URL isn't collected already.
-			if ( ! in_array( $image_url, $image_urls ) ) {
-				array_push( $image_urls, $image_url );
+			if ( ! in_array($image_url, $image_urls)) {
+				array_push($image_urls, $image_url);
 			}
 		}
 

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

Indentation +376 added lines, -376 removed lines

@@ -15,393 +15,393 @@
  */
 class Wordlift_Post_To_Jsonld_Converter extends Wordlift_Abstract_Post_To_Jsonld_Converter {
 
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Wordlift_Post_To_Jsonld_Converter constructor.
-	 *
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
-	 * @param \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
-	 * @param \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since 3.10.0
-	 *
-	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
-
-		$this->configuration_service = $configuration_service;
-
-		// Set a reference to the logger.
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_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 post id.
-	 * @param array $references An array of entity references.
-	 *
-	 * @return array A JSON-LD array.
-	 * @since 3.10.0
-	 *
-	 */
-	public function convert( $post_id, &$references = array() ) {
-
-		// Get the post instance.
-		if ( null === $post = get_post( $post_id ) ) {
-			// 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 );
-
-		// Set WebPage by default.
-		if ( empty( $jsonld['@type'] ) ) {
-			$jsonld['@type'] = 'WebPage';
-		}
-
-		// Get the entity name.
-		$jsonld['headline'] = $post->post_title;
-
-		// Set the published and modified dates.
-		/*
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Wordlift_Post_To_Jsonld_Converter constructor.
+     *
+     * @param \Wordlift_Entity_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_User_Service $user_service A {@link Wordlift_User_Service} instance.
+     * @param \Wordlift_Attachment_Service $attachment_service A {@link Wordlift_Attachment_Service} instance.
+     * @param \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since 3.10.0
+     *
+     */
+    public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service ) {
+        parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+
+        $this->configuration_service = $configuration_service;
+
+        // Set a reference to the logger.
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_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 post id.
+     * @param array $references An array of entity references.
+     *
+     * @return array A JSON-LD array.
+     * @since 3.10.0
+     *
+     */
+    public function convert( $post_id, &$references = array() ) {
+
+        // Get the post instance.
+        if ( null === $post = get_post( $post_id ) ) {
+            // 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 );
+
+        // Set WebPage by default.
+        if ( empty( $jsonld['@type'] ) ) {
+            $jsonld['@type'] = 'WebPage';
+        }
+
+        // Get the entity name.
+        $jsonld['headline'] = $post->post_title;
+
+        // 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();
-			date_default_timezone_set( get_option( 'timezone_string' ) );
-			$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 );
-		} 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();
+            date_default_timezone_set( get_option( 'timezone_string' ) );
+            $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 );
+        } 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();
-		}
-
-		// Set the publisher.
-		$this->set_publisher( $jsonld );
-
-		// Process the references if any.
-		if ( 0 < count( $references ) ) {
-
-			// Prepare the `about` and `mentions` array.
-			$about = $mentions = array();
-
-			// If the entity is in the title, then it should be an `about`.
-			foreach ( $references as $reference ) {
-
-				// Get the entity labels.
-				$labels = $this->entity_service->get_labels( $reference );
-
-				// Get the entity URI.
-				$item = array(
-					'@id' => $this->entity_service->get_uri( $reference ),
-				);
-
-				$escaped_labels = array_map( function ( $value ) {
-					return preg_quote( $value, '/' );
-				}, $labels );
-
-				// Check if the labels match any part of the title.
-				$matches = 1 === preg_match( '/' . implode( '|', $escaped_labels ) . '/', $post->post_title );
-
-				// If the title matches, assign the entity to the about, otherwise to the mentions.
-				if ( $matches ) {
-					$about[] = $item;
-				} else {
-					$mentions[] = $item;
-				}
-			}
-
-			// If we have abouts, assign them to the JSON-LD.
-			if ( 0 < count( $about ) ) {
-				$jsonld['about'] = $about;
-			}
-
-			// If we have mentions, assign them to the JSON-LD.
-			if ( 0 < count( $mentions ) ) {
-				$jsonld['mentions'] = $mentions;
-			}
-		}
-
-		// Finally set the author.
-		$jsonld['author'] = $this->get_author( $post->post_author, $references );
-
-		/**
-		 * 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_post_jsonld_array', array(
-			'jsonld'     => $jsonld,
-			'references' => $references,
-		), $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
-	 *
-	 */
-	private function get_author( $author_id, &$references ) {
-
-		// Get the entity bound to this user.
-		$entity_id = $this->user_service->get_entity( $author_id );
-
-		// If there's no entity bound return a simple author structure.
-		if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
-
-			$author     = get_the_author_meta( 'display_name', $author_id );
-			$author_uri = $this->user_service->get_uri( $author_id );
-
-			return array(
-				'@type' => 'Person',
-				'@id'   => $author_uri,
-				'name'  => $author,
-			);
-		}
-
-		// Add the author to the references.
-		$author_uri   = $this->entity_service->get_uri( $entity_id );
-		$references[] = $entity_id;
-
-		// Return the JSON-LD for the referenced entity.
-		return array(
-			'@id' => $author_uri,
-		);
-	}
-
-	/**
-	 * 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.
-		if ( null === $publisher_id = $this->configuration_service->get_publisher_id() ) {
-			return;
-		}
-
-		// Get the post instance.
-		if ( null === $post = get_post( $publisher_id ) ) {
-			// Publisher not found.
-			return;
-		}
-
-		// Get the item id.
-		$id = $this->entity_service->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 ( 'http://schema.org/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'];
-
-		// Bail out if the file isn't found.
-		if ( ! file_exists( $path ) ) {
-			$this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
-
-			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( $jsonld['@type'] ) && 'WebPage' !== $jsonld['@type'] ) {
+            $post_adapter        = new Wordlift_Post_Adapter( $post_id );
+            $jsonld['wordCount'] = $post_adapter->word_count();
+        }
+
+        // Set the publisher.
+        $this->set_publisher( $jsonld );
+
+        // Process the references if any.
+        if ( 0 < count( $references ) ) {
+
+            // Prepare the `about` and `mentions` array.
+            $about = $mentions = array();
+
+            // If the entity is in the title, then it should be an `about`.
+            foreach ( $references as $reference ) {
+
+                // Get the entity labels.
+                $labels = $this->entity_service->get_labels( $reference );
+
+                // Get the entity URI.
+                $item = array(
+                    '@id' => $this->entity_service->get_uri( $reference ),
+                );
+
+                $escaped_labels = array_map( function ( $value ) {
+                    return preg_quote( $value, '/' );
+                }, $labels );
+
+                // Check if the labels match any part of the title.
+                $matches = 1 === preg_match( '/' . implode( '|', $escaped_labels ) . '/', $post->post_title );
+
+                // If the title matches, assign the entity to the about, otherwise to the mentions.
+                if ( $matches ) {
+                    $about[] = $item;
+                } else {
+                    $mentions[] = $item;
+                }
+            }
+
+            // If we have abouts, assign them to the JSON-LD.
+            if ( 0 < count( $about ) ) {
+                $jsonld['about'] = $about;
+            }
+
+            // If we have mentions, assign them to the JSON-LD.
+            if ( 0 < count( $mentions ) ) {
+                $jsonld['mentions'] = $mentions;
+            }
+        }
+
+        // Finally set the author.
+        $jsonld['author'] = $this->get_author( $post->post_author, $references );
+
+        /**
+         * 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_post_jsonld_array', array(
+            'jsonld'     => $jsonld,
+            'references' => $references,
+        ), $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
+     *
+     */
+    private function get_author( $author_id, &$references ) {
+
+        // Get the entity bound to this user.
+        $entity_id = $this->user_service->get_entity( $author_id );
+
+        // If there's no entity bound return a simple author structure.
+        if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
+
+            $author     = get_the_author_meta( 'display_name', $author_id );
+            $author_uri = $this->user_service->get_uri( $author_id );
+
+            return array(
+                '@type' => 'Person',
+                '@id'   => $author_uri,
+                'name'  => $author,
+            );
+        }
+
+        // Add the author to the references.
+        $author_uri   = $this->entity_service->get_uri( $entity_id );
+        $references[] = $entity_id;
+
+        // Return the JSON-LD for the referenced entity.
+        return array(
+            '@id' => $author_uri,
+        );
+    }
+
+    /**
+     * 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.
+        if ( null === $publisher_id = $this->configuration_service->get_publisher_id() ) {
+            return;
+        }
+
+        // Get the post instance.
+        if ( null === $post = get_post( $publisher_id ) ) {
+            // Publisher not found.
+            return;
+        }
+
+        // Get the item id.
+        $id = $this->entity_service->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 ( 'http://schema.org/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'];
+
+        // Bail out if the file isn't found.
+        if ( ! file_exists( $path ) ) {
+            $this->log->warn( "Featured image file $path doesn't exist for post $post_id." );
+
+            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 +70 added lines, -70 removed lines

@@ -45,13 +45,13 @@ 
 	 * @since 3.10.0
 	 *
 	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+	public function __construct($entity_type_service, $entity_service, $user_service, $attachment_service, $configuration_service) {
+		parent::__construct($entity_type_service, $entity_service, $user_service, $attachment_service);
 
 		$this->configuration_service = $configuration_service;
 
 		// 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');
 	}
 
 	/**
@@ -65,19 +65,19 @@ 
 	 * @since 3.10.0
 	 *
 	 */
-	public function convert( $post_id, &$references = array() ) {
+	public function convert($post_id, &$references = array()) {
 
 		// Get the post instance.
-		if ( null === $post = get_post( $post_id ) ) {
+		if (null === $post = get_post($post_id)) {
 			// 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 );
+		$jsonld = parent::convert($post_id, $references);
 
 		// Set WebPage by default.
-		if ( empty( $jsonld['@type'] ) ) {
+		if (empty($jsonld['@type'])) {
 			$jsonld['@type'] = 'WebPage';
 		}
 
@@ -94,13 +94,13 @@ 
 		 */
 		try {
 			$default_timezone = date_default_timezone_get();
-			date_default_timezone_set( get_option( 'timezone_string' ) );
-			$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 );
-		} 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 );
+			date_default_timezone_set(get_option('timezone_string'));
+			$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);
+		} 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.
@@ -111,40 +111,40 @@ 
 		 *
 		 * @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();
 		}
 
 		// Set the publisher.
-		$this->set_publisher( $jsonld );
+		$this->set_publisher($jsonld);
 
 		// Process the references if any.
-		if ( 0 < count( $references ) ) {
+		if (0 < count($references)) {
 
 			// Prepare the `about` and `mentions` array.
 			$about = $mentions = array();
 
 			// If the entity is in the title, then it should be an `about`.
-			foreach ( $references as $reference ) {
+			foreach ($references as $reference) {
 
 				// Get the entity labels.
-				$labels = $this->entity_service->get_labels( $reference );
+				$labels = $this->entity_service->get_labels($reference);
 
 				// Get the entity URI.
 				$item = array(
-					'@id' => $this->entity_service->get_uri( $reference ),
+					'@id' => $this->entity_service->get_uri($reference),
 				);
 
-				$escaped_labels = array_map( function ( $value ) {
-					return preg_quote( $value, '/' );
-				}, $labels );
+				$escaped_labels = array_map(function($value) {
+					return preg_quote($value, '/');
+				}, $labels);
 
 				// Check if the labels match any part of the title.
-				$matches = 1 === preg_match( '/' . implode( '|', $escaped_labels ) . '/', $post->post_title );
+				$matches = 1 === preg_match('/'.implode('|', $escaped_labels).'/', $post->post_title);
 
 				// If the title matches, assign the entity to the about, otherwise to the mentions.
-				if ( $matches ) {
+				if ($matches) {
 					$about[] = $item;
 				} else {
 					$mentions[] = $item;
@@ -152,18 +152,18 @@ 
 			}
 
 			// If we have abouts, assign them to the JSON-LD.
-			if ( 0 < count( $about ) ) {
+			if (0 < count($about)) {
 				$jsonld['about'] = $about;
 			}
 
 			// If we have mentions, assign them to the JSON-LD.
-			if ( 0 < count( $mentions ) ) {
+			if (0 < count($mentions)) {
 				$jsonld['mentions'] = $mentions;
 			}
 		}
 
 		// Finally set the author.
-		$jsonld['author'] = $this->get_author( $post->post_author, $references );
+		$jsonld['author'] = $this->get_author($post->post_author, $references);
 
 		/**
 		 * Call the `wl_post_jsonld_array` filter. This filter allows 3rd parties to also modify the references.
@@ -179,10 +179,10 @@ 
 		 *
 		 * @api
 		 */
-		$ret_val    = apply_filters( 'wl_post_jsonld_array', array(
+		$ret_val = apply_filters('wl_post_jsonld_array', array(
 			'jsonld'     => $jsonld,
 			'references' => $references,
-		), $post_id );
+		), $post_id);
 		$jsonld     = $ret_val['jsonld'];
 		$references = $ret_val['references'];
 
@@ -197,7 +197,7 @@ 
 		 *
 		 * @api
 		 */
-		return apply_filters( 'wl_post_jsonld', $jsonld, $post_id, $references );
+		return apply_filters('wl_post_jsonld', $jsonld, $post_id, $references);
 	}
 
 	/**
@@ -213,16 +213,16 @@ 
 	 * @since 3.14.0
 	 *
 	 */
-	private function get_author( $author_id, &$references ) {
+	private 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 there's no entity bound return a simple author structure.
-		if ( empty( $entity_id ) || 'publish' !== get_post_status( $entity_id ) ) {
+		if (empty($entity_id) || 'publish' !== get_post_status($entity_id)) {
 
-			$author     = get_the_author_meta( 'display_name', $author_id );
-			$author_uri = $this->user_service->get_uri( $author_id );
+			$author     = get_the_author_meta('display_name', $author_id);
+			$author_uri = $this->user_service->get_uri($author_id);
 
 			return array(
 				'@type' => 'Person',
@@ -232,7 +232,7 @@ 
 		}
 
 		// Add the author to the references.
-		$author_uri   = $this->entity_service->get_uri( $entity_id );
+		$author_uri   = $this->entity_service->get_uri($entity_id);
 		$references[] = $entity_id;
 
 		// Return the JSON-LD for the referenced entity.
@@ -249,39 +249,39 @@ 
 	 * @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.
-		if ( null === $publisher_id = $this->configuration_service->get_publisher_id() ) {
+		if (null === $publisher_id = $this->configuration_service->get_publisher_id()) {
 			return;
 		}
 
 		// Get the post instance.
-		if ( null === $post = get_post( $publisher_id ) ) {
+		if (null === $post = get_post($publisher_id)) {
 			// Publisher not found.
 			return;
 		}
 
 		// Get the item id.
-		$id = $this->entity_service->get_uri( $publisher_id );
+		$id = $this->entity_service->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;
 		}
 
@@ -289,15 +289,15 @@ 
 		// support the logo property.
 		//
 		// See http://schema.org/logo.
-		if ( 'http://schema.org/Organization' !== $type['uri'] ) {
+		if ('http://schema.org/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;
 		}
 
@@ -332,14 +332,14 @@ 
 	 * @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;
 		}
@@ -348,47 +348,47 @@ 
 		$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'];
 
 		// Bail out if the file isn't found.
-		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.");
 
 			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." );
+		$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;
 		}
@@ -398,7 +398,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'],
 		);

src/shortcodes/wordlift_shortcode_chord.php

Indentation +175 added lines, -175 removed lines

@@ -15,45 +15,45 @@ 
  * @return mixed
  */
 function wl_shortcode_chord_most_referenced_entity_id() {
-	// Get the last 20 articles by post date.
-	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
-		'numberposts' => 20,
-		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-		'fields'      => 'ids', // Only get post IDs.
-		'post_status' => 'publish',
-		'tax_query'   => array(
-			'relation' => 'OR',
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'operator' => 'NOT EXISTS',
-			),
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'field'    => 'slug',
-				'terms'    => 'article',
-			),
-		),
-		'orderby'     => 'post_date',
-		'order'       => 'DESC',
-	) );
-
-	if ( empty( $post_ids ) ) {
-		return null;
-	}
-
-	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
-	}
-
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
-	} else {
-		return $post_ids[0];
-	}
+    // Get the last 20 articles by post date.
+    // For each article get the entities they reference.
+    $post_ids = get_posts( array(
+        'numberposts' => 20,
+        'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+        'fields'      => 'ids', // Only get post IDs.
+        'post_status' => 'publish',
+        'tax_query'   => array(
+            'relation' => 'OR',
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'operator' => 'NOT EXISTS',
+            ),
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'field'    => 'slug',
+                'terms'    => 'article',
+            ),
+        ),
+        'orderby'     => 'post_date',
+        'order'       => 'DESC',
+    ) );
+
+    if ( empty( $post_ids ) ) {
+        return null;
+    }
+
+    $entities = array();
+    foreach ( $post_ids as $id ) {
+        $entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+    }
+
+    $famous_entities = array_count_values( $entities );
+    arsort( $famous_entities );
+    if ( sizeof( $famous_entities ) >= 1 ) {
+        return key( $famous_entities );
+    } else {
+        return $post_ids[0];
+    }
 
 }
 
@@ -71,60 +71,60 @@ 
  */
 function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
-			return $related;
-		}
-	}
+    if ( ! is_null( $related ) ) {
+        if ( 0 === $depth ) {
+            return $related;
+        }
+    }
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+    wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
 
-	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
-		$related = array(
-			'entities'  => array( $entity_id ),
-			'relations' => array(),
-		);
-	}
+    // Create a related array which will hold entities and relations.
+    if ( is_null( $related ) ) {
+        $related = array(
+            'entities'  => array( $entity_id ),
+            'relations' => array(),
+        );
+    }
 
-	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
-		'status' => 'publish',
-	) );
+    // Get related entities
+    $related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+        'status' => 'publish',
+    ) );
 
-	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
-			'status' => 'publish',
-		) ) :
-		array();
+    // If the current node is an entity, add related posts too
+    $related_post_ids = ( Wordlift_Entity_Service::get_instance()
+                                                    ->is_entity( $entity_id ) ) ?
+        wl_core_get_related_post_ids( $entity_id, array(
+            'status' => 'publish',
+        ) ) :
+        array();
 
-	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+    // Merge results and remove duplicated entries
+    $related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
 
-	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+    // TODO: List of entities ($rel) should be ordered by interest factors.
+    shuffle( $related_ids );
 
-	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+    // Now we have all the related IDs.
+    foreach ( $related_ids as $related_id ) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
-			return $related;
-		}
+        if ( count( $related['entities'] ) >= $max_size ) {
+            return $related;
+        }
 
-		$related['relations'][] = array( $entity_id, $related_id );
+        $related['relations'][] = array( $entity_id, $related_id );
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
-			// Found new related entity!
-			$related['entities'][] = $related_id;
+        if ( ! in_array( $related_id, $related['entities'] ) ) {
+            // Found new related entity!
+            $related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
-		}
-	}
+            $related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+        }
+    }
 
-	// End condition 2: no more entities to search for.
-	return $related;
+    // End condition 2: no more entities to search for.
+    return $related;
 }
 
 /**
@@ -138,57 +138,57 @@ 
  */
 function wl_shortcode_chord_get_graph( $data ) {
 
-	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
-
-		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
-
-			return $item;
-		}
-
-		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
-
-		// The following log may create a circular loop.
-		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
-
-		// TODO: get all images
-		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
-			}
-		}
-
-		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
-			'label'      => $post->post_title,
-			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
-		);
-
-		$item = $entity;
-	} );
-
-	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
-		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
-		);
-
-		$item = $relation;
-	} );
-
-	// Return the JSON representation.
-	return $data;
+    // Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
+    array_walk( $data['entities'], function ( &$item ) {
+        $post = get_post( $item );
+
+        // Skip non-existing posts.
+        if ( is_null( $post ) ) {
+            wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+
+            return $item;
+        }
+
+        // Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
+        $term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+
+        // The following log may create a circular loop.
+        // wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
+
+        // TODO: get all images
+        $thumbnail    = null;
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
+            $attachment = wp_get_attachment_image_src( $thumbnail_id );
+            if ( false !== $attachment ) {
+                $thumbnail = esc_attr( $attachment[0] );
+            }
+        }
+
+        $entity = array(
+            'uri'        => wl_get_entity_uri( $item ),
+            'url'        => get_permalink( $item ),
+            'label'      => $post->post_title,
+            'type'       => $post->post_type,
+            'thumbnails' => array( $thumbnail ),
+            'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+        );
+
+        $item = $entity;
+    } );
+
+    // Refactor the relations.
+    array_walk( $data['relations'], function ( &$item ) {
+        $relation = array(
+            's' => wl_get_entity_uri( $item[0] ),
+            'o' => wl_get_entity_uri( $item[1] ),
+        );
+
+        $item = $relation;
+    } );
+
+    // Return the JSON representation.
+    return $data;
 }
 
 /**
@@ -199,13 +199,13 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	$post_id = $_REQUEST['post_id'];
-	$depth   = $_REQUEST['depth'];
+    $post_id = $_REQUEST['post_id'];
+    $depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+    $relations = wl_shortcode_chord_get_relations( $post_id, $depth );
+    $graph     = wl_shortcode_chord_get_graph( $relations );
 
-	wl_core_send_json( $graph );
+    wl_core_send_json( $graph );
 }
 
 add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
@@ -216,42 +216,42 @@ 
  */
 add_action( 'init', function () {
 
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type( 'wordlift/chord', array(
-		'editor_script'   => 'wl-block-editor',
-		'render_callback' => function ( $attributes ) {
-			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
-			}
-
-			return '[wl_chord ' . $attr_code . ']';
-		},
-		'attributes'      => array(
-			'width'      => array(
-				'type'    => 'string',
-				'default' => '100%',
-			),
-			'height'     => array(
-				'type'    => 'string',
-				'default' => '500px',
-			),
-			'main_color' => array(
-				'type'    => 'string',
-				'default' => '000',
-			),
-			'depth'      => array(
-				'type'    => 'number',
-				'default' => 2,
-			),
-			'global'     => array(
-				'type'    => 'bool',
-				'default' => false,
-			),
-		),
-	) );
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type( 'wordlift/chord', array(
+        'editor_script'   => 'wl-block-editor',
+        'render_callback' => function ( $attributes ) {
+            $attr_code = '';
+            foreach ( $attributes as $key => $value ) {
+                $attr_code .= $key . '="' . $value . '" ';
+            }
+
+            return '[wl_chord ' . $attr_code . ']';
+        },
+        'attributes'      => array(
+            'width'      => array(
+                'type'    => 'string',
+                'default' => '100%',
+            ),
+            'height'     => array(
+                'type'    => 'string',
+                'default' => '500px',
+            ),
+            'main_color' => array(
+                'type'    => 'string',
+                'default' => '000',
+            ),
+            'depth'      => array(
+                'type'    => 'number',
+                'default' => 2,
+            ),
+            'global'     => array(
+                'type'    => 'bool',
+                'default' => false,
+            ),
+        ),
+    ) );
 } );

Spacing +59 added lines, -60 removed lines

@@ -17,7 +17,7 @@ 
 function wl_shortcode_chord_most_referenced_entity_id() {
 	// Get the last 20 articles by post date.
 	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
+	$post_ids = get_posts(array(
 		'numberposts' => 20,
 		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
 		'fields'      => 'ids', // Only get post IDs.
@@ -36,21 +36,21 @@ 
 		),
 		'orderby'     => 'post_date',
 		'order'       => 'DESC',
-	) );
+	));
 
-	if ( empty( $post_ids ) ) {
+	if (empty($post_ids)) {
 		return null;
 	}
 
 	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+	foreach ($post_ids as $id) {
+		$entities = array_merge($entities, wl_core_get_related_entity_ids($id));
 	}
 
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
+	$famous_entities = array_count_values($entities);
+	arsort($famous_entities);
+	if (sizeof($famous_entities) >= 1) {
+		return key($famous_entities);
 	} else {
 		return $post_ids[0];
 	}
@@ -69,57 +69,56 @@ 
  * @uses wl_core_get_related_post_ids() to get the list of post ids that reference an entity.
  *
  */
-function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
+function wl_shortcode_chord_get_relations($entity_id, $depth = 2, $related = null, $max_size = 9) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
+	if ( ! is_null($related)) {
+		if (0 === $depth) {
 			return $related;
 		}
 	}
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+	wl_write_log("wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: ".(is_null($related) ? 'yes' : 'no')." ]");
 
 	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
+	if (is_null($related)) {
 		$related = array(
-			'entities'  => array( $entity_id ),
+			'entities'  => array($entity_id),
 			'relations' => array(),
 		);
 	}
 
 	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+	$related_entity_ids = wl_core_get_related_entity_ids($entity_id, array(
 		'status' => 'publish',
-	) );
+	));
 
 	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
+	$related_post_ids = (Wordlift_Entity_Service::get_instance()
+	                                             ->is_entity($entity_id)) ?
+		wl_core_get_related_post_ids($entity_id, array(
 			'status' => 'publish',
-		) ) :
-		array();
+		)) : array();
 
 	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+	$related_ids = array_unique(array_merge($related_post_ids, $related_entity_ids));
 
 	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+	shuffle($related_ids);
 
 	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+	foreach ($related_ids as $related_id) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
+		if (count($related['entities']) >= $max_size) {
 			return $related;
 		}
 
-		$related['relations'][] = array( $entity_id, $related_id );
+		$related['relations'][] = array($entity_id, $related_id);
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
+		if ( ! in_array($related_id, $related['entities'])) {
 			// Found new related entity!
 			$related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+			$related = wl_shortcode_chord_get_relations($related_id, ($depth - 1), $related, $max_size);
 		}
 	}
 
@@ -136,52 +135,52 @@ 
  *
  * @return mixed|string
  */
-function wl_shortcode_chord_get_graph( $data ) {
+function wl_shortcode_chord_get_graph($data) {
 
 	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
+	array_walk($data['entities'], function(&$item) {
+		$post = get_post($item);
 
 		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+		if (is_null($post)) {
+			wl_write_log("wl_shortcode_chord_get_graph : post not found [ post id :: $item ]");
 
 			return $item;
 		}
 
 		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+		$term = Wordlift_Entity_Type_Service::get_instance()->get($item);
 
 		// The following log may create a circular loop.
 		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
 
 		// TODO: get all images
 		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id && 0 !== $thumbnail_id) {
+			$attachment = wp_get_attachment_image_src($thumbnail_id);
+			if (false !== $attachment) {
+				$thumbnail = esc_attr($attachment[0]);
 			}
 		}
 
 		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
+			'uri'        => wl_get_entity_uri($item),
+			'url'        => get_permalink($item),
 			'label'      => $post->post_title,
 			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+			'thumbnails' => array($thumbnail),
+			'css_class'  => (isset($term['css_class']) ? $term['css_class'] : ''),
 		);
 
 		$item = $entity;
 	} );
 
 	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
+	array_walk($data['relations'], function(&$item) {
 		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
+			's' => wl_get_entity_uri($item[0]),
+			'o' => wl_get_entity_uri($item[1]),
 		);
 
 		$item = $relation;
@@ -202,34 +201,34 @@ 
 	$post_id = $_REQUEST['post_id'];
 	$depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+	$relations = wl_shortcode_chord_get_relations($post_id, $depth);
+	$graph     = wl_shortcode_chord_get_graph($relations);
 
-	wl_core_send_json( $graph );
+	wl_core_send_json($graph);
 }
 
-add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
-add_action( 'wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax' );
+add_action('wp_ajax_wl_chord', 'wl_shortcode_chord_ajax');
+add_action('wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax');
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function () {
+add_action('init', function() {
 
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
-	register_block_type( 'wordlift/chord', array(
+	register_block_type('wordlift/chord', array(
 		'editor_script'   => 'wl-block-editor',
-		'render_callback' => function ( $attributes ) {
+		'render_callback' => function($attributes) {
 			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
+			foreach ($attributes as $key => $value) {
+				$attr_code .= $key.'="'.$value.'" ';
 			}
 
-			return '[wl_chord ' . $attr_code . ']';
+			return '[wl_chord '.$attr_code.']';
 		},
 		'attributes'      => array(
 			'width'      => array(
@@ -253,5 +252,5 @@ 
 				'default' => false,
 			),
 		),
-	) );
+	));
 } );

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

Indentation +314 added lines, -314 removed lines

@@ -18,320 +18,320 @@
 
 class Post_Adapter {
 
-	/**
-	 * A {@link Wordlift_Log_Service} logging instance.
-	 *
-	 * @access private
-	 * @var \Wordlift_Log_Service A {@link Wordlift_Log_Service} logging instance.
-	 */
-	private $log;
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @access private
-	 * @var \Wordlift_Entity_Service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Entity_Store} instance.
-	 *
-	 * @access private
-	 * @var Entity_Store $entity_store A {@link Entity_Store} instance.
-	 */
-	private $entity_store;
-
-	public function __construct() {
-
-		// Bail out if block editor's functions aren't available.
-		if ( ! function_exists( 'register_block_type' ) || ! function_exists( 'parse_blocks' ) ) {
-			return;
-		}
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->entity_service = \Wordlift_Entity_Service::get_instance();
-		$this->entity_store   = Entity_Store::get_instance();
-
-		add_action( 'init', array( $this, 'init' ) );
-		add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
-
-	}
-
-	/**
-	 * Initialize by registering our block type `wordlift/classification`, required for {@link parse_blocks) to work
-	 * correctly.
-	 */
-	public function init() {
-
-		register_block_type( 'wordlift/classification', array(
-			'editor_script' => 'wl-block-editor',
-			'attributes'    => array(
-				'entities' => array( 'type' => 'array' ),
-			),
-		) );
-
-	}
-
-	/**
-	 * A sample structure:
-	 *
-	 * {
-	 *   "entities": [
-	 *     {
-	 *       "annotations": {
-	 *         "urn:enhancement-7e8e66fc": {
-	 *           "start": 3480,
-	 *           "end": 3486,
-	 *           "text": "libero"
-	 *         }
-	 *       },
-	 *       "description": "Le libero ou libéro est un poste défensif du volley-ball. Des règles particulières le concernant ont été introduites à la fin des années 1990. De par sa spécificité, le libéro a un statut à part au sein d’une équipe de volley-ball. Pour être identifié, il doit porter un uniforme qui contraste avec ceux des autres membres de son équipe, titulaires ou remplaçants.",
-	 *       "id": "http://fr.dbpedia.org/resource/Libero_(volley-ball)",
-	 *       "label": "Libero (volley-ball)",
-	 *       "mainType": "other",
-	 *       "occurrences": ["urn:enhancement-7e8e66fc"],
-	 *       "sameAs": null,
-	 *       "synonyms": [],
-	 *       "types": ["other"]
-	 *     }
-	 *   ]
-	 * }
-	 *
-	 * @param array $data An array of slashed post data.
-	 * @param array $postarr An array of sanitized, but otherwise unmodified post data.
-	 *
-	 * @return array The data array.
-	 * @throws \Exception
-	 */
-	public function wp_insert_post_data( $data, $postarr ) {
-
-		$this->log->trace( "The following data has been received by `wp_insert_post_data`:\n"
-		                   . var_export( $data, true ) );
-
-		try {
-			$entities = $this->parse_content( wp_unslash( $data['post_content'] ) );
-
-			foreach ( $entities as $entity ) {
-				$this->create_or_update_entity( $entity, $data['post_status'] );
-			}
-
-		} catch ( \Exception $e ) {
-			$this->log->error( $e->getMessage() );
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Parse the post content to find the `wordlift/classification` block and return the entities' data.
-	 *
-	 * @param string $post_content The post content.
-	 *
-	 * @return array An array of entities' structures.
-	 * @throws \Exception
-	 */
-	private function parse_content( $post_content ) {
-
-		$all_blocks = parse_blocks( $post_content );
-		$this->log->trace( "The following blocks have been parsed while in `wp_insert_post`:\n"
-		                   . var_export( $all_blocks, true ) );
-
-		$blocks = array_filter( $all_blocks, function ( $item ) {
-			return ! empty( $item['blockName'] ) && 'wordlift/classification' === $item['blockName'];
-		} );
-
-		// Bail out if the blocks' array is empty.
-		if ( empty( $blocks ) ) {
-			return array();
-		}
-
-		$block = current( $blocks );
-		$this->log->trace( "The following block has been found while in `wp_insert_post`:\n"
-		                   . var_export( $block, true ) );
-
-		// Bail out if the entities array is empty.
-		if ( empty( $block['attrs'] ) && empty( $block['attrs']['entities'] ) ) {
-			return array();
-		}
-
-		return $block['attrs']['entities'];
-	}
-
-	/**
-	 * Collect entity labels from the entity array.
-	 *
-	 * This function expects an array with the following keys:
-	 *
-	 * array(
-	 *   'label'       => ...,
-	 *   'synonyms'    => array( ... ),
-	 *   'annotations' => array(
-	 *     ...id...      => array( text => ... ),
-	 *   ),
-	 *   'occurrences' => array( ... ),
-	 * )
-	 *
-	 * and it is going to output an array with all the labels, keeping the `label` at first position:
-	 *
-	 * array(
-	 *   ...label...,
-	 *   ...synonyms...,
-	 *   ...texts...,
-	 * )
-	 *
-	 * This function is going to collect the label from the `label` property, from the `synonyms` property and from
-	 * `annotations` property. Since the `annotations` property contains all the annotations including those that
-	 * haven't been selected, this function is going to only get the `text` for the annotations property listed in
-	 * `occurrences`.
-	 *
-	 * @param array $entity {
-	 *  The entity data.
-	 *
-	 * @type string $label The entity label.
-	 * @type array $synonyms The entity synonyms.
-	 * @type array $occurrences The selected occurrences.
-	 * @type array $annotations The annotations.
-	 * }
-	 *
-	 * @return array An array of labels.
-	 */
-	public function get_labels( $entity ) {
-
-		$args = wp_parse_args( $entity, array(
-			'label'       => array(),
-			'synonyms'    => array(),
-			'annotations' => array(),
-			'occurrences' => array(),
-		) );
-
-		// We gather all the labels, occurrences texts and synonyms into one array.
-		$initial = array_merge(
-			(array) $args['label'],
-			(array) $args['synonyms']
-		);
-
-		$annotations = $args['annotations'];
-
-		return array_reduce( $args['occurrences'], function ( $carry, $item ) use ( $annotations ) {
-
-			// Bail out if occurrences->$item->text isn't set or its contents are already
-			// in `$carry`.
-			if ( ! isset( $annotations[ $item ]['text'] )
-			     || in_array( $annotations[ $item ]['text'], $carry ) ) {
-				return $carry;
-			}
-
-			// Push the label.
-			$carry[] = $annotations[ $item ]['text'];
-
-			return $carry;
-		}, $initial );
-	}
-
-	/**
-	 * Create or update the entity.
-	 *
-	 * An entity lookup is performed on the local vocabulary using the `id` and `sameAs` URIs. If an entity is found
-	 * the {@link Entity_Store} update function is called to update the `labels` and the `sameAs` values.
-	 *
-	 * If an entity is not found the {@link Entity_Store} create function is called to create a new entity.
-	 *
-	 * @param array $entity {
-	 * The entity parameters.
-	 *
-	 * @type string The entity item id URI.
-	 * @type string|array The entity sameAs URI(s).
-	 * @type string $description The entity description.
-	 * }
-	 *
-	 * @param       $string $post_status The post status, default 'draft'.
-	 *
-	 * @return int|\WP_Error
-	 * @throws \Exception
-	 */
-	private function create_or_update_entity( $entity, $post_status = 'draft' ) {
-
-		// Get only valid IDs.
-		$ids = array_filter( (array) $entity['id'], function ( $id ) {
-			return preg_match( '|^https?://|', $id );
-		} );
-
-		$uris = array_merge(
-			(array) $ids,
-			(array) $entity['sameAs']
-		);
-
-		$post = $this->get_first_matching_entity_by_uri( $uris );
-
-		$this->log->trace( 'Entity' . ( empty( $post ) ? ' not' : '' ) . " found with the following URIs:\n"
-		                   . var_export( $uris, true ) );
-
-		// Get the labels.
-		$labels = $this->get_labels( $entity );
-
-		if ( empty( $post ) ) {
-			// Create the entity if it doesn't exist.
-			$post_id = $this->entity_store->create( array(
-				'labels'      => $labels,
-				'description' => $entity['description'],
-				'same_as'     => $uris,
-			), $post_status );
-
-			// Return the WP_Error if we got one.
-			if ( is_wp_error( $post_id ) ) {
-				return $post_id;
-			}
-
-			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_set_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			}
-
-			if ( isset( $entity['properties'] ) && isset( $entity['properties']['latitude'] ) && isset( $entity['properties']['longitude'] ) ) {
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude'] );
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude'] );
-			}
-		} else {
-			// Update the entity otherwise.
-			$post_id = $this->entity_store->update( array(
-				'ID'      => $post->ID,
-				'labels'  => $labels,
-				'same_as' => $uris,
-			) );
-
-			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_add_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			}
-		}
-
-		return $post_id;
-	}
-
-	/**
-	 * Get the first matching entity for the provided URI array.
-	 *
-	 * Entities IDs and sameAs are searched.
-	 *
-	 * @param array $uris An array of URIs.
-	 *
-	 * @return \WP_Post|null The entity WP_Post if found or null if not found.
-	 */
-	private function get_first_matching_entity_by_uri( $uris ) {
-
-		foreach ( $uris as $uri ) {
-			$existing_entity = $this->entity_service->get_entity_post_by_uri( $uri );
-			if ( isset( $existing_entity ) ) {
-				return $existing_entity;
-			}
-		}
-
-		return null;
-	}
-
-	//	/**
+    /**
+     * A {@link Wordlift_Log_Service} logging instance.
+     *
+     * @access private
+     * @var \Wordlift_Log_Service A {@link Wordlift_Log_Service} logging instance.
+     */
+    private $log;
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @access private
+     * @var \Wordlift_Entity_Service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Entity_Store} instance.
+     *
+     * @access private
+     * @var Entity_Store $entity_store A {@link Entity_Store} instance.
+     */
+    private $entity_store;
+
+    public function __construct() {
+
+        // Bail out if block editor's functions aren't available.
+        if ( ! function_exists( 'register_block_type' ) || ! function_exists( 'parse_blocks' ) ) {
+            return;
+        }
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->entity_service = \Wordlift_Entity_Service::get_instance();
+        $this->entity_store   = Entity_Store::get_instance();
+
+        add_action( 'init', array( $this, 'init' ) );
+        add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
+
+    }
+
+    /**
+     * Initialize by registering our block type `wordlift/classification`, required for {@link parse_blocks) to work
+     * correctly.
+     */
+    public function init() {
+
+        register_block_type( 'wordlift/classification', array(
+            'editor_script' => 'wl-block-editor',
+            'attributes'    => array(
+                'entities' => array( 'type' => 'array' ),
+            ),
+        ) );
+
+    }
+
+    /**
+     * A sample structure:
+     *
+     * {
+     *   "entities": [
+     *     {
+     *       "annotations": {
+     *         "urn:enhancement-7e8e66fc": {
+     *           "start": 3480,
+     *           "end": 3486,
+     *           "text": "libero"
+     *         }
+     *       },
+     *       "description": "Le libero ou libéro est un poste défensif du volley-ball. Des règles particulières le concernant ont été introduites à la fin des années 1990. De par sa spécificité, le libéro a un statut à part au sein d’une équipe de volley-ball. Pour être identifié, il doit porter un uniforme qui contraste avec ceux des autres membres de son équipe, titulaires ou remplaçants.",
+     *       "id": "http://fr.dbpedia.org/resource/Libero_(volley-ball)",
+     *       "label": "Libero (volley-ball)",
+     *       "mainType": "other",
+     *       "occurrences": ["urn:enhancement-7e8e66fc"],
+     *       "sameAs": null,
+     *       "synonyms": [],
+     *       "types": ["other"]
+     *     }
+     *   ]
+     * }
+     *
+     * @param array $data An array of slashed post data.
+     * @param array $postarr An array of sanitized, but otherwise unmodified post data.
+     *
+     * @return array The data array.
+     * @throws \Exception
+     */
+    public function wp_insert_post_data( $data, $postarr ) {
+
+        $this->log->trace( "The following data has been received by `wp_insert_post_data`:\n"
+                            . var_export( $data, true ) );
+
+        try {
+            $entities = $this->parse_content( wp_unslash( $data['post_content'] ) );
+
+            foreach ( $entities as $entity ) {
+                $this->create_or_update_entity( $entity, $data['post_status'] );
+            }
+
+        } catch ( \Exception $e ) {
+            $this->log->error( $e->getMessage() );
+        }
+
+        return $data;
+    }
+
+    /**
+     * Parse the post content to find the `wordlift/classification` block and return the entities' data.
+     *
+     * @param string $post_content The post content.
+     *
+     * @return array An array of entities' structures.
+     * @throws \Exception
+     */
+    private function parse_content( $post_content ) {
+
+        $all_blocks = parse_blocks( $post_content );
+        $this->log->trace( "The following blocks have been parsed while in `wp_insert_post`:\n"
+                            . var_export( $all_blocks, true ) );
+
+        $blocks = array_filter( $all_blocks, function ( $item ) {
+            return ! empty( $item['blockName'] ) && 'wordlift/classification' === $item['blockName'];
+        } );
+
+        // Bail out if the blocks' array is empty.
+        if ( empty( $blocks ) ) {
+            return array();
+        }
+
+        $block = current( $blocks );
+        $this->log->trace( "The following block has been found while in `wp_insert_post`:\n"
+                            . var_export( $block, true ) );
+
+        // Bail out if the entities array is empty.
+        if ( empty( $block['attrs'] ) && empty( $block['attrs']['entities'] ) ) {
+            return array();
+        }
+
+        return $block['attrs']['entities'];
+    }
+
+    /**
+     * Collect entity labels from the entity array.
+     *
+     * This function expects an array with the following keys:
+     *
+     * array(
+     *   'label'       => ...,
+     *   'synonyms'    => array( ... ),
+     *   'annotations' => array(
+     *     ...id...      => array( text => ... ),
+     *   ),
+     *   'occurrences' => array( ... ),
+     * )
+     *
+     * and it is going to output an array with all the labels, keeping the `label` at first position:
+     *
+     * array(
+     *   ...label...,
+     *   ...synonyms...,
+     *   ...texts...,
+     * )
+     *
+     * This function is going to collect the label from the `label` property, from the `synonyms` property and from
+     * `annotations` property. Since the `annotations` property contains all the annotations including those that
+     * haven't been selected, this function is going to only get the `text` for the annotations property listed in
+     * `occurrences`.
+     *
+     * @param array $entity {
+     *  The entity data.
+     *
+     * @type string $label The entity label.
+     * @type array $synonyms The entity synonyms.
+     * @type array $occurrences The selected occurrences.
+     * @type array $annotations The annotations.
+     * }
+     *
+     * @return array An array of labels.
+     */
+    public function get_labels( $entity ) {
+
+        $args = wp_parse_args( $entity, array(
+            'label'       => array(),
+            'synonyms'    => array(),
+            'annotations' => array(),
+            'occurrences' => array(),
+        ) );
+
+        // We gather all the labels, occurrences texts and synonyms into one array.
+        $initial = array_merge(
+            (array) $args['label'],
+            (array) $args['synonyms']
+        );
+
+        $annotations = $args['annotations'];
+
+        return array_reduce( $args['occurrences'], function ( $carry, $item ) use ( $annotations ) {
+
+            // Bail out if occurrences->$item->text isn't set or its contents are already
+            // in `$carry`.
+            if ( ! isset( $annotations[ $item ]['text'] )
+                 || in_array( $annotations[ $item ]['text'], $carry ) ) {
+                return $carry;
+            }
+
+            // Push the label.
+            $carry[] = $annotations[ $item ]['text'];
+
+            return $carry;
+        }, $initial );
+    }
+
+    /**
+     * Create or update the entity.
+     *
+     * An entity lookup is performed on the local vocabulary using the `id` and `sameAs` URIs. If an entity is found
+     * the {@link Entity_Store} update function is called to update the `labels` and the `sameAs` values.
+     *
+     * If an entity is not found the {@link Entity_Store} create function is called to create a new entity.
+     *
+     * @param array $entity {
+     * The entity parameters.
+     *
+     * @type string The entity item id URI.
+     * @type string|array The entity sameAs URI(s).
+     * @type string $description The entity description.
+     * }
+     *
+     * @param       $string $post_status The post status, default 'draft'.
+     *
+     * @return int|\WP_Error
+     * @throws \Exception
+     */
+    private function create_or_update_entity( $entity, $post_status = 'draft' ) {
+
+        // Get only valid IDs.
+        $ids = array_filter( (array) $entity['id'], function ( $id ) {
+            return preg_match( '|^https?://|', $id );
+        } );
+
+        $uris = array_merge(
+            (array) $ids,
+            (array) $entity['sameAs']
+        );
+
+        $post = $this->get_first_matching_entity_by_uri( $uris );
+
+        $this->log->trace( 'Entity' . ( empty( $post ) ? ' not' : '' ) . " found with the following URIs:\n"
+                            . var_export( $uris, true ) );
+
+        // Get the labels.
+        $labels = $this->get_labels( $entity );
+
+        if ( empty( $post ) ) {
+            // Create the entity if it doesn't exist.
+            $post_id = $this->entity_store->create( array(
+                'labels'      => $labels,
+                'description' => $entity['description'],
+                'same_as'     => $uris,
+            ), $post_status );
+
+            // Return the WP_Error if we got one.
+            if ( is_wp_error( $post_id ) ) {
+                return $post_id;
+            }
+
+            // Add the entity type.
+            if ( isset( $entity['mainType'] ) ) {
+                wp_set_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            }
+
+            if ( isset( $entity['properties'] ) && isset( $entity['properties']['latitude'] ) && isset( $entity['properties']['longitude'] ) ) {
+                add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude'] );
+                add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude'] );
+            }
+        } else {
+            // Update the entity otherwise.
+            $post_id = $this->entity_store->update( array(
+                'ID'      => $post->ID,
+                'labels'  => $labels,
+                'same_as' => $uris,
+            ) );
+
+            // Add the entity type.
+            if ( isset( $entity['mainType'] ) ) {
+                wp_add_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            }
+        }
+
+        return $post_id;
+    }
+
+    /**
+     * Get the first matching entity for the provided URI array.
+     *
+     * Entities IDs and sameAs are searched.
+     *
+     * @param array $uris An array of URIs.
+     *
+     * @return \WP_Post|null The entity WP_Post if found or null if not found.
+     */
+    private function get_first_matching_entity_by_uri( $uris ) {
+
+        foreach ( $uris as $uri ) {
+            $existing_entity = $this->entity_service->get_entity_post_by_uri( $uri );
+            if ( isset( $existing_entity ) ) {
+                return $existing_entity;
+            }
+        }
+
+        return null;
+    }
+
+    //	/**
 //	 * @param int      $post_ID Post ID.
 //	 * @param \WP_Post $post Post object.
 //	 * @param bool     $update Whether this is an existing post being updated or not.

Spacing +58 added lines, -58 removed lines

@@ -45,17 +45,17 @@ 
 	public function __construct() {
 
 		// Bail out if block editor's functions aren't available.
-		if ( ! function_exists( 'register_block_type' ) || ! function_exists( 'parse_blocks' ) ) {
+		if ( ! function_exists('register_block_type') || ! function_exists('parse_blocks')) {
 			return;
 		}
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 		$this->entity_service = \Wordlift_Entity_Service::get_instance();
 		$this->entity_store   = Entity_Store::get_instance();
 
-		add_action( 'init', array( $this, 'init' ) );
-		add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
+		add_action('init', array($this, 'init'));
+		add_filter('wp_insert_post_data', array($this, 'wp_insert_post_data'), 10, 2);
 
 	}
 
@@ -65,12 +65,12 @@ 
 	 */
 	public function init() {
 
-		register_block_type( 'wordlift/classification', array(
+		register_block_type('wordlift/classification', array(
 			'editor_script' => 'wl-block-editor',
 			'attributes'    => array(
-				'entities' => array( 'type' => 'array' ),
+				'entities' => array('type' => 'array'),
 			),
-		) );
+		));
 
 	}
 
@@ -105,20 +105,20 @@ 
 	 * @return array The data array.
 	 * @throws \Exception
 	 */
-	public function wp_insert_post_data( $data, $postarr ) {
+	public function wp_insert_post_data($data, $postarr) {
 
-		$this->log->trace( "The following data has been received by `wp_insert_post_data`:\n"
-		                   . var_export( $data, true ) );
+		$this->log->trace("The following data has been received by `wp_insert_post_data`:\n"
+		                   . var_export($data, true));
 
 		try {
-			$entities = $this->parse_content( wp_unslash( $data['post_content'] ) );
+			$entities = $this->parse_content(wp_unslash($data['post_content']));
 
-			foreach ( $entities as $entity ) {
-				$this->create_or_update_entity( $entity, $data['post_status'] );
+			foreach ($entities as $entity) {
+				$this->create_or_update_entity($entity, $data['post_status']);
 			}
 
-		} catch ( \Exception $e ) {
-			$this->log->error( $e->getMessage() );
+		} catch (\Exception $e) {
+			$this->log->error($e->getMessage());
 		}
 
 		return $data;
@@ -132,27 +132,27 @@ 
 	 * @return array An array of entities' structures.
 	 * @throws \Exception
 	 */
-	private function parse_content( $post_content ) {
+	private function parse_content($post_content) {
 
-		$all_blocks = parse_blocks( $post_content );
-		$this->log->trace( "The following blocks have been parsed while in `wp_insert_post`:\n"
-		                   . var_export( $all_blocks, true ) );
+		$all_blocks = parse_blocks($post_content);
+		$this->log->trace("The following blocks have been parsed while in `wp_insert_post`:\n"
+		                   . var_export($all_blocks, true));
 
-		$blocks = array_filter( $all_blocks, function ( $item ) {
-			return ! empty( $item['blockName'] ) && 'wordlift/classification' === $item['blockName'];
+		$blocks = array_filter($all_blocks, function($item) {
+			return ! empty($item['blockName']) && 'wordlift/classification' === $item['blockName'];
 		} );
 
 		// Bail out if the blocks' array is empty.
-		if ( empty( $blocks ) ) {
+		if (empty($blocks)) {
 			return array();
 		}
 
-		$block = current( $blocks );
-		$this->log->trace( "The following block has been found while in `wp_insert_post`:\n"
-		                   . var_export( $block, true ) );
+		$block = current($blocks);
+		$this->log->trace("The following block has been found while in `wp_insert_post`:\n"
+		                   . var_export($block, true));
 
 		// Bail out if the entities array is empty.
-		if ( empty( $block['attrs'] ) && empty( $block['attrs']['entities'] ) ) {
+		if (empty($block['attrs']) && empty($block['attrs']['entities'])) {
 			return array();
 		}
 
@@ -197,14 +197,14 @@ 
 	 *
 	 * @return array An array of labels.
 	 */
-	public function get_labels( $entity ) {
+	public function get_labels($entity) {
 
-		$args = wp_parse_args( $entity, array(
+		$args = wp_parse_args($entity, array(
 			'label'       => array(),
 			'synonyms'    => array(),
 			'annotations' => array(),
 			'occurrences' => array(),
-		) );
+		));
 
 		// We gather all the labels, occurrences texts and synonyms into one array.
 		$initial = array_merge(
@@ -214,20 +214,20 @@ 
 
 		$annotations = $args['annotations'];
 
-		return array_reduce( $args['occurrences'], function ( $carry, $item ) use ( $annotations ) {
+		return array_reduce($args['occurrences'], function($carry, $item) use ($annotations) {
 
 			// Bail out if occurrences->$item->text isn't set or its contents are already
 			// in `$carry`.
-			if ( ! isset( $annotations[ $item ]['text'] )
-			     || in_array( $annotations[ $item ]['text'], $carry ) ) {
+			if ( ! isset($annotations[$item]['text'])
+			     || in_array($annotations[$item]['text'], $carry)) {
 				return $carry;
 			}
 
 			// Push the label.
-			$carry[] = $annotations[ $item ]['text'];
+			$carry[] = $annotations[$item]['text'];
 
 			return $carry;
-		}, $initial );
+		}, $initial);
 	}
 
 	/**
@@ -251,11 +251,11 @@ 
 	 * @return int|\WP_Error
 	 * @throws \Exception
 	 */
-	private function create_or_update_entity( $entity, $post_status = 'draft' ) {
+	private function create_or_update_entity($entity, $post_status = 'draft') {
 
 		// Get only valid IDs.
-		$ids = array_filter( (array) $entity['id'], function ( $id ) {
-			return preg_match( '|^https?://|', $id );
+		$ids = array_filter((array) $entity['id'], function($id) {
+			return preg_match('|^https?://|', $id);
 		} );
 
 		$uris = array_merge(
@@ -263,47 +263,47 @@ 
 			(array) $entity['sameAs']
 		);
 
-		$post = $this->get_first_matching_entity_by_uri( $uris );
+		$post = $this->get_first_matching_entity_by_uri($uris);
 
-		$this->log->trace( 'Entity' . ( empty( $post ) ? ' not' : '' ) . " found with the following URIs:\n"
-		                   . var_export( $uris, true ) );
+		$this->log->trace('Entity'.(empty($post) ? ' not' : '')." found with the following URIs:\n"
+		                   . var_export($uris, true));
 
 		// Get the labels.
-		$labels = $this->get_labels( $entity );
+		$labels = $this->get_labels($entity);
 
-		if ( empty( $post ) ) {
+		if (empty($post)) {
 			// Create the entity if it doesn't exist.
-			$post_id = $this->entity_store->create( array(
+			$post_id = $this->entity_store->create(array(
 				'labels'      => $labels,
 				'description' => $entity['description'],
 				'same_as'     => $uris,
-			), $post_status );
+			), $post_status);
 
 			// Return the WP_Error if we got one.
-			if ( is_wp_error( $post_id ) ) {
+			if (is_wp_error($post_id)) {
 				return $post_id;
 			}
 
 			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_set_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			if (isset($entity['mainType'])) {
+				wp_set_object_terms($post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 			}
 
-			if ( isset( $entity['properties'] ) && isset( $entity['properties']['latitude'] ) && isset( $entity['properties']['longitude'] ) ) {
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude'] );
-				add_post_meta( $post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude'] );
+			if (isset($entity['properties']) && isset($entity['properties']['latitude']) && isset($entity['properties']['longitude'])) {
+				add_post_meta($post_id, \Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $entity['properties']['latitude']);
+				add_post_meta($post_id, \Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $entity['properties']['longitude']);
 			}
 		} else {
 			// Update the entity otherwise.
-			$post_id = $this->entity_store->update( array(
+			$post_id = $this->entity_store->update(array(
 				'ID'      => $post->ID,
 				'labels'  => $labels,
 				'same_as' => $uris,
-			) );
+			));
 
 			// Add the entity type.
-			if ( isset( $entity['mainType'] ) ) {
-				wp_add_object_terms( $post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			if (isset($entity['mainType'])) {
+				wp_add_object_terms($post_id, $entity['mainType'], \Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 			}
 		}
 
@@ -319,11 +319,11 @@ 
 	 *
 	 * @return \WP_Post|null The entity WP_Post if found or null if not found.
 	 */
-	private function get_first_matching_entity_by_uri( $uris ) {
+	private function get_first_matching_entity_by_uri($uris) {
 
-		foreach ( $uris as $uri ) {
-			$existing_entity = $this->entity_service->get_entity_post_by_uri( $uri );
-			if ( isset( $existing_entity ) ) {
+		foreach ($uris as $uri) {
+			$existing_entity = $this->entity_service->get_entity_post_by_uri($uri);
+			if (isset($existing_entity)) {
 				return $existing_entity;
 			}
 		}

src/public/class-wordlift-context-cards.php

Doc Comments +5 added lines

@@ -104,6 +104,11 @@
 		}
 	}
 
+	/**
+	 * @param string $url
+	 *
+	 * @return integer|null
+	 */
 	static function url_to_postid( $url ) {
 		// Try with url_to_postid
 		$post_id = url_to_postid( $url );

Indentation +108 added lines, -108 removed lines

@@ -9,113 +9,113 @@
 
 class Wordlift_Context_Cards_Service {
 
-	/**
-	 * @var string
-	 */
-	private $endpoint;
-	private $jsonld_endpoint;
-
-	function __construct() {
-
-		$this->endpoint        = '/context-card';
-		$this->jsonld_endpoint = '/jsonld';
-
-		// PHP 5.3 compatibility as `$this` cannot be used in closures.
-		$that = $this;
-
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
-				'methods'  => 'GET',
-				'callback' => array( $that, 'context_data' ),
-			) );
-		} );
-
-	}
-
-	function format_response( $jsonld, $publisher = true ) {
-
-		$response = array();
-
-		if ( ! isset( $jsonld ) || empty( $jsonld ) || empty( $jsonld[0] ) ) {
-			return null;
-		}
-
-		if ( isset( $jsonld[0]['description'] ) && ! empty( $jsonld[0]['description'] ) ) {
-			if ( isset( $jsonld[0]['name'] ) && ! empty( $jsonld[0]['name'] ) ) {
-				$title                   = $jsonld[0]['name'];
-				$pos                     = strpos( $jsonld[0]['description'], $title );
-				$response['description'] = $jsonld[0]['description'];
-				if ( $pos !== false ) {
-					$response['description'] = substr_replace( $response['description'], "<strong>$title</strong>", $pos, strlen( $title ) );
-				}
-			} else {
-				$response['description'] = $jsonld[0]['description'];
-			}
-		}
-
-		if ( isset( $jsonld[0]['name'] ) && ! empty( $jsonld[0]['name'] ) ) {
-			$response['title'] = $jsonld[0]['name'];
-		}
-
-		if ( isset( $jsonld[0]['url'] ) && ! empty( $jsonld[0]['url'] ) ) {
-			$response['url'] = $jsonld[0]['url'];
-		}
-
-		if ( isset( $jsonld[0]['image'] ) &&
-		     isset( $jsonld[0]['image'][0]['url'] ) &&
-		     isset( $jsonld[0]['image'][0]['width'] ) &&
-		     isset( $jsonld[0]['image'][0]['height'] )
-		) {
-			$response['image'] = array(
-				'url'    => $jsonld[0]['image'][0]['url'],
-				'width'  => $jsonld[0]['image'][0]['width'],
-				'height' => $jsonld[0]['image'][0]['height'],
-			);
-		}
-
-		if ( $publisher ) {
-			$publisher_id          = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-			$publisher_jsonld      = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $publisher_id );
-			$response['publisher'] = $this->format_response( $publisher_jsonld, false );
-		}
-
-		return $response;
-	}
-
-	public function context_data( $request ) {
-
-		$entity_uri = urldecode( $request->get_param( 'entity_url' ) );
-		$entity_id  = Wordlift_Context_Cards_Service::url_to_postid( $entity_uri );
-		$jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $entity_id );
-
-		return $this->format_response( $jsonld );
-
-	}
-
-	public function enqueue_scripts() {
-		$show_context_cards = apply_filters( 'wl_show_context_cards', true );
-		$base_url           = apply_filters( 'wl_context_cards_base_url', get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint );
-		if ( $show_context_cards ) {
-			wp_enqueue_script( 'wordlift-cloud' );
-			wp_localize_script( 'wordlift-cloud', '_wlCloudSettings', array(
-				'selector' => 'a.wl-entity-page-link',
-				'url'  => get_rest_url( NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/jsonld' ),
-			) );
-		}
-	}
-
-	static function url_to_postid( $url ) {
-		// Try with url_to_postid
-		$post_id = url_to_postid( $url );
-		if ( $post_id == 0 ) {
-			// Try with get_page_by_path
-			$post = get_page_by_path( basename( untrailingslashit( $url ) ), OBJECT, 'entity' );
-			if ( $post ) {
-				$post_id = $post->ID;
-			}
-		}
-
-		return $post_id;
-	}
+    /**
+     * @var string
+     */
+    private $endpoint;
+    private $jsonld_endpoint;
+
+    function __construct() {
+
+        $this->endpoint        = '/context-card';
+        $this->jsonld_endpoint = '/jsonld';
+
+        // PHP 5.3 compatibility as `$this` cannot be used in closures.
+        $that = $this;
+
+        add_action( 'rest_api_init', function () use ( $that ) {
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
+                'methods'  => 'GET',
+                'callback' => array( $that, 'context_data' ),
+            ) );
+        } );
+
+    }
+
+    function format_response( $jsonld, $publisher = true ) {
+
+        $response = array();
+
+        if ( ! isset( $jsonld ) || empty( $jsonld ) || empty( $jsonld[0] ) ) {
+            return null;
+        }
+
+        if ( isset( $jsonld[0]['description'] ) && ! empty( $jsonld[0]['description'] ) ) {
+            if ( isset( $jsonld[0]['name'] ) && ! empty( $jsonld[0]['name'] ) ) {
+                $title                   = $jsonld[0]['name'];
+                $pos                     = strpos( $jsonld[0]['description'], $title );
+                $response['description'] = $jsonld[0]['description'];
+                if ( $pos !== false ) {
+                    $response['description'] = substr_replace( $response['description'], "<strong>$title</strong>", $pos, strlen( $title ) );
+                }
+            } else {
+                $response['description'] = $jsonld[0]['description'];
+            }
+        }
+
+        if ( isset( $jsonld[0]['name'] ) && ! empty( $jsonld[0]['name'] ) ) {
+            $response['title'] = $jsonld[0]['name'];
+        }
+
+        if ( isset( $jsonld[0]['url'] ) && ! empty( $jsonld[0]['url'] ) ) {
+            $response['url'] = $jsonld[0]['url'];
+        }
+
+        if ( isset( $jsonld[0]['image'] ) &&
+             isset( $jsonld[0]['image'][0]['url'] ) &&
+             isset( $jsonld[0]['image'][0]['width'] ) &&
+             isset( $jsonld[0]['image'][0]['height'] )
+        ) {
+            $response['image'] = array(
+                'url'    => $jsonld[0]['image'][0]['url'],
+                'width'  => $jsonld[0]['image'][0]['width'],
+                'height' => $jsonld[0]['image'][0]['height'],
+            );
+        }
+
+        if ( $publisher ) {
+            $publisher_id          = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
+            $publisher_jsonld      = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $publisher_id );
+            $response['publisher'] = $this->format_response( $publisher_jsonld, false );
+        }
+
+        return $response;
+    }
+
+    public function context_data( $request ) {
+
+        $entity_uri = urldecode( $request->get_param( 'entity_url' ) );
+        $entity_id  = Wordlift_Context_Cards_Service::url_to_postid( $entity_uri );
+        $jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $entity_id );
+
+        return $this->format_response( $jsonld );
+
+    }
+
+    public function enqueue_scripts() {
+        $show_context_cards = apply_filters( 'wl_show_context_cards', true );
+        $base_url           = apply_filters( 'wl_context_cards_base_url', get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint );
+        if ( $show_context_cards ) {
+            wp_enqueue_script( 'wordlift-cloud' );
+            wp_localize_script( 'wordlift-cloud', '_wlCloudSettings', array(
+                'selector' => 'a.wl-entity-page-link',
+                'url'  => get_rest_url( NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/jsonld' ),
+            ) );
+        }
+    }
+
+    static function url_to_postid( $url ) {
+        // Try with url_to_postid
+        $post_id = url_to_postid( $url );
+        if ( $post_id == 0 ) {
+            // Try with get_page_by_path
+            $post = get_page_by_path( basename( untrailingslashit( $url ) ), OBJECT, 'entity' );
+            if ( $post ) {
+                $post_id = $post->ID;
+            }
+        }
+
+        return $post_id;
+    }
 
 }

Spacing +37 added lines, -37 removed lines

@@ -23,48 +23,48 @@ 
 		// PHP 5.3 compatibility as `$this` cannot be used in closures.
 		$that = $this;
 
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
+		add_action('rest_api_init', function() use ($that) {
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
 				'methods'  => 'GET',
-				'callback' => array( $that, 'context_data' ),
-			) );
+				'callback' => array($that, 'context_data'),
+			));
 		} );
 
 	}
 
-	function format_response( $jsonld, $publisher = true ) {
+	function format_response($jsonld, $publisher = true) {
 
 		$response = array();
 
-		if ( ! isset( $jsonld ) || empty( $jsonld ) || empty( $jsonld[0] ) ) {
+		if ( ! isset($jsonld) || empty($jsonld) || empty($jsonld[0])) {
 			return null;
 		}
 
-		if ( isset( $jsonld[0]['description'] ) && ! empty( $jsonld[0]['description'] ) ) {
-			if ( isset( $jsonld[0]['name'] ) && ! empty( $jsonld[0]['name'] ) ) {
+		if (isset($jsonld[0]['description']) && ! empty($jsonld[0]['description'])) {
+			if (isset($jsonld[0]['name']) && ! empty($jsonld[0]['name'])) {
 				$title                   = $jsonld[0]['name'];
-				$pos                     = strpos( $jsonld[0]['description'], $title );
+				$pos                     = strpos($jsonld[0]['description'], $title);
 				$response['description'] = $jsonld[0]['description'];
-				if ( $pos !== false ) {
-					$response['description'] = substr_replace( $response['description'], "<strong>$title</strong>", $pos, strlen( $title ) );
+				if ($pos !== false) {
+					$response['description'] = substr_replace($response['description'], "<strong>$title</strong>", $pos, strlen($title));
 				}
 			} else {
 				$response['description'] = $jsonld[0]['description'];
 			}
 		}
 
-		if ( isset( $jsonld[0]['name'] ) && ! empty( $jsonld[0]['name'] ) ) {
+		if (isset($jsonld[0]['name']) && ! empty($jsonld[0]['name'])) {
 			$response['title'] = $jsonld[0]['name'];
 		}
 
-		if ( isset( $jsonld[0]['url'] ) && ! empty( $jsonld[0]['url'] ) ) {
+		if (isset($jsonld[0]['url']) && ! empty($jsonld[0]['url'])) {
 			$response['url'] = $jsonld[0]['url'];
 		}
 
-		if ( isset( $jsonld[0]['image'] ) &&
-		     isset( $jsonld[0]['image'][0]['url'] ) &&
-		     isset( $jsonld[0]['image'][0]['width'] ) &&
-		     isset( $jsonld[0]['image'][0]['height'] )
+		if (isset($jsonld[0]['image']) &&
+		     isset($jsonld[0]['image'][0]['url']) &&
+		     isset($jsonld[0]['image'][0]['width']) &&
+		     isset($jsonld[0]['image'][0]['height'])
 		) {
 			$response['image'] = array(
 				'url'    => $jsonld[0]['image'][0]['url'],
@@ -73,44 +73,44 @@ 
 			);
 		}
 
-		if ( $publisher ) {
+		if ($publisher) {
 			$publisher_id          = Wordlift_Configuration_Service::get_instance()->get_publisher_id();
-			$publisher_jsonld      = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $publisher_id );
-			$response['publisher'] = $this->format_response( $publisher_jsonld, false );
+			$publisher_jsonld      = Wordlift_Jsonld_Service::get_instance()->get_jsonld(false, $publisher_id);
+			$response['publisher'] = $this->format_response($publisher_jsonld, false);
 		}
 
 		return $response;
 	}
 
-	public function context_data( $request ) {
+	public function context_data($request) {
 
-		$entity_uri = urldecode( $request->get_param( 'entity_url' ) );
-		$entity_id  = Wordlift_Context_Cards_Service::url_to_postid( $entity_uri );
-		$jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $entity_id );
+		$entity_uri = urldecode($request->get_param('entity_url'));
+		$entity_id  = Wordlift_Context_Cards_Service::url_to_postid($entity_uri);
+		$jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld(false, $entity_id);
 
-		return $this->format_response( $jsonld );
+		return $this->format_response($jsonld);
 
 	}
 
 	public function enqueue_scripts() {
-		$show_context_cards = apply_filters( 'wl_show_context_cards', true );
-		$base_url           = apply_filters( 'wl_context_cards_base_url', get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint );
-		if ( $show_context_cards ) {
-			wp_enqueue_script( 'wordlift-cloud' );
-			wp_localize_script( 'wordlift-cloud', '_wlCloudSettings', array(
+		$show_context_cards = apply_filters('wl_show_context_cards', true);
+		$base_url           = apply_filters('wl_context_cards_base_url', get_rest_url().WL_REST_ROUTE_DEFAULT_NAMESPACE.$this->endpoint);
+		if ($show_context_cards) {
+			wp_enqueue_script('wordlift-cloud');
+			wp_localize_script('wordlift-cloud', '_wlCloudSettings', array(
 				'selector' => 'a.wl-entity-page-link',
-				'url'  => get_rest_url( NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/jsonld' ),
-			) );
+				'url'  => get_rest_url(NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE.'/jsonld'),
+			));
 		}
 	}
 
-	static function url_to_postid( $url ) {
+	static function url_to_postid($url) {
 		// Try with url_to_postid
-		$post_id = url_to_postid( $url );
-		if ( $post_id == 0 ) {
+		$post_id = url_to_postid($url);
+		if ($post_id == 0) {
 			// Try with get_page_by_path
-			$post = get_page_by_path( basename( untrailingslashit( $url ) ), OBJECT, 'entity' );
-			if ( $post ) {
+			$post = get_page_by_path(basename(untrailingslashit($url)), OBJECT, 'entity');
+			if ($post) {
 				$post_id = $post->ID;
 			}
 		}

src/public/class-wordlift-public.php

Indentation +187 added lines, -187 removed lines

@@ -22,109 +22,109 @@ 
  */
 class Wordlift_Public {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @param string $plugin_name The name of the plugin.
-	 * @param string $version The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 *
-	 */
-	public function __construct( $plugin_name, $version ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since 3.19.3 Register the `wordlift-ui` css.
-	 * @since 3.19.2 The call to this function is commented out in `class-wordlift.php` because `wordlift-public.css`
-	 *               is empty.
-	 * @since 1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		/**
-		 * Add the `wordlift-font-awesome` unless some 3rd party sets the flag to false.
-		 *
-		 * @param bool $include Whether to include or not font-awesome (default true).
-		 *
-		 * @since 3.19.3
-		 *
-		 */
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
-			: array();
-		wp_register_style( 'wordlift-font-awesome', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
-
-		// You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/821
-		//
-		// wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		$settings = self::get_settings();
-
-		// Note that we switched the js to be loaded in footer, since it is loading
-		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
-
-		/*
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @param string $plugin_name The name of the plugin.
+     * @param string $version The version of this plugin.
+     *
+     * @since    1.0.0
+     *
+     */
+    public function __construct( $plugin_name, $version ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since 3.19.3 Register the `wordlift-ui` css.
+     * @since 3.19.2 The call to this function is commented out in `class-wordlift.php` because `wordlift-public.css`
+     *               is empty.
+     * @since 1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        /**
+         * Add the `wordlift-font-awesome` unless some 3rd party sets the flag to false.
+         *
+         * @param bool $include Whether to include or not font-awesome (default true).
+         *
+         * @since 3.19.3
+         *
+         */
+        $deps = apply_filters( 'wl_include_font_awesome', true )
+            ? array( 'wordlift-font-awesome' )
+            : array();
+        wp_register_style( 'wordlift-font-awesome', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
+        wp_register_style( 'wordlift-ui', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
+
+        // You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/821
+        //
+        // wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        $settings = self::get_settings();
+
+        // Note that we switched the js to be loaded in footer, since it is loading
+        // the json-ld representation.
+        wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
+        wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+
+        /*
 		 * Add WordLift's version.
 		 * Can be disabled via filter 'wl_disable_version_js' since 3.21.1
 		 *
@@ -133,96 +133,96 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/843.
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/926.
 		 */
-		$show_version_default = false;
-		$show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
+        $show_version_default = false;
+        $show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
 
-		if ( $show_version ) {
-			wp_localize_script( $this->plugin_name, 'wordlift', array(
-				'version' => $this->version,
-			) );
-		}
+        if ( $show_version ) {
+            wp_localize_script( $this->plugin_name, 'wordlift', array(
+                'version' => $this->version,
+            ) );
+        }
 
-		/*
+        /*
 		 * Register wordlift-cloud script which is shared by
 		 * Context Cards and Navigator
 		 *
 		 * @since 3.22.0
 		 *
 		 */
-		wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), array( 'wp-hooks' ), Wordlift::get_instance()->get_version(), true );
-
-	}
-
-	/**
-	 * Get the settings array.
-	 *
-	 * @return array An array with the settings.
-	 * @since 3.19.1
-	 *
-	 */
-	public static function get_settings() {
-
-		// Prepare a settings array for client-side functions.
-		$settings = array(
-			'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
-			'apiUrl'     => get_home_url( null, 'wl-api/' ),
-			'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' )
-		);
-
-		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
-			$settings['postId'] = get_the_ID();
-		}
-
-		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
-			$settings['isHome'] = true;
-		}
-
-		// As of 2020-02-15, we publish the JSON-LD in the head, see Jsonld_Adaper.
-		$settings['jsonld_enabled'] = false;
-
-		// By default only enable JSON-LD on supported entity pages (includes
-		// `page`, `post` and `entity` by default) and on the home page.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/733
-		//	$jsonld_enabled = is_home() || is_front_page() || Wordlift_Entity_Type_Service::is_valid_entity_post_type( get_post_type() );
-
-		// Add the JSON-LD enabled flag, when set to false, the JSON-LD won't
-		// be loaded.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/642.
-		// $settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', $jsonld_enabled );
-
-		return $settings;
-	}
-
-	/**
-	 * Get the public JavaScript URL.
-	 *
-	 * Using this function is encouraged, since the public JavaScript is also used by the {@link Wordlift_WpRocket_Adapter}
-	 * in order to avoid breaking optimizations.
-	 *
-	 * @return string The URL to the public JavaScript.
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/842.
-	 *
-	 * @since 3.19.4
-	 *
-	 */
-	public static function get_public_js_url() {
-
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/bundle.js';
-	}
-
-	/**
-	 * Get the Cloud JavaScript URL.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/971
-	 * @since 3.23.0
-	 * @return string The URL to the Cloud JavaScript.
-	 */
-	public static function get_cloud_js_url() {
-
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/wordlift-cloud.js';
-	}
+        wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), array( 'wp-hooks' ), Wordlift::get_instance()->get_version(), true );
+
+    }
+
+    /**
+     * Get the settings array.
+     *
+     * @return array An array with the settings.
+     * @since 3.19.1
+     *
+     */
+    public static function get_settings() {
+
+        // Prepare a settings array for client-side functions.
+        $settings = array(
+            'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
+            'apiUrl'     => get_home_url( null, 'wl-api/' ),
+            'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' )
+        );
+
+        // If we're in a single page, then print out the post id.
+        if ( is_singular() ) {
+            $settings['postId'] = get_the_ID();
+        }
+
+        // Add flag that we are on home/blog page.
+        if ( is_home() || is_front_page() ) {
+            $settings['isHome'] = true;
+        }
+
+        // As of 2020-02-15, we publish the JSON-LD in the head, see Jsonld_Adaper.
+        $settings['jsonld_enabled'] = false;
+
+        // By default only enable JSON-LD on supported entity pages (includes
+        // `page`, `post` and `entity` by default) and on the home page.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/733
+        //	$jsonld_enabled = is_home() || is_front_page() || Wordlift_Entity_Type_Service::is_valid_entity_post_type( get_post_type() );
+
+        // Add the JSON-LD enabled flag, when set to false, the JSON-LD won't
+        // be loaded.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/642.
+        // $settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', $jsonld_enabled );
+
+        return $settings;
+    }
+
+    /**
+     * Get the public JavaScript URL.
+     *
+     * Using this function is encouraged, since the public JavaScript is also used by the {@link Wordlift_WpRocket_Adapter}
+     * in order to avoid breaking optimizations.
+     *
+     * @return string The URL to the public JavaScript.
+     * @see https://github.com/insideout10/wordlift-plugin/issues/842.
+     *
+     * @since 3.19.4
+     *
+     */
+    public static function get_public_js_url() {
+
+        return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/bundle.js';
+    }
+
+    /**
+     * Get the Cloud JavaScript URL.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/971
+     * @since 3.23.0
+     * @return string The URL to the Cloud JavaScript.
+     */
+    public static function get_cloud_js_url() {
+
+        return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/wordlift-cloud.js';
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -49,7 +49,7 @@ 
 	 * @since    1.0.0
 	 *
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -84,11 +84,11 @@ 
 		 * @since 3.19.3
 		 *
 		 */
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
+		$deps = apply_filters('wl_include_font_awesome', true)
+			? array('wordlift-font-awesome')
 			: array();
-		wp_register_style( 'wordlift-font-awesome', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
+		wp_register_style('wordlift-font-awesome', plugin_dir_url(dirname(__FILE__)).'css/wordlift-font-awesome'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', array(), $this->version, 'all');
+		wp_register_style('wordlift-ui', plugin_dir_url(dirname(__FILE__)).'css/wordlift-ui'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', $deps, $this->version, 'all');
 
 		// You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
 		//
@@ -121,8 +121,8 @@ 
 
 		// Note that we switched the js to be loaded in footer, since it is loading
 		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+		wp_enqueue_script($this->plugin_name, self::get_public_js_url(), array(), $this->version, true);
+		wp_localize_script($this->plugin_name, 'wlSettings', $settings);
 
 		/*
 		 * Add WordLift's version.
@@ -134,12 +134,12 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/926.
 		 */
 		$show_version_default = false;
-		$show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
+		$show_version         = apply_filters('wl_disable_version_js', $show_version_default);
 
-		if ( $show_version ) {
-			wp_localize_script( $this->plugin_name, 'wordlift', array(
+		if ($show_version) {
+			wp_localize_script($this->plugin_name, 'wordlift', array(
 				'version' => $this->version,
-			) );
+			));
 		}
 
 		/*
@@ -149,7 +149,7 @@ 
 		 * @since 3.22.0
 		 *
 		 */
-		wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), array( 'wp-hooks' ), Wordlift::get_instance()->get_version(), true );
+		wp_register_script('wordlift-cloud', self::get_cloud_js_url(), array('wp-hooks'), Wordlift::get_instance()->get_version(), true);
 
 	}
 
@@ -164,18 +164,18 @@ 
 
 		// Prepare a settings array for client-side functions.
 		$settings = array(
-			'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
-			'apiUrl'     => get_home_url( null, 'wl-api/' ),
-			'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' )
+			'ajaxUrl'    => admin_url('admin-ajax.php'),
+			'apiUrl'     => get_home_url(null, 'wl-api/'),
+			'jsonld_url' => rest_url('/wordlift/v1/jsonld/')
 		);
 
 		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
+		if (is_singular()) {
 			$settings['postId'] = get_the_ID();
 		}
 
 		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
+		if (is_home() || is_front_page()) {
 			$settings['isHome'] = true;
 		}
 
@@ -211,7 +211,7 @@ 
 	 */
 	public static function get_public_js_url() {
 
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/bundle.js';
+		return plugin_dir_url(dirname(__FILE__)).'js/dist/bundle.js';
 	}
 
 	/**
@@ -223,6 +223,6 @@ 
 	 */
 	public static function get_cloud_js_url() {
 
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/wordlift-cloud.js';
+		return plugin_dir_url(dirname(__FILE__)).'js/dist/wordlift-cloud.js';
 	}
 }

src/admin/class-wordlift-admin-post-edit-page.php

Indentation +278 added lines, -278 removed lines

@@ -20,128 +20,128 @@ 
  */
 class Wordlift_Admin_Post_Edit_Page {
 
-	/**
-	 * Constants to be used instead of text inside FAQ
-	 * helper methods.
-	 */
-	const GUTENBERG = 'gutenberg';
-	const TINY_MCE = 'tiny_mce';
-	const FAQ_LIST_BOX_ID = 'wl-faq-meta-list-box';
-
-	/** Constant to be used for translation domain */
-	const WORDLIFT_TEXT_DOMAIN = 'wordlift';
-
-	/**
-	 * The {@link Wordlift} plugin instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	private $plugin;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.4
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
-	 *
-	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 */
-	function __construct( $plugin ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg', ) );
-
-		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
-
-			return;
-		}
-
-		// Define the callbacks.
-		$callback = array( $this, 'enqueue_scripts', );
-
-		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
-
-		$this->plugin = $plugin;
-	}
-
-	/**
-	 * Check whether the current post opens with G'berg or not.
-	 *
-	 * @return bool True if G'berg is used otherwise false.
-	 * @since 3.22.3
-	 */
-	function is_gutenberg_page() {
-		if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
-			// The Gutenberg plugin is on.
-			return TRUE;
-		}
-
-		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
-			// Gutenberg page on 5+.
-			return TRUE;
-		}
-
-		return FALSE;
-	}
-
-	/**
-	 * Check if we're in UX builder.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/691
-	 *
-	 * @since 3.15.4
-	 *
-	 * @return bool True if we're in UX builder, otherwise false.
-	 */
-	private function is_ux_builder_editor() {
-
-		return function_exists( 'ux_builder_is_editor' )
-		       && ux_builder_is_editor();
-	}
-
-	/**
-	 * Enqueue scripts and styles for the edit page.
-	 *
-	 * @since 3.11.0
-	 */
-	public function enqueue_scripts() {
-
-		// Bail out if this is G'berg.
-		if ( $this->is_gutenberg_page() ) {
-			return;
-		}
-
-		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
-
-		// If Gutenberg is enabled for the post, do not load the legacy edit.js.
-		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
-			return;
-		}
-
-
-		/*
+    /**
+     * Constants to be used instead of text inside FAQ
+     * helper methods.
+     */
+    const GUTENBERG = 'gutenberg';
+    const TINY_MCE = 'tiny_mce';
+    const FAQ_LIST_BOX_ID = 'wl-faq-meta-list-box';
+
+    /** Constant to be used for translation domain */
+    const WORDLIFT_TEXT_DOMAIN = 'wordlift';
+
+    /**
+     * The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     *
+     * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    private $plugin;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.4
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
+     *
+     * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     *
+     */
+    function __construct( $plugin ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg', ) );
+
+        // Bail out if we're in the UX Builder editor.
+        if ( $this->is_ux_builder_editor() ) {
+            $this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+
+            return;
+        }
+
+        // Define the callbacks.
+        $callback = array( $this, 'enqueue_scripts', );
+
+        // Set a hook to enqueue scripts only when the edit page is displayed.
+        add_action( 'admin_print_scripts-post.php', $callback );
+        add_action( 'admin_print_scripts-post-new.php', $callback );
+
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * Check whether the current post opens with G'berg or not.
+     *
+     * @return bool True if G'berg is used otherwise false.
+     * @since 3.22.3
+     */
+    function is_gutenberg_page() {
+        if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+            // The Gutenberg plugin is on.
+            return TRUE;
+        }
+
+        $current_screen = get_current_screen();
+        if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+            // Gutenberg page on 5+.
+            return TRUE;
+        }
+
+        return FALSE;
+    }
+
+    /**
+     * Check if we're in UX builder.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/691
+     *
+     * @since 3.15.4
+     *
+     * @return bool True if we're in UX builder, otherwise false.
+     */
+    private function is_ux_builder_editor() {
+
+        return function_exists( 'ux_builder_is_editor' )
+               && ux_builder_is_editor();
+    }
+
+    /**
+     * Enqueue scripts and styles for the edit page.
+     *
+     * @since 3.11.0
+     */
+    public function enqueue_scripts() {
+
+        // Bail out if this is G'berg.
+        if ( $this->is_gutenberg_page() ) {
+            return;
+        }
+
+        // Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/832
+        wp_dequeue_script( 'ontrapagesAngular' );
+        wp_dequeue_script( 'ontrapagesApp' );
+        wp_dequeue_script( 'ontrapagesController' );
+
+        // If Gutenberg is enabled for the post, do not load the legacy edit.js.
+        if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
+            return;
+        }
+
+
+        /*
 		 * Enqueue the edit screen JavaScript. The `wordlift-admin.bundle.js` file
 		 * is scheduled to replace the older `wordlift-admin.min.js` once client-side
 		 * code is properly refactored.
@@ -150,169 +150,169 @@ 
 		 *
 		 * @since 3.20.0 edit.js has been migrated to the new webpack configuration.
 		 */
-		$script_name = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/edit';
-
-		/**
-		 * Scripts_Helper introduced.
-		 *
-		 * @since 3.25.0 Scripts are loaded using script helper to ensure WP 4.4 compatibiility.
-		 * @since 3.25.1 The handle is used to hook the wp_localize_script for the _wlEntityTypes global object.
-		 */
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			'wl-classic-editor',
-			$script_name,
-			array(
-				$this->plugin->get_plugin_name(),
-				'jquery',
-				// Require wp.ajax.
-				'wp-util',
-				// @@todo: provide the following dependencies when we're in WP < 5.0 (i.e. when these dependencies aren't already defined).
-				'react',
-				'react-dom',
-				'wp-element',
-				'wp-polyfill',
-				/*
+        $script_name = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/edit';
+
+        /**
+         * Scripts_Helper introduced.
+         *
+         * @since 3.25.0 Scripts are loaded using script helper to ensure WP 4.4 compatibiility.
+         * @since 3.25.1 The handle is used to hook the wp_localize_script for the _wlEntityTypes global object.
+         */
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            'wl-classic-editor',
+            $script_name,
+            array(
+                $this->plugin->get_plugin_name(),
+                'jquery',
+                // Require wp.ajax.
+                'wp-util',
+                // @@todo: provide the following dependencies when we're in WP < 5.0 (i.e. when these dependencies aren't already defined).
+                'react',
+                'react-dom',
+                'wp-element',
+                'wp-polyfill',
+                /*
 				* Angular isn't loaded anymore remotely, but it is loaded within wordlift-reloaded.js.
 				*
 				* See https://github.com/insideout10/wordlift-plugin/issues/865.
 				*
 				* @since 3.19.6
 				*/
-				//				// Require Angular.
-				//				'wl-angular',
-				//				'wl-angular-geolocation',
-				//				'wl-angular-touch',
-				//				'wl-angular-animate',
-				/**
-				 * We need the `wp.hooks` global to allow the edit.js script to send actions.
-				 *
-				 * @since 3.23.0
-				 */
-				'wp-hooks',
-			)
-		);
-
-		wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
-		$this->load_faq_scripts_and_styles();
-		$this->load_faq_settings( self::TINY_MCE );
-	}
-
-	/**
-	 * Enqueue the scripts and styles needed for FAQ
-	 */
-	private function load_faq_scripts_and_styles() {
-		wp_enqueue_style(
-			'wl-faq-metabox-style',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq.css',
-			array()
-		);
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			'wl-faq-metabox-script',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq',
-			array( 'wp-polyfill' ),
-			true
-		);
-	}
-
-	/**
-	 * Get FAQ settings array
-	 *
-	 * @return array
-	 */
-	public function get_faq_settings() {
-		return array(
-			'restUrl'                 => get_rest_url( NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faq' ),
-			'listBoxId'               => self::FAQ_LIST_BOX_ID,
-			'nonce'                   => wp_create_nonce( 'wp_rest' ),
-			'postId'                  => get_the_ID(),
-			// Translation for warning, error message.
-			'invalidTagMessage'       => sprintf( __( 'Invalid tags %s is present in answer', self::WORDLIFT_TEXT_DOMAIN ), "{INVALID_TAGS}" ),
-			'invalidWordCountMessage' => sprintf( __( 'Answer word count must not exceed %s words', self::WORDLIFT_TEXT_DOMAIN ), "{ANSWER_WORD_COUNT_WARNING_LIMIT}" ),
-			'questionText'            => __( 'Question', self::WORDLIFT_TEXT_DOMAIN ),
-			'answerText'              => __( 'Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'addQuestionOrAnswerText' => __( 'Add Question / Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'addQuestionText'         => __( 'Add Question', self::WORDLIFT_TEXT_DOMAIN ),
-			'addAnswerText'           => __( 'Add Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'noFaqItemsText'          => __( 'Highlight a question in content, then click Add Question.', self::WORDLIFT_TEXT_DOMAIN ),
-			'updatingText'          => __( 'Updating...', self::WORDLIFT_TEXT_DOMAIN )
-		);
-	}
-
-	/**
-	 * Load FAQ settings to the add/edit post page
-	 *
-	 * @param $editor string specifying which text editor needed to be used.
-	 */
-	private function load_faq_settings( $editor ) {
-		// This script also provides translations to gutenberg.
-		wp_localize_script( 'wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings() );
-
-		// Enqueue the FAQ style
-		if ( $editor === self::GUTENBERG ) {
-			Scripts_Helper::enqueue_based_on_wordpress_version(
-				'wl-faq-gutenberg-plugin',
-				plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor-faq-plugin',
-				array( 'wp-polyfill' ),
-				TRUE
-			);
-		}
-	}
-
-	/**
-	 * Enqueue scripts and styles for the gutenberg edit page.
-	 *
-	 * @since 3.21.0
-	 */
-	public function enqueue_scripts_gutenberg() {
-		// Load FAQ settings.
-		$this->load_faq_scripts_and_styles();
-		$this->load_faq_settings( self::GUTENBERG );
-
-		wp_register_script(
-			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.js',
-			array(
-				'react',
-				'wordlift',
-				'wp-hooks',
-				'wp-data',
-				'wp-rich-text',
-				'wp-blocks',
-				'wp-plugins',
-				'wp-edit-post',
-			),
-			$this->plugin->get_version()
-		);
-		wp_localize_script( 'wl-block-editor', '_wlBlockEditorSettings', array(
-			'root'  => esc_url_raw( rest_url() ),
-			'nonce' => wp_create_nonce( 'wp_rest' )
-		) );
-
-		/*
+                //				// Require Angular.
+                //				'wl-angular',
+                //				'wl-angular-geolocation',
+                //				'wl-angular-touch',
+                //				'wl-angular-animate',
+                /**
+                 * We need the `wp.hooks` global to allow the edit.js script to send actions.
+                 *
+                 * @since 3.23.0
+                 */
+                'wp-hooks',
+            )
+        );
+
+        wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
+        $this->load_faq_scripts_and_styles();
+        $this->load_faq_settings( self::TINY_MCE );
+    }
+
+    /**
+     * Enqueue the scripts and styles needed for FAQ
+     */
+    private function load_faq_scripts_and_styles() {
+        wp_enqueue_style(
+            'wl-faq-metabox-style',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq.css',
+            array()
+        );
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            'wl-faq-metabox-script',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq',
+            array( 'wp-polyfill' ),
+            true
+        );
+    }
+
+    /**
+     * Get FAQ settings array
+     *
+     * @return array
+     */
+    public function get_faq_settings() {
+        return array(
+            'restUrl'                 => get_rest_url( NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faq' ),
+            'listBoxId'               => self::FAQ_LIST_BOX_ID,
+            'nonce'                   => wp_create_nonce( 'wp_rest' ),
+            'postId'                  => get_the_ID(),
+            // Translation for warning, error message.
+            'invalidTagMessage'       => sprintf( __( 'Invalid tags %s is present in answer', self::WORDLIFT_TEXT_DOMAIN ), "{INVALID_TAGS}" ),
+            'invalidWordCountMessage' => sprintf( __( 'Answer word count must not exceed %s words', self::WORDLIFT_TEXT_DOMAIN ), "{ANSWER_WORD_COUNT_WARNING_LIMIT}" ),
+            'questionText'            => __( 'Question', self::WORDLIFT_TEXT_DOMAIN ),
+            'answerText'              => __( 'Answer', self::WORDLIFT_TEXT_DOMAIN ),
+            'addQuestionOrAnswerText' => __( 'Add Question / Answer', self::WORDLIFT_TEXT_DOMAIN ),
+            'addQuestionText'         => __( 'Add Question', self::WORDLIFT_TEXT_DOMAIN ),
+            'addAnswerText'           => __( 'Add Answer', self::WORDLIFT_TEXT_DOMAIN ),
+            'noFaqItemsText'          => __( 'Highlight a question in content, then click Add Question.', self::WORDLIFT_TEXT_DOMAIN ),
+            'updatingText'          => __( 'Updating...', self::WORDLIFT_TEXT_DOMAIN )
+        );
+    }
+
+    /**
+     * Load FAQ settings to the add/edit post page
+     *
+     * @param $editor string specifying which text editor needed to be used.
+     */
+    private function load_faq_settings( $editor ) {
+        // This script also provides translations to gutenberg.
+        wp_localize_script( 'wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings() );
+
+        // Enqueue the FAQ style
+        if ( $editor === self::GUTENBERG ) {
+            Scripts_Helper::enqueue_based_on_wordpress_version(
+                'wl-faq-gutenberg-plugin',
+                plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor-faq-plugin',
+                array( 'wp-polyfill' ),
+                TRUE
+            );
+        }
+    }
+
+    /**
+     * Enqueue scripts and styles for the gutenberg edit page.
+     *
+     * @since 3.21.0
+     */
+    public function enqueue_scripts_gutenberg() {
+        // Load FAQ settings.
+        $this->load_faq_scripts_and_styles();
+        $this->load_faq_settings( self::GUTENBERG );
+
+        wp_register_script(
+            'wl-block-editor',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.js',
+            array(
+                'react',
+                'wordlift',
+                'wp-hooks',
+                'wp-data',
+                'wp-rich-text',
+                'wp-blocks',
+                'wp-plugins',
+                'wp-edit-post',
+            ),
+            $this->plugin->get_version()
+        );
+        wp_localize_script( 'wl-block-editor', '_wlBlockEditorSettings', array(
+            'root'  => esc_url_raw( rest_url() ),
+            'nonce' => wp_create_nonce( 'wp_rest' )
+        ) );
+
+        /*
 		 * @since 3.25.1 The hook is used by the wp_localize_script to register the _wlEntityTypes global object.
 		 */
-		wp_enqueue_style(
-			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.css',
-			array(),
-			$this->plugin->get_version()
-		);
-
-		wp_enqueue_script(
-			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.js',
-			array(),
-			$this->plugin->get_version(),
-			TRUE
-		);
-
-		wp_enqueue_style(
-			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.css',
-			array(),
-			$this->plugin->get_version()
-		);
-
-	}
+        wp_enqueue_style(
+            'wl-block-editor',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.css',
+            array(),
+            $this->plugin->get_version()
+        );
+
+        wp_enqueue_script(
+            'wl-autocomplete-select',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.js',
+            array(),
+            $this->plugin->get_version(),
+            TRUE
+        );
+
+        wp_enqueue_style(
+            'wl-autocomplete-select',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.css',
+            array(),
+            $this->plugin->get_version()
+        );
+
+    }
 
 }

Spacing +47 added lines, -47 removed lines

@@ -57,25 +57,25 @@ 
 	 * @since 3.11.0
 	 *
 	 */
-	function __construct( $plugin ) {
+	function __construct($plugin) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
-		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg', ) );
+		add_action('enqueue_block_editor_assets', array($this, 'enqueue_scripts_gutenberg',));
 
 		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+		if ($this->is_ux_builder_editor()) {
+			$this->log->info('WordLift will not show, since we are in UX Builder editor.');
 
 			return;
 		}
 
 		// Define the callbacks.
-		$callback = array( $this, 'enqueue_scripts', );
+		$callback = array($this, 'enqueue_scripts',);
 
 		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
+		add_action('admin_print_scripts-post.php', $callback);
+		add_action('admin_print_scripts-post-new.php', $callback);
 
 		$this->plugin = $plugin;
 	}
@@ -87,13 +87,13 @@ 
 	 * @since 3.22.3
 	 */
 	function is_gutenberg_page() {
-		if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+		if (function_exists('is_gutenberg_page') && is_gutenberg_page()) {
 			// The Gutenberg plugin is on.
 			return TRUE;
 		}
 
 		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+		if (method_exists($current_screen, 'is_block_editor') && $current_screen->is_block_editor()) {
 			// Gutenberg page on 5+.
 			return TRUE;
 		}
@@ -112,7 +112,7 @@ 
 	 */
 	private function is_ux_builder_editor() {
 
-		return function_exists( 'ux_builder_is_editor' )
+		return function_exists('ux_builder_is_editor')
 		       && ux_builder_is_editor();
 	}
 
@@ -124,19 +124,19 @@ 
 	public function enqueue_scripts() {
 
 		// Bail out if this is G'berg.
-		if ( $this->is_gutenberg_page() ) {
+		if ($this->is_gutenberg_page()) {
 			return;
 		}
 
 		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
+		wp_dequeue_script('ontrapagesAngular');
+		wp_dequeue_script('ontrapagesApp');
+		wp_dequeue_script('ontrapagesController');
 
 		// If Gutenberg is enabled for the post, do not load the legacy edit.js.
-		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
+		if (function_exists('use_block_editor_for_post') && use_block_editor_for_post(get_post())) {
 			return;
 		}
 
@@ -150,7 +150,7 @@ 
 		 *
 		 * @since 3.20.0 edit.js has been migrated to the new webpack configuration.
 		 */
-		$script_name = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/edit';
+		$script_name = plugin_dir_url(dirname(__FILE__)).'js/dist/edit';
 
 		/**
 		 * Scripts_Helper introduced.
@@ -192,9 +192,9 @@ 
 			)
 		);
 
-		wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
+		wp_enqueue_style('wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version());
 		$this->load_faq_scripts_and_styles();
-		$this->load_faq_settings( self::TINY_MCE );
+		$this->load_faq_settings(self::TINY_MCE);
 	}
 
 	/**
@@ -203,13 +203,13 @@ 
 	private function load_faq_scripts_and_styles() {
 		wp_enqueue_style(
 			'wl-faq-metabox-style',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq.css',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/faq.css',
 			array()
 		);
 		Scripts_Helper::enqueue_based_on_wordpress_version(
 			'wl-faq-metabox-script',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/faq',
-			array( 'wp-polyfill' ),
+			plugin_dir_url(dirname(__FILE__)).'js/dist/faq',
+			array('wp-polyfill'),
 			true
 		);
 	}
@@ -221,20 +221,20 @@ 
 	 */
 	public function get_faq_settings() {
 		return array(
-			'restUrl'                 => get_rest_url( NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE . '/faq' ),
+			'restUrl'                 => get_rest_url(NULL, WL_REST_ROUTE_DEFAULT_NAMESPACE.'/faq'),
 			'listBoxId'               => self::FAQ_LIST_BOX_ID,
-			'nonce'                   => wp_create_nonce( 'wp_rest' ),
+			'nonce'                   => wp_create_nonce('wp_rest'),
 			'postId'                  => get_the_ID(),
 			// Translation for warning, error message.
-			'invalidTagMessage'       => sprintf( __( 'Invalid tags %s is present in answer', self::WORDLIFT_TEXT_DOMAIN ), "{INVALID_TAGS}" ),
-			'invalidWordCountMessage' => sprintf( __( 'Answer word count must not exceed %s words', self::WORDLIFT_TEXT_DOMAIN ), "{ANSWER_WORD_COUNT_WARNING_LIMIT}" ),
-			'questionText'            => __( 'Question', self::WORDLIFT_TEXT_DOMAIN ),
-			'answerText'              => __( 'Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'addQuestionOrAnswerText' => __( 'Add Question / Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'addQuestionText'         => __( 'Add Question', self::WORDLIFT_TEXT_DOMAIN ),
-			'addAnswerText'           => __( 'Add Answer', self::WORDLIFT_TEXT_DOMAIN ),
-			'noFaqItemsText'          => __( 'Highlight a question in content, then click Add Question.', self::WORDLIFT_TEXT_DOMAIN ),
-			'updatingText'          => __( 'Updating...', self::WORDLIFT_TEXT_DOMAIN )
+			'invalidTagMessage'       => sprintf(__('Invalid tags %s is present in answer', self::WORDLIFT_TEXT_DOMAIN), "{INVALID_TAGS}"),
+			'invalidWordCountMessage' => sprintf(__('Answer word count must not exceed %s words', self::WORDLIFT_TEXT_DOMAIN), "{ANSWER_WORD_COUNT_WARNING_LIMIT}"),
+			'questionText'            => __('Question', self::WORDLIFT_TEXT_DOMAIN),
+			'answerText'              => __('Answer', self::WORDLIFT_TEXT_DOMAIN),
+			'addQuestionOrAnswerText' => __('Add Question / Answer', self::WORDLIFT_TEXT_DOMAIN),
+			'addQuestionText'         => __('Add Question', self::WORDLIFT_TEXT_DOMAIN),
+			'addAnswerText'           => __('Add Answer', self::WORDLIFT_TEXT_DOMAIN),
+			'noFaqItemsText'          => __('Highlight a question in content, then click Add Question.', self::WORDLIFT_TEXT_DOMAIN),
+			'updatingText'          => __('Updating...', self::WORDLIFT_TEXT_DOMAIN)
 		);
 	}
 
@@ -243,16 +243,16 @@ 
 	 *
 	 * @param $editor string specifying which text editor needed to be used.
 	 */
-	private function load_faq_settings( $editor ) {
+	private function load_faq_settings($editor) {
 		// This script also provides translations to gutenberg.
-		wp_localize_script( 'wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings() );
+		wp_localize_script('wl-faq-metabox-script', '_wlFaqSettings', $this->get_faq_settings());
 
 		// Enqueue the FAQ style
-		if ( $editor === self::GUTENBERG ) {
+		if ($editor === self::GUTENBERG) {
 			Scripts_Helper::enqueue_based_on_wordpress_version(
 				'wl-faq-gutenberg-plugin',
-				plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor-faq-plugin',
-				array( 'wp-polyfill' ),
+				plugin_dir_url(dirname(__FILE__)).'js/dist/block-editor-faq-plugin',
+				array('wp-polyfill'),
 				TRUE
 			);
 		}
@@ -266,11 +266,11 @@ 
 	public function enqueue_scripts_gutenberg() {
 		// Load FAQ settings.
 		$this->load_faq_scripts_and_styles();
-		$this->load_faq_settings( self::GUTENBERG );
+		$this->load_faq_settings(self::GUTENBERG);
 
 		wp_register_script(
 			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.js',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/block-editor.js',
 			array(
 				'react',
 				'wordlift',
@@ -283,24 +283,24 @@ 
 			),
 			$this->plugin->get_version()
 		);
-		wp_localize_script( 'wl-block-editor', '_wlBlockEditorSettings', array(
-			'root'  => esc_url_raw( rest_url() ),
-			'nonce' => wp_create_nonce( 'wp_rest' )
-		) );
+		wp_localize_script('wl-block-editor', '_wlBlockEditorSettings', array(
+			'root'  => esc_url_raw(rest_url()),
+			'nonce' => wp_create_nonce('wp_rest')
+		));
 
 		/*
 		 * @since 3.25.1 The hook is used by the wp_localize_script to register the _wlEntityTypes global object.
 		 */
 		wp_enqueue_style(
 			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.css',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/block-editor.css',
 			array(),
 			$this->plugin->get_version()
 		);
 
 		wp_enqueue_script(
 			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.js',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/autocomplete-select.js',
 			array(),
 			$this->plugin->get_version(),
 			TRUE
@@ -308,7 +308,7 @@ 
 
 		wp_enqueue_style(
 			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.css',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/autocomplete-select.css',
 			array(),
 			$this->plugin->get_version()
 		);

src/wordlift/jsonld/class-jsonld-by-id-endpoint.php

Indentation +99 added lines, -99 removed lines

@@ -23,104 +23,104 @@
  */
 class Jsonld_By_Id_Endpoint {
 
-	/**
-	 * The {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
-	 */
-	private $jsonld_service;
-
-	/**
-	 * @var \Wordlift_Entity_Uri_Service
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * Jsonld_Endpoint constructor.
-	 *
-	 * @param \Wordlift_Jsonld_Service $jsonld_service
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
-	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
-
-		$this->jsonld_service     = $jsonld_service;
-		$this->entity_uri_service = $entity_uri_service;
-
-		add_action( 'rest_api_init', array( $this, 'register_routes', ) );
-
-	}
-
-	/**
-	 * Get the JSON-LD.
-	 *
-	 * @param \WP_REST_Request $request The incoming {@link \WP_REST_Request}.
-	 *
-	 * @return WP_REST_Response The outgoing {@link WP_REST_Response}.
-	 * @throws \Exception
-	 */
-	public function jsonld_by_id( $request ) {
-
-		// Get the ids.
-		$ids = (array)$request->get_param( 'id' );
-
-		// Preload the URIs to reduce the number of DB roundtrips.
-		$this->entity_uri_service->preload_uris( array_map( 'urldecode', $ids ) );
-
-		$that = $this;
-
-		// Get the posts, filtering out those not found.
-		$posts = array_filter( array_map( function ( $item ) use ( $that ) {
-			return $that->entity_uri_service->get_entity( urldecode( $item ) );
-		}, $ids ) );
-
-		// Get the posts' IDs and make the unique.
-		$post_ids = array_unique( array_map( function ( $item ) {
-			return $item->ID;
-		}, $posts ) );
-
-		// Get the JSON-LD.
-		$data = array();
-		foreach ( $post_ids as $post_id ) {
-			$data = array_merge( $data, $that->jsonld_service->get_jsonld( false, $post_id ) );
-		}
-
-		// Add the WebSite fragment if requested.
-		if ( $request->get_param( 'website' ) ) {
-			$data[] = $this->jsonld_service->get_jsonld( true );
-		}
-
-		return Jsonld_Response_Helper::to_response( $data );
-	}
-
-	public function register_routes() {
-
-		register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld', array(
-			'methods'  => WP_REST_Server::READABLE,
-			'callback' => array( $this, 'jsonld_by_id' ),
-			'args'     => array(
-				'id'      => array(
-					'description'       => __( 'One ore more itemids (e.g. http://data.wordlift.io/wordlift).', 'wordlift' ),
-					// We expect an array of strings.
-					'type'              => 'array',
-					'validate_callback' => function ( $values, $request, $param ) {
-
-						if ( ! is_array( $values ) ) {
-							return new WP_Error( 'rest_invalid_param', esc_html__( 'The id argument must be an array (try passing `id[]=...`.', 'wordlift' ), array( 'status' => 400 ) );
-						}
-
-						foreach ( $values as $value ) {
-							if ( 0 !== strpos( $value, 'http' ) ) {
-								return new WP_Error( 'rest_invalid_param', esc_html__( 'Ids must start with http.', 'wordlift' ), array( 'status' => 400 ) );
-							}
-						}
-					}
-				),
-				'website' => array(
-					'description' => __( 'Whether to include the WebSite markup.', 'wordlift' ),
-				)
-			)
-		) );
-
-	}
+    /**
+     * The {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
+     */
+    private $jsonld_service;
+
+    /**
+     * @var \Wordlift_Entity_Uri_Service
+     */
+    private $entity_uri_service;
+
+    /**
+     * Jsonld_Endpoint constructor.
+     *
+     * @param \Wordlift_Jsonld_Service $jsonld_service
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service
+     */
+    public function __construct( $jsonld_service, $entity_uri_service ) {
+
+        $this->jsonld_service     = $jsonld_service;
+        $this->entity_uri_service = $entity_uri_service;
+
+        add_action( 'rest_api_init', array( $this, 'register_routes', ) );
+
+    }
+
+    /**
+     * Get the JSON-LD.
+     *
+     * @param \WP_REST_Request $request The incoming {@link \WP_REST_Request}.
+     *
+     * @return WP_REST_Response The outgoing {@link WP_REST_Response}.
+     * @throws \Exception
+     */
+    public function jsonld_by_id( $request ) {
+
+        // Get the ids.
+        $ids = (array)$request->get_param( 'id' );
+
+        // Preload the URIs to reduce the number of DB roundtrips.
+        $this->entity_uri_service->preload_uris( array_map( 'urldecode', $ids ) );
+
+        $that = $this;
+
+        // Get the posts, filtering out those not found.
+        $posts = array_filter( array_map( function ( $item ) use ( $that ) {
+            return $that->entity_uri_service->get_entity( urldecode( $item ) );
+        }, $ids ) );
+
+        // Get the posts' IDs and make the unique.
+        $post_ids = array_unique( array_map( function ( $item ) {
+            return $item->ID;
+        }, $posts ) );
+
+        // Get the JSON-LD.
+        $data = array();
+        foreach ( $post_ids as $post_id ) {
+            $data = array_merge( $data, $that->jsonld_service->get_jsonld( false, $post_id ) );
+        }
+
+        // Add the WebSite fragment if requested.
+        if ( $request->get_param( 'website' ) ) {
+            $data[] = $this->jsonld_service->get_jsonld( true );
+        }
+
+        return Jsonld_Response_Helper::to_response( $data );
+    }
+
+    public function register_routes() {
+
+        register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld', array(
+            'methods'  => WP_REST_Server::READABLE,
+            'callback' => array( $this, 'jsonld_by_id' ),
+            'args'     => array(
+                'id'      => array(
+                    'description'       => __( 'One ore more itemids (e.g. http://data.wordlift.io/wordlift).', 'wordlift' ),
+                    // We expect an array of strings.
+                    'type'              => 'array',
+                    'validate_callback' => function ( $values, $request, $param ) {
+
+                        if ( ! is_array( $values ) ) {
+                            return new WP_Error( 'rest_invalid_param', esc_html__( 'The id argument must be an array (try passing `id[]=...`.', 'wordlift' ), array( 'status' => 400 ) );
+                        }
+
+                        foreach ( $values as $value ) {
+                            if ( 0 !== strpos( $value, 'http' ) ) {
+                                return new WP_Error( 'rest_invalid_param', esc_html__( 'Ids must start with http.', 'wordlift' ), array( 'status' => 400 ) );
+                            }
+                        }
+                    }
+                ),
+                'website' => array(
+                    'description' => __( 'Whether to include the WebSite markup.', 'wordlift' ),
+                )
+            )
+        ) );
+
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -41,12 +41,12 @@ 
 	 * @param \Wordlift_Jsonld_Service $jsonld_service
 	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
 	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
+	public function __construct($jsonld_service, $entity_uri_service) {
 
 		$this->jsonld_service     = $jsonld_service;
 		$this->entity_uri_service = $entity_uri_service;
 
-		add_action( 'rest_api_init', array( $this, 'register_routes', ) );
+		add_action('rest_api_init', array($this, 'register_routes',));
 
 	}
 
@@ -58,68 +58,68 @@ 
 	 * @return WP_REST_Response The outgoing {@link WP_REST_Response}.
 	 * @throws \Exception
 	 */
-	public function jsonld_by_id( $request ) {
+	public function jsonld_by_id($request) {
 
 		// Get the ids.
-		$ids = (array)$request->get_param( 'id' );
+		$ids = (array) $request->get_param('id');
 
 		// Preload the URIs to reduce the number of DB roundtrips.
-		$this->entity_uri_service->preload_uris( array_map( 'urldecode', $ids ) );
+		$this->entity_uri_service->preload_uris(array_map('urldecode', $ids));
 
 		$that = $this;
 
 		// Get the posts, filtering out those not found.
-		$posts = array_filter( array_map( function ( $item ) use ( $that ) {
-			return $that->entity_uri_service->get_entity( urldecode( $item ) );
-		}, $ids ) );
+		$posts = array_filter(array_map(function($item) use ($that) {
+			return $that->entity_uri_service->get_entity(urldecode($item));
+		}, $ids));
 
 		// Get the posts' IDs and make the unique.
-		$post_ids = array_unique( array_map( function ( $item ) {
+		$post_ids = array_unique(array_map(function($item) {
 			return $item->ID;
-		}, $posts ) );
+		}, $posts));
 
 		// Get the JSON-LD.
 		$data = array();
-		foreach ( $post_ids as $post_id ) {
-			$data = array_merge( $data, $that->jsonld_service->get_jsonld( false, $post_id ) );
+		foreach ($post_ids as $post_id) {
+			$data = array_merge($data, $that->jsonld_service->get_jsonld(false, $post_id));
 		}
 
 		// Add the WebSite fragment if requested.
-		if ( $request->get_param( 'website' ) ) {
-			$data[] = $this->jsonld_service->get_jsonld( true );
+		if ($request->get_param('website')) {
+			$data[] = $this->jsonld_service->get_jsonld(true);
 		}
 
-		return Jsonld_Response_Helper::to_response( $data );
+		return Jsonld_Response_Helper::to_response($data);
 	}
 
 	public function register_routes() {
 
-		register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld', array(
+		register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld', array(
 			'methods'  => WP_REST_Server::READABLE,
-			'callback' => array( $this, 'jsonld_by_id' ),
+			'callback' => array($this, 'jsonld_by_id'),
 			'args'     => array(
 				'id'      => array(
-					'description'       => __( 'One ore more itemids (e.g. http://data.wordlift.io/wordlift).', 'wordlift' ),
+					'description'       => __('One ore more itemids (e.g. http://data.wordlift.io/wordlift).', 'wordlift'),
 					// We expect an array of strings.
 					'type'              => 'array',
-					'validate_callback' => function ( $values, $request, $param ) {
+					'validate_callback' => function($values, $request, $param) {
 
-						if ( ! is_array( $values ) ) {
-							return new WP_Error( 'rest_invalid_param', esc_html__( 'The id argument must be an array (try passing `id[]=...`.', 'wordlift' ), array( 'status' => 400 ) );
+						if ( ! is_array($values)) {
+							return new WP_Error('rest_invalid_param', esc_html__('The id argument must be an array (try passing `id[]=...`.', 'wordlift'), array('status' => 400));
 						}
 
-						foreach ( $values as $value ) {
-							if ( 0 !== strpos( $value, 'http' ) ) {
-								return new WP_Error( 'rest_invalid_param', esc_html__( 'Ids must start with http.', 'wordlift' ), array( 'status' => 400 ) );
+						foreach ($values as $value) {
+							if (0 !== strpos($value, 'http')) {
+								return new WP_Error('rest_invalid_param', esc_html__('Ids must start with http.', 'wordlift'), array('status' => 400));
 							}
 						}
 					}
 				),
 				'website' => array(
-					'description' => __( 'Whether to include the WebSite markup.', 'wordlift' ),
+					'description' => __('Whether to include the WebSite markup.', 'wordlift'),
 				)
 			)
-		) );
+		));
 
 	}