insideout10 / wordlift-plugin

src/wordlift/dataset/class-sync-user-hooks.php

Indentation +105 added lines, -105 removed lines

@@ -7,110 +7,110 @@
 use Wordlift\Object_Type_Enum;
 
 class Sync_User_Hooks extends Abstract_Sync_Hooks {
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * @var Sync_Service
-	 */
-	private $sync_service;
-
-	/**
-	 * Sync_User_Hooks constructor.
-	 *
-	 * @param Sync_Service $sync_service
-	 */
-	public function __construct( Sync_Service $sync_service ) {
-		parent::__construct();
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->sync_service = $sync_service;
-
-		$this->register_hooks();
-
-	}
-
-	private function register_hooks() {
-		/**
-		 * Register hooks for user and meta.
-		 */
-		add_action( 'user_register', array( $this, 'changed_user' ) );
-		add_action( 'profile_update', array( $this, 'changed_user' ) );
-		add_action( 'added_user_meta', array( $this, 'changed_user_meta' ), 10, 3 );
-		add_action( 'updated_user_meta', array( $this, 'changed_user_meta' ), 10, 3 );
-		add_action( 'deleted_user_meta', array( $this, 'changed_user_meta' ), 10, 3 );
-		add_action( 'delete_user', array( $this, 'delete_user' ) );
-
-	}
-
-	public function changed_user( $user_id ) {
-
-		$this->sync( $user_id );
-
-	}
-
-	public function changed_user_meta( $meta_id, $user_id, $meta_key ) {
-
-		if ( in_array(
-			$meta_key,
-			apply_filters(
-				'wl_dataset__sync_user_hooks__ignored_meta_keys',
-				apply_filters(
-					'wl_dataset__sync_hooks__ignored_meta_keys',
-					array(
-						'rich_editing',
-						'comment_shortcuts',
-						'admin_color',
-						'use_ssl',
-						'show_admin_bar_front',
-						'wptests_capabilities',
-						'wptests_user_level',
-						'dismissed_wp_pointers',
-						'entity_url',
-					)
-				)
-			),
-			true
-		) ) {
-			return;
-		}
-
-		$this->sync( $user_id );
-
-	}
-
-	private function sync( $user_id ) {
-		$this->enqueue( array( 'do_sync', $user_id ) );
-	}
-
-	public function do_sync( $user_id ) {
-
-		try {
-			$this->sync_service->sync_one( Object_Type_Enum::USER, (int) $user_id );
-		} catch ( \Exception $e ) {
-			$this->log->error( "An error occurred while trying to sync user $user_id: " . $e->getMessage(), $e );
-		}
-
-	}
-
-	public function delete_user( $user_id ) {
-		$this->enqueue( array( 'do_delete', $user_id ) );
-	}
-
-	public function do_delete( $user_id ) {
-		try {
-			$this->sync_service->delete_one(
-				Object_Type_Enum::USER,
-				$user_id,
-				Wordpress_User_Content_Legacy_Service::get_instance()->get_entity_id( Wordpress_Content_Id::create_user( $user_id ) )
-			);
-		} catch ( \Exception $e ) {
-			$this->log->error( "An error occurred while trying to delete user $user_id: " . $e->getMessage(), $e );
-		}
-
-	}
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * @var Sync_Service
+     */
+    private $sync_service;
+
+    /**
+     * Sync_User_Hooks constructor.
+     *
+     * @param Sync_Service $sync_service
+     */
+    public function __construct( Sync_Service $sync_service ) {
+        parent::__construct();
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->sync_service = $sync_service;
+
+        $this->register_hooks();
+
+    }
+
+    private function register_hooks() {
+        /**
+         * Register hooks for user and meta.
+         */
+        add_action( 'user_register', array( $this, 'changed_user' ) );
+        add_action( 'profile_update', array( $this, 'changed_user' ) );
+        add_action( 'added_user_meta', array( $this, 'changed_user_meta' ), 10, 3 );
+        add_action( 'updated_user_meta', array( $this, 'changed_user_meta' ), 10, 3 );
+        add_action( 'deleted_user_meta', array( $this, 'changed_user_meta' ), 10, 3 );
+        add_action( 'delete_user', array( $this, 'delete_user' ) );
+
+    }
+
+    public function changed_user( $user_id ) {
+
+        $this->sync( $user_id );
+
+    }
+
+    public function changed_user_meta( $meta_id, $user_id, $meta_key ) {
+
+        if ( in_array(
+            $meta_key,
+            apply_filters(
+                'wl_dataset__sync_user_hooks__ignored_meta_keys',
+                apply_filters(
+                    'wl_dataset__sync_hooks__ignored_meta_keys',
+                    array(
+                        'rich_editing',
+                        'comment_shortcuts',
+                        'admin_color',
+                        'use_ssl',
+                        'show_admin_bar_front',
+                        'wptests_capabilities',
+                        'wptests_user_level',
+                        'dismissed_wp_pointers',
+                        'entity_url',
+                    )
+                )
+            ),
+            true
+        ) ) {
+            return;
+        }
+
+        $this->sync( $user_id );
+
+    }
+
+    private function sync( $user_id ) {
+        $this->enqueue( array( 'do_sync', $user_id ) );
+    }
+
+    public function do_sync( $user_id ) {
+
+        try {
+            $this->sync_service->sync_one( Object_Type_Enum::USER, (int) $user_id );
+        } catch ( \Exception $e ) {
+            $this->log->error( "An error occurred while trying to sync user $user_id: " . $e->getMessage(), $e );
+        }
+
+    }
+
+    public function delete_user( $user_id ) {
+        $this->enqueue( array( 'do_delete', $user_id ) );
+    }
+
+    public function do_delete( $user_id ) {
+        try {
+            $this->sync_service->delete_one(
+                Object_Type_Enum::USER,
+                $user_id,
+                Wordpress_User_Content_Legacy_Service::get_instance()->get_entity_id( Wordpress_Content_Id::create_user( $user_id ) )
+            );
+        } catch ( \Exception $e ) {
+            $this->log->error( "An error occurred while trying to delete user $user_id: " . $e->getMessage(), $e );
+        }
+
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -22,10 +22,10 @@ 
 	 *
 	 * @param Sync_Service $sync_service
 	 */
-	public function __construct( Sync_Service $sync_service ) {
+	public function __construct(Sync_Service $sync_service) {
 		parent::__construct();
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 		$this->sync_service = $sync_service;
 
@@ -37,24 +37,24 @@ 
 		/**
 		 * Register hooks for user and meta.
 		 */
-		add_action( 'user_register', array( $this, 'changed_user' ) );
-		add_action( 'profile_update', array( $this, 'changed_user' ) );
-		add_action( 'added_user_meta', array( $this, 'changed_user_meta' ), 10, 3 );
-		add_action( 'updated_user_meta', array( $this, 'changed_user_meta' ), 10, 3 );
-		add_action( 'deleted_user_meta', array( $this, 'changed_user_meta' ), 10, 3 );
-		add_action( 'delete_user', array( $this, 'delete_user' ) );
+		add_action('user_register', array($this, 'changed_user'));
+		add_action('profile_update', array($this, 'changed_user'));
+		add_action('added_user_meta', array($this, 'changed_user_meta'), 10, 3);
+		add_action('updated_user_meta', array($this, 'changed_user_meta'), 10, 3);
+		add_action('deleted_user_meta', array($this, 'changed_user_meta'), 10, 3);
+		add_action('delete_user', array($this, 'delete_user'));
 
 	}
 
-	public function changed_user( $user_id ) {
+	public function changed_user($user_id) {
 
-		$this->sync( $user_id );
+		$this->sync($user_id);
 
 	}
 
-	public function changed_user_meta( $meta_id, $user_id, $meta_key ) {
+	public function changed_user_meta($meta_id, $user_id, $meta_key) {
 
-		if ( in_array(
+		if (in_array(
 			$meta_key,
 			apply_filters(
 				'wl_dataset__sync_user_hooks__ignored_meta_keys',
@@ -74,41 +74,41 @@ 
 				)
 			),
 			true
-		) ) {
+		)) {
 			return;
 		}
 
-		$this->sync( $user_id );
+		$this->sync($user_id);
 
 	}
 
-	private function sync( $user_id ) {
-		$this->enqueue( array( 'do_sync', $user_id ) );
+	private function sync($user_id) {
+		$this->enqueue(array('do_sync', $user_id));
 	}
 
-	public function do_sync( $user_id ) {
+	public function do_sync($user_id) {
 
 		try {
-			$this->sync_service->sync_one( Object_Type_Enum::USER, (int) $user_id );
-		} catch ( \Exception $e ) {
-			$this->log->error( "An error occurred while trying to sync user $user_id: " . $e->getMessage(), $e );
+			$this->sync_service->sync_one(Object_Type_Enum::USER, (int) $user_id);
+		} catch (\Exception $e) {
+			$this->log->error("An error occurred while trying to sync user $user_id: ".$e->getMessage(), $e);
 		}
 
 	}
 
-	public function delete_user( $user_id ) {
-		$this->enqueue( array( 'do_delete', $user_id ) );
+	public function delete_user($user_id) {
+		$this->enqueue(array('do_delete', $user_id));
 	}
 
-	public function do_delete( $user_id ) {
+	public function do_delete($user_id) {
 		try {
 			$this->sync_service->delete_one(
 				Object_Type_Enum::USER,
 				$user_id,
-				Wordpress_User_Content_Legacy_Service::get_instance()->get_entity_id( Wordpress_Content_Id::create_user( $user_id ) )
+				Wordpress_User_Content_Legacy_Service::get_instance()->get_entity_id(Wordpress_Content_Id::create_user($user_id))
 			);
-		} catch ( \Exception $e ) {
-			$this->log->error( "An error occurred while trying to delete user $user_id: " . $e->getMessage(), $e );
+		} catch (\Exception $e) {
+			$this->log->error("An error occurred while trying to delete user $user_id: ".$e->getMessage(), $e);
 		}
 
 	}

src/wordlift/dataset/class-sync-user-adapter.php

Indentation +28 added lines, -28 removed lines

@@ -6,33 +6,33 @@
 
 class Sync_User_Adapter extends Abstract_Sync_Object_Adapter {
 
-	/**
-	 * Sync_User_Adapter constructor.
-	 *
-	 * @param int $user_id
-	 *
-	 * @throws \Exception when an error occurs.
-	 */
-	public function __construct( $user_id ) {
-		parent::__construct( Object_Type_Enum::USER, $user_id );
-	}
-
-	public function is_published() {
-		return true;
-	}
-
-	public function is_public() {
-		return true;
-	}
-
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function set_values( $arr ) {
-		// @@todo
-	}
-
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function get_value( $key ) {
-		// @@todo
-	}
+    /**
+     * Sync_User_Adapter constructor.
+     *
+     * @param int $user_id
+     *
+     * @throws \Exception when an error occurs.
+     */
+    public function __construct( $user_id ) {
+        parent::__construct( Object_Type_Enum::USER, $user_id );
+    }
+
+    public function is_published() {
+        return true;
+    }
+
+    public function is_public() {
+        return true;
+    }
+
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function set_values( $arr ) {
+        // @@todo
+    }
+
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function get_value( $key ) {
+        // @@todo
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -13,8 +13,8 @@ 
 	 *
 	 * @throws \Exception when an error occurs.
 	 */
-	public function __construct( $user_id ) {
-		parent::__construct( Object_Type_Enum::USER, $user_id );
+	public function __construct($user_id) {
+		parent::__construct(Object_Type_Enum::USER, $user_id);
 	}
 
 	public function is_published() {
@@ -26,12 +26,12 @@ 
 	}
 
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function set_values( $arr ) {
+	public function set_values($arr) {
 		// @@todo
 	}
 
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function get_value( $key ) {
+	public function get_value($key) {
 		// @@todo
 	}
 

src/wordlift/dataset/class-sync-service.php

Indentation +266 added lines, -266 removed lines

@@ -7,271 +7,271 @@
 use Wordlift\Object_Type_Enum;
 
 class Sync_Service {
-	const JSONLD_HASH = 'jsonld_hash';
-	const SYNCED_GMT  = 'synced_gmt';
-
-	/**
-	 * @var \Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * @var Api_Service
-	 */
-	private $api_service;
-
-	/**
-	 * @var Jsonld_Service
-	 */
-	private $jsonld_service;
-
-	/**
-	 * @var Sync_Background_Process
-	 */
-	private $sync_background_process;
-
-	/**
-	 * The number of posts processed in one call.
-	 *
-	 * @var int The batch size.
-	 */
-	private $batch_size;
-
-	/**
-	 * @var Sync_Object_Adapter_Factory
-	 */
-	private $sync_object_adapter_factory;
-
-	/**
-	 * @var Sync_Service
-	 */
-	private static $instance;
-	private $entity_service;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param Api_Service                 $api_service The {@link Api_Service} used to communicate with the remote APIs.
-	 * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
-	 * @param Jsonld_Service              $jsonld_service
-	 * @param \Wordlift_Entity_Service    $entity_service
-	 */
-	public function __construct( $api_service, $sync_object_adapter_factory, $jsonld_service, $entity_service ) {
-
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
-
-		$this->api_service                 = $api_service;
-		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
-		$this->jsonld_service              = $jsonld_service;
-		$this->entity_service              = $entity_service;
-		$this->batch_size                  = 10;
-
-		// You need to initialize this early, otherwise the Background Process isn't registered in AJAX calls.
-		// $this->sync_background_process = new Sync_Background_Process( $this );;
-
-		// Exclude the JSONLD_HASH meta key from those that require a resync.
-		add_filter(
-			'wl_dataset__sync_hooks__ignored_meta_keys',
-			function ( $args ) {
-				$args[] = Sync_Service::JSONLD_HASH;
-				$args[] = Sync_Service::SYNCED_GMT;
-
-				return $args;
-			}
-		);
-
-		self::$instance = $this;
-	}
-
-	public static function get_instance() {
-		return self::$instance;
-	}
-
-	/**
-	 * @param int $type
-	 * @param int $object_id
-	 *
-	 * @return array|false
-	 * @throws \Exception when an error occurs.
-	 */
-	public function sync_one( $type, $object_id ) {
-
-		$object = $this->sync_object_adapter_factory->create( $type, $object_id );
-
-		return $this->sync_many( array( $object ) );
-	}
-
-	/**
-	 * @param $type string Post or User.
-	 * @param $object_id  int Post or User id
-	 * @param $uri string Entity uri , This needs to be supplied before deletion, if we
-	 * get it from meta it might not be available.
-	 *
-	 * @return bool
-	 */
-	public function delete_one( $type, $object_id, $uri ) {
-		// Entity URL isn't set, bail out.
-		if ( empty( $uri ) ) {
-			return false;
-		}
-
-		$response = $this->api_service->request(
-			'DELETE',
-			sprintf( '/middleware/dataset?uri=%s', rawurlencode( $uri ) )
-		);
-
-		// Update the sync date in case of success, otherwise log an error.
-		if ( ! $response->is_success() ) {
-			return false;
-		}
-
-		/**
-		 * Allow 3rd parties to run additional sync work.
-		 */
-		do_action( 'wl_sync__delete_one', $type, $object_id, $uri );
-
-		return true;
-	}
-
-	/**
-	 * @param Sync_Object_Adapter[] $objects
-	 * @param bool                  $force Force synchronization even if the json-ld hash hasn't changed.
-	 *
-	 * @return bool
-	 * @throws \Exception when an error occurs.
-	 */
-	public function sync_many( $objects, $force = false ) {
-
-		$hashes   = array();
-		$payloads = array();
-		/** @var Sync_Object_Adapter $object */
-		foreach ( $objects as $object ) {
-			// Bail out if no payload.
-			$payload_as_string = $this->get_payload_as_string( $object );
-			if ( empty( $payload_as_string ) ) {
-				continue;
-			}
-			$new_hash = sha1( $payload_as_string );
-			$old_hash = $object->get_value( self::JSONLD_HASH );
-
-			// JSON-LD hasn't changed, bail out.
-			$should_sync = $force || $new_hash !== $old_hash;
-			if ( ! apply_filters( 'wl_dataset__sync_service__sync_item', $should_sync, $object, $payload_as_string ) ) {
-				continue;
-			}
-
-			// Collect the hashes and the payloads.
-			$hashes[]   = array( $object, $new_hash, $payload_as_string );
-			$payloads[] = $payload_as_string;
-		}
-
-		// Bail out if payloads are empty.
-		if ( empty( $payloads ) ) {
-			return false;
-		}
-
-		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		$blocking = apply_filters( 'wl_feature__enable__sync-blocking', false );
-		$response = $this->api_service->request(
-			'POST',
-			'/middleware/dataset/batch',
-			array( 'Content-Type' => 'application/json' ),
-			// Put the payload in a JSON array w/o decoding/encoding again.
-			'[ ' . implode( ', ', $payloads ) . ' ]',
-			$blocking ? 60 : 0.001,
-			null,
-			array( 'blocking' => $blocking )
-		);
-
-		// Update the sync date in case of success, otherwise log an error.
-		if ( $blocking && ! $response->is_success() ) {
-			return false;
-		}
-
-		// If successful update the hashes and sync datetime.
-		foreach ( $hashes as $hash ) {
-			$object   = $hash[0];
-			$new_hash = $hash[1];
-
-			$object->set_values(
-				array(
-					self::JSONLD_HASH => $new_hash,
-					self::SYNCED_GMT  => current_time( 'mysql', true ),
-				)
-			);
-		}
-
-		/**
-		 * Allow 3rd parties to run additional sync work.
-		 */
-		do_action( 'wl_sync__sync_many', $hashes );
-
-		return true;
-	}
-
-	/**
-	 * @param Sync_Object_Adapter $object
-	 *
-	 * @return false|string
-	 * @throws \Exception when an error occurs.
-	 */
-	private function get_payload_as_string( $object ) {
-		$type             = $object->get_type();
-		$object_id        = $object->get_object_id();
-		$jsonld_as_string = wp_json_encode(
-			apply_filters(
-				'wl_dataset__sync_service__sync_item__jsonld',
-				$this->jsonld_service->get( $type, $object_id ),
-				$type,
-				$object_id
-			),
-			64
-		); // JSON_UNESCAPED_SLASHES
-		$uri              = $this->entity_service->get_uri( $object_id, $type );
-
-		// Entity URL isn't set, bail out.
-		if ( empty( $uri ) ) {
-			return false;
-		}
-
-		return wp_json_encode(
-			array(
-				'uri'     => $uri,
-				'model'   => $jsonld_as_string,
-				'private' => ! ( $object->is_public() && $object->is_published() ),
-			),
-			64
-		); // JSON_UNESCAPED_SLASHES
-	}
-
-	/**
-	 * @param $post_id
-	 *
-	 * @todo Complete the delete item.
-	 */
-	public function delete_item( $post_id ) {
-		$uri = $this->entity_service->get_uri( $post_id, Object_Type_Enum::POST );
-
-		if ( ! isset( $uri ) ) {
-			return;
-		}
-
-		// Make a request to the remote endpoint.
-		$this->api_service->request(
-			'DELETE',
-			'/middleware/dataset?uri=' . rawurlencode( $uri ),
-			array( 'Content-Type' => 'application/ld+json' )
-		);
-
-	}
-
-	public function get_batch_size() {
-
-		return $this->batch_size;
-	}
-
-	public function delete_all() {
-		$this->api_service->request( 'DELETE', '/middleware/dataset/all' );
-	}
+    const JSONLD_HASH = 'jsonld_hash';
+    const SYNCED_GMT  = 'synced_gmt';
+
+    /**
+     * @var \Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * @var Api_Service
+     */
+    private $api_service;
+
+    /**
+     * @var Jsonld_Service
+     */
+    private $jsonld_service;
+
+    /**
+     * @var Sync_Background_Process
+     */
+    private $sync_background_process;
+
+    /**
+     * The number of posts processed in one call.
+     *
+     * @var int The batch size.
+     */
+    private $batch_size;
+
+    /**
+     * @var Sync_Object_Adapter_Factory
+     */
+    private $sync_object_adapter_factory;
+
+    /**
+     * @var Sync_Service
+     */
+    private static $instance;
+    private $entity_service;
+
+    /**
+     * Constructor.
+     *
+     * @param Api_Service                 $api_service The {@link Api_Service} used to communicate with the remote APIs.
+     * @param Sync_Object_Adapter_Factory $sync_object_adapter_factory
+     * @param Jsonld_Service              $jsonld_service
+     * @param \Wordlift_Entity_Service    $entity_service
+     */
+    public function __construct( $api_service, $sync_object_adapter_factory, $jsonld_service, $entity_service ) {
+
+        $this->log = \Wordlift_Log_Service::get_logger( get_class() );
+
+        $this->api_service                 = $api_service;
+        $this->sync_object_adapter_factory = $sync_object_adapter_factory;
+        $this->jsonld_service              = $jsonld_service;
+        $this->entity_service              = $entity_service;
+        $this->batch_size                  = 10;
+
+        // You need to initialize this early, otherwise the Background Process isn't registered in AJAX calls.
+        // $this->sync_background_process = new Sync_Background_Process( $this );;
+
+        // Exclude the JSONLD_HASH meta key from those that require a resync.
+        add_filter(
+            'wl_dataset__sync_hooks__ignored_meta_keys',
+            function ( $args ) {
+                $args[] = Sync_Service::JSONLD_HASH;
+                $args[] = Sync_Service::SYNCED_GMT;
+
+                return $args;
+            }
+        );
+
+        self::$instance = $this;
+    }
+
+    public static function get_instance() {
+        return self::$instance;
+    }
+
+    /**
+     * @param int $type
+     * @param int $object_id
+     *
+     * @return array|false
+     * @throws \Exception when an error occurs.
+     */
+    public function sync_one( $type, $object_id ) {
+
+        $object = $this->sync_object_adapter_factory->create( $type, $object_id );
+
+        return $this->sync_many( array( $object ) );
+    }
+
+    /**
+     * @param $type string Post or User.
+     * @param $object_id  int Post or User id
+     * @param $uri string Entity uri , This needs to be supplied before deletion, if we
+     * get it from meta it might not be available.
+     *
+     * @return bool
+     */
+    public function delete_one( $type, $object_id, $uri ) {
+        // Entity URL isn't set, bail out.
+        if ( empty( $uri ) ) {
+            return false;
+        }
+
+        $response = $this->api_service->request(
+            'DELETE',
+            sprintf( '/middleware/dataset?uri=%s', rawurlencode( $uri ) )
+        );
+
+        // Update the sync date in case of success, otherwise log an error.
+        if ( ! $response->is_success() ) {
+            return false;
+        }
+
+        /**
+         * Allow 3rd parties to run additional sync work.
+         */
+        do_action( 'wl_sync__delete_one', $type, $object_id, $uri );
+
+        return true;
+    }
+
+    /**
+     * @param Sync_Object_Adapter[] $objects
+     * @param bool                  $force Force synchronization even if the json-ld hash hasn't changed.
+     *
+     * @return bool
+     * @throws \Exception when an error occurs.
+     */
+    public function sync_many( $objects, $force = false ) {
+
+        $hashes   = array();
+        $payloads = array();
+        /** @var Sync_Object_Adapter $object */
+        foreach ( $objects as $object ) {
+            // Bail out if no payload.
+            $payload_as_string = $this->get_payload_as_string( $object );
+            if ( empty( $payload_as_string ) ) {
+                continue;
+            }
+            $new_hash = sha1( $payload_as_string );
+            $old_hash = $object->get_value( self::JSONLD_HASH );
+
+            // JSON-LD hasn't changed, bail out.
+            $should_sync = $force || $new_hash !== $old_hash;
+            if ( ! apply_filters( 'wl_dataset__sync_service__sync_item', $should_sync, $object, $payload_as_string ) ) {
+                continue;
+            }
+
+            // Collect the hashes and the payloads.
+            $hashes[]   = array( $object, $new_hash, $payload_as_string );
+            $payloads[] = $payload_as_string;
+        }
+
+        // Bail out if payloads are empty.
+        if ( empty( $payloads ) ) {
+            return false;
+        }
+
+        // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+        $blocking = apply_filters( 'wl_feature__enable__sync-blocking', false );
+        $response = $this->api_service->request(
+            'POST',
+            '/middleware/dataset/batch',
+            array( 'Content-Type' => 'application/json' ),
+            // Put the payload in a JSON array w/o decoding/encoding again.
+            '[ ' . implode( ', ', $payloads ) . ' ]',
+            $blocking ? 60 : 0.001,
+            null,
+            array( 'blocking' => $blocking )
+        );
+
+        // Update the sync date in case of success, otherwise log an error.
+        if ( $blocking && ! $response->is_success() ) {
+            return false;
+        }
+
+        // If successful update the hashes and sync datetime.
+        foreach ( $hashes as $hash ) {
+            $object   = $hash[0];
+            $new_hash = $hash[1];
+
+            $object->set_values(
+                array(
+                    self::JSONLD_HASH => $new_hash,
+                    self::SYNCED_GMT  => current_time( 'mysql', true ),
+                )
+            );
+        }
+
+        /**
+         * Allow 3rd parties to run additional sync work.
+         */
+        do_action( 'wl_sync__sync_many', $hashes );
+
+        return true;
+    }
+
+    /**
+     * @param Sync_Object_Adapter $object
+     *
+     * @return false|string
+     * @throws \Exception when an error occurs.
+     */
+    private function get_payload_as_string( $object ) {
+        $type             = $object->get_type();
+        $object_id        = $object->get_object_id();
+        $jsonld_as_string = wp_json_encode(
+            apply_filters(
+                'wl_dataset__sync_service__sync_item__jsonld',
+                $this->jsonld_service->get( $type, $object_id ),
+                $type,
+                $object_id
+            ),
+            64
+        ); // JSON_UNESCAPED_SLASHES
+        $uri              = $this->entity_service->get_uri( $object_id, $type );
+
+        // Entity URL isn't set, bail out.
+        if ( empty( $uri ) ) {
+            return false;
+        }
+
+        return wp_json_encode(
+            array(
+                'uri'     => $uri,
+                'model'   => $jsonld_as_string,
+                'private' => ! ( $object->is_public() && $object->is_published() ),
+            ),
+            64
+        ); // JSON_UNESCAPED_SLASHES
+    }
+
+    /**
+     * @param $post_id
+     *
+     * @todo Complete the delete item.
+     */
+    public function delete_item( $post_id ) {
+        $uri = $this->entity_service->get_uri( $post_id, Object_Type_Enum::POST );
+
+        if ( ! isset( $uri ) ) {
+            return;
+        }
+
+        // Make a request to the remote endpoint.
+        $this->api_service->request(
+            'DELETE',
+            '/middleware/dataset?uri=' . rawurlencode( $uri ),
+            array( 'Content-Type' => 'application/ld+json' )
+        );
+
+    }
+
+    public function get_batch_size() {
+
+        return $this->batch_size;
+    }
+
+    public function delete_all() {
+        $this->api_service->request( 'DELETE', '/middleware/dataset/all' );
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -56,9 +56,9 @@ 
 	 * @param Jsonld_Service              $jsonld_service
 	 * @param \Wordlift_Entity_Service    $entity_service
 	 */
-	public function __construct( $api_service, $sync_object_adapter_factory, $jsonld_service, $entity_service ) {
+	public function __construct($api_service, $sync_object_adapter_factory, $jsonld_service, $entity_service) {
 
-		$this->log = \Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = \Wordlift_Log_Service::get_logger(get_class());
 
 		$this->api_service                 = $api_service;
 		$this->sync_object_adapter_factory = $sync_object_adapter_factory;
@@ -72,7 +72,7 @@ 
 		// Exclude the JSONLD_HASH meta key from those that require a resync.
 		add_filter(
 			'wl_dataset__sync_hooks__ignored_meta_keys',
-			function ( $args ) {
+			function($args) {
 				$args[] = Sync_Service::JSONLD_HASH;
 				$args[] = Sync_Service::SYNCED_GMT;
 
@@ -94,11 +94,11 @@ 
 	 * @return array|false
 	 * @throws \Exception when an error occurs.
 	 */
-	public function sync_one( $type, $object_id ) {
+	public function sync_one($type, $object_id) {
 
-		$object = $this->sync_object_adapter_factory->create( $type, $object_id );
+		$object = $this->sync_object_adapter_factory->create($type, $object_id);
 
-		return $this->sync_many( array( $object ) );
+		return $this->sync_many(array($object));
 	}
 
 	/**
@@ -109,26 +109,26 @@ 
 	 *
 	 * @return bool
 	 */
-	public function delete_one( $type, $object_id, $uri ) {
+	public function delete_one($type, $object_id, $uri) {
 		// Entity URL isn't set, bail out.
-		if ( empty( $uri ) ) {
+		if (empty($uri)) {
 			return false;
 		}
 
 		$response = $this->api_service->request(
 			'DELETE',
-			sprintf( '/middleware/dataset?uri=%s', rawurlencode( $uri ) )
+			sprintf('/middleware/dataset?uri=%s', rawurlencode($uri))
 		);
 
 		// Update the sync date in case of success, otherwise log an error.
-		if ( ! $response->is_success() ) {
+		if ( ! $response->is_success()) {
 			return false;
 		}
 
 		/**
 		 * Allow 3rd parties to run additional sync work.
 		 */
-		do_action( 'wl_sync__delete_one', $type, $object_id, $uri );
+		do_action('wl_sync__delete_one', $type, $object_id, $uri);
 
 		return true;
 	}
@@ -140,63 +140,63 @@ 
 	 * @return bool
 	 * @throws \Exception when an error occurs.
 	 */
-	public function sync_many( $objects, $force = false ) {
+	public function sync_many($objects, $force = false) {
 
 		$hashes   = array();
 		$payloads = array();
 		/** @var Sync_Object_Adapter $object */
-		foreach ( $objects as $object ) {
+		foreach ($objects as $object) {
 			// Bail out if no payload.
-			$payload_as_string = $this->get_payload_as_string( $object );
-			if ( empty( $payload_as_string ) ) {
+			$payload_as_string = $this->get_payload_as_string($object);
+			if (empty($payload_as_string)) {
 				continue;
 			}
-			$new_hash = sha1( $payload_as_string );
-			$old_hash = $object->get_value( self::JSONLD_HASH );
+			$new_hash = sha1($payload_as_string);
+			$old_hash = $object->get_value(self::JSONLD_HASH);
 
 			// JSON-LD hasn't changed, bail out.
 			$should_sync = $force || $new_hash !== $old_hash;
-			if ( ! apply_filters( 'wl_dataset__sync_service__sync_item', $should_sync, $object, $payload_as_string ) ) {
+			if ( ! apply_filters('wl_dataset__sync_service__sync_item', $should_sync, $object, $payload_as_string)) {
 				continue;
 			}
 
 			// Collect the hashes and the payloads.
-			$hashes[]   = array( $object, $new_hash, $payload_as_string );
+			$hashes[]   = array($object, $new_hash, $payload_as_string);
 			$payloads[] = $payload_as_string;
 		}
 
 		// Bail out if payloads are empty.
-		if ( empty( $payloads ) ) {
+		if (empty($payloads)) {
 			return false;
 		}
 
 		// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		$blocking = apply_filters( 'wl_feature__enable__sync-blocking', false );
+		$blocking = apply_filters('wl_feature__enable__sync-blocking', false);
 		$response = $this->api_service->request(
 			'POST',
 			'/middleware/dataset/batch',
-			array( 'Content-Type' => 'application/json' ),
+			array('Content-Type' => 'application/json'),
 			// Put the payload in a JSON array w/o decoding/encoding again.
-			'[ ' . implode( ', ', $payloads ) . ' ]',
+			'[ '.implode(', ', $payloads).' ]',
 			$blocking ? 60 : 0.001,
 			null,
-			array( 'blocking' => $blocking )
+			array('blocking' => $blocking)
 		);
 
 		// Update the sync date in case of success, otherwise log an error.
-		if ( $blocking && ! $response->is_success() ) {
+		if ($blocking && ! $response->is_success()) {
 			return false;
 		}
 
 		// If successful update the hashes and sync datetime.
-		foreach ( $hashes as $hash ) {
+		foreach ($hashes as $hash) {
 			$object   = $hash[0];
 			$new_hash = $hash[1];
 
 			$object->set_values(
 				array(
 					self::JSONLD_HASH => $new_hash,
-					self::SYNCED_GMT  => current_time( 'mysql', true ),
+					self::SYNCED_GMT  => current_time('mysql', true),
 				)
 			);
 		}
@@ -204,7 +204,7 @@ 
 		/**
 		 * Allow 3rd parties to run additional sync work.
 		 */
-		do_action( 'wl_sync__sync_many', $hashes );
+		do_action('wl_sync__sync_many', $hashes);
 
 		return true;
 	}
@@ -215,22 +215,22 @@ 
 	 * @return false|string
 	 * @throws \Exception when an error occurs.
 	 */
-	private function get_payload_as_string( $object ) {
+	private function get_payload_as_string($object) {
 		$type             = $object->get_type();
 		$object_id        = $object->get_object_id();
 		$jsonld_as_string = wp_json_encode(
 			apply_filters(
 				'wl_dataset__sync_service__sync_item__jsonld',
-				$this->jsonld_service->get( $type, $object_id ),
+				$this->jsonld_service->get($type, $object_id),
 				$type,
 				$object_id
 			),
 			64
 		); // JSON_UNESCAPED_SLASHES
-		$uri              = $this->entity_service->get_uri( $object_id, $type );
+		$uri = $this->entity_service->get_uri($object_id, $type);
 
 		// Entity URL isn't set, bail out.
-		if ( empty( $uri ) ) {
+		if (empty($uri)) {
 			return false;
 		}
 
@@ -238,7 +238,7 @@ 
 			array(
 				'uri'     => $uri,
 				'model'   => $jsonld_as_string,
-				'private' => ! ( $object->is_public() && $object->is_published() ),
+				'private' => ! ($object->is_public() && $object->is_published()),
 			),
 			64
 		); // JSON_UNESCAPED_SLASHES
@@ -249,18 +249,18 @@ 
 	 *
 	 * @todo Complete the delete item.
 	 */
-	public function delete_item( $post_id ) {
-		$uri = $this->entity_service->get_uri( $post_id, Object_Type_Enum::POST );
+	public function delete_item($post_id) {
+		$uri = $this->entity_service->get_uri($post_id, Object_Type_Enum::POST);
 
-		if ( ! isset( $uri ) ) {
+		if ( ! isset($uri)) {
 			return;
 		}
 
 		// Make a request to the remote endpoint.
 		$this->api_service->request(
 			'DELETE',
-			'/middleware/dataset?uri=' . rawurlencode( $uri ),
-			array( 'Content-Type' => 'application/ld+json' )
+			'/middleware/dataset?uri='.rawurlencode($uri),
+			array('Content-Type' => 'application/ld+json')
 		);
 
 	}
@@ -271,7 +271,7 @@ 
 	}
 
 	public function delete_all() {
-		$this->api_service->request( 'DELETE', '/middleware/dataset/all' );
+		$this->api_service->request('DELETE', '/middleware/dataset/all');
 	}
 
 }

src/wordlift/dataset/index.php

Indentation +25 added lines, -25 removed lines

@@ -14,38 +14,38 @@
 use Wordlift\Jsonld\Jsonld_Service;
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 // Register the Dataset JSON Endpoint.
 // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 if ( apply_filters( 'wl_feature__enable__dataset-ng', false ) ) {
 
-	$sync_object_adapter_factory = new Sync_Object_Adapter_Factory();
-	$sync_service                = new Sync_Service( Default_Api_Service::get_instance(), $sync_object_adapter_factory, Jsonld_Service::get_instance(), Wordlift_Entity_Service::get_instance() );
-	new Sync_Post_Hooks( $sync_service, $sync_object_adapter_factory );
-	new Sync_User_Hooks( $sync_service );
+    $sync_object_adapter_factory = new Sync_Object_Adapter_Factory();
+    $sync_service                = new Sync_Service( Default_Api_Service::get_instance(), $sync_object_adapter_factory, Jsonld_Service::get_instance(), Wordlift_Entity_Service::get_instance() );
+    new Sync_Post_Hooks( $sync_service, $sync_object_adapter_factory );
+    new Sync_User_Hooks( $sync_service );
 
-	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	if ( apply_filters( 'wl_feature__enable__no-vocabulary-terms', false ) ) {
-		new Sync_Term_Hooks( $sync_service, $sync_object_adapter_factory );
-	}
-	/**
-	 * @since 3.28.0
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/1186
-	 */
-	new Sync_Hooks_Entity_Relation( Wordlift_Entity_Service::get_instance() );
+    // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+    if ( apply_filters( 'wl_feature__enable__no-vocabulary-terms', false ) ) {
+        new Sync_Term_Hooks( $sync_service, $sync_object_adapter_factory );
+    }
+    /**
+     * @since 3.28.0
+     * @see https://github.com/insideout10/wordlift-plugin/issues/1186
+     */
+    new Sync_Hooks_Entity_Relation( Wordlift_Entity_Service::get_instance() );
 
-	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	if ( apply_filters( 'wl_feature__enable__wordpress-ontology', false ) ) {
-		new Sync_Hooks_Wordpress_Ontology();
-	}
+    // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+    if ( apply_filters( 'wl_feature__enable__wordpress-ontology', false ) ) {
+        new Sync_Hooks_Wordpress_Ontology();
+    }
 
-	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	if ( apply_filters( 'wl_feature__enable__sync-background', false ) ) {
-		// Set up the sync background process.
-		$sync_background_process = new Sync_Background_Process( $sync_service, $sync_object_adapter_factory );
-		new Sync_Background_Process_Wpjson_Endpoint( $sync_background_process );
-		new Sync_Page();
-	}
+    // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+    if ( apply_filters( 'wl_feature__enable__sync-background', false ) ) {
+        // Set up the sync background process.
+        $sync_background_process = new Sync_Background_Process( $sync_service, $sync_object_adapter_factory );
+        new Sync_Background_Process_Wpjson_Endpoint( $sync_background_process );
+        new Sync_Page();
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -13,39 +13,39 @@
 use Wordlift\Dataset\Sync_User_Hooks;
 use Wordlift\Jsonld\Jsonld_Service;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Register the Dataset JSON Endpoint.
 // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-if ( apply_filters( 'wl_feature__enable__dataset-ng', false ) ) {
+if (apply_filters('wl_feature__enable__dataset-ng', false)) {
 
 	$sync_object_adapter_factory = new Sync_Object_Adapter_Factory();
-	$sync_service                = new Sync_Service( Default_Api_Service::get_instance(), $sync_object_adapter_factory, Jsonld_Service::get_instance(), Wordlift_Entity_Service::get_instance() );
-	new Sync_Post_Hooks( $sync_service, $sync_object_adapter_factory );
-	new Sync_User_Hooks( $sync_service );
+	$sync_service                = new Sync_Service(Default_Api_Service::get_instance(), $sync_object_adapter_factory, Jsonld_Service::get_instance(), Wordlift_Entity_Service::get_instance());
+	new Sync_Post_Hooks($sync_service, $sync_object_adapter_factory);
+	new Sync_User_Hooks($sync_service);
 
 	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	if ( apply_filters( 'wl_feature__enable__no-vocabulary-terms', false ) ) {
-		new Sync_Term_Hooks( $sync_service, $sync_object_adapter_factory );
+	if (apply_filters('wl_feature__enable__no-vocabulary-terms', false)) {
+		new Sync_Term_Hooks($sync_service, $sync_object_adapter_factory);
 	}
 	/**
 	 * @since 3.28.0
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/1186
 	 */
-	new Sync_Hooks_Entity_Relation( Wordlift_Entity_Service::get_instance() );
+	new Sync_Hooks_Entity_Relation(Wordlift_Entity_Service::get_instance());
 
 	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	if ( apply_filters( 'wl_feature__enable__wordpress-ontology', false ) ) {
+	if (apply_filters('wl_feature__enable__wordpress-ontology', false)) {
 		new Sync_Hooks_Wordpress_Ontology();
 	}
 
 	// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-	if ( apply_filters( 'wl_feature__enable__sync-background', false ) ) {
+	if (apply_filters('wl_feature__enable__sync-background', false)) {
 		// Set up the sync background process.
-		$sync_background_process = new Sync_Background_Process( $sync_service, $sync_object_adapter_factory );
-		new Sync_Background_Process_Wpjson_Endpoint( $sync_background_process );
+		$sync_background_process = new Sync_Background_Process($sync_service, $sync_object_adapter_factory);
+		new Sync_Background_Process_Wpjson_Endpoint($sync_background_process);
 		new Sync_Page();
 	}
 }

src/wordlift/dataset/class-sync-hooks-wordpress-ontology.php

Indentation +60 added lines, -60 removed lines

@@ -7,65 +7,65 @@
 // phpcs:ignore WordPress.WP.CapitalPDangit.MisspelledClassName
 class Sync_Hooks_Wordpress_Ontology {
 
-	const HTTP_PURL_ORG_WORDPRESS_1_0 = 'http://purl.org/wordpress/1.0/';
-
-	public function __construct() {
-		add_filter( 'wl_dataset__sync_service__sync_item__jsonld', array( $this, 'jsonld' ), 10, 3 );
-	}
-
-	public function jsonld( $jsonld, $type, $object_id ) {
-
-		$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'id' ] = $object_id;
-
-		switch ( $type ) {
-
-			case Object_Type_Enum::TERM:
-				$term = get_term( $object_id );
-
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'type' ]        = 'term';
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'name' ]        = $term->name;
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'description' ] = $term->description;
-				break;
-
-			case Object_Type_Enum::USER:
-				$user = get_userdata( $object_id );
-
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'type' ]        = 'user';
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'displayName' ] = $user->display_name;
-				break;
-
-			case Object_Type_Enum::POST:
-				$post = get_post( $object_id );
-
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'type' ]       = 'post';
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'customType' ] = $post->post_type;
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'title' ]      = $post->post_title;
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'status' ]     = $post->post_status;
-				$content = has_blocks( $post ) ?
-					do_blocks( $post->post_content ) : do_shortcode( $post->post_content );
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'content' ]   = $content;
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'permalink' ] = get_permalink( $post );
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'sticky' ]    = is_sticky( $post->ID );
-
-				$taxonomies = get_post_taxonomies( $post );
-				$_tmp_terms = array();
-				foreach ( $taxonomies as $taxonomy ) {
-					$terms = wp_get_post_terms( $post->ID, $taxonomy );
-					/** @var \WP_Term $term */
-					foreach ( $terms as $term ) {
-						$_tmp_terms[] = "$taxonomy:$term->name";
-					}
-				}
-				if ( ! empty( $_tmp_terms ) ) {
-					$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'terms' ] = $_tmp_terms;
-				}
-
-				break;
-
-			default:
-		}
-
-		return $jsonld;
-	}
+    const HTTP_PURL_ORG_WORDPRESS_1_0 = 'http://purl.org/wordpress/1.0/';
+
+    public function __construct() {
+        add_filter( 'wl_dataset__sync_service__sync_item__jsonld', array( $this, 'jsonld' ), 10, 3 );
+    }
+
+    public function jsonld( $jsonld, $type, $object_id ) {
+
+        $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'id' ] = $object_id;
+
+        switch ( $type ) {
+
+            case Object_Type_Enum::TERM:
+                $term = get_term( $object_id );
+
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'type' ]        = 'term';
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'name' ]        = $term->name;
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'description' ] = $term->description;
+                break;
+
+            case Object_Type_Enum::USER:
+                $user = get_userdata( $object_id );
+
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'type' ]        = 'user';
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'displayName' ] = $user->display_name;
+                break;
+
+            case Object_Type_Enum::POST:
+                $post = get_post( $object_id );
+
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'type' ]       = 'post';
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'customType' ] = $post->post_type;
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'title' ]      = $post->post_title;
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'status' ]     = $post->post_status;
+                $content = has_blocks( $post ) ?
+                    do_blocks( $post->post_content ) : do_shortcode( $post->post_content );
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'content' ]   = $content;
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'permalink' ] = get_permalink( $post );
+                $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'sticky' ]    = is_sticky( $post->ID );
+
+                $taxonomies = get_post_taxonomies( $post );
+                $_tmp_terms = array();
+                foreach ( $taxonomies as $taxonomy ) {
+                    $terms = wp_get_post_terms( $post->ID, $taxonomy );
+                    /** @var \WP_Term $term */
+                    foreach ( $terms as $term ) {
+                        $_tmp_terms[] = "$taxonomy:$term->name";
+                    }
+                }
+                if ( ! empty( $_tmp_terms ) ) {
+                    $jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'terms' ] = $_tmp_terms;
+                }
+
+                break;
+
+            default:
+        }
+
+        return $jsonld;
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -10,54 +10,54 @@
 	const HTTP_PURL_ORG_WORDPRESS_1_0 = 'http://purl.org/wordpress/1.0/';
 
 	public function __construct() {
-		add_filter( 'wl_dataset__sync_service__sync_item__jsonld', array( $this, 'jsonld' ), 10, 3 );
+		add_filter('wl_dataset__sync_service__sync_item__jsonld', array($this, 'jsonld'), 10, 3);
 	}
 
-	public function jsonld( $jsonld, $type, $object_id ) {
+	public function jsonld($jsonld, $type, $object_id) {
 
-		$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'id' ] = $object_id;
+		$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'id'] = $object_id;
 
-		switch ( $type ) {
+		switch ($type) {
 
 			case Object_Type_Enum::TERM:
-				$term = get_term( $object_id );
+				$term = get_term($object_id);
 
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'type' ]        = 'term';
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'name' ]        = $term->name;
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'description' ] = $term->description;
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'type']        = 'term';
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'name']        = $term->name;
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'description'] = $term->description;
 				break;
 
 			case Object_Type_Enum::USER:
-				$user = get_userdata( $object_id );
+				$user = get_userdata($object_id);
 
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'type' ]        = 'user';
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'displayName' ] = $user->display_name;
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'type']        = 'user';
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'displayName'] = $user->display_name;
 				break;
 
 			case Object_Type_Enum::POST:
