insideout10 / wordlift-plugin

src/modules/food-kg/includes/admin/Main_Ingredient_List_Table.php

Indentation +109 added lines, -109 removed lines

@@ -3,43 +3,43 @@ 
 namespace Wordlift\Modules\Food_Kg\Admin;
 
 if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 use WP_List_Table;
 
 class Main_Ingredient_List_Table extends WP_List_Table {
 
-	public function prepare_items() {
-		global $wpdb; // This is used only if making any database queries
-
-		/**
-		 * REQUIRED. Now we need to define our column headers. This includes a complete
-		 * array of columns to be displayed (slugs & titles), a list of columns
-		 * to keep hidden, and a list of columns that are sortable. Each of these
-		 * can be defined in another method (as we've done here) before being
-		 * used to build the value for our _column_headers property.
-		 */
-		$columns  = $this->get_columns();
-		$hidden   = array();
-		$sortable = $this->get_sortable_columns();
-
-		/**
-		 * REQUIRED. Finally, we build an array to be used by the class for column
-		 * headers. The $this->_column_headers property takes an array which contains
-		 * 3 other arrays. One for all columns, one for hidden columns, and one
-		 * for sortable columns.
-		 */
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		// Pagination.
-		$per_page     = 20;
-		$current_page = $this->get_pagenum();
-		$total_items  = $this->count();
-
-		$this->items = $wpdb->get_results(
-			$wpdb->prepare(
-				"SELECT p1.ID AS recipe_ID,
+    public function prepare_items() {
+        global $wpdb; // This is used only if making any database queries
+
+        /**
+         * REQUIRED. Now we need to define our column headers. This includes a complete
+         * array of columns to be displayed (slugs & titles), a list of columns
+         * to keep hidden, and a list of columns that are sortable. Each of these
+         * can be defined in another method (as we've done here) before being
+         * used to build the value for our _column_headers property.
+         */
+        $columns  = $this->get_columns();
+        $hidden   = array();
+        $sortable = $this->get_sortable_columns();
+
+        /**
+         * REQUIRED. Finally, we build an array to be used by the class for column
+         * headers. The $this->_column_headers property takes an array which contains
+         * 3 other arrays. One for all columns, one for hidden columns, and one
+         * for sortable columns.
+         */
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        // Pagination.
+        $per_page     = 20;
+        $current_page = $this->get_pagenum();
+        $total_items  = $this->count();
+
+        $this->items = $wpdb->get_results(
+            $wpdb->prepare(
+                "SELECT p1.ID AS recipe_ID,
 					    p1.post_title AS recipe_name,
 					    p2.ID AS post_ID,
 					    p2.post_title
@@ -49,99 +49,99 @@ 
 							INNER JOIN $wpdb->postmeta pm2
 								ON pm2.post_ID = pm1.post_ID AND pm2.meta_key = 'wprm_parent_post_id'
 						    INNER JOIN $wpdb->posts p2"
-				// The following ignore rule is used against the `LIKE CONCAT`. We only have const values.
-				// phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.LikeWildcardsInQuery
-				. " ON p2.post_status = 'publish' AND p2.ID = pm2.post_ID
+                // The following ignore rule is used against the `LIKE CONCAT`. We only have const values.
+                // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.LikeWildcardsInQuery
+                . " ON p2.post_status = 'publish' AND p2.ID = pm2.post_ID
 							WHERE pm1.meta_key = '_wl_main_ingredient_jsonld'
 					LIMIT %d
 					OFFSET %d",
-				$per_page,
-				( $current_page - 1 ) * $per_page
-			)
-		);
+                $per_page,
+                ( $current_page - 1 ) * $per_page
+            )
+        );
 
-		$this->set_pagination_args(
-			array(
-				'total_items' => $total_items,
-				'per_page'    => $per_page,
-				'total_pages' => ceil( $total_items / $per_page ),
-			)
-		);
-	}
+        $this->set_pagination_args(
+            array(
+                'total_items' => $total_items,
+                'per_page'    => $per_page,
+                'total_pages' => ceil( $total_items / $per_page ),
+            )
+        );
+    }
 
-	private function count() {
-		global $wpdb;
+    private function count() {
+        global $wpdb;
 
-		$count = get_transient( '_wl_main_ingredient_list_table__count' );
+        $count = get_transient( '_wl_main_ingredient_list_table__count' );
 
-		if ( ! $count ) {
+        if ( ! $count ) {
 
-			$count = $wpdb->get_var(
-				"SELECT COUNT(1)
+            $count = $wpdb->get_var(
+                "SELECT COUNT(1)
 						FROM $wpdb->postmeta pm1
 						    INNER JOIN $wpdb->posts p1
 						        ON p1.ID = pm1.post_ID AND p1.post_type = 'wprm_recipe'
 							INNER JOIN $wpdb->postmeta pm2
 								ON pm2.post_ID = pm1.post_ID AND pm2.meta_key = 'wprm_parent_post_id'
 						    INNER JOIN $wpdb->posts p2"
-				// The following ignore rule is used against the `LIKE CONCAT`. We only have const values.
-				// phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.LikeWildcardsInQuery
-				. " ON p2.post_status = 'publish' AND p2.ID = pm2.post_ID
+                // The following ignore rule is used against the `LIKE CONCAT`. We only have const values.
+                // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.LikeWildcardsInQuery
+                . " ON p2.post_status = 'publish' AND p2.ID = pm2.post_ID
 							WHERE pm1.meta_key = '_wl_main_ingredient_jsonld'"
-			);
-
-			set_transient( '_wl_main_ingredient_list_table__count', $count, 60 );
-		}
-
-		return $count;
-	}
-
-	public function no_items() {
-		esc_html_e( 'No main ingredients found.', 'wordlift' );
-	}
-
-	public function get_columns() {
-		return array(
-			'ingredient_name' => __( 'Ingredient Name', 'wordlift' ),
-			'recipe_name'     => __( 'Recipe Name', 'wordlift' ),
-			'post_title'      => __( 'Post Title', 'wordlift' ),
-			'url'             => __( 'Post URL', 'wordlift' ),
-			'actions'         => '',
-		);
-	}
-
-	public function column_ingredient_name( $item ) {
-		$recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		$recipe         = json_decode( $recipe_json_ld, true );
-
-		return $recipe ? $recipe['name'] : 'null';
-	}
-
-	public function column_recipe_name( $item ) {
-		return $item->recipe_name;
-	}
-
-	public function column_post_title( $item ) {
-		return sprintf( '<a href="%s">%s</a>', get_edit_post_link( $item->post_ID ), $item->post_title );
-	}
-
-	public function column_url( $item ) {
-		return get_permalink( $item->post_ID );
-	}
-
-	public function column_actions( $item ) {
-
-		$url = admin_url(
-			sprintf( 'admin.php?page=wl_ingredients&modal_window=true&id=%d&TB_iframe=true', $item->recipe_ID )  // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		);
-
-		return sprintf(
-			'<a href="%s" class="button alignright thickbox open-plugin-details-modal" data-title="%s" type="button">%s</a>',
-			$url,
-			esc_attr( $item->post_title ),
-			esc_html__( 'JSON-LD', 'wordlift' )
-		);
-	}
+            );
+
+            set_transient( '_wl_main_ingredient_list_table__count', $count, 60 );
+        }
+
+        return $count;
+    }
+
+    public function no_items() {
+        esc_html_e( 'No main ingredients found.', 'wordlift' );
+    }
+
+    public function get_columns() {
+        return array(
+            'ingredient_name' => __( 'Ingredient Name', 'wordlift' ),
+            'recipe_name'     => __( 'Recipe Name', 'wordlift' ),
+            'post_title'      => __( 'Post Title', 'wordlift' ),
+            'url'             => __( 'Post URL', 'wordlift' ),
+            'actions'         => '',
+        );
+    }
+
+    public function column_ingredient_name( $item ) {
+        $recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        $recipe         = json_decode( $recipe_json_ld, true );
+
+        return $recipe ? $recipe['name'] : 'null';
+    }
+
+    public function column_recipe_name( $item ) {
+        return $item->recipe_name;
+    }
+
+    public function column_post_title( $item ) {
+        return sprintf( '<a href="%s">%s</a>', get_edit_post_link( $item->post_ID ), $item->post_title );
+    }
+
+    public function column_url( $item ) {
+        return get_permalink( $item->post_ID );
+    }
+
+    public function column_actions( $item ) {
+
+        $url = admin_url(
+            sprintf( 'admin.php?page=wl_ingredients&modal_window=true&id=%d&TB_iframe=true', $item->recipe_ID )  // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        );
+
+        return sprintf(
+            '<a href="%s" class="button alignright thickbox open-plugin-details-modal" data-title="%s" type="button">%s</a>',
+            $url,
+            esc_attr( $item->post_title ),
+            esc_html__( 'JSON-LD', 'wordlift' )
+        );
+    }
 
 }
 

Spacing +25 added lines, -25 removed lines

@@ -2,8 +2,8 @@ 
 
 namespace Wordlift\Modules\Food_Kg\Admin;
 
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 use WP_List_Table;
@@ -30,7 +30,7 @@ 
 		 * 3 other arrays. One for all columns, one for hidden columns, and one
 		 * for sortable columns.
 		 */
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		// Pagination.
 		$per_page     = 20;
@@ -56,7 +56,7 @@ 
 					LIMIT %d
 					OFFSET %d",
 				$per_page,
-				( $current_page - 1 ) * $per_page
+				($current_page - 1) * $per_page
 			)
 		);
 
@@ -64,7 +64,7 @@ 
 			array(
 				'total_items' => $total_items,
 				'per_page'    => $per_page,
-				'total_pages' => ceil( $total_items / $per_page ),
+				'total_pages' => ceil($total_items / $per_page),
 			)
 		);
 	}
