insideout10 / wordlift-plugin

src/wordlift/vocabulary/api/class-tag-rest-endpoint.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 
 use Wordlift\Vocabulary\Analysis_Background_Service;
-use Wordlift\Vocabulary\Analysis_Service;
 use Wordlift\Vocabulary\Data\Term_Data\Term_Data_Factory;
 use Wordlift\Vocabulary\Terms_Compat;
 use WP_REST_Server;

Indentation +115 added lines, -115 removed lines

@@ -15,121 +15,121 @@
  */
 class Tag_Rest_Endpoint {
 
-	/**
-	 * @var Term_Data_Factory
-	 */
-	private $term_data_factory;
-
-	/**
-	 * Tag_Rest_Endpoint constructor.
-	 *
-	 * @param Term_Data_Factory $term_data_factory
-	 */
-	public function __construct( $term_data_factory ) {
-
-		$this->term_data_factory = $term_data_factory;
-
-	}
-
-
-	public function register_routes() {
-		$that = $this;
-		add_action( 'rest_api_init',
-			function () use ( $that ) {
-				register_rest_route(
-					Api_Config::REST_NAMESPACE,
-					'/tags',
-					array(
-						'methods'             => WP_REST_Server::CREATABLE,
-						'callback'            => array( $that, 'get_tags' ),
-						//@todo : review the permission level
-						'permission_callback' => function () {
-							return current_user_can( 'manage_options' );
-						},
-						'args'                => array(
-							'limit'  => array(
-								'validate_callback' => function ( $param, $request, $key ) {
-									return is_numeric( $param ) && $param;
-								},
-								'required'          => true,
-							),
-							'offset' => array(
-								'validate_callback' => function ( $param, $request, $key ) {
-									return is_numeric( $param );
-								},
-								'required'          => true,
-							),
-						),
-					)
-				);
-			} );
-
-
-	}
-
-
-	public function get_tags( $request ) {
-
-		$data   = $request->get_params();
-		$offset = (int) $data['offset'];
-		$limit  = (int) $data['limit'];
-		$tags = $this->get_terms_from_db( $limit, $offset );
-		$term_data_list = array();
-
-		foreach ( $tags as $tag ) {
-
-			if ( $this->is_tag_excluded_from_ui( $tag ) ) {
-				continue;
-			}
-
-			/**
-			 * @param $tag \WP_Term
-			 */
-			$term_data_instance = $this->term_data_factory->get_term_data($tag);
-			$term_data = $term_data_instance->get_data();
-			if ( $term_data['entities'] ) {
-				$term_data_list[] = $term_data;
-			}
-		}
-
-
-		return $term_data_list;
-	}
-
-	/**
-	 * @param \WP_Term $tag
-	 *
-	 * @return bool
-	 */
-	private function is_tag_excluded_from_ui( $tag ) {
-		return (int) get_term_meta( $tag->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) === 1;
-	}
-
-	/**
-	 * @param $limit
-	 * @param $offset
-	 *
-	 * @return int|\WP_Error|\WP_Term[]
-	 */
-	public function get_terms_from_db( $limit, $offset ) {
-
-
-		return Terms_Compat::get_terms(Terms_Compat::get_public_taxonomies(), array(
-			'hide_empty' => false,
-			'number'     => $limit,
-			'offset'     => $offset,
-			'meta_query' => array(
-				array(
-					'key'     => Analysis_Background_Service::ENTITIES_PRESENT_FOR_TERM,
-					'compare' => 'EXISTS'
-				)
-			),
-			'orderby'    => 'count',
-			'order'      => 'DESC',
-		));
-
-
-	}
+    /**
+     * @var Term_Data_Factory
+     */
+    private $term_data_factory;
+
+    /**
+     * Tag_Rest_Endpoint constructor.
+     *
+     * @param Term_Data_Factory $term_data_factory
+     */
+    public function __construct( $term_data_factory ) {
+
+        $this->term_data_factory = $term_data_factory;
+
+    }
+
+
+    public function register_routes() {
+        $that = $this;
+        add_action( 'rest_api_init',
+            function () use ( $that ) {
+                register_rest_route(
+                    Api_Config::REST_NAMESPACE,
+                    '/tags',
+                    array(
+                        'methods'             => WP_REST_Server::CREATABLE,
+                        'callback'            => array( $that, 'get_tags' ),
+                        //@todo : review the permission level
+                        'permission_callback' => function () {
+                            return current_user_can( 'manage_options' );
+                        },
+                        'args'                => array(
+                            'limit'  => array(
+                                'validate_callback' => function ( $param, $request, $key ) {
+                                    return is_numeric( $param ) && $param;
+                                },
+                                'required'          => true,
+                            ),
+                            'offset' => array(
+                                'validate_callback' => function ( $param, $request, $key ) {
+                                    return is_numeric( $param );
+                                },
+                                'required'          => true,
+                            ),
+                        ),
+                    )
+                );
+            } );
+
+
+    }
+
+
+    public function get_tags( $request ) {
+
+        $data   = $request->get_params();
+        $offset = (int) $data['offset'];
+        $limit  = (int) $data['limit'];
+        $tags = $this->get_terms_from_db( $limit, $offset );
+        $term_data_list = array();
+
+        foreach ( $tags as $tag ) {
+
+            if ( $this->is_tag_excluded_from_ui( $tag ) ) {
+                continue;
+            }
+
+            /**
+             * @param $tag \WP_Term
+             */
+            $term_data_instance = $this->term_data_factory->get_term_data($tag);
+            $term_data = $term_data_instance->get_data();
+            if ( $term_data['entities'] ) {
+                $term_data_list[] = $term_data;
+            }
+        }
+
+
+        return $term_data_list;
+    }
+
+    /**
+     * @param \WP_Term $tag
+     *
+     * @return bool
+     */
+    private function is_tag_excluded_from_ui( $tag ) {
+        return (int) get_term_meta( $tag->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) === 1;
+    }
+
+    /**
+     * @param $limit
+     * @param $offset
+     *
+     * @return int|\WP_Error|\WP_Term[]
+     */
+    public function get_terms_from_db( $limit, $offset ) {
+
+
+        return Terms_Compat::get_terms(Terms_Compat::get_public_taxonomies(), array(
+            'hide_empty' => false,
+            'number'     => $limit,
+            'offset'     => $offset,
+            'meta_query' => array(
+                array(
+                    'key'     => Analysis_Background_Service::ENTITIES_PRESENT_FOR_TERM,
+                    'compare' => 'EXISTS'
+                )
+            ),
+            'orderby'    => 'count',
+            'order'      => 'DESC',
+        ));
+
+
+    }
 
 
 }

Spacing +18 added lines, -18 removed lines

@@ -25,7 +25,7 @@ 
 	 *
 	 * @param Term_Data_Factory $term_data_factory
 	 */
