insideout10 / wordlift-plugin

src/wordlift/faq/class-faq-rest-controller.php

Indentation +229 added lines, -229 removed lines

@@ -17,233 +17,233 @@
  * @package Wordlift\FAQ
  */
 class Faq_Rest_Controller {
-	const FAQ_META_KEY = '_wl_faq';
-	/**
-	 * Enumerations to determine the field to be deleted on
-	 * the DELETE request in API.
-	 */
-	const QUESTION = 'question';
-	const ANSWER   = 'answer';
-
-	public static function register_routes() {
-		add_action( 'rest_api_init', 'Wordlift\FAQ\FAQ_Rest_Controller::register_route_callback' );
-	}
-
-	public static function register_route_callback() {
-		/**
-		 * Specifies the list of arguments to be present for update request.
-		 */
-		$post_id_validation_settings   = array(
-			'required'          => true,
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-			'validate_callback' => function ( $param, $request, $key ) {
-				return is_numeric( $param );
-			},
-		);
-		$faq_items_validation_settings = array(
-			'required'          => true,
-			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-			'validate_callback' => function ( $param, $request, $key ) {
-				return is_array( $param ) && count( $param ) > 0;
-			},
-		);
-		/**
-		 * Array of args to be present in order to
-		 * make create, update or delete request.
-		 */
-		$create_or_update_or_delete_args = array(
-			'post_id'   => $post_id_validation_settings,
-			'faq_items' => $faq_items_validation_settings,
-		);
-
-		/**
-		 * Rest route for creating new faq item.
-		 */
-		register_rest_route(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE,
-			'/faq',
-			array(
-				'methods'             => \WP_REST_Server::CREATABLE,
-				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::add_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
-				},
-				'args'                => $create_or_update_or_delete_args,
-			)
-		);
-		/**
-		 * Rest route for updating faq items.
-		 */
-		register_rest_route(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE,
-			'/faq',
-			array(
-				'methods'             => \WP_REST_Server::EDITABLE,
-				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::update_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
-				},
-				'args'                => $create_or_update_or_delete_args,
-			)
-		);
-		/**
-		 * Rest route for getting the faq items.
-		 */
-		register_rest_route(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE,
-			'/faq/(?P<post_id>\d+)',
-			array(
-				'methods'             => \WP_REST_Server::READABLE,
-				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::get_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
-				},
-				'args'                => array( 'post_id' => $post_id_validation_settings ),
-			)
-		);
-		/**
-		 * Rest route for deleting faq item.
-		 */
-		register_rest_route(
-			WL_REST_ROUTE_DEFAULT_NAMESPACE,
-			'/faq',
-			array(
-				'methods'             => \WP_REST_Server::DELETABLE,
-				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::delete_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
-				},
-				'args'                => $create_or_update_or_delete_args,
-			)
-		);
-	}
-
-	/**
-	 * Get all FAQ items for a post id.
-	 *
-	 * @param $request $request WP_REST_Request $request {@link WP_REST_Request instance}.
-	 *
-	 * @return array Result array, if post id is not given then error array is returned.
-	 */
-	public static function get_faq_items( $request ) {
-		$data    = $request->get_params();
-		$post_id = (int) $data['post_id'];
-
-		return get_post_meta( $post_id, self::FAQ_META_KEY );
-	}
-
-	/**
-	 * Update all FAQ items for a post id.
-	 *
-	 * @param $request $request WP_REST_Request $request {@link WP_REST_Request instance}.
-	 *
-	 * @return array Result array, if post id is not given then error array is returned.
-	 */
-	public static function update_faq_items( $request ) {
-		$data      = $request->get_params();
-		$post_id   = (int) $data['post_id'];
-		$faq_items = (array) $data['faq_items'];
-		foreach ( $faq_items as $faq_item ) {
-			$previous_value = array(
-				'question' => (string) $faq_item['previous_question_value'],
-				'answer'   => (string) $faq_item['previous_answer_value'],
-				'id'       => (int) $faq_item['id'],
-			);
-			$new_value      = array(
-				'question' => (string) $faq_item['question'],
-				'answer'   => (string) $faq_item['answer'],
-				'id'       => (int) $faq_item['id'],
-			);
-			update_post_meta( $post_id, self::FAQ_META_KEY, $new_value, $previous_value );
-		}
-
-		return array(
-			'status'  => 'success',
-			'message' => __( 'Faq Items updated successfully', 'wordlift' ),
-		);
-
-	}
-
-	/**
-	 * Delete Faq items.
-	 *
-	 * @param $request WP_REST_Request $request {@link WP_REST_Request instance}.
-	 *
-	 * @return array Associative array whether the faq item is deleted or not.
-	 */
-	public static function delete_faq_items( $request ) {
-		$post_data = $request->get_params();
-		$post_id   = $post_data['post_id'];
-		$faq_items = $post_data['faq_items'];
-		foreach ( $faq_items as $faq_item ) {
-			/**
-			 * Note: the order of keys is important in order to delete it properly
-			 * If the order change, delete operation will fail since it is converted
-			 * in to a string when it was stored.
-			 * we cant rely on client to post it in correct order, so we create an array
-			 * in correct order.
-			 */
-			$deleted_faq_item = array(
-				'question' => $faq_item['question'],
-				'answer'   => $faq_item['answer'],
-				'id'       => (int) $faq_item['id'],
-			);
-			/**
-			 * If the field to be deleted is answer, then don't delete the faq item,
-			 * if it is question then delete the faq item.
-			 */
-			if ( self::ANSWER === $faq_item['field_to_be_deleted'] ) {
-				$previous_value = $deleted_faq_item;
-				// then don't delete the faq item, set the answer as empty.
-				$deleted_faq_item['answer'] = '';
-				$new_value                  = $deleted_faq_item;
-				update_post_meta( $post_id, self::FAQ_META_KEY, $new_value, $previous_value );
-			} elseif ( self::QUESTION === $faq_item['field_to_be_deleted'] ) {
-				/**
-				 * If the question is deleted, then delete the faq item.
-				 */
-				delete_post_meta( $post_id, self::FAQ_META_KEY, $deleted_faq_item );
-			}
-		}
-
-		/**
-		 * We are returning only the first item id, since the user can select only one text at a time.
-		 */
-		return array(
-			'status'  => 'success',
-			'message' => __( 'Faq item successfully deleted.', 'wordlift' ),
-		);
-	}
-
-	/**
-	 * Insert or update FAQ items.
-	 *
-	 * @param $request WP_REST_Request $request {@link WP_REST_Request instance}.
-	 *
-	 * @return array Associative array whether the faq item is inserted or not
-	 */
-	public static function add_faq_items( $request ) {
-		$post_data = $request->get_params();
-		$post_id   = $post_data['post_id'];
-		$faq_items = $post_data['faq_items'];
-		foreach ( $faq_items as &$faq_item ) {
-			// Add an identifier id to the faq item, it helps to prevent duplication problem.
-			/**
-			 * We are using time() and a random integer to prevent
-			 * duplication problem.
-			 */
-			$faq_item['id'] = time() + wp_rand( 1, 100 ) + wp_rand( 1, 100 );
-			add_post_meta( (int) $post_id, self::FAQ_META_KEY, $faq_item );
-		}
-
-		/**
-		 * We are returning only the first item id, since the user can select only one text at a time.
-		 */
-		return array(
-			'status'  => 'success',
-			'message' => __( 'Question successfully added.', 'wordlift' ),
-			'id'      => (int) $faq_items[0]['id'],
-		);
-
-	}
+    const FAQ_META_KEY = '_wl_faq';
+    /**
+     * Enumerations to determine the field to be deleted on
+     * the DELETE request in API.
+     */
+    const QUESTION = 'question';
+    const ANSWER   = 'answer';
+
+    public static function register_routes() {
+        add_action( 'rest_api_init', 'Wordlift\FAQ\FAQ_Rest_Controller::register_route_callback' );
+    }
+
+    public static function register_route_callback() {
+        /**
+         * Specifies the list of arguments to be present for update request.
+         */
+        $post_id_validation_settings   = array(
+            'required'          => true,
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+            'validate_callback' => function ( $param, $request, $key ) {
+                return is_numeric( $param );
+            },
+        );
+        $faq_items_validation_settings = array(
+            'required'          => true,
+            // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+            'validate_callback' => function ( $param, $request, $key ) {
+                return is_array( $param ) && count( $param ) > 0;
+            },
+        );
+        /**
+         * Array of args to be present in order to
+         * make create, update or delete request.
+         */
+        $create_or_update_or_delete_args = array(
+            'post_id'   => $post_id_validation_settings,
+            'faq_items' => $faq_items_validation_settings,
+        );
+
+        /**
+         * Rest route for creating new faq item.
+         */
+        register_rest_route(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE,
+            '/faq',
+            array(
+                'methods'             => \WP_REST_Server::CREATABLE,
+                'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::add_faq_items',
+                'permission_callback' => function () {
+                    return current_user_can( 'publish_posts' );
+                },
+                'args'                => $create_or_update_or_delete_args,
+            )
+        );
+        /**
+         * Rest route for updating faq items.
+         */
+        register_rest_route(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE,
+            '/faq',
+            array(
+                'methods'             => \WP_REST_Server::EDITABLE,
+                'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::update_faq_items',
+                'permission_callback' => function () {
+                    return current_user_can( 'publish_posts' );
+                },
+                'args'                => $create_or_update_or_delete_args,
+            )
+        );
+        /**
+         * Rest route for getting the faq items.
+         */
+        register_rest_route(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE,
+            '/faq/(?P<post_id>\d+)',
+            array(
+                'methods'             => \WP_REST_Server::READABLE,
+                'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::get_faq_items',
+                'permission_callback' => function () {
+                    return current_user_can( 'publish_posts' );
+                },
+                'args'                => array( 'post_id' => $post_id_validation_settings ),
+            )
+        );
+        /**
+         * Rest route for deleting faq item.
+         */
+        register_rest_route(
+            WL_REST_ROUTE_DEFAULT_NAMESPACE,
+            '/faq',
+            array(
+                'methods'             => \WP_REST_Server::DELETABLE,
+                'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::delete_faq_items',
+                'permission_callback' => function () {
+                    return current_user_can( 'publish_posts' );
+                },
+                'args'                => $create_or_update_or_delete_args,
+            )
+        );
+    }
+
+    /**
+     * Get all FAQ items for a post id.
+     *
+     * @param $request $request WP_REST_Request $request {@link WP_REST_Request instance}.
+     *
+     * @return array Result array, if post id is not given then error array is returned.
+     */
+    public static function get_faq_items( $request ) {
+        $data    = $request->get_params();
+        $post_id = (int) $data['post_id'];
+
+        return get_post_meta( $post_id, self::FAQ_META_KEY );
+    }
+
+    /**
+     * Update all FAQ items for a post id.
+     *
+     * @param $request $request WP_REST_Request $request {@link WP_REST_Request instance}.
+     *
+     * @return array Result array, if post id is not given then error array is returned.
+     */
+    public static function update_faq_items( $request ) {
+        $data      = $request->get_params();
+        $post_id   = (int) $data['post_id'];
+        $faq_items = (array) $data['faq_items'];
+        foreach ( $faq_items as $faq_item ) {
+            $previous_value = array(
+                'question' => (string) $faq_item['previous_question_value'],
+                'answer'   => (string) $faq_item['previous_answer_value'],
+                'id'       => (int) $faq_item['id'],
+            );
+            $new_value      = array(
+                'question' => (string) $faq_item['question'],
+                'answer'   => (string) $faq_item['answer'],
+                'id'       => (int) $faq_item['id'],
+            );
+            update_post_meta( $post_id, self::FAQ_META_KEY, $new_value, $previous_value );
+        }
+
+        return array(
+            'status'  => 'success',
+            'message' => __( 'Faq Items updated successfully', 'wordlift' ),
+        );
+
+    }
+
+    /**
+     * Delete Faq items.
+     *
+     * @param $request WP_REST_Request $request {@link WP_REST_Request instance}.
+     *
+     * @return array Associative array whether the faq item is deleted or not.
+     */
+    public static function delete_faq_items( $request ) {
+        $post_data = $request->get_params();
+        $post_id   = $post_data['post_id'];
+        $faq_items = $post_data['faq_items'];
+        foreach ( $faq_items as $faq_item ) {
+            /**
+             * Note: the order of keys is important in order to delete it properly
+             * If the order change, delete operation will fail since it is converted
+             * in to a string when it was stored.
+             * we cant rely on client to post it in correct order, so we create an array
+             * in correct order.
+             */
+            $deleted_faq_item = array(
+                'question' => $faq_item['question'],
+                'answer'   => $faq_item['answer'],
+                'id'       => (int) $faq_item['id'],
+            );
+            /**
+             * If the field to be deleted is answer, then don't delete the faq item,
+             * if it is question then delete the faq item.
+             */
+            if ( self::ANSWER === $faq_item['field_to_be_deleted'] ) {
+                $previous_value = $deleted_faq_item;
+                // then don't delete the faq item, set the answer as empty.
+                $deleted_faq_item['answer'] = '';
+                $new_value                  = $deleted_faq_item;
+                update_post_meta( $post_id, self::FAQ_META_KEY, $new_value, $previous_value );
+            } elseif ( self::QUESTION === $faq_item['field_to_be_deleted'] ) {
+                /**
+                 * If the question is deleted, then delete the faq item.
+                 */
+                delete_post_meta( $post_id, self::FAQ_META_KEY, $deleted_faq_item );
+            }
+        }
+
+        /**
+         * We are returning only the first item id, since the user can select only one text at a time.
+         */
+        return array(
+            'status'  => 'success',
+            'message' => __( 'Faq item successfully deleted.', 'wordlift' ),
+        );
+    }
+
+    /**
+     * Insert or update FAQ items.
+     *
+     * @param $request WP_REST_Request $request {@link WP_REST_Request instance}.
+     *
+     * @return array Associative array whether the faq item is inserted or not
+     */
+    public static function add_faq_items( $request ) {
+        $post_data = $request->get_params();
+        $post_id   = $post_data['post_id'];
+        $faq_items = $post_data['faq_items'];
+        foreach ( $faq_items as &$faq_item ) {
+            // Add an identifier id to the faq item, it helps to prevent duplication problem.
+            /**
+             * We are using time() and a random integer to prevent
+             * duplication problem.
+             */
+            $faq_item['id'] = time() + wp_rand( 1, 100 ) + wp_rand( 1, 100 );
+            add_post_meta( (int) $post_id, self::FAQ_META_KEY, $faq_item );
+        }
+
+        /**
+         * We are returning only the first item id, since the user can select only one text at a time.
+         */
+        return array(
+            'status'  => 'success',
+            'message' => __( 'Question successfully added.', 'wordlift' ),
+            'id'      => (int) $faq_items[0]['id'],
+        );
+
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -26,25 +26,25 @@ 
 	const ANSWER   = 'answer';
 
 	public static function register_routes() {
-		add_action( 'rest_api_init', 'Wordlift\FAQ\FAQ_Rest_Controller::register_route_callback' );
+		add_action('rest_api_init', 'Wordlift\FAQ\FAQ_Rest_Controller::register_route_callback');
 	}
 
 	public static function register_route_callback() {
 		/**
 		 * Specifies the list of arguments to be present for update request.
 		 */
-		$post_id_validation_settings   = array(
+		$post_id_validation_settings = array(
 			'required'          => true,
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-			'validate_callback' => function ( $param, $request, $key ) {
-				return is_numeric( $param );
+			'validate_callback' => function($param, $request, $key) {
+				return is_numeric($param);
 			},
 		);
 		$faq_items_validation_settings = array(
 			'required'          => true,
 			// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-			'validate_callback' => function ( $param, $request, $key ) {
-				return is_array( $param ) && count( $param ) > 0;
+			'validate_callback' => function($param, $request, $key) {
+				return is_array($param) && count($param) > 0;
 			},
 		);
 		/**
@@ -65,8 +65,8 @@ 
 			array(
 				'methods'             => \WP_REST_Server::CREATABLE,
 				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::add_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
+				'permission_callback' => function() {
+					return current_user_can('publish_posts');
 				},
 				'args'                => $create_or_update_or_delete_args,
 			)
@@ -80,8 +80,8 @@ 
 			array(
 				'methods'             => \WP_REST_Server::EDITABLE,
 				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::update_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
+				'permission_callback' => function() {
+					return current_user_can('publish_posts');
 				},
 				'args'                => $create_or_update_or_delete_args,
 			)
@@ -95,10 +95,10 @@ 
 			array(
 				'methods'             => \WP_REST_Server::READABLE,
 				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::get_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
+				'permission_callback' => function() {
+					return current_user_can('publish_posts');
 				},
-				'args'                => array( 'post_id' => $post_id_validation_settings ),
+				'args'                => array('post_id' => $post_id_validation_settings),
 			)
 		);
 		/**
@@ -110,8 +110,8 @@ 
 			array(
 				'methods'             => \WP_REST_Server::DELETABLE,
 				'callback'            => 'Wordlift\Faq\Faq_Rest_Controller::delete_faq_items',
-				'permission_callback' => function () {
-					return current_user_can( 'publish_posts' );
+				'permission_callback' => function() {
+					return current_user_can('publish_posts');
 				},
 				'args'                => $create_or_update_or_delete_args,
 			)
@@ -125,11 +125,11 @@ 
 	 *
 	 * @return array Result array, if post id is not given then error array is returned.
 	 */
-	public static function get_faq_items( $request ) {
+	public static function get_faq_items($request) {
 		$data    = $request->get_params();
 		$post_id = (int) $data['post_id'];
 
-		return get_post_meta( $post_id, self::FAQ_META_KEY );
+		return get_post_meta($post_id, self::FAQ_META_KEY);
 	}
 
 	/**
@@ -139,27 +139,27 @@ 
 	 *
 	 * @return array Result array, if post id is not given then error array is returned.
 	 */
-	public static function update_faq_items( $request ) {
+	public static function update_faq_items($request) {
 		$data      = $request->get_params();
 		$post_id   = (int) $data['post_id'];
 		$faq_items = (array) $data['faq_items'];
-		foreach ( $faq_items as $faq_item ) {
+		foreach ($faq_items as $faq_item) {
 			$previous_value = array(
 				'question' => (string) $faq_item['previous_question_value'],
 				'answer'   => (string) $faq_item['previous_answer_value'],
 				'id'       => (int) $faq_item['id'],
 			);
-			$new_value      = array(
+			$new_value = array(
 				'question' => (string) $faq_item['question'],
 				'answer'   => (string) $faq_item['answer'],
 				'id'       => (int) $faq_item['id'],
 			);
-			update_post_meta( $post_id, self::FAQ_META_KEY, $new_value, $previous_value );
+			update_post_meta($post_id, self::FAQ_META_KEY, $new_value, $previous_value);
 		}
 
 		return array(
 			'status'  => 'success',
-			'message' => __( 'Faq Items updated successfully', 'wordlift' ),
+			'message' => __('Faq Items updated successfully', 'wordlift'),
 		);
 
 	}
@@ -171,11 +171,11 @@ 
 	 *
 	 * @return array Associative array whether the faq item is deleted or not.
 	 */
-	public static function delete_faq_items( $request ) {
+	public static function delete_faq_items($request) {
 		$post_data = $request->get_params();
 		$post_id   = $post_data['post_id'];
 		$faq_items = $post_data['faq_items'];
-		foreach ( $faq_items as $faq_item ) {
+		foreach ($faq_items as $faq_item) {
 			/**
 			 * Note: the order of keys is important in order to delete it properly
 			 * If the order change, delete operation will fail since it is converted
@@ -192,17 +192,17 @@ 
 			 * If the field to be deleted is answer, then don't delete the faq item,
 			 * if it is question then delete the faq item.
 			 */
-			if ( self::ANSWER === $faq_item['field_to_be_deleted'] ) {
+			if (self::ANSWER === $faq_item['field_to_be_deleted']) {
 				$previous_value = $deleted_faq_item;
 				// then don't delete the faq item, set the answer as empty.
 				$deleted_faq_item['answer'] = '';
 				$new_value                  = $deleted_faq_item;
-				update_post_meta( $post_id, self::FAQ_META_KEY, $new_value, $previous_value );
-			} elseif ( self::QUESTION === $faq_item['field_to_be_deleted'] ) {
+				update_post_meta($post_id, self::FAQ_META_KEY, $new_value, $previous_value);
+			} elseif (self::QUESTION === $faq_item['field_to_be_deleted']) {
 				/**
 				 * If the question is deleted, then delete the faq item.
 				 */
-				delete_post_meta( $post_id, self::FAQ_META_KEY, $deleted_faq_item );
+				delete_post_meta($post_id, self::FAQ_META_KEY, $deleted_faq_item);
 			}
 		}
 
@@ -211,7 +211,7 @@ 
 		 */
 		return array(
 			'status'  => 'success',
-			'message' => __( 'Faq item successfully deleted.', 'wordlift' ),
+			'message' => __('Faq item successfully deleted.', 'wordlift'),
 		);
 	}
 
@@ -222,18 +222,18 @@ 
 	 *
 	 * @return array Associative array whether the faq item is inserted or not
 	 */
-	public static function add_faq_items( $request ) {
+	public static function add_faq_items($request) {
 		$post_data = $request->get_params();
 		$post_id   = $post_data['post_id'];
 		$faq_items = $post_data['faq_items'];
-		foreach ( $faq_items as &$faq_item ) {
+		foreach ($faq_items as &$faq_item) {
 			// Add an identifier id to the faq item, it helps to prevent duplication problem.
 			/**
 			 * We are using time() and a random integer to prevent
 			 * duplication problem.
 			 */
-			$faq_item['id'] = time() + wp_rand( 1, 100 ) + wp_rand( 1, 100 );
-			add_post_meta( (int) $post_id, self::FAQ_META_KEY, $faq_item );
+			$faq_item['id'] = time() + wp_rand(1, 100) + wp_rand(1, 100);
+			add_post_meta((int) $post_id, self::FAQ_META_KEY, $faq_item);
 		}
 
 		/**
@@ -241,7 +241,7 @@ 
 		 */
 		return array(
 			'status'  => 'success',
-			'message' => __( 'Question successfully added.', 'wordlift' ),
+			'message' => __('Question successfully added.', 'wordlift'),
 			'id'      => (int) $faq_items[0]['id'],
 		);
 

src/wordlift/faq/class-faq-tinymce-adapter.php

Indentation +36 added lines, -36 removed lines

@@ -13,41 +13,41 @@
 
 class Faq_Tinymce_Adapter {
 
-	const FAQ_TINYMCE_PLUGIN_NAME = 'wl_faq_tinymce';
-
-	const FAQ_TINYMCE_ADD_BUTTON_ID = 'wl-faq-toolbar-button';
-
-	/**
-	 * Add a list of custom tags which is to be used by our highlighting program.
-	 *
-	 * @param $init_array
-	 *
-	 * @return array
-	 */
-	public function register_custom_tags( $init_array ) {
-		$opts                                   = '~wl-faq-question,~wl-faq-answer';
-		$init_array['custom_elements']         .= ( empty( $init_array['custom_elements'] ) ? '' : ',' ) . $opts;
-		$init_array['extended_valid_elements'] .= ( empty( $init_array['extended_valid_elements'] ) ? '' : ',' ) . $opts;
-
-		return $init_array;
-	}
-
-	public function register_faq_tinymce_plugin( $plugins ) {
-		/**
-		 * Registering the tinymce plugin for FAQ here.
-		 *
-		 * @since 3.26.0
-		 */
-		$version                                  = Wordlift::get_instance()->get_version();
-		$plugins[ self::FAQ_TINYMCE_PLUGIN_NAME ] = plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/tinymce-faq-plugin.full.js?ver=' . $version;
-
-		return $plugins;
-	}
-
-	public function register_faq_toolbar_button( $buttons ) {
-		array_push( $buttons, self::FAQ_TINYMCE_ADD_BUTTON_ID );
-
-		return $buttons;
-	}
+    const FAQ_TINYMCE_PLUGIN_NAME = 'wl_faq_tinymce';
+
+    const FAQ_TINYMCE_ADD_BUTTON_ID = 'wl-faq-toolbar-button';
+
+    /**
+     * Add a list of custom tags which is to be used by our highlighting program.
+     *
+     * @param $init_array
+     *
+     * @return array
+     */
+    public function register_custom_tags( $init_array ) {
+        $opts                                   = '~wl-faq-question,~wl-faq-answer';
+        $init_array['custom_elements']         .= ( empty( $init_array['custom_elements'] ) ? '' : ',' ) . $opts;
+        $init_array['extended_valid_elements'] .= ( empty( $init_array['extended_valid_elements'] ) ? '' : ',' ) . $opts;
+
+        return $init_array;
+    }
+
+    public function register_faq_tinymce_plugin( $plugins ) {
+        /**
+         * Registering the tinymce plugin for FAQ here.
+         *
+         * @since 3.26.0
+         */
+        $version                                  = Wordlift::get_instance()->get_version();
+        $plugins[ self::FAQ_TINYMCE_PLUGIN_NAME ] = plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/tinymce-faq-plugin.full.js?ver=' . $version;
+
+        return $plugins;
+    }
+
+    public function register_faq_toolbar_button( $buttons ) {
+        array_push( $buttons, self::FAQ_TINYMCE_ADD_BUTTON_ID );
+
+        return $buttons;
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -24,28 +24,28 @@
 	 *
 	 * @return array
 	 */
-	public function register_custom_tags( $init_array ) {
+	public function register_custom_tags($init_array) {
 		$opts                                   = '~wl-faq-question,~wl-faq-answer';
-		$init_array['custom_elements']         .= ( empty( $init_array['custom_elements'] ) ? '' : ',' ) . $opts;
-		$init_array['extended_valid_elements'] .= ( empty( $init_array['extended_valid_elements'] ) ? '' : ',' ) . $opts;
+		$init_array['custom_elements']         .= (empty($init_array['custom_elements']) ? '' : ',').$opts;
+		$init_array['extended_valid_elements'] .= (empty($init_array['extended_valid_elements']) ? '' : ',').$opts;
 
 		return $init_array;
 	}
 
-	public function register_faq_tinymce_plugin( $plugins ) {
+	public function register_faq_tinymce_plugin($plugins) {
 		/**
 		 * Registering the tinymce plugin for FAQ here.
 		 *
 		 * @since 3.26.0
 		 */
 		$version                                  = Wordlift::get_instance()->get_version();
-		$plugins[ self::FAQ_TINYMCE_PLUGIN_NAME ] = plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/tinymce-faq-plugin.full.js?ver=' . $version;
+		$plugins[self::FAQ_TINYMCE_PLUGIN_NAME] = plugin_dir_url(dirname(__DIR__)).'js/dist/tinymce-faq-plugin.full.js?ver='.$version;
 
 		return $plugins;
 	}
 
-	public function register_faq_toolbar_button( $buttons ) {
-		array_push( $buttons, self::FAQ_TINYMCE_ADD_BUTTON_ID );
+	public function register_faq_toolbar_button($buttons) {
+		array_push($buttons, self::FAQ_TINYMCE_ADD_BUTTON_ID);
 
 		return $buttons;
 	}

src/wordlift/cleanup/class-post-handler.php

Indentation +65 added lines, -65 removed lines

@@ -14,70 +14,70 @@
 
 class Post_Handler {
 
-	/**
-	 * Process post.
-	 *
-	 * @param int $post_id
-	 */
-	public static function fix( $post_id ) {
-		// 3 cases:
-		// 1. item id w/o the base URI: itemid="/entity/marketing"
-		// 2. item id w/ domain outside the scope of dataset URI: itemid="https://data.wordlift.io/wl95583/entity/emailing"
-		// 3. item id w/ domain within the scope of the dataset URI, but non existent.
-		// 4. should we manipulate also the `wp:wordlift/classification` block?
-
-		$post             = get_post( $post_id );
-		$new_post_content = preg_replace_callback(
-			'@<(\w+)[^<]*class="([^"]*)"\sitemid="([^"]+)"[^>]*>(.*?)</\1>@i',
-			array( get_class(), 'fix_annotations' ),
-			$post->post_content,
-			- 1,
-			$count
-		);
-
-		if ( 0 === $count || $new_post_content === $post->post_content ) {
-			// Bail out if the regex doesn't match or if the post content didn't change.
-			return;
-		}
-
-		wp_update_post(
-			array(
-				'ID'           => $post_id,
-				'post_content' => $new_post_content,
-			)
-		);
-
-	}
-
-	public static function fix_annotations( $args ) {
-		// Make the item id relative.
-		if ( 0 === preg_match( '@(?:https?://[^/]+/[^/]+)?/?(.*)@', $args[3], $matches ) ) {
-			return $args[4];
-		}
-
-		$item_id = $matches[1];
-
-		// Bail out if the item id is empty.
-		if ( empty( $item_id ) ) {
-			return $args[4];
-		}
-
-		// Find a matching content.
-		$content_service = Wordpress_Content_Service::get_instance();
-		$content         = $content_service->get_by_entity_id_or_same_as( $item_id );
-
-		if ( ! isset( $content ) ) {
-			// No content found return only label.
-			return $args[4];
-		} else {
-			// Get the actual entity id.
-			$new_item_id = $content_service->get_entity_id(
-				new Wordpress_Content_Id( $content->get_id(), $content->get_object_type_enum() )
-			);
-
-			// Replace the incoming entity id with the actual entity id.
-			return str_replace( $args[3], $new_item_id, $args[0] );
-		}
-	}
+    /**
+     * Process post.
+     *
+     * @param int $post_id
+     */
+    public static function fix( $post_id ) {
+        // 3 cases:
+        // 1. item id w/o the base URI: itemid="/entity/marketing"
+        // 2. item id w/ domain outside the scope of dataset URI: itemid="https://data.wordlift.io/wl95583/entity/emailing"
+        // 3. item id w/ domain within the scope of the dataset URI, but non existent.
+        // 4. should we manipulate also the `wp:wordlift/classification` block?
+
+        $post             = get_post( $post_id );
+        $new_post_content = preg_replace_callback(
+            '@<(\w+)[^<]*class="([^"]*)"\sitemid="([^"]+)"[^>]*>(.*?)</\1>@i',
+            array( get_class(), 'fix_annotations' ),
+            $post->post_content,
+            - 1,
+            $count
+        );
+
+        if ( 0 === $count || $new_post_content === $post->post_content ) {
+            // Bail out if the regex doesn't match or if the post content didn't change.
+            return;
+        }
+
+        wp_update_post(
+            array(
+                'ID'           => $post_id,
+                'post_content' => $new_post_content,
+            )
+        );
+
+    }
+
+    public static function fix_annotations( $args ) {
+        // Make the item id relative.
+        if ( 0 === preg_match( '@(?:https?://[^/]+/[^/]+)?/?(.*)@', $args[3], $matches ) ) {
+            return $args[4];
+        }
+
+        $item_id = $matches[1];
+
+        // Bail out if the item id is empty.
+        if ( empty( $item_id ) ) {
+            return $args[4];
+        }
+
+        // Find a matching content.
+        $content_service = Wordpress_Content_Service::get_instance();
+        $content         = $content_service->get_by_entity_id_or_same_as( $item_id );
+
+        if ( ! isset( $content ) ) {
+            // No content found return only label.
+            return $args[4];
+        } else {
+            // Get the actual entity id.
+            $new_item_id = $content_service->get_entity_id(
+                new Wordpress_Content_Id( $content->get_id(), $content->get_object_type_enum() )
+            );
+
+            // Replace the incoming entity id with the actual entity id.
+            return str_replace( $args[3], $new_item_id, $args[0] );
+        }
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -19,23 +19,23 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public static function fix( $post_id ) {
+	public static function fix($post_id) {
 		// 3 cases:
 		// 1. item id w/o the base URI: itemid="/entity/marketing"
 		// 2. item id w/ domain outside the scope of dataset URI: itemid="https://data.wordlift.io/wl95583/entity/emailing"
 		// 3. item id w/ domain within the scope of the dataset URI, but non existent.
 		// 4. should we manipulate also the `wp:wordlift/classification` block?
 
-		$post             = get_post( $post_id );
+		$post             = get_post($post_id);
 		$new_post_content = preg_replace_callback(
 			'@<(\w+)[^<]*class="([^"]*)"\sitemid="([^"]+)"[^>]*>(.*?)</\1>@i',
-			array( get_class(), 'fix_annotations' ),
+			array(get_class(), 'fix_annotations'),
 			$post->post_content,
 			- 1,
 			$count
 		);
 
-		if ( 0 === $count || $new_post_content === $post->post_content ) {
+		if (0 === $count || $new_post_content === $post->post_content) {
 			// Bail out if the regex doesn't match or if the post content didn't change.
 			return;
 		}
@@ -49,34 +49,34 @@ 
 
 	}
 
-	public static function fix_annotations( $args ) {
+	public static function fix_annotations($args) {
 		// Make the item id relative.
-		if ( 0 === preg_match( '@(?:https?://[^/]+/[^/]+)?/?(.*)@', $args[3], $matches ) ) {
+		if (0 === preg_match('@(?:https?://[^/]+/[^/]+)?/?(.*)@', $args[3], $matches)) {
 			return $args[4];
 		}
 
 		$item_id = $matches[1];
 
 		// Bail out if the item id is empty.
-		if ( empty( $item_id ) ) {
+		if (empty($item_id)) {
 			return $args[4];
 		}
 
 		// Find a matching content.
 		$content_service = Wordpress_Content_Service::get_instance();
-		$content         = $content_service->get_by_entity_id_or_same_as( $item_id );
+		$content         = $content_service->get_by_entity_id_or_same_as($item_id);
 
-		if ( ! isset( $content ) ) {
+		if ( ! isset($content)) {
 			// No content found return only label.
 			return $args[4];
 		} else {
 			// Get the actual entity id.
 			$new_item_id = $content_service->get_entity_id(
-				new Wordpress_Content_Id( $content->get_id(), $content->get_object_type_enum() )
+				new Wordpress_Content_Id($content->get_id(), $content->get_object_type_enum())
 			);
 
 			// Replace the incoming entity id with the actual entity id.
-			return str_replace( $args[3], $new_item_id, $args[0] );
+			return str_replace($args[3], $new_item_id, $args[0]);
 		}
 	}
 

src/wordlift/http/class-cacheable-http-client.php

Indentation +107 added lines, -107 removed lines

@@ -15,112 +15,112 @@
 // @@todo: add a hook to clear the cached files now and then.
 class Cacheable_Http_Client extends Simple_Http_Client {
 
-	/**
-	 * The TTL of cached responses in seconds.
-	 *
-	 * @var int $ttl The TTL in seconds.
-	 * @access private
-	 * @since 1.0.0
-	 */
-	private $ttl;
-
-	/**
-	 * The cache dir where the cached responses are written.
-	 *
-	 * @since 1.0.0
-	 * @access private
-	 * @var string $cache_dir The cache dir where the cached responses are written.
-	 */
-	private $cache_dir;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 * @access private
-	 * @since 1.0.0
-	 */
-	private $log;
-
-	/**
-	 * Create a {@link Cacheable_Http_Client} with the specified TTL, default 900 secs.
-	 *
-	 * @param int $ttl The cache TTL, default 900 secs.
-	 *
-	 * @since 1.0.0
-	 */
-	public function __construct( $ttl = 900 ) {
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->ttl = $ttl;
-
-		// Get the temp dir and add the directory separator if missing.
-		$temp_dir = get_temp_dir();
-		if ( DIRECTORY_SEPARATOR !== substr( $temp_dir, - strlen( DIRECTORY_SEPARATOR ) ) ) {
-			$temp_dir .= DIRECTORY_SEPARATOR;
-		}
-		$this->cache_dir = $temp_dir . 'wlfb-http-cache';
-
-		$this->log->trace( "Creating the cache folder {$this->cache_dir}..." );
-		wp_mkdir_p( $this->cache_dir );
-
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function request( $url, $options = array() ) {
-
-		// Create a hash and a path to the cache file.
-		// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
-		$hash     = md5( $url ) . '-' . md5( serialize( $options ) );
-		$filename = $this->get_path( $hash );
-
-		// If the cache file exists and it's not too old, then return it.
-		if ( file_exists( $filename ) && $this->ttl >= time() - filemtime( $filename ) ) {
-			$this->log->trace( "Cache HIT.\n" );
-
-			// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
-			return json_decode( file_get_contents( $filename ), true );
-		}
-
-		$this->log->trace( "Cache MISS for URL $url, hash $hash.\n" );
-
-		// Get a fresh response and return it.
-		$response = parent::request( $url, $options );
-
-		// Return immediately, do not cache.
-		if ( is_wp_error( $response ) ) {
-			return $response;
-		}
-
-		// Do not cache response with invalid status codes or status code different from 2xx.
-		$code = wp_remote_retrieve_response_code( $response );
-		if ( ! is_numeric( $code ) || 2 !== intval( $code ) / 100 ) {
-			return $response;
-		}
-
-		// Cache.
-		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@unlink( $filename );
-		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged,WordPress.WP.AlternativeFunctions.json_encode_json_encode,WordPress.WP.AlternativeFunctions.file_system_read_file_put_contents
-		@file_put_contents( $filename, json_encode( $response ) );
-
-		return $response;
-	}
-
-	/**
-	 * Get the full path for the given `$hash`. The file is not checked for its existence.
-	 *
-	 * @param string $hash A file hash.
-	 *
-	 * @return string The full path to the file.
-	 * @since 1.0.0
-	 */
-	private function get_path( $hash ) {
-
-		return $this->cache_dir . DIRECTORY_SEPARATOR . $hash;
-	}
+    /**
+     * The TTL of cached responses in seconds.
+     *
+     * @var int $ttl The TTL in seconds.
+     * @access private
+     * @since 1.0.0
+     */
+    private $ttl;
+
+    /**
+     * The cache dir where the cached responses are written.
+     *
+     * @since 1.0.0
+     * @access private
+     * @var string $cache_dir The cache dir where the cached responses are written.
+     */
+    private $cache_dir;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     * @access private
+     * @since 1.0.0
+     */
+    private $log;
+
+    /**
+     * Create a {@link Cacheable_Http_Client} with the specified TTL, default 900 secs.
+     *
+     * @param int $ttl The cache TTL, default 900 secs.
+     *
+     * @since 1.0.0
+     */
+    public function __construct( $ttl = 900 ) {
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->ttl = $ttl;
+
+        // Get the temp dir and add the directory separator if missing.
+        $temp_dir = get_temp_dir();
+        if ( DIRECTORY_SEPARATOR !== substr( $temp_dir, - strlen( DIRECTORY_SEPARATOR ) ) ) {
+            $temp_dir .= DIRECTORY_SEPARATOR;
+        }
+        $this->cache_dir = $temp_dir . 'wlfb-http-cache';
+
+        $this->log->trace( "Creating the cache folder {$this->cache_dir}..." );
+        wp_mkdir_p( $this->cache_dir );
+
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function request( $url, $options = array() ) {
+
+        // Create a hash and a path to the cache file.
+        // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
+        $hash     = md5( $url ) . '-' . md5( serialize( $options ) );
+        $filename = $this->get_path( $hash );
+
+        // If the cache file exists and it's not too old, then return it.
+        if ( file_exists( $filename ) && $this->ttl >= time() - filemtime( $filename ) ) {
+            $this->log->trace( "Cache HIT.\n" );
+
+            // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
+            return json_decode( file_get_contents( $filename ), true );
+        }
+
+        $this->log->trace( "Cache MISS for URL $url, hash $hash.\n" );
+
+        // Get a fresh response and return it.
+        $response = parent::request( $url, $options );
+
+        // Return immediately, do not cache.
+        if ( is_wp_error( $response ) ) {
+            return $response;
+        }
+
+        // Do not cache response with invalid status codes or status code different from 2xx.
+        $code = wp_remote_retrieve_response_code( $response );
+        if ( ! is_numeric( $code ) || 2 !== intval( $code ) / 100 ) {
+            return $response;
+        }
+
+        // Cache.
+        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+        @unlink( $filename );
+        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged,WordPress.WP.AlternativeFunctions.json_encode_json_encode,WordPress.WP.AlternativeFunctions.file_system_read_file_put_contents
+        @file_put_contents( $filename, json_encode( $response ) );
+
+        return $response;
+    }
+
+    /**
+     * Get the full path for the given `$hash`. The file is not checked for its existence.
+     *
+     * @param string $hash A file hash.
+     *
+     * @return string The full path to the file.
+     * @since 1.0.0
+     */
+    private function get_path( $hash ) {
+
+        return $this->cache_dir . DIRECTORY_SEPARATOR . $hash;
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -49,63 +49,63 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function __construct( $ttl = 900 ) {
+	public function __construct($ttl = 900) {
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 		$this->ttl = $ttl;
 
 		// Get the temp dir and add the directory separator if missing.
 		$temp_dir = get_temp_dir();
-		if ( DIRECTORY_SEPARATOR !== substr( $temp_dir, - strlen( DIRECTORY_SEPARATOR ) ) ) {
+		if (DIRECTORY_SEPARATOR !== substr($temp_dir, - strlen(DIRECTORY_SEPARATOR))) {
 			$temp_dir .= DIRECTORY_SEPARATOR;
 		}
-		$this->cache_dir = $temp_dir . 'wlfb-http-cache';
+		$this->cache_dir = $temp_dir.'wlfb-http-cache';
 
-		$this->log->trace( "Creating the cache folder {$this->cache_dir}..." );
-		wp_mkdir_p( $this->cache_dir );
+		$this->log->trace("Creating the cache folder {$this->cache_dir}...");
+		wp_mkdir_p($this->cache_dir);
 
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function request( $url, $options = array() ) {
+	public function request($url, $options = array()) {
 
 		// Create a hash and a path to the cache file.
 		// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
-		$hash     = md5( $url ) . '-' . md5( serialize( $options ) );
-		$filename = $this->get_path( $hash );
+		$hash     = md5($url).'-'.md5(serialize($options));
+		$filename = $this->get_path($hash);
 
 		// If the cache file exists and it's not too old, then return it.
-		if ( file_exists( $filename ) && $this->ttl >= time() - filemtime( $filename ) ) {
-			$this->log->trace( "Cache HIT.\n" );
+		if (file_exists($filename) && $this->ttl >= time() - filemtime($filename)) {
+			$this->log->trace("Cache HIT.\n");
 
 			// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
-			return json_decode( file_get_contents( $filename ), true );
+			return json_decode(file_get_contents($filename), true);
 		}
 
-		$this->log->trace( "Cache MISS for URL $url, hash $hash.\n" );
+		$this->log->trace("Cache MISS for URL $url, hash $hash.\n");
 
 		// Get a fresh response and return it.
-		$response = parent::request( $url, $options );
+		$response = parent::request($url, $options);
 
 		// Return immediately, do not cache.
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			return $response;
 		}
 
 		// Do not cache response with invalid status codes or status code different from 2xx.
-		$code = wp_remote_retrieve_response_code( $response );
-		if ( ! is_numeric( $code ) || 2 !== intval( $code ) / 100 ) {
+		$code = wp_remote_retrieve_response_code($response);
+		if ( ! is_numeric($code) || 2 !== intval($code) / 100) {
 			return $response;
 		}
 
 		// Cache.
 		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-		@unlink( $filename );
+		@unlink($filename);
 		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged,WordPress.WP.AlternativeFunctions.json_encode_json_encode,WordPress.WP.AlternativeFunctions.file_system_read_file_put_contents
-		@file_put_contents( $filename, json_encode( $response ) );
+		@file_put_contents($filename, json_encode($response));
 
 		return $response;
 	}
@@ -118,9 +118,9 @@ 
 	 * @return string The full path to the file.
 	 * @since 1.0.0
 	 */
-	private function get_path( $hash ) {
+	private function get_path($hash) {
 
-		return $this->cache_dir . DIRECTORY_SEPARATOR . $hash;
+		return $this->cache_dir.DIRECTORY_SEPARATOR.$hash;
 	}
 
 }

src/wordlift/http/class-http-client.php

Indentation +20 added lines, -20 removed lines

@@ -15,26 +15,26 @@
  */
 interface Http_Client {
 
-	/**
-	 * Perform a `GET` operation to the specified `$url`.
-	 *
-	 * @param string $url The URL.
-	 * @param array  $options An array of options to pass to WordPress {@link wp_remote_request} function, default: array().
-	 *
-	 * @return \WP_Error|array The response or WP_Error on failure.
-	 * @since 1.0.0
-	 */
-	public function get( $url, $options = array() );
+    /**
+     * Perform a `GET` operation to the specified `$url`.
+     *
+     * @param string $url The URL.
+     * @param array  $options An array of options to pass to WordPress {@link wp_remote_request} function, default: array().
+     *
+     * @return \WP_Error|array The response or WP_Error on failure.
+     * @since 1.0.0
+     */
+    public function get( $url, $options = array() );
 
-	/**
-	 * Perform a request to the specified `$url`.
-	 *
-	 * @param string $url The URL.
-	 * @param array  $options An array of options to pass to WordPress {@link wp_remote_request} function, default: array().
-	 *
-	 * @return \WP_Error|array The response or WP_Error on failure.
-	 * @since 1.0.0
-	 */
-	public function request( $url, $options = array() );
+    /**
+     * Perform a request to the specified `$url`.
+     *
+     * @param string $url The URL.
+     * @param array  $options An array of options to pass to WordPress {@link wp_remote_request} function, default: array().
+     *
+     * @return \WP_Error|array The response or WP_Error on failure.
+     * @since 1.0.0
+     */
+    public function request( $url, $options = array() );
 
 }

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 	 * @return \WP_Error|array The response or WP_Error on failure.
 	 * @since 1.0.0
 	 */
-	public function get( $url, $options = array() );
+	public function get($url, $options = array());
 
 	/**
 	 * Perform a request to the specified `$url`.
@@ -35,6 +35,6 @@ 
 	 * @return \WP_Error|array The response or WP_Error on failure.
 	 * @since 1.0.0
 	 */
-	public function request( $url, $options = array() );
+	public function request($url, $options = array());
 
 }

src/wordlift/entity-type/class-entity-type-change-handler.php

Indentation +54 added lines, -54 removed lines

@@ -14,59 +14,59 @@
 use Wordlift_Entity_Type_Taxonomy_Service;
 
 class Entity_Type_Change_Handler {
-	/**
-	 * @var Wordlift_Entity_Service
-	 */
-	private $entity_service;
-	/**
-	 * @var Wordlift_Entity_Type_Service
-	 */
-	private $entity_type_service;
-
-	/**
-	 * Entity_Type_Change_Handler constructor.
-	 *
-	 * @param $entity_service Wordlift_Entity_Service
-	 * @param $entity_type_service Wordlift_Entity_Type_Service
-	 */
-	public function __construct( $entity_service, $entity_type_service ) {
-
-		$this->entity_service = $entity_service;
-
-		$this->entity_type_service = $entity_type_service;
-
-		// Takes a performance toll, do we really need it?
-		// add_action( 'set_object_terms', array( $this, 'set_object_terms' ), 10, 4 );
-	}
-
-	public function set_object_terms( $object_id, $terms, $tt_ids, $taxonomy ) {
-
-		if ( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $taxonomy ) {
-			return;
-		}
-
-		if ( count( $terms ) !== 1 ) {
-			// Unable to determine which entity type or multiple entity types.
-			return;
-		}
-
-		// This taxonomy is registered only for post, so the object id would
-		// be the post id.
-		$types = $this->entity_type_service->get_names( $object_id );
-
-		if ( count( $types ) !== 1 ) {
-			// Unable to determine which entity type or multiple entity types.
-			return;
-		}
-
-		// Check if set to Article or one of its descendants
-		if ( ! in_array( $types[0], Jsonld_Article_Wrapper::$article_types, true ) ) {
-			return;
-		}
-
-		// clear the labels.
-		$this->entity_service->set_alternative_labels( $object_id, array() );
-
-	}
+    /**
+     * @var Wordlift_Entity_Service
+     */
+    private $entity_service;
+    /**
+     * @var Wordlift_Entity_Type_Service
+     */
+    private $entity_type_service;
+
+    /**
+     * Entity_Type_Change_Handler constructor.
+     *
+     * @param $entity_service Wordlift_Entity_Service
+     * @param $entity_type_service Wordlift_Entity_Type_Service
+     */
+    public function __construct( $entity_service, $entity_type_service ) {
+
+        $this->entity_service = $entity_service;
+
+        $this->entity_type_service = $entity_type_service;
+
+        // Takes a performance toll, do we really need it?
+        // add_action( 'set_object_terms', array( $this, 'set_object_terms' ), 10, 4 );
+    }
+
+    public function set_object_terms( $object_id, $terms, $tt_ids, $taxonomy ) {
+
+        if ( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $taxonomy ) {
+            return;
+        }
+
+        if ( count( $terms ) !== 1 ) {
+            // Unable to determine which entity type or multiple entity types.
+            return;
+        }
+
+        // This taxonomy is registered only for post, so the object id would
+        // be the post id.
+        $types = $this->entity_type_service->get_names( $object_id );
+
+        if ( count( $types ) !== 1 ) {
+            // Unable to determine which entity type or multiple entity types.
+            return;
+        }
+
+        // Check if set to Article or one of its descendants
+        if ( ! in_array( $types[0], Jsonld_Article_Wrapper::$article_types, true ) ) {
+            return;
+        }
+
+        // clear the labels.
+        $this->entity_service->set_alternative_labels( $object_id, array() );
+
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param $entity_service Wordlift_Entity_Service
 	 * @param $entity_type_service Wordlift_Entity_Type_Service
 	 */
-	public function __construct( $entity_service, $entity_type_service ) {
+	public function __construct($entity_service, $entity_type_service) {
 
 		$this->entity_service = $entity_service;
 
@@ -39,33 +39,33 @@ 
 		// add_action( 'set_object_terms', array( $this, 'set_object_terms' ), 10, 4 );
 	}
 
-	public function set_object_terms( $object_id, $terms, $tt_ids, $taxonomy ) {
+	public function set_object_terms($object_id, $terms, $tt_ids, $taxonomy) {
 
-		if ( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $taxonomy ) {
+		if (Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $taxonomy) {
 			return;
 		}
 
-		if ( count( $terms ) !== 1 ) {
+		if (count($terms) !== 1) {
 			// Unable to determine which entity type or multiple entity types.
 			return;
 		}
 
 		// This taxonomy is registered only for post, so the object id would
 		// be the post id.
-		$types = $this->entity_type_service->get_names( $object_id );
+		$types = $this->entity_type_service->get_names($object_id);
 
-		if ( count( $types ) !== 1 ) {
+		if (count($types) !== 1) {
 			// Unable to determine which entity type or multiple entity types.
 			return;
 		}
 
 		// Check if set to Article or one of its descendants
-		if ( ! in_array( $types[0], Jsonld_Article_Wrapper::$article_types, true ) ) {
+		if ( ! in_array($types[0], Jsonld_Article_Wrapper::$article_types, true)) {
 			return;
 		}
 
 		// clear the labels.
-		$this->entity_service->set_alternative_labels( $object_id, array() );
+		$this->entity_service->set_alternative_labels($object_id, array());
 
 	}
 

src/wordlift/entity-type/class-entity-type-setter.php

Indentation +203 added lines, -203 removed lines

@@ -10,208 +10,208 @@
 
 class Entity_Type_Setter {
 
-	const STARTER_PLAN = 'entity-types-starter';
-
-	const PROFESSIONAL_PLAN = 'entity-types-professional';
-
-	const BUSINESS_PLAN = 'entity-types-business';
-
-	public function __construct() {
-		add_action(
-			'wl_feature__change__entity-types-starter',
-			array(
-				$this,
-				'wl_entity_types_feature_changed',
-			),
-			10,
-			3
-		);
-		add_action(
-			'wl_feature__change__entity-types-professional',
-			array(
-				$this,
-				'wl_entity_types_feature_changed',
-			),
-			10,
-			3
-		);
-		add_action(
-			'wl_feature__change__entity-types-business',
-			array(
-				$this,
-				'wl_entity_types_feature_changed',
-			),
-			10,
-			3
-		);
-	}
-
-	public function wl_entity_types_feature_changed( $new_value, $old_value, $feature_slug ) {
-
-		// If the entity types is not set by server, then return early.
-		if ( ! $new_value ) {
-			return;
-		}
-
-		$entity_types_data = self::get_entity_types_by_feature_flag( $feature_slug );
-
-		// If we dont have entity types returned, then dont reset the entity types, return early.
-		if ( ! $entity_types_data ) {
-			return;
-		}
-		// Repopulate the ones returned by package type.
-		foreach ( $entity_types_data as $entity_type_data ) {
-
-			$schema_label = $entity_type_data['label'];
-
-			$term_exists = get_term_by( 'name', $schema_label, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) instanceof \WP_Term;
-
-			if ( $term_exists ) {
-				// Dont create term if it already exists.
-				continue;
-			}
-
-			$term_data = wp_insert_term(
-				$schema_label,
-				Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				array(
-					'description' => $entity_type_data['description'],
-					'slug'        => $entity_type_data['slug'],
-				)
-			);
-
-			$term_id = $term_data['term_id'];
-
-			update_term_meta( $term_id, '_wl_uri', 'http://schema.org/' . $schema_label );
-			update_term_meta( $term_id, '_wl_name', $schema_label );
-		}
-
-	}
-
-	public static function get_starter_entity_types() {
-		return array(
-			array(
-				'label'       => 'Person',
-				'description' => 'A person (or a music artist).',
-				'slug'        => 'person',
-			),
-			array(
-				'label'       => 'Thing',
-				'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
-				'slug'        => 'thing',
-			),
-
-			array(
-				'label'       => 'Place',
-				'description' => 'A place.',
-				'slug'        => 'place',
-			),
-
-			array(
-				'label'       => 'CreativeWork',
-				'description' => 'A creative work (or a Music Album).',
-				'slug'        => 'creative-work',
-			),
-			array(
-				'label'       => 'Organization',
-				'description' => 'An organization, including a government or a newspaper.',
-				'slug'        => 'organization',
-			),
-
-			array(
-				'label'       => 'Article',
-				'description' => 'An article, such as a news article or piece of investigative report. Newspapers and magazines have articles of many different types and this is intended to cover them all.',
-				'slug'        => 'article',
-			),
-
-			array(
-				'label'       => 'WebSite',
-				'description' => 'A WebSite is a set of related web pages and other items typically served from a single web domain and accessible via URLs.',
-				'slug'        => 'web-site',
-			),
-
-			array(
-				'label'       => 'NewsArticle',
-				'description' => 'A NewsArticle is an article whose content reports news, or provides background context and supporting materials for understanding the news.',
-				'slug'        => 'news-article',
-			),
-
-			array(
-				'label'       => 'AboutPage',
-				'description' => 'An About page.',
-				'slug'        => 'about-page',
-			),
-
-			array(
-				'label'       => 'ContactPage',
-				'description' => 'A Contact Page.',
-				'slug'        => 'contact-page',
-			),
-
-		);
-	}
-
-	public static function get_professional_entity_types() {
-		return array(
-
-			array(
-				'label'       => 'FAQPage',
-				'description' => 'A FAQPage is a WebPage presenting one or more "Frequently asked questions".',
-				'slug'        => 'faq-page',
-			),
-			array(
-				'label'       => 'LocalBusiness',
-				'description' => 'A particular physical business or branch of an organization. Examples of LocalBusiness include a restaurant, a particular branch of a restaurant chain, a branch of a bank, a medical practice, a club, a bowling alley, etc.',
-				'slug'        => 'local-business',
-
-			),
-			array(
-				'label'       => 'Recipe',
-				'description' => 'A recipe',
-				'slug'        => 'recipe',
-			),
-			array(
-				'label'       => 'PodcastEpisode',
-				'description' => 'A single episode of a podcast series.',
-				'slug'        => 'podcast-episode',
-			),
-			array(
-				'label'       => 'Course',
-				'description' => 'A description of an educational course which may be offered as distinct instances at which take place at different times or take place at different locations, or be offered through different media or modes of study.',
-				'slug'        => 'course',
-			),
-			array(
-				'label'       => 'Event',
-				'description' => 'An event happening at a certain time and location, such as a concert, lecture, or festival.',
-				'slug'        => 'event',
-			),
-			array(
-				'label'       => 'Review',
-				'description' => 'A review of an item - for example, of a restaurant, movie, or store.',
-				'slug'        => 'review',
-			),
-
-		);
-	}
-
-	private static function get_entity_types_by_feature_flag( $package_type ) {
-
-		switch ( $package_type ) {
-			case self::STARTER_PLAN:
-				return self::get_starter_entity_types();
-			case self::BUSINESS_PLAN:
-			case self::PROFESSIONAL_PLAN:
-				// We return same entity types for professional and business plans.
-				// Business plan should have sync schema ui feature enabled, to sync all the entity types.
-				return array_merge(
-					self::get_starter_entity_types(),
-					self::get_professional_entity_types()
-				);
-			default:
-				return array();
-
-		}
-
-	}
+    const STARTER_PLAN = 'entity-types-starter';
+
+    const PROFESSIONAL_PLAN = 'entity-types-professional';
+
+    const BUSINESS_PLAN = 'entity-types-business';
+
+    public function __construct() {
+        add_action(
+            'wl_feature__change__entity-types-starter',
+            array(
+                $this,
+                'wl_entity_types_feature_changed',
+            ),
+            10,
+            3
+        );
+        add_action(
+            'wl_feature__change__entity-types-professional',
+            array(
+                $this,
+                'wl_entity_types_feature_changed',
+            ),
+            10,
+            3
+        );
+        add_action(
+            'wl_feature__change__entity-types-business',
+            array(
+                $this,
+                'wl_entity_types_feature_changed',
+            ),
+            10,
+            3
+        );
+    }
+
+    public function wl_entity_types_feature_changed( $new_value, $old_value, $feature_slug ) {
+
+        // If the entity types is not set by server, then return early.
+        if ( ! $new_value ) {
+            return;
+        }
+
+        $entity_types_data = self::get_entity_types_by_feature_flag( $feature_slug );
+
+        // If we dont have entity types returned, then dont reset the entity types, return early.
+        if ( ! $entity_types_data ) {
+            return;
+        }
+        // Repopulate the ones returned by package type.
+        foreach ( $entity_types_data as $entity_type_data ) {
+
+            $schema_label = $entity_type_data['label'];
+
+            $term_exists = get_term_by( 'name', $schema_label, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) instanceof \WP_Term;
+
+            if ( $term_exists ) {
+                // Dont create term if it already exists.
+                continue;
+            }
+
+            $term_data = wp_insert_term(
+                $schema_label,
+                Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                array(
+                    'description' => $entity_type_data['description'],
+                    'slug'        => $entity_type_data['slug'],
+                )
+            );
+
+            $term_id = $term_data['term_id'];
+
+            update_term_meta( $term_id, '_wl_uri', 'http://schema.org/' . $schema_label );
+            update_term_meta( $term_id, '_wl_name', $schema_label );
+        }
+
+    }
+
+    public static function get_starter_entity_types() {
+        return array(
+            array(
+                'label'       => 'Person',
+                'description' => 'A person (or a music artist).',
+                'slug'        => 'person',
+            ),
+            array(
+                'label'       => 'Thing',
+                'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
+                'slug'        => 'thing',
+            ),
+
+            array(
+                'label'       => 'Place',
+                'description' => 'A place.',
+                'slug'        => 'place',
+            ),
+
+            array(
+                'label'       => 'CreativeWork',
+                'description' => 'A creative work (or a Music Album).',
+                'slug'        => 'creative-work',
+            ),
+            array(
+                'label'       => 'Organization',
+                'description' => 'An organization, including a government or a newspaper.',
+                'slug'        => 'organization',
+            ),
+
+            array(
+                'label'       => 'Article',
+                'description' => 'An article, such as a news article or piece of investigative report. Newspapers and magazines have articles of many different types and this is intended to cover them all.',
+                'slug'        => 'article',
+            ),
+
+            array(
+                'label'       => 'WebSite',
+                'description' => 'A WebSite is a set of related web pages and other items typically served from a single web domain and accessible via URLs.',
+                'slug'        => 'web-site',
+            ),
+
+            array(
+                'label'       => 'NewsArticle',
+                'description' => 'A NewsArticle is an article whose content reports news, or provides background context and supporting materials for understanding the news.',
+                'slug'        => 'news-article',
+            ),
+
+            array(
+                'label'       => 'AboutPage',
+                'description' => 'An About page.',
+                'slug'        => 'about-page',
+            ),
+
+            array(
+                'label'       => 'ContactPage',
+                'description' => 'A Contact Page.',
+                'slug'        => 'contact-page',
+            ),
+
+        );
+    }
+
+    public static function get_professional_entity_types() {
+        return array(
+
+            array(
+                'label'       => 'FAQPage',
+                'description' => 'A FAQPage is a WebPage presenting one or more "Frequently asked questions".',
+                'slug'        => 'faq-page',
+            ),
+            array(
+                'label'       => 'LocalBusiness',
+                'description' => 'A particular physical business or branch of an organization. Examples of LocalBusiness include a restaurant, a particular branch of a restaurant chain, a branch of a bank, a medical practice, a club, a bowling alley, etc.',
+                'slug'        => 'local-business',
+
+            ),
+            array(
+                'label'       => 'Recipe',
+                'description' => 'A recipe',
+                'slug'        => 'recipe',
+            ),
+            array(
+                'label'       => 'PodcastEpisode',
+                'description' => 'A single episode of a podcast series.',
+                'slug'        => 'podcast-episode',
+            ),
+            array(
+                'label'       => 'Course',
+                'description' => 'A description of an educational course which may be offered as distinct instances at which take place at different times or take place at different locations, or be offered through different media or modes of study.',
+                'slug'        => 'course',
+            ),
+            array(
+                'label'       => 'Event',
+                'description' => 'An event happening at a certain time and location, such as a concert, lecture, or festival.',
+                'slug'        => 'event',
+            ),
+            array(
+                'label'       => 'Review',
+                'description' => 'A review of an item - for example, of a restaurant, movie, or store.',
+                'slug'        => 'review',
+            ),
+
+        );
+    }
+
+    private static function get_entity_types_by_feature_flag( $package_type ) {
+
+        switch ( $package_type ) {
+            case self::STARTER_PLAN:
+                return self::get_starter_entity_types();
+            case self::BUSINESS_PLAN:
+            case self::PROFESSIONAL_PLAN:
+                // We return same entity types for professional and business plans.
+                // Business plan should have sync schema ui feature enabled, to sync all the entity types.
+                return array_merge(
+                    self::get_starter_entity_types(),
+                    self::get_professional_entity_types()
+                );
+            default:
+                return array();
+
+        }
+
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -46,27 +46,27 @@ 
 		);
 	}
 
-	public function wl_entity_types_feature_changed( $new_value, $old_value, $feature_slug ) {
+	public function wl_entity_types_feature_changed($new_value, $old_value, $feature_slug) {
 
 		// If the entity types is not set by server, then return early.
-		if ( ! $new_value ) {
+		if ( ! $new_value) {
 			return;
 		}
 
-		$entity_types_data = self::get_entity_types_by_feature_flag( $feature_slug );
+		$entity_types_data = self::get_entity_types_by_feature_flag($feature_slug);
 
 		// If we dont have entity types returned, then dont reset the entity types, return early.
-		if ( ! $entity_types_data ) {
+		if ( ! $entity_types_data) {
 			return;
 		}
 		// Repopulate the ones returned by package type.
-		foreach ( $entity_types_data as $entity_type_data ) {
+		foreach ($entity_types_data as $entity_type_data) {
 
 			$schema_label = $entity_type_data['label'];
 
-			$term_exists = get_term_by( 'name', $schema_label, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) instanceof \WP_Term;
+			$term_exists = get_term_by('name', $schema_label, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME) instanceof \WP_Term;
 
-			if ( $term_exists ) {
+			if ($term_exists) {
 				// Dont create term if it already exists.
 				continue;
 			}
@@ -82,8 +82,8 @@ 
 
 			$term_id = $term_data['term_id'];
 
-			update_term_meta( $term_id, '_wl_uri', 'http://schema.org/' . $schema_label );
-			update_term_meta( $term_id, '_wl_name', $schema_label );
+			update_term_meta($term_id, '_wl_uri', 'http://schema.org/'.$schema_label);
+			update_term_meta($term_id, '_wl_name', $schema_label);
 		}
 
 	}
@@ -194,9 +194,9 @@ 
 		);
 	}
 
-	private static function get_entity_types_by_feature_flag( $package_type ) {
+	private static function get_entity_types_by_feature_flag($package_type) {
 
-		switch ( $package_type ) {
+		switch ($package_type) {
 			case self::STARTER_PLAN:
 				return self::get_starter_entity_types();
 			case self::BUSINESS_PLAN:

src/wordlift/api/class-default-api-service.php

Indentation +147 added lines, -147 removed lines

@@ -7,152 +7,152 @@
 
 class Default_Api_Service implements Api_Service, Api_Service_Ext {
 
-	/**
-	 * @var string
-	 */
-	private $wordlift_key;
-	/**
-	 * @var int
-	 */
-	private $timeout;
-
-	/**
-	 * @var string
-	 */
-	private $user_agent;
-
-	/**
-	 * @var array
-	 */
-	private $headers;
-	/**
-	 * @var string
-	 */
-	private $base_url;
-
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * Default_Api_Service constructor.
-	 *
-	 * @param string $base_url
-	 * @param int    $timeout
-	 * @param string $user_agent
-	 * @param string $wordlift_key
-	 */
-	protected function __construct( $base_url, $timeout, $user_agent, $wordlift_key ) {
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->base_url     = untrailingslashit( $base_url );
-		$this->timeout      = $timeout;
-		$this->user_agent   = $user_agent;
-		$this->wordlift_key = $wordlift_key;
-
-		$this->headers = array(
-			'Content-Type'  => 'application/json',
-			'Authorization' => "Key $wordlift_key",
-			'Expect'        => '',
-		);
-
-		self::$instance = $this;
-	}
-
-	private static $instance;
-
-	/**
-	 * @return Default_Api_Service
-	 */
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self(
-				apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ),
-				60,
-				User_Agent::get_user_agent(),
-				Wordlift_Configuration_Service::get_instance()->get_key()
-			);
-		}
-
-		return self::$instance;
-	}
-
-	public function request( $method, $path, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
-
-		// Get the timeout for this request.
-		$request_timeout = isset( $timeout ) ? $timeout : $this->timeout;
-
-		// Set the time limit if lesser than our request timeout.
-		$max_execution_time = ini_get( 'max_execution_time' );
-		if ( ! ( defined( 'WP_CLI' ) && WP_CLI )
-			 && ( 0 !== intval( $max_execution_time ) )
-			 && ( $max_execution_time < $request_timeout ) ) {
-			// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-			@set_time_limit( $request_timeout );
-		}
-
-		$request_url = $this->base_url . $path;
-		// Create the request args in the following order:
-		// 1. use `$args` as base if provided.
-		// 2. set the custom timeout if provided.
-		// 3. set the custom user-agent if provided.
-		// 4. merge the API headers to the provided headers.
-		// 5. add the body.
-		//
-		// In this way the user can fully control the request if wanted (using `$args`) and we can add our defaults.
-		$request_args = apply_filters(
-			'wl_api_service__request',
-			$args + array(
-				'method'     => $method,
-				'timeout'    => $request_timeout,
-				'user-agent' => isset( $user_agent ) ? $user_agent : $this->user_agent,
-				'headers'    => $headers + $this->headers + Api_Headers_Service::get_instance()->get_wp_headers(),
-				'body'       => $body,
-			)
-		);
-
-		/**
-		 * Allow 3rd parties to process the response.
-		 */
-		$response = apply_filters(
-			'wl_api_service__response',
-			wp_remote_request( $request_url, $request_args ),
-			$request_url,
-			$request_args
-		);
-
-		if ( defined( 'WL_DEBUG' ) && WL_DEBUG ) {
-			$this->log->trace(
-				"=== REQUEST  ===========================\n"
-				. "=== URL: $request_url ===========================\n"
-				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-				. var_export( $request_args, true )
-				. "=== RESPONSE ===========================\n"
-				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-				. var_export( $response, true )
-			);
-		}
-
-		return new Response( $response );
-	}
-
-	public function get( $path, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
-
-		return $this->request( 'GET', $path, $headers, $body, $timeout, $user_agent, $args );
-	}
-
-	public function get_base_url() {
-		return $this->base_url;
-	}
-
-	/**
-	 * @return Me_Response
-	 * @throws Exception when an error occurs.
-	 */
-	public function me() {
-		return json_decode( $this->get( '/me' )->get_body() );
-	}
+    /**
+     * @var string
+     */
+    private $wordlift_key;
+    /**
+     * @var int
+     */
+    private $timeout;
+
+    /**
+     * @var string
+     */
+    private $user_agent;
+
+    /**
+     * @var array
+     */
+    private $headers;
+    /**
+     * @var string
+     */
+    private $base_url;
+
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * Default_Api_Service constructor.
+     *
+     * @param string $base_url
+     * @param int    $timeout
+     * @param string $user_agent
+     * @param string $wordlift_key
+     */
+    protected function __construct( $base_url, $timeout, $user_agent, $wordlift_key ) {
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->base_url     = untrailingslashit( $base_url );
+        $this->timeout      = $timeout;
+        $this->user_agent   = $user_agent;
+        $this->wordlift_key = $wordlift_key;
+
+        $this->headers = array(
+            'Content-Type'  => 'application/json',
+            'Authorization' => "Key $wordlift_key",
+            'Expect'        => '',
+        );
+
+        self::$instance = $this;
+    }
+
+    private static $instance;
+
+    /**
+     * @return Default_Api_Service
+     */
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self(
+                apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ),
+                60,
+                User_Agent::get_user_agent(),
+                Wordlift_Configuration_Service::get_instance()->get_key()
+            );
+        }
+
+        return self::$instance;
+    }
+
+    public function request( $method, $path, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
+
+        // Get the timeout for this request.
+        $request_timeout = isset( $timeout ) ? $timeout : $this->timeout;
+
+        // Set the time limit if lesser than our request timeout.
+        $max_execution_time = ini_get( 'max_execution_time' );
+        if ( ! ( defined( 'WP_CLI' ) && WP_CLI )
+             && ( 0 !== intval( $max_execution_time ) )
+             && ( $max_execution_time < $request_timeout ) ) {
+            // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+            @set_time_limit( $request_timeout );
+        }
+
+        $request_url = $this->base_url . $path;
+        // Create the request args in the following order:
+        // 1. use `$args` as base if provided.
+        // 2. set the custom timeout if provided.
+        // 3. set the custom user-agent if provided.
+        // 4. merge the API headers to the provided headers.
+        // 5. add the body.
+        //
+        // In this way the user can fully control the request if wanted (using `$args`) and we can add our defaults.
+        $request_args = apply_filters(
+            'wl_api_service__request',
+            $args + array(
+                'method'     => $method,
+                'timeout'    => $request_timeout,
+                'user-agent' => isset( $user_agent ) ? $user_agent : $this->user_agent,
+                'headers'    => $headers + $this->headers + Api_Headers_Service::get_instance()->get_wp_headers(),
+                'body'       => $body,
+            )
+        );
+
+        /**
+         * Allow 3rd parties to process the response.
+         */
+        $response = apply_filters(
+            'wl_api_service__response',
+            wp_remote_request( $request_url, $request_args ),
+            $request_url,
+            $request_args
+        );
+
+        if ( defined( 'WL_DEBUG' ) && WL_DEBUG ) {
+            $this->log->trace(
+                "=== REQUEST  ===========================\n"
+                . "=== URL: $request_url ===========================\n"
+                // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
+                . var_export( $request_args, true )
+                . "=== RESPONSE ===========================\n"
+                // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
+                . var_export( $response, true )
+            );
+        }
+
+        return new Response( $response );
+    }
+
+    public function get( $path, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
+
+        return $this->request( 'GET', $path, $headers, $body, $timeout, $user_agent, $args );
+    }
+
+    public function get_base_url() {
+        return $this->base_url;
+    }
+
+    /**
+     * @return Me_Response
+     * @throws Exception when an error occurs.
+     */
+    public function me() {
+        return json_decode( $this->get( '/me' )->get_body() );
+    }
 
 }

Spacing +22 added lines, -22 removed lines

@@ -43,11 +43,11 @@ 
 	 * @param string $user_agent
 	 * @param string $wordlift_key
 	 */
-	protected function __construct( $base_url, $timeout, $user_agent, $wordlift_key ) {
+	protected function __construct($base_url, $timeout, $user_agent, $wordlift_key) {
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
-		$this->base_url     = untrailingslashit( $base_url );
+		$this->base_url     = untrailingslashit($base_url);
 		$this->timeout      = $timeout;
 		$this->user_agent   = $user_agent;
 		$this->wordlift_key = $wordlift_key;
@@ -67,9 +67,9 @@ 
 	 * @return Default_Api_Service
 	 */
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self(
-				apply_filters( 'wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE ),
+				apply_filters('wl_api_base_url', WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE),
 				60,
 				User_Agent::get_user_agent(),
 				Wordlift_Configuration_Service::get_instance()->get_key()
@@ -79,21 +79,21 @@ 
 		return self::$instance;
 	}
 
-	public function request( $method, $path, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
+	public function request($method, $path, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array()) {
 
 		// Get the timeout for this request.
-		$request_timeout = isset( $timeout ) ? $timeout : $this->timeout;
+		$request_timeout = isset($timeout) ? $timeout : $this->timeout;
 
 		// Set the time limit if lesser than our request timeout.
-		$max_execution_time = ini_get( 'max_execution_time' );
-		if ( ! ( defined( 'WP_CLI' ) && WP_CLI )
-			 && ( 0 !== intval( $max_execution_time ) )
-			 && ( $max_execution_time < $request_timeout ) ) {
+		$max_execution_time = ini_get('max_execution_time');
+		if ( ! (defined('WP_CLI') && WP_CLI)
+			 && (0 !== intval($max_execution_time))
+			 && ($max_execution_time < $request_timeout)) {
 			// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-			@set_time_limit( $request_timeout );
+			@set_time_limit($request_timeout);
 		}
 
-		$request_url = $this->base_url . $path;
+		$request_url = $this->base_url.$path;
 		// Create the request args in the following order:
 		// 1. use `$args` as base if provided.
 		// 2. set the custom timeout if provided.
@@ -107,7 +107,7 @@ 
 			$args + array(
 				'method'     => $method,
 				'timeout'    => $request_timeout,
-				'user-agent' => isset( $user_agent ) ? $user_agent : $this->user_agent,
+				'user-agent' => isset($user_agent) ? $user_agent : $this->user_agent,
 				'headers'    => $headers + $this->headers + Api_Headers_Service::get_instance()->get_wp_headers(),
 				'body'       => $body,
 			)
@@ -118,29 +118,29 @@ 
 		 */
 		$response = apply_filters(
 			'wl_api_service__response',
-			wp_remote_request( $request_url, $request_args ),
+			wp_remote_request($request_url, $request_args),
 			$request_url,
 			$request_args
 		);
 
-		if ( defined( 'WL_DEBUG' ) && WL_DEBUG ) {
+		if (defined('WL_DEBUG') && WL_DEBUG) {
 			$this->log->trace(
 				"=== REQUEST  ===========================\n"
 				. "=== URL: $request_url ===========================\n"
 				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-				. var_export( $request_args, true )
+				. var_export($request_args, true)
 				. "=== RESPONSE ===========================\n"
 				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_var_export
-				. var_export( $response, true )
+				. var_export($response, true)
 			);
 		}
 
-		return new Response( $response );
+		return new Response($response);
 	}
 
-	public function get( $path, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array() ) {
+	public function get($path, $headers = array(), $body = null, $timeout = null, $user_agent = null, $args = array()) {
 
-		return $this->request( 'GET', $path, $headers, $body, $timeout, $user_agent, $args );
+		return $this->request('GET', $path, $headers, $body, $timeout, $user_agent, $args);
 	}
 
 	public function get_base_url() {
@@ -152,7 +152,7 @@ 
 	 * @throws Exception when an error occurs.
 	 */
 	public function me() {
-		return json_decode( $this->get( '/me' )->get_body() );
+		return json_decode($this->get('/me')->get_body());
 	}
 
 }

src/wordlift/api/class-api-headers-service.php

Indentation +28 added lines, -28 removed lines

@@ -4,33 +4,33 @@
 
 class Api_Headers_Service {
 
-	private static $instance = null;
-
-	protected function __construct() {
-
-	}
-
-	/**
-	 * This function is used to append WordPress endpoint data to every request made.
-	 *
-	 * @return array
-	 */
-	public function get_wp_headers() {
-		return array(
-			'X-Wordlift-Plugin-Wp-Admin' => untrailingslashit( get_admin_url() ),
-			'X-Wordlift-Plugin-Wp-Json'  => untrailingslashit( get_rest_url() ),
-		);
-	}
-
-	/**
-	 * @return Api_Headers_Service
-	 */
-	public static function get_instance() {
-		if ( null === self::$instance ) {
-			self::$instance = new Api_Headers_Service();
-		}
-
-		return self::$instance;
-	}
+    private static $instance = null;
+
+    protected function __construct() {
+
+    }
+
+    /**
+     * This function is used to append WordPress endpoint data to every request made.
+     *
+     * @return array
+     */
+    public function get_wp_headers() {
+        return array(
+            'X-Wordlift-Plugin-Wp-Admin' => untrailingslashit( get_admin_url() ),
+            'X-Wordlift-Plugin-Wp-Json'  => untrailingslashit( get_rest_url() ),
+        );
+    }
+
+    /**
+     * @return Api_Headers_Service
+     */
+    public static function get_instance() {
+        if ( null === self::$instance ) {
+            self::$instance = new Api_Headers_Service();
+        }
+
+        return self::$instance;
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -17,8 +17,8 @@ 
 	 */
 	public function get_wp_headers() {
 		return array(
-			'X-Wordlift-Plugin-Wp-Admin' => untrailingslashit( get_admin_url() ),
-			'X-Wordlift-Plugin-Wp-Json'  => untrailingslashit( get_rest_url() ),
+			'X-Wordlift-Plugin-Wp-Admin' => untrailingslashit(get_admin_url()),
+			'X-Wordlift-Plugin-Wp-Json'  => untrailingslashit(get_rest_url()),
 		);
 	}
 
@@ -26,7 +26,7 @@ 
 	 * @return Api_Headers_Service
 	 */
 	public static function get_instance() {
-		if ( null === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new Api_Headers_Service();
 		}