insideout10 / wordlift-plugin

src/modules/dashboard/includes/Post_Entity_Match/Post_Entity_Match_Service.php

Indentation +60 added lines, -60 removed lines

@@ -8,76 +8,76 @@
 
 class Post_Entity_Match_Service extends Match_Service {
 
-	public function list_items( $args ) {
-		global $wpdb;
+    public function list_items( $args ) {
+        global $wpdb;
 
-		$params = wp_parse_args(
-			$args,
-			array(
-				'position'    => null,
-				'element'     => 'INCLUDED',
-				'direction'   => 'ASCENDING',
-				'limit'       => 10,
-				'sort'        => '+id',
-				'post_type'   => null,
-				'has_match'   => null,
-				'post_status' => null,
-			)
-		);
-		/**
-		 * @var $sort Sort
-		 */
-		$sort = new Sort( $params['sort'] );
+        $params = wp_parse_args(
+            $args,
+            array(
+                'position'    => null,
+                'element'     => 'INCLUDED',
+                'direction'   => 'ASCENDING',
+                'limit'       => 10,
+                'sort'        => '+id',
+                'post_type'   => null,
+                'has_match'   => null,
+                'post_status' => null,
+            )
+        );
+        /**
+         * @var $sort Sort
+         */
+        $sort = new Sort( $params['sort'] );
 
-		$query_builder = new Query_Builder(
-			$params,
-			$sort
-		);
+        $query_builder = new Query_Builder(
+            $params,
+            $sort
+        );
 
-		$items = $wpdb->get_results(
-		// Each function above is preparing `$sql` by using `$wpdb->prepare`.
-		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-			$wpdb->prepare( $query_builder->get(), Object_Type_Enum::POST )
-		);
+        $items = $wpdb->get_results(
+        // Each function above is preparing `$sql` by using `$wpdb->prepare`.
+        // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+            $wpdb->prepare( $query_builder->get(), Object_Type_Enum::POST )
+        );
 
-		$sort->apply( $items );
+        $sort->apply( $items );
 
-		return $this->map( $items );
-	}
+        return $this->map( $items );
+    }
 
-	/** Returns an array of rows where each row contains
-	 * 'post_title' => The title of the post
-	 * 'id'   => The id of the post
-	 * 'post_link' => The edit post link
+    /** Returns an array of rows where each row contains
+     * 'post_title' => The title of the post
+     * 'id'   => The id of the post
+     * 'post_link' => The edit post link
      * 'post_status' => The status of the post.
-	 * 'parent_post_title' => The title of the post linked to this post via wprm_parent_post_id property
-	 * ( this is only applicable when the post is wprm_recipe, returns null if not present )
-	 * 'parent_post_id'  => The id of the linked parent post.
-	 * 'parent_post_link' => The link to parent post.
+     * 'parent_post_title' => The title of the post linked to this post via wprm_parent_post_id property
+     * ( this is only applicable when the post is wprm_recipe, returns null if not present )
+     * 'parent_post_id'  => The id of the linked parent post.
+     * 'parent_post_link' => The link to parent post.
      * 'view link'  => The permalink to the post.
      * 'preview link' => The preview link to the post.
-	 * 'match_jsonld' => The matched `about_jsonld` column from wl_entities.
-	 * 'match_id' => This id points to id column of wl_entities table.
-	 */
-	private function map( array $items ) {
-		return array_map(
-			function ( $item ) {
-				$data             = json_decode( $item->match_jsonld, true );
-				$item->match_name = $data && is_array( $data ) && array_key_exists( 'name', $data ) ? $data['name'] : null;
+     * 'match_jsonld' => The matched `about_jsonld` column from wl_entities.
+     * 'match_id' => This id points to id column of wl_entities table.
+     */
+    private function map( array $items ) {
+        return array_map(
+            function ( $item ) {
+                $data             = json_decode( $item->match_jsonld, true );
+                $item->match_name = $data && is_array( $data ) && array_key_exists( 'name', $data ) ? $data['name'] : null;
 
-				if ( $item->id ) {
-					$item->post_link    = get_edit_post_link( $item->id, 'ui' );
-					$item->view_link    = get_permalink( $item->id );
-					$item->preview_link = get_preview_post_link( $item->id );
-				}
+                if ( $item->id ) {
+                    $item->post_link    = get_edit_post_link( $item->id, 'ui' );
+                    $item->view_link    = get_permalink( $item->id );
+                    $item->preview_link = get_preview_post_link( $item->id );
+                }
 
-				if ( $item->parent_post_id ) {
-					$item->parent_post_link = get_edit_post_link( $item->parent_post_id, 'ui' );
-				}
+                if ( $item->parent_post_id ) {
+                    $item->parent_post_link = get_edit_post_link( $item->parent_post_id, 'ui' );
+                }
 
-				return $item;
-			},
-			$items
-		);
-	}
+                return $item;
+            },
+            $items
+        );
+    }
 }

src/modules/dashboard/includes/Post_Entity_Match/Query_Builder.php

Indentation +62 added lines, -62 removed lines