-	public function __construct( $term_data_factory ) {
+	public function __construct($term_data_factory) {
 
 		$this->term_data_factory = $term_data_factory;
 
@@ -34,28 +34,28 @@ 
 
 	public function register_routes() {
 		$that = $this;
-		add_action( 'rest_api_init',
-			function () use ( $that ) {
+		add_action('rest_api_init',
+			function() use ($that) {
 				register_rest_route(
 					Api_Config::REST_NAMESPACE,
 					'/tags',
 					array(
 						'methods'             => WP_REST_Server::CREATABLE,
-						'callback'            => array( $that, 'get_tags' ),
+						'callback'            => array($that, 'get_tags'),
 						//@todo : review the permission level
-						'permission_callback' => function () {
-							return current_user_can( 'manage_options' );
+						'permission_callback' => function() {
+							return current_user_can('manage_options');
 						},
 						'args'                => array(
 							'limit'  => array(
-								'validate_callback' => function ( $param, $request, $key ) {
-									return is_numeric( $param ) && $param;
+								'validate_callback' => function($param, $request, $key) {
+									return is_numeric($param) && $param;
 								},
 								'required'          => true,
 							),
 							'offset' => array(
-								'validate_callback' => function ( $param, $request, $key ) {
-									return is_numeric( $param );
+								'validate_callback' => function($param, $request, $key) {
+									return is_numeric($param);
 								},
 								'required'          => true,
 							),
@@ -68,17 +68,17 @@ 
 	}
 
 
-	public function get_tags( $request ) {
+	public function get_tags($request) {
 
 		$data   = $request->get_params();
 		$offset = (int) $data['offset'];
 		$limit  = (int) $data['limit'];
-		$tags = $this->get_terms_from_db( $limit, $offset );
+		$tags = $this->get_terms_from_db($limit, $offset);
 		$term_data_list = array();
 
-		foreach ( $tags as $tag ) {
+		foreach ($tags as $tag) {
 
-			if ( $this->is_tag_excluded_from_ui( $tag ) ) {
+			if ($this->is_tag_excluded_from_ui($tag)) {
 				continue;
 			}
 
@@ -87,7 +87,7 @@ 
 			 */
 			$term_data_instance = $this->term_data_factory->get_term_data($tag);
 			$term_data = $term_data_instance->get_data();
-			if ( $term_data['entities'] ) {
+			if ($term_data['entities']) {
 				$term_data_list[] = $term_data;
 			}
 		}
@@ -101,8 +101,8 @@ 
 	 *
 	 * @return bool
 	 */
-	private function is_tag_excluded_from_ui( $tag ) {
-		return (int) get_term_meta( $tag->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) === 1;
+	private function is_tag_excluded_from_ui($tag) {
+		return (int) get_term_meta($tag->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true) === 1;
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 *
 	 * @return int|\WP_Error|\WP_Term[]
 	 */
-	public function get_terms_from_db( $limit, $offset ) {
+	public function get_terms_from_db($limit, $offset) {
 
 
 		return Terms_Compat::get_terms(Terms_Compat::get_public_taxonomies(), array(

src/wordlift/vocabulary/class-analysis-service.php

Doc Comments +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 	 * Formats the entity url from https://foo.com/some/path to
 	 * https/foo.com/some/path
 	 *
-	 * @return bool|string
+	 * @return false|string
 	 */
 	public static function format_entity_url( $entity_url ) {
 		$result = parse_url( $entity_url );

Indentation +117 added lines, -117 removed lines

@@ -13,161 +13,161 @@
  */
 class Analysis_Service {
 
-	/**
-	 * @var Default_Api_Service
-	 */
-	private $api_service;
-	/**
-	 * @var Cache
-	 */
-	private $cache_service;
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
+    /**
+     * @var Default_Api_Service
+     */
+    private $api_service;
+    /**
+     * @var Cache
+     */
+    private $cache_service;
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
 
 
-	/**
-	 * Tag_Rest_Endpoint constructor.
-	 *
-	 * @param Default_Api_Service $api_service
-	 * @param Cache $cache_service
-	 */
-	public function __construct( $api_service, $cache_service ) {
+    /**
+     * Tag_Rest_Endpoint constructor.
+     *
+     * @param Default_Api_Service $api_service
+     * @param Cache $cache_service
+     */
+    public function __construct( $api_service, $cache_service ) {
 
-		$this->api_service = $api_service;
+        $this->api_service = $api_service;
 
-		$this->cache_service = $cache_service;
+        $this->cache_service = $cache_service;
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-	}
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+    }
 
 
-	/**
-	 * Check if entities are in cache, if not return the results from
-	 * cache service.
-	 *
-	 * @param $tag \WP_Term
-	 */
-	public function get_entities( $tag ) {
+    /**
+     * Check if entities are in cache, if not return the results from
+     * cache service.
+     *
+     * @param $tag \WP_Term
+     */
+    public function get_entities( $tag ) {
 
-		$cache_key    = $tag->term_id;
-		$cache_result = $this->cache_service->get( $cache_key );
-		if ( $cache_result !== false ) {
-			return $cache_result;
-		}
+        $cache_key    = $tag->term_id;
+        $cache_result = $this->cache_service->get( $cache_key );
+        if ( $cache_result !== false ) {
+            return $cache_result;
+        }
 
-		// send the request.
-		$response = $this->api_service->request(
-			'POST',
-			"/analysis/single",
-			array( 'Content-Type' => 'application/json' ),
-			wp_json_encode( array(
-				"content"         => $tag->name,
-				"contentType"     => "text/plain",
-				"version"         => "1.0.0",
-				"contentLanguage" => "en",
-				"scope"           => "all",
-			) )
-		);
+        // send the request.
+        $response = $this->api_service->request(
+            'POST',
+            "/analysis/single",
+            array( 'Content-Type' => 'application/json' ),
+            wp_json_encode( array(
+                "content"         => $tag->name,
+                "contentType"     => "text/plain",
+                "version"         => "1.0.0",
+                "contentLanguage" => "en",
+                "scope"           => "all",
+            ) )
+        );
 
 
-		if ( ! $response->is_success() ) {
-			return false;
-		}
+        if ( ! $response->is_success() ) {
+            return false;
+        }
 
-		$response = json_decode( $response->get_body(), true );
+        $response = json_decode( $response->get_body(), true );
 
-		if ( ! array_key_exists( 'entities', $response ) ) {
-			return false;
-		}
+        if ( ! array_key_exists( 'entities', $response ) ) {
+            return false;
+        }
 
 
-		$entities = $this->get_meta_for_entities( $response['entities'] );
+        $entities = $this->get_meta_for_entities( $response['entities'] );
 
-		$this->cache_service->put( $cache_key, $entities );
+        $this->cache_service->put( $cache_key, $entities );
 
-		return $entities;
+        return $entities;
 
-	}
+    }
 
 
-	/**
-	 * @param $entity_url string
-	 * Formats the entity url from https://foo.com/some/path to
-	 * https/foo.com/some/path
-	 *
-	 * @return bool|string
-	 */
-	public static function format_entity_url( $entity_url ) {
-		$result = parse_url( $entity_url );
-		if ( ! $result ) {
-			return false;
-		}
-		if ( ! array_key_exists( 'scheme', $result )
-		     || ! array_key_exists( 'host', $result )
-		     || ! array_key_exists( 'path', $result ) ) {
-			return false;
-		}
+    /**
+     * @param $entity_url string
+     * Formats the entity url from https://foo.com/some/path to
+     * https/foo.com/some/path
+     *
+     * @return bool|string
+     */
+    public static function format_entity_url( $entity_url ) {
+        $result = parse_url( $entity_url );
+        if ( ! $result ) {
+            return false;
+        }
+        if ( ! array_key_exists( 'scheme', $result )
+             || ! array_key_exists( 'host', $result )
+             || ! array_key_exists( 'path', $result ) ) {
+            return false;
+        }
 
-		return $result['scheme'] . "/" . $result['host'] . $result['path'];
-	}
+        return $result['scheme'] . "/" . $result['host'] . $result['path'];
+    }
 
-	private function get_meta( $entity_url ) {
+    private function get_meta( $entity_url ) {
 
 
-		$cache_results = $this->cache_service->get( $entity_url );
+        $cache_results = $this->cache_service->get( $entity_url );
 
-		if ( $cache_results !== false ) {
-			return $cache_results;
-		}
+        if ( $cache_results !== false ) {
+            return $cache_results;
+        }
 
-		$formatted_url = self::format_entity_url( $entity_url );
+        $formatted_url = self::format_entity_url( $entity_url );
 
-		if ( ! $formatted_url ) {
-			return array();
-		}
+        if ( ! $formatted_url ) {
+            return array();
+        }
 
-		$meta_url = 'https://api.wordlift.io/id/' . $formatted_url;
+        $meta_url = 'https://api.wordlift.io/id/' . $formatted_url;
 
-		$response = wp_remote_get( $meta_url );
+        $response = wp_remote_get( $meta_url );
 
-		$this->log->debug( "Requesting entity data for url :" . $meta_url );
-		$this->log->debug( "Got entity meta data as : " );
-		$this->log->debug( var_export( $response, true ) );
-		if ( ! is_wp_error( $response ) ) {
-			$meta = json_decode( wp_remote_retrieve_body( $response ), true );
-			$this->log->debug( "Saved entity data to meta :" );
-			$this->log->debug( var_export( $meta, true ) );
-			$this->cache_service->put( $entity_url, $meta );
+        $this->log->debug( "Requesting entity data for url :" . $meta_url );
+        $this->log->debug( "Got entity meta data as : " );
+        $this->log->debug( var_export( $response, true ) );
+        if ( ! is_wp_error( $response ) ) {
+            $meta = json_decode( wp_remote_retrieve_body( $response ), true );
+            $this->log->debug( "Saved entity data to meta :" );
+            $this->log->debug( var_export( $meta, true ) );
+            $this->cache_service->put( $entity_url, $meta );
 
-			return $meta;
-		}
+            return $meta;
+        }
 
 
-		return array();
+        return array();
 
-	}
+    }
 
-	private function get_meta_for_entities( $entities ) {
+    private function get_meta_for_entities( $entities ) {
 
-		$filtered_entities = array();
-		foreach ( $entities as $entity ) {
-			$entity['meta'] = array();
-			$meta = $this->get_meta( $entity['entityId'] );
-			$meta = Default_Entity_List::compact_jsonld($meta);
-			if ( $meta ) {
-				$entity['meta'] = $meta;
-			}
-			$filtered_entities[] = $entity;
-		}
-		$this->log->debug("Returning filtered entities as");
-		$this->log->debug(var_export($filtered_entities, true));
+        $filtered_entities = array();
+        foreach ( $entities as $entity ) {
+            $entity['meta'] = array();
+            $meta = $this->get_meta( $entity['entityId'] );
+            $meta = Default_Entity_List::compact_jsonld($meta);
+            if ( $meta ) {
+                $entity['meta'] = $meta;
+            }
+            $filtered_entities[] = $entity;
+        }
+        $this->log->debug("Returning filtered entities as");
+        $this->log->debug(var_export($filtered_entities, true));
 
-		return $filtered_entities;
+        return $filtered_entities;
 
-	}
+    }
 
 
 }

Spacing +39 added lines, -39 removed lines

@@ -33,13 +33,13 @@ 
 	 * @param Default_Api_Service $api_service
 	 * @param Cache $cache_service
 	 */
-	public function __construct( $api_service, $cache_service ) {
+	public function __construct($api_service, $cache_service) {
 
 		$this->api_service = $api_service;
 
 		$this->cache_service = $cache_service;
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 	}
 
@@ -50,11 +50,11 @@ 
 	 *
 	 * @param $tag \WP_Term
 	 */
-	public function get_entities( $tag ) {
+	public function get_entities($tag) {
 
 		$cache_key    = $tag->term_id;
-		$cache_result = $this->cache_service->get( $cache_key );
-		if ( $cache_result !== false ) {
+		$cache_result = $this->cache_service->get($cache_key);
+		if ($cache_result !== false) {
 			return $cache_result;
 		}
 
@@ -62,31 +62,31 @@ 
 		$response = $this->api_service->request(
 			'POST',
 			"/analysis/single",
-			array( 'Content-Type' => 'application/json' ),
-			wp_json_encode( array(
+			array('Content-Type' => 'application/json'),
+			wp_json_encode(array(
 				"content"         => $tag->name,
 				"contentType"     => "text/plain",
 				"version"         => "1.0.0",
 				"contentLanguage" => "en",
 				"scope"           => "all",
-			) )
+			))
 		);
 
 
-		if ( ! $response->is_success() ) {
+		if ( ! $response->is_success()) {
 			return false;
 		}
 
-		$response = json_decode( $response->get_body(), true );
+		$response = json_decode($response->get_body(), true);
 
-		if ( ! array_key_exists( 'entities', $response ) ) {
+		if ( ! array_key_exists('entities', $response)) {
 			return false;
 		}
 
 
-		$entities = $this->get_meta_for_entities( $response['entities'] );
+		$entities = $this->get_meta_for_entities($response['entities']);
 
-		$this->cache_service->put( $cache_key, $entities );
+		$this->cache_service->put($cache_key, $entities);
 
 		return $entities;
 
@@ -100,47 +100,47 @@ 
 	 *
 	 * @return bool|string
 	 */
-	public static function format_entity_url( $entity_url ) {
-		$result = parse_url( $entity_url );
-		if ( ! $result ) {
+	public static function format_entity_url($entity_url) {
+		$result = parse_url($entity_url);
+		if ( ! $result) {
 			return false;
 		}
-		if ( ! array_key_exists( 'scheme', $result )
-		     || ! array_key_exists( 'host', $result )
-		     || ! array_key_exists( 'path', $result ) ) {
+		if ( ! array_key_exists('scheme', $result)
+		     || ! array_key_exists('host', $result)
+		     || ! array_key_exists('path', $result)) {
 			return false;
 		}
 
-		return $result['scheme'] . "/" . $result['host'] . $result['path'];
+		return $result['scheme']."/".$result['host'].$result['path'];
 	}
 
-	private function get_meta( $entity_url ) {
+	private function get_meta($entity_url) {
 
 
-		$cache_results = $this->cache_service->get( $entity_url );
+		$cache_results = $this->cache_service->get($entity_url);
 
-		if ( $cache_results !== false ) {
+		if ($cache_results !== false) {
 			return $cache_results;
 		}
 
-		$formatted_url = self::format_entity_url( $entity_url );
+		$formatted_url = self::format_entity_url($entity_url);
 
-		if ( ! $formatted_url ) {
+		if ( ! $formatted_url) {
 			return array();
 		}
 
-		$meta_url = 'https://api.wordlift.io/id/' . $formatted_url;
+		$meta_url = 'https://api.wordlift.io/id/'.$formatted_url;
 
-		$response = wp_remote_get( $meta_url );
+		$response = wp_remote_get($meta_url);
 
-		$this->log->debug( "Requesting entity data for url :" . $meta_url );
-		$this->log->debug( "Got entity meta data as : " );
-		$this->log->debug( var_export( $response, true ) );
-		if ( ! is_wp_error( $response ) ) {
-			$meta = json_decode( wp_remote_retrieve_body( $response ), true );
-			$this->log->debug( "Saved entity data to meta :" );
-			$this->log->debug( var_export( $meta, true ) );
-			$this->cache_service->put( $entity_url, $meta );
+		$this->log->debug("Requesting entity data for url :".$meta_url);
+		$this->log->debug("Got entity meta data as : ");
+		$this->log->debug(var_export($response, true));
+		if ( ! is_wp_error($response)) {
+			$meta = json_decode(wp_remote_retrieve_body($response), true);
+			$this->log->debug("Saved entity data to meta :");
+			$this->log->debug(var_export($meta, true));
+			$this->cache_service->put($entity_url, $meta);
 
 			return $meta;
 		}
@@ -150,14 +150,14 @@ 
 
 	}
 
-	private function get_meta_for_entities( $entities ) {
+	private function get_meta_for_entities($entities) {
 
 		$filtered_entities = array();
-		foreach ( $entities as $entity ) {
+		foreach ($entities as $entity) {
 			$entity['meta'] = array();
-			$meta = $this->get_meta( $entity['entityId'] );
+			$meta = $this->get_meta($entity['entityId']);
 			$meta = Default_Entity_List::compact_jsonld($meta);
-			if ( $meta ) {
+			if ($meta) {
 				$entity['meta'] = $meta;
 			}
 			$filtered_entities[] = $entity;

src/wordlift/vocabulary/data/entity-list/class-default-entity-list.php

Doc Comments +2 added lines, -1 removed lines

@@ -20,7 +20,7 @@ 
 	 * Default_Entity constructor.
 	 *
 	 * @param $term_id int
-	 * @param $legacy_entity Legacy_Entity_List
+	 * @param Legacy_Entity_List $legacy_entity Legacy_Entity_List
 	 */
 	public function __construct( $term_id, $legacy_entity ) {
 		parent::__construct( $term_id );
@@ -46,6 +46,7 @@ 
 	 * Check if the key exists and value is array.
 	 *
 	 * @param $entity_data
+	 * @param string $key
 	 *
 	 * @return bool
 	 */

Indentation +157 added lines, -157 removed lines

@@ -9,162 +9,162 @@
  */
 class Default_Entity_List extends Entity_List {
 
-	const META_KEY = '_wl_vocabulary_entity_match_for_term';
-
-	/**
-	 * @var Legacy_Entity_List
-	 */
-	private $legacy_entity;
-
-	/**
-	 * Default_Entity constructor.
-	 *
-	 * @param $term_id int
-	 * @param $legacy_entity Legacy_Entity_List
-	 */
-	public function __construct( $term_id, $legacy_entity ) {
-		parent::__construct( $term_id );
-		$this->legacy_entity = $legacy_entity;
-	}
-
-	/**
-	 * @param $values
-	 *
-	 * @return array
-	 */
-	private static function extract_jsonld_values( $values ) {
-		return array_map( function ( $value ) {
-			if ( ! is_array($value) || ! array_key_exists( '@value', $value ) ) {
-				return $value;
-			}
-
-			return $value['@value'];
-		}, $values );
-	}
-
-	/**
-	 * Check if the key exists and value is array.
-	 *
-	 * @param $entity_data
-	 *
-	 * @return bool
-	 */
-	private static function is_value_array( $key, $entity_data ) {
-		return array_key_exists( $key, $entity_data ) && is_array( $entity_data[ $key ] );
-	}
-
-	public function get_jsonld_data() {
-		$default_data = get_term_meta( $this->term_id, self::META_KEY );
-		if ( is_array( $default_data ) && $default_data ) {
-			return $default_data;
-		}
-
-		// Use legacy entity if the data doesnt exist on that key.
-		return $this->legacy_entity->get_jsonld_data();
-	}
-
-	public function save_jsonld_data( $entity_data ) {
-
-		$entity_id = $entity_data['@id'];
-
-		if ( $entity_id ) {
-			$entity_data['sameAs'] = array_merge( $entity_data['sameAs'], array( $entity_id ) );
-		}
-
-		$entity_list = get_term_meta( $this->term_id, self::META_KEY );
-
-		$entity_list[] = $this->compact_jsonld( $this->filter_entity_data( $entity_data ) );
-
-		$this->clear_and_save_list( $entity_list );
-
-	}
-
-	public function clear_data() {
-		delete_term_meta( $this->term_id, self::META_KEY );
-	}
-
-
-	public function remove_entity_by_id( $entity_id ) {
-		$entity_list = get_term_meta( $this->term_id, self::META_KEY );
-		foreach ( $entity_list as $key => $entity ) {
-			$same_as = $entity['sameAs'];
-			if ( in_array( $entity_id, $same_as ) ) {
-				// since entity ids are unique, we break after finding the first instance.
-				unset( $entity_list[ $key ] );
-				break;
-			}
-		}
-		$this->clear_and_save_list( $entity_list );
-
-	}
-
-	/**
-	 * @param $entity_list
-	 */
-	private function save_entity_list( $entity_list ) {
-		foreach ( $entity_list as $single_entity ) {
-			add_term_meta( $this->term_id, self::META_KEY, $single_entity );
-		}
-	}
-
-	/**
-	 * @param $entity_list
-	 */
-	private function clear_and_save_list( $entity_list ) {
-		// Clear all data and add the new one.
-		$this->clear_data();
-		$this->save_entity_list( $entity_list );
-	}
-
-
-	/**
-	 * For now support only these properties.
-	 *
-	 * @param $entity_data
-	 *
-	 * @return array
-	 */
-	private function filter_entity_data( $entity_data ) {
-		$allowed_keys = array( '@id', 'description', 'sameAs', '@type', 'name' );
-		$data         = array();
-		foreach ( $entity_data as $key => $value ) {
-			if ( in_array( $key, $allowed_keys ) ) {
-				$data[ $key ] = $value;
-			}
-		}
-
-		return $data;
-	}
-
-
-	public static function compact_jsonld( $entity_data ) {
-
-		if ( self::is_value_array( '@type', $entity_data ) ) {
-			$entity_data['@type'] = array_map( function ( $type ) {
-				return str_replace( "http://schema.org/", "", $type );
-			}, $entity_data['@type'] );
-		}
-
-		if ( self::is_value_array( 'description', $entity_data ) ) {
-			$entity_data['description'] = self::extract_jsonld_values( $entity_data['description'] );
-		}
-
-
-		if ( self::is_value_array( 'name', $entity_data ) ) {
-			$entity_data['name'] = self::extract_jsonld_values( $entity_data['name'] );
-		}
-
-
-		if ( self::is_value_array( 'sameAs', $entity_data ) ) {
-			$entity_data['sameAs'] = array_map( function ( $sameas ) {
-				if ( ! is_array($sameas) || ! array_key_exists( '@id', $sameas ) ) {
-					return $sameas;
-				}
-				return $sameas['@id'];
-			}, $entity_data['sameAs'] );
-		}
-
+    const META_KEY = '_wl_vocabulary_entity_match_for_term';
+
+    /**
+     * @var Legacy_Entity_List
+     */
+    private $legacy_entity;
+
+    /**
+     * Default_Entity constructor.
+     *
+     * @param $term_id int
+     * @param $legacy_entity Legacy_Entity_List
+     */
+    public function __construct( $term_id, $legacy_entity ) {
+        parent::__construct( $term_id );
+        $this->legacy_entity = $legacy_entity;
+    }
+
+    /**
+     * @param $values
+     *
+     * @return array
+     */
+    private static function extract_jsonld_values( $values ) {
+        return array_map( function ( $value ) {
+            if ( ! is_array($value) || ! array_key_exists( '@value', $value ) ) {
+                return $value;
+            }
+
+            return $value['@value'];
+        }, $values );
+    }
+
+    /**
+     * Check if the key exists and value is array.
+     *
+     * @param $entity_data
+     *
+     * @return bool
+     */
+    private static function is_value_array( $key, $entity_data ) {
+        return array_key_exists( $key, $entity_data ) && is_array( $entity_data[ $key ] );
+    }
+
+    public function get_jsonld_data() {
+        $default_data = get_term_meta( $this->term_id, self::META_KEY );
+        if ( is_array( $default_data ) && $default_data ) {
+            return $default_data;
+        }
+
+        // Use legacy entity if the data doesnt exist on that key.
+        return $this->legacy_entity->get_jsonld_data();
+    }
+
+    public function save_jsonld_data( $entity_data ) {
+
+        $entity_id = $entity_data['@id'];
+
+        if ( $entity_id ) {
+            $entity_data['sameAs'] = array_merge( $entity_data['sameAs'], array( $entity_id ) );
+        }
+
+        $entity_list = get_term_meta( $this->term_id, self::META_KEY );
+
+        $entity_list[] = $this->compact_jsonld( $this->filter_entity_data( $entity_data ) );
+
+        $this->clear_and_save_list( $entity_list );
+
+    }
+
+    public function clear_data() {
+        delete_term_meta( $this->term_id, self::META_KEY );
+    }
+
+
+    public function remove_entity_by_id( $entity_id ) {
+        $entity_list = get_term_meta( $this->term_id, self::META_KEY );
+        foreach ( $entity_list as $key => $entity ) {
+            $same_as = $entity['sameAs'];
+            if ( in_array( $entity_id, $same_as ) ) {
+                // since entity ids are unique, we break after finding the first instance.
+                unset( $entity_list[ $key ] );
+                break;
+            }
+        }
+        $this->clear_and_save_list( $entity_list );
+
+    }
+
+    /**
+     * @param $entity_list
+     */
+    private function save_entity_list( $entity_list ) {
+        foreach ( $entity_list as $single_entity ) {
+            add_term_meta( $this->term_id, self::META_KEY, $single_entity );
+        }
+    }
+
+    /**
+     * @param $entity_list
+     */
+    private function clear_and_save_list( $entity_list ) {
+        // Clear all data and add the new one.
+        $this->clear_data();
+        $this->save_entity_list( $entity_list );
+    }
+
+
+    /**
+     * For now support only these properties.
+     *
+     * @param $entity_data
+     *
+     * @return array
+     */
+    private function filter_entity_data( $entity_data ) {
+        $allowed_keys = array( '@id', 'description', 'sameAs', '@type', 'name' );
+        $data         = array();
+        foreach ( $entity_data as $key => $value ) {
+            if ( in_array( $key, $allowed_keys ) ) {
+                $data[ $key ] = $value;
+            }
+        }
+
+        return $data;
+    }
+
+
+    public static function compact_jsonld( $entity_data ) {
+
+        if ( self::is_value_array( '@type', $entity_data ) ) {
+            $entity_data['@type'] = array_map( function ( $type ) {
+                return str_replace( "http://schema.org/", "", $type );
+            }, $entity_data['@type'] );
+        }
+
+        if ( self::is_value_array( 'description', $entity_data ) ) {
+            $entity_data['description'] = self::extract_jsonld_values( $entity_data['description'] );
+        }
+
+
+        if ( self::is_value_array( 'name', $entity_data ) ) {
+            $entity_data['name'] = self::extract_jsonld_values( $entity_data['name'] );
+        }
+
+
+        if ( self::is_value_array( 'sameAs', $entity_data ) ) {
+            $entity_data['sameAs'] = array_map( function ( $sameas ) {
+                if ( ! is_array($sameas) || ! array_key_exists( '@id', $sameas ) ) {
+                    return $sameas;
+                }
+                return $sameas['@id'];
+            }, $entity_data['sameAs'] );
+        }
+
 
-		return $entity_data;
-	}
+        return $entity_data;
+    }
 }
\ No newline at end of file

Spacing +46 added lines, -46 removed lines

@@ -22,8 +22,8 @@ 
 	 * @param $term_id int
 	 * @param $legacy_entity Legacy_Entity_List
 	 */
-	public function __construct( $term_id, $legacy_entity ) {
-		parent::__construct( $term_id );
+	public function __construct($term_id, $legacy_entity) {
+		parent::__construct($term_id);
 		$this->legacy_entity = $legacy_entity;
 	}
 
@@ -32,14 +32,14 @@ 
 	 *
 	 * @return array
 	 */
-	private static function extract_jsonld_values( $values ) {
-		return array_map( function ( $value ) {
-			if ( ! is_array($value) || ! array_key_exists( '@value', $value ) ) {
+	private static function extract_jsonld_values($values) {
+		return array_map(function($value) {
+			if ( ! is_array($value) || ! array_key_exists('@value', $value)) {
 				return $value;
 			}
 
 			return $value['@value'];
-		}, $values );
+		}, $values);
 	}
 
 	/**
@@ -49,13 +49,13 @@ 
 	 *
 	 * @return bool
 	 */
-	private static function is_value_array( $key, $entity_data ) {
-		return array_key_exists( $key, $entity_data ) && is_array( $entity_data[ $key ] );
+	private static function is_value_array($key, $entity_data) {
+		return array_key_exists($key, $entity_data) && is_array($entity_data[$key]);
 	}
 
 	public function get_jsonld_data() {
-		$default_data = get_term_meta( $this->term_id, self::META_KEY );
-		if ( is_array( $default_data ) && $default_data ) {
+		$default_data = get_term_meta($this->term_id, self::META_KEY);
+		if (is_array($default_data) && $default_data) {
 			return $default_data;
 		}
 
@@ -63,57 +63,57 @@ 
 		return $this->legacy_entity->get_jsonld_data();
 	}
 
-	public function save_jsonld_data( $entity_data ) {
+	public function save_jsonld_data($entity_data) {
 
 		$entity_id = $entity_data['@id'];
 
-		if ( $entity_id ) {
-			$entity_data['sameAs'] = array_merge( $entity_data['sameAs'], array( $entity_id ) );
+		if ($entity_id) {
+			$entity_data['sameAs'] = array_merge($entity_data['sameAs'], array($entity_id));
 		}
 
-		$entity_list = get_term_meta( $this->term_id, self::META_KEY );
+		$entity_list = get_term_meta($this->term_id, self::META_KEY);
 
-		$entity_list[] = $this->compact_jsonld( $this->filter_entity_data( $entity_data ) );
+		$entity_list[] = $this->compact_jsonld($this->filter_entity_data($entity_data));
 
-		$this->clear_and_save_list( $entity_list );
+		$this->clear_and_save_list($entity_list);
 
 	}
 
 	public function clear_data() {
-		delete_term_meta( $this->term_id, self::META_KEY );
+		delete_term_meta($this->term_id, self::META_KEY);
 	}
 
 
-	public function remove_entity_by_id( $entity_id ) {
-		$entity_list = get_term_meta( $this->term_id, self::META_KEY );
-		foreach ( $entity_list as $key => $entity ) {
+	public function remove_entity_by_id($entity_id) {
+		$entity_list = get_term_meta($this->term_id, self::META_KEY);
+		foreach ($entity_list as $key => $entity) {
 			$same_as = $entity['sameAs'];
-			if ( in_array( $entity_id, $same_as ) ) {
+			if (in_array($entity_id, $same_as)) {
 				// since entity ids are unique, we break after finding the first instance.
-				unset( $entity_list[ $key ] );
+				unset($entity_list[$key]);
 				break;
 			}
 		}
-		$this->clear_and_save_list( $entity_list );
+		$this->clear_and_save_list($entity_list);
 
 	}
 
 	/**
 	 * @param $entity_list
 	 */
-	private function save_entity_list( $entity_list ) {
-		foreach ( $entity_list as $single_entity ) {
-			add_term_meta( $this->term_id, self::META_KEY, $single_entity );
+	private function save_entity_list($entity_list) {
+		foreach ($entity_list as $single_entity) {
+			add_term_meta($this->term_id, self::META_KEY, $single_entity);
 		}
 	}
 
 	/**
 	 * @param $entity_list
 	 */
-	private function clear_and_save_list( $entity_list ) {
+	private function clear_and_save_list($entity_list) {
 		// Clear all data and add the new one.
 		$this->clear_data();
-		$this->save_entity_list( $entity_list );
+		$this->save_entity_list($entity_list);
 	}
 
 
@@ -124,12 +124,12 @@ 
 	 *
 	 * @return array
 	 */
-	private function filter_entity_data( $entity_data ) {
-		$allowed_keys = array( '@id', 'description', 'sameAs', '@type', 'name' );
+	private function filter_entity_data($entity_data) {
+		$allowed_keys = array('@id', 'description', 'sameAs', '@type', 'name');
 		$data         = array();
-		foreach ( $entity_data as $key => $value ) {
-			if ( in_array( $key, $allowed_keys ) ) {
-				$data[ $key ] = $value;
+		foreach ($entity_data as $key => $value) {
+			if (in_array($key, $allowed_keys)) {
+				$data[$key] = $value;
 			}
 		}
 
@@ -137,31 +137,31 @@ 
 	}
 
 
-	public static function compact_jsonld( $entity_data ) {
+	public static function compact_jsonld($entity_data) {
 
-		if ( self::is_value_array( '@type', $entity_data ) ) {
-			$entity_data['@type'] = array_map( function ( $type ) {
-				return str_replace( "http://schema.org/", "", $type );
-			}, $entity_data['@type'] );
+		if (self::is_value_array('@type', $entity_data)) {
+			$entity_data['@type'] = array_map(function($type) {
+				return str_replace("http://schema.org/", "", $type);
+			}, $entity_data['@type']);
 		}
 
-		if ( self::is_value_array( 'description', $entity_data ) ) {
-			$entity_data['description'] = self::extract_jsonld_values( $entity_data['description'] );
+		if (self::is_value_array('description', $entity_data)) {
+			$entity_data['description'] = self::extract_jsonld_values($entity_data['description']);
 		}
 
 
-		if ( self::is_value_array( 'name', $entity_data ) ) {
-			$entity_data['name'] = self::extract_jsonld_values( $entity_data['name'] );
+		if (self::is_value_array('name', $entity_data)) {
+			$entity_data['name'] = self::extract_jsonld_values($entity_data['name']);
 		}
 
 
-		if ( self::is_value_array( 'sameAs', $entity_data ) ) {
-			$entity_data['sameAs'] = array_map( function ( $sameas ) {
-				if ( ! is_array($sameas) || ! array_key_exists( '@id', $sameas ) ) {
+		if (self::is_value_array('sameAs', $entity_data)) {
+			$entity_data['sameAs'] = array_map(function($sameas) {
+				if ( ! is_array($sameas) || ! array_key_exists('@id', $sameas)) {
 					return $sameas;
 				}
 				return $sameas['@id'];
-			}, $entity_data['sameAs'] );
+			}, $entity_data['sameAs']);
 		}
 
 

src/wordlift/vocabulary/class-analysis-background-service.php

Indentation +126 added lines, -126 removed lines

@@ -6,135 +6,135 @@
 class Analysis_Background_Service {
 
 
-	const ANALYSIS_DONE_FLAG = '_wl_cmkg_analysis_complete_for_term_options_cache';
-	const TERMS_COUNT_TRANSIENT = '_wl_cmkg_analysis_background_service_terms_count';
-	const ENTITIES_PRESENT_FOR_TERM = '_wl_cmkg_analysis_entities_present_for_term_options_cache';
-
-	/**
-	 * @var Analysis_Service
-	 */
-	private $analysis_service;
-	/**
-	 * @var Analysis_Background_Process
-	 */
-	private $analysis_background_process;
-
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-
-
-	public function __construct( $analysis_service ) {
-
-		$this->analysis_service = $analysis_service;
-
-		$this->analysis_background_process = new Analysis_Background_Process( $this );
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-	}
-
-	public function start() {
-		$this->analysis_background_process->start();
-	}
-
-	public function cancel() {
-		$this->analysis_background_process->cancel();
-	}
-
-	public function stop() {
-		$this->analysis_background_process->cancel();
-		$this->analysis_background_process->request_cancel();
-	}
-
-	/**
-	 * A list of term ids.
-	 * @return int|\WP_Error|\WP_Term[]
-	 */
-	public function next() {
-
-		$state = $this->info();
-
-		return Terms_Compat::get_terms( Terms_Compat::get_public_taxonomies(), array(
-			'fields'     => 'ids',
-			'hide_empty' => false,
-			'number'     => $this->get_batch_size(),
-			'offset'     => $state->index,
-			'meta_query' => array(
-				array(
-					'key'     => self::ANALYSIS_DONE_FLAG,
-					'compare' => 'NOT EXISTS'
-				)
-			),
-		) );
-	}
-
-	public function count() {
-
-		$count = count( Terms_Compat::get_terms(
-			Terms_Compat::get_public_taxonomies(),
-			array(
-			'fields'     => 'ids',
-			'hide_empty' => false,
-			// return all terms, we cant pass -1 here.
-			'number'     => 0,
-			'meta_query' => array(
-				array(
-					'key'     => self::ANALYSIS_DONE_FLAG,
-					'compare' => 'NOT EXISTS'
-				)
-			),
-		) ) );
-
-		$this->log->debug( "Count returned as $count" );
-
-
-		return $count;
-	}
-
-	public function get_batch_size() {
-		return 10;
-	}
-
-	public function info() {
-		return Analysis_Background_Process::get_state();
-	}
-
-	/**
-	 * @param $term_ids
-	 *
-	 * @return bool
-	 */
-	public function perform_analysis_for_terms( $term_ids ) {
-
-		foreach ( $term_ids as $term_id ) {
-
-			$tag = get_term( $term_id );
-
-			// This adds the entities to ttl cache
-			$result = $this->analysis_service->get_entities( $tag );
+    const ANALYSIS_DONE_FLAG = '_wl_cmkg_analysis_complete_for_term_options_cache';
+    const TERMS_COUNT_TRANSIENT = '_wl_cmkg_analysis_background_service_terms_count';
+    const ENTITIES_PRESENT_FOR_TERM = '_wl_cmkg_analysis_entities_present_for_term_options_cache';
+
+    /**
+     * @var Analysis_Service
+     */
+    private $analysis_service;
+    /**
+     * @var Analysis_Background_Process
+     */
+    private $analysis_background_process;
+
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+
+
+    public function __construct( $analysis_service ) {
+
+        $this->analysis_service = $analysis_service;
+
+        $this->analysis_background_process = new Analysis_Background_Process( $this );
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+    }
+
+    public function start() {
+        $this->analysis_background_process->start();
+    }
+
+    public function cancel() {
+        $this->analysis_background_process->cancel();
+    }
+
+    public function stop() {
+        $this->analysis_background_process->cancel();
+        $this->analysis_background_process->request_cancel();
+    }
+
+    /**
+     * A list of term ids.
+     * @return int|\WP_Error|\WP_Term[]
+     */
+    public function next() {
+
+        $state = $this->info();
+
+        return Terms_Compat::get_terms( Terms_Compat::get_public_taxonomies(), array(
+            'fields'     => 'ids',
+            'hide_empty' => false,
+            'number'     => $this->get_batch_size(),
+            'offset'     => $state->index,
+            'meta_query' => array(
+                array(
+                    'key'     => self::ANALYSIS_DONE_FLAG,
+                    'compare' => 'NOT EXISTS'
+                )
+            ),
+        ) );
+    }
+
+    public function count() {
+
+        $count = count( Terms_Compat::get_terms(
+            Terms_Compat::get_public_taxonomies(),
+            array(
+            'fields'     => 'ids',
+            'hide_empty' => false,
+            // return all terms, we cant pass -1 here.
+            'number'     => 0,
+            'meta_query' => array(
+                array(
+                    'key'     => self::ANALYSIS_DONE_FLAG,
+                    'compare' => 'NOT EXISTS'
+                )
+            ),
+        ) ) );
+
+        $this->log->debug( "Count returned as $count" );
+
+
+        return $count;
+    }
+
+    public function get_batch_size() {
+        return 10;
+    }
+
+    public function info() {
+        return Analysis_Background_Process::get_state();
+    }
+
+    /**
+     * @param $term_ids
+     *
+     * @return bool
+     */
+    public function perform_analysis_for_terms( $term_ids ) {
+
+        foreach ( $term_ids as $term_id ) {
+
+            $tag = get_term( $term_id );
+
+            // This adds the entities to ttl cache
+            $result = $this->analysis_service->get_entities( $tag );
 
-			$this->log->debug( "Received result " . var_export( $result ) . " for ${term_id}" );
+            $this->log->debug( "Received result " . var_export( $result ) . " for ${term_id}" );
 
-			if ( $result !== false ) {
-				// then set the analysis complete flag.
-				update_term_meta( $term_id, self::ANALYSIS_DONE_FLAG, 1 );
-				if ( count( $result ) > 0 ) {
-					update_term_meta( $term_id, self::ENTITIES_PRESENT_FOR_TERM, 1 );
-				}
-			}
+            if ( $result !== false ) {
+                // then set the analysis complete flag.
+                update_term_meta( $term_id, self::ANALYSIS_DONE_FLAG, 1 );
+                if ( count( $result ) > 0 ) {
+                    update_term_meta( $term_id, self::ENTITIES_PRESENT_FOR_TERM, 1 );
+                }
+            }
 
-		}
+        }
 
-		/**
-		 * This action fires when the analysis is complete for the current batch
-		 * @since 3.30.0
-		 */
-		do_action( 'wordlift_vocabulary_analysis_complete_for_terms_batch' );
-
-		return true;
-
-
-	}
+        /**
+         * This action fires when the analysis is complete for the current batch
+         * @since 3.30.0
+         */
+        do_action( 'wordlift_vocabulary_analysis_complete_for_terms_batch' );
+
+        return true;
+
+
+    }
 
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -25,13 +25,13 @@ 
 	private $log;
 
 
-	public function __construct( $analysis_service ) {
+	public function __construct($analysis_service) {
 
 		$this->analysis_service = $analysis_service;
 
-		$this->analysis_background_process = new Analysis_Background_Process( $this );
+		$this->analysis_background_process = new Analysis_Background_Process($this);
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 	}
 
 	public function start() {
@@ -55,7 +55,7 @@ 
 
 		$state = $this->info();
 
-		return Terms_Compat::get_terms( Terms_Compat::get_public_taxonomies(), array(
+		return Terms_Compat::get_terms(Terms_Compat::get_public_taxonomies(), array(
 			'fields'     => 'ids',
 			'hide_empty' => false,
 			'number'     => $this->get_batch_size(),
@@ -66,12 +66,12 @@ 
 					'compare' => 'NOT EXISTS'
 				)
 			),
-		) );
+		));
 	}
 
 	public function count() {
 
-		$count = count( Terms_Compat::get_terms(
+		$count = count(Terms_Compat::get_terms(
 			Terms_Compat::get_public_taxonomies(),
 			array(
 			'fields'     => 'ids',
@@ -84,9 +84,9 @@ 
 					'compare' => 'NOT EXISTS'
 				)
 			),
-		) ) );
+		) ));
 
-		$this->log->debug( "Count returned as $count" );
+		$this->log->debug("Count returned as $count");
 
 
 		return $count;
@@ -105,22 +105,22 @@ 
 	 *
 	 * @return bool
 	 */
-	public function perform_analysis_for_terms( $term_ids ) {
+	public function perform_analysis_for_terms($term_ids) {
 
-		foreach ( $term_ids as $term_id ) {
+		foreach ($term_ids as $term_id) {
 
-			$tag = get_term( $term_id );
+			$tag = get_term($term_id);
 
 			// This adds the entities to ttl cache
-			$result = $this->analysis_service->get_entities( $tag );
+			$result = $this->analysis_service->get_entities($tag);
 
-			$this->log->debug( "Received result " . var_export( $result ) . " for ${term_id}" );
+			$this->log->debug("Received result ".var_export($result)." for ${term_id}");
 
-			if ( $result !== false ) {
+			if ($result !== false) {
 				// then set the analysis complete flag.
-				update_term_meta( $term_id, self::ANALYSIS_DONE_FLAG, 1 );
-				if ( count( $result ) > 0 ) {
-					update_term_meta( $term_id, self::ENTITIES_PRESENT_FOR_TERM, 1 );
+				update_term_meta($term_id, self::ANALYSIS_DONE_FLAG, 1);
+				if (count($result) > 0) {
+					update_term_meta($term_id, self::ENTITIES_PRESENT_FOR_TERM, 1);
 				}
 			}
 
@@ -130,7 +130,7 @@ 
 		 * This action fires when the analysis is complete for the current batch
 		 * @since 3.30.0
 		 */
-		do_action( 'wordlift_vocabulary_analysis_complete_for_terms_batch' );
+		do_action('wordlift_vocabulary_analysis_complete_for_terms_batch');
 
 		return true;
 

src/wordlift/vocabulary/jsonld/class-post-jsonld.php

Indentation +74 added lines, -74 removed lines

@@ -12,108 +12,108 @@
 
 class Post_Jsonld {
 
-	public function enhance_post_jsonld() {
-		add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 11, 2 );
-	}
+    public function enhance_post_jsonld() {
+        add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
+        add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 11, 2 );
+    }
 
-	public function wl_post_jsonld_array( $arr, $post_id ) {
+    public function wl_post_jsonld_array( $arr, $post_id ) {
 
-		$jsonld     = $arr['jsonld'];
-		$references = $arr['references'];
+        $jsonld     = $arr['jsonld'];
+        $references = $arr['references'];
 
-		$this->add_mentions( $post_id, $jsonld, $references );
+        $this->add_mentions( $post_id, $jsonld, $references );
 
-		return array(
-			'jsonld'     => $jsonld,
-			'references' => $references
-		);
+        return array(
+            'jsonld'     => $jsonld,
+            'references' => $references
+        );
 
-	}
+    }
 
-	public function add_mentions( $post_id, &$jsonld, &$references ) {
+    public function add_mentions( $post_id, &$jsonld, &$references ) {
 
-		$taxonomies = Terms_Compat::get_public_taxonomies();
-		$terms      = array();
+        $taxonomies = Terms_Compat::get_public_taxonomies();
+        $terms      = array();
 
-		foreach ( $taxonomies as $taxonomy ) {
-			$taxonomy_terms = get_the_terms( $post_id, $taxonomy );
-			if ( ! $taxonomy_terms ) {
-				continue;
-			}
-			$terms = array_merge( $taxonomy_terms, $terms );
-		}
+        foreach ( $taxonomies as $taxonomy ) {
+            $taxonomy_terms = get_the_terms( $post_id, $taxonomy );
+            if ( ! $taxonomy_terms ) {
+                continue;
+            }
+            $terms = array_merge( $taxonomy_terms, $terms );
+        }
 
-		if ( ! $terms  ) {
-			return;
-		}
+        if ( ! $terms  ) {
+            return;
+        }
 
-		if ( ! array_key_exists( 'mentions', $jsonld ) ) {
-			$jsonld['mentions'] = array();
-		}
+        if ( ! array_key_exists( 'mentions', $jsonld ) ) {
+            $jsonld['mentions'] = array();
+        }
 
-		foreach ( $terms as $term ) {
+        foreach ( $terms as $term ) {
 
-			$is_matched = intval( get_term_meta( $term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) ) === 1;
+            $is_matched = intval( get_term_meta( $term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) ) === 1;
 
-			if ( ! $is_matched ) {
-				continue;
-			}
+            if ( ! $is_matched ) {
+                continue;
+            }
 
-			$entity = Entity_List_Factory::get_instance( $term->term_id );
+            $entity = Entity_List_Factory::get_instance( $term->term_id );
 
-			$entities = $entity->get_jsonld_data();
+            $entities = $entity->get_jsonld_data();
 
-			if ( count( $entities ) === 0 ) {
-				continue;
-			}
+            if ( count( $entities ) === 0 ) {
+                continue;
+            }
 
-			$jsonld['mentions'] = array_merge( $jsonld['mentions'], self::add_additional_attrs( $term, $entities ) );
-		}
+            $jsonld['mentions'] = array_merge( $jsonld['mentions'], self::add_additional_attrs( $term, $entities ) );
+        }
 
-	}
+    }
 
-	/**
-	 * @param $term \WP_Term
-	 * @param $entities
-	 *
-	 * @return array
-	 */
-	public static function add_additional_attrs( $term, $entities ) {
+    /**
+     * @param $term \WP_Term
+     * @param $entities
+     *
+     * @return array
+     */
+    public static function add_additional_attrs( $term, $entities ) {
 
-		return array_map( function ( $entity ) use ( $term ) {
-			$entity['@id'] = get_term_link( $term->term_id ) . '#id';
-			if ( ! empty( $term->description ) ) {
-				$entity['description'] = $term->description;
-			}
+        return array_map( function ( $entity ) use ( $term ) {
+            $entity['@id'] = get_term_link( $term->term_id ) . '#id';
+            if ( ! empty( $term->description ) ) {
+                $entity['description'] = $term->description;
+            }
 
-			return $entity;
+            return $entity;
 
-		}, $entities );
+        }, $entities );
 
-	}
+    }
 
-	public function wl_after_get_jsonld( $jsonld, $post_id ) {
+    public function wl_after_get_jsonld( $jsonld, $post_id ) {
 
-		if ( ! is_array( $jsonld ) || count( $jsonld ) === 0 ) {
-			return $jsonld;
-		}
+        if ( ! is_array( $jsonld ) || count( $jsonld ) === 0 ) {
+            return $jsonld;
+        }
 
-		foreach ( $jsonld as $key => $value ) {
-			if ( $value['@type'] === 'Article' && isset( $value['image'] ) ) {
-				$image = $value['image'];
-			}
-			if ( $value['@type'] === 'Recipe' && ! isset( $value['image'] ) ) {
-				$index = $key;
-			}
-		}
+        foreach ( $jsonld as $key => $value ) {
+            if ( $value['@type'] === 'Article' && isset( $value['image'] ) ) {
+                $image = $value['image'];
+            }
+            if ( $value['@type'] === 'Recipe' && ! isset( $value['image'] ) ) {
+                $index = $key;
+            }
+        }
 
-		if ( isset( $index ) && ! empty( $image ) ) {
-			$jsonld[ $index ]['image'] = $image;
-		}
+        if ( isset( $index ) && ! empty( $image ) ) {
+            $jsonld[ $index ]['image'] = $image;
+        }
 
-		return $jsonld;
+        return $jsonld;
 
-	}
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -13,16 +13,16 @@ 
 class Post_Jsonld {
 
 	public function enhance_post_jsonld() {
-		add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 11, 2 );
+		add_filter('wl_post_jsonld_array', array($this, 'wl_post_jsonld_array'), 11, 2);
+		add_filter('wl_after_get_jsonld', array($this, 'wl_after_get_jsonld'), 11, 2);
 	}
 
-	public function wl_post_jsonld_array( $arr, $post_id ) {
+	public function wl_post_jsonld_array($arr, $post_id) {
 
 		$jsonld     = $arr['jsonld'];
 		$references = $arr['references'];
 
-		$this->add_mentions( $post_id, $jsonld, $references );
+		$this->add_mentions($post_id, $jsonld, $references);
 
 		return array(
 			'jsonld'     => $jsonld,
@@ -31,44 +31,44 @@ 
 
 	}
 
-	public function add_mentions( $post_id, &$jsonld, &$references ) {
+	public function add_mentions($post_id, &$jsonld, &$references) {
 
 		$taxonomies = Terms_Compat::get_public_taxonomies();
 		$terms      = array();
 
-		foreach ( $taxonomies as $taxonomy ) {
-			$taxonomy_terms = get_the_terms( $post_id, $taxonomy );
-			if ( ! $taxonomy_terms ) {
+		foreach ($taxonomies as $taxonomy) {
+			$taxonomy_terms = get_the_terms($post_id, $taxonomy);
+			if ( ! $taxonomy_terms) {
 				continue;
 			}
-			$terms = array_merge( $taxonomy_terms, $terms );
+			$terms = array_merge($taxonomy_terms, $terms);
 		}
 
-		if ( ! $terms  ) {
+		if ( ! $terms) {
 			return;
 		}
 
-		if ( ! array_key_exists( 'mentions', $jsonld ) ) {
+		if ( ! array_key_exists('mentions', $jsonld)) {
 			$jsonld['mentions'] = array();
 		}
 
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 
-			$is_matched = intval( get_term_meta( $term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) ) === 1;
+			$is_matched = intval(get_term_meta($term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true)) === 1;
 
-			if ( ! $is_matched ) {
+			if ( ! $is_matched) {
 				continue;
 			}
 
-			$entity = Entity_List_Factory::get_instance( $term->term_id );
+			$entity = Entity_List_Factory::get_instance($term->term_id);
 
 			$entities = $entity->get_jsonld_data();
 
-			if ( count( $entities ) === 0 ) {
+			if (count($entities) === 0) {
 				continue;
 			}
 
-			$jsonld['mentions'] = array_merge( $jsonld['mentions'], self::add_additional_attrs( $term, $entities ) );
+			$jsonld['mentions'] = array_merge($jsonld['mentions'], self::add_additional_attrs($term, $entities));
 		}
 
 	}
@@ -79,37 +79,37 @@ 
 	 *
 	 * @return array
 	 */
-	public static function add_additional_attrs( $term, $entities ) {
+	public static function add_additional_attrs($term, $entities) {
 
-		return array_map( function ( $entity ) use ( $term ) {
-			$entity['@id'] = get_term_link( $term->term_id ) . '#id';
-			if ( ! empty( $term->description ) ) {
+		return array_map(function($entity) use ($term) {
+			$entity['@id'] = get_term_link($term->term_id).'#id';
+			if ( ! empty($term->description)) {
 				$entity['description'] = $term->description;
 			}
 
 			return $entity;
 
-		}, $entities );
+		}, $entities);
 
 	}
 
-	public function wl_after_get_jsonld( $jsonld, $post_id ) {
+	public function wl_after_get_jsonld($jsonld, $post_id) {
 
-		if ( ! is_array( $jsonld ) || count( $jsonld ) === 0 ) {
+		if ( ! is_array($jsonld) || count($jsonld) === 0) {
 			return $jsonld;
 		}
 
-		foreach ( $jsonld as $key => $value ) {
-			if ( $value['@type'] === 'Article' && isset( $value['image'] ) ) {
+		foreach ($jsonld as $key => $value) {
+			if ($value['@type'] === 'Article' && isset($value['image'])) {
 				$image = $value['image'];
 			}
-			if ( $value['@type'] === 'Recipe' && ! isset( $value['image'] ) ) {
+			if ($value['@type'] === 'Recipe' && ! isset($value['image'])) {
 				$index = $key;
 			}
 		}
 
-		if ( isset( $index ) && ! empty( $image ) ) {
-			$jsonld[ $index ]['image'] = $image;
+		if (isset($index) && ! empty($image)) {
+			$jsonld[$index]['image'] = $image;
 		}
 
 		return $jsonld;

src/wordlift/vocabulary/class-terms-compat.php

Indentation +12 added lines, -12 removed lines

@@ -3,20 +3,20 @@
 
 class Terms_Compat {
 
-	public static function get_terms( $taxonomy, $args_with_taxonomy_key ) {
-		global $wp_version;
+    public static function get_terms( $taxonomy, $args_with_taxonomy_key ) {
+        global $wp_version;
 
-		if ( version_compare( $wp_version, '4.5', '<' ) ) {
-			return get_terms( $taxonomy, $args_with_taxonomy_key );
-		} else {
-			$args_with_taxonomy_key['taxonomy'] = $taxonomy;
-			return get_terms( $args_with_taxonomy_key );
-		}
-	}
+        if ( version_compare( $wp_version, '4.5', '<' ) ) {
+            return get_terms( $taxonomy, $args_with_taxonomy_key );
+        } else {
+            $args_with_taxonomy_key['taxonomy'] = $taxonomy;
+            return get_terms( $args_with_taxonomy_key );
+        }
+    }
 
-	public static function get_public_taxonomies() {
-		return get_taxonomies( array( 'public' => true ) );
-	}
+    public static function get_public_taxonomies() {
+        return get_taxonomies( array( 'public' => true ) );
+    }
 
 
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -3,19 +3,19 @@
 
 class Terms_Compat {
 
-	public static function get_terms( $taxonomy, $args_with_taxonomy_key ) {
+	public static function get_terms($taxonomy, $args_with_taxonomy_key) {
 		global $wp_version;
 
-		if ( version_compare( $wp_version, '4.5', '<' ) ) {
-			return get_terms( $taxonomy, $args_with_taxonomy_key );
+		if (version_compare($wp_version, '4.5', '<')) {
+			return get_terms($taxonomy, $args_with_taxonomy_key);
 		} else {
 			$args_with_taxonomy_key['taxonomy'] = $taxonomy;
-			return get_terms( $args_with_taxonomy_key );
+			return get_terms($args_with_taxonomy_key);
 		}
 	}
 
 	public static function get_public_taxonomies() {
-		return get_taxonomies( array( 'public' => true ) );
+		return get_taxonomies(array('public' => true));
 	}
 
 

src/wordlift/vocabulary/data/term-data/class-default-term-data.php

Indentation +24 added lines, -24 removed lines

@@ -9,31 +9,31 @@
 
 class Default_Term_Data implements Term_Data {
 
-	/**
-	 * @var array An array of entities bound to the term.
-	 */
-	private $entities;
-	/**
-	 * @var \WP_Term
-	 */
-	private $term;
+    /**
+     * @var array An array of entities bound to the term.
+     */
+    private $entities;
+    /**
+     * @var \WP_Term
+     */
+    private $term;
 
-	public function __construct( $term, $entities ) {
-		$this->term     = $term;
-		$this->entities = $entities;
-	}
+    public function __construct( $term, $entities ) {
+        $this->term     = $term;
+        $this->entities = $entities;
+    }
 
-	public function get_data() {
+    public function get_data() {
 
-		return array(
-			'tagId'          => $this->term->term_id,
-			'tagName'        => $this->term->name,
-			'tagDescription' => $this->term->description,
-			// Before 4.5.0 taxonomy parameter **must** be passed to this function.
-			'tagLink'        => get_edit_term_link( $this->term->term_id, $this->term->taxonomy ),
-			'tagPostCount'   => $this->term->count,
-			'tagTaxonomy'    => get_taxonomy( $this->term->taxonomy )->label,
-			'entities'       => $this->entities,
-		);
-	}
+        return array(
+            'tagId'          => $this->term->term_id,
+            'tagName'        => $this->term->name,
+            'tagDescription' => $this->term->description,
+            // Before 4.5.0 taxonomy parameter **must** be passed to this function.
+            'tagLink'        => get_edit_term_link( $this->term->term_id, $this->term->taxonomy ),
+            'tagPostCount'   => $this->term->count,
+            'tagTaxonomy'    => get_taxonomy( $this->term->taxonomy )->label,
+            'entities'       => $this->entities,
+        );
+    }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 	 */
 	private $term;
 
-	public function __construct( $term, $entities ) {
+	public function __construct($term, $entities) {
 		$this->term     = $term;
 		$this->entities = $entities;
 	}
@@ -30,9 +30,9 @@ 
 			'tagName'        => $this->term->name,
 			'tagDescription' => $this->term->description,
 			// Before 4.5.0 taxonomy parameter **must** be passed to this function.
-			'tagLink'        => get_edit_term_link( $this->term->term_id, $this->term->taxonomy ),
+			'tagLink'        => get_edit_term_link($this->term->term_id, $this->term->taxonomy),
 			'tagPostCount'   => $this->term->count,
-			'tagTaxonomy'    => get_taxonomy( $this->term->taxonomy )->label,
+			'tagTaxonomy'    => get_taxonomy($this->term->taxonomy)->label,
 			'entities'       => $this->entities,
 		);
 	}

src/wordlift/vocabulary/data/term-count/class-cached-term-count-manager.php

Indentation +11 added lines, -11 removed lines

@@ -9,19 +9,19 @@
  */
 class Cached_Term_count_Manager {
 
-	public function connect_hook() {
+    public function connect_hook() {
 
-		add_action( 'wordlift_vocabulary_analysis_complete_for_terms_batch', function () {
-			delete_transient( Cached_Term_Count::TRANSIENT_KEY );
-		} );
+        add_action( 'wordlift_vocabulary_analysis_complete_for_terms_batch', function () {
+            delete_transient( Cached_Term_Count::TRANSIENT_KEY );
+        } );
 
-		$taxonomies = Terms_Compat::get_public_taxonomies();
-		foreach ( $taxonomies as $taxonomy ) {
-			add_action( "created_${taxonomy}", function () {
-				delete_transient( Cached_Term_Count::TRANSIENT_KEY );
-			} );
-		}
+        $taxonomies = Terms_Compat::get_public_taxonomies();
+        foreach ( $taxonomies as $taxonomy ) {
+            add_action( "created_${taxonomy}", function () {
+                delete_transient( Cached_Term_Count::TRANSIENT_KEY );
+            } );
+        }
 
-	}
+    }
 
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -11,14 +11,14 @@
 
 	public function connect_hook() {
 
-		add_action( 'wordlift_vocabulary_analysis_complete_for_terms_batch', function () {
-			delete_transient( Cached_Term_Count::TRANSIENT_KEY );
+		add_action('wordlift_vocabulary_analysis_complete_for_terms_batch', function() {
+			delete_transient(Cached_Term_Count::TRANSIENT_KEY);
 		} );
 
 		$taxonomies = Terms_Compat::get_public_taxonomies();
-		foreach ( $taxonomies as $taxonomy ) {
-			add_action( "created_${taxonomy}", function () {
-				delete_transient( Cached_Term_Count::TRANSIENT_KEY );
+		foreach ($taxonomies as $taxonomy) {
+			add_action("created_${taxonomy}", function() {
+				delete_transient(Cached_Term_Count::TRANSIENT_KEY);
 			} );
 		}
 

src/wordlift/vocabulary/data/term-count/class-default-term-count.php

Indentation +22 added lines, -22 removed lines

@@ -13,28 +13,28 @@
  */
 class Default_Term_Count implements Term_Count {
 
-	/**
-	 * Return count of terms which have entities and also not matched by editor, currently
-	 * it is used for the menu icon badge.
-	 * @return int
-	 */
-	public function get_term_count() {
-		return count( Terms_Compat::get_terms( Terms_Compat::get_public_taxonomies(), array(
-			'hide_empty' => false,
-			'fields'     => 'ids',
-			'meta_query' => array(
-				array(
-					'key'     => Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING,
-					'compare' => 'NOT EXISTS',
-				),
-				array(
-					'key'     => Analysis_Background_Service::ENTITIES_PRESENT_FOR_TERM,
-					'compare' => 'EXISTS'
-				)
-			),
-		) ) );
-
-	}
+    /**
+     * Return count of terms which have entities and also not matched by editor, currently
+     * it is used for the menu icon badge.
+     * @return int
+     */
+    public function get_term_count() {
+        return count( Terms_Compat::get_terms( Terms_Compat::get_public_taxonomies(), array(
+            'hide_empty' => false,
+            'fields'     => 'ids',
+            'meta_query' => array(
+                array(
+                    'key'     => Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING,
+                    'compare' => 'NOT EXISTS',
+                ),
+                array(
+                    'key'     => Analysis_Background_Service::ENTITIES_PRESENT_FOR_TERM,
+                    'compare' => 'EXISTS'
+                )
+            ),
+        ) ) );
+
+    }
 
 
 

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 	 * @return int
 	 */
 	public function get_term_count() {
-		return count( Terms_Compat::get_terms( Terms_Compat::get_public_taxonomies(), array(
+		return count(Terms_Compat::get_terms(Terms_Compat::get_public_taxonomies(), array(
 			'hide_empty' => false,
 			'fields'     => 'ids',
 			'meta_query' => array(
@@ -32,7 +32,7 @@ 
 					'compare' => 'EXISTS'
 				)
 			),
-		) ) );
+		)));
 
 	}