@@ -72,9 +72,9 @@ 
 	private function count() {
 		global $wpdb;
 
-		$count = get_transient( '_wl_main_ingredient_list_table__count' );
+		$count = get_transient('_wl_main_ingredient_list_table__count');
 
-		if ( ! $count ) {
+		if ( ! $count) {
 
 			$count = $wpdb->get_var(
 				"SELECT COUNT(1)
@@ -90,56 +90,56 @@ 
 							WHERE pm1.meta_key = '_wl_main_ingredient_jsonld'"
 			);
 
-			set_transient( '_wl_main_ingredient_list_table__count', $count, 60 );
+			set_transient('_wl_main_ingredient_list_table__count', $count, 60);
 		}
 
 		return $count;
 	}
 
 	public function no_items() {
-		esc_html_e( 'No main ingredients found.', 'wordlift' );
+		esc_html_e('No main ingredients found.', 'wordlift');
 	}
 
 	public function get_columns() {
 		return array(
-			'ingredient_name' => __( 'Ingredient Name', 'wordlift' ),
-			'recipe_name'     => __( 'Recipe Name', 'wordlift' ),
-			'post_title'      => __( 'Post Title', 'wordlift' ),
-			'url'             => __( 'Post URL', 'wordlift' ),
+			'ingredient_name' => __('Ingredient Name', 'wordlift'),
+			'recipe_name'     => __('Recipe Name', 'wordlift'),
+			'post_title'      => __('Post Title', 'wordlift'),
+			'url'             => __('Post URL', 'wordlift'),
 			'actions'         => '',
 		);
 	}
 
-	public function column_ingredient_name( $item ) {
-		$recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		$recipe         = json_decode( $recipe_json_ld, true );
+	public function column_ingredient_name($item) {
+		$recipe_json_ld = get_post_meta($item->recipe_ID, '_wl_main_ingredient_jsonld', true); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+		$recipe         = json_decode($recipe_json_ld, true);
 
 		return $recipe ? $recipe['name'] : 'null';
 	}
 
-	public function column_recipe_name( $item ) {
+	public function column_recipe_name($item) {
 		return $item->recipe_name;
 	}
 
-	public function column_post_title( $item ) {
-		return sprintf( '<a href="%s">%s</a>', get_edit_post_link( $item->post_ID ), $item->post_title );
+	public function column_post_title($item) {
+		return sprintf('<a href="%s">%s</a>', get_edit_post_link($item->post_ID), $item->post_title);
 	}
 
-	public function column_url( $item ) {
-		return get_permalink( $item->post_ID );
+	public function column_url($item) {
+		return get_permalink($item->post_ID);
 	}
 
-	public function column_actions( $item ) {
+	public function column_actions($item) {
 
 		$url = admin_url(
-			sprintf( 'admin.php?page=wl_ingredients&modal_window=true&id=%d&TB_iframe=true', $item->recipe_ID )  // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			sprintf('admin.php?page=wl_ingredients&modal_window=true&id=%d&TB_iframe=true', $item->recipe_ID)  // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		);
 
 		return sprintf(
 			'<a href="%s" class="button alignright thickbox open-plugin-details-modal" data-title="%s" type="button">%s</a>',
 			$url,
-			esc_attr( $item->post_title ),
-			esc_html__( 'JSON-LD', 'wordlift' )
+			esc_attr($item->post_title),
+			esc_html__('JSON-LD', 'wordlift')
 		);
 	}
 

src/wordlift/shipping-data/class-flat-rate-shipping-method.php

Spacing +12 added lines, -12 removed lines

@@ -6,40 +6,40 @@
 
 class Flat_Rate_Shipping_Method extends Shipping_Method {
 
-	public function add_available_delivery_method( &$jsonld ) {
+	public function add_available_delivery_method(&$jsonld) {
 
-		if ( ! isset( $jsonld['availableDeliveryMethod'] ) ) {
+		if ( ! isset($jsonld['availableDeliveryMethod'])) {
 			$jsonld['availableDeliveryMethod'] = array();
 		}
 
-		if ( ! is_array( $jsonld['availableDeliveryMethod'] ) ) {
-			$jsonld['availableDeliveryMethod'] = array( $jsonld['availableDeliveryMethod'] );
+		if ( ! is_array($jsonld['availableDeliveryMethod'])) {
+			$jsonld['availableDeliveryMethod'] = array($jsonld['availableDeliveryMethod']);
 		}
 
-		if ( ! in_array( 'ParcelDelivery', $jsonld['availableDeliveryMethod'], true ) ) {
-			array_push( $jsonld['availableDeliveryMethod'], 'ParcelDelivery' );
+		if ( ! in_array('ParcelDelivery', $jsonld['availableDeliveryMethod'], true)) {
+			array_push($jsonld['availableDeliveryMethod'], 'ParcelDelivery');
 		}
 
 	}
 
-	public function add_shipping_rate( &$offer_shipping_details ) {
+	public function add_shipping_rate(&$offer_shipping_details) {
 
-		if ( ! isset( $offer_shipping_details['shippingRate'] ) ) {
+		if ( ! isset($offer_shipping_details['shippingRate'])) {
 			$offer_shipping_details['shippingRate'] = array();
 		}
 
-		$description = isset( $this->wc_shipping_method->instance_settings['description'] )
-			? wp_strip_all_tags( $this->wc_shipping_method->instance_settings['description'] ) : '';
+		$description = isset($this->wc_shipping_method->instance_settings['description'])
+			? wp_strip_all_tags($this->wc_shipping_method->instance_settings['description']) : '';
 
 		$shipping_rate = array(
 			'@type'       => 'MonetaryAmount',
 			'name'        => $this->wc_shipping_method->get_title(),
 			'description' => $description,
-			'value'       => $this->wc_shipping_method->get_option( 'cost' ),
+			'value'       => $this->wc_shipping_method->get_option('cost'),
 			'currency'    => get_woocommerce_currency(),
 		);
 
-		$this->change_to_manual_currency( $shipping_rate );
+		$this->change_to_manual_currency($shipping_rate);
 
 		$offer_shipping_details['shippingRate'][] = $shipping_rate;
 

Indentation +27 added lines, -27 removed lines

@@ -4,43 +4,43 @@
 
 class Flat_Rate_Shipping_Method extends Shipping_Method {
 
-	public function add_available_delivery_method( &$jsonld ) {
+    public function add_available_delivery_method( &$jsonld ) {
 
-		if ( ! isset( $jsonld['availableDeliveryMethod'] ) ) {
-			$jsonld['availableDeliveryMethod'] = array();
-		}
+        if ( ! isset( $jsonld['availableDeliveryMethod'] ) ) {
+            $jsonld['availableDeliveryMethod'] = array();
+        }
 
-		if ( ! is_array( $jsonld['availableDeliveryMethod'] ) ) {
-			$jsonld['availableDeliveryMethod'] = array( $jsonld['availableDeliveryMethod'] );
-		}
+        if ( ! is_array( $jsonld['availableDeliveryMethod'] ) ) {
+            $jsonld['availableDeliveryMethod'] = array( $jsonld['availableDeliveryMethod'] );
+        }
 
-		if ( ! in_array( 'ParcelDelivery', $jsonld['availableDeliveryMethod'], true ) ) {
-			array_push( $jsonld['availableDeliveryMethod'], 'ParcelDelivery' );
-		}
+        if ( ! in_array( 'ParcelDelivery', $jsonld['availableDeliveryMethod'], true ) ) {
+            array_push( $jsonld['availableDeliveryMethod'], 'ParcelDelivery' );
+        }
 
-	}
+    }
 
-	public function add_shipping_rate( &$offer_shipping_details ) {
+    public function add_shipping_rate( &$offer_shipping_details ) {
 
-		if ( ! isset( $offer_shipping_details['shippingRate'] ) ) {
-			$offer_shipping_details['shippingRate'] = array();
-		}
+        if ( ! isset( $offer_shipping_details['shippingRate'] ) ) {
+            $offer_shipping_details['shippingRate'] = array();
+        }
 
-		$description = isset( $this->wc_shipping_method->instance_settings['description'] )
-			? wp_strip_all_tags( $this->wc_shipping_method->instance_settings['description'] ) : '';
+        $description = isset( $this->wc_shipping_method->instance_settings['description'] )
+            ? wp_strip_all_tags( $this->wc_shipping_method->instance_settings['description'] ) : '';
 
-		$shipping_rate = array(
-			'@type'       => 'MonetaryAmount',
-			'name'        => $this->wc_shipping_method->get_title(),
-			'description' => $description,
-			'value'       => $this->wc_shipping_method->get_option( 'cost' ),
-			'currency'    => get_woocommerce_currency(),
-		);
+        $shipping_rate = array(
+            '@type'       => 'MonetaryAmount',
+            'name'        => $this->wc_shipping_method->get_title(),
+            'description' => $description,
+            'value'       => $this->wc_shipping_method->get_option( 'cost' ),
+            'currency'    => get_woocommerce_currency(),
+        );
 
-		$this->change_to_manual_currency( $shipping_rate );
+        $this->change_to_manual_currency( $shipping_rate );
 
-		$offer_shipping_details['shippingRate'][] = $shipping_rate;
+        $offer_shipping_details['shippingRate'][] = $shipping_rate;
 
-	}
+    }
 
 }

src/wordlift/shipping-data/class-free-shipping-shipping-method.php

Indentation +27 added lines, -27 removed lines

@@ -4,43 +4,43 @@
 
 class Free_Shipping_Shipping_Method extends Shipping_Method {
 
-	public function add_available_delivery_method( &$jsonld ) {
+    public function add_available_delivery_method( &$jsonld ) {
 
-		if ( ! isset( $jsonld['availableDeliveryMethod'] ) ) {
-			$jsonld['availableDeliveryMethod'] = array();
-		}
+        if ( ! isset( $jsonld['availableDeliveryMethod'] ) ) {
+            $jsonld['availableDeliveryMethod'] = array();
+        }
 
-		if ( ! is_array( $jsonld['availableDeliveryMethod'] ) ) {
-			$jsonld['availableDeliveryMethod'] = array( $jsonld['availableDeliveryMethod'] );
-		}
+        if ( ! is_array( $jsonld['availableDeliveryMethod'] ) ) {
+            $jsonld['availableDeliveryMethod'] = array( $jsonld['availableDeliveryMethod'] );
+        }
 
-		if ( ! in_array( 'ParcelDelivery', $jsonld['availableDeliveryMethod'], true ) ) {
-			array_push( $jsonld['availableDeliveryMethod'], 'ParcelDelivery' );
-		}
+        if ( ! in_array( 'ParcelDelivery', $jsonld['availableDeliveryMethod'], true ) ) {
+            array_push( $jsonld['availableDeliveryMethod'], 'ParcelDelivery' );
+        }
 
-	}
+    }
 
-	public function add_shipping_rate( &$offer_shipping_details ) {
+    public function add_shipping_rate( &$offer_shipping_details ) {
 
-		if ( ! isset( $offer_shipping_details['shippingRate'] ) ) {
-			$offer_shipping_details['shippingRate'] = array();
-		}
+        if ( ! isset( $offer_shipping_details['shippingRate'] ) ) {
+            $offer_shipping_details['shippingRate'] = array();
+        }
 
-		$description = isset( $this->wc_shipping_method->instance_settings['description'] )
-			? wp_strip_all_tags( $this->wc_shipping_method->instance_settings['description'] ) : '';
+        $description = isset( $this->wc_shipping_method->instance_settings['description'] )
+            ? wp_strip_all_tags( $this->wc_shipping_method->instance_settings['description'] ) : '';
 
-		$shipping_rate = array(
-			'@type'       => 'MonetaryAmount',
-			'name'        => $this->wc_shipping_method->get_title(),
-			'description' => $description,
-			'value'       => '0',
-			'currency'    => get_woocommerce_currency(),
-		);
+        $shipping_rate = array(
+            '@type'       => 'MonetaryAmount',
+            'name'        => $this->wc_shipping_method->get_title(),
+            'description' => $description,
+            'value'       => '0',
+            'currency'    => get_woocommerce_currency(),
+        );
 
-		$this->change_to_manual_currency( $shipping_rate );
+        $this->change_to_manual_currency( $shipping_rate );
 
-		$offer_shipping_details['shippingRate'][] = $shipping_rate;
+        $offer_shipping_details['shippingRate'][] = $shipping_rate;
 
-	}
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -4,30 +4,30 @@ 
 
 class Free_Shipping_Shipping_Method extends Shipping_Method {
 
-	public function add_available_delivery_method( &$jsonld ) {
+	public function add_available_delivery_method(&$jsonld) {
 
-		if ( ! isset( $jsonld['availableDeliveryMethod'] ) ) {
+		if ( ! isset($jsonld['availableDeliveryMethod'])) {
 			$jsonld['availableDeliveryMethod'] = array();
 		}
 
-		if ( ! is_array( $jsonld['availableDeliveryMethod'] ) ) {
-			$jsonld['availableDeliveryMethod'] = array( $jsonld['availableDeliveryMethod'] );
+		if ( ! is_array($jsonld['availableDeliveryMethod'])) {
+			$jsonld['availableDeliveryMethod'] = array($jsonld['availableDeliveryMethod']);
 		}
 
-		if ( ! in_array( 'ParcelDelivery', $jsonld['availableDeliveryMethod'], true ) ) {
-			array_push( $jsonld['availableDeliveryMethod'], 'ParcelDelivery' );
+		if ( ! in_array('ParcelDelivery', $jsonld['availableDeliveryMethod'], true)) {
+			array_push($jsonld['availableDeliveryMethod'], 'ParcelDelivery');
 		}
 
 	}
 
-	public function add_shipping_rate( &$offer_shipping_details ) {
+	public function add_shipping_rate(&$offer_shipping_details) {
 
-		if ( ! isset( $offer_shipping_details['shippingRate'] ) ) {
+		if ( ! isset($offer_shipping_details['shippingRate'])) {
 			$offer_shipping_details['shippingRate'] = array();
 		}
 
-		$description = isset( $this->wc_shipping_method->instance_settings['description'] )
-			? wp_strip_all_tags( $this->wc_shipping_method->instance_settings['description'] ) : '';
+		$description = isset($this->wc_shipping_method->instance_settings['description'])
+			? wp_strip_all_tags($this->wc_shipping_method->instance_settings['description']) : '';
 
 		$shipping_rate = array(
 			'@type'       => 'MonetaryAmount',
@@ -37,7 +37,7 @@ 
 			'currency'    => get_woocommerce_currency(),
 		);
 
-		$this->change_to_manual_currency( $shipping_rate );
+		$this->change_to_manual_currency($shipping_rate);
 
 		$offer_shipping_details['shippingRate'][] = $shipping_rate;
 

src/wordlift/shipping-data/class-local-pickup-shipping-method.php

Indentation +28 added lines, -28 removed lines

@@ -6,45 +6,45 @@
 
 class Local_Pickup_Shipping_Method extends Shipping_Method {
 
-	public function add_available_delivery_method( &$jsonld ) {
+    public function add_available_delivery_method( &$jsonld ) {
 
-		if ( ! isset( $jsonld['availableDeliveryMethod'] ) ) {
-			$jsonld['availableDeliveryMethod'] = array();
-		}
+        if ( ! isset( $jsonld['availableDeliveryMethod'] ) ) {
+            $jsonld['availableDeliveryMethod'] = array();
+        }
 
-		if ( ! is_array( $jsonld['availableDeliveryMethod'] ) ) {
-			$jsonld['availableDeliveryMethod'] = array( $jsonld['availableDeliveryMethod'] );
-		}
+        if ( ! is_array( $jsonld['availableDeliveryMethod'] ) ) {
+            $jsonld['availableDeliveryMethod'] = array( $jsonld['availableDeliveryMethod'] );
+        }
 
-		if ( ! in_array( 'OnSitePickup', $jsonld['availableDeliveryMethod'], true ) ) {
-			array_push( $jsonld['availableDeliveryMethod'], 'OnSitePickup' );
-		}
+        if ( ! in_array( 'OnSitePickup', $jsonld['availableDeliveryMethod'], true ) ) {
+            array_push( $jsonld['availableDeliveryMethod'], 'OnSitePickup' );
+        }
 
-	}
+    }
 
-	public function add_shipping_rate( &$offer_shipping_details ) {
+    public function add_shipping_rate( &$offer_shipping_details ) {
 
-		if ( ! isset( $offer_shipping_details['shippingRate'] ) ) {
-			$offer_shipping_details['shippingRate'] = array();
-		}
+        if ( ! isset( $offer_shipping_details['shippingRate'] ) ) {
+            $offer_shipping_details['shippingRate'] = array();
+        }
 
-		$description = isset( $this->wc_shipping_method->instance_settings['description'] )
-			? wp_strip_all_tags( $this->wc_shipping_method->instance_settings['description'] ) : '';
+        $description = isset( $this->wc_shipping_method->instance_settings['description'] )
+            ? wp_strip_all_tags( $this->wc_shipping_method->instance_settings['description'] ) : '';
 
-		$cost = $this->wc_shipping_method->get_option( 'cost' );
+        $cost = $this->wc_shipping_method->get_option( 'cost' );
 
-		$shipping_rate = array(
-			'@type'       => 'MonetaryAmount',
-			'name'        => $this->wc_shipping_method->get_title(),
-			'description' => $description,
-			'value'       => $cost ? $cost : '0',
-			'currency'    => get_woocommerce_currency(),
-		);
+        $shipping_rate = array(
+            '@type'       => 'MonetaryAmount',
+            'name'        => $this->wc_shipping_method->get_title(),
+            'description' => $description,
+            'value'       => $cost ? $cost : '0',
+            'currency'    => get_woocommerce_currency(),
+        );
 
-		$this->change_to_manual_currency( $shipping_rate );
+        $this->change_to_manual_currency( $shipping_rate );
 
-		$offer_shipping_details['shippingRate'][] = $shipping_rate;
+        $offer_shipping_details['shippingRate'][] = $shipping_rate;
 
-	}
+    }
 
 }

Spacing +12 added lines, -12 removed lines

@@ -6,32 +6,32 @@ 
 
 class Local_Pickup_Shipping_Method extends Shipping_Method {
 
-	public function add_available_delivery_method( &$jsonld ) {
+	public function add_available_delivery_method(&$jsonld) {
 
-		if ( ! isset( $jsonld['availableDeliveryMethod'] ) ) {
+		if ( ! isset($jsonld['availableDeliveryMethod'])) {
 			$jsonld['availableDeliveryMethod'] = array();
 		}
 
-		if ( ! is_array( $jsonld['availableDeliveryMethod'] ) ) {
-			$jsonld['availableDeliveryMethod'] = array( $jsonld['availableDeliveryMethod'] );
+		if ( ! is_array($jsonld['availableDeliveryMethod'])) {
+			$jsonld['availableDeliveryMethod'] = array($jsonld['availableDeliveryMethod']);
 		}
 
-		if ( ! in_array( 'OnSitePickup', $jsonld['availableDeliveryMethod'], true ) ) {
-			array_push( $jsonld['availableDeliveryMethod'], 'OnSitePickup' );
+		if ( ! in_array('OnSitePickup', $jsonld['availableDeliveryMethod'], true)) {
+			array_push($jsonld['availableDeliveryMethod'], 'OnSitePickup');
 		}
 
 	}
 
-	public function add_shipping_rate( &$offer_shipping_details ) {
+	public function add_shipping_rate(&$offer_shipping_details) {
 
-		if ( ! isset( $offer_shipping_details['shippingRate'] ) ) {
+		if ( ! isset($offer_shipping_details['shippingRate'])) {
 			$offer_shipping_details['shippingRate'] = array();
 		}
 
-		$description = isset( $this->wc_shipping_method->instance_settings['description'] )
-			? wp_strip_all_tags( $this->wc_shipping_method->instance_settings['description'] ) : '';
+		$description = isset($this->wc_shipping_method->instance_settings['description'])
+			? wp_strip_all_tags($this->wc_shipping_method->instance_settings['description']) : '';
 
-		$cost = $this->wc_shipping_method->get_option( 'cost' );
+		$cost = $this->wc_shipping_method->get_option('cost');
 
 		$shipping_rate = array(
 			'@type'       => 'MonetaryAmount',
@@ -41,7 +41,7 @@ 
 			'currency'    => get_woocommerce_currency(),
 		);
 
-		$this->change_to_manual_currency( $shipping_rate );
+		$this->change_to_manual_currency($shipping_rate);
 
 		$offer_shipping_details['shippingRate'][] = $shipping_rate;
 

src/wordlift/shipping-data/class-shipping-method.php

Indentation +100 added lines, -100 removed lines

@@ -7,105 +7,105 @@
 
 class Shipping_Method {
 
-	/**
-	 * @var WC_Shipping_Method $wc_shipping_method
-	 */
-	protected $wc_shipping_method;
-
-	/**
-	 * Shipping_Method constructor.
-	 *
-	 * @param WC_Shipping_Method $wc_shipping_method
-	 */
-	public function __construct( $wc_shipping_method ) {
-		$this->wc_shipping_method = $wc_shipping_method;
-	}
-
-	/**
-	 * @param WC_Shipping_Method $wc_shipping_method
-	 *
-	 * @return Shipping_Method
-	 */
-	public static function from_wc_shipping_method( $wc_shipping_method ) {
-
-		switch ( get_class( $wc_shipping_method ) ) {
-			case 'WC_Shipping_Local_Pickup':
-				return new Local_Pickup_Shipping_Method( $wc_shipping_method );
-
-			case 'WC_Shipping_Flat_Rate':
-				return new Flat_Rate_Shipping_Method( $wc_shipping_method );
-
-			case 'WC_Shipping_Free_Shipping':
-				return new Free_Shipping_Shipping_Method( $wc_shipping_method );
-
-			default:
-				return new self( $wc_shipping_method );
-		}
-
-	}
-
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function add_available_delivery_method( &$jsonld ) {
-
-	}
-
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function add_shipping_rate( &$offer_shipping_details ) {
-
-	}
-
-	public function add_transit_time( &$shipping_delivery_time ) {
-
-		$prefix   = "wcsdt_transit_m{$this->wc_shipping_method->get_instance_id()}";
-		$property = 'transitTime';
-
-		$option = get_option( 'wpsso_options' );
-
-		if ( empty( $option[ "{$prefix}_unit_code" ] )
-			 || ! isset( $option[ "{$prefix}_minimum" ] )
-			 || ! isset( $option[ "{$prefix}_maximum" ] )
-			 || ! is_numeric( $option[ "{$prefix}_minimum" ] )
-			 || ! is_numeric( $option[ "{$prefix}_maximum" ] ) ) {
-			return;
-		}
-
-		$unit_code = $option[ "{$prefix}_unit_code" ];
-		$minimum   = $option[ "{$prefix}_minimum" ];
-		$maximum   = $option[ "{$prefix}_maximum" ];
-
-		if ( 'HUR' === $unit_code ) {
-			$minimum = floor( $minimum / 24.0 );
-			$maximum = ceil( $maximum / 24.0 );
-		}
-
-		$shipping_delivery_time[ $property ] = array(
-			'@type'    => 'QuantitativeValue',
-			'minValue' => intval( $minimum ),
-			'maxValue' => intval( $maximum ),
-		);
-
-	}
-
-	protected function change_to_manual_currency( &$shipping_rate ) {
-		// WCML not available.
-		if ( ! class_exists( 'WCML\Multicurrency\Shipping\ShippingModeProvider' ) ) {
-			return;
-		}
-
-		// Manual pricing not enabled.
-		if ( ! ShippingModeProvider::get( $this->wc_shipping_method->id )->isManualPricingEnabled( $this->wc_shipping_method ) ) {
-			return;
-		}
-
-		// Get the first manual price.
-		foreach ( $this->wc_shipping_method->instance_settings as $key => $value ) {
-			if ( preg_match( '@^cost_(\w{3})$@', $key, $matches ) ) {
-				$shipping_rate['value']    = $value;
-				$shipping_rate['currency'] = $matches[1];
-
-				return;
-			}
-		}
-	}
+    /**
+     * @var WC_Shipping_Method $wc_shipping_method
+     */
+    protected $wc_shipping_method;
+
+    /**
+     * Shipping_Method constructor.
+     *
+     * @param WC_Shipping_Method $wc_shipping_method
+     */
+    public function __construct( $wc_shipping_method ) {
+        $this->wc_shipping_method = $wc_shipping_method;
+    }
+
+    /**
+     * @param WC_Shipping_Method $wc_shipping_method
+     *
+     * @return Shipping_Method
+     */
+    public static function from_wc_shipping_method( $wc_shipping_method ) {
+
+        switch ( get_class( $wc_shipping_method ) ) {
+            case 'WC_Shipping_Local_Pickup':
+                return new Local_Pickup_Shipping_Method( $wc_shipping_method );
+
+            case 'WC_Shipping_Flat_Rate':
+                return new Flat_Rate_Shipping_Method( $wc_shipping_method );
+
+            case 'WC_Shipping_Free_Shipping':
+                return new Free_Shipping_Shipping_Method( $wc_shipping_method );
+
+            default:
+                return new self( $wc_shipping_method );
+        }
+
+    }
+
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function add_available_delivery_method( &$jsonld ) {
+
+    }
+
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function add_shipping_rate( &$offer_shipping_details ) {
+
+    }
+
+    public function add_transit_time( &$shipping_delivery_time ) {
+
+        $prefix   = "wcsdt_transit_m{$this->wc_shipping_method->get_instance_id()}";
+        $property = 'transitTime';
+
+        $option = get_option( 'wpsso_options' );
+
+        if ( empty( $option[ "{$prefix}_unit_code" ] )
+             || ! isset( $option[ "{$prefix}_minimum" ] )
+             || ! isset( $option[ "{$prefix}_maximum" ] )
+             || ! is_numeric( $option[ "{$prefix}_minimum" ] )
+             || ! is_numeric( $option[ "{$prefix}_maximum" ] ) ) {
+            return;
+        }
+
+        $unit_code = $option[ "{$prefix}_unit_code" ];
+        $minimum   = $option[ "{$prefix}_minimum" ];
+        $maximum   = $option[ "{$prefix}_maximum" ];
+
+        if ( 'HUR' === $unit_code ) {
+            $minimum = floor( $minimum / 24.0 );
+            $maximum = ceil( $maximum / 24.0 );
+        }
+
+        $shipping_delivery_time[ $property ] = array(
+            '@type'    => 'QuantitativeValue',
+            'minValue' => intval( $minimum ),
+            'maxValue' => intval( $maximum ),
+        );
+
+    }
+
+    protected function change_to_manual_currency( &$shipping_rate ) {
+        // WCML not available.
+        if ( ! class_exists( 'WCML\Multicurrency\Shipping\ShippingModeProvider' ) ) {
+            return;
+        }
+
+        // Manual pricing not enabled.
+        if ( ! ShippingModeProvider::get( $this->wc_shipping_method->id )->isManualPricingEnabled( $this->wc_shipping_method ) ) {
+            return;
+        }
+
+        // Get the first manual price.
+        foreach ( $this->wc_shipping_method->instance_settings as $key => $value ) {
+            if ( preg_match( '@^cost_(\w{3})$@', $key, $matches ) ) {
+                $shipping_rate['value']    = $value;
+                $shipping_rate['currency'] = $matches[1];
+
+                return;
+            }
+        }
+    }
 
 }

Spacing +30 added lines, -30 removed lines

@@ -17,7 +17,7 @@ 
 	 *
 	 * @param WC_Shipping_Method $wc_shipping_method
 	 */
-	public function __construct( $wc_shipping_method ) {
+	public function __construct($wc_shipping_method) {
 		$this->wc_shipping_method = $wc_shipping_method;
 	}
 
@@ -26,80 +26,80 @@ 
 	 *
 	 * @return Shipping_Method
 	 */
-	public static function from_wc_shipping_method( $wc_shipping_method ) {
+	public static function from_wc_shipping_method($wc_shipping_method) {
 
-		switch ( get_class( $wc_shipping_method ) ) {
+		switch (get_class($wc_shipping_method)) {
 			case 'WC_Shipping_Local_Pickup':
-				return new Local_Pickup_Shipping_Method( $wc_shipping_method );
+				return new Local_Pickup_Shipping_Method($wc_shipping_method);
 
 			case 'WC_Shipping_Flat_Rate':
-				return new Flat_Rate_Shipping_Method( $wc_shipping_method );
+				return new Flat_Rate_Shipping_Method($wc_shipping_method);
 
 			case 'WC_Shipping_Free_Shipping':
-				return new Free_Shipping_Shipping_Method( $wc_shipping_method );
+				return new Free_Shipping_Shipping_Method($wc_shipping_method);
 
 			default:
-				return new self( $wc_shipping_method );
+				return new self($wc_shipping_method);
 		}
 
 	}
 
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function add_available_delivery_method( &$jsonld ) {
+	public function add_available_delivery_method(&$jsonld) {
 
 	}
 
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function add_shipping_rate( &$offer_shipping_details ) {
+	public function add_shipping_rate(&$offer_shipping_details) {
 
 	}
 
-	public function add_transit_time( &$shipping_delivery_time ) {
+	public function add_transit_time(&$shipping_delivery_time) {
 
 		$prefix   = "wcsdt_transit_m{$this->wc_shipping_method->get_instance_id()}";
 		$property = 'transitTime';
 
-		$option = get_option( 'wpsso_options' );
+		$option = get_option('wpsso_options');
 
-		if ( empty( $option[ "{$prefix}_unit_code" ] )
-			 || ! isset( $option[ "{$prefix}_minimum" ] )
-			 || ! isset( $option[ "{$prefix}_maximum" ] )
-			 || ! is_numeric( $option[ "{$prefix}_minimum" ] )
-			 || ! is_numeric( $option[ "{$prefix}_maximum" ] ) ) {
+		if (empty($option["{$prefix}_unit_code"])
+			 || ! isset($option["{$prefix}_minimum"])
+			 || ! isset($option["{$prefix}_maximum"])
+			 || ! is_numeric($option["{$prefix}_minimum"])
+			 || ! is_numeric($option["{$prefix}_maximum"])) {
 			return;
 		}
 
-		$unit_code = $option[ "{$prefix}_unit_code" ];
-		$minimum   = $option[ "{$prefix}_minimum" ];
-		$maximum   = $option[ "{$prefix}_maximum" ];
+		$unit_code = $option["{$prefix}_unit_code"];
+		$minimum   = $option["{$prefix}_minimum"];
+		$maximum   = $option["{$prefix}_maximum"];
 
-		if ( 'HUR' === $unit_code ) {
-			$minimum = floor( $minimum / 24.0 );
-			$maximum = ceil( $maximum / 24.0 );
+		if ('HUR' === $unit_code) {
+			$minimum = floor($minimum / 24.0);
+			$maximum = ceil($maximum / 24.0);
 		}
 
-		$shipping_delivery_time[ $property ] = array(
+		$shipping_delivery_time[$property] = array(
 			'@type'    => 'QuantitativeValue',
-			'minValue' => intval( $minimum ),
-			'maxValue' => intval( $maximum ),
+			'minValue' => intval($minimum),
+			'maxValue' => intval($maximum),
 		);
 
 	}
 
-	protected function change_to_manual_currency( &$shipping_rate ) {
+	protected function change_to_manual_currency(&$shipping_rate) {
 		// WCML not available.
-		if ( ! class_exists( 'WCML\Multicurrency\Shipping\ShippingModeProvider' ) ) {
+		if ( ! class_exists('WCML\Multicurrency\Shipping\ShippingModeProvider')) {
 			return;
 		}
 
 		// Manual pricing not enabled.
-		if ( ! ShippingModeProvider::get( $this->wc_shipping_method->id )->isManualPricingEnabled( $this->wc_shipping_method ) ) {
+		if ( ! ShippingModeProvider::get($this->wc_shipping_method->id)->isManualPricingEnabled($this->wc_shipping_method)) {
 			return;
 		}
 
 		// Get the first manual price.
-		foreach ( $this->wc_shipping_method->instance_settings as $key => $value ) {
-			if ( preg_match( '@^cost_(\w{3})$@', $key, $matches ) ) {
+		foreach ($this->wc_shipping_method->instance_settings as $key => $value) {
+			if (preg_match('@^cost_(\w{3})$@', $key, $matches)) {
 				$shipping_rate['value']    = $value;
 				$shipping_rate['currency'] = $matches[1];
 

src/modules/food-kg/includes/admin/Download_Ingredients_Data.php

Indentation +68 added lines, -68 removed lines

@@ -4,22 +4,22 @@ 
 
 class Download_Ingredients_Data {
 
-	public function register_hooks() {
-		add_action( 'wp_ajax_wl_download_ingredients_data', array( $this, 'wl_download_ingredients_data' ) );
-	}
+    public function register_hooks() {
+        add_action( 'wp_ajax_wl_download_ingredients_data', array( $this, 'wl_download_ingredients_data' ) );
+    }
 
-	public function wl_download_ingredients_data() {
+    public function wl_download_ingredients_data() {
 
-		check_ajax_referer( 'wl-dl-ingredients-data-nonce' );
+        check_ajax_referer( 'wl-dl-ingredients-data-nonce' );
 
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'wordlift' ) );
-		}
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'wordlift' ) );
+        }
 
-		global $wpdb;
+        global $wpdb;
 
-		$items = $wpdb->get_results(
-			"SELECT p1.ID AS recipe_ID,
+        $items = $wpdb->get_results(
+            "SELECT p1.ID AS recipe_ID,
 					    p1.post_title AS recipe_name,
 					    p2.ID AS post_ID,
 					    p2.post_title
@@ -29,62 +29,62 @@ 
 							INNER JOIN $wpdb->postmeta pm2
 								ON pm2.post_ID = pm1.post_ID AND pm2.meta_key = 'wprm_parent_post_id'
 						    INNER JOIN $wpdb->posts p2"
-			// The following ignore rule is used against the `LIKE CONCAT`. We only have const values.
-			// phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.LikeWildcardsInQuery
-			. " ON p2.post_status = 'publish' AND p2.ID = pm2.post_ID
+            // The following ignore rule is used against the `LIKE CONCAT`. We only have const values.
+            // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.LikeWildcardsInQuery
+            . " ON p2.post_status = 'publish' AND p2.ID = pm2.post_ID
 							WHERE pm1.meta_key = '_wl_main_ingredient_jsonld'"
-		);
-
-		if ( ! $items ) {
-			wp_send_json_error( __( 'No main ingredients found.', 'wordlift' ) );
-		}
-
-		// Generate unique filename using current timestamp.
-		$filename = 'wl-main-ingredients-data-' . gmdate( 'Y-m-d-H-i-s' ) . '.tsv';
-
-		header( 'Content-Disposition: attachment; filename=' . $filename );
-		header( 'Content-Type: text/text/tab-separated-values; charset=' . get_bloginfo( 'charset' ) );
-
-		// Do not cache the file.
-		header( 'Pragma: no-cache' );
-		header( 'Expires: 0' );
-
-		$output = fopen( 'php://output', 'w' );
-
-		// Insert Header.
-		fputcsv(
-			$output,
-			array(
-				__( 'Ingredient Name', 'wordlift' ),
-				__( 'Recipe Name', 'wordlift' ),
-				__( 'Recipe ID', 'wordlift' ),
-				__( 'Post Name', 'wordlift' ),
-				__( 'Post ID', 'wordlift' ),
-				__( 'Post URL', 'wordlift' ),
-			),
-			"\t"
-		);
-
-		// Insert Data.
-		foreach ( $items as $item ) {
-			$recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-			$recipe         = json_decode( $recipe_json_ld, true );
-			fputcsv(
-				$output,
-				array(
-					$recipe ? $recipe['name'] : 'null',
-					$item->recipe_name,
-					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-					$item->recipe_ID,
-					$item->post_title,
-					$item->post_ID,
-					esc_url( get_the_permalink( $item->post_ID ) ),
-				),
-				"\t"
-			);
-			ob_flush();
-		}
-
-		wp_die();
-	}
+        );
+
+        if ( ! $items ) {
+            wp_send_json_error( __( 'No main ingredients found.', 'wordlift' ) );
+        }
+
+        // Generate unique filename using current timestamp.
+        $filename = 'wl-main-ingredients-data-' . gmdate( 'Y-m-d-H-i-s' ) . '.tsv';
+
+        header( 'Content-Disposition: attachment; filename=' . $filename );
+        header( 'Content-Type: text/text/tab-separated-values; charset=' . get_bloginfo( 'charset' ) );
+
+        // Do not cache the file.
+        header( 'Pragma: no-cache' );
+        header( 'Expires: 0' );
+
+        $output = fopen( 'php://output', 'w' );
+
+        // Insert Header.
+        fputcsv(
+            $output,
+            array(
+                __( 'Ingredient Name', 'wordlift' ),
+                __( 'Recipe Name', 'wordlift' ),
+                __( 'Recipe ID', 'wordlift' ),
+                __( 'Post Name', 'wordlift' ),
+                __( 'Post ID', 'wordlift' ),
+                __( 'Post URL', 'wordlift' ),
+            ),
+            "\t"
+        );
+
+        // Insert Data.
+        foreach ( $items as $item ) {
+            $recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+            $recipe         = json_decode( $recipe_json_ld, true );
+            fputcsv(
+                $output,
+                array(
+                    $recipe ? $recipe['name'] : 'null',
+                    $item->recipe_name,
+                    // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+                    $item->recipe_ID,
+                    $item->post_title,
+                    $item->post_ID,
+                    esc_url( get_the_permalink( $item->post_ID ) ),
+                ),
+                "\t"
+            );
+            ob_flush();
+        }
+
+        wp_die();
+    }
 }

Spacing +22 added lines, -22 removed lines

@@ -5,15 +5,15 @@ 
 class Download_Ingredients_Data {
 
 	public function register_hooks() {
-		add_action( 'wp_ajax_wl_download_ingredients_data', array( $this, 'wl_download_ingredients_data' ) );
+		add_action('wp_ajax_wl_download_ingredients_data', array($this, 'wl_download_ingredients_data'));
 	}
 
 	public function wl_download_ingredients_data() {
 
-		check_ajax_referer( 'wl-dl-ingredients-data-nonce' );
+		check_ajax_referer('wl-dl-ingredients-data-nonce');
 
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'wordlift' ) );
+		if ( ! current_user_can('manage_options')) {
+			wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'wordlift'));
 		}
 
 		global $wpdb;
@@ -35,40 +35,40 @@ 
 							WHERE pm1.meta_key = '_wl_main_ingredient_jsonld'"
 		);
 
-		if ( ! $items ) {
-			wp_send_json_error( __( 'No main ingredients found.', 'wordlift' ) );
+		if ( ! $items) {
+			wp_send_json_error(__('No main ingredients found.', 'wordlift'));
 		}
 
 		// Generate unique filename using current timestamp.
-		$filename = 'wl-main-ingredients-data-' . gmdate( 'Y-m-d-H-i-s' ) . '.tsv';
+		$filename = 'wl-main-ingredients-data-'.gmdate('Y-m-d-H-i-s').'.tsv';
 
-		header( 'Content-Disposition: attachment; filename=' . $filename );
-		header( 'Content-Type: text/text/tab-separated-values; charset=' . get_bloginfo( 'charset' ) );
+		header('Content-Disposition: attachment; filename='.$filename);
+		header('Content-Type: text/text/tab-separated-values; charset='.get_bloginfo('charset'));
 
 		// Do not cache the file.
-		header( 'Pragma: no-cache' );
-		header( 'Expires: 0' );
+		header('Pragma: no-cache');
+		header('Expires: 0');
 
-		$output = fopen( 'php://output', 'w' );
+		$output = fopen('php://output', 'w');
 
 		// Insert Header.
 		fputcsv(
 			$output,
 			array(
-				__( 'Ingredient Name', 'wordlift' ),
-				__( 'Recipe Name', 'wordlift' ),
-				__( 'Recipe ID', 'wordlift' ),
-				__( 'Post Name', 'wordlift' ),
-				__( 'Post ID', 'wordlift' ),
-				__( 'Post URL', 'wordlift' ),
+				__('Ingredient Name', 'wordlift'),
+				__('Recipe Name', 'wordlift'),
+				__('Recipe ID', 'wordlift'),
+				__('Post Name', 'wordlift'),
+				__('Post ID', 'wordlift'),
+				__('Post URL', 'wordlift'),
 			),
 			"\t"
 		);
 
 		// Insert Data.
-		foreach ( $items as $item ) {
-			$recipe_json_ld = get_post_meta( $item->recipe_ID, '_wl_main_ingredient_jsonld', true ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-			$recipe         = json_decode( $recipe_json_ld, true );
+		foreach ($items as $item) {
+			$recipe_json_ld = get_post_meta($item->recipe_ID, '_wl_main_ingredient_jsonld', true); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			$recipe         = json_decode($recipe_json_ld, true);
 			fputcsv(
 				$output,
 				array(
@@ -78,7 +78,7 @@ 
 					$item->recipe_ID,
 					$item->post_title,
 					$item->post_ID,
-					esc_url( get_the_permalink( $item->post_ID ) ),
+					esc_url(get_the_permalink($item->post_ID)),
 				),
 				"\t"
 			);

src/includes/class-wordlift-key-validation-service.php

Spacing +38 added lines, -38 removed lines

@@ -41,9 +41,9 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Key_Validation_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Key_Validation_Service');
 
-		add_action( 'admin_init', array( $this, 'wl_load_plugin' ) );
+		add_action('admin_init', array($this, 'wl_load_plugin'));
 		/**
 		 * Filter: wl_feature__enable__notices.
 		 *
@@ -52,11 +52,11 @@ 
 		 * @return bool
 		 * @since 3.27.6
 		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			add_action( 'admin_notices', array( $this, 'wl_key_update_notice' ) );
+		if (apply_filters('wl_feature__enable__notices', true)) {
+			add_action('admin_notices', array($this, 'wl_key_update_notice'));
 		}
 
-		$this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification' );
+		$this->ttl_cache_service = new Ttl_Cache('key-validation-notification');
 
 	}
 
@@ -68,9 +68,9 @@ 
 	 * @return WP_Error|array The response or WP_Error on failure.
 	 * @since 3.9.0
 	 */
-	public function get_account_info( $key ) {
+	public function get_account_info($key) {
 
-		$this->log->debug( 'Validating key...' );
+		$this->log->debug('Validating key...');
 
 		$response = Default_Api_Service::get_instance()->get(
 			'/accounts/info',
@@ -84,7 +84,7 @@ 
 		 * This action is fired when the key is validated.
 		 * @param $response \Wordlift\Api\Response
 		 */
-		do_action( 'wl_key_validation_response', $response );
+		do_action('wl_key_validation_response', $response);
 
 		return $response->get_response();
 	}
@@ -96,21 +96,21 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_key_valid( $key ) {
+	public function is_key_valid($key) {
 
-		$response = $this->get_account_info( $key );
+		$response = $this->get_account_info($key);
 
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+		if (is_wp_error($response) || 2 !== (int) $response['response']['code'] / 100) {
 			return false;
 		}
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+		$res_body = json_decode(wp_remote_retrieve_body($response), true);
 
 		$url = $res_body['url'];
 
 		// Considering that production URL may be filtered.
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
-		if ( $url === null || $url === $site_url ) {
+		$home_url = get_option('home');
+		$site_url = apply_filters('wl_production_site_url', untrailingslashit($home_url));
+		if ($url === null || $url === $site_url) {
 			return true;
 		}
 
@@ -128,14 +128,14 @@ 
 		ob_clean();
 
 		// Check if we have a key.
-		if ( ! isset( $_POST['key'] ) ) {  //phpcs:ignore WordPress.Security.NonceVerification.Missing
-			wp_send_json_error( 'The key parameter is required.' );
+		if ( ! isset($_POST['key'])) {  //phpcs:ignore WordPress.Security.NonceVerification.Missing
+			wp_send_json_error('The key parameter is required.');
 		}
 
-		$response = $this->get_account_info( sanitize_text_field( wp_unslash( (string) $_POST['key'] ) ) );  //phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$response = $this->get_account_info(sanitize_text_field(wp_unslash((string) $_POST['key']))); //phpcs:ignore WordPress.Security.NonceVerification.Missing
 
 		// If we got an error, return invalid.
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+		if (is_wp_error($response) || 2 !== (int) $response['response']['code'] / 100) {
 			wp_send_json_success(
 				array(
 					'valid'    => false,
@@ -146,19 +146,19 @@ 
 			);
 		}
 
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+		$res_body = json_decode(wp_remote_retrieve_body($response), true);
 
 		// The URL stored in WLS. If this is the initial install the URL may be null.
 		$url = $res_body['url'];
 
 		// Considering that production URL may be filtered.
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
+		$home_url = get_option('home');
+		$site_url = apply_filters('wl_production_site_url', untrailingslashit($home_url));
 
 		// If the URL isn't set or matches, then it's valid.
-		if ( $url === null || $url === $site_url ) {
+		if ($url === null || $url === $site_url) {
 			// Invalidate the cache key
-			$this->ttl_cache_service->delete( 'is_key_valid' );
+			$this->ttl_cache_service->delete('is_key_valid');
 			wp_send_json_success(
 				array(
 					'valid'   => true,
@@ -168,12 +168,12 @@ 
 		}
 
 		// If the URL doesn't match it means that this key has been configured elsewhere already.
-		if ( $url !== $site_url ) {
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
+		if ($url !== $site_url) {
+			Wordlift_Configuration_Service::get_instance()->set_key('');
 			wp_send_json_success(
 				array(
 					'valid'   => false,
-					'message' => __( 'The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift' ),
+					'message' => __('The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift'),
 				)
 			);
 		}
@@ -182,7 +182,7 @@ 
 		wp_send_json_success(
 			array(
 				'valid'   => false,
-				'message' => __( 'An error occurred, please contact us at hello@wordlift.io', 'wordlift' ),
+				'message' => __('An error occurred, please contact us at hello@wordlift.io', 'wordlift'),
 			)
 		);
 	}
@@ -192,15 +192,15 @@ 
 	 */
 	public function wl_load_plugin() {
 
-		$wl_blog_url = get_option( '_wl_blog_url' );
-		$home_url    = get_option( 'home' );
+		$wl_blog_url = get_option('_wl_blog_url');
+		$home_url    = get_option('home');
 
-		if ( ! $wl_blog_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-		} elseif ( $wl_blog_url !== $home_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			set_transient( 'wl-key-error-msg', __( "Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift' ), 10 );
+		if ( ! $wl_blog_url) {
+			update_option('_wl_blog_url', $home_url, true);
+		} elseif ($wl_blog_url !== $home_url) {
+			update_option('_wl_blog_url', $home_url, true);
+			Wordlift_Configuration_Service::get_instance()->set_key('');
+			set_transient('wl-key-error-msg', __("Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift'), 10);
 		}
 
 	}
@@ -209,10 +209,10 @@ 
 	 * This function is hooked to the `admin_notices` to show admin notification.
 	 */
 	public function wl_key_update_notice() {
-		if ( get_transient( 'wl-key-error-msg' ) ) {
+		if (get_transient('wl-key-error-msg')) {
 			?>
 			<div class="updated notice is-dismissible error">
-				<p><?php esc_html( get_transient( 'wl-key-error-msg' ) ); ?></p>
+				<p><?php esc_html(get_transient('wl-key-error-msg')); ?></p>
 			</div>
 			<?php
 		}

Indentation +193 added lines, -193 removed lines

@@ -20,201 +20,201 @@
  */
 class Wordlift_Key_Validation_Service {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * @var Ttl_Cache
-	 */
-	private $ttl_cache_service;
-
-	/**
-	 * Create a {@link Wordlift_Key_Validation_Service} instance.
-	 *
-	 * @since 3.14.0
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Key_Validation_Service' );
-
-		add_action( 'admin_init', array( $this, 'wl_load_plugin' ) );
-		/**
-		 * Filter: wl_feature__enable__notices.
-		 *
-		 * @param bool whether notices need to be enabled or not.
-		 *
-		 * @return bool
-		 * @since 3.27.6
-		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			add_action( 'admin_notices', array( $this, 'wl_key_update_notice' ) );
-		}
-
-		$this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification' );
-
-	}
-
-	/**
-	 * Validate the provided key.
-	 *
-	 * @param string $key WordLift's key to validate.
-	 *
-	 * @return WP_Error|array The response or WP_Error on failure.
-	 * @since 3.9.0
-	 */
-	public function get_account_info( $key ) {
-
-		$this->log->debug( 'Validating key...' );
-
-		$response = Default_Api_Service::get_instance()->get(
-			'/accounts/info',
-			array(
-				'Authorization' => "Key $key",
-			)
-		);
-
-		/**
-		 * @since 3.38.5
-		 * This action is fired when the key is validated.
-		 * @param $response \Wordlift\Api\Response
-		 */
-		do_action( 'wl_key_validation_response', $response );
-
-		return $response->get_response();
-	}
-
-	/**
-	 * Check if key is valid
-	 *
-	 * @param $key string
-	 *
-	 * @return bool
-	 */
-	public function is_key_valid( $key ) {
-
-		$response = $this->get_account_info( $key );
-
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
-			return false;
-		}
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
-
-		$url = $res_body['url'];
-
-		// Considering that production URL may be filtered.
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
-		if ( $url === null || $url === $site_url ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * This function is hooked to the `wl_validate_key` AJAX call.
-	 *
-	 * @since 3.9.0
-	 */
-	public function validate_key() {
-
-		// Ensure we don't have garbage before us.
-		ob_clean();
-
-		// Check if we have a key.
-		if ( ! isset( $_POST['key'] ) ) {  //phpcs:ignore WordPress.Security.NonceVerification.Missing
-			wp_send_json_error( 'The key parameter is required.' );
-		}
-
-		$response = $this->get_account_info( sanitize_text_field( wp_unslash( (string) $_POST['key'] ) ) );  //phpcs:ignore WordPress.Security.NonceVerification.Missing
-
-		// If we got an error, return invalid.
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
-			wp_send_json_success(
-				array(
-					'valid'    => false,
-					'message'  => '',
-					'response' => $response,
-					'api_url'  => Default_Api_Service::get_instance()->get_base_url(),
-				)
-			);
-		}
-
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
-
-		// The URL stored in WLS. If this is the initial install the URL may be null.
-		$url = $res_body['url'];
-
-		// Considering that production URL may be filtered.
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
-
-		// If the URL isn't set or matches, then it's valid.
-		if ( $url === null || $url === $site_url ) {
-			// Invalidate the cache key
-			$this->ttl_cache_service->delete( 'is_key_valid' );
-			wp_send_json_success(
-				array(
-					'valid'   => true,
-					'message' => '',
-				)
-			);
-		}
-
-		// If the URL doesn't match it means that this key has been configured elsewhere already.
-		if ( $url !== $site_url ) {
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			wp_send_json_success(
-				array(
-					'valid'   => false,
-					'message' => __( 'The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift' ),
-				)
-			);
-		}
-
-		// Set a response with valid set to true or false according to the key validity with message.
-		wp_send_json_success(
-			array(
-				'valid'   => false,
-				'message' => __( 'An error occurred, please contact us at hello@wordlift.io', 'wordlift' ),
-			)
-		);
-	}
-
-	/**
-	 * This function is hooked `admin_init` to check _wl_blog_url.
-	 */
-	public function wl_load_plugin() {
-
-		$wl_blog_url = get_option( '_wl_blog_url' );
-		$home_url    = get_option( 'home' );
-
-		if ( ! $wl_blog_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-		} elseif ( $wl_blog_url !== $home_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			set_transient( 'wl-key-error-msg', __( "Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift' ), 10 );
-		}
-
-	}
-
-	/**
-	 * This function is hooked to the `admin_notices` to show admin notification.
-	 */
-	public function wl_key_update_notice() {
-		if ( get_transient( 'wl-key-error-msg' ) ) {
-			?>
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * @var Ttl_Cache
+     */
+    private $ttl_cache_service;
+
+    /**
+     * Create a {@link Wordlift_Key_Validation_Service} instance.
+     *
+     * @since 3.14.0
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Key_Validation_Service' );
+
+        add_action( 'admin_init', array( $this, 'wl_load_plugin' ) );
+        /**
+         * Filter: wl_feature__enable__notices.
+         *
+         * @param bool whether notices need to be enabled or not.
+         *
+         * @return bool
+         * @since 3.27.6
+         */
+        if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+            add_action( 'admin_notices', array( $this, 'wl_key_update_notice' ) );
+        }
+
+        $this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification' );
+
+    }
+
+    /**
+     * Validate the provided key.
+     *
+     * @param string $key WordLift's key to validate.
+     *
+     * @return WP_Error|array The response or WP_Error on failure.
+     * @since 3.9.0
+     */
+    public function get_account_info( $key ) {
+
+        $this->log->debug( 'Validating key...' );
+
+        $response = Default_Api_Service::get_instance()->get(
+            '/accounts/info',
+            array(
+                'Authorization' => "Key $key",
+            )
+        );
+
+        /**
+         * @since 3.38.5
+         * This action is fired when the key is validated.
+         * @param $response \Wordlift\Api\Response
+         */
+        do_action( 'wl_key_validation_response', $response );
+
+        return $response->get_response();
+    }
+
+    /**
+     * Check if key is valid
+     *
+     * @param $key string
+     *
+     * @return bool
+     */
+    public function is_key_valid( $key ) {
+
+        $response = $this->get_account_info( $key );
+
+        if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+            return false;
+        }
+        $res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+
+        $url = $res_body['url'];
+
+        // Considering that production URL may be filtered.
+        $home_url = get_option( 'home' );
+        $site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
+        if ( $url === null || $url === $site_url ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * This function is hooked to the `wl_validate_key` AJAX call.
+     *
+     * @since 3.9.0
+     */
+    public function validate_key() {
+
+        // Ensure we don't have garbage before us.
+        ob_clean();
+
+        // Check if we have a key.
+        if ( ! isset( $_POST['key'] ) ) {  //phpcs:ignore WordPress.Security.NonceVerification.Missing
+            wp_send_json_error( 'The key parameter is required.' );
+        }
+
+        $response = $this->get_account_info( sanitize_text_field( wp_unslash( (string) $_POST['key'] ) ) );  //phpcs:ignore WordPress.Security.NonceVerification.Missing
+
+        // If we got an error, return invalid.
+        if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+            wp_send_json_success(
+                array(
+                    'valid'    => false,
+                    'message'  => '',
+                    'response' => $response,
+                    'api_url'  => Default_Api_Service::get_instance()->get_base_url(),
+                )
+            );
+        }
+
+        $res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+
+        // The URL stored in WLS. If this is the initial install the URL may be null.
+        $url = $res_body['url'];
+
+        // Considering that production URL may be filtered.
+        $home_url = get_option( 'home' );
+        $site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
+
+        // If the URL isn't set or matches, then it's valid.
+        if ( $url === null || $url === $site_url ) {
+            // Invalidate the cache key
+            $this->ttl_cache_service->delete( 'is_key_valid' );
+            wp_send_json_success(
+                array(
+                    'valid'   => true,
+                    'message' => '',
+                )
+            );
+        }
+
+        // If the URL doesn't match it means that this key has been configured elsewhere already.
+        if ( $url !== $site_url ) {
+            Wordlift_Configuration_Service::get_instance()->set_key( '' );
+            wp_send_json_success(
+                array(
+                    'valid'   => false,
+                    'message' => __( 'The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift' ),
+                )
+            );
+        }
+
+        // Set a response with valid set to true or false according to the key validity with message.
+        wp_send_json_success(
+            array(
+                'valid'   => false,
+                'message' => __( 'An error occurred, please contact us at hello@wordlift.io', 'wordlift' ),
+            )
+        );
+    }
+
+    /**
+     * This function is hooked `admin_init` to check _wl_blog_url.
+     */
+    public function wl_load_plugin() {
+
+        $wl_blog_url = get_option( '_wl_blog_url' );
+        $home_url    = get_option( 'home' );
+
+        if ( ! $wl_blog_url ) {
+            update_option( '_wl_blog_url', $home_url, true );
+        } elseif ( $wl_blog_url !== $home_url ) {
+            update_option( '_wl_blog_url', $home_url, true );
+            Wordlift_Configuration_Service::get_instance()->set_key( '' );
+            set_transient( 'wl-key-error-msg', __( "Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift' ), 10 );
+        }
+
+    }
+
+    /**
+     * This function is hooked to the `admin_notices` to show admin notification.
+     */
+    public function wl_key_update_notice() {
+        if ( get_transient( 'wl-key-error-msg' ) ) {
+            ?>
 			<div class="updated notice is-dismissible error">
 				<p><?php esc_html( get_transient( 'wl-key-error-msg' ) ); ?></p>
 			</div>
 			<?php
-		}
-	}
+        }
+    }
 }

src/includes/class-wordlift-configuration-service.php

Spacing +102 added lines, -102 removed lines

@@ -12,7 +12,7 @@ 
 
 use Wordlift\Api\Default_Api_Service;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -136,10 +136,10 @@ 
 	 */
 	protected function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		// Sync some configuration properties when key is validated.
-		add_action( 'wl_key_validation_response', array( $this, 'sync' ) );
+		add_action('wl_key_validation_response', array($this, 'sync'));
 
 	}
 
@@ -148,15 +148,15 @@ 
 	 *
 	 * @return void
 	 */
-	public function sync( $response ) {
-		if ( ! $response->is_success() ) {
+	public function sync($response) {
+		if ( ! $response->is_success()) {
 			return;
 		}
-		$data = json_decode( $response->get_body(), true );
-		if ( ! is_array( $data ) || ! array_key_exists( 'networkDatasetId', $data ) ) {
+		$data = json_decode($response->get_body(), true);
+		if ( ! is_array($data) || ! array_key_exists('networkDatasetId', $data)) {
 			return;
 		}
-		$this->set_network_dataset_ids( $data['networkDatasetId'] );
+		$this->set_network_dataset_ids($data['networkDatasetId']);
 	}
 
 	/**
@@ -177,7 +177,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -195,11 +195,11 @@ 
 	 * @return mixed The configuration value or the default value if not found.
 	 * @since 3.6.0
 	 */
-	private function get( $option, $key, $default = '' ) {
+	private function get($option, $key, $default = '') {
 
-		$options = get_option( $option, array() );
+		$options = get_option($option, array());
 
-		return isset( $options[ $key ] ) ? $options[ $key ] : $default;
+		return isset($options[$key]) ? $options[$key] : $default;
 	}
 
 	/**
@@ -211,12 +211,12 @@ 
 	 *
 	 * @since 3.9.0
 	 */
-	private function set( $option, $key, $value ) {
+	private function set($option, $key, $value) {
 
-		$values         = get_option( $option );
-		$values         = isset( $values ) ? $values : array();
-		$values[ $key ] = $value;
-		update_option( $option, $values );
+		$values         = get_option($option);
+		$values         = isset($values) ? $values : array();
+		$values[$key] = $value;
+		update_option($option, $values);
 
 	}
 
@@ -228,7 +228,7 @@ 
 	 */
 	public function get_entity_base_path() {
 
-		return $this->get( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity' );
+		return $this->get('wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity');
 	}
 
 	/**
@@ -238,9 +238,9 @@ 
 	 *
 	 * @since 3.9.0
 	 */
-	public function set_entity_base_path( $value ) {
+	public function set_entity_base_path($value) {
 
-		$this->set( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value );
+		$this->set('wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value);
 
 	}
 
@@ -252,7 +252,7 @@ 
 	 */
 	public function is_skip_wizard() {
 
-		return $this->get( 'wl_general_settings', self::SKIP_WIZARD, false );
+		return $this->get('wl_general_settings', self::SKIP_WIZARD, false);
 	}
 
 	/**
@@ -262,9 +262,9 @@ 
 	 *
 	 * @since 3.9.0
 	 */
-	public function set_skip_wizard( $value ) {
+	public function set_skip_wizard($value) {
 
-		$this->set( 'wl_general_settings', self::SKIP_WIZARD, true === $value );
+		$this->set('wl_general_settings', self::SKIP_WIZARD, true === $value);
 
 	}
 
@@ -276,7 +276,7 @@ 
 	 */
 	public function get_key() {
 
-		return $this->get( 'wl_general_settings', self::KEY, '' );
+		return $this->get('wl_general_settings', self::KEY, '');
 	}
 
 	/**
@@ -286,9 +286,9 @@ 
 	 *
 	 * @since 3.9.0
 	 */
-	public function set_key( $value ) {
+	public function set_key($value) {
 
-		$this->set( 'wl_general_settings', self::KEY, $value );
+		$this->set('wl_general_settings', self::KEY, $value);
 	}
 
 	/**
@@ -302,11 +302,11 @@ 
 	public function get_language_code() {
 
 		$language = get_locale();
-		if ( ! $language ) {
+		if ( ! $language) {
 			return 'en';
 		}
 
-		return substr( $language, 0, 2 );
+		return substr($language, 0, 2);
 	}
 
 	/**
@@ -321,9 +321,9 @@ 
 	 *
 	 * @since 3.9.0
 	 */
-	public function set_language_code( $value ) {
+	public function set_language_code($value) {
 
-		$this->set( 'wl_general_settings', self::LANGUAGE, $value );
+		$this->set('wl_general_settings', self::LANGUAGE, $value);
 
 	}
 
@@ -334,9 +334,9 @@ 
 	 *
 	 * @since 3.19.0
 	 */
-	public function set_diagnostic_preferences( $value ) {
+	public function set_diagnostic_preferences($value) {
 
-		$this->set( 'wl_general_settings', self::SEND_DIAGNOSTIC, $value );
+		$this->set('wl_general_settings', self::SEND_DIAGNOSTIC, $value);
 
 	}
 
@@ -347,7 +347,7 @@ 
 	 */
 	public function get_diagnostic_preferences() {
 
-		return $this->get( 'wl_general_settings', self::SEND_DIAGNOSTIC, 'no' );
+		return $this->get('wl_general_settings', self::SEND_DIAGNOSTIC, 'no');
 	}
 
 	/**
@@ -358,7 +358,7 @@ 
 	 */
 	public function get_country_code() {
 
-		return $this->get( 'wl_general_settings', self::COUNTRY_CODE, 'us' );
+		return $this->get('wl_general_settings', self::COUNTRY_CODE, 'us');
 	}
 
 	/**
@@ -368,9 +368,9 @@ 
 	 *
 	 * @since 3.18.0
 	 */
-	public function set_country_code( $value ) {
+	public function set_country_code($value) {
 
-		$this->set( 'wl_general_settings', self::COUNTRY_CODE, $value );
+		$this->set('wl_general_settings', self::COUNTRY_CODE, $value);
 
 	}
 
@@ -385,7 +385,7 @@ 
 	 */
 	public function get_publisher_id() {
 
-		return $this->get( 'wl_general_settings', self::PUBLISHER_ID, null );
+		return $this->get('wl_general_settings', self::PUBLISHER_ID, null);
 	}
 
 	/**
@@ -395,9 +395,9 @@ 
 	 *
 	 * @since 3.9.0
 	 */
-	public function set_publisher_id( $value ) {
+	public function set_publisher_id($value) {
 
-		$this->set( 'wl_general_settings', self::PUBLISHER_ID, $value );
+		$this->set('wl_general_settings', self::PUBLISHER_ID, $value);
 
 	}
 
@@ -410,8 +410,8 @@ 
 	 */
 	public function get_dataset_uri() {
 
-		if ( apply_filters( 'wl_feature__enable__dataset', true ) ) {
-			return $this->get( 'wl_advanced_settings', self::DATASET_URI, null );
+		if (apply_filters('wl_feature__enable__dataset', true)) {
+			return $this->get('wl_advanced_settings', self::DATASET_URI, null);
 		} else {
 			return null;
 		}
@@ -424,9 +424,9 @@ 
 	 *
 	 * @since 3.10.0
 	 */
-	public function set_dataset_uri( $value ) {
+	public function set_dataset_uri($value) {
 
-		$this->set( 'wl_advanced_settings', self::DATASET_URI, $value );
+		$this->set('wl_advanced_settings', self::DATASET_URI, $value);
 	}
 
 	/**
@@ -437,7 +437,7 @@ 
 	 */
 	public function get_package_type() {
 
-		return $this->get( 'wl_advanced_settings', self::PACKAGE_TYPE, null );
+		return $this->get('wl_advanced_settings', self::PACKAGE_TYPE, null);
 	}
 
 	/**
@@ -447,8 +447,8 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	public function set_package_type( $value ) {
-		$this->set( 'wl_advanced_settings', self::PACKAGE_TYPE, $value );
+	public function set_package_type($value) {
+		$this->set('wl_advanced_settings', self::PACKAGE_TYPE, $value);
 	}
 
 	/**
@@ -463,11 +463,11 @@ 
 	 * @param array $old_value The old settings.
 	 * @param array $new_value The new settings.
 	 */
-	public function update_key( $old_value, $new_value ) {
+	public function update_key($old_value, $new_value) {
 
 		// Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
 		// $old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
+		$new_key = isset($new_value['key']) ? $new_value['key'] : '';
 
 		// If the key hasn't changed, don't do anything.
 		// WARN The 'update_option' hook is fired only if the new and old value are not equal.
@@ -476,14 +476,14 @@ 
 		// }
 
 		// If the key is empty, empty the dataset URI.
-		if ( '' === $new_key ) {
-			$this->set_dataset_uri( '' );
+		if ('' === $new_key) {
+			$this->set_dataset_uri('');
 		}
 
 		// make the request to the remote server.
-		$this->get_remote_dataset_uri( $new_key );
+		$this->get_remote_dataset_uri($new_key);
 
-		do_action( 'wl_key_updated' );
+		do_action('wl_key_updated');
 
 	}
 
@@ -499,15 +499,15 @@ 
 	 *
 	 * @since 3.17.0 send the site URL and get the dataset URI.
 	 */
-	public function get_remote_dataset_uri( $key ) {
+	public function get_remote_dataset_uri($key) {
 
-		$this->log->trace( 'Getting the remote dataset URI and package type...' );
+		$this->log->trace('Getting the remote dataset URI and package type...');
 
-		if ( empty( $key ) ) {
-			$this->log->warn( 'Key set to empty value.' );
+		if (empty($key)) {
+			$this->log->warn('Key set to empty value.');
 
-			$this->set_dataset_uri( '' );
-			$this->set_package_type( null );
+			$this->set_dataset_uri('');
+			$this->set_package_type(null);
 
 			return;
 		}
@@ -521,15 +521,15 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
+		$home_url = get_option('home');
+		$site_url = apply_filters('wl_production_site_url', untrailingslashit($home_url));
 
 		// Build the URL.
 		$url = '/accounts'
-			   . '?key=' . rawurlencode( $key )
-			   . '&url=' . rawurlencode( $site_url )
-			   . '&country=' . $this->get_country_code()
-			   . '&language=' . $this->get_language_code();
+			   . '?key='.rawurlencode($key)
+			   . '&url='.rawurlencode($site_url)
+			   . '&country='.$this->get_country_code()
+			   . '&language='.$this->get_language_code();
 
 		$api_service = Default_Api_Service::get_instance();
 		/**
@@ -539,32 +539,32 @@ 
 		$headers  = array(
 			'Authorization' => "Key $key",
 		);
-		$response = $api_service->request( 'PUT', $url, $headers )->get_response();
+		$response = $api_service->request('PUT', $url, $headers)->get_response();
 
 		// The response is an error.
-		if ( is_wp_error( $response ) ) {
-			$this->log->error( 'An error occurred setting the dataset URI: ' . $response->get_error_message() );
+		if (is_wp_error($response)) {
+			$this->log->error('An error occurred setting the dataset URI: '.$response->get_error_message());
 
-			$this->set_dataset_uri( '' );
-			$this->set_package_type( null );
+			$this->set_dataset_uri('');
+			$this->set_package_type(null);
 
 			return;
 		}
 
 		// The response is not OK.
-		if ( ! is_array( $response ) || 200 !== (int) $response['response']['code'] ) {
+		if ( ! is_array($response) || 200 !== (int) $response['response']['code']) {
 			$base_url = $api_service->get_base_url();
 
-			if ( ! is_array( $response ) ) {
+			if ( ! is_array($response)) {
 				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-				$this->log->error( "Unexpected response when opening URL $base_url$url: " . var_export( $response, true ) );
+				$this->log->error("Unexpected response when opening URL $base_url$url: ".var_export($response, true));
 			} else {
 				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-				$this->log->error( "Unexpected status code when opening URL $base_url$url: " . $response['response']['code'] . "\n" . var_export( $response, true ) );
+				$this->log->error("Unexpected status code when opening URL $base_url$url: ".$response['response']['code']."\n".var_export($response, true));
 			}
 
-			$this->set_dataset_uri( '' );
-			$this->set_package_type( null );
+			$this->set_dataset_uri('');
+			$this->set_package_type(null);
 
 			return;
 		}
@@ -574,20 +574,20 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$json = json_decode( $response['body'] );
+		$json = json_decode($response['body']);
 		/**
 		 * @since 3.27.7
 		 * Remove the trailing slash returned from the new platform api.
 		 */
 		// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		$dataset_uri = untrailingslashit( $json->datasetURI );
+		$dataset_uri = untrailingslashit($json->datasetURI);
 		// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		$package_type = isset( $json->packageType ) ? $json->packageType : null;
+		$package_type = isset($json->packageType) ? $json->packageType : null;
 
-		$this->log->info( "Updating [ dataset uri :: $dataset_uri ][ package type :: $package_type ]..." );
+		$this->log->info("Updating [ dataset uri :: $dataset_uri ][ package type :: $package_type ]...");
 
-		$this->set_dataset_uri( $dataset_uri );
-		$this->set_package_type( $package_type );
+		$this->set_dataset_uri($dataset_uri);
+		$this->set_package_type($package_type);
 	}
 
 	/**
@@ -604,20 +604,20 @@ 
 	 * @return mixed The same value in the $value parameter
 	 * @since 3.12.0
 	 */
-	public function maybe_update_dataset_uri( $value, $old_value ) {
+	public function maybe_update_dataset_uri($value, $old_value) {
 
 		// Check the old key value and the new one. Here we're only handling the
 		// case where the key hasn't changed and the dataset URI isn't set. The
 		// other case, i.e. a new key is inserted, is handled at `update_key`.
-		$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $value['key'] ) ? $value['key'] : '';
+		$old_key = isset($old_value['key']) ? $old_value['key'] : '';
+		$new_key = isset($value['key']) ? $value['key'] : '';
 
 		$dataset_uri = $this->get_dataset_uri();
 
-		if ( ! empty( $new_key ) && $new_key === $old_key && empty( $dataset_uri ) ) {
+		if ( ! empty($new_key) && $new_key === $old_key && empty($dataset_uri)) {
 
 			// make the request to the remote server to try to get the dataset uri.
-			$this->get_remote_dataset_uri( $new_key );
+			$this->get_remote_dataset_uri($new_key);
 		}
 
 		return $value;
@@ -631,9 +631,9 @@ 
 	 * @return string The API URI.
 	 * @since 3.11.0
 	 */
-	public function get_accounts_by_key_dataset_uri( $key ) {
+	public function get_accounts_by_key_dataset_uri($key) {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."accounts/key=$key/dataset_uri";
 	}
 
 	/**
@@ -644,7 +644,7 @@ 
 	 */
 	public function get_accounts() {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'accounts';
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE.'accounts';
 	}
 
 	/**
@@ -655,7 +655,7 @@ 
 	 */
 	public function is_link_by_default() {
 
-		return 'yes' === $this->get( 'wl_general_settings', self::LINK_BY_DEFAULT, 'yes' );
+		return 'yes' === $this->get('wl_general_settings', self::LINK_BY_DEFAULT, 'yes');
 	}
 
 	/**
@@ -665,9 +665,9 @@ 
 	 *
 	 * @since 3.13.0
 	 */
-	public function set_link_by_default( $value ) {
+	public function set_link_by_default($value) {
 
-		$this->set( 'wl_general_settings', self::LINK_BY_DEFAULT, true === $value ? 'yes' : 'no' );
+		$this->set('wl_general_settings', self::LINK_BY_DEFAULT, true === $value ? 'yes' : 'no');
 	}
 
 	/**
@@ -677,7 +677,7 @@ 
 	 * @since 3.21.0
 	 */
 	public function is_analytics_enable() {
-		return 'yes' === $this->get( 'wl_analytics_settings', self::ANALYTICS_ENABLE, 'no' );
+		return 'yes' === $this->get('wl_analytics_settings', self::ANALYTICS_ENABLE, 'no');
 	}
 
 	/**
@@ -687,9 +687,9 @@ 
 	 *
 	 * @since 3.21.0
 	 */
-	public function set_is_analytics_enable( $value ) {
+	public function set_is_analytics_enable($value) {
 
-		$this->set( 'wl_general_settings', self::ANALYTICS_ENABLE, true === $value ? 'yes' : 'no' );
+		$this->set('wl_general_settings', self::ANALYTICS_ENABLE, true === $value ? 'yes' : 'no');
 	}
 
 	/**
@@ -699,7 +699,7 @@ 
 	 * @since 3.21.0
 	 */
 	public function get_analytics_entity_uri_dimension() {
-		return (int) $this->get( 'wl_analytics_settings', self::ANALYTICS_ENTITY_URI_DIMENSION, 1 );
+		return (int) $this->get('wl_analytics_settings', self::ANALYTICS_ENTITY_URI_DIMENSION, 1);
 	}
 
 	/**
@@ -709,7 +709,7 @@ 
 	 * @since 3.21.0
 	 */
 	public function get_analytics_entity_type_dimension() {
-		return $this->get( 'wl_analytics_settings', self::ANALYTICS_ENTITY_TYPE_DIMENSION, 2 );
+		return $this->get('wl_analytics_settings', self::ANALYTICS_ENTITY_TYPE_DIMENSION, 2);
 	}
 
 	/**
@@ -720,7 +720,7 @@ 
 	 */
 	public function get_autocomplete_url() {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'autocomplete';
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE.'autocomplete';
 
 	}
 
@@ -732,7 +732,7 @@ 
 	 */
 	public function get_deactivation_feedback_url() {
 
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'feedbacks';
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE.'feedbacks';
 
 	}
 
@@ -748,11 +748,11 @@ 
 	}
 
 	public function get_network_dataset_ids() {
-		return $this->get( 'wl_advanced_settings', self::NETWORK_DATASET_IDS, array() );
+		return $this->get('wl_advanced_settings', self::NETWORK_DATASET_IDS, array());
 	}
 
-	public function set_network_dataset_ids( $network_dataset_ids ) {
-		$this->set( 'wl_advanced_settings', self::NETWORK_DATASET_IDS, $network_dataset_ids );
+	public function set_network_dataset_ids($network_dataset_ids) {
+		$this->set('wl_advanced_settings', self::NETWORK_DATASET_IDS, $network_dataset_ids);
 	}
 
 }

Indentation +728 added lines, -728 removed lines

@@ -13,7 +13,7 @@ 
 use Wordlift\Api\Default_Api_Service;
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -23,736 +23,736 @@ 
  */
 class Wordlift_Configuration_Service {
 
-	/**
-	 * The entity base path option name.
-	 *
-	 * @since 3.6.0
-	 */
-	const ENTITY_BASE_PATH_KEY = 'wl_entity_base_path';
-
-	/**
-	 * The skip wizard (admin installation wizard) option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const SKIP_WIZARD = 'wl_skip_wizard';
-
-	/**
-	 * WordLift's key option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const KEY = 'key';
-
-	/**
-	 * WordLift's configured language option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const LANGUAGE = 'site_language';
-
-	/**
-	 * WordLift's configured country code.
-	 *
-	 * @since 3.18.0
-	 */
-	const COUNTRY_CODE = 'country_code';
-
-	/**
-	 * The publisher entity post ID option name.
-	 *
-	 * @since 3.9.0
-	 */
-	const PUBLISHER_ID = 'publisher_id';
-
-	/**
-	 * The dataset URI option name
-	 *
-	 * @since 3.10.0
-	 */
-	const DATASET_URI = 'redlink_dataset_uri';
-
-	/**
-	 * The link by default option name.
-	 *
-	 * @since 3.11.0
-	 */
-	const LINK_BY_DEFAULT = 'link_by_default';
-
-	/**
-	 * The analytics enable option.
-	 *
-	 * @since 3.21.0
-	 */
-	const ANALYTICS_ENABLE = 'analytics_enable';
-
-	/**
-	 * The analytics entity uri dimension option.
-	 *
-	 * @since 3.21.0
-	 */
-	const ANALYTICS_ENTITY_URI_DIMENSION = 'analytics_entity_uri_dimension';
-
-	/**
-	 * The analytics entity type dimension option.
-	 *
-	 * @since 3.21.0
-	 */
-	const ANALYTICS_ENTITY_TYPE_DIMENSION = 'analytics_entity_type_dimension';
-
-	/**
-	 * The user preferences about sharing data option.
-	 *
-	 * @since 3.19.0
-	 */
-	const SEND_DIAGNOSTIC = 'send_diagnostic';
-
-	/**
-	 * The package type configuration key.
-	 *
-	 * @since 3.20.0
-	 */
-	const PACKAGE_TYPE = 'package_type';
-	/**
-	 * The dataset ids connected to the current key
-	 *
-	 * @since 3.38.5
-	 */
-	const NETWORK_DATASET_IDS = 'network_dataset_ids';
-
-	/**
-	 * The {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @var \Wordlift_Log_Service $log The {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create a Wordlift_Configuration_Service's instance.
-	 *
-	 * @since 3.6.0
-	 */
-	protected function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		// Sync some configuration properties when key is validated.
-		add_action( 'wl_key_validation_response', array( $this, 'sync' ) );
-
-	}
-
-	/**
-	 * @param $response \Wordlift\Api\Response
-	 *
-	 * @return void
-	 */
-	public function sync( $response ) {
-		if ( ! $response->is_success() ) {
-			return;
-		}
-		$data = json_decode( $response->get_body(), true );
-		if ( ! is_array( $data ) || ! array_key_exists( 'networkDatasetId', $data ) ) {
-			return;
-		}
-		$this->set_network_dataset_ids( $data['networkDatasetId'] );
-	}
-
-	/**
-	 * The Wordlift_Configuration_Service's singleton instance.
-	 *
-	 * @since  3.6.0
-	 *
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $instance Wordlift_Configuration_Service's singleton instance.
-	 */
-	private static $instance = null;
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @return \Wordlift_Configuration_Service
-	 * @since 3.6.0
-	 */
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get a configuration given the option name and a key. The option value is
-	 * expected to be an array.
-	 *
-	 * @param string $option The option name.
-	 * @param string $key A key in the option value array.
-	 * @param string $default The default value in case the key is not found (by default an empty string).
-	 *
-	 * @return mixed The configuration value or the default value if not found.
-	 * @since 3.6.0
-	 */
-	private function get( $option, $key, $default = '' ) {
-
-		$options = get_option( $option, array() );
-
-		return isset( $options[ $key ] ) ? $options[ $key ] : $default;
-	}
-
-	/**
-	 * Set a configuration parameter.
-	 *
-	 * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
-	 * @param string $key The value key.
-	 * @param mixed  $value The value.
-	 *
-	 * @since 3.9.0
-	 */
-	private function set( $option, $key, $value ) {
-
-		$values         = get_option( $option );
-		$values         = isset( $values ) ? $values : array();
-		$values[ $key ] = $value;
-		update_option( $option, $values );
-
-	}
-
-	/**
-	 * Get the entity base path, by default 'entity'.
-	 *
-	 * @return string The entity base path.
-	 * @since 3.6.0
-	 */
-	public function get_entity_base_path() {
-
-		return $this->get( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity' );
-	}
-
-	/**
-	 * Get the entity base path.
-	 *
-	 * @param string $value The entity base path.
-	 *
-	 * @since 3.9.0
-	 */
-	public function set_entity_base_path( $value ) {
-
-		$this->set( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value );
-
-	}
-
-	/**
-	 * Whether the installation skip wizard should be skipped.
-	 *
-	 * @return bool True if it should be skipped otherwise false.
-	 * @since 3.9.0
-	 */
-	public function is_skip_wizard() {
-
-		return $this->get( 'wl_general_settings', self::SKIP_WIZARD, false );
-	}
-
-	/**
-	 * Set the skip wizard parameter.
-	 *
-	 * @param bool $value True to skip the wizard. We expect a boolean value.
-	 *
-	 * @since 3.9.0
-	 */
-	public function set_skip_wizard( $value ) {
-
-		$this->set( 'wl_general_settings', self::SKIP_WIZARD, true === $value );
-
-	}
-
-	/**
-	 * Get WordLift's key.
-	 *
-	 * @return string WordLift's key or an empty string if not set.
-	 * @since 3.9.0
-	 */
-	public function get_key() {
-
-		return $this->get( 'wl_general_settings', self::KEY, '' );
-	}
-
-	/**
-	 * Set WordLift's key.
-	 *
-	 * @param string $value WordLift's key.
-	 *
-	 * @since 3.9.0
-	 */
-	public function set_key( $value ) {
-
-		$this->set( 'wl_general_settings', self::KEY, $value );
-	}
-
-	/**
-	 * Get WordLift's configured language, by default 'en'.
-	 *
-	 * Note that WordLift's language is used when writing strings to the Linked Data dataset, not for the analysis.
-	 *
-	 * @return string WordLift's configured language code ('en' by default).
-	 * @since 3.9.0
-	 */
-	public function get_language_code() {
-
-		$language = get_locale();
-		if ( ! $language ) {
-			return 'en';
-		}
-
-		return substr( $language, 0, 2 );
-	}
-
-	/**
-	 * @param string $value WordLift's language code.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1466
-	 *
-	 * Set WordLift's language code, used when storing strings to the Linked Data dataset.
-	 *
-	 * @deprecated As of 3.32.7 this below method has no effect on setting the language, we use the
-	 * language code form WordPress directly.
-	 *
-	 * @since 3.9.0
-	 */
-	public function set_language_code( $value ) {
-
-		$this->set( 'wl_general_settings', self::LANGUAGE, $value );
-
-	}
-
-	/**
-	 * Set the user preferences about sharing diagnostic with us.
-	 *
-	 * @param string $value The user preferences(yes/no).
-	 *
-	 * @since 3.19.0
-	 */
-	public function set_diagnostic_preferences( $value ) {
-
-		$this->set( 'wl_general_settings', self::SEND_DIAGNOSTIC, $value );
-
-	}
-
-	/**
-	 * Get the user preferences about sharing diagnostic.
-	 *
-	 * @since 3.19.0
-	 */
-	public function get_diagnostic_preferences() {
-
-		return $this->get( 'wl_general_settings', self::SEND_DIAGNOSTIC, 'no' );
-	}
-
-	/**
-	 * Get WordLift's configured country code, by default 'us'.
-	 *
-	 * @return string WordLift's configured country code ('us' by default).
-	 * @since 3.18.0
-	 */
-	public function get_country_code() {
-
-		return $this->get( 'wl_general_settings', self::COUNTRY_CODE, 'us' );
-	}
-
-	/**
-	 * Set WordLift's country code.
-	 *
-	 * @param string $value WordLift's country code.
-	 *
-	 * @since 3.18.0
-	 */
-	public function set_country_code( $value ) {
-
-		$this->set( 'wl_general_settings', self::COUNTRY_CODE, $value );
-
-	}
-
-	/**
-	 * Get the publisher entity post id.
-	 *
-	 * The publisher entity post id points to an entity post which contains the data for the publisher used in schema.org
-	 * Article markup.
-	 *
-	 * @return int|NULL The publisher entity post id or NULL if not set.
-	 * @since 3.9.0
-	 */
-	public function get_publisher_id() {
-
-		return $this->get( 'wl_general_settings', self::PUBLISHER_ID, null );
-	}
-
-	/**
-	 * Set the publisher entity post id.
-	 *
-	 * @param int $value The publisher entity post id.
-	 *
-	 * @since 3.9.0
-	 */
-	public function set_publisher_id( $value ) {
-
-		$this->set( 'wl_general_settings', self::PUBLISHER_ID, $value );
-
-	}
-
-	/**
-	 * Get the dataset URI.
-	 *
-	 * @return string The dataset URI or an empty string if not set.
-	 * @since 3.10.0
-	 * @since 3.27.7 Always return null if `wl_features__enable__dataset` is disabled.
-	 */
-	public function get_dataset_uri() {
-
-		if ( apply_filters( 'wl_feature__enable__dataset', true ) ) {
-			return $this->get( 'wl_advanced_settings', self::DATASET_URI, null );
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Set the dataset URI.
-	 *
-	 * @param string $value The dataset URI.
-	 *
-	 * @since 3.10.0
-	 */
-	public function set_dataset_uri( $value ) {
-
-		$this->set( 'wl_advanced_settings', self::DATASET_URI, $value );
-	}
-
-	/**
-	 * Get the package type.
-	 *
-	 * @return string The package type or an empty string if not set.
-	 * @since 3.20.0
-	 */
-	public function get_package_type() {
-
-		return $this->get( 'wl_advanced_settings', self::PACKAGE_TYPE, null );
-	}
-
-	/**
-	 * Set the package type.
-	 *
-	 * @param string $value The package type.
-	 *
-	 * @since 3.20.0
-	 */
-	public function set_package_type( $value ) {
-		$this->set( 'wl_advanced_settings', self::PACKAGE_TYPE, $value );
-	}
-
-	/**
-	 * Intercept the change of the WordLift key in order to set the dataset URI.
-	 *
-	 * @since 3.20.0 as of #761, we save settings every time a key is set, not only when the key changes, so to
-	 *               store the configuration parameters such as country or language.
-	 * @since 3.11.0
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/761
-	 *
-	 * @param array $old_value The old settings.
-	 * @param array $new_value The new settings.
-	 */
-	public function update_key( $old_value, $new_value ) {
-
-		// Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
-		// $old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
-
-		// If the key hasn't changed, don't do anything.
-		// WARN The 'update_option' hook is fired only if the new and old value are not equal.
-		// if ( $old_key === $new_key ) {
-		// return;
-		// }
-
-		// If the key is empty, empty the dataset URI.
-		if ( '' === $new_key ) {
-			$this->set_dataset_uri( '' );
-		}
-
-		// make the request to the remote server.
-		$this->get_remote_dataset_uri( $new_key );
-
-		do_action( 'wl_key_updated' );
-
-	}
-
-	/**
-	 * Handle retrieving the dataset uri from the remote server.
-	 *
-	 * If a valid dataset uri is returned it is stored in the appropriate option,
-	 * otherwise the option is set to empty string.
-	 *
-	 * @param string $key The key to be used.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @since 3.17.0 send the site URL and get the dataset URI.
-	 */
-	public function get_remote_dataset_uri( $key ) {
-
-		$this->log->trace( 'Getting the remote dataset URI and package type...' );
-
-		if ( empty( $key ) ) {
-			$this->log->warn( 'Key set to empty value.' );
-
-			$this->set_dataset_uri( '' );
-			$this->set_package_type( null );
-
-			return;
-		}
-
-		/**
-		 * Allow 3rd parties to change the site_url.
-		 *
-		 * @param string $site_url The site url.
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/850
-		 *
-		 * @since 3.20.0
-		 */
-		$home_url = get_option( 'home' );
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
-
-		// Build the URL.
-		$url = '/accounts'
-			   . '?key=' . rawurlencode( $key )
-			   . '&url=' . rawurlencode( $site_url )
-			   . '&country=' . $this->get_country_code()
-			   . '&language=' . $this->get_language_code();
-
-		$api_service = Default_Api_Service::get_instance();
-		/**
-		 * @since 3.27.7.1
-		 * The Key should be passed to headers, otherwise api would return null.
-		 */
-		$headers  = array(
-			'Authorization' => "Key $key",
-		);
-		$response = $api_service->request( 'PUT', $url, $headers )->get_response();
-
-		// The response is an error.
-		if ( is_wp_error( $response ) ) {
-			$this->log->error( 'An error occurred setting the dataset URI: ' . $response->get_error_message() );
-
-			$this->set_dataset_uri( '' );
-			$this->set_package_type( null );
-
-			return;
-		}
-
-		// The response is not OK.
-		if ( ! is_array( $response ) || 200 !== (int) $response['response']['code'] ) {
-			$base_url = $api_service->get_base_url();
-
-			if ( ! is_array( $response ) ) {
-				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-				$this->log->error( "Unexpected response when opening URL $base_url$url: " . var_export( $response, true ) );
-			} else {
-				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-				$this->log->error( "Unexpected status code when opening URL $base_url$url: " . $response['response']['code'] . "\n" . var_export( $response, true ) );
-			}
-
-			$this->set_dataset_uri( '' );
-			$this->set_package_type( null );
-
-			return;
-		}
-
-		/*
+    /**
+     * The entity base path option name.
+     *
+     * @since 3.6.0
+     */
+    const ENTITY_BASE_PATH_KEY = 'wl_entity_base_path';
+
+    /**
+     * The skip wizard (admin installation wizard) option name.
+     *
+     * @since 3.9.0
+     */
+    const SKIP_WIZARD = 'wl_skip_wizard';
+
+    /**
+     * WordLift's key option name.
+     *
+     * @since 3.9.0
+     */
+    const KEY = 'key';
+
+    /**
+     * WordLift's configured language option name.
+     *
+     * @since 3.9.0
+     */
+    const LANGUAGE = 'site_language';
+
+    /**
+     * WordLift's configured country code.
+     *
+     * @since 3.18.0
+     */
+    const COUNTRY_CODE = 'country_code';
+
+    /**
+     * The publisher entity post ID option name.
+     *
+     * @since 3.9.0
+     */
+    const PUBLISHER_ID = 'publisher_id';
+
+    /**
+     * The dataset URI option name
+     *
+     * @since 3.10.0
+     */
+    const DATASET_URI = 'redlink_dataset_uri';
+
+    /**
+     * The link by default option name.
+     *
+     * @since 3.11.0
+     */
+    const LINK_BY_DEFAULT = 'link_by_default';
+
+    /**
+     * The analytics enable option.
+     *
+     * @since 3.21.0
+     */
+    const ANALYTICS_ENABLE = 'analytics_enable';
+
+    /**
+     * The analytics entity uri dimension option.
+     *
+     * @since 3.21.0
+     */
+    const ANALYTICS_ENTITY_URI_DIMENSION = 'analytics_entity_uri_dimension';
+
+    /**
+     * The analytics entity type dimension option.
+     *
+     * @since 3.21.0
+     */
+    const ANALYTICS_ENTITY_TYPE_DIMENSION = 'analytics_entity_type_dimension';
+
+    /**
+     * The user preferences about sharing data option.
+     *
+     * @since 3.19.0
+     */
+    const SEND_DIAGNOSTIC = 'send_diagnostic';
+
+    /**
+     * The package type configuration key.
+     *
+     * @since 3.20.0
+     */
+    const PACKAGE_TYPE = 'package_type';
+    /**
+     * The dataset ids connected to the current key
+     *
+     * @since 3.38.5
+     */
+    const NETWORK_DATASET_IDS = 'network_dataset_ids';
+
+    /**
+     * The {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.16.0
+     *
+     * @var \Wordlift_Log_Service $log The {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create a Wordlift_Configuration_Service's instance.
+     *
+     * @since 3.6.0
+     */
+    protected function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        // Sync some configuration properties when key is validated.
+        add_action( 'wl_key_validation_response', array( $this, 'sync' ) );
+
+    }
+
+    /**
+     * @param $response \Wordlift\Api\Response
+     *
+     * @return void
+     */
+    public function sync( $response ) {
+        if ( ! $response->is_success() ) {
+            return;
+        }
+        $data = json_decode( $response->get_body(), true );
+        if ( ! is_array( $data ) || ! array_key_exists( 'networkDatasetId', $data ) ) {
+            return;
+        }
+        $this->set_network_dataset_ids( $data['networkDatasetId'] );
+    }
+
+    /**
+     * The Wordlift_Configuration_Service's singleton instance.
+     *
+     * @since  3.6.0
+     *
+     * @access private
+     * @var \Wordlift_Configuration_Service $instance Wordlift_Configuration_Service's singleton instance.
+     */
+    private static $instance = null;
+
+    /**
+     * Get the singleton instance.
+     *
+     * @return \Wordlift_Configuration_Service
+     * @since 3.6.0
+     */
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Get a configuration given the option name and a key. The option value is
+     * expected to be an array.
+     *
+     * @param string $option The option name.
+     * @param string $key A key in the option value array.
+     * @param string $default The default value in case the key is not found (by default an empty string).
+     *
+     * @return mixed The configuration value or the default value if not found.
+     * @since 3.6.0
+     */
+    private function get( $option, $key, $default = '' ) {
+
+        $options = get_option( $option, array() );
+
+        return isset( $options[ $key ] ) ? $options[ $key ] : $default;
+    }
+
+    /**
+     * Set a configuration parameter.
+     *
+     * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
+     * @param string $key The value key.
+     * @param mixed  $value The value.
+     *
+     * @since 3.9.0
+     */
+    private function set( $option, $key, $value ) {
+
+        $values         = get_option( $option );
+        $values         = isset( $values ) ? $values : array();
+        $values[ $key ] = $value;
+        update_option( $option, $values );
+
+    }
+
+    /**
+     * Get the entity base path, by default 'entity'.
+     *
+     * @return string The entity base path.
+     * @since 3.6.0
+     */
+    public function get_entity_base_path() {
+
+        return $this->get( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, 'entity' );
+    }
+
+    /**
+     * Get the entity base path.
+     *
+     * @param string $value The entity base path.
+     *
+     * @since 3.9.0
+     */
+    public function set_entity_base_path( $value ) {
+
+        $this->set( 'wl_general_settings', self::ENTITY_BASE_PATH_KEY, $value );
+
+    }
+
+    /**
+     * Whether the installation skip wizard should be skipped.
+     *
+     * @return bool True if it should be skipped otherwise false.
+     * @since 3.9.0
+     */
+    public function is_skip_wizard() {
+
+        return $this->get( 'wl_general_settings', self::SKIP_WIZARD, false );
+    }
+
+    /**
+     * Set the skip wizard parameter.
+     *
+     * @param bool $value True to skip the wizard. We expect a boolean value.
+     *
+     * @since 3.9.0
+     */
+    public function set_skip_wizard( $value ) {
+
+        $this->set( 'wl_general_settings', self::SKIP_WIZARD, true === $value );
+
+    }
+
+    /**
+     * Get WordLift's key.
+     *
+     * @return string WordLift's key or an empty string if not set.
+     * @since 3.9.0
+     */
+    public function get_key() {
+
+        return $this->get( 'wl_general_settings', self::KEY, '' );
+    }
+
+    /**
+     * Set WordLift's key.
+     *
+     * @param string $value WordLift's key.
+     *
+     * @since 3.9.0
+     */
+    public function set_key( $value ) {
+
+        $this->set( 'wl_general_settings', self::KEY, $value );
+    }
+
+    /**
+     * Get WordLift's configured language, by default 'en'.
+     *
+     * Note that WordLift's language is used when writing strings to the Linked Data dataset, not for the analysis.
+     *
+     * @return string WordLift's configured language code ('en' by default).
+     * @since 3.9.0
+     */
+    public function get_language_code() {
+
+        $language = get_locale();
+        if ( ! $language ) {
+            return 'en';
+        }
+
+        return substr( $language, 0, 2 );
+    }
+
+    /**
+     * @param string $value WordLift's language code.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1466
+     *
+     * Set WordLift's language code, used when storing strings to the Linked Data dataset.
+     *
+     * @deprecated As of 3.32.7 this below method has no effect on setting the language, we use the
+     * language code form WordPress directly.
+     *
+     * @since 3.9.0
+     */
+    public function set_language_code( $value ) {
+
+        $this->set( 'wl_general_settings', self::LANGUAGE, $value );
+
+    }
+
+    /**
+     * Set the user preferences about sharing diagnostic with us.
+     *
+     * @param string $value The user preferences(yes/no).
+     *
+     * @since 3.19.0
+     */
+    public function set_diagnostic_preferences( $value ) {
+
+        $this->set( 'wl_general_settings', self::SEND_DIAGNOSTIC, $value );
+
+    }
+
+    /**
+     * Get the user preferences about sharing diagnostic.
+     *
+     * @since 3.19.0
+     */
+    public function get_diagnostic_preferences() {
+
+        return $this->get( 'wl_general_settings', self::SEND_DIAGNOSTIC, 'no' );
+    }
+
+    /**
+     * Get WordLift's configured country code, by default 'us'.
+     *
+     * @return string WordLift's configured country code ('us' by default).
+     * @since 3.18.0
+     */
+    public function get_country_code() {
+
+        return $this->get( 'wl_general_settings', self::COUNTRY_CODE, 'us' );
+    }
+
+    /**
+     * Set WordLift's country code.
+     *
+     * @param string $value WordLift's country code.
+     *
+     * @since 3.18.0
+     */
+    public function set_country_code( $value ) {
+
+        $this->set( 'wl_general_settings', self::COUNTRY_CODE, $value );
+
+    }
+
+    /**
+     * Get the publisher entity post id.
+     *
+     * The publisher entity post id points to an entity post which contains the data for the publisher used in schema.org
+     * Article markup.
+     *
+     * @return int|NULL The publisher entity post id or NULL if not set.
+     * @since 3.9.0
+     */
+    public function get_publisher_id() {
+
+        return $this->get( 'wl_general_settings', self::PUBLISHER_ID, null );
+    }
+
+    /**
+     * Set the publisher entity post id.
+     *
+     * @param int $value The publisher entity post id.
+     *
+     * @since 3.9.0
+     */
+    public function set_publisher_id( $value ) {
+
+        $this->set( 'wl_general_settings', self::PUBLISHER_ID, $value );
+
+    }
+
+    /**
+     * Get the dataset URI.
+     *
+     * @return string The dataset URI or an empty string if not set.
+     * @since 3.10.0
+     * @since 3.27.7 Always return null if `wl_features__enable__dataset` is disabled.
+     */
+    public function get_dataset_uri() {
+
+        if ( apply_filters( 'wl_feature__enable__dataset', true ) ) {
+            return $this->get( 'wl_advanced_settings', self::DATASET_URI, null );
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Set the dataset URI.
+     *
+     * @param string $value The dataset URI.
+     *
+     * @since 3.10.0
+     */
+    public function set_dataset_uri( $value ) {
+
+        $this->set( 'wl_advanced_settings', self::DATASET_URI, $value );
+    }
+
+    /**
+     * Get the package type.
+     *
+     * @return string The package type or an empty string if not set.
+     * @since 3.20.0
+     */
+    public function get_package_type() {
+
+        return $this->get( 'wl_advanced_settings', self::PACKAGE_TYPE, null );
+    }
+
+    /**
+     * Set the package type.
+     *
+     * @param string $value The package type.
+     *
+     * @since 3.20.0
+     */
+    public function set_package_type( $value ) {
+        $this->set( 'wl_advanced_settings', self::PACKAGE_TYPE, $value );
+    }
+
+    /**
+     * Intercept the change of the WordLift key in order to set the dataset URI.
+     *
+     * @since 3.20.0 as of #761, we save settings every time a key is set, not only when the key changes, so to
+     *               store the configuration parameters such as country or language.
+     * @since 3.11.0
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/761
+     *
+     * @param array $old_value The old settings.
+     * @param array $new_value The new settings.
+     */
+    public function update_key( $old_value, $new_value ) {
+
+        // Check the old key value and the new one. We're going to ask for the dataset URI only if the key has changed.
+        // $old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
+        $new_key = isset( $new_value['key'] ) ? $new_value['key'] : '';
+
+        // If the key hasn't changed, don't do anything.
+        // WARN The 'update_option' hook is fired only if the new and old value are not equal.
+        // if ( $old_key === $new_key ) {
+        // return;
+        // }
+
+        // If the key is empty, empty the dataset URI.
+        if ( '' === $new_key ) {
+            $this->set_dataset_uri( '' );
+        }
+
+        // make the request to the remote server.
+        $this->get_remote_dataset_uri( $new_key );
+
+        do_action( 'wl_key_updated' );
+
+    }
+
+    /**
+     * Handle retrieving the dataset uri from the remote server.
+     *
+     * If a valid dataset uri is returned it is stored in the appropriate option,
+     * otherwise the option is set to empty string.
+     *
+     * @param string $key The key to be used.
+     *
+     * @since 3.12.0
+     *
+     * @since 3.17.0 send the site URL and get the dataset URI.
+     */
+    public function get_remote_dataset_uri( $key ) {
+
+        $this->log->trace( 'Getting the remote dataset URI and package type...' );
+
+        if ( empty( $key ) ) {
+            $this->log->warn( 'Key set to empty value.' );
+
+            $this->set_dataset_uri( '' );
+            $this->set_package_type( null );
+
+            return;
+        }
+
+        /**
+         * Allow 3rd parties to change the site_url.
+         *
+         * @param string $site_url The site url.
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/850
+         *
+         * @since 3.20.0
+         */
+        $home_url = get_option( 'home' );
+        $site_url = apply_filters( 'wl_production_site_url', untrailingslashit( $home_url ) );
+
+        // Build the URL.
+        $url = '/accounts'
+                . '?key=' . rawurlencode( $key )
+                . '&url=' . rawurlencode( $site_url )
+                . '&country=' . $this->get_country_code()
+                . '&language=' . $this->get_language_code();
+
+        $api_service = Default_Api_Service::get_instance();
+        /**
+         * @since 3.27.7.1
+         * The Key should be passed to headers, otherwise api would return null.
+         */
+        $headers  = array(
+            'Authorization' => "Key $key",
+        );
+        $response = $api_service->request( 'PUT', $url, $headers )->get_response();
+
+        // The response is an error.
+        if ( is_wp_error( $response ) ) {
+            $this->log->error( 'An error occurred setting the dataset URI: ' . $response->get_error_message() );
+
+            $this->set_dataset_uri( '' );
+            $this->set_package_type( null );
+
+            return;
+        }
+
+        // The response is not OK.
+        if ( ! is_array( $response ) || 200 !== (int) $response['response']['code'] ) {
+            $base_url = $api_service->get_base_url();
+
+            if ( ! is_array( $response ) ) {
+                // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
+                $this->log->error( "Unexpected response when opening URL $base_url$url: " . var_export( $response, true ) );
+            } else {
+                // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
+                $this->log->error( "Unexpected status code when opening URL $base_url$url: " . $response['response']['code'] . "\n" . var_export( $response, true ) );
+            }
+
+            $this->set_dataset_uri( '' );
+            $this->set_package_type( null );
+
+            return;
+        }
+
+        /*
 		 * We also store the package type.
 		 *
 		 * @since 3.20.0
 		 */
-		$json = json_decode( $response['body'] );
-		/**
-		 * @since 3.27.7
-		 * Remove the trailing slash returned from the new platform api.
-		 */
-		// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		$dataset_uri = untrailingslashit( $json->datasetURI );
-		// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		$package_type = isset( $json->packageType ) ? $json->packageType : null;
-
-		$this->log->info( "Updating [ dataset uri :: $dataset_uri ][ package type :: $package_type ]..." );
-
-		$this->set_dataset_uri( $dataset_uri );
-		$this->set_package_type( $package_type );
-	}
-
-	/**
-	 * Handle the edge case where a user submits the same key again
-	 * when he does not have the dataset uri to regain it.
-	 *
-	 * This can not be handled in the normal option update hook because
-	 * it is not being triggered when the save value equals to the one already
-	 * in the DB.
-	 *
-	 * @param mixed $value The new, unserialized option value.
-	 * @param mixed $old_value The old option value.
-	 *
-	 * @return mixed The same value in the $value parameter
-	 * @since 3.12.0
-	 */
-	public function maybe_update_dataset_uri( $value, $old_value ) {
-
-		// Check the old key value and the new one. Here we're only handling the
-		// case where the key hasn't changed and the dataset URI isn't set. The
-		// other case, i.e. a new key is inserted, is handled at `update_key`.
-		$old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
-		$new_key = isset( $value['key'] ) ? $value['key'] : '';
-
-		$dataset_uri = $this->get_dataset_uri();
-
-		if ( ! empty( $new_key ) && $new_key === $old_key && empty( $dataset_uri ) ) {
-
-			// make the request to the remote server to try to get the dataset uri.
-			$this->get_remote_dataset_uri( $new_key );
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Get the API URI to retrieve the dataset URI using the WordLift Key.
-	 *
-	 * @param string $key The WordLift key to use.
-	 *
-	 * @return string The API URI.
-	 * @since 3.11.0
-	 */
-	public function get_accounts_by_key_dataset_uri( $key ) {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
-	}
-
-	/**
-	 * Get the `accounts` end point.
-	 *
-	 * @return string The `accounts` end point.
-	 * @since 3.16.0
-	 */
-	public function get_accounts() {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'accounts';
-	}
-
-	/**
-	 * Get the `link by default` option.
-	 *
-	 * @return bool True if entities must be linked by default otherwise false.
-	 * @since 3.13.0
-	 */
-	public function is_link_by_default() {
-
-		return 'yes' === $this->get( 'wl_general_settings', self::LINK_BY_DEFAULT, 'yes' );
-	}
-
-	/**
-	 * Set the `link by default` option.
-	 *
-	 * @param bool $value True to enabling linking by default, otherwise false.
-	 *
-	 * @since 3.13.0
-	 */
-	public function set_link_by_default( $value ) {
-
-		$this->set( 'wl_general_settings', self::LINK_BY_DEFAULT, true === $value ? 'yes' : 'no' );
-	}
-
-	/**
-	 * Get the 'analytics-enable' option.
-	 *
-	 * @return string 'no' or 'yes' representing bool.
-	 * @since 3.21.0
-	 */
-	public function is_analytics_enable() {
-		return 'yes' === $this->get( 'wl_analytics_settings', self::ANALYTICS_ENABLE, 'no' );
-	}
-
-	/**
-	 * Set the `analytics-enable` option.
-	 *
-	 * @param bool $value True to enabling analytics, otherwise false.
-	 *
-	 * @since 3.21.0
-	 */
-	public function set_is_analytics_enable( $value ) {
-
-		$this->set( 'wl_general_settings', self::ANALYTICS_ENABLE, true === $value ? 'yes' : 'no' );
-	}
-
-	/**
-	 * Get the 'analytics-entity-uri-dimention' option.
-	 *
-	 * @return int
-	 * @since 3.21.0
-	 */
-	public function get_analytics_entity_uri_dimension() {
-		return (int) $this->get( 'wl_analytics_settings', self::ANALYTICS_ENTITY_URI_DIMENSION, 1 );
-	}
-
-	/**
-	 * Get the 'analytics-entity-type-dimension' option.
-	 *
-	 * @return int
-	 * @since 3.21.0
-	 */
-	public function get_analytics_entity_type_dimension() {
-		return $this->get( 'wl_analytics_settings', self::ANALYTICS_ENTITY_TYPE_DIMENSION, 2 );
-	}
-
-	/**
-	 * Get the URL to perform autocomplete request.
-	 *
-	 * @return string The URL to call to perform the autocomplete request.
-	 * @since 3.15.0
-	 */
-	public function get_autocomplete_url() {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'autocomplete';
-
-	}
-
-	/**
-	 * Get the URL to perform feedback deactivation request.
-	 *
-	 * @return string The URL to call to perform the feedback deactivation request.
-	 * @since 3.19.0
-	 */
-	public function get_deactivation_feedback_url() {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'feedbacks';
-
-	}
-
-	/**
-	 * Get the base API URL.
-	 *
-	 * @return string The base API URL.
-	 * @since 3.20.0
-	 */
-	public function get_api_url() {
-
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE;
-	}
-
-	public function get_network_dataset_ids() {
-		return $this->get( 'wl_advanced_settings', self::NETWORK_DATASET_IDS, array() );
-	}
-
-	public function set_network_dataset_ids( $network_dataset_ids ) {
-		$this->set( 'wl_advanced_settings', self::NETWORK_DATASET_IDS, $network_dataset_ids );
-	}
+        $json = json_decode( $response['body'] );
+        /**
+         * @since 3.27.7
+         * Remove the trailing slash returned from the new platform api.
+         */
+        // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        $dataset_uri = untrailingslashit( $json->datasetURI );
+        // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+        $package_type = isset( $json->packageType ) ? $json->packageType : null;
+
+        $this->log->info( "Updating [ dataset uri :: $dataset_uri ][ package type :: $package_type ]..." );
+
+        $this->set_dataset_uri( $dataset_uri );
+        $this->set_package_type( $package_type );
+    }
+
+    /**
+     * Handle the edge case where a user submits the same key again
+     * when he does not have the dataset uri to regain it.
+     *
+     * This can not be handled in the normal option update hook because
+     * it is not being triggered when the save value equals to the one already
+     * in the DB.
+     *
+     * @param mixed $value The new, unserialized option value.
+     * @param mixed $old_value The old option value.
+     *
+     * @return mixed The same value in the $value parameter
+     * @since 3.12.0
+     */
+    public function maybe_update_dataset_uri( $value, $old_value ) {
+
+        // Check the old key value and the new one. Here we're only handling the
+        // case where the key hasn't changed and the dataset URI isn't set. The
+        // other case, i.e. a new key is inserted, is handled at `update_key`.
+        $old_key = isset( $old_value['key'] ) ? $old_value['key'] : '';
+        $new_key = isset( $value['key'] ) ? $value['key'] : '';
+
+        $dataset_uri = $this->get_dataset_uri();
+
+        if ( ! empty( $new_key ) && $new_key === $old_key && empty( $dataset_uri ) ) {
+
+            // make the request to the remote server to try to get the dataset uri.
+            $this->get_remote_dataset_uri( $new_key );
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get the API URI to retrieve the dataset URI using the WordLift Key.
+     *
+     * @param string $key The WordLift key to use.
+     *
+     * @return string The API URI.
+     * @since 3.11.0
+     */
+    public function get_accounts_by_key_dataset_uri( $key ) {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
+    }
+
+    /**
+     * Get the `accounts` end point.
+     *
+     * @return string The `accounts` end point.
+     * @since 3.16.0
+     */
+    public function get_accounts() {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'accounts';
+    }
+
+    /**
+     * Get the `link by default` option.
+     *
+     * @return bool True if entities must be linked by default otherwise false.
+     * @since 3.13.0
+     */
+    public function is_link_by_default() {
+
+        return 'yes' === $this->get( 'wl_general_settings', self::LINK_BY_DEFAULT, 'yes' );
+    }
+
+    /**
+     * Set the `link by default` option.
+     *
+     * @param bool $value True to enabling linking by default, otherwise false.
+     *
+     * @since 3.13.0
+     */
+    public function set_link_by_default( $value ) {
+
+        $this->set( 'wl_general_settings', self::LINK_BY_DEFAULT, true === $value ? 'yes' : 'no' );
+    }
+
+    /**
+     * Get the 'analytics-enable' option.
+     *
+     * @return string 'no' or 'yes' representing bool.
+     * @since 3.21.0
+     */
+    public function is_analytics_enable() {
+        return 'yes' === $this->get( 'wl_analytics_settings', self::ANALYTICS_ENABLE, 'no' );
+    }
+
+    /**
+     * Set the `analytics-enable` option.
+     *
+     * @param bool $value True to enabling analytics, otherwise false.
+     *
+     * @since 3.21.0
+     */
+    public function set_is_analytics_enable( $value ) {
+
+        $this->set( 'wl_general_settings', self::ANALYTICS_ENABLE, true === $value ? 'yes' : 'no' );
+    }
+
+    /**
+     * Get the 'analytics-entity-uri-dimention' option.
+     *
+     * @return int
+     * @since 3.21.0
+     */
+    public function get_analytics_entity_uri_dimension() {
+        return (int) $this->get( 'wl_analytics_settings', self::ANALYTICS_ENTITY_URI_DIMENSION, 1 );
+    }
+
+    /**
+     * Get the 'analytics-entity-type-dimension' option.
+     *
+     * @return int
+     * @since 3.21.0
+     */
+    public function get_analytics_entity_type_dimension() {
+        return $this->get( 'wl_analytics_settings', self::ANALYTICS_ENTITY_TYPE_DIMENSION, 2 );
+    }
+
+    /**
+     * Get the URL to perform autocomplete request.
+     *
+     * @return string The URL to call to perform the autocomplete request.
+     * @since 3.15.0
+     */
+    public function get_autocomplete_url() {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'autocomplete';
+
+    }
+
+    /**
+     * Get the URL to perform feedback deactivation request.
+     *
+     * @return string The URL to call to perform the feedback deactivation request.
+     * @since 3.19.0
+     */
+    public function get_deactivation_feedback_url() {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . 'feedbacks';
+
+    }
+
+    /**
+     * Get the base API URL.
+     *
+     * @return string The base API URL.
+     * @since 3.20.0
+     */
+    public function get_api_url() {
+
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE;
+    }
+
+    public function get_network_dataset_ids() {
+        return $this->get( 'wl_advanced_settings', self::NETWORK_DATASET_IDS, array() );
+    }
+
+    public function set_network_dataset_ids( $network_dataset_ids ) {
+        $this->set( 'wl_advanced_settings', self::NETWORK_DATASET_IDS, $network_dataset_ids );
+    }
 
 }

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

Indentation +171 added lines, -171 removed lines

@@ -12,177 +12,177 @@
  */
 class Analysis_Service {
 
-	/**
-	 * @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 ) {
-
-		$this->api_service = $api_service;
-
-		$this->cache_service = $cache_service;
-
-		$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 ) {
-
-		$cache_key    = $tag->term_id;
-		$cache_result = $this->cache_service->get( $cache_key );
-		if ( false !== $cache_result ) {
-			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 = wp_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'];
-	}
-
-	private function get_meta( $entity_url ) {
-
-		$cache_results = $this->cache_service->get( $entity_url );
-
-		if ( false !== $cache_results ) {
-			return $cache_results;
-		}
-
-		$formatted_url = self::format_entity_url( $entity_url );
-
-		if ( ! $formatted_url ) {
-			return array();
-		}
-
-		$meta_url = 'https://api.wordlift.io/id/' . $formatted_url;
-
-		$response = wp_remote_get( $meta_url );
-
-		if ( is_wp_error( $response )
-			 || ! isset( $response['response']['code'] )
-			 || 2 !== (int) $response['response']['code'] / 100 ) {
-			return false;
-		}
-
-		if ( ! is_wp_error( $response ) ) {
-			$meta = json_decode( wp_remote_retrieve_body( $response ), true );
-			$this->cache_service->put( $entity_url, $meta );
-
-			return $meta;
-		}
-
-		return array();
-
-	}
-
-	private function get_meta_for_entities( $entities ) {
-
-		$filtered_entities = array();
-		foreach ( $entities as $entity ) {
-			$entity['meta'] = array();
-			$meta           = $this->get_meta( $entity['entityId'] );
-			if ( $meta ) {
-				$meta                = Default_Entity_List::compact_jsonld( $meta );
-				$entity['meta']      = $meta;
-				$filtered_entities[] = $entity;
-			}
-		}
-
-		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'           => $this->get_scope(),
-				)
-			)
-		);
-
-		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'] );
-
-		return $entities;
-	}
-
-	public function get_scope() {
-		$service = \Wordlift_Configuration_Service::get_instance();
+    /**
+     * @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 ) {
+
+        $this->api_service = $api_service;
+
+        $this->cache_service = $cache_service;
+
+        $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 ) {
+
+        $cache_key    = $tag->term_id;
+        $cache_result = $this->cache_service->get( $cache_key );
+        if ( false !== $cache_result ) {
+            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 = wp_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'];
+    }
+
+    private function get_meta( $entity_url ) {
+
+        $cache_results = $this->cache_service->get( $entity_url );
+
+        if ( false !== $cache_results ) {
+            return $cache_results;
+        }
+
+        $formatted_url = self::format_entity_url( $entity_url );
+
+        if ( ! $formatted_url ) {
+            return array();
+        }
+
+        $meta_url = 'https://api.wordlift.io/id/' . $formatted_url;
+
+        $response = wp_remote_get( $meta_url );
+
+        if ( is_wp_error( $response )
+             || ! isset( $response['response']['code'] )
+             || 2 !== (int) $response['response']['code'] / 100 ) {
+            return false;
+        }
+
+        if ( ! is_wp_error( $response ) ) {
+            $meta = json_decode( wp_remote_retrieve_body( $response ), true );
+            $this->cache_service->put( $entity_url, $meta );
+
+            return $meta;
+        }
+
+        return array();
+
+    }
+
+    private function get_meta_for_entities( $entities ) {
+
+        $filtered_entities = array();
+        foreach ( $entities as $entity ) {
+            $entity['meta'] = array();
+            $meta           = $this->get_meta( $entity['entityId'] );
+            if ( $meta ) {
+                $meta                = Default_Entity_List::compact_jsonld( $meta );
+                $entity['meta']      = $meta;
+                $filtered_entities[] = $entity;
+            }
+        }
+
+        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'           => $this->get_scope(),
+                )
+            )
+        );
+
+        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'] );
+
+        return $entities;
+    }
+
+    public function get_scope() {
+        $service = \Wordlift_Configuration_Service::get_instance();
 
-		return count( $service->get_network_dataset_ids() ) > 0 ? 'network-only' : 'cloud';
-	}
+        return count( $service->get_network_dataset_ids() ) > 0 ? 'network-only' : 'cloud';
+    }
 
 }

Spacing +40 added lines, -40 removed lines

@@ -31,13 +31,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());
 
 	}
 
@@ -47,24 +47,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 ( false !== $cache_result ) {
+		$cache_result = $this->cache_service->get($cache_key);
+		if (false !== $cache_result) {
 			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;
 
@@ -77,47 +77,47 @@ 
 	 *
 	 * @return bool|string
 	 */
-	public static function format_entity_url( $entity_url ) {
-		$result = wp_parse_url( $entity_url );
-		if ( ! $result ) {
+	public static function format_entity_url($entity_url) {
+		$result = wp_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 ( false !== $cache_results ) {
+		if (false !== $cache_results) {
 			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);
 
-		if ( is_wp_error( $response )
-			 || ! isset( $response['response']['code'] )
-			 || 2 !== (int) $response['response']['code'] / 100 ) {
+		if (is_wp_error($response)
+			 || ! isset($response['response']['code'])
+			 || 2 !== (int) $response['response']['code'] / 100) {
 			return false;
 		}
 
-		if ( ! is_wp_error( $response ) ) {
-			$meta = json_decode( wp_remote_retrieve_body( $response ), true );
-			$this->cache_service->put( $entity_url, $meta );
+		if ( ! is_wp_error($response)) {
+			$meta = json_decode(wp_remote_retrieve_body($response), true);
+			$this->cache_service->put($entity_url, $meta);
 
 			return $meta;
 		}
@@ -126,14 +126,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'] );
-			if ( $meta ) {
-				$meta                = Default_Entity_List::compact_jsonld( $meta );
+			$meta           = $this->get_meta($entity['entityId']);
+			if ($meta) {
+				$meta                = Default_Entity_List::compact_jsonld($meta);
 				$entity['meta']      = $meta;
 				$filtered_entities[] = $entity;
 			}
@@ -148,11 +148,11 @@ 
 	 *
 	 * @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' ),
+			array('Content-Type' => 'application/json'),
 			wp_json_encode(
 				array(
 					'content'         => $tag_name,
@@ -164,17 +164,17 @@ 
 			)
 		);
 
-		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;
 	}
@@ -182,7 +182,7 @@ 
 	public function get_scope() {
 		$service = \Wordlift_Configuration_Service::get_instance();
 
-		return count( $service->get_network_dataset_ids() ) > 0 ? 'network-only' : 'cloud';
+		return count($service->get_network_dataset_ids()) > 0 ? 'network-only' : 'cloud';
 	}
 
 }