insideout10 / wordlift-plugin

src/wordlift/mappings/class-jsonld-converter.php

Indentation +147 added lines, -147 removed lines

@@ -16,152 +16,152 @@
  * @since 3.25.0
  */
 class Jsonld_Converter {
-	/**
-	 * Enumerations for the field types.
-	 * Enumerations for the field types.
-	 */
-	const FIELD_TYPE_TEXT_FIELD = 'text';
-	const FIELD_TYPE_CUSTOM_FIELD = 'custom_field';
-	const FIELD_TYPE_ACF = 'acf';
-	/**
-	 * The {@link Mappings_Validator} instance to test.
-	 *
-	 * @since  3.25.0
-	 * @access private
-	 * @var Mappings_Validator $validator The {@link Mappings_Validator} instance.
-	 */
-	private $validator;
-
-	/**
-	 * The {@link Mappings_Transform_Functions_Registry} instance.
-	 *
-	 * @since  3.25.0
-	 * @access private
-	 * @var Mappings_Transform_Functions_Registry $transform_functions_registry The {@link Mappings_Transform_Functions_Registry} instance.
-	 */
-	private $transform_functions_registry;
-
-	/**
-	 * Initialize all dependencies required.
-	 *
-	 * @param Mappings_Validator $validator A {@link Mappings_Validator} instance.
-	 * @param Mappings_Transform_Functions_Registry $transform_functions_registry
-	 */
-	public function __construct( $validator, $transform_functions_registry ) {
-
-		$this->validator                    = $validator;
-		$this->transform_functions_registry = $transform_functions_registry;
-
-		// Hook to refactor the JSON-LD.
-		add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
-		add_filter( 'wl_entity_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 3 );
-
-	}
-
-	/**
-	 * Hook to `wl_post_jsonld_array` and `wl_entity_jsonld_array`.
-	 *
-	 * Receive the JSON-LD and the references in the array along with the post ID and transform them according to
-	 * the configuration.
-	 *
-	 * @param array $value {
-	 *      The array containing the JSON-LD and the references.
-	 *
-	 * @type array $jsonld The JSON-LD array.
-	 * @type int[] $references An array of post ID referenced by the JSON-LD (will be expanded by the converter).
-	 * }
-	 *
-	 * @param int $post_id The post ID.
-	 *
-	 * @return array An array with the updated JSON-LD and references.
-	 */
-	public function wl_post_jsonld_array( $value, $post_id ) {
-
-		$jsonld     = $value['jsonld'];
-		$references = $value['references'];
-
-		return array(
-			'jsonld'     => $this->wl_post_jsonld( $jsonld, $post_id, $references ),
-			'references' => $references,
-		);
-	}
-
-	/**
-	 * Returns JSON-LD data after applying transformation functions.
-	 *
-	 * @param array $jsonld The JSON-LD structure.
-	 * @param int $post_id The {@link WP_Post} id.
-	 * @param array $references An array of post references.
-	 *
-	 * @return array the new refactored array structure.
-	 * @since 3.25.0
-	 */
-	private function wl_post_jsonld( $jsonld, $post_id, &$references ) {
-
-		// @@todo I think there's an issue here with the Validator, because you're changing the instance state and the
-		// instance may be reused afterwards.
-
-		$properties = $this->validator->validate( $post_id );
-
-		foreach ( $properties as $property ) {
-			$transform_instance = $this->transform_functions_registry->get_transform_function( $property['transform_function'] );
-			$data               = $this->get_data_from_data_source( $post_id, $property );
-			if ( null !== $transform_instance ) {
-				$transform_data = $transform_instance->transform_data( $data, $jsonld, $references, $post_id );
-				if ( null !== $transform_data ) {
-					$jsonld[ $property['property_name'] ] = $this->make_single( $transform_data );
-				}
-			} else {
-				$jsonld[ $property['property_name'] ] = $this->make_single( $data );
-			}
-		}
-
-		return $jsonld;
-	}
-
-	/**
-	 * Returns data from data source.
-	 *
-	 * @param int $post_id Id of the post.
-	 * @param array $property_data The property data for the post_id.
-	 *
-	 * @return array Returns key, value array, if the value is not found, then it returns null.
-	 */
-	final public function get_data_from_data_source( $post_id, $property_data ) {
-		$value = $property_data['field_name'];
-
-		// Do 1 to 1 mapping and return result.
-		switch ( $property_data['field_type'] ) {
-			case self::FIELD_TYPE_ACF:
-				if ( ! function_exists( 'get_field' ) ) {
-					return array();
-				}
-
-				return get_field( $property_data['field_name'], $post_id );
-
-			case self::FIELD_TYPE_CUSTOM_FIELD:
-
-				return array_map( 'wp_strip_all_tags', get_post_meta( $post_id, $value ) );
-
-			default:
-				return $value;
-		}
-
-	}
-
-	private function make_single( $value ) {
-
-		$values = (array) $value;
-
-		if ( empty( $values ) ) {
-			return null;
-		}
-
-		if ( 1 === count( $values ) && 0 === key( $values ) ) {
-			return current( $values );
-		}
-
-		return $values;
-	}
+    /**
+     * Enumerations for the field types.
+     * Enumerations for the field types.
+     */
+    const FIELD_TYPE_TEXT_FIELD = 'text';
+    const FIELD_TYPE_CUSTOM_FIELD = 'custom_field';
+    const FIELD_TYPE_ACF = 'acf';
+    /**
+     * The {@link Mappings_Validator} instance to test.
+     *
+     * @since  3.25.0
+     * @access private
+     * @var Mappings_Validator $validator The {@link Mappings_Validator} instance.
+     */
+    private $validator;
+
+    /**
+     * The {@link Mappings_Transform_Functions_Registry} instance.
+     *
+     * @since  3.25.0
+     * @access private
+     * @var Mappings_Transform_Functions_Registry $transform_functions_registry The {@link Mappings_Transform_Functions_Registry} instance.
+     */
+    private $transform_functions_registry;
+
+    /**
+     * Initialize all dependencies required.
+     *
+     * @param Mappings_Validator $validator A {@link Mappings_Validator} instance.
+     * @param Mappings_Transform_Functions_Registry $transform_functions_registry
+     */
+    public function __construct( $validator, $transform_functions_registry ) {
+
+        $this->validator                    = $validator;
+        $this->transform_functions_registry = $transform_functions_registry;
+
+        // Hook to refactor the JSON-LD.
+        add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
+        add_filter( 'wl_entity_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 3 );
+
+    }
+
+    /**
+     * Hook to `wl_post_jsonld_array` and `wl_entity_jsonld_array`.
+     *
+     * Receive the JSON-LD and the references in the array along with the post ID and transform them according to
+     * the configuration.
+     *
+     * @param array $value {
+     *      The array containing the JSON-LD and the references.
+     *
+     * @type array $jsonld The JSON-LD array.
+     * @type int[] $references An array of post ID referenced by the JSON-LD (will be expanded by the converter).
+     * }
+     *
+     * @param int $post_id The post ID.
+     *
+     * @return array An array with the updated JSON-LD and references.
+     */
+    public function wl_post_jsonld_array( $value, $post_id ) {
+
+        $jsonld     = $value['jsonld'];
+        $references = $value['references'];
+
+        return array(
+            'jsonld'     => $this->wl_post_jsonld( $jsonld, $post_id, $references ),
+            'references' => $references,
+        );
+    }
+
+    /**
+     * Returns JSON-LD data after applying transformation functions.
+     *
+     * @param array $jsonld The JSON-LD structure.
+     * @param int $post_id The {@link WP_Post} id.
+     * @param array $references An array of post references.
+     *
+     * @return array the new refactored array structure.
+     * @since 3.25.0
+     */
+    private function wl_post_jsonld( $jsonld, $post_id, &$references ) {
+
+        // @@todo I think there's an issue here with the Validator, because you're changing the instance state and the
+        // instance may be reused afterwards.
+
+        $properties = $this->validator->validate( $post_id );
+
+        foreach ( $properties as $property ) {
+            $transform_instance = $this->transform_functions_registry->get_transform_function( $property['transform_function'] );
+            $data               = $this->get_data_from_data_source( $post_id, $property );
+            if ( null !== $transform_instance ) {
+                $transform_data = $transform_instance->transform_data( $data, $jsonld, $references, $post_id );
+                if ( null !== $transform_data ) {
+                    $jsonld[ $property['property_name'] ] = $this->make_single( $transform_data );
+                }
+            } else {
+                $jsonld[ $property['property_name'] ] = $this->make_single( $data );
+            }
+        }
+
+        return $jsonld;
+    }
+
+    /**
+     * Returns data from data source.
+     *
+     * @param int $post_id Id of the post.
+     * @param array $property_data The property data for the post_id.
+     *
+     * @return array Returns key, value array, if the value is not found, then it returns null.
+     */
+    final public function get_data_from_data_source( $post_id, $property_data ) {
+        $value = $property_data['field_name'];
+
+        // Do 1 to 1 mapping and return result.
+        switch ( $property_data['field_type'] ) {
+            case self::FIELD_TYPE_ACF:
+                if ( ! function_exists( 'get_field' ) ) {
+                    return array();
+                }
+
+                return get_field( $property_data['field_name'], $post_id );
+
+            case self::FIELD_TYPE_CUSTOM_FIELD:
+
+                return array_map( 'wp_strip_all_tags', get_post_meta( $post_id, $value ) );
+
+            default:
+                return $value;
+        }
+
+    }
+
+    private function make_single( $value ) {
+
+        $values = (array) $value;
+
+        if ( empty( $values ) ) {
+            return null;
+        }
+
+        if ( 1 === count( $values ) && 0 === key( $values ) ) {
+            return current( $values );
+        }
+
+        return $values;
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -47,14 +47,14 @@ 
 	 * @param Mappings_Validator $validator A {@link Mappings_Validator} instance.
 	 * @param Mappings_Transform_Functions_Registry $transform_functions_registry
 	 */
-	public function __construct( $validator, $transform_functions_registry ) {
+	public function __construct($validator, $transform_functions_registry) {
 
 		$this->validator                    = $validator;
 		$this->transform_functions_registry = $transform_functions_registry;
 
 		// Hook to refactor the JSON-LD.
-		add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
-		add_filter( 'wl_entity_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 3 );
+		add_filter('wl_post_jsonld_array', array($this, 'wl_post_jsonld_array'), 11, 2);
+		add_filter('wl_entity_jsonld_array', array($this, 'wl_post_jsonld_array'), 11, 3);
 
 	}
 
@@ -75,13 +75,13 @@ 
 	 *
 	 * @return array An array with the updated JSON-LD and references.
 	 */
-	public function wl_post_jsonld_array( $value, $post_id ) {
+	public function wl_post_jsonld_array($value, $post_id) {
 
 		$jsonld     = $value['jsonld'];
 		$references = $value['references'];
 
 		return array(
-			'jsonld'     => $this->wl_post_jsonld( $jsonld, $post_id, $references ),
+			'jsonld'     => $this->wl_post_jsonld($jsonld, $post_id, $references),
 			'references' => $references,
 		);
 	}
@@ -96,23 +96,23 @@ 
 	 * @return array the new refactored array structure.
 	 * @since 3.25.0
 	 */
-	private function wl_post_jsonld( $jsonld, $post_id, &$references ) {
+	private function wl_post_jsonld($jsonld, $post_id, &$references) {
 
 		// @@todo I think there's an issue here with the Validator, because you're changing the instance state and the
 		// instance may be reused afterwards.
 
-		$properties = $this->validator->validate( $post_id );
+		$properties = $this->validator->validate($post_id);
 
-		foreach ( $properties as $property ) {
-			$transform_instance = $this->transform_functions_registry->get_transform_function( $property['transform_function'] );
-			$data               = $this->get_data_from_data_source( $post_id, $property );
-			if ( null !== $transform_instance ) {
-				$transform_data = $transform_instance->transform_data( $data, $jsonld, $references, $post_id );
-				if ( null !== $transform_data ) {
-					$jsonld[ $property['property_name'] ] = $this->make_single( $transform_data );
+		foreach ($properties as $property) {
+			$transform_instance = $this->transform_functions_registry->get_transform_function($property['transform_function']);
+			$data               = $this->get_data_from_data_source($post_id, $property);
+			if (null !== $transform_instance) {
+				$transform_data = $transform_instance->transform_data($data, $jsonld, $references, $post_id);
+				if (null !== $transform_data) {
+					$jsonld[$property['property_name']] = $this->make_single($transform_data);
 				}
 			} else {
-				$jsonld[ $property['property_name'] ] = $this->make_single( $data );
+				$jsonld[$property['property_name']] = $this->make_single($data);
 			}
 		}
 
@@ -127,21 +127,21 @@ 
 	 *
 	 * @return array Returns key, value array, if the value is not found, then it returns null.
 	 */
-	final public function get_data_from_data_source( $post_id, $property_data ) {
+	final public function get_data_from_data_source($post_id, $property_data) {
 		$value = $property_data['field_name'];
 
 		// Do 1 to 1 mapping and return result.
-		switch ( $property_data['field_type'] ) {
+		switch ($property_data['field_type']) {
 			case self::FIELD_TYPE_ACF:
-				if ( ! function_exists( 'get_field' ) ) {
+				if ( ! function_exists('get_field')) {
 					return array();
 				}
 
-				return get_field( $property_data['field_name'], $post_id );
+				return get_field($property_data['field_name'], $post_id);
 
 			case self::FIELD_TYPE_CUSTOM_FIELD:
 
-				return array_map( 'wp_strip_all_tags', get_post_meta( $post_id, $value ) );
+				return array_map('wp_strip_all_tags', get_post_meta($post_id, $value));
 
 			default:
 				return $value;
@@ -149,16 +149,16 @@ 
 
 	}
 
-	private function make_single( $value ) {
+	private function make_single($value) {
 
 		$values = (array) $value;
 
-		if ( empty( $values ) ) {
+		if (empty($values)) {
 			return null;
 		}
 
-		if ( 1 === count( $values ) && 0 === key( $values ) ) {
-			return current( $values );
+		if (1 === count($values) && 0 === key($values)) {
+			return current($values);
 		}
 
 		return $values;

src/wordlift/jsonld/class-jsonld-endpoint.php

Indentation +125 added lines, -125 removed lines

@@ -21,138 +21,138 @@
  */
 class Jsonld_Endpoint {
 
-	/**
-	 * The {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
-	 */
-	private $jsonld_service;
-	/**
-	 * @var \Wordlift_Entity_Uri_Service
-	 */
-	private $entity_uri_service;
-
-	/**
-	 * Jsonld_Endpoint constructor.
-	 *
-	 * @param \Wordlift_Jsonld_Service $jsonld_service
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
-	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
-
-		$this->jsonld_service     = $jsonld_service;
-		$this->entity_uri_service = $entity_uri_service;
-
-		// PHP 5.3 compatibility.
-		$that = $this;
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
-				'methods'  => 'GET',
-				'callback' => array( $that, 'jsonld_using_post_id' ),
-				'args'     => array(
-					'id' => array(
-						'validate_callback' => function ( $param, $request, $key ) {
-							return is_numeric( $param );
-						},
-						'sanitize_callback' => 'absint',
-					),
-				)
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
-				'methods'  => 'GET',
-				'callback' => array( $that, 'jsonld_using_get_page_by_path' ),
-			) );
-
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
-				'methods'  => 'GET',
-				'callback' => array( $that, 'jsonld_using_item_id' ),
-			) );
-		} );
-
-	}
-
-	/**
-	 * Callback for the JSON-LD request.
-	 *
-	 * @param array $request {
-	 *  The request array.
-	 *
-	 * @type int $id The post id.
-	 * }
-	 *
-	 * @return WP_REST_Response
-	 * @throws \Exception
-	 */
-	public function jsonld_using_post_id( $request ) {
-
-		$post_id     = $request['id'];
-		$is_homepage = ( 0 === $post_id );
-
-		// Send the generated JSON-LD.
-		$data     = $this->jsonld_service->get_jsonld( $is_homepage, $post_id );
-		$response = new WP_REST_Response( $data );
-
-		$cache_in_seconds = 86400;
-		$date_timezone    = new DateTimeZone( 'GMT' );
-		$date_now         = new DateTime( 'now', $date_timezone );
-		$date_interval    = new DateInterval( "PT{$cache_in_seconds}S" );
-		$expires          = $date_now->add( $date_interval )->format( 'D, j M Y H:i:s T' );
-
-		$response->set_headers( array(
-			'Content-Type'  => 'application/ld+json; charset=' . get_option( 'blog_charset' ),
-			'Cache-Control' => "max-age=$cache_in_seconds",
-			'Expires'       => $expires
-		) );
-
-		return $response;
-	}
-
-	/**
-	 * Provide a JSON-LD given the itemId.
-	 *
-	 * @param array $request {
-	 *  The request array.
-	 *
-	 * @type string $item_id The entity item id.
-	 * }
-	 *
-	 * @return WP_REST_Response
-	 * @throws \Exception
-	 */
-	public function jsonld_using_item_id( $request ) {
-
-		$item_id = 'http://' . $request['item_id'];
-		$post    = $this->entity_uri_service->get_entity( $item_id );
-
-		if ( ! is_a( $post, 'WP_Post' ) ) {
-			return new WP_REST_Response( esc_html( "$item_id not found." ), 404, array( 'Content-Type' => 'text/html' ) );
-		}
-
-		return $this->jsonld_using_post_id( array( 'id' => $post->ID, ) );
-	}
-
-	public function jsonld_using_get_page_by_path( $request ) {
-
-		$post_name = $request['post_name'];
-		$post_type = $request['post_type'];
-
-		global $wpdb;
-
-		$sql     = "
+    /**
+     * The {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @var Wordlift_Jsonld_Service The {@link Wordlift_Jsonld_Service} instance.
+     */
+    private $jsonld_service;
+    /**
+     * @var \Wordlift_Entity_Uri_Service
+     */
+    private $entity_uri_service;
+
+    /**
+     * Jsonld_Endpoint constructor.
+     *
+     * @param \Wordlift_Jsonld_Service $jsonld_service
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service
+     */
+    public function __construct( $jsonld_service, $entity_uri_service ) {
+
+        $this->jsonld_service     = $jsonld_service;
+        $this->entity_uri_service = $entity_uri_service;
+
+        // PHP 5.3 compatibility.
+        $that = $this;
+        add_action( 'rest_api_init', function () use ( $that ) {
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
+                'methods'  => 'GET',
+                'callback' => array( $that, 'jsonld_using_post_id' ),
+                'args'     => array(
+                    'id' => array(
+                        'validate_callback' => function ( $param, $request, $key ) {
+                            return is_numeric( $param );
+                        },
+                        'sanitize_callback' => 'absint',
+                    ),
+                )
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
+                'methods'  => 'GET',
+                'callback' => array( $that, 'jsonld_using_get_page_by_path' ),
+            ) );
+
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
+                'methods'  => 'GET',
+                'callback' => array( $that, 'jsonld_using_item_id' ),
+            ) );
+        } );
+
+    }
+
+    /**
+     * Callback for the JSON-LD request.
+     *
+     * @param array $request {
+     *  The request array.
+     *
+     * @type int $id The post id.
+     * }
+     *
+     * @return WP_REST_Response
+     * @throws \Exception
+     */
+    public function jsonld_using_post_id( $request ) {
+
+        $post_id     = $request['id'];
+        $is_homepage = ( 0 === $post_id );
+
+        // Send the generated JSON-LD.
+        $data     = $this->jsonld_service->get_jsonld( $is_homepage, $post_id );
+        $response = new WP_REST_Response( $data );
+
+        $cache_in_seconds = 86400;
+        $date_timezone    = new DateTimeZone( 'GMT' );
+        $date_now         = new DateTime( 'now', $date_timezone );
+        $date_interval    = new DateInterval( "PT{$cache_in_seconds}S" );
+        $expires          = $date_now->add( $date_interval )->format( 'D, j M Y H:i:s T' );
+
+        $response->set_headers( array(
+            'Content-Type'  => 'application/ld+json; charset=' . get_option( 'blog_charset' ),
+            'Cache-Control' => "max-age=$cache_in_seconds",
+            'Expires'       => $expires
+        ) );
+
+        return $response;
+    }
+
+    /**
+     * Provide a JSON-LD given the itemId.
+     *
+     * @param array $request {
+     *  The request array.
+     *
+     * @type string $item_id The entity item id.
+     * }
+     *
+     * @return WP_REST_Response
+     * @throws \Exception
+     */
+    public function jsonld_using_item_id( $request ) {
+
+        $item_id = 'http://' . $request['item_id'];
+        $post    = $this->entity_uri_service->get_entity( $item_id );
+
+        if ( ! is_a( $post, 'WP_Post' ) ) {
+            return new WP_REST_Response( esc_html( "$item_id not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+        }
+
+        return $this->jsonld_using_post_id( array( 'id' => $post->ID, ) );
+    }
+
+    public function jsonld_using_get_page_by_path( $request ) {
+
+        $post_name = $request['post_name'];
+        $post_type = $request['post_type'];
+
+        global $wpdb;
+
+        $sql     = "
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_name = %s
 			 AND post_type = %s
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $post_name, $post_type ) );
+        $post_id = $wpdb->get_var( $wpdb->prepare( $sql, $post_name, $post_type ) );
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "$post_name of type $post_type not found." ), 404, array( 'Content-Type' => 'text/html' ) );
-		}
+        if ( is_null( $post_id ) ) {
+            return new WP_REST_Response( esc_html( "$post_name of type $post_type not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+        }
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
-	}
+        return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+    }
 
 }
\ No newline at end of file

Spacing +36 added lines, -36 removed lines

@@ -38,36 +38,36 @@ 
 	 * @param \Wordlift_Jsonld_Service $jsonld_service
 	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
 	 */
-	public function __construct( $jsonld_service, $entity_uri_service ) {
+	public function __construct($jsonld_service, $entity_uri_service) {
 
 		$this->jsonld_service     = $jsonld_service;
 		$this->entity_uri_service = $entity_uri_service;
 
 		// PHP 5.3 compatibility.
 		$that = $this;
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
+		add_action('rest_api_init', function() use ($that) {
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<id>\d+)', array(
 				'methods'  => 'GET',
-				'callback' => array( $that, 'jsonld_using_post_id' ),
+				'callback' => array($that, 'jsonld_using_post_id'),
 				'args'     => array(
 					'id' => array(
-						'validate_callback' => function ( $param, $request, $key ) {
-							return is_numeric( $param );
+						'validate_callback' => function($param, $request, $key) {
+							return is_numeric($param);
 						},
 						'sanitize_callback' => 'absint',
 					),
 				)
-			) );
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/(?P<post_type>.*)/(?P<post_name>.*)', array(
 				'methods'  => 'GET',
-				'callback' => array( $that, 'jsonld_using_get_page_by_path' ),
-			) );
+				'callback' => array($that, 'jsonld_using_get_page_by_path'),
+			));
 
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/jsonld/http/(?P<item_id>.*)', array(
 				'methods'  => 'GET',
-				'callback' => array( $that, 'jsonld_using_item_id' ),
-			) );
+				'callback' => array($that, 'jsonld_using_item_id'),
+			));
 		} );
 
 	}
@@ -84,26 +84,26 @@ 
 	 * @return WP_REST_Response
 	 * @throws \Exception
 	 */
-	public function jsonld_using_post_id( $request ) {
+	public function jsonld_using_post_id($request) {
 
 		$post_id     = $request['id'];
-		$is_homepage = ( 0 === $post_id );
+		$is_homepage = (0 === $post_id);
 
 		// Send the generated JSON-LD.
-		$data     = $this->jsonld_service->get_jsonld( $is_homepage, $post_id );
-		$response = new WP_REST_Response( $data );
+		$data     = $this->jsonld_service->get_jsonld($is_homepage, $post_id);
+		$response = new WP_REST_Response($data);
 
 		$cache_in_seconds = 86400;
-		$date_timezone    = new DateTimeZone( 'GMT' );
-		$date_now         = new DateTime( 'now', $date_timezone );
-		$date_interval    = new DateInterval( "PT{$cache_in_seconds}S" );
-		$expires          = $date_now->add( $date_interval )->format( 'D, j M Y H:i:s T' );
+		$date_timezone    = new DateTimeZone('GMT');
+		$date_now         = new DateTime('now', $date_timezone);
+		$date_interval    = new DateInterval("PT{$cache_in_seconds}S");
+		$expires          = $date_now->add($date_interval)->format('D, j M Y H:i:s T');
 
-		$response->set_headers( array(
-			'Content-Type'  => 'application/ld+json; charset=' . get_option( 'blog_charset' ),
+		$response->set_headers(array(
+			'Content-Type'  => 'application/ld+json; charset='.get_option('blog_charset'),
 			'Cache-Control' => "max-age=$cache_in_seconds",
 			'Expires'       => $expires
-		) );
+		));
 
 		return $response;
 	}
@@ -120,39 +120,39 @@ 
 	 * @return WP_REST_Response
 	 * @throws \Exception
 	 */
-	public function jsonld_using_item_id( $request ) {
+	public function jsonld_using_item_id($request) {
 
-		$item_id = 'http://' . $request['item_id'];
-		$post    = $this->entity_uri_service->get_entity( $item_id );
+		$item_id = 'http://'.$request['item_id'];
+		$post    = $this->entity_uri_service->get_entity($item_id);
 
-		if ( ! is_a( $post, 'WP_Post' ) ) {
-			return new WP_REST_Response( esc_html( "$item_id not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+		if ( ! is_a($post, 'WP_Post')) {
+			return new WP_REST_Response(esc_html("$item_id not found."), 404, array('Content-Type' => 'text/html'));
 		}
 
-		return $this->jsonld_using_post_id( array( 'id' => $post->ID, ) );
+		return $this->jsonld_using_post_id(array('id' => $post->ID,));
 	}
 
-	public function jsonld_using_get_page_by_path( $request ) {
+	public function jsonld_using_get_page_by_path($request) {
 
 		$post_name = $request['post_name'];
 		$post_type = $request['post_type'];
 
 		global $wpdb;
 
-		$sql     = "
+		$sql = "
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_name = %s
 			 AND post_type = %s
 		";
 
-		$post_id = $wpdb->get_var( $wpdb->prepare( $sql, $post_name, $post_type ) );
+		$post_id = $wpdb->get_var($wpdb->prepare($sql, $post_name, $post_type));
 
-		if ( is_null( $post_id ) ) {
-			return new WP_REST_Response( esc_html( "$post_name of type $post_type not found." ), 404, array( 'Content-Type' => 'text/html' ) );
+		if (is_null($post_id)) {
+			return new WP_REST_Response(esc_html("$post_name of type $post_type not found."), 404, array('Content-Type' => 'text/html'));
 		}
 
-		return $this->jsonld_using_post_id( array( 'id' => $post_id, ) );
+		return $this->jsonld_using_post_id(array('id' => $post_id,));
 	}
 
 }
\ No newline at end of file

src/install/class-wordlift-install-3-25-0.php

Indentation +145 added lines, -145 removed lines

@@ -60,54 +60,54 @@ 
  * @subpackage Wordlift/install
  */
 class Wordlift_Install_3_25_0 extends Wordlift_Install {
-	/**
-	 * @inheritdoc
-	 */
-	protected static $version = '3.25.2.20200317.1';
-
-	/**
-	 * Reference to global $wpdb instance.
-	 *
-	 * @var $wpdb
-	 * */
-	private $wpdb;
-
-	/** Constructor for 3_25_0 installer. */
-	public function __construct() {
-		global $wpdb;
-		$this->wpdb = $wpdb;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function install() {
-		$this->create_mappings_table();
-		$this->create_rule_group_table();
-		$this->create_rule_table();
-		$this->create_property_table();
-	}
-
-	/**
-	 * Install mappings table.
-	 *
-	 * +----------------+--------------+------+-----+---------+----------------+
-	 * | Field          | Type         | Null | Key | Default | Extra          |
-	 * +----------------+--------------+------+-----+---------+----------------+
-	 * | mapping_id     | int(11)      | NO   | PRI | NULL    | auto_increment |
-	 * | mapping_title  | varchar(255) | NO   |     | NULL    |                |
-	 * | mapping_status | varchar(255) | NO   |     | active  |                |
-	 * +----------------+--------------+------+-----+---------+----------------+
-	 *
-	 * @return void
-	 * @since 3.25.0
-	 *
-	 */
-	public function create_mappings_table() {
-		$table_name      = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
-		$charset_collate = $this->wpdb->get_charset_collate();
-		// @@todo: is necessary to prefix the column names with `mapping_` ? we're the mappings table already.
-		$sql = <<<EOF
+    /**
+     * @inheritdoc
+     */
+    protected static $version = '3.25.2.20200317.1';
+
+    /**
+     * Reference to global $wpdb instance.
+     *
+     * @var $wpdb
+     * */
+    private $wpdb;
+
+    /** Constructor for 3_25_0 installer. */
+    public function __construct() {
+        global $wpdb;
+        $this->wpdb = $wpdb;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function install() {
+        $this->create_mappings_table();
+        $this->create_rule_group_table();
+        $this->create_rule_table();
+        $this->create_property_table();
+    }
+
+    /**
+     * Install mappings table.
+     *
+     * +----------------+--------------+------+-----+---------+----------------+
+     * | Field          | Type         | Null | Key | Default | Extra          |
+     * +----------------+--------------+------+-----+---------+----------------+
+     * | mapping_id     | int(11)      | NO   | PRI | NULL    | auto_increment |
+     * | mapping_title  | varchar(255) | NO   |     | NULL    |                |
+     * | mapping_status | varchar(255) | NO   |     | active  |                |
+     * +----------------+--------------+------+-----+---------+----------------+
+     *
+     * @return void
+     * @since 3.25.0
+     *
+     */
+    public function create_mappings_table() {
+        $table_name      = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
+        $charset_collate = $this->wpdb->get_charset_collate();
+        // @@todo: is necessary to prefix the column names with `mapping_` ? we're the mappings table already.
+        $sql = <<<EOF
         CREATE TABLE $table_name (
 			mapping_id INT(11) NOT NULL AUTO_INCREMENT, 
 			mapping_title VARCHAR(255) NOT NULL,
@@ -115,33 +115,33 @@ 
 			PRIMARY KEY  (mapping_id)
         ) $charset_collate;
 EOF;
-		// Execute the query for mappings table.
-		dbDelta( $sql );
-	}
-
-
-	/**
-	 * Install rule table
-	 *
-	 * +------------------+--------------+------+-----+---------+----------------+
-	 * | Field            | Type         | Null | Key | Default | Extra          |
-	 * +------------------+--------------+------+-----+---------+----------------+
-	 * | rule_id          | int(11)      | NO   | PRI | NULL    | auto_increment |
-	 * | rule_field_one   | varchar(255) | NO   |     | NULL    |                |
-	 * | rule_logic_field | varchar(255) | NO   |     | NULL    |                |
-	 * | rule_field_two   | varchar(255) | NO   |     | NULL    |                |
-	 * | rule_group_id    | int(11)      | NO   | MUL | NULL    |                |
-	 * +------------------+--------------+------+-----+---------+----------------+
-	 *
-	 * @return void
-	 * @since 3.25.0
-	 */
-	public function create_rule_table() {
-		$table_name            = $this->wpdb->prefix . WL_RULE_TABLE_NAME;
-		$rule_group_table_name = $this->wpdb->prefix . WL_RULE_GROUP_TABLE_NAME;
-		$charset_collate       = $this->wpdb->get_charset_collate();
-		// @@todo: is necessary to prefix the column names with `rule_` ? we're the rules table already.
-		$sql = <<<EOF
+        // Execute the query for mappings table.
+        dbDelta( $sql );
+    }
+
+
+    /**
+     * Install rule table
+     *
+     * +------------------+--------------+------+-----+---------+----------------+
+     * | Field            | Type         | Null | Key | Default | Extra          |
+     * +------------------+--------------+------+-----+---------+----------------+
+     * | rule_id          | int(11)      | NO   | PRI | NULL    | auto_increment |
+     * | rule_field_one   | varchar(255) | NO   |     | NULL    |                |
+     * | rule_logic_field | varchar(255) | NO   |     | NULL    |                |
+     * | rule_field_two   | varchar(255) | NO   |     | NULL    |                |
+     * | rule_group_id    | int(11)      | NO   | MUL | NULL    |                |
+     * +------------------+--------------+------+-----+---------+----------------+
+     *
+     * @return void
+     * @since 3.25.0
+     */
+    public function create_rule_table() {
+        $table_name            = $this->wpdb->prefix . WL_RULE_TABLE_NAME;
+        $rule_group_table_name = $this->wpdb->prefix . WL_RULE_GROUP_TABLE_NAME;
+        $charset_collate       = $this->wpdb->get_charset_collate();
+        // @@todo: is necessary to prefix the column names with `rule_` ? we're the rules table already.
+        $sql = <<<EOF
         CREATE TABLE IF NOT EXISTS $table_name (
 				rule_id INT(11) NOT NULL AUTO_INCREMENT,
 				rule_field_one VARCHAR(255) NOT NULL,
@@ -153,31 +153,31 @@ 
 				PRIMARY KEY  (rule_id)
         ) $charset_collate;
 EOF;
-		// Execute the query for mappings table.
-		$this->wpdb->query( $sql );
-	}
-
-	/**
-	 * Install rule group table, should run after creating mapping and
-	 * rule table due to foreign key reference.
-	 *
-	 * +---------------+---------+------+-----+---------+----------------+
-	 * | Field         | Type    | Null | Key | Default | Extra          |
-	 * +---------------+---------+------+-----+---------+----------------+
-	 * | rule_group_id | int(11) | NO   | PRI | NULL    | auto_increment |
-	 * | mapping_id    | int(11) | NO   | MUL | NULL    |                |
-	 * +---------------+---------+------+-----+---------+----------------+
-	 *
-	 * @return void
-	 * @since 3.25.0
-	 */
-	public function create_rule_group_table() {
-		$table_name      = $this->wpdb->prefix . WL_RULE_GROUP_TABLE_NAME;
-		$charset_collate = $this->wpdb->get_charset_collate();
-
-		$mapping_table_name = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
-		// @@todo is this table actually needed? I am not understanding what it does.
-		$sql = <<<EOF
+        // Execute the query for mappings table.
+        $this->wpdb->query( $sql );
+    }
+
+    /**
+     * Install rule group table, should run after creating mapping and
+     * rule table due to foreign key reference.
+     *
+     * +---------------+---------+------+-----+---------+----------------+
+     * | Field         | Type    | Null | Key | Default | Extra          |
+     * +---------------+---------+------+-----+---------+----------------+
+     * | rule_group_id | int(11) | NO   | PRI | NULL    | auto_increment |
+     * | mapping_id    | int(11) | NO   | MUL | NULL    |                |
+     * +---------------+---------+------+-----+---------+----------------+
+     *
+     * @return void
+     * @since 3.25.0
+     */
+    public function create_rule_group_table() {
+        $table_name      = $this->wpdb->prefix . WL_RULE_GROUP_TABLE_NAME;
+        $charset_collate = $this->wpdb->get_charset_collate();
+
+        $mapping_table_name = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
+        // @@todo is this table actually needed? I am not understanding what it does.
+        $sql = <<<EOF
         CREATE TABLE IF NOT EXISTS $table_name (
                 rule_group_id INT(11) NOT NULL AUTO_INCREMENT,
                 mapping_id INT(11) NOT NULL,
@@ -186,38 +186,38 @@ 
                 ON DELETE CASCADE
         ) $charset_collate;
 EOF;
-		// Execute the query for rule group table, we cant use db delta
-		// due to lack of support for foreign keys.
-		$this->wpdb->query( $sql );
-	}
-
-
-	/**
-	 * Install property table, should run after mapping table due to
-	 * foreign key reference.
-	 *
-	 * +--------------------+--------------+------+-----+---------+----------------+
-	 * | Field              | Type         | Null | Key | Default | Extra          |
-	 * +--------------------+--------------+------+-----+---------+----------------+
-	 * | property_id        | int(11)      | NO   | PRI | NULL    | auto_increment |
-	 * | mapping_id         | int(11)      | NO   | MUL | NULL    |                |
-	 * | property_name      | varchar(255) | NO   |     | NULL    |                |
-	 * | field_type         | varchar(255) | NO   |     | NULL    |                |
-	 * | field_name         | varchar(255) | NO   |     | NULL    |                |
-	 * | transform_function | varchar(255) | NO   |     | NULL    |                |
-	 * | property_status    | varchar(255) | NO   |     | active  |                |
-	 * +--------------------+--------------+------+-----+---------+----------------+
-	 *
-	 * @return void
-	 * @since 3.25.0
-	 */
-	public function create_property_table() {
-		$table_name      = $this->wpdb->prefix . WL_PROPERTY_TABLE_NAME;
-		$charset_collate = $this->wpdb->get_charset_collate();
-
-		$mapping_table_name = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
-		// @@todo do you we need the `property_` prefix? this is the property table anyway.
-		$sql = <<<EOF
+        // Execute the query for rule group table, we cant use db delta
+        // due to lack of support for foreign keys.
+        $this->wpdb->query( $sql );
+    }
+
+
+    /**
+     * Install property table, should run after mapping table due to
+     * foreign key reference.
+     *
+     * +--------------------+--------------+------+-----+---------+----------------+
+     * | Field              | Type         | Null | Key | Default | Extra          |
+     * +--------------------+--------------+------+-----+---------+----------------+
+     * | property_id        | int(11)      | NO   | PRI | NULL    | auto_increment |
+     * | mapping_id         | int(11)      | NO   | MUL | NULL    |                |
+     * | property_name      | varchar(255) | NO   |     | NULL    |                |
+     * | field_type         | varchar(255) | NO   |     | NULL    |                |
+     * | field_name         | varchar(255) | NO   |     | NULL    |                |
+     * | transform_function | varchar(255) | NO   |     | NULL    |                |
+     * | property_status    | varchar(255) | NO   |     | active  |                |
+     * +--------------------+--------------+------+-----+---------+----------------+
+     *
+     * @return void
+     * @since 3.25.0
+     */
+    public function create_property_table() {
+        $table_name      = $this->wpdb->prefix . WL_PROPERTY_TABLE_NAME;
+        $charset_collate = $this->wpdb->get_charset_collate();
+
+        $mapping_table_name = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
+        // @@todo do you we need the `property_` prefix? this is the property table anyway.
+        $sql = <<<EOF
         CREATE TABLE IF NOT EXISTS $table_name (
                 property_id INT(11) NOT NULL AUTO_INCREMENT,
                 mapping_id INT(11) NOT NULL,
@@ -231,18 +231,18 @@ 
                 ON DELETE CASCADE
         ) $charset_collate;
 EOF;
-		// Execute the query for property table, we cant use db delta
-		// due to lack of support for foreign keys.
-		$this->wpdb->query( $sql );
-	}
-
-	public static function drop_tables() {
-		global $wpdb;
-
-		$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_PROPERTY_TABLE_NAME );
-		$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_RULE_TABLE_NAME );
-		$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_RULE_GROUP_TABLE_NAME );
-		$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_MAPPING_TABLE_NAME );
-	}
+        // Execute the query for property table, we cant use db delta
+        // due to lack of support for foreign keys.
+        $this->wpdb->query( $sql );
+    }
+
+    public static function drop_tables() {
+        global $wpdb;
+
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_PROPERTY_TABLE_NAME );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_RULE_TABLE_NAME );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_RULE_GROUP_TABLE_NAME );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_MAPPING_TABLE_NAME );
+    }
 
 }