@@ -16,25 +16,25 @@ 
  */
 class Query_Builder extends Match_Query_Builder {
 
-	public function build() {
-
-		global $wpdb;
-		/**
-		 * Why not use JSON_EXTRACT() to extract the match_name ?
-		 * As of now the min wp compatibility is 5.3 which requires min mysql version
-		 * 5.6, The JSON_* functions are introduced on 5.7 which will break the
-		 * compatibility.
-		 *
-		 *  Returns an array of rows where each row contains
-		 * 'post_title' => The title of the post
-		 * 'id'   => The id of the post
-		 * 'parent_post_title' => The title of the post linked to this post via wprm_parent_post_id property
-		 * ( this is only applicable when the post is wprm_recipe, returns null if not present )
-		 * 'parent_post_id'  => The id of the linked parent post.
-		 * 'match_jsonld' => The matched `about_jsonld` column from wl_entities.
-		 * 'match_id' => This id points to id column of wl_entities table.
-		 */
-		$this->sql = "
+    public function build() {
+
+        global $wpdb;
+        /**
+         * Why not use JSON_EXTRACT() to extract the match_name ?
+         * As of now the min wp compatibility is 5.3 which requires min mysql version
+         * 5.6, The JSON_* functions are introduced on 5.7 which will break the
+         * compatibility.
+         *
+         *  Returns an array of rows where each row contains
+         * 'post_title' => The title of the post
+         * 'id'   => The id of the post
+         * 'parent_post_title' => The title of the post linked to this post via wprm_parent_post_id property
+         * ( this is only applicable when the post is wprm_recipe, returns null if not present )
+         * 'parent_post_id'  => The id of the linked parent post.
+         * 'match_jsonld' => The matched `about_jsonld` column from wl_entities.
+         * 'match_id' => This id points to id column of wl_entities table.
+         */
+        $this->sql = "
 		SELECT p.ID as id,
 		       p.post_title as post_title,
 		       p.post_status as post_status,
@@ -49,48 +49,48 @@ 
 			WHERE 1=1 
 		";
 
-		$this->cursor()
-			 ->post_type()
-			 ->post_status()
-			 ->has_match()
-			 ->order_by()
-			 ->limit();
-	}
-
-	private function post_status() {
-		global $wpdb;
-
-		// If a value has been provided and it's either 'draft' or 'publish', we add the related filter.
-		if ( is_string( $this->params['post_status'] ) && in_array(
-			$this->params['post_status'],
-			array(
-				'publish',
-				'draft',
-			),
-			true
-		) ) {
-
-			$this->sql .= $wpdb->prepare( ' AND p.post_status = %s', $this->params['post_status'] );
-
-			return $this;
-		}
-
-		// By default we filter on 'draft' and 'publish'.
-		$this->sql .= " AND p.post_status IN ( 'draft', 'publish' )";
-
-		return $this;
-	}
-
-	public function post_type() {
-		$post_types = $this->params['post_types'];
-
-		if ( ! isset( $post_types ) ) {
-			return $this;
-		}
-		$post_types_sql = Escape::sql_array( $post_types );
-		$this->sql     .= " AND p.post_type IN ({$post_types_sql}) ";
-
-		return $this;
-	}
+        $this->cursor()
+                ->post_type()
+                ->post_status()
+                ->has_match()
+                ->order_by()
+                ->limit();
+    }
+
+    private function post_status() {
+        global $wpdb;
+
+        // If a value has been provided and it's either 'draft' or 'publish', we add the related filter.
+        if ( is_string( $this->params['post_status'] ) && in_array(
+            $this->params['post_status'],
+            array(
+                'publish',
+                'draft',
+            ),
+            true
+        ) ) {
+
+            $this->sql .= $wpdb->prepare( ' AND p.post_status = %s', $this->params['post_status'] );
+
+            return $this;
+        }
+
+        // By default we filter on 'draft' and 'publish'.
+        $this->sql .= " AND p.post_status IN ( 'draft', 'publish' )";
+
+        return $this;
+    }
+
+    public function post_type() {
+        $post_types = $this->params['post_types'];
+
+        if ( ! isset( $post_types ) ) {
+            return $this;
+        }
+        $post_types_sql = Escape::sql_array( $post_types );
+        $this->sql     .= " AND p.post_type IN ({$post_types_sql}) ";
+
+        return $this;
+    }
 
 }

src/modules/dashboard/includes/Post_Entity_Match/Sort.php

Indentation +8 added lines, -8 removed lines

@@ -6,17 +6,17 @@
 
 class Sort extends Match_Sort {
 
-	public function get_field_name() {
-		$tmp_sort_field_name = substr( $this->sort, 1 );
-		if ( 'id' === $tmp_sort_field_name ) {
-			return 'p.ID';
-		}
+    public function get_field_name() {
+        $tmp_sort_field_name = substr( $this->sort, 1 );
+        if ( 'id' === $tmp_sort_field_name ) {
+            return 'p.ID';
+        }
         elseif ('date_modified_gmt' === $tmp_sort_field_name) {
             return 'p.post_modified_gmt';
         }
         else {
-			return 'p.post_title';
-		}
-	}
+            return 'p.post_title';
+        }
+    }
 
 }

src/modules/dashboard/includes/Post_Entity_Match/Post_Entity_Match_Rest_Controller.php

Indentation +217 added lines, -217 removed lines

