insideout10 / wordlift-plugin

src/wordlift/vocabulary/hooks/class-term-page-hook.php

Indentation +40 added lines, -40 removed lines

@@ -14,65 +14,65 @@
  */
 class Term_Page_Hook {
 
-	const HANDLE = 'wl-vocabulary-term-page-handle';
+    const HANDLE = 'wl-vocabulary-term-page-handle';
 
-	const LOCALIZED_KEY = '_wlVocabularyTermPageSettings';
+    const LOCALIZED_KEY = '_wlVocabularyTermPageSettings';
 
-	private $term_data_factory;
+    private $term_data_factory;
 
-	/**
-	 * Term_Page_Hook constructor.
-	 *
-	 * @param $term_data_factory Term_Data_Factory
-	 */
-	public function __construct( $term_data_factory ) {
-		$this->term_data_factory = $term_data_factory;
-	}
+    /**
+     * Term_Page_Hook constructor.
+     *
+     * @param $term_data_factory Term_Data_Factory
+     */
+    public function __construct( $term_data_factory ) {
+        $this->term_data_factory = $term_data_factory;
+    }
 
-	public function connect_hook() {
-		$taxonomies = Terms_Compat::get_public_taxonomies();
-		foreach ( $taxonomies as $taxonomy ) {
-			add_action( "${taxonomy}_edit_form_fields", array( $this, 'load_scripts' ), 2, PHP_INT_MAX );
-		}
-	}
+    public function connect_hook() {
+        $taxonomies = Terms_Compat::get_public_taxonomies();
+        foreach ( $taxonomies as $taxonomy ) {
+            add_action( "${taxonomy}_edit_form_fields", array( $this, 'load_scripts' ), 2, PHP_INT_MAX );
+        }
+    }
 
-	/**
-	 * @param $term \WP_Term
-	 */
-	public function load_scripts( $term ) {
+    /**
+     * @param $term \WP_Term
+     */
+    public function load_scripts( $term ) {
 
-		$term_data = $this->term_data_factory->get_term_data( $term );
+        $term_data = $this->term_data_factory->get_term_data( $term );
 
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			self::HANDLE,
-			plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary-term-page',
-			array( 'react', 'react-dom', 'wp-polyfill' ),
-			true
-		);
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            self::HANDLE,
+            plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary-term-page',
+            array( 'react', 'react-dom', 'wp-polyfill' ),
+            true
+        );
 
-		wp_enqueue_style( self::HANDLE, plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary-term-page.full.css' );
+        wp_enqueue_style( self::HANDLE, plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary-term-page.full.css' );
 
 
-		$term_data_arr = $term_data->get_data();
+        $term_data_arr = $term_data->get_data();
 
-		$term_data_arr['entities'] = Entity_List_Utils::mark_is_active_for_entities( $term->term_id, $term_data_arr['entities'] );
+        $term_data_arr['entities'] = Entity_List_Utils::mark_is_active_for_entities( $term->term_id, $term_data_arr['entities'] );
 
-		wp_localize_script( self::HANDLE, self::LOCALIZED_KEY, array(
-			'termData'  => $term_data_arr,
-			'apiConfig' => Api_Config::get_api_config(),
-			'restUrl'   => get_rest_url( null, Api_Config::REST_NAMESPACE . '/search-entity/' ),
-			'nonce'     => wp_create_nonce( 'wp_rest' ),
-		) );
+        wp_localize_script( self::HANDLE, self::LOCALIZED_KEY, array(
+            'termData'  => $term_data_arr,
+            'apiConfig' => Api_Config::get_api_config(),
+            'restUrl'   => get_rest_url( null, Api_Config::REST_NAMESPACE . '/search-entity/' ),
+            'nonce'     => wp_create_nonce( 'wp_rest' ),
+        ) );
 
-		echo "<tr class=\"form-field\">
+        echo "<tr class=\"form-field\">
 				<th>Match</th>
 				<td style='width: 100%;' id='wl_vocabulary_terms_widget'></td>
 			</tr>";
 
-		echo "<tr class=\"form-field\">
+        echo "<tr class=\"form-field\">
 		     <th></th>
 		     <td id='wl_vocabulary_terms_autocomplete_select'></td></tr>";
 
-	}
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -25,44 +25,44 @@
 	 *
 	 * @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;
 	}
 
 	public function connect_hook() {
 		$taxonomies = Terms_Compat::get_public_taxonomies();
-		foreach ( $taxonomies as $taxonomy ) {
-			add_action( "${taxonomy}_edit_form_fields", array( $this, 'load_scripts' ), 2, PHP_INT_MAX );
+		foreach ($taxonomies as $taxonomy) {
+			add_action("${taxonomy}_edit_form_fields", array($this, 'load_scripts'), 2, PHP_INT_MAX);
 		}
 	}
 
 	/**
 	 * @param $term \WP_Term
 	 */
-	public function load_scripts( $term ) {
+	public function load_scripts($term) {
 
-		$term_data = $this->term_data_factory->get_term_data( $term );
+		$term_data = $this->term_data_factory->get_term_data($term);
 
 		Scripts_Helper::enqueue_based_on_wordpress_version(
 			self::HANDLE,
-			plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary-term-page',
-			array( 'react', 'react-dom', 'wp-polyfill' ),
+			plugin_dir_url(dirname(dirname(__DIR__))).'js/dist/vocabulary-term-page',
+			array('react', 'react-dom', 'wp-polyfill'),
 			true
 		);
 
-		wp_enqueue_style( self::HANDLE, plugin_dir_url( dirname( dirname( __DIR__ ) ) ) . 'js/dist/vocabulary-term-page.full.css' );
+		wp_enqueue_style(self::HANDLE, plugin_dir_url(dirname(dirname(__DIR__))).'js/dist/vocabulary-term-page.full.css');
 
 
 		$term_data_arr = $term_data->get_data();
 
-		$term_data_arr['entities'] = Entity_List_Utils::mark_is_active_for_entities( $term->term_id, $term_data_arr['entities'] );
+		$term_data_arr['entities'] = Entity_List_Utils::mark_is_active_for_entities($term->term_id, $term_data_arr['entities']);
 
-		wp_localize_script( self::HANDLE, self::LOCALIZED_KEY, array(
+		wp_localize_script(self::HANDLE, self::LOCALIZED_KEY, array(
 			'termData'  => $term_data_arr,
 			'apiConfig' => Api_Config::get_api_config(),
-			'restUrl'   => get_rest_url( null, Api_Config::REST_NAMESPACE . '/search-entity/' ),
-			'nonce'     => wp_create_nonce( 'wp_rest' ),
-		) );
+			'restUrl'   => get_rest_url(null, Api_Config::REST_NAMESPACE.'/search-entity/'),
+			'nonce'     => wp_create_nonce('wp_rest'),
+		));
 
 		echo "<tr class=\"form-field\">
 				<th>Match</th>

src/wordlift/vocabulary/api/class-search-entity-rest-endpoint.php

Indentation +115 added lines, -115 removed lines

@@ -9,119 +9,119 @@
 
 class Search_Entity_Rest_Endpoint {
 
-	/**
-	 * @var Analysis_Service
-	 */
-	private $analysis_service;
-
-
-	/**
-	 * @var Cache
-	 */
-	private $cache_service;
-
-	public function __construct( $api_service, $cache_service ) {
-		$this->analysis_service = $api_service;
-		$this->cache_service    = $cache_service;
-		add_action( 'rest_api_init', array( $this, 'register_route_callback' ) );
-	}
-
-	public function register_route_callback() {
-		register_rest_route(
-			Api_Config::REST_NAMESPACE,
-			'/search-entity',
-			array(
-				'methods'             => \WP_REST_Server::CREATABLE,
-				'callback'            => array( $this, 'get_entities_from_api' ),
-				'args'                => array(
-					'entity' => array(
-						'validate_callback' => function ( $param ) {
-							return is_string( $param );
-						}
-					),
-				),
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
-				}
-			)
-		);
-
-		register_rest_route(
-			Api_Config::REST_NAMESPACE,
-			'/add-entity',
-			array(
-				'methods'             => \WP_REST_Server::CREATABLE,
-				'callback'            => array( $this, 'add_entity_to_matches' ),
-				'args'                => array(
-					'entity_data' => array(
-						'validate_callback' => function ( $param ) {
-							return is_array( $param );
-						}
-					),
-					'term_id'     => array(
-						'validate_callback' => function ( $param ) {
-							return is_numeric( $param );
-						}
-					)
-				),
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
-				}
-			)
-		);
-	}
-
-	public function add_entity_to_matches( $request ) {
-		$data                = $request->get_params();
-		$entity_data         = $data['entity_data'];
-		$term_id             = (int) $data['term_id'];
-		$existing_entities   = $this->cache_service->get( $term_id );
-		$existing_entities[] = $entity_data;
-		$this->cache_service->put( $term_id, $existing_entities );
-
-		$entity = Entity_List_Factory::get_instance( $term_id );
-		$entity->save_jsonld_data( $entity_data );
-		update_term_meta( $term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, 1 );
-		Ttl_Cache::flush_all();
-
-		return $existing_entities;
-	}
-
-	public function get_entities_from_api( $request ) {
-		$data     = $request->get_params();
-		$search   = $data['entity'];
-		$entities = $this->analysis_service->get_entities_by_search_query( (string) $search );
-
-		return $this->convert_to_autocomplete_ui_response( $entities );
-	}
-
-	private function convert_to_autocomplete_ui_response( $entities ) {
-
-		$autocomplete_entities = array();
-
-		foreach ( $entities as $entity_id => $entity_data ) {
-
-			$label                   = $entity_data['label'];
-			$types                   = $entity_data['types'];
-			$autocomplete_entities[] = array(
-				"id"           => $entity_data["entityId"],
-				"labels"       => array( $label ),
-				"descriptions" => array( $entity_data['description'] ),
-				"types"        => $types,
-				"urls"         => array( $entity_id ),
-				"images"       => array(),
-				"sameAss"      => $entity_data['sameAs'],
-				"scope"        => "cloud",
-				"description"  => $entity_data['description'],
-				"mainType"     => $entity_data['mainType'],
-				"label"        => $label,
-				"displayTypes" => $types,
-				"value"        => $entity_id,
-				"confidence"   => $entity_data["confidence"],
-				"meta"         => $entity_data["meta"]
-			);
-		}
-
-		return $autocomplete_entities;
-	}
+    /**
+     * @var Analysis_Service
+     */
+    private $analysis_service;
+
+
+    /**
+     * @var Cache
+     */
+    private $cache_service;
+
+    public function __construct( $api_service, $cache_service ) {
+        $this->analysis_service = $api_service;
+        $this->cache_service    = $cache_service;
+        add_action( 'rest_api_init', array( $this, 'register_route_callback' ) );
+    }
+
+    public function register_route_callback() {
+        register_rest_route(
+            Api_Config::REST_NAMESPACE,
+            '/search-entity',
+            array(
+                'methods'             => \WP_REST_Server::CREATABLE,
+                'callback'            => array( $this, 'get_entities_from_api' ),
+                'args'                => array(
+                    'entity' => array(
+                        'validate_callback' => function ( $param ) {
+                            return is_string( $param );
+                        }
+                    ),
+                ),
+                'permission_callback' => function () {
+                    return current_user_can( 'manage_options' );
+                }
+            )
+        );
+
+        register_rest_route(
+            Api_Config::REST_NAMESPACE,
+            '/add-entity',
+            array(
+                'methods'             => \WP_REST_Server::CREATABLE,
+                'callback'            => array( $this, 'add_entity_to_matches' ),
+                'args'                => array(
+                    'entity_data' => array(
+                        'validate_callback' => function ( $param ) {
+                            return is_array( $param );
+                        }
+                    ),
+                    'term_id'     => array(
+                        'validate_callback' => function ( $param ) {
+                            return is_numeric( $param );
+                        }
+                    )
+                ),
+                'permission_callback' => function () {
+                    return current_user_can( 'manage_options' );
+                }
+            )
+        );
+    }
+
+    public function add_entity_to_matches( $request ) {
+        $data                = $request->get_params();
+        $entity_data         = $data['entity_data'];
+        $term_id             = (int) $data['term_id'];
+        $existing_entities   = $this->cache_service->get( $term_id );
+        $existing_entities[] = $entity_data;
+        $this->cache_service->put( $term_id, $existing_entities );
+
+        $entity = Entity_List_Factory::get_instance( $term_id );
+        $entity->save_jsonld_data( $entity_data );
+        update_term_meta( $term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, 1 );
+        Ttl_Cache::flush_all();
+
+        return $existing_entities;
+    }
+
+    public function get_entities_from_api( $request ) {
+        $data     = $request->get_params();
+        $search   = $data['entity'];
+        $entities = $this->analysis_service->get_entities_by_search_query( (string) $search );
+
+        return $this->convert_to_autocomplete_ui_response( $entities );
+    }
+
+    private function convert_to_autocomplete_ui_response( $entities ) {
+
+        $autocomplete_entities = array();
+
+        foreach ( $entities as $entity_id => $entity_data ) {
+
+            $label                   = $entity_data['label'];
+            $types                   = $entity_data['types'];
+            $autocomplete_entities[] = array(
+                "id"           => $entity_data["entityId"],
+                "labels"       => array( $label ),
+                "descriptions" => array( $entity_data['description'] ),
+                "types"        => $types,
+                "urls"         => array( $entity_id ),
+                "images"       => array(),
+                "sameAss"      => $entity_data['sameAs'],
+                "scope"        => "cloud",
+                "description"  => $entity_data['description'],
+                "mainType"     => $entity_data['mainType'],
+                "label"        => $label,
+                "displayTypes" => $types,
+                "value"        => $entity_id,
+                "confidence"   => $entity_data["confidence"],
+                "meta"         => $entity_data["meta"]
+            );
+        }
+
+        return $autocomplete_entities;
+    }
 }

Spacing +28 added lines, -28 removed lines

@@ -20,10 +20,10 @@ 
 	 */
 	private $cache_service;
 
-	public function __construct( $api_service, $cache_service ) {
+	public function __construct($api_service, $cache_service) {
 		$this->analysis_service = $api_service;
 		$this->cache_service    = $cache_service;
-		add_action( 'rest_api_init', array( $this, 'register_route_callback' ) );
+		add_action('rest_api_init', array($this, 'register_route_callback'));
 	}
 
 	public function register_route_callback() {
@@ -32,16 +32,16 @@ 
 			'/search-entity',
 			array(
 				'methods'             => \WP_REST_Server::CREATABLE,
-				'callback'            => array( $this, 'get_entities_from_api' ),
+				'callback'            => array($this, 'get_entities_from_api'),
 				'args'                => array(
 					'entity' => array(
-						'validate_callback' => function ( $param ) {
-							return is_string( $param );
+						'validate_callback' => function($param) {
+							return is_string($param);
 						}
 					),
 				),
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
+				'permission_callback' => function() {
+					return current_user_can('manage_options');
 				}
 			)
 		);
@@ -51,64 +51,64 @@ 
 			'/add-entity',
 			array(
 				'methods'             => \WP_REST_Server::CREATABLE,
-				'callback'            => array( $this, 'add_entity_to_matches' ),
+				'callback'            => array($this, 'add_entity_to_matches'),
 				'args'                => array(
 					'entity_data' => array(
-						'validate_callback' => function ( $param ) {
-							return is_array( $param );
+						'validate_callback' => function($param) {
+							return is_array($param);
 						}
 					),
 					'term_id'     => array(
-						'validate_callback' => function ( $param ) {
-							return is_numeric( $param );
+						'validate_callback' => function($param) {
+							return is_numeric($param);
 						}
 					)
 				),
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
+				'permission_callback' => function() {
+					return current_user_can('manage_options');
 				}
 			)
 		);
 	}
 
-	public function add_entity_to_matches( $request ) {
+	public function add_entity_to_matches($request) {
 		$data                = $request->get_params();
 		$entity_data         = $data['entity_data'];
 		$term_id             = (int) $data['term_id'];
-		$existing_entities   = $this->cache_service->get( $term_id );
+		$existing_entities   = $this->cache_service->get($term_id);
 		$existing_entities[] = $entity_data;
-		$this->cache_service->put( $term_id, $existing_entities );
+		$this->cache_service->put($term_id, $existing_entities);
 
-		$entity = Entity_List_Factory::get_instance( $term_id );
-		$entity->save_jsonld_data( $entity_data );
-		update_term_meta( $term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, 1 );
+		$entity = Entity_List_Factory::get_instance($term_id);
+		$entity->save_jsonld_data($entity_data);
+		update_term_meta($term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, 1);
 		Ttl_Cache::flush_all();
 
 		return $existing_entities;
 	}
 
-	public function get_entities_from_api( $request ) {
+	public function get_entities_from_api($request) {
 		$data     = $request->get_params();
 		$search   = $data['entity'];
-		$entities = $this->analysis_service->get_entities_by_search_query( (string) $search );
+		$entities = $this->analysis_service->get_entities_by_search_query((string) $search);
 
-		return $this->convert_to_autocomplete_ui_response( $entities );
+		return $this->convert_to_autocomplete_ui_response($entities);
 	}
 
-	private function convert_to_autocomplete_ui_response( $entities ) {
+	private function convert_to_autocomplete_ui_response($entities) {
 
 		$autocomplete_entities = array();
 
-		foreach ( $entities as $entity_id => $entity_data ) {
+		foreach ($entities as $entity_id => $entity_data) {
 
 			$label                   = $entity_data['label'];
 			$types                   = $entity_data['types'];
 			$autocomplete_entities[] = array(
 				"id"           => $entity_data["entityId"],
-				"labels"       => array( $label ),
-				"descriptions" => array( $entity_data['description'] ),
+				"labels"       => array($label),
+				"descriptions" => array($entity_data['description']),
 				"types"        => $types,
-				"urls"         => array( $entity_id ),
+				"urls"         => array($entity_id),
 				"images"       => array(),
 				"sameAss"      => $entity_data['sameAs'],
 				"scope"        => "cloud",

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

Indentation +138 added lines, -138 removed lines

@@ -13,178 +13,178 @@
  */
 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.
-		$tag_name = $tag->name;
-
-		$entities = $this->get_entities_by_search_query( $tag_name );
-
-		if ( ! $entities ) {
-			return false;
-		}
-
-		$this->cache_service->put( $cache_key, $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;
-		}
+        // send the request.
+        $tag_name = $tag->name;
+
+        $entities = $this->get_entities_by_search_query( $tag_name );
+
+        if ( ! $entities ) {
+            return false;
+        }
+
+        $this->cache_service->put( $cache_key, $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;
+        }
 
-		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;
 
-	}
+    }
 
-	/**
-	 * @param $tag_name
-	 *
-	 * @return array
-	 */
-	public function get_entities_by_search_query( $tag_name ) {
-		$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",
-			) )
-		);
+    /**
+     * @param $tag_name
+     *
+     * @return array
+     */
+    public function get_entities_by_search_query( $tag_name ) {
+        $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;
-		}
-
-		$response = json_decode( $response->get_body(), true );
-
-		if ( ! array_key_exists( 'entities', $response ) ) {
-			return false;
-		}
+        if ( ! $response->is_success() ) {
+            return false;
+        }
+
+        $response = json_decode( $response->get_body(), true );
+
+        if ( ! array_key_exists( 'entities', $response ) ) {
+            return false;
+        }
 
 
-		$entities = $this->get_meta_for_entities( $response['entities'] );
+        $entities = $this->get_meta_for_entities( $response['entities'] );
 
-		return $entities;
-	}
+        return $entities;
+    }
 
 
 }

Spacing +45 added lines, -45 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,24 +50,24 @@ 
 	 *
 	 * @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;
 		}
 
 		// send the request.
 		$tag_name = $tag->name;
 
-		$entities = $this->get_entities_by_search_query( $tag_name );
+		$entities = $this->get_entities_by_search_query($tag_name);
 
-		if ( ! $entities ) {
+		if ( ! $entities) {
 			return false;
 		}
 
-		$this->cache_service->put( $cache_key, $entities );
+		$this->cache_service->put($cache_key, $entities);
 
 		return $entities;
 
@@ -81,47 +81,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;
 		}
@@ -131,20 +131,20 @@ 
 
 	}
 
-	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           = Default_Entity_List::compact_jsonld( $meta );
-			if ( $meta ) {
+			$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 ) );
+		$this->log->debug("Returning filtered entities as");
+		$this->log->debug(var_export($filtered_entities, true));
 
 		return $filtered_entities;
 
@@ -155,33 +155,33 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_entities_by_search_query( $tag_name ) {
+	public function get_entities_by_search_query($tag_name) {
 		$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']);
 
 		return $entities;
 	}

src/wordlift/vocabulary/class-vocabulary-loader.php

Indentation +36 added lines, -36 removed lines

@@ -23,67 +23,67 @@
 
 class Vocabulary_Loader {
 
-	public function init_vocabulary() {
+    public function init_vocabulary() {
 
-		$configuration_service = \Wordlift_Configuration_Service::get_instance();
+        $configuration_service = \Wordlift_Configuration_Service::get_instance();
 
-		$api_service = new Default_Api_Service(
-			apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ),
-			60,
-			User_Agent::get_user_agent(),
-			$configuration_service->get_key()
-		);
+        $api_service = new Default_Api_Service(
+            apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ),
+            60,
+            User_Agent::get_user_agent(),
+            $configuration_service->get_key()
+        );
 
-		$cache_service    = Cache_Service_Factory::get_cache_service();
+        $cache_service    = Cache_Service_Factory::get_cache_service();
 
 
-		$analysis_service = new Analysis_Service( $api_service, $cache_service );
+        $analysis_service = new Analysis_Service( $api_service, $cache_service );
 
-		$term_data_factory = new Term_Data_Factory( $analysis_service );
+        $term_data_factory = new Term_Data_Factory( $analysis_service );
 
-		$tag_rest_endpoint = new Tag_Rest_Endpoint( $term_data_factory );
-		$tag_rest_endpoint->register_routes();
+        $tag_rest_endpoint = new Tag_Rest_Endpoint( $term_data_factory );
+        $tag_rest_endpoint->register_routes();
 
-		new Search_Entity_Rest_Endpoint( $analysis_service, $cache_service );
+        new Search_Entity_Rest_Endpoint( $analysis_service, $cache_service );
 
-		$entity_rest_endpoint = new Entity_Rest_Endpoint();
-		$entity_rest_endpoint->register_routes();
+        $entity_rest_endpoint = new Entity_Rest_Endpoint();
+        $entity_rest_endpoint->register_routes();
 
 
 
-		$post_jsonld = new Post_Jsonld();
-		$post_jsonld->enhance_post_jsonld();
+        $post_jsonld = new Post_Jsonld();
+        $post_jsonld->enhance_post_jsonld();
 
-		$term_jsonld = new Term_Jsonld();
-		$term_jsonld->init();
+        $term_jsonld = new Term_Jsonld();
+        $term_jsonld->init();
 
-		$term_count = Term_Count_Factory::get_instance( Term_Count_Factory::CACHED_TERM_COUNT );
-		new Match_Terms( $term_count );
+        $term_count = Term_Count_Factory::get_instance( Term_Count_Factory::CACHED_TERM_COUNT );
+        new Match_Terms( $term_count );
 
-		$analysis_background_service = new Analysis_Background_Service( $analysis_service );
+        $analysis_background_service = new Analysis_Background_Service( $analysis_service );
 
 
-		new Tag_Created_Hook( $analysis_background_service );
+        new Tag_Created_Hook( $analysis_background_service );
 
-		new Background_Analysis_Endpoint( $analysis_background_service, $cache_service );
+        new Background_Analysis_Endpoint( $analysis_background_service, $cache_service );
 
-		$reconcile_progress_endpoint = new Reconcile_Progress_Endpoint();
-		$reconcile_progress_endpoint->register_routes();
+        $reconcile_progress_endpoint = new Reconcile_Progress_Endpoint();
+        $reconcile_progress_endpoint->register_routes();
 
 
-		$term_page_hook = new Term_Page_Hook( $term_data_factory );
-		$term_page_hook->connect_hook();
+        $term_page_hook = new Term_Page_Hook( $term_data_factory );
+        $term_page_hook->connect_hook();
 
-		$dashboard_widget = new Term_Matches_Widget( $term_count );
-		$dashboard_widget->connect_hook();
+        $dashboard_widget = new Term_Matches_Widget( $term_count );
+        $dashboard_widget->connect_hook();
 
-		$cached_term_count_manager = new Cached_Term_count_Manager();
-		$cached_term_count_manager->connect_hook();
+        $cached_term_count_manager = new Cached_Term_count_Manager();
+        $cached_term_count_manager->connect_hook();
 
-		$settings_tab = new Settings_Tab();
-		$settings_tab->connect_hook();
+        $settings_tab = new Settings_Tab();
+        $settings_tab->connect_hook();
 
-	}
+    }
 
 }
 