-				$post = get_post( $object_id );
-
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'type' ]       = 'post';
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'customType' ] = $post->post_type;
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'title' ]      = $post->post_title;
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'status' ]     = $post->post_status;
-				$content = has_blocks( $post ) ?
-					do_blocks( $post->post_content ) : do_shortcode( $post->post_content );
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'content' ]   = $content;
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'permalink' ] = get_permalink( $post );
-				$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'sticky' ]    = is_sticky( $post->ID );
-
-				$taxonomies = get_post_taxonomies( $post );
+				$post = get_post($object_id);
+
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'type']       = 'post';
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'customType'] = $post->post_type;
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'title']      = $post->post_title;
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'status']     = $post->post_status;
+				$content = has_blocks($post) ?
+					do_blocks($post->post_content) : do_shortcode($post->post_content);
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'content']   = $content;
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'permalink'] = get_permalink($post);
+				$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'sticky']    = is_sticky($post->ID);
+
+				$taxonomies = get_post_taxonomies($post);
 				$_tmp_terms = array();
-				foreach ( $taxonomies as $taxonomy ) {
-					$terms = wp_get_post_terms( $post->ID, $taxonomy );
+				foreach ($taxonomies as $taxonomy) {
+					$terms = wp_get_post_terms($post->ID, $taxonomy);
 					/** @var \WP_Term $term */
-					foreach ( $terms as $term ) {
+					foreach ($terms as $term) {
 						$_tmp_terms[] = "$taxonomy:$term->name";
 					}
 				}
-				if ( ! empty( $_tmp_terms ) ) {
-					$jsonld[0][ self::HTTP_PURL_ORG_WORDPRESS_1_0 . 'terms' ] = $_tmp_terms;
+				if ( ! empty($_tmp_terms)) {
+					$jsonld[0][self::HTTP_PURL_ORG_WORDPRESS_1_0.'terms'] = $_tmp_terms;
 				}
 
 				break;

src/wordlift/dataset/class-sync-object-adapter-factory.php

Indentation +32 added lines, -32 removed lines

@@ -6,37 +6,37 @@
 
 class Sync_Object_Adapter_Factory {
 
-	/**
-	 * @param int $type One of Object_Type_Enum::POST, Object_Type_Enum::USER, ...
-	 * @param int $object_id The object id.
-	 *
-	 * @return Sync_Object_Adapter
-	 * @throws \Exception when an error occurs.
-	 */
-	public function create( $type, $object_id ) {
-
-		switch ( $type ) {
-			case Object_Type_Enum::POST:
-				return new Sync_Post_Adapter( $object_id );
-			case Object_Type_Enum::USER:
-				return new Sync_User_Adapter( $object_id );
-			case Object_Type_Enum::TERM:
-				return new Sync_Term_Adapter( $object_id );
-			default:
-				throw new \Exception( "Unsupported type $type." );
-		}
-
-	}
-
-	public function create_many( $type, $object_ids ) {
-		$that = $this;
-
-		return array_map(
-			function ( $item ) use ( $type, $that ) {
-				return $that->create( $type, $item );
-			},
-			(array) $object_ids
-		);
-	}
+    /**
+     * @param int $type One of Object_Type_Enum::POST, Object_Type_Enum::USER, ...
+     * @param int $object_id The object id.
+     *
+     * @return Sync_Object_Adapter
+     * @throws \Exception when an error occurs.
+     */
+    public function create( $type, $object_id ) {
+
+        switch ( $type ) {
+            case Object_Type_Enum::POST:
+                return new Sync_Post_Adapter( $object_id );
+            case Object_Type_Enum::USER:
+                return new Sync_User_Adapter( $object_id );
+            case Object_Type_Enum::TERM:
+                return new Sync_Term_Adapter( $object_id );
+            default:
+                throw new \Exception( "Unsupported type $type." );
+        }
+
+    }
+
+    public function create_many( $type, $object_ids ) {
+        $that = $this;
+
+        return array_map(
+            function ( $item ) use ( $type, $that ) {
+                return $that->create( $type, $item );
+            },
+            (array) $object_ids
+        );
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -13,27 +13,27 @@
 	 * @return Sync_Object_Adapter
 	 * @throws \Exception when an error occurs.
 	 */
-	public function create( $type, $object_id ) {
+	public function create($type, $object_id) {
 
-		switch ( $type ) {
+		switch ($type) {
 			case Object_Type_Enum::POST:
-				return new Sync_Post_Adapter( $object_id );
+				return new Sync_Post_Adapter($object_id);
 			case Object_Type_Enum::USER:
-				return new Sync_User_Adapter( $object_id );
+				return new Sync_User_Adapter($object_id);
 			case Object_Type_Enum::TERM:
-				return new Sync_Term_Adapter( $object_id );
+				return new Sync_Term_Adapter($object_id);
 			default:
-				throw new \Exception( "Unsupported type $type." );
+				throw new \Exception("Unsupported type $type.");
 		}
 
 	}
 
-	public function create_many( $type, $object_ids ) {
+	public function create_many($type, $object_ids) {
 		$that = $this;
 
 		return array_map(
-			function ( $item ) use ( $type, $that ) {
-				return $that->create( $type, $item );
+			function($item) use ($type, $that) {
+				return $that->create($type, $item);
 			},
 			(array) $object_ids
 		);

src/wordlift/dataset/class-sync-page.php

Indentation +48 added lines, -48 removed lines

@@ -4,49 +4,49 @@ 
 
 class Sync_Page {
 
-	/**
-	 * Sync_Page constructor.
-	 */
-	public function __construct() {
-
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-
-	}
-
-	public function admin_menu() {
-
-		add_submenu_page(
-			'wl_admin_menu',
-			__( 'Synchronize Dataset', 'wordlift' ),
-			__( 'Synchronize Dataset', 'wordlift' ),
-			'manage_options',
-			'wl_dataset_sync',
-			array(
-				$this,
-				'render',
-			)
-		);
-
-	}
-
-	public function render() {
-
-		wp_enqueue_style(
-			'wl-tasks-page',
-			plugin_dir_url( __DIR__ ) . 'tasks/admin/assets/tasks-page.css',
-			array(),
-			\Wordlift::get_instance()->get_version()
-		);
-
-		wp_enqueue_script(
-			'wl-dataset-sync-page',
-			plugin_dir_url( __FILE__ ) . 'assets/sync-page.js',
-			array( 'wp-api' ),
-			\Wordlift::get_instance()->get_version(),
-			false
-		);
-
-		?>
+    /**
+     * Sync_Page constructor.
+     */
+    public function __construct() {
+
+        add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+
+    }
+
+    public function admin_menu() {
+
+        add_submenu_page(
+            'wl_admin_menu',
+            __( 'Synchronize Dataset', 'wordlift' ),
+            __( 'Synchronize Dataset', 'wordlift' ),
+            'manage_options',
+            'wl_dataset_sync',
+            array(
+                $this,
+                'render',
+            )
+        );
+
+    }
+
+    public function render() {
+
+        wp_enqueue_style(
+            'wl-tasks-page',
+            plugin_dir_url( __DIR__ ) . 'tasks/admin/assets/tasks-page.css',
+            array(),
+            \Wordlift::get_instance()->get_version()
+        );
+
+        wp_enqueue_script(
+            'wl-dataset-sync-page',
+            plugin_dir_url( __FILE__ ) . 'assets/sync-page.js',
+            array( 'wp-api' ),
+            \Wordlift::get_instance()->get_version(),
+            false
+        );
+
+        ?>
 		<div class="wrap">
 			<h2><?php esc_html_e( 'Synchronize Dataset', 'wordlift' ); ?></h2>
 
@@ -57,17 +57,17 @@ 
 
 			<button id="wl-start-btn" type="button" class="button button-large button-primary">
 			<?php
-				esc_html_e( 'Start', 'wordlift' );
-			?>
+                esc_html_e( 'Start', 'wordlift' );
+            ?>
 				</button>
 			<button id="wl-stop-btn" type="button" class="button button-large button-primary hidden">
 			<?php
-				esc_html_e( 'Stop', 'wordlift' );
-			?>
+                esc_html_e( 'Stop', 'wordlift' );
+            ?>
 				</button>
 
 		</div>
 		<?php
-	}
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -9,7 +9,7 @@ 
 	 */
 	public function __construct() {
 
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+		add_action('admin_menu', array($this, 'admin_menu'));
 
 	}
 
@@ -17,8 +17,8 @@ 
 
 		add_submenu_page(
 			'wl_admin_menu',
-			__( 'Synchronize Dataset', 'wordlift' ),
-			__( 'Synchronize Dataset', 'wordlift' ),
+			__('Synchronize Dataset', 'wordlift'),
+			__('Synchronize Dataset', 'wordlift'),
 			'manage_options',
 			'wl_dataset_sync',
 			array(
@@ -33,22 +33,22 @@ 
 
 		wp_enqueue_style(
 			'wl-tasks-page',
-			plugin_dir_url( __DIR__ ) . 'tasks/admin/assets/tasks-page.css',
+			plugin_dir_url(__DIR__).'tasks/admin/assets/tasks-page.css',
 			array(),
 			\Wordlift::get_instance()->get_version()
 		);
 
 		wp_enqueue_script(
 			'wl-dataset-sync-page',
-			plugin_dir_url( __FILE__ ) . 'assets/sync-page.js',
-			array( 'wp-api' ),
+			plugin_dir_url(__FILE__).'assets/sync-page.js',
+			array('wp-api'),
 			\Wordlift::get_instance()->get_version(),
 			false
 		);
 
 		?>
 		<div class="wrap">
-			<h2><?php esc_html_e( 'Synchronize Dataset', 'wordlift' ); ?></h2>
+			<h2><?php esc_html_e('Synchronize Dataset', 'wordlift'); ?></h2>
 
 			<div class="wl-task__progress" style="border: 1px solid #23282D; height: 20px; margin: 8px 0;">
 				<div class="wl-task__progress__bar"
@@ -57,12 +57,12 @@ 
 
 			<button id="wl-start-btn" type="button" class="button button-large button-primary">
 			<?php
-				esc_html_e( 'Start', 'wordlift' );
+				esc_html_e('Start', 'wordlift');
 			?>
 				</button>
 			<button id="wl-stop-btn" type="button" class="button button-large button-primary hidden">
 			<?php
-				esc_html_e( 'Stop', 'wordlift' );
+				esc_html_e('Stop', 'wordlift');
 			?>
 				</button>
 

src/wordlift/faq/class-faq-content-filter.php

Indentation +27 added lines, -27 removed lines

@@ -10,33 +10,33 @@
 namespace Wordlift\Faq;
 
 class Faq_Content_Filter {
-	/**
-	 * Constants used for replacing the tags in the html string.
-	 */
-	const FAQ_QUESTION_TAG_NAME = 'wl-faq-question';
-	const FAQ_ANSWER_TAG_NAME   = 'wl-faq-answer';
-	/**
-	 * Replaces all the html tags inserted by Faq highlighting code in the front end
-	 *
-	 * @param $content string Post content
-	 * @return string String after replacing all the opening and closing tags.
-	 */
-	public function remove_all_faq_question_and_answer_tags( $content ) {
-		/**
-		 * Replace all the question tags.
-		 */
-		$faq_question_closing_tag = '</' . self::FAQ_QUESTION_TAG_NAME . '>';
-		$content                  = preg_replace( '/<wl-faq-question class=".+?">/m', '', $content );
-		$content                  = str_replace( $faq_question_closing_tag, '', $content );
-		/**
-		 * Replace all the answer tags.
-		 */
-		$faq_answer_closing_tag = '</' . self::FAQ_ANSWER_TAG_NAME . '>';
-		$content                = preg_replace( '/<wl-faq-answer class=".+?">/m', '', $content );
-		$content                = str_replace( $faq_answer_closing_tag, '', $content );
+    /**
+     * Constants used for replacing the tags in the html string.
+     */
+    const FAQ_QUESTION_TAG_NAME = 'wl-faq-question';
+    const FAQ_ANSWER_TAG_NAME   = 'wl-faq-answer';
+    /**
+     * Replaces all the html tags inserted by Faq highlighting code in the front end
+     *
+     * @param $content string Post content
+     * @return string String after replacing all the opening and closing tags.
+     */
+    public function remove_all_faq_question_and_answer_tags( $content ) {
+        /**
+         * Replace all the question tags.
+         */
+        $faq_question_closing_tag = '</' . self::FAQ_QUESTION_TAG_NAME . '>';
+        $content                  = preg_replace( '/<wl-faq-question class=".+?">/m', '', $content );
+        $content                  = str_replace( $faq_question_closing_tag, '', $content );
+        /**
+         * Replace all the answer tags.
+         */
+        $faq_answer_closing_tag = '</' . self::FAQ_ANSWER_TAG_NAME . '>';
+        $content                = preg_replace( '/<wl-faq-answer class=".+?">/m', '', $content );
+        $content                = str_replace( $faq_answer_closing_tag, '', $content );
 
-		/** Return all the replaced content */
-		return $content;
-	}
+        /** Return all the replaced content */
+        return $content;
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -21,19 +21,19 @@
 	 * @param $content string Post content
 	 * @return string String after replacing all the opening and closing tags.
 	 */
-	public function remove_all_faq_question_and_answer_tags( $content ) {
+	public function remove_all_faq_question_and_answer_tags($content) {
 		/**
 		 * Replace all the question tags.
 		 */
-		$faq_question_closing_tag = '</' . self::FAQ_QUESTION_TAG_NAME . '>';
-		$content                  = preg_replace( '/<wl-faq-question class=".+?">/m', '', $content );
-		$content                  = str_replace( $faq_question_closing_tag, '', $content );
+		$faq_question_closing_tag = '</'.self::FAQ_QUESTION_TAG_NAME.'>';
+		$content                  = preg_replace('/<wl-faq-question class=".+?">/m', '', $content);
+		$content                  = str_replace($faq_question_closing_tag, '', $content);
 		/**
 		 * Replace all the answer tags.
 		 */
-		$faq_answer_closing_tag = '</' . self::FAQ_ANSWER_TAG_NAME . '>';
-		$content                = preg_replace( '/<wl-faq-answer class=".+?">/m', '', $content );
-		$content                = str_replace( $faq_answer_closing_tag, '', $content );
+		$faq_answer_closing_tag = '</'.self::FAQ_ANSWER_TAG_NAME.'>';
+		$content                = preg_replace('/<wl-faq-answer class=".+?">/m', '', $content);
+		$content                = str_replace($faq_answer_closing_tag, '', $content);
 
 		/** Return all the replaced content */
 		return $content;

src/wordlift/faq/class-faq-to-jsonld-converter.php

Indentation +71 added lines, -71 removed lines

@@ -17,80 +17,80 @@
  */
 class Faq_To_Jsonld_Converter {
 
-	const FAQ_JSONLD_TYPE = 'FAQPage';
+    const FAQ_JSONLD_TYPE = 'FAQPage';
 
-	public function __construct() {
-		add_filter( 'wl_post_jsonld', array( $this, 'get_jsonld_for_faq' ), 11, 2 );
-		add_filter( 'wl_entity_jsonld', array( $this, 'get_jsonld_for_faq' ), 11, 2 );
-	}
+    public function __construct() {
+        add_filter( 'wl_post_jsonld', array( $this, 'get_jsonld_for_faq' ), 11, 2 );
+        add_filter( 'wl_entity_jsonld', array( $this, 'get_jsonld_for_faq' ), 11, 2 );
+    }
 
-	/**
-	 * Set the FAQ type to the json ld array
-	 *
-	 * @param $jsonld array The jsonld array.
-	 *
-	 * @return array Returns the json ld array with the type set.
-	 */
-	public function set_faq_type( $jsonld ) {
-		if ( array_key_exists( '@type', $jsonld ) ) {
-			if ( is_string( $jsonld['@type'] ) ) {
-				// If a plain string is present, create an array with previous items.
-				$jsonld['@type'] = array( $jsonld['@type'], self::FAQ_JSONLD_TYPE );
-				return $jsonld;
-			}
-			// check if it is a array, then append the type.
-			if ( is_array( $jsonld['@type'] ) && ! in_array( self::FAQ_JSONLD_TYPE, $jsonld['@type'], true ) ) {
-				array_push( $jsonld['@type'], self::FAQ_JSONLD_TYPE );
-				return $jsonld;
-			}
-		} else {
-			$jsonld['@type'] = array( self::FAQ_JSONLD_TYPE );
-		}
-		return $jsonld;
-	}
-	/**
-	 * @param $post_id int The id of the post.
-	 *
-	 * @return array Get the converted jsonld data
-	 */
-	public function get_jsonld_for_faq( $jsonld, $post_id ) {
+    /**
+     * Set the FAQ type to the json ld array
+     *
+     * @param $jsonld array The jsonld array.
+     *
+     * @return array Returns the json ld array with the type set.
+     */
+    public function set_faq_type( $jsonld ) {
+        if ( array_key_exists( '@type', $jsonld ) ) {
+            if ( is_string( $jsonld['@type'] ) ) {
+                // If a plain string is present, create an array with previous items.
+                $jsonld['@type'] = array( $jsonld['@type'], self::FAQ_JSONLD_TYPE );
+                return $jsonld;
+            }
+            // check if it is a array, then append the type.
+            if ( is_array( $jsonld['@type'] ) && ! in_array( self::FAQ_JSONLD_TYPE, $jsonld['@type'], true ) ) {
+                array_push( $jsonld['@type'], self::FAQ_JSONLD_TYPE );
+                return $jsonld;
+            }
+        } else {
+            $jsonld['@type'] = array( self::FAQ_JSONLD_TYPE );
+        }
+        return $jsonld;
+    }
+    /**
+     * @param $post_id int The id of the post.
+     *
+     * @return array Get the converted jsonld data
+     */
+    public function get_jsonld_for_faq( $jsonld, $post_id ) {
 
-		$faq_items = get_post_meta( $post_id, Faq_Rest_Controller::FAQ_META_KEY );
-		/**
-		 * Apply the FAQ mapping only if the FAQ items are present.
-		 */
-		if ( count( $faq_items ) > 0 ) {
-			$faq_data = $this->get_faq_data( $faq_items );
-			// Merge the FAQ data with jsonld.
-			$jsonld = array_merge( $jsonld, $faq_data );
-			// check if the @type is set on json ld
-			$jsonld = $this->set_faq_type( $jsonld );
-		}
-		return $jsonld;
-	}
+        $faq_items = get_post_meta( $post_id, Faq_Rest_Controller::FAQ_META_KEY );
+        /**
+         * Apply the FAQ mapping only if the FAQ items are present.
+         */
+        if ( count( $faq_items ) > 0 ) {
+            $faq_data = $this->get_faq_data( $faq_items );
+            // Merge the FAQ data with jsonld.
+            $jsonld = array_merge( $jsonld, $faq_data );
+            // check if the @type is set on json ld
+            $jsonld = $this->set_faq_type( $jsonld );
+        }
+        return $jsonld;
+    }
 
-	/**
-	 * @param $faq_items array List of FAQ items extracted from the meta.
-	 *
-	 * @return array Associtative array of type, mainEntity.
-	 */
-	private function get_faq_data( $faq_items ) {
-		$jsonld_data               = array();
-		$jsonld_data['mainEntity'] = array();
-		foreach ( $faq_items as $faq_item ) {
-			if ( 0 === strlen( $faq_item['question'] ) || 0 === strlen( $faq_item['answer'] ) ) {
-				// Bail out if question or answer is not present
-				continue;
-			}
-			$faq_data                            = array();
-			$faq_data['@type']                   = 'Question';
-			$faq_data['name']                    = $faq_item['question'];
-			$faq_data['acceptedAnswer']          = array();
-			$faq_data['acceptedAnswer']['@type'] = 'Answer';
-			$faq_data['acceptedAnswer']['text']  = $faq_item['answer'];
-			array_push( $jsonld_data['mainEntity'], $faq_data );
-		}
+    /**
+     * @param $faq_items array List of FAQ items extracted from the meta.
+     *
+     * @return array Associtative array of type, mainEntity.
+     */
+    private function get_faq_data( $faq_items ) {
+        $jsonld_data               = array();
+        $jsonld_data['mainEntity'] = array();
+        foreach ( $faq_items as $faq_item ) {
+            if ( 0 === strlen( $faq_item['question'] ) || 0 === strlen( $faq_item['answer'] ) ) {
+                // Bail out if question or answer is not present
+                continue;
+            }
+            $faq_data                            = array();
+            $faq_data['@type']                   = 'Question';
+            $faq_data['name']                    = $faq_item['question'];
+            $faq_data['acceptedAnswer']          = array();
+            $faq_data['acceptedAnswer']['@type'] = 'Answer';
+            $faq_data['acceptedAnswer']['text']  = $faq_item['answer'];
+            array_push( $jsonld_data['mainEntity'], $faq_data );
+        }
 
-		return $jsonld_data;
-	}
+        return $jsonld_data;
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -20,8 +20,8 @@ 
 	const FAQ_JSONLD_TYPE = 'FAQPage';
 
 	public function __construct() {
-		add_filter( 'wl_post_jsonld', array( $this, 'get_jsonld_for_faq' ), 11, 2 );
-		add_filter( 'wl_entity_jsonld', array( $this, 'get_jsonld_for_faq' ), 11, 2 );
+		add_filter('wl_post_jsonld', array($this, 'get_jsonld_for_faq'), 11, 2);
+		add_filter('wl_entity_jsonld', array($this, 'get_jsonld_for_faq'), 11, 2);
 	}
 
 	/**
@@ -31,20 +31,20 @@ 
 	 *
 	 * @return array Returns the json ld array with the type set.
 	 */
-	public function set_faq_type( $jsonld ) {
-		if ( array_key_exists( '@type', $jsonld ) ) {
-			if ( is_string( $jsonld['@type'] ) ) {
+	public function set_faq_type($jsonld) {
+		if (array_key_exists('@type', $jsonld)) {
+			if (is_string($jsonld['@type'])) {
 				// If a plain string is present, create an array with previous items.
-				$jsonld['@type'] = array( $jsonld['@type'], self::FAQ_JSONLD_TYPE );
+				$jsonld['@type'] = array($jsonld['@type'], self::FAQ_JSONLD_TYPE);
 				return $jsonld;
 			}
 			// check if it is a array, then append the type.
-			if ( is_array( $jsonld['@type'] ) && ! in_array( self::FAQ_JSONLD_TYPE, $jsonld['@type'], true ) ) {
-				array_push( $jsonld['@type'], self::FAQ_JSONLD_TYPE );
+			if (is_array($jsonld['@type']) && ! in_array(self::FAQ_JSONLD_TYPE, $jsonld['@type'], true)) {
+				array_push($jsonld['@type'], self::FAQ_JSONLD_TYPE);
 				return $jsonld;
 			}
 		} else {
-			$jsonld['@type'] = array( self::FAQ_JSONLD_TYPE );
+			$jsonld['@type'] = array(self::FAQ_JSONLD_TYPE);
 		}
 		return $jsonld;
 	}
@@ -53,18 +53,18 @@ 
 	 *
 	 * @return array Get the converted jsonld data
 	 */
-	public function get_jsonld_for_faq( $jsonld, $post_id ) {
+	public function get_jsonld_for_faq($jsonld, $post_id) {
 
-		$faq_items = get_post_meta( $post_id, Faq_Rest_Controller::FAQ_META_KEY );
+		$faq_items = get_post_meta($post_id, Faq_Rest_Controller::FAQ_META_KEY);
 		/**
 		 * Apply the FAQ mapping only if the FAQ items are present.
 		 */
-		if ( count( $faq_items ) > 0 ) {
-			$faq_data = $this->get_faq_data( $faq_items );
+		if (count($faq_items) > 0) {
+			$faq_data = $this->get_faq_data($faq_items);
 			// Merge the FAQ data with jsonld.
-			$jsonld = array_merge( $jsonld, $faq_data );
+			$jsonld = array_merge($jsonld, $faq_data);
 			// check if the @type is set on json ld
-			$jsonld = $this->set_faq_type( $jsonld );
+			$jsonld = $this->set_faq_type($jsonld);
 		}
 		return $jsonld;
 	}
@@ -74,11 +74,11 @@ 
 	 *
 	 * @return array Associtative array of type, mainEntity.
 	 */
-	private function get_faq_data( $faq_items ) {
+	private function get_faq_data($faq_items) {
 		$jsonld_data               = array();
 		$jsonld_data['mainEntity'] = array();
-		foreach ( $faq_items as $faq_item ) {
-			if ( 0 === strlen( $faq_item['question'] ) || 0 === strlen( $faq_item['answer'] ) ) {
+		foreach ($faq_items as $faq_item) {
+			if (0 === strlen($faq_item['question']) || 0 === strlen($faq_item['answer'])) {
 				// Bail out if question or answer is not present
 				continue;
 			}
@@ -88,7 +88,7 @@ 
 			$faq_data['acceptedAnswer']          = array();
 			$faq_data['acceptedAnswer']['@type'] = 'Answer';
 			$faq_data['acceptedAnswer']['text']  = $faq_item['answer'];
-			array_push( $jsonld_data['mainEntity'], $faq_data );
+			array_push($jsonld_data['mainEntity'], $faq_data);
 		}
 
 		return $jsonld_data;