@@ -11,221 +11,221 @@
 
 class Post_Entity_Match_Rest_Controller extends \WP_REST_Controller {
 
-	/**
-	 * @var Post_Entity_Match_Service
-	 */
-	private $match_service;
-
-	public function __construct( $match_service ) {
-		$this->match_service = $match_service;
-	}
-
-	public function register_hooks() {
-		add_action( 'rest_api_init', array( $this, 'register_routes' ) );
-	}
-
-	/**
-	 * Register the routes for the objects of the controller.
-	 */
-	public function register_routes() {
-
-		// Get term matches by taxonomy name
-		register_rest_route(
-			'wordlift/v1',
-			'/post-matches',
-			array(
-				'methods'             => 'GET',
-				'callback'            => array( $this, 'get_post_matches' ),
-				'args'                => array(
-					'cursor'      => array(
-						'type'              => 'string',
-						'default'           => Cursor::EMPTY_CURSOR_AS_BASE64_STRING,
-						'validate_callback' => 'rest_validate_request_arg',
-						'sanitize_callback' => array( Cursor::class, 'rest_sanitize_request_arg' ),
-					),
-					'limit'       => array(
-						'type'              => 'integer',
-						'validate_callback' => 'rest_validate_request_arg',
-						'default'           => 10,
-						'minimum'           => 1,
-						'maximum'           => 100,
-						'sanitize_callback' => 'absint',
-					),
-					'post_types'  => array(
-						'type'              => 'array',
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-					'has_match'   => array(
-						'type'              => 'boolean',
-						'required'          => false,
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-					'post_status' => array(
-						'type'              => 'string',
-						'required'          => false,
-						'enum'              => array( 'publish', 'draft' ),
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-					'sort'        => array(
-						'type'              => 'string',
-						'required'          => false,
-						'enum'              => array( '+date_modified_gmt', '-date_modified_gmt' ),
-						'validate_callback' => 'rest_validate_request_arg',
-						'default'           => '+date_modified_gmt',
-					),
-				),
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
-				},
-			)
-		);
-
-		// Create a new match for a post
-		register_rest_route(
-			'wordlift/v1',
-			'/post-matches/(?P<post_id>\d+)/matches',
-			array(
-				'methods'             => 'POST',
-				'callback'            => array( $this, 'create_post_match' ),
-				'args'                => array(
-					'post_id' => array(
-						'required'          => true,
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-				),
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
-				},
-			)
-		);
-
-		// Update an existing post match
-		register_rest_route(
-			'wordlift/v1',
-			'/post-matches/(?P<post_id>\d+)/matches/(?P<match_id>\d+)',
-			array(
-				'methods'             => 'PUT',
-				'callback'            => array( $this, 'update_post_match' ),
-				'args'                => array(
-					'post_id'  => array(
-						'required'          => true,
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-					'match_id' => array(
-						'required'          => true,
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-				),
-				'permission_callback' => function () {
-
-					return current_user_can( 'manage_options' );
-				},
-			)
-		);
-	}
-
-	/**
-	 * Get the term matches by taxonomy name.
-	 *
-	 * @var $request \WP_REST_Request
-	 */
-	public function get_post_matches( $request ) {
-
-		$cursor = $request->get_param( 'cursor' );
-		if ( $request->has_param( 'limit' ) ) {
-			$cursor['limit'] = $request->get_param( 'limit' );
-		}
-		if ( $request->has_param( 'sort' ) ) {
-			$cursor['sort'] = $request->get_param( 'sort' );
-		}
-		if ( $request->has_param( 'post_types' ) ) {
-			$cursor['query']['post_types'] = $request->get_param( 'post_types' );
-		}
-		if ( $request->has_param( 'has_match' ) ) {
-			$cursor['query']['has_match'] = $request->get_param( 'has_match' );
-		}
-		if ( $request->has_param( 'post_status' ) ) {
-			$cursor['query']['post_status'] = $request->get_param( 'post_status' );
-		}
-
-		// Query.
-		$post_types = isset( $cursor['query']['post_types'] ) ? $cursor['query']['post_types'] : apply_filters(
-			'wl_dashboard__post_entity_match__post_types',
-			array(
-				'post',
-				'page',
-			)
-		);
-		$has_match  = isset( $cursor['query']['has_match'] ) ? $cursor['query']['has_match'] : null;
-
-		$post_status = isset( $cursor['query']['post_status'] ) ? $cursor['query']['post_status'] : null;
-
-		$items = $this->match_service->list_items(
-			array(
-				// Query
-				'post_types'  => $post_types,
-				'has_match'   => $has_match,
-				'post_status' => $post_status,
-				// Cursor-Pagination
-				'position'    => $cursor['position'],
-				'element'     => $cursor['element'],
-				'direction'   => $cursor['direction'],
-				// `+1` to check if we have other results.
-				'limit'       => $cursor['limit'] + 1,
-				'sort'        => $cursor['sort'],
-			)
-		);
-
-		return new Cursor_Page(
-			$items,
-			$cursor['position'],
-			$cursor['element'],
-			$cursor['direction'],
-			$cursor['sort'],
-			$cursor['limit'],
-			$cursor['query']
-		);
-	}
-
-	/**
-	 * Create a new match for a post.
-	 *
-	 * @var $request \WP_REST_Request
-	 */
-	public function create_post_match( $request ) {
-		$post_id = $request->get_param( 'post_id' );
-
-		// If we dont have a entry on the match table, then add one.
-		$content_id = Wordpress_Content_Id::create_post( $post_id );
-		if ( ! Wordpress_Content_Service::get_instance()
-										->get_entity_id( $content_id ) ) {
-			$uri = Entity_Uri_Generator::create_uri( $content_id->get_type(), $content_id->get_id() );
-			Wordpress_Content_Service::get_instance()->set_entity_id( $content_id, $uri );
-		}
-
-		$match_id = $this->match_service->get_id(
-			$post_id,
-			Object_Type_Enum::POST
-		);
-
-		return $this->match_service->set_jsonld(
-			$post_id,
-			Object_Type_Enum::POST,
-			$match_id,
-			$request->get_json_params()
-		);
-	}
-
-	/**
-	 * @var $request \WP_REST_Request
-	 */
-	public function update_post_match( $request ) {
-
-		return $this->match_service->set_jsonld(
-			$request->get_param( 'post_id' ),
-			Object_Type_Enum::POST,
-			$request->get_param( 'match_id' ),
-			$request->get_json_params()
-		);
-	}
+    /**
+     * @var Post_Entity_Match_Service
+     */
+    private $match_service;
+
+    public function __construct( $match_service ) {
+        $this->match_service = $match_service;
+    }
+
+    public function register_hooks() {
+        add_action( 'rest_api_init', array( $this, 'register_routes' ) );
+    }
+
+    /**
+     * Register the routes for the objects of the controller.
+     */
+    public function register_routes() {
+
+        // Get term matches by taxonomy name
+        register_rest_route(
+            'wordlift/v1',
+            '/post-matches',
+            array(
+                'methods'             => 'GET',
+                'callback'            => array( $this, 'get_post_matches' ),
+                'args'                => array(
+                    'cursor'      => array(
+                        'type'              => 'string',
+                        'default'           => Cursor::EMPTY_CURSOR_AS_BASE64_STRING,
+                        'validate_callback' => 'rest_validate_request_arg',
+                        'sanitize_callback' => array( Cursor::class, 'rest_sanitize_request_arg' ),
+                    ),
+                    'limit'       => array(
+                        'type'              => 'integer',
+                        'validate_callback' => 'rest_validate_request_arg',
+                        'default'           => 10,
+                        'minimum'           => 1,
+                        'maximum'           => 100,
+                        'sanitize_callback' => 'absint',
+                    ),
+                    'post_types'  => array(
+                        'type'              => 'array',
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                    'has_match'   => array(
+                        'type'              => 'boolean',
+                        'required'          => false,
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                    'post_status' => array(
+                        'type'              => 'string',
+                        'required'          => false,
+                        'enum'              => array( 'publish', 'draft' ),
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                    'sort'        => array(
+                        'type'              => 'string',
+                        'required'          => false,
+                        'enum'              => array( '+date_modified_gmt', '-date_modified_gmt' ),
+                        'validate_callback' => 'rest_validate_request_arg',
+                        'default'           => '+date_modified_gmt',
+                    ),
+                ),
+                'permission_callback' => function () {
+                    return current_user_can( 'manage_options' );
+                },
+            )
+        );
+
+        // Create a new match for a post
+        register_rest_route(
+            'wordlift/v1',
+            '/post-matches/(?P<post_id>\d+)/matches',
+            array(
+                'methods'             => 'POST',
+                'callback'            => array( $this, 'create_post_match' ),
+                'args'                => array(
+                    'post_id' => array(
+                        'required'          => true,
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                ),
+                'permission_callback' => function () {
+                    return current_user_can( 'manage_options' );
+                },
+            )
+        );
+
+        // Update an existing post match
+        register_rest_route(
+            'wordlift/v1',
+            '/post-matches/(?P<post_id>\d+)/matches/(?P<match_id>\d+)',
+            array(
+                'methods'             => 'PUT',
+                'callback'            => array( $this, 'update_post_match' ),
+                'args'                => array(
+                    'post_id'  => array(
+                        'required'          => true,
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                    'match_id' => array(
+                        'required'          => true,
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                ),
+                'permission_callback' => function () {
+
+                    return current_user_can( 'manage_options' );
+                },
+            )
+        );
+    }
+
+    /**
+     * Get the term matches by taxonomy name.
+     *
+     * @var $request \WP_REST_Request
+     */
+    public function get_post_matches( $request ) {
+
+        $cursor = $request->get_param( 'cursor' );
+        if ( $request->has_param( 'limit' ) ) {
+            $cursor['limit'] = $request->get_param( 'limit' );
+        }
+        if ( $request->has_param( 'sort' ) ) {
+            $cursor['sort'] = $request->get_param( 'sort' );
+        }
+        if ( $request->has_param( 'post_types' ) ) {
+            $cursor['query']['post_types'] = $request->get_param( 'post_types' );
+        }
+        if ( $request->has_param( 'has_match' ) ) {
+            $cursor['query']['has_match'] = $request->get_param( 'has_match' );
+        }
+        if ( $request->has_param( 'post_status' ) ) {
+            $cursor['query']['post_status'] = $request->get_param( 'post_status' );
+        }
+
+        // Query.
+        $post_types = isset( $cursor['query']['post_types'] ) ? $cursor['query']['post_types'] : apply_filters(
+            'wl_dashboard__post_entity_match__post_types',
+            array(
+                'post',
+                'page',
+            )
+        );
+        $has_match  = isset( $cursor['query']['has_match'] ) ? $cursor['query']['has_match'] : null;
+
+        $post_status = isset( $cursor['query']['post_status'] ) ? $cursor['query']['post_status'] : null;
+
+        $items = $this->match_service->list_items(
+            array(
+                // Query
+                'post_types'  => $post_types,
+                'has_match'   => $has_match,
+                'post_status' => $post_status,
+                // Cursor-Pagination
+                'position'    => $cursor['position'],
+                'element'     => $cursor['element'],
+                'direction'   => $cursor['direction'],
+                // `+1` to check if we have other results.
+                'limit'       => $cursor['limit'] + 1,
+                'sort'        => $cursor['sort'],
+            )
+        );
+
+        return new Cursor_Page(
+            $items,
+            $cursor['position'],
+            $cursor['element'],
+            $cursor['direction'],
+            $cursor['sort'],
+            $cursor['limit'],
+            $cursor['query']
+        );
+    }
+
+    /**
+     * Create a new match for a post.
+     *
+     * @var $request \WP_REST_Request
+     */
+    public function create_post_match( $request ) {
+        $post_id = $request->get_param( 'post_id' );
+
+        // If we dont have a entry on the match table, then add one.
+        $content_id = Wordpress_Content_Id::create_post( $post_id );
+        if ( ! Wordpress_Content_Service::get_instance()
+                                        ->get_entity_id( $content_id ) ) {
+            $uri = Entity_Uri_Generator::create_uri( $content_id->get_type(), $content_id->get_id() );
+            Wordpress_Content_Service::get_instance()->set_entity_id( $content_id, $uri );
+        }
+
+        $match_id = $this->match_service->get_id(
+            $post_id,
+            Object_Type_Enum::POST
+        );
+
+        return $this->match_service->set_jsonld(
+            $post_id,
+            Object_Type_Enum::POST,
+            $match_id,
+            $request->get_json_params()
+        );
+    }
+
+    /**
+     * @var $request \WP_REST_Request
+     */
+    public function update_post_match( $request ) {
+
+        return $this->match_service->set_jsonld(
+            $request->get_param( 'post_id' ),
+            Object_Type_Enum::POST,
+            $request->get_param( 'match_id' ),
+            $request->get_json_params()
+        );
+    }
 }

src/modules/dashboard/includes/Term_Entity_Match/Query_Builder.php

Indentation +35 added lines, -35 removed lines

@@ -7,16 +7,16 @@ 
 
 class Query_Builder extends Match_Query_Builder {
 
-	public function build() {
-
-		global $wpdb;
-		/**
-		 * Why not use JSON_EXTRACT() to extract the match_name ?
-		 * As of now the min wp compatibility is 5.3 which requires min mysql version
-		 * 5.6, The JSON_* functions are introduced on 5.7 which will break the
-		 * compatibility.
-		 */
-		$this->sql = "
+    public function build() {
+
+        global $wpdb;
+        /**
+         * Why not use JSON_EXTRACT() to extract the match_name ?
+         * As of now the min wp compatibility is 5.3 which requires min mysql version
+         * 5.6, The JSON_* functions are introduced on 5.7 which will break the
+         * compatibility.
+         */
+        $this->sql = "
 		SELECT t.term_id as id, e.about_jsonld as match_jsonld,
 		       t.name, e.id AS match_id FROM {$wpdb->prefix}terms t
 			INNER JOIN {$wpdb->prefix}term_taxonomy tt ON t.term_id = tt.term_id
@@ -25,36 +25,36 @@ 
 		";
 
 
-		$this->cursor()
-			->ingredient_name_contains()
-			->taxonomy()
-			->has_match()
-			->order_by()
-			->limit();
+        $this->cursor()
+            ->ingredient_name_contains()
+            ->taxonomy()
+            ->has_match()
+            ->order_by()
+            ->limit();
 
-	}
+    }
 
-	public function taxonomy() {
-		$taxonomies = $this->params['taxonomies'];
+    public function taxonomy() {
+        $taxonomies = $this->params['taxonomies'];
 
-		if ( ! isset( $taxonomies ) ) {
-			return $this;
-		}
-		$sql        = Escape::sql_array( $taxonomies );
-		$this->sql .= " AND tt.taxonomy IN ($sql)";
-		return $this;
-	}
+        if ( ! isset( $taxonomies ) ) {
+            return $this;
+        }
+        $sql        = Escape::sql_array( $taxonomies );
+        $this->sql .= " AND tt.taxonomy IN ($sql)";
+        return $this;
+    }
 
-	public function ingredient_name_contains() {
-		global $wpdb;
+    public function ingredient_name_contains() {
+        global $wpdb;
 
-		// If the ingredient_name_contains value is a non-empty string, add the filter
-		if ( is_string( $this->params['ingredient_name_contains'] ) && ! empty( $this->params['ingredient_name_contains'] ) ) {
-			$ingredient_name_contains = $this->params['ingredient_name_contains'];
-			$this->sql .= $wpdb->prepare( ' AND t.name LIKE %s', '%' . $ingredient_name_contains . '%' );
-		}
+        // If the ingredient_name_contains value is a non-empty string, add the filter
+        if ( is_string( $this->params['ingredient_name_contains'] ) && ! empty( $this->params['ingredient_name_contains'] ) ) {
+            $ingredient_name_contains = $this->params['ingredient_name_contains'];
+            $this->sql .= $wpdb->prepare( ' AND t.name LIKE %s', '%' . $ingredient_name_contains . '%' );
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
 }

src/modules/dashboard/includes/Term_Entity_Match/Term_Entity_Match_Service.php

Indentation +51 added lines, -51 removed lines

@@ -7,56 +7,56 @@
 
 class Term_Entity_Match_Service extends Match_Service {
 
-	public function list_items( $args ) {
-		global $wpdb;
-
-		$params = wp_parse_args(
-			$args,
-			array(
-				'position'  => null,
-				'element'   => 'INCLUDED',
-				'direction' => 'ASCENDING',
-				'limit'     => 10,
-				'sort'      => '+id',
-				// Query.
-				'taxonomy'  => null,
-				'has_match' => null,
-				'ingredient_name_contains' => null,
-			)
-		);
-
-		/**
-		 * @var $sort Sort
-		 */
-		$sort = new Sort( $params['sort'] );
-
-		$query_builder = new Query_Builder(
-			$params,
-			$sort
-		);
-		$query         = $query_builder
-			->get();
-
-		$items = $wpdb->get_results(
-		// Each function above is preparing `$sql` by using `$wpdb->prepare`.
-		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-			$wpdb->prepare( $query, Object_Type_Enum::TERM )
-		);
-
-		$sort->apply( $items );
-
-		return $this->map( $items );
-	}
-
-	private function map( array $items ) {
-		return array_map(
-			function ( $item ) {
-				$data             = json_decode( $item->match_jsonld, true );
-				$item->match_name = $data && is_array( $data ) && array_key_exists( 'name', $data ) ? $data['name'] : null;
-				return $item;
-			},
-			$items
-		);
-	}
+    public function list_items( $args ) {
+        global $wpdb;
+
+        $params = wp_parse_args(
+            $args,
+            array(
+                'position'  => null,
+                'element'   => 'INCLUDED',
+                'direction' => 'ASCENDING',
+                'limit'     => 10,
+                'sort'      => '+id',
+                // Query.
+                'taxonomy'  => null,
+                'has_match' => null,
+                'ingredient_name_contains' => null,
+            )
+        );
+
+        /**
+         * @var $sort Sort
+         */
+        $sort = new Sort( $params['sort'] );
+
+        $query_builder = new Query_Builder(
+            $params,
+            $sort
+        );
+        $query         = $query_builder
+            ->get();
+
+        $items = $wpdb->get_results(
+        // Each function above is preparing `$sql` by using `$wpdb->prepare`.
+        // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+            $wpdb->prepare( $query, Object_Type_Enum::TERM )
+        );
+
+        $sort->apply( $items );
+
+        return $this->map( $items );
+    }
+
+    private function map( array $items ) {
+        return array_map(
+            function ( $item ) {
+                $data             = json_decode( $item->match_jsonld, true );
+                $item->match_name = $data && is_array( $data ) && array_key_exists( 'name', $data ) ? $data['name'] : null;
+                return $item;
+            },
+            $items
+        );
+    }
 
 }

src/modules/dashboard/includes/Term_Entity_Match/Term_Entity_Match_Rest_Controller.php

Indentation +214 added lines, -214 removed lines

@@ -11,219 +11,219 @@
 
 class Term_Entity_Match_Rest_Controller extends \WP_REST_Controller {
 
-	private $match_service;
-
-	public function __construct( $match_service ) {
-		$this->match_service = $match_service;
-	}
-
-	public function register_hooks() {
-		add_action( 'rest_api_init', array( $this, 'register_routes' ) );
-	}
-
-	/**
-	 * Register the routes for the objects of the controller.
-	 */
-	public function register_routes() {
-
-		// Get term matches by taxonomy name
-		register_rest_route(
-			'wordlift/v1',
-			'/term-matches',
-			array(
-				'methods'             => 'GET',
-				'callback'            => array( $this, 'get_term_matches' ),
-				'args'                => array(
-					'cursor'     => array(
-						'type'              => 'string',
-						'default'           => Cursor::EMPTY_CURSOR_AS_BASE64_STRING,
-						'validate_callback' => 'rest_validate_request_arg',
-						'sanitize_callback' => array( Cursor::class, 'rest_sanitize_request_arg' ),
-					),
-					'limit'      => array(
-						'type'              => 'integer',
-						'validate_callback' => 'rest_validate_request_arg',
-						'default'           => 10,
-						'minimum'           => 1,
-						'maximum'           => 100,
-						'sanitize_callback' => 'absint',
-					),
-					'taxonomies' => array(
-						'type'              => 'array',
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-					'has_match'  => array(
-						'type'              => 'boolean',
-						'required'          => false,
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-					'ingredient_name_contains'	=> array(
-						'type'				=> 'string',
-						'required'			=> false,
-						'validate_callback' => 'rest_validate_request_arg'
-					),
-					'sort'						=> array(
-						'type'				=> 'string',
-						'required'			=> 'false',
-						'enum'              => array( '+ingredient_term', '-ingredient_term', '+matched_ingredient', '-matched_ingredient', '+occurrences', '-occurrences'),
-						'validate_callback' => 'rest_validate_request_arg',
-					)
-				),
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
-				},
-			)
-		);
-
-		// Create a new match for a term
-		register_rest_route(
-			'/wordlift/v1',
-			'/term-matches/(?P<term_id>\d+)/matches',
-			array(
-				'methods'             => 'POST',
-				'callback'            => array( $this, 'create_term_match' ),
-				'args'                => array(
-					'term_id' => array(
-						'required'          => true,
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-				),
-				'permission_callback' => function () {
-					return current_user_can( 'manage_options' );
-				},
-			)
-		);
-
-		// Update an existing term match
-		register_rest_route(
-			'/wordlift/v1',
-			'/term-matches/(?P<term_id>\d+)/matches/(?P<match_id>\d+)',
-			array(
-				'methods'             => 'PUT',
-				'callback'            => array( $this, 'update_term_match' ),
-				'args'                => array(
-					'term_id'  => array(
-						'required'          => true,
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-					'match_id' => array(
-						'required'          => true,
-						'validate_callback' => 'rest_validate_request_arg',
-					),
-				),
-				'permission_callback' => function () {
-
-					return current_user_can( 'manage_options' );
-				},
-			)
-		);
-	}
-
-	/**
-	 * Get the term matches by taxonomy name.
-	 *
-	 * @var $request \WP_REST_Request
-	 */
-	public function get_term_matches( $request ) {
-
-		$cursor = $request->get_param( 'cursor' );
-		if ( $request->has_param( 'limit' ) ) {
-			$cursor['limit'] = $request->get_param( 'limit' );
-		}
-		if ( $request->has_param( 'sort' ) ) {
-			$cursor['sort'] = $request->get_param( 'sort' );
-		}
-		if ( $request->has_param( 'taxonomies' ) ) {
-			$cursor['query']['taxonomies'] = $request->get_param( 'taxonomies' );
-		}
-		if ( $request->has_param( 'has_match' ) ) {
-			$cursor['query']['has_match'] = $request->get_param( 'has_match' );
-		}
-		if ( $request->has_param( 'ingredient_name_contains' )) {
-			$cursor['query']['ingredient_name_contains'] = $request->get_param('ingredient_name_contains');
-		}
-
-		// Query.
-		$taxonomies = isset( $cursor['query']['taxonomies'] ) ? $cursor['query']['taxonomies'] : apply_filters(
-			'wl_dashboard__post_entity_match__taxonomies',
-			array(
-				'post_tag',
-				'category',
-			)
-		);
-
-		$has_match = isset( $cursor['query']['has_match'] ) ? $cursor['query']['has_match'] : null;
-		$ingredient_name_contains = isset( $cursor['query']['ingredient_name_contains']) ? $cursor['query']['ingredient_name_contains'] : null;
-
-		$items = $this->match_service->list_items(
-			array(
-				// Query
-				'taxonomies' => $taxonomies,
-				'has_match'  => $has_match,
-				'ingredient_name_contains' => $ingredient_name_contains,
-				// Cursor-Pagination
-				'position'   => $cursor['position'],
-				'element'    => $cursor['element'],
-				'direction'  => $cursor['direction'],
-				// `+1` to check if we have other results.
-				'limit'      => $cursor['limit'] + 1,
-				'sort'       => $cursor['sort'],
-			)
-		);
-
-		return new Cursor_Page(
-			$items,
-			$cursor['position'],
-			$cursor['element'],
-			$cursor['direction'],
-			$cursor['sort'],
-			$cursor['limit'],
-			$cursor['query']
-		);
-	}
-
-	/**
-	 * Create a new match for a term.
-	 *
-	 * @var $request \WP_REST_Request
-	 */
-	public function create_term_match( $request ) {
-
-		$term_id = $request->get_param( 'term_id' );
-
-		// If we dont have a entry on the match table, then add one.
-		$content_id = Wordpress_Content_Id::create_term( $term_id );
-		if ( ! Wordpress_Content_Service::get_instance()
-										->get_entity_id( $content_id ) ) {
-			$uri = Entity_Uri_Generator::create_uri( $content_id->get_type(), $content_id->get_id() );
-			Wordpress_Content_Service::get_instance()->set_entity_id( $content_id, $uri );
-		}
-
-		$match_id = $this->match_service->get_id(
-			$term_id,
-			Object_Type_Enum::TERM
-		);
-
-		return $this->match_service->set_jsonld(
-			$term_id,
-			Object_Type_Enum::TERM,
-			$match_id,
-			$request->get_json_params()
-		);
-
-	}
-
-	/**
-	 * @var $request \WP_REST_Request
-	 */
-	public function update_term_match( $request ) {
-
-		return $this->match_service->set_jsonld(
-			$request->get_param( 'term_id' ),
-			Object_Type_Enum::TERM,
-			$request->get_param( 'match_id' ),
-			$request->get_json_params()
-		);
-	}
+    private $match_service;
+
+    public function __construct( $match_service ) {
+        $this->match_service = $match_service;
+    }
+
+    public function register_hooks() {
+        add_action( 'rest_api_init', array( $this, 'register_routes' ) );
+    }
+
+    /**
+     * Register the routes for the objects of the controller.
+     */
+    public function register_routes() {
+
+        // Get term matches by taxonomy name
+        register_rest_route(
+            'wordlift/v1',
+            '/term-matches',
+            array(
+                'methods'             => 'GET',
+                'callback'            => array( $this, 'get_term_matches' ),
+                'args'                => array(
+                    'cursor'     => array(
+                        'type'              => 'string',
+                        'default'           => Cursor::EMPTY_CURSOR_AS_BASE64_STRING,
+                        'validate_callback' => 'rest_validate_request_arg',
+                        'sanitize_callback' => array( Cursor::class, 'rest_sanitize_request_arg' ),
+                    ),
+                    'limit'      => array(
+                        'type'              => 'integer',
+                        'validate_callback' => 'rest_validate_request_arg',
+                        'default'           => 10,
+                        'minimum'           => 1,
+                        'maximum'           => 100,
+                        'sanitize_callback' => 'absint',
+                    ),
+                    'taxonomies' => array(
+                        'type'              => 'array',
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                    'has_match'  => array(
+                        'type'              => 'boolean',
+                        'required'          => false,
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                    'ingredient_name_contains'	=> array(
+                        'type'				=> 'string',
+                        'required'			=> false,
+                        'validate_callback' => 'rest_validate_request_arg'
+                    ),
+                    'sort'						=> array(
+                        'type'				=> 'string',
+                        'required'			=> 'false',
+                        'enum'              => array( '+ingredient_term', '-ingredient_term', '+matched_ingredient', '-matched_ingredient', '+occurrences', '-occurrences'),
+                        'validate_callback' => 'rest_validate_request_arg',
+                    )
+                ),
+                'permission_callback' => function () {
+                    return current_user_can( 'manage_options' );
+                },
+            )
+        );
+
+        // Create a new match for a term
+        register_rest_route(
+            '/wordlift/v1',
+            '/term-matches/(?P<term_id>\d+)/matches',
+            array(
+                'methods'             => 'POST',
+                'callback'            => array( $this, 'create_term_match' ),
+                'args'                => array(
+                    'term_id' => array(
+                        'required'          => true,
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                ),
+                'permission_callback' => function () {
+                    return current_user_can( 'manage_options' );
+                },
+            )
+        );
+
+        // Update an existing term match
+        register_rest_route(
+            '/wordlift/v1',
+            '/term-matches/(?P<term_id>\d+)/matches/(?P<match_id>\d+)',
+            array(
+                'methods'             => 'PUT',
+                'callback'            => array( $this, 'update_term_match' ),
+                'args'                => array(
+                    'term_id'  => array(
+                        'required'          => true,
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                    'match_id' => array(
+                        'required'          => true,
+                        'validate_callback' => 'rest_validate_request_arg',
+                    ),
+                ),
+                'permission_callback' => function () {
+
+                    return current_user_can( 'manage_options' );
+                },
+            )
+        );
+    }
+
+    /**
+     * Get the term matches by taxonomy name.
+     *
+     * @var $request \WP_REST_Request
+     */
+    public function get_term_matches( $request ) {
+
+        $cursor = $request->get_param( 'cursor' );
+        if ( $request->has_param( 'limit' ) ) {
+            $cursor['limit'] = $request->get_param( 'limit' );
+        }
+        if ( $request->has_param( 'sort' ) ) {
+            $cursor['sort'] = $request->get_param( 'sort' );
+        }
+        if ( $request->has_param( 'taxonomies' ) ) {
+            $cursor['query']['taxonomies'] = $request->get_param( 'taxonomies' );
+        }
+        if ( $request->has_param( 'has_match' ) ) {
+            $cursor['query']['has_match'] = $request->get_param( 'has_match' );
+        }
+        if ( $request->has_param( 'ingredient_name_contains' )) {
+            $cursor['query']['ingredient_name_contains'] = $request->get_param('ingredient_name_contains');
+        }
+
+        // Query.
+        $taxonomies = isset( $cursor['query']['taxonomies'] ) ? $cursor['query']['taxonomies'] : apply_filters(
+            'wl_dashboard__post_entity_match__taxonomies',
+            array(
+                'post_tag',
+                'category',
+            )
+        );
+
+        $has_match = isset( $cursor['query']['has_match'] ) ? $cursor['query']['has_match'] : null;
+        $ingredient_name_contains = isset( $cursor['query']['ingredient_name_contains']) ? $cursor['query']['ingredient_name_contains'] : null;
+
+        $items = $this->match_service->list_items(
+            array(
+                // Query
+                'taxonomies' => $taxonomies,
+                'has_match'  => $has_match,
+                'ingredient_name_contains' => $ingredient_name_contains,
+                // Cursor-Pagination
+                'position'   => $cursor['position'],
+                'element'    => $cursor['element'],
+                'direction'  => $cursor['direction'],
+                // `+1` to check if we have other results.
+                'limit'      => $cursor['limit'] + 1,
+                'sort'       => $cursor['sort'],
+            )
+        );
+
+        return new Cursor_Page(
+            $items,
+            $cursor['position'],
+            $cursor['element'],
+            $cursor['direction'],
+            $cursor['sort'],
+            $cursor['limit'],
+            $cursor['query']
+        );
+    }
+
+    /**
+     * Create a new match for a term.
+     *
+     * @var $request \WP_REST_Request
+     */
+    public function create_term_match( $request ) {
+
+        $term_id = $request->get_param( 'term_id' );
+
+        // If we dont have a entry on the match table, then add one.
+        $content_id = Wordpress_Content_Id::create_term( $term_id );
+        if ( ! Wordpress_Content_Service::get_instance()
+                                        ->get_entity_id( $content_id ) ) {
+            $uri = Entity_Uri_Generator::create_uri( $content_id->get_type(), $content_id->get_id() );
+            Wordpress_Content_Service::get_instance()->set_entity_id( $content_id, $uri );
+        }
+
+        $match_id = $this->match_service->get_id(
+            $term_id,
+            Object_Type_Enum::TERM
+        );
+
+        return $this->match_service->set_jsonld(
+            $term_id,
+            Object_Type_Enum::TERM,
+            $match_id,
+            $request->get_json_params()
+        );
+
+    }
+
+    /**
+     * @var $request \WP_REST_Request
+     */
+    public function update_term_match( $request ) {
+
+        return $this->match_service->set_jsonld(
+            $request->get_param( 'term_id' ),
+            Object_Type_Enum::TERM,
+            $request->get_param( 'match_id' ),
+            $request->get_json_params()
+        );
+    }
 
 }

src/modules/dashboard/includes/Term_Entity_Match/Sort.php

Indentation +14 added lines, -14 removed lines

@@ -6,19 +6,19 @@
 
 class Sort extends Match_Sort {
 
-	public function get_field_name() {
-		$tmp_sort_field_name = substr( $this->sort, 1 );
-		if ( 'id' === $tmp_sort_field_name ) {
-			return 't.term_id';
-		} elseif ( 'ingredient_term' ) {
-			return 't.name';
-		} elseif ( 'matched_ingredient' ) {
-			//@todo -not sure what this is
-		} elseif ( 'occurrences' ) {
-			//@todo
-		} else {
-			return 't.name';
-		}
-	}
+    public function get_field_name() {
+        $tmp_sort_field_name = substr( $this->sort, 1 );
+        if ( 'id' === $tmp_sort_field_name ) {
+            return 't.term_id';
+        } elseif ( 'ingredient_term' ) {
+            return 't.name';
+        } elseif ( 'matched_ingredient' ) {
+            //@todo -not sure what this is
+        } elseif ( 'occurrences' ) {
+            //@todo
+        } else {
+            return 't.name';
+        }
+    }
 
 }