Spacing +12 added lines, -12 removed lines

@@ -28,7 +28,7 @@ 
 		$configuration_service = \Wordlift_Configuration_Service::get_instance();
 
 		$api_service = new Default_Api_Service(
-			apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ),
+			apply_filters('wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE),
 			60,
 			User_Agent::get_user_agent(),
 			$configuration_service->get_key()
@@ -37,14 +37,14 @@ 
 		$cache_service    = Cache_Service_Factory::get_cache_service();
 
 
-		$analysis_service = new Analysis_Service( $api_service, $cache_service );
+		$analysis_service = new Analysis_Service($api_service, $cache_service);
 
-		$term_data_factory = new Term_Data_Factory( $analysis_service );
+		$term_data_factory = new Term_Data_Factory($analysis_service);
 
-		$tag_rest_endpoint = new Tag_Rest_Endpoint( $term_data_factory );
+		$tag_rest_endpoint = new Tag_Rest_Endpoint($term_data_factory);
 		$tag_rest_endpoint->register_routes();
 
-		new Search_Entity_Rest_Endpoint( $analysis_service, $cache_service );
+		new Search_Entity_Rest_Endpoint($analysis_service, $cache_service);
 
 		$entity_rest_endpoint = new Entity_Rest_Endpoint();
 		$entity_rest_endpoint->register_routes();
@@ -57,24 +57,24 @@ 
 		$term_jsonld = new Term_Jsonld();
 		$term_jsonld->init();
 
-		$term_count = Term_Count_Factory::get_instance( Term_Count_Factory::CACHED_TERM_COUNT );
-		new Match_Terms( $term_count );
+		$term_count = Term_Count_Factory::get_instance(Term_Count_Factory::CACHED_TERM_COUNT);
+		new Match_Terms($term_count);
 
-		$analysis_background_service = new Analysis_Background_Service( $analysis_service );
+		$analysis_background_service = new Analysis_Background_Service($analysis_service);
 
 
-		new Tag_Created_Hook( $analysis_background_service );
+		new Tag_Created_Hook($analysis_background_service);
 
-		new Background_Analysis_Endpoint( $analysis_background_service, $cache_service );
+		new Background_Analysis_Endpoint($analysis_background_service, $cache_service);
 
 		$reconcile_progress_endpoint = new Reconcile_Progress_Endpoint();
 		$reconcile_progress_endpoint->register_routes();
 
 
-		$term_page_hook = new Term_Page_Hook( $term_data_factory );
+		$term_page_hook = new Term_Page_Hook($term_data_factory);
 		$term_page_hook->connect_hook();
 
-		$dashboard_widget = new Term_Matches_Widget( $term_count );
+		$dashboard_widget = new Term_Matches_Widget($term_count);
 		$dashboard_widget->connect_hook();
 
 		$cached_term_count_manager = new Cached_Term_count_Manager();