insideout10 / wordlift-plugin

src/includes/wp-async-task/class-wordlift-batch-analysis-request-async-task.php

Indentation +45 added lines, -45 removed lines

@@ -18,59 +18,59 @@
  */
 class Wordlift_Batch_Analysis_Request_Async_Task extends Wordlift_Async_Task {
 
-	/**
-	 * The protected $action property should be set to the action to which you
-	 * wish to attach the asynchronous task. For example, if you want to spin
-	 * off an asynchronous task whenever a post gets saved, you would set this
-	 * to save_post.
-	 *
-	 * @since  3.14.2
-	 * @access protected
-	 * @var string $action The action to which you wish to attach the
-	 *                     asynchronous task.
-	 */
-	protected $action = 'wl_batch_analysis_request';
+    /**
+     * The protected $action property should be set to the action to which you
+     * wish to attach the asynchronous task. For example, if you want to spin
+     * off an asynchronous task whenever a post gets saved, you would set this
+     * to save_post.
+     *
+     * @since  3.14.2
+     * @access protected
+     * @var string $action The action to which you wish to attach the
+     *                     asynchronous task.
+     */
+    protected $action = 'wl_batch_analysis_request';
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.14.2
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.14.2
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
-	/**
-	 * Create a {@link Wordlift_Sparql_Query_Async_Task} instance.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param int $auth_level The authentication level to use (see above)
-	 */
-	public function __construct( $auth_level = self::BOTH ) {
-		parent::__construct( $auth_level );
+    /**
+     * Create a {@link Wordlift_Sparql_Query_Async_Task} instance.
+     *
+     * @since 3.14.2
+     *
+     * @param int $auth_level The authentication level to use (see above)
+     */
+    public function __construct( $auth_level = self::BOTH ) {
+        parent::__construct( $auth_level );
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Batch_Analysis_Request_Async_Task' );
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Batch_Analysis_Request_Async_Task' );
 
-	}
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	protected function prepare_data( $data ) {
+    /**
+     * @inheritdoc
+     */
+    protected function prepare_data( $data ) {
 
-		// Return the link setting.
-		return array();
-	}
+        // Return the link setting.
+        return array();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	protected function run_action() {
+    /**
+     * @inheritdoc
+     */
+    protected function run_action() {
 
-		// Run the asynchronous action.
-		do_action( "wl_async_$this->action" );
+        // Run the asynchronous action.
+        do_action( "wl_async_$this->action" );
 
-	}
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -47,17 +47,17 @@ 
 	 *
 	 * @param int $auth_level The authentication level to use (see above)
 	 */
-	public function __construct( $auth_level = self::BOTH ) {
-		parent::__construct( $auth_level );
+	public function __construct($auth_level = self::BOTH) {
+		parent::__construct($auth_level);
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Batch_Analysis_Request_Async_Task' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Batch_Analysis_Request_Async_Task');
 
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	protected function prepare_data( $data ) {
+	protected function prepare_data($data) {
 
 		// Return the link setting.
 		return array();
@@ -69,7 +69,7 @@ 
 	protected function run_action() {
 
 		// Run the asynchronous action.
-		do_action( "wl_async_$this->action" );
+		do_action("wl_async_$this->action");
 
 	}
 

src/wordlift_editor.php

Indentation +10 added lines, -10 removed lines

@@ -8,13 +8,13 @@ 
  * @return string The updated list of styles, including the custom style provided by WordLift.
  */
 function wordlift_mce_css( $mce_css ) {
-	if ( ! empty( $mce_css ) ) {
-		$mce_css .= ',';
-	}
+    if ( ! empty( $mce_css ) ) {
+        $mce_css .= ',';
+    }
 
-	$mce_css .= plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css';
+    $mce_css .= plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css';
 
-	return $mce_css;
+    return $mce_css;
 }
 
 // hook the TinyMCE custom styles function.
@@ -29,13 +29,13 @@ 
  */
 function wordlift_filter_tiny_mce_before_init( $options ) {
 
-	if ( ! isset( $options['extended_valid_elements'] ) ) {
-		$options['extended_valid_elements'] = '';
-	}
+    if ( ! isset( $options['extended_valid_elements'] ) ) {
+        $options['extended_valid_elements'] = '';
+    }
 
-	$options['extended_valid_elements'] .= ",span[*]";
+    $options['extended_valid_elements'] .= ",span[*]";
 
-	return $options;
+    return $options;
 }
 
 add_filter( 'tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init' );

Spacing +7 added lines, -7 removed lines

@@ -7,18 +7,18 @@ 
  *
  * @return string The updated list of styles, including the custom style provided by WordLift.
  */
-function wordlift_mce_css( $mce_css ) {
-	if ( ! empty( $mce_css ) ) {
+function wordlift_mce_css($mce_css) {
+	if ( ! empty($mce_css)) {
 		$mce_css .= ',';
 	}
 
-	$mce_css .= plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css';
+	$mce_css .= plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css';
 
 	return $mce_css;
 }
 
 // hook the TinyMCE custom styles function.
-add_filter( 'mce_css', 'wordlift_mce_css' );
+add_filter('mce_css', 'wordlift_mce_css');
 
 /**
  * Set TinyMCE options, in particular enable microdata tagging.
@@ -27,9 +27,9 @@ 
  *
  * @return mixed
  */
-function wordlift_filter_tiny_mce_before_init( $options ) {
+function wordlift_filter_tiny_mce_before_init($options) {
 
-	if ( ! isset( $options['extended_valid_elements'] ) ) {
+	if ( ! isset($options['extended_valid_elements'])) {
 		$options['extended_valid_elements'] = '';
 	}
 
@@ -38,4 +38,4 @@ 
 	return $options;
 }
 
-add_filter( 'tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init' );
+add_filter('tiny_mce_before_init', 'wordlift_filter_tiny_mce_before_init');

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

Spacing +32 added lines, -32 removed lines

@@ -27,26 +27,26 @@ 
 	 *
 	 * @return int|false Attachment ID on success, false on failure
 	 */
-	public function get_attachment_id( $url ) {
+	public function get_attachment_id($url) {
 
 		// Get the upload directory data, we need the base URL to check whether
 		// the URL we received is within WP.
 		$dir = wp_upload_dir();
 
 		// If the image is not inside WP's base url, return.
-		if ( false === strpos( $url, $dir['baseurl'] . '/' ) ) {
+		if (false === strpos($url, $dir['baseurl'].'/')) {
 			return false;
 		}
 
 		// Get the filename, the extension is kept.
-		$filename = basename( $url );
+		$filename = basename($url);
 
 		// The following query is CPU-intensive, we need to review it.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/689.
 		//
 		// Query for attachments with the specified filename.
-		$query = new WP_Query( array(
+		$query = new WP_Query(array(
 			'post_type'   => 'attachment',
 			'post_status' => 'inherit',
 			'fields'      => 'ids',
@@ -57,21 +57,21 @@ 
 					'key'     => '_wp_attachment_metadata',
 				),
 			),
-		) );
+		));
 
 		// If there are no posts, return.
-		if ( $query->have_posts() ) {
-			foreach ( $query->posts as $attachment_id ) {
+		if ($query->have_posts()) {
+			foreach ($query->posts as $attachment_id) {
 
 				// Get the attachment metadata, we need the filename.
-				$metadata          = wp_get_attachment_metadata( $attachment_id );
-				$original_filename = basename( $metadata['file'] );
+				$metadata          = wp_get_attachment_metadata($attachment_id);
+				$original_filename = basename($metadata['file']);
 
 				// Get the cropped filenames, or an empty array in case there are no files.
-				$sizes_filenames = isset( $metadata['sizes'] ) ? wp_list_pluck( $metadata['sizes'], 'file' ) : array();
+				$sizes_filenames = isset($metadata['sizes']) ? wp_list_pluck($metadata['sizes'], 'file') : array();
 
 				// If the provided filename matches the attachment filename (or one of its resized images), return the id.
-				if ( $original_filename === $filename || in_array( $filename, $sizes_filenames ) ) {
+				if ($original_filename === $filename || in_array($filename, $sizes_filenames)) {
 					return $attachment_id;
 				}
 			}
@@ -90,23 +90,23 @@ 
 	 *
 	 * @return array An array of attachment ids.
 	 */
-	public function get_image_embeds( $content ) {
+	public function get_image_embeds($content) {
 
 		// Go over all the images included in the post content, check if they are
 		// in the DB, and if so include them.
 		$images = array();
-		if ( false === preg_match_all( '#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images ) ) {
+		if (false === preg_match_all('#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images)) {
 			return array();
 		}
 
 		// Map the image URLs to attachment ids.
 		$that = $this;
-		$ids  = array_map( function ( $url ) use ( $that ) {
-			return $that->get_attachment_id( $url );
-		}, $images[1] );
+		$ids  = array_map(function($url) use ($that) {
+			return $that->get_attachment_id($url);
+		}, $images[1]);
 
 		// Filter out not found ids (i.e. id is false).
-		return array_filter( $ids, function ( $item ) {
+		return array_filter($ids, function($item) {
 			return false !== $item;
 		} );
 	}
@@ -120,7 +120,7 @@ 
 	 *
 	 * @return array An array of attachment ids.
 	 */
-	public function get_gallery( $post ) {
+	public function get_gallery($post) {
 
 		// @todo: the `gallery` shortcode has an `exclude` attribute which isn't
 		// checked at the moment.
@@ -132,38 +132,38 @@ 
 		// Code inspired by http://wordpress.stackexchange.com/questions/80408/how-to-get-page-post-gallery-attachment-images-in-order-they-are-set-in-backend
 		$pattern = get_shortcode_regex();
 
-		if ( preg_match_all( '/' . $pattern . '/s', $post->post_content, $matches )
-		     && array_key_exists( 2, $matches )
-		     && in_array( 'gallery', $matches[2] )
+		if (preg_match_all('/'.$pattern.'/s', $post->post_content, $matches)
+		     && array_key_exists(2, $matches)
+		     && in_array('gallery', $matches[2])
 		) {
 
-			$keys = array_keys( $matches[2], 'gallery' );
+			$keys = array_keys($matches[2], 'gallery');
 
-			foreach ( $keys as $key ) {
-				$atts = shortcode_parse_atts( $matches[3][ $key ] );
+			foreach ($keys as $key) {
+				$atts = shortcode_parse_atts($matches[3][$key]);
 
-				if ( is_array( $atts ) && array_key_exists( 'ids', $atts ) ) {
+				if (is_array($atts) && array_key_exists('ids', $atts)) {
 					// gallery images insert explicitly by their ids.
 
-					foreach ( explode( ',', $atts['ids'] ) as $attachment_id ) {
+					foreach (explode(',', $atts['ids']) as $attachment_id) {
 						// Since we do not check for actual image existence
 						// when generating the json content, check it now.
-						if ( wp_get_attachment_image_src( $attachment_id, 'full' ) ) {
-							$ids[ $attachment_id ] = true;
+						if (wp_get_attachment_image_src($attachment_id, 'full')) {
+							$ids[$attachment_id] = true;
 						}
 					}
 				} else {
 					// gallery shortcode with no ids uses all the images
 					// attached to the post.
-					$images = get_attached_media( 'image', $post->ID );
-					foreach ( $images as $attachment ) {
-						$ids[ $attachment->ID ] = true;
+					$images = get_attached_media('image', $post->ID);
+					foreach ($images as $attachment) {
+						$ids[$attachment->ID] = true;
 					}
 				}
 			}
 		}
 
-		return array_keys( $ids );
+		return array_keys($ids);
 	}
 
 }

Indentation +181 added lines, -181 removed lines

@@ -16,186 +16,186 @@
  */
 class Wordlift_Attachment_Service {
 
-	/**
-	 * The singleton instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Attachment_Service The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a {@link Wordlift_Attachment_Service} instance.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct() {
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @return \Wordlift_Attachment_Service The singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get an attachment ID given a URL.
-	 *
-	 * Inspired from https://wpscholar.com/blog/get-attachment-id-from-wp-image-url/
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param string $url The attachment URL.
-	 *
-	 * @return int|false Attachment ID on success, false on failure
-	 */
-	public function get_attachment_id( $url ) {
-
-		// Get the upload directory data, we need the base URL to check whether
-		// the URL we received is within WP.
-		$dir = wp_upload_dir();
-
-		// If the image is not inside WP's base url, return.
-		if ( false === strpos( $url, $dir['baseurl'] . '/' ) ) {
-			return false;
-		}
-
-		// Get the filename, the extension is kept.
-		$filename = basename( $url );
-
-		// The following query is CPU-intensive, we need to review it.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/689.
-		//
-		// Query for attachments with the specified filename.
-		$query = new WP_Query( array(
-			'post_type'   => 'attachment',
-			'post_status' => 'inherit',
-			'fields'      => 'ids',
-			'meta_query'  => array(
-				array(
-					'value'   => $filename,
-					'compare' => 'LIKE',
-					'key'     => '_wp_attachment_metadata',
-				),
-			),
-		) );
-
-		// If there are no posts, return.
-		if ( $query->have_posts() ) {
-			foreach ( $query->posts as $attachment_id ) {
-
-				// Get the attachment metadata, we need the filename.
-				$metadata          = wp_get_attachment_metadata( $attachment_id );
-				$original_filename = basename( $metadata['file'] );
-
-				// Get the cropped filenames, or an empty array in case there are no files.
-				$sizes_filenames = isset( $metadata['sizes'] ) ? wp_list_pluck( $metadata['sizes'], 'file' ) : array();
-
-				// If the provided filename matches the attachment filename (or one of its resized images), return the id.
-				if ( $original_filename === $filename || in_array( $filename, $sizes_filenames ) ) {
-					return $attachment_id;
-				}
-			}
-		}
-
-		// If we got here, we couldn't find any attachment.
-		return false;
-	}
-
-	/**
-	 * Get images embedded in the post content.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param string $content The post content.
-	 *
-	 * @return array An array of attachment ids.
-	 */
-	public function get_image_embeds( $content ) {
-
-		// Go over all the images included in the post content, check if they are
-		// in the DB, and if so include them.
-		$images = array();
-		if ( false === preg_match_all( '#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images ) ) {
-			return array();
-		}
-
-		// Map the image URLs to attachment ids.
-		$that = $this;
-		$ids  = array_map( function ( $url ) use ( $that ) {
-			return $that->get_attachment_id( $url );
-		}, $images[1] );
-
-		// Filter out not found ids (i.e. id is false).
-		return array_filter( $ids, function ( $item ) {
-			return false !== $item;
-		} );
-	}
-
-	/**
-	 * Get images linked via the `gallery` shortcode.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param \WP_Post $post A {@link WP_Post} instance.
-	 *
-	 * @return array An array of attachment ids.
-	 */
-	public function get_gallery( $post ) {
-
-		// @todo: the `gallery` shortcode has an `exclude` attribute which isn't
-		// checked at the moment.
-
-		// Prepare the return value.
-		$ids = array();
-
-		// As the above for images in galleries.
-		// Code inspired by http://wordpress.stackexchange.com/questions/80408/how-to-get-page-post-gallery-attachment-images-in-order-they-are-set-in-backend
-		$pattern = get_shortcode_regex();
-
-		if ( preg_match_all( '/' . $pattern . '/s', $post->post_content, $matches )
-		     && array_key_exists( 2, $matches )
-		     && in_array( 'gallery', $matches[2] )
-		) {
-
-			$keys = array_keys( $matches[2], 'gallery' );
-
-			foreach ( $keys as $key ) {
-				$atts = shortcode_parse_atts( $matches[3][ $key ] );
-
-				if ( is_array( $atts ) && array_key_exists( 'ids', $atts ) ) {
-					// gallery images insert explicitly by their ids.
-
-					foreach ( explode( ',', $atts['ids'] ) as $attachment_id ) {
-						// Since we do not check for actual image existence
-						// when generating the json content, check it now.
-						if ( wp_get_attachment_image_src( $attachment_id, 'full' ) ) {
-							$ids[ $attachment_id ] = true;
-						}
-					}
-				} else {
-					// gallery shortcode with no ids uses all the images
-					// attached to the post.
-					$images = get_attached_media( 'image', $post->ID );
-					foreach ( $images as $attachment ) {
-						$ids[ $attachment->ID ] = true;
-					}
-				}
-			}
-		}
-
-		return array_keys( $ids );
-	}
+    /**
+     * The singleton instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Attachment_Service The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a {@link Wordlift_Attachment_Service} instance.
+     *
+     * @since 3.20.0
+     */
+    public function __construct() {
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.20.0
+     *
+     * @return \Wordlift_Attachment_Service The singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get an attachment ID given a URL.
+     *
+     * Inspired from https://wpscholar.com/blog/get-attachment-id-from-wp-image-url/
+     *
+     * @since 3.10.0
+     *
+     * @param string $url The attachment URL.
+     *
+     * @return int|false Attachment ID on success, false on failure
+     */
+    public function get_attachment_id( $url ) {
+
+        // Get the upload directory data, we need the base URL to check whether
+        // the URL we received is within WP.
+        $dir = wp_upload_dir();
+
+        // If the image is not inside WP's base url, return.
+        if ( false === strpos( $url, $dir['baseurl'] . '/' ) ) {
+            return false;
+        }
+
+        // Get the filename, the extension is kept.
+        $filename = basename( $url );
+
+        // The following query is CPU-intensive, we need to review it.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/689.
+        //
+        // Query for attachments with the specified filename.
+        $query = new WP_Query( array(
+            'post_type'   => 'attachment',
+            'post_status' => 'inherit',
+            'fields'      => 'ids',
+            'meta_query'  => array(
+                array(
+                    'value'   => $filename,
+                    'compare' => 'LIKE',
+                    'key'     => '_wp_attachment_metadata',
+                ),
+            ),
+        ) );
+
+        // If there are no posts, return.
+        if ( $query->have_posts() ) {
+            foreach ( $query->posts as $attachment_id ) {
+
+                // Get the attachment metadata, we need the filename.
+                $metadata          = wp_get_attachment_metadata( $attachment_id );
+                $original_filename = basename( $metadata['file'] );
+
+                // Get the cropped filenames, or an empty array in case there are no files.
+                $sizes_filenames = isset( $metadata['sizes'] ) ? wp_list_pluck( $metadata['sizes'], 'file' ) : array();
+
+                // If the provided filename matches the attachment filename (or one of its resized images), return the id.
+                if ( $original_filename === $filename || in_array( $filename, $sizes_filenames ) ) {
+                    return $attachment_id;
+                }
+            }
+        }
+
+        // If we got here, we couldn't find any attachment.
+        return false;
+    }
+
+    /**
+     * Get images embedded in the post content.
+     *
+     * @since 3.10.0
+     *
+     * @param string $content The post content.
+     *
+     * @return array An array of attachment ids.
+     */
+    public function get_image_embeds( $content ) {
+
+        // Go over all the images included in the post content, check if they are
+        // in the DB, and if so include them.
+        $images = array();
+        if ( false === preg_match_all( '#<img [^>]*src="([^\\">]*)"[^>]*>#', $content, $images ) ) {
+            return array();
+        }
+
+        // Map the image URLs to attachment ids.
+        $that = $this;
+        $ids  = array_map( function ( $url ) use ( $that ) {
+            return $that->get_attachment_id( $url );
+        }, $images[1] );
+
+        // Filter out not found ids (i.e. id is false).
+        return array_filter( $ids, function ( $item ) {
+            return false !== $item;
+        } );
+    }
+
+    /**
+     * Get images linked via the `gallery` shortcode.
+     *
+     * @since 3.10.0
+     *
+     * @param \WP_Post $post A {@link WP_Post} instance.
+     *
+     * @return array An array of attachment ids.
+     */
+    public function get_gallery( $post ) {
+
+        // @todo: the `gallery` shortcode has an `exclude` attribute which isn't
+        // checked at the moment.
+
+        // Prepare the return value.
+        $ids = array();
+
+        // As the above for images in galleries.
+        // Code inspired by http://wordpress.stackexchange.com/questions/80408/how-to-get-page-post-gallery-attachment-images-in-order-they-are-set-in-backend
+        $pattern = get_shortcode_regex();
+
+        if ( preg_match_all( '/' . $pattern . '/s', $post->post_content, $matches )
+             && array_key_exists( 2, $matches )
+             && in_array( 'gallery', $matches[2] )
+        ) {
+
+            $keys = array_keys( $matches[2], 'gallery' );
+
+            foreach ( $keys as $key ) {
+                $atts = shortcode_parse_atts( $matches[3][ $key ] );
+
+                if ( is_array( $atts ) && array_key_exists( 'ids', $atts ) ) {
+                    // gallery images insert explicitly by their ids.
+
+                    foreach ( explode( ',', $atts['ids'] ) as $attachment_id ) {
+                        // Since we do not check for actual image existence
+                        // when generating the json content, check it now.
+                        if ( wp_get_attachment_image_src( $attachment_id, 'full' ) ) {
+                            $ids[ $attachment_id ] = true;
+                        }
+                    }
+                } else {
+                    // gallery shortcode with no ids uses all the images
+                    // attached to the post.
+                    $images = get_attached_media( 'image', $post->ID );
+                    foreach ( $images as $attachment ) {
+                        $ids[ $attachment->ID ] = true;
+                    }
+                }
+            }
+        }
+
+        return array_keys( $ids );
+    }
 
 }

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

Indentation +183 added lines, -183 removed lines

@@ -19,188 +19,188 @@
  */
 class Wordlift_Import_Service {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * A {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Post_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The entity service instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The entity service instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * The schema service instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The schema service instance.
-	 */
-	private $schema_service;
-
-	private $sparql_service;
-
-	/**
-	 * The dataset URI for this WordPress web site.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $dataset_uri The dataset URI for this WordPress web site.
-	 */
-	private $dataset_uri;
-
-	/**
-	 * Create a Wordlift_Import_Service instance.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param \Wordlift_Entity_Post_Type_Service $entity_type_service
-	 * @param \Wordlift_Entity_Service           $entity_service
-	 * @param \Wordlift_Schema_Service           $schema_service
-	 * @param \Wordlift_Sparql_Service           $sparql_service
-	 * @param string                             $dataset_uri
-	 */
-	public function __construct( $entity_type_service, $entity_service, $schema_service, $sparql_service, $dataset_uri ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Import_Service' );
-
-		$this->entity_type_service = $entity_type_service;
-		$this->entity_service      = $entity_service;
-		$this->schema_service      = $schema_service;
-		$this->sparql_service      = $sparql_service;
-		$this->dataset_uri         = $dataset_uri;
-
-	}
-
-	/**
-	 * Handle the `wp_import_post_meta` filter by checking the `entity_url` meta.
-	 * If the `entity_url` meta value is not within the WP web site dataset URI,
-	 * it is changed into an `entity_same_as` meta key.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param array $postmeta An array of indexed post meta.
-	 * @param int   $post_id  The post ID being imported.
-	 * @param array $post     An array of post properties.
-	 *
-	 * @return array An array of indexed post meta.
-	 */
-	public function wp_import_post_meta( $postmeta, $post_id, $post ) {
-
-		// If we're not dealing with entity posts, return the original post meta.
-		if ( ! $this->entity_service->is_entity( $post_id ) ) {
-			return $postmeta;
-		}
-
-		// Get a reference to the entity URL meta.
-		$entity_url_meta = null;
-
-		foreach ( $postmeta as &$meta ) {
-			if ( 'entity_url' === $meta['key'] ) {
-				$entity_url_meta = &$meta;
-				break;
-			}
-		}
-
-		// If the entity URI is within the dataset URI, we don't change anything.
-		if ( null === $entity_url_meta || 0 === strpos( $entity_url_meta['value'], $this->dataset_uri ) ) {
-			return $postmeta;
-		}
-
-		// Since the entity URL doesn't belong to this WP install, as the dataset
-		// URI doesn't match the start of the entity URL, we turn the entity URL
-		// meta to an entity sameAs. $entity_url_meta is a reference so it should
-		// update the item in the postmeta array directly.
-		$entity_url_meta['key'] = 'entity_same_as';
-
-		return $postmeta;
-	}
-
-	/**
-	 * Catch post meta updates.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param int    $mid        The meta ID after successful update.
-	 * @param int    $object_id  Object ID.
-	 * @param string $meta_key   Meta key.
-	 * @param mixed  $meta_value Meta value.
-	 */
-	public function added_post_meta( $mid, $object_id, $meta_key, $meta_value ) {
-
-		// Get the entity URI.
-		$s = $this->entity_service->get_uri( $object_id );
-
-		// Get the field with the specified meta key. Return if the field is not defined.
-		if ( null === ( $field = $this->schema_service->get_field( $meta_key ) ) ) {
-			return;
-		}
-
-		// Get the field predicate.
-		$p = $field['predicate'];
-
-		// Format the object value according to the field type.
-		$o = Wordlift_Sparql_Service::format( $meta_value, $field['type'] );
-
-		// Create the statement.
-		$stmt = sprintf( 'INSERT DATA { <%s> <%s> %s };', Wordlift_Sparql_Service::escape_uri( $s ), Wordlift_Sparql_Service::escape_uri( $p ), $o );
-
-		// Finally queue the statement.
-		$this->sparql_service->execute( $stmt );
-
-		// Removed.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/686.
-		//
-		// Clear up the cache to avoid memory errors.
-		// wp_cache_flush();
-
-	}
-
-	/**
-	 * When an import is running, hook the {@link added_post_meta} function in order
-	 * to insert metadata from an import in Linked Data.
-	 *
-	 * @since 3.6.0
-	 */
-	public function import_start() {
-
-		add_action( 'added_post_meta', array(
-			$this,
-			'added_post_meta',
-		), 10, 4 );
-
-	}
-
-	/**
-	 * When an import ends, remove the hook previously added by {@link import_start}.
-	 *
-	 * @since 3.6.0
-	 */
-	public function import_end() {
-
-		remove_action( 'added_post_meta', array(
-			$this,
-			'added_post_meta',
-		), 10 );
-
-	}
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * A {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Post_Type_Service $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The entity service instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The entity service instance.
+     */
+    private $entity_service;
+
+    /**
+     * The schema service instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The schema service instance.
+     */
+    private $schema_service;
+
+    private $sparql_service;
+
+    /**
+     * The dataset URI for this WordPress web site.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $dataset_uri The dataset URI for this WordPress web site.
+     */
+    private $dataset_uri;
+
+    /**
+     * Create a Wordlift_Import_Service instance.
+     *
+     * @since 3.6.0
+     *
+     * @param \Wordlift_Entity_Post_Type_Service $entity_type_service
+     * @param \Wordlift_Entity_Service           $entity_service
+     * @param \Wordlift_Schema_Service           $schema_service
+     * @param \Wordlift_Sparql_Service           $sparql_service
+     * @param string                             $dataset_uri
+     */
+    public function __construct( $entity_type_service, $entity_service, $schema_service, $sparql_service, $dataset_uri ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Import_Service' );
+
+        $this->entity_type_service = $entity_type_service;
+        $this->entity_service      = $entity_service;
+        $this->schema_service      = $schema_service;
+        $this->sparql_service      = $sparql_service;
+        $this->dataset_uri         = $dataset_uri;
+
+    }
+
+    /**
+     * Handle the `wp_import_post_meta` filter by checking the `entity_url` meta.
+     * If the `entity_url` meta value is not within the WP web site dataset URI,
+     * it is changed into an `entity_same_as` meta key.
+     *
+     * @since 3.6.0
+     *
+     * @param array $postmeta An array of indexed post meta.
+     * @param int   $post_id  The post ID being imported.
+     * @param array $post     An array of post properties.
+     *
+     * @return array An array of indexed post meta.
+     */
+    public function wp_import_post_meta( $postmeta, $post_id, $post ) {
+
+        // If we're not dealing with entity posts, return the original post meta.
+        if ( ! $this->entity_service->is_entity( $post_id ) ) {
+            return $postmeta;
+        }
+
+        // Get a reference to the entity URL meta.
+        $entity_url_meta = null;
+
+        foreach ( $postmeta as &$meta ) {
+            if ( 'entity_url' === $meta['key'] ) {
+                $entity_url_meta = &$meta;
+                break;
+            }
+        }
+
+        // If the entity URI is within the dataset URI, we don't change anything.
+        if ( null === $entity_url_meta || 0 === strpos( $entity_url_meta['value'], $this->dataset_uri ) ) {
+            return $postmeta;
+        }
+
+        // Since the entity URL doesn't belong to this WP install, as the dataset
+        // URI doesn't match the start of the entity URL, we turn the entity URL
+        // meta to an entity sameAs. $entity_url_meta is a reference so it should
+        // update the item in the postmeta array directly.
+        $entity_url_meta['key'] = 'entity_same_as';
+
+        return $postmeta;
+    }
+
+    /**
+     * Catch post meta updates.
+     *
+     * @since 3.6.0
+     *
+     * @param int    $mid        The meta ID after successful update.
+     * @param int    $object_id  Object ID.
+     * @param string $meta_key   Meta key.
+     * @param mixed  $meta_value Meta value.
+     */
+    public function added_post_meta( $mid, $object_id, $meta_key, $meta_value ) {
+
+        // Get the entity URI.
+        $s = $this->entity_service->get_uri( $object_id );
+
+        // Get the field with the specified meta key. Return if the field is not defined.
+        if ( null === ( $field = $this->schema_service->get_field( $meta_key ) ) ) {
+            return;
+        }
+
+        // Get the field predicate.
+        $p = $field['predicate'];
+
+        // Format the object value according to the field type.
+        $o = Wordlift_Sparql_Service::format( $meta_value, $field['type'] );
+
+        // Create the statement.
+        $stmt = sprintf( 'INSERT DATA { <%s> <%s> %s };', Wordlift_Sparql_Service::escape_uri( $s ), Wordlift_Sparql_Service::escape_uri( $p ), $o );
+
+        // Finally queue the statement.
+        $this->sparql_service->execute( $stmt );
+
+        // Removed.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/686.
+        //
+        // Clear up the cache to avoid memory errors.
+        // wp_cache_flush();
+
+    }
+
+    /**
+     * When an import is running, hook the {@link added_post_meta} function in order
+     * to insert metadata from an import in Linked Data.
+     *
+     * @since 3.6.0
+     */
+    public function import_start() {
+
+        add_action( 'added_post_meta', array(
+            $this,
+            'added_post_meta',
+        ), 10, 4 );
+
+    }
+
+    /**
+     * When an import ends, remove the hook previously added by {@link import_start}.
+     *
+     * @since 3.6.0
+     */
+    public function import_end() {
+
+        remove_action( 'added_post_meta', array(
+            $this,
+            'added_post_meta',
+        ), 10 );
+
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -77,9 +77,9 @@ 
 	 * @param \Wordlift_Sparql_Service           $sparql_service
 	 * @param string                             $dataset_uri
 	 */
-	public function __construct( $entity_type_service, $entity_service, $schema_service, $sparql_service, $dataset_uri ) {
+	public function __construct($entity_type_service, $entity_service, $schema_service, $sparql_service, $dataset_uri) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Import_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Import_Service');
 
 		$this->entity_type_service = $entity_type_service;
 		$this->entity_service      = $entity_service;
@@ -102,25 +102,25 @@ 
 	 *
 	 * @return array An array of indexed post meta.
 	 */
-	public function wp_import_post_meta( $postmeta, $post_id, $post ) {
+	public function wp_import_post_meta($postmeta, $post_id, $post) {
 
 		// If we're not dealing with entity posts, return the original post meta.
-		if ( ! $this->entity_service->is_entity( $post_id ) ) {
+		if ( ! $this->entity_service->is_entity($post_id)) {
 			return $postmeta;
 		}
 
 		// Get a reference to the entity URL meta.
 		$entity_url_meta = null;
 
-		foreach ( $postmeta as &$meta ) {
-			if ( 'entity_url' === $meta['key'] ) {
+		foreach ($postmeta as &$meta) {
+			if ('entity_url' === $meta['key']) {
 				$entity_url_meta = &$meta;
 				break;
 			}
 		}
 
 		// If the entity URI is within the dataset URI, we don't change anything.
-		if ( null === $entity_url_meta || 0 === strpos( $entity_url_meta['value'], $this->dataset_uri ) ) {
+		if (null === $entity_url_meta || 0 === strpos($entity_url_meta['value'], $this->dataset_uri)) {
 			return $postmeta;
 		}
 
@@ -143,13 +143,13 @@ 
 	 * @param string $meta_key   Meta key.
 	 * @param mixed  $meta_value Meta value.
 	 */
-	public function added_post_meta( $mid, $object_id, $meta_key, $meta_value ) {
+	public function added_post_meta($mid, $object_id, $meta_key, $meta_value) {
 
 		// Get the entity URI.
-		$s = $this->entity_service->get_uri( $object_id );
+		$s = $this->entity_service->get_uri($object_id);
 
 		// Get the field with the specified meta key. Return if the field is not defined.
-		if ( null === ( $field = $this->schema_service->get_field( $meta_key ) ) ) {
+		if (null === ($field = $this->schema_service->get_field($meta_key))) {
 			return;
 		}
 
@@ -157,13 +157,13 @@ 
 		$p = $field['predicate'];
 
 		// Format the object value according to the field type.
-		$o = Wordlift_Sparql_Service::format( $meta_value, $field['type'] );
+		$o = Wordlift_Sparql_Service::format($meta_value, $field['type']);
 
 		// Create the statement.
-		$stmt = sprintf( 'INSERT DATA { <%s> <%s> %s };', Wordlift_Sparql_Service::escape_uri( $s ), Wordlift_Sparql_Service::escape_uri( $p ), $o );
+		$stmt = sprintf('INSERT DATA { <%s> <%s> %s };', Wordlift_Sparql_Service::escape_uri($s), Wordlift_Sparql_Service::escape_uri($p), $o);
 
 		// Finally queue the statement.
-		$this->sparql_service->execute( $stmt );
+		$this->sparql_service->execute($stmt);
 
 		// Removed.
 		//
@@ -182,10 +182,10 @@ 
 	 */
 	public function import_start() {
 
-		add_action( 'added_post_meta', array(
+		add_action('added_post_meta', array(
 			$this,
 			'added_post_meta',
-		), 10, 4 );
+		), 10, 4);
 
 	}
 
@@ -196,10 +196,10 @@ 
 	 */
 	public function import_end() {
 
-		remove_action( 'added_post_meta', array(
+		remove_action('added_post_meta', array(
 			$this,
 			'added_post_meta',
-		), 10 );
+		), 10);
 
 	}
 

src/includes/class-wordlift-postid-to-jsonld-converter.php

Indentation +45 added lines, -45 removed lines

@@ -16,58 +16,58 @@
  */
 class Wordlift_Postid_To_Jsonld_Converter implements Wordlift_Post_Converter {
 
-	private $entity_service;
-	private $entity_post_to_jsonld_converter;
-	private $post_to_jsonld_converter;
+    private $entity_service;
+    private $entity_post_to_jsonld_converter;
+    private $post_to_jsonld_converter;
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.16.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.16.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
-	/**
-	 * Wordlift_Entity_To_Jsonld_Converter constructor.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param \Wordlift_Entity_Service                  $entity_service
-	 * @param \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter
-	 * @param \Wordlift_Post_To_Jsonld_Converter        $post_to_jsonld_converter
-	 */
-	public function __construct( $entity_service, $entity_post_to_jsonld_converter, $post_to_jsonld_converter ) {
+    /**
+     * Wordlift_Entity_To_Jsonld_Converter constructor.
+     *
+     * @since 3.8.0
+     *
+     * @param \Wordlift_Entity_Service                  $entity_service
+     * @param \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter
+     * @param \Wordlift_Post_To_Jsonld_Converter        $post_to_jsonld_converter
+     */
+    public function __construct( $entity_service, $entity_post_to_jsonld_converter, $post_to_jsonld_converter ) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
 
-		$this->entity_service                  = $entity_service;
-		$this->entity_post_to_jsonld_converter = $entity_post_to_jsonld_converter;
-		$this->post_to_jsonld_converter        = $post_to_jsonld_converter;
+        $this->entity_service                  = $entity_service;
+        $this->entity_post_to_jsonld_converter = $entity_post_to_jsonld_converter;
+        $this->post_to_jsonld_converter        = $post_to_jsonld_converter;
 
-	}
+    }
 
-	/**
-	 * Convert a post to JSON-LD.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param string $id A post id (post or entity).
-	 *
-	 * @param array  $references
-	 *
-	 * @return array|NULL A JSON-LD array representation of the post with the provided id, or NULL if not found.
-	 */
-	public function convert( $id, &$references = array() ) {
+    /**
+     * Convert a post to JSON-LD.
+     *
+     * @since 3.8.0
+     *
+     * @param string $id A post id (post or entity).
+     *
+     * @param array  $references
+     *
+     * @return array|NULL A JSON-LD array representation of the post with the provided id, or NULL if not found.
+     */
+    public function convert( $id, &$references = array() ) {
 
-		$this->log->trace( "Converting post $id..." );
+        $this->log->trace( "Converting post $id..." );
 
-		return $this->entity_service->is_entity( $id )
-			// Entity.
-			? $this->entity_post_to_jsonld_converter->convert( $id, $references )
-			// Post/Page.
-			: $this->post_to_jsonld_converter->convert( $id, $references );
-	}
+        return $this->entity_service->is_entity( $id )
+            // Entity.
+            ? $this->entity_post_to_jsonld_converter->convert( $id, $references )
+            // Post/Page.
+            : $this->post_to_jsonld_converter->convert( $id, $references );
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -38,9 +38,9 @@ 
 	 * @param \Wordlift_Entity_Post_To_Jsonld_Converter $entity_post_to_jsonld_converter
 	 * @param \Wordlift_Post_To_Jsonld_Converter        $post_to_jsonld_converter
 	 */
-	public function __construct( $entity_service, $entity_post_to_jsonld_converter, $post_to_jsonld_converter ) {
+	public function __construct($entity_service, $entity_post_to_jsonld_converter, $post_to_jsonld_converter) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		$this->entity_service                  = $entity_service;
 		$this->entity_post_to_jsonld_converter = $entity_post_to_jsonld_converter;
@@ -59,15 +59,15 @@ 
 	 *
 	 * @return array|NULL A JSON-LD array representation of the post with the provided id, or NULL if not found.
 	 */
-	public function convert( $id, &$references = array() ) {
+	public function convert($id, &$references = array()) {
 
-		$this->log->trace( "Converting post $id..." );
+		$this->log->trace("Converting post $id...");
 
-		return $this->entity_service->is_entity( $id )
+		return $this->entity_service->is_entity($id)
 			// Entity.
-			? $this->entity_post_to_jsonld_converter->convert( $id, $references )
+			? $this->entity_post_to_jsonld_converter->convert($id, $references)
 			// Post/Page.
-			: $this->post_to_jsonld_converter->convert( $id, $references );
+			: $this->post_to_jsonld_converter->convert($id, $references);
 	}
 
 }

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

Spacing +49 added lines, -49 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	public function __construct() {
 
-		self::$log = Wordlift_Log_Service::get_logger( get_class() );
+		self::$log = Wordlift_Log_Service::get_logger(get_class());
 
 		global $wpdb;
 
@@ -93,24 +93,24 @@ 
 	 *
 	 * @return array|object|null Database query results
 	 */
-	public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null ) {
+	public function get_article_subjects($object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null) {
 		global $wpdb;
 
 		// The output fields.
-		$actual_fields = self::fields( $fields );
+		$actual_fields = self::fields($fields);
 
-		self::$log->trace( 'Getting article subjects for object ' . implode( ', ', (array) $object_id ) . '...' );
+		self::$log->trace('Getting article subjects for object '.implode(', ', (array) $object_id).'...');
 
-		$objects = $this->article_id_to_entity_id( $object_id );
+		$objects = $this->article_id_to_entity_id($object_id);
 
 		// If there are no related objects, return an empty array.
-		if ( empty( $objects ) ) {
-			self::$log->debug( 'No entities found for object ' . implode( ', ', (array) $object_id ) . '.' );
+		if (empty($objects)) {
+			self::$log->debug('No entities found for object '.implode(', ', (array) $object_id).'.');
 
 			return array();
 		}
 
-		self::$log->debug( count( $objects ) . ' entity id(s) found for object ' . implode( ', ', (array) $object_id ) . '.' );
+		self::$log->debug(count($objects).' entity id(s) found for object '.implode(', ', (array) $object_id).'.');
 
 		$sql =
 			"
@@ -120,19 +120,19 @@ 
 				ON p.id = r.subject_id
 			"
 			// Add the status clause.
-			. self::and_status( $status )
+			. self::and_status($status)
 			. self::inner_join_is_article()
-			. self::where_object_id( $objects )
+			. self::where_object_id($objects)
 			// Since `object_id` can be an article ID we need to exclude it from
 			// the results.
-			. self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
-			. self::and_article_in( $include )
+			. self::and_article_not_in(array_merge($excludes, (array) $object_id))
+			. self::and_article_in($include)
 			. self::and_post_type_in()
-			. self::and_predicate( $predicate )
-			. self::limit( $limit );
+			. self::and_predicate($predicate)
+			. self::limit($limit);
 
 
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+		return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql);
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 		return " AND p.post_type IN ( '"
 			   . implode(
 				   "','",
-				   array_map( 'esc_sql', Wordlift_Entity_Service::valid_entity_post_types() )
+				   array_map('esc_sql', Wordlift_Entity_Service::valid_entity_post_types())
 			   )
 			   . "' )";
 	}
@@ -161,9 +161,9 @@ 
 	 *
 	 * @return string The limit clause (empty if no limit has been specified).
 	 */
-	private static function limit( $limit = null ) {
+	private static function limit($limit = null) {
 
-		if ( null === $limit ) {
+		if (null === $limit) {
 			return '';
 		}
 
@@ -180,19 +180,19 @@ 
 	 *
 	 * @return array An array of entities' ids.
 	 */
-	private function article_id_to_entity_id( $object_id ) {
+	private function article_id_to_entity_id($object_id) {
 
 		$entity_service = Wordlift_Entity_Service::get_instance();
 
 		$relation_service = $this;
 
-		return array_reduce( (array) $object_id, function ( $carry, $item ) use ( $entity_service, $relation_service ) {
-			if ( $entity_service->is_entity( $item ) ) {
-				return array_merge( $carry, (array) $item );
+		return array_reduce((array) $object_id, function($carry, $item) use ($entity_service, $relation_service) {
+			if ($entity_service->is_entity($item)) {
+				return array_merge($carry, (array) $item);
 			}
 
-			return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
-		}, array() );
+			return array_merge($carry, $relation_service->get_objects($item, 'ids'));
+		}, array());
 
 	}
 
@@ -205,15 +205,15 @@ 
 	 *
 	 * @return string The WHERE clause.
 	 */
-	private static function where_object_id( $object_id ) {
+	private static function where_object_id($object_id) {
 
-		if ( empty( $object_id ) ) {
-			self::$log->warn( sprintf( "%s `where_object_id` called with empty `object_id`.", var_export( debug_backtrace( false, 3 ), true ) ) );
+		if (empty($object_id)) {
+			self::$log->warn(sprintf("%s `where_object_id` called with empty `object_id`.", var_export(debug_backtrace(false, 3), true)));
 
 			return ' WHERE 1 = 1';
 		}
 
-		return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
+		return ' WHERE r.object_id IN ( '.implode(',', wp_parse_id_list((array) $object_id)).' )';
 	}
 
 	/**
@@ -225,9 +225,9 @@ 
 	 *
 	 * @return string The exclude clause.
 	 */
-	private static function and_article_not_in( $exclude ) {
+	private static function and_article_not_in($exclude) {
 
-		return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
+		return ' AND NOT p.ID IN ( '.implode(',', wp_parse_id_list((array) $exclude)).' )';
 	}
 
 	/**
@@ -240,13 +240,13 @@ 
 	 * @return string An empty string if $include is null otherwise the include
 	 *                clause.
 	 */
-	private static function and_article_in( $include = null ) {
+	private static function and_article_in($include = null) {
 
-		if ( null === $include ) {
+		if (null === $include) {
 			return '';
 		}
 
-		return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
+		return ' AND p.ID IN ( '.implode(',', wp_parse_id_list((array) $include)).' )';
 	}
 
 	/**
@@ -261,11 +261,11 @@ 
 	 *
 	 * @return array|object|null Database query results
 	 */
-	public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
+	public function get_non_article_subjects($object_id, $fields = '*', $status = null) {
 		global $wpdb;
 
 		// The output fields.
-		$actual_fields = self::fields( $fields );
+		$actual_fields = self::fields($fields);
 
 		$sql = $wpdb->prepare(
 			"
@@ -275,7 +275,7 @@ 
 				ON p.id = r.subject_id
 			"
 			// Add the status clause.
-			. self::and_status( $status )
+			. self::and_status($status)
 			. self::inner_join_is_not_article()
 			. " WHERE r.object_id = %d "
 			. self::and_post_type_in()
@@ -283,7 +283,7 @@ 
 			$object_id
 		);
 
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+		return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql);
 	}
 
 	/**
@@ -299,11 +299,11 @@ 
 	 *
 	 * @return array|object|null Database query results
 	 */
-	public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
+	public function get_objects($subject_id, $fields = '*', $predicate = null, $status = null) {
 		global $wpdb;
 
 		// The output fields.
-		$actual_fields = self::fields( $fields );
+		$actual_fields = self::fields($fields);
 
 		$sql = $wpdb->prepare(
 			"
@@ -313,16 +313,16 @@ 
 				ON p.id = r.object_id
 			"
 			// Add the status clause.
-			. self::and_status( $status )
+			. self::and_status($status)
 			. self::inner_join_is_not_article()
 			. " WHERE r.subject_id = %d "
 			. self::and_post_type_in()
-			. self::and_predicate( $predicate )
+			. self::and_predicate($predicate)
 			,
 			$subject_id
 		);
 
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+		return '*' === $actual_fields ? $wpdb->get_results($sql) : $wpdb->get_col($sql);
 	}
 
 	/**
@@ -334,13 +334,13 @@ 
 	 *
 	 * @return string An empty string if $status is null, otherwise the status clause.
 	 */
-	private static function and_status( $status = null ) {
+	private static function and_status($status = null) {
 
-		if ( null === $status ) {
+		if (null === $status) {
 			return '';
 		}
 
-		return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
+		return " AND p.post_status IN ('".implode("', '", array_map('esc_sql', (array) $status))."')";
 	}
 
 	/**
@@ -353,13 +353,13 @@ 
 	 * @return string An empty string if $predicate is null otherwise the predicate
 	 *                clause.
 	 */
-	private static function and_predicate( $predicate = null ) {
+	private static function and_predicate($predicate = null) {
 
-		if ( null === $predicate ) {
+		if (null === $predicate) {
 			return '';
 		}
 
-		return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
+		return " AND r.predicate IN ('".implode("', '", array_map('esc_sql', (array) $predicate))."')";
 	}
 
 	/**
@@ -371,7 +371,7 @@ 
 	 *
 	 * @return string The `id` field if `ids` otherwise `*`.
 	 */
-	private static function fields( $fields = '*' ) {
+	private static function fields($fields = '*') {
 
 		// The output fields.
 		return 'ids' === $fields ? 'id' : '*';

Indentation +391 added lines, -391 removed lines

@@ -18,376 +18,376 @@ 
  */
 class Wordlift_Relation_Service {
 
-	/**
-	 * The singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Relation_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * The relation table name in MySQL, set during instantiation.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var string $relation_table The relation table name.
-	 */
-	private $relation_table;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.3
-	 *
-	 * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private static $log;
-
-	/**
-	 * Create a {@link Wordlift_Relation_Service} instance.
-	 *
-	 * @since 3.15.0
-	 */
-	public function __construct() {
-
-		self::$log = Wordlift_Log_Service::get_logger( get_class() );
-
-		global $wpdb;
-
-		// The relations table.
-		$this->relation_table = "{$wpdb->prefix}wl_relation_instances";
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since  3.15.0
-	 * @access public
-	 * @return \Wordlift_Relation_Service The {@link Wordlift_Relation_Service}
-	 *                                    singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the articles referencing the specified entity {@link WP_Post}.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int|array   $object_id The entity {@link WP_Post}'s id.
-	 * @param string      $fields    The fields to return, 'ids' to only return ids or
-	 *                               '*' to return all fields, by default '*'.
-	 * @param null|string $predicate The predicate (who|what|...), by default all.
-	 * @param null|string $status    The status, by default all.
-	 * @param array       $excludes  An array of ids to exclude from the results.
-	 * @param null|int    $limit     The maximum number of results, by default
-	 *                               no limit.
-	 * @param null|array  $include   The {@link WP_Post}s' ids to include.
-	 *
-	 * @return array|object|null Database query results
-	 */
-	public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null ) {
-		global $wpdb;
-
-		// The output fields.
-		$actual_fields = self::fields( $fields );
-
-		self::$log->trace( 'Getting article subjects for object ' . implode( ', ', (array) $object_id ) . '...' );
-
-		$objects = $this->article_id_to_entity_id( $object_id );
-
-		// If there are no related objects, return an empty array.
-		if ( empty( $objects ) ) {
-			self::$log->debug( 'No entities found for object ' . implode( ', ', (array) $object_id ) . '.' );
-
-			return array();
-		}
-
-		self::$log->debug( count( $objects ) . ' entity id(s) found for object ' . implode( ', ', (array) $object_id ) . '.' );
-
-		$sql =
-			"
+    /**
+     * The singleton instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Relation_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * The relation table name in MySQL, set during instantiation.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var string $relation_table The relation table name.
+     */
+    private $relation_table;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.3
+     *
+     * @var Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private static $log;
+
+    /**
+     * Create a {@link Wordlift_Relation_Service} instance.
+     *
+     * @since 3.15.0
+     */
+    public function __construct() {
+
+        self::$log = Wordlift_Log_Service::get_logger( get_class() );
+
+        global $wpdb;
+
+        // The relations table.
+        $this->relation_table = "{$wpdb->prefix}wl_relation_instances";
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since  3.15.0
+     * @access public
+     * @return \Wordlift_Relation_Service The {@link Wordlift_Relation_Service}
+     *                                    singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the articles referencing the specified entity {@link WP_Post}.
+     *
+     * @since 3.15.0
+     *
+     * @param int|array   $object_id The entity {@link WP_Post}'s id.
+     * @param string      $fields    The fields to return, 'ids' to only return ids or
+     *                               '*' to return all fields, by default '*'.
+     * @param null|string $predicate The predicate (who|what|...), by default all.
+     * @param null|string $status    The status, by default all.
+     * @param array       $excludes  An array of ids to exclude from the results.
+     * @param null|int    $limit     The maximum number of results, by default
+     *                               no limit.
+     * @param null|array  $include   The {@link WP_Post}s' ids to include.
+     *
+     * @return array|object|null Database query results
+     */
+    public function get_article_subjects( $object_id, $fields = '*', $predicate = null, $status = null, $excludes = array(), $limit = null, $include = null ) {
+        global $wpdb;
+
+        // The output fields.
+        $actual_fields = self::fields( $fields );
+
+        self::$log->trace( 'Getting article subjects for object ' . implode( ', ', (array) $object_id ) . '...' );
+
+        $objects = $this->article_id_to_entity_id( $object_id );
+
+        // If there are no related objects, return an empty array.
+        if ( empty( $objects ) ) {
+            self::$log->debug( 'No entities found for object ' . implode( ', ', (array) $object_id ) . '.' );
+
+            return array();
+        }
+
+        self::$log->debug( count( $objects ) . ' entity id(s) found for object ' . implode( ', ', (array) $object_id ) . '.' );
+
+        $sql =
+            "
 			SELECT DISTINCT p.$actual_fields
 			FROM {$this->relation_table} r
 			INNER JOIN $wpdb->posts p
 				ON p.id = r.subject_id
 			"
-			// Add the status clause.
-			. self::and_status( $status )
-			. self::inner_join_is_article()
-			. self::where_object_id( $objects )
-			// Since `object_id` can be an article ID we need to exclude it from
-			// the results.
-			. self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
-			. self::and_article_in( $include )
-			. self::and_post_type_in()
-			. self::and_predicate( $predicate )
-			. self::limit( $limit );
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * The `post_type IN` clause.
-	 *
-	 * @since 3.15.3
-	 *
-	 * @return string The `post_type IN` clause.
-	 */
-	private static function and_post_type_in() {
-
-		return " AND p.post_type IN ( '"
-			   . implode(
-				   "','",
-				   array_map( 'esc_sql', Wordlift_Entity_Service::valid_entity_post_types() )
-			   )
-			   . "' )";
-	}
-
-	/**
-	 * Add the limit clause if specified.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param null|int $limit The maximum number of results.
-	 *
-	 * @return string The limit clause (empty if no limit has been specified).
-	 */
-	private static function limit( $limit = null ) {
-
-		if ( null === $limit ) {
-			return '';
-		}
-
-		return "LIMIT $limit";
-	}
-
-	/**
-	 * Map the provided ids into entities (i.e. return the id if it's an entity
-	 * or get the entities if it's a post).
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int|array $object_id An array of posts/entities' ids.
-	 *
-	 * @return array An array of entities' ids.
-	 */
-	private function article_id_to_entity_id( $object_id ) {
-
-		$entity_service = Wordlift_Entity_Service::get_instance();
-
-		$relation_service = $this;
-
-		return array_reduce( (array) $object_id, function ( $carry, $item ) use ( $entity_service, $relation_service ) {
-			if ( $entity_service->is_entity( $item ) ) {
-				return array_merge( $carry, (array) $item );
-			}
-
-			return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
-		}, array() );
-
-	}
-
-	/**
-	 * Add the WHERE clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int|array $object_id An array of {@link WP_Post}s' ids.
-	 *
-	 * @return string The WHERE clause.
-	 */
-	private static function where_object_id( $object_id ) {
-
-		if ( empty( $object_id ) ) {
-			self::$log->warn( sprintf( "%s `where_object_id` called with empty `object_id`.", var_export( debug_backtrace( false, 3 ), true ) ) );
-
-			return ' WHERE 1 = 1';
-		}
-
-		return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
-	}
-
-	/**
-	 * Add the exclude clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int|array $exclude An array of {@link WP_Post}s' ids to exclude.
-	 *
-	 * @return string The exclude clause.
-	 */
-	private static function and_article_not_in( $exclude ) {
-
-		return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
-	}
-
-	/**
-	 * Add the include clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param null|int|array $include An array of {@link WP_Post}s' ids.
-	 *
-	 * @return string An empty string if $include is null otherwise the include
-	 *                clause.
-	 */
-	private static function and_article_in( $include = null ) {
-
-		if ( null === $include ) {
-			return '';
-		}
-
-		return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
-	}
-
-	/**
-	 * Get the entities' {@link WP_Post}s' ids referencing the specified {@link WP_Post}.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int         $object_id The object {@link WP_Post}'s id.
-	 * @param string      $fields    The fields to return, 'ids' to only return ids or
-	 *                               '*' to return all fields, by default '*'.
-	 * @param null|string $status    The status, by default all.
-	 *
-	 * @return array|object|null Database query results
-	 */
-	public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
-		global $wpdb;
-
-		// The output fields.
-		$actual_fields = self::fields( $fields );
-
-		$sql = $wpdb->prepare(
-			"
+            // Add the status clause.
+            . self::and_status( $status )
+            . self::inner_join_is_article()
+            . self::where_object_id( $objects )
+            // Since `object_id` can be an article ID we need to exclude it from
+            // the results.
+            . self::and_article_not_in( array_merge( $excludes, (array) $object_id ) )
+            . self::and_article_in( $include )
+            . self::and_post_type_in()
+            . self::and_predicate( $predicate )
+            . self::limit( $limit );
+
+        return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * The `post_type IN` clause.
+     *
+     * @since 3.15.3
+     *
+     * @return string The `post_type IN` clause.
+     */
+    private static function and_post_type_in() {
+
+        return " AND p.post_type IN ( '"
+                . implode(
+                    "','",
+                    array_map( 'esc_sql', Wordlift_Entity_Service::valid_entity_post_types() )
+                )
+                . "' )";
+    }
+
+    /**
+     * Add the limit clause if specified.
+     *
+     * @since 3.15.0
+     *
+     * @param null|int $limit The maximum number of results.
+     *
+     * @return string The limit clause (empty if no limit has been specified).
+     */
+    private static function limit( $limit = null ) {
+
+        if ( null === $limit ) {
+            return '';
+        }
+
+        return "LIMIT $limit";
+    }
+
+    /**
+     * Map the provided ids into entities (i.e. return the id if it's an entity
+     * or get the entities if it's a post).
+     *
+     * @since 3.15.0
+     *
+     * @param int|array $object_id An array of posts/entities' ids.
+     *
+     * @return array An array of entities' ids.
+     */
+    private function article_id_to_entity_id( $object_id ) {
+
+        $entity_service = Wordlift_Entity_Service::get_instance();
+
+        $relation_service = $this;
+
+        return array_reduce( (array) $object_id, function ( $carry, $item ) use ( $entity_service, $relation_service ) {
+            if ( $entity_service->is_entity( $item ) ) {
+                return array_merge( $carry, (array) $item );
+            }
+
+            return array_merge( $carry, $relation_service->get_objects( $item, 'ids' ) );
+        }, array() );
+
+    }
+
+    /**
+     * Add the WHERE clause.
+     *
+     * @since 3.15.0
+     *
+     * @param int|array $object_id An array of {@link WP_Post}s' ids.
+     *
+     * @return string The WHERE clause.
+     */
+    private static function where_object_id( $object_id ) {
+
+        if ( empty( $object_id ) ) {
+            self::$log->warn( sprintf( "%s `where_object_id` called with empty `object_id`.", var_export( debug_backtrace( false, 3 ), true ) ) );
+
+            return ' WHERE 1 = 1';
+        }
+
+        return ' WHERE r.object_id IN ( ' . implode( ',', wp_parse_id_list( (array) $object_id ) ) . ' )';
+    }
+
+    /**
+     * Add the exclude clause.
+     *
+     * @since 3.15.0
+     *
+     * @param int|array $exclude An array of {@link WP_Post}s' ids to exclude.
+     *
+     * @return string The exclude clause.
+     */
+    private static function and_article_not_in( $exclude ) {
+
+        return ' AND NOT p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $exclude ) ) . ' )';
+    }
+
+    /**
+     * Add the include clause.
+     *
+     * @since 3.15.0
+     *
+     * @param null|int|array $include An array of {@link WP_Post}s' ids.
+     *
+     * @return string An empty string if $include is null otherwise the include
+     *                clause.
+     */
+    private static function and_article_in( $include = null ) {
+
+        if ( null === $include ) {
+            return '';
+        }
+
+        return ' AND p.ID IN ( ' . implode( ',', wp_parse_id_list( (array) $include ) ) . ' )';
+    }
+
+    /**
+     * Get the entities' {@link WP_Post}s' ids referencing the specified {@link WP_Post}.
+     *
+     * @since 3.15.0
+     *
+     * @param int         $object_id The object {@link WP_Post}'s id.
+     * @param string      $fields    The fields to return, 'ids' to only return ids or
+     *                               '*' to return all fields, by default '*'.
+     * @param null|string $status    The status, by default all.
+     *
+     * @return array|object|null Database query results
+     */
+    public function get_non_article_subjects( $object_id, $fields = '*', $status = null ) {
+        global $wpdb;
+
+        // The output fields.
+        $actual_fields = self::fields( $fields );
+
+        $sql = $wpdb->prepare(
+            "
 			SELECT p.$actual_fields
 			FROM {$this->relation_table} r
 			INNER JOIN $wpdb->posts p
 				ON p.id = r.subject_id
 			"
-			// Add the status clause.
-			. self::and_status( $status )
-			. self::inner_join_is_not_article()
-			. " WHERE r.object_id = %d "
-			. self::and_post_type_in()
-			,
-			$object_id
-		);
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * Get the entities referenced by the specified {@link WP_Post}.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int         $subject_id The {@link WP_Post}'s id.
-	 * @param string      $fields     The fields to return, 'ids' to only return ids or
-	 *                                '*' to return all fields, by default '*'.
-	 * @param null|string $predicate  The predicate (who|what|...), by default all.
-	 * @param null|string $status     The status, by default all.
-	 *
-	 * @return array|object|null Database query results
-	 */
-	public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
-		global $wpdb;
-
-		// The output fields.
-		$actual_fields = self::fields( $fields );
-
-		$sql = $wpdb->prepare(
-			"
+            // Add the status clause.
+            . self::and_status( $status )
+            . self::inner_join_is_not_article()
+            . " WHERE r.object_id = %d "
+            . self::and_post_type_in()
+            ,
+            $object_id
+        );
+
+        return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * Get the entities referenced by the specified {@link WP_Post}.
+     *
+     * @since 3.15.0
+     *
+     * @param int         $subject_id The {@link WP_Post}'s id.
+     * @param string      $fields     The fields to return, 'ids' to only return ids or
+     *                                '*' to return all fields, by default '*'.
+     * @param null|string $predicate  The predicate (who|what|...), by default all.
+     * @param null|string $status     The status, by default all.
+     *
+     * @return array|object|null Database query results
+     */
+    public function get_objects( $subject_id, $fields = '*', $predicate = null, $status = null ) {
+        global $wpdb;
+
+        // The output fields.
+        $actual_fields = self::fields( $fields );
+
+        $sql = $wpdb->prepare(
+            "
 			SELECT p.$actual_fields
 			FROM {$this->relation_table} r
 			INNER JOIN $wpdb->posts p
 				ON p.id = r.object_id
 			"
-			// Add the status clause.
-			. self::and_status( $status )
-			. self::inner_join_is_not_article()
-			. " WHERE r.subject_id = %d "
-			. self::and_post_type_in()
-			. self::and_predicate( $predicate )
-			,
-			$subject_id
-		);
-
-		return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * Add the `post_status` clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param null|string|array $status The status values.
-	 *
-	 * @return string An empty string if $status is null, otherwise the status clause.
-	 */
-	private static function and_status( $status = null ) {
-
-		if ( null === $status ) {
-			return '';
-		}
-
-		return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
-	}
-
-	/**
-	 * Add the `predicate` clause.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param null|string|array $predicate An array of predicates.
-	 *
-	 * @return string An empty string if $predicate is null otherwise the predicate
-	 *                clause.
-	 */
-	private static function and_predicate( $predicate = null ) {
-
-		if ( null === $predicate ) {
-			return '';
-		}
-
-		return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
-	}
-
-	/**
-	 * The select fields.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $fields Either 'ids' or '*', by default '*'.
-	 *
-	 * @return string The `id` field if `ids` otherwise `*`.
-	 */
-	private static function fields( $fields = '*' ) {
-
-		// The output fields.
-		return 'ids' === $fields ? 'id' : '*';
-	}
-
-	/**
-	 * The inner join clause for articles.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return string The articles inner join clause.
-	 */
-	private static function inner_join_is_article() {
-		global $wpdb;
-
-		return $wpdb->prepare(
-			"
+            // Add the status clause.
+            . self::and_status( $status )
+            . self::inner_join_is_not_article()
+            . " WHERE r.subject_id = %d "
+            . self::and_post_type_in()
+            . self::and_predicate( $predicate )
+            ,
+            $subject_id
+        );
+
+        return '*' === $actual_fields ? $wpdb->get_results( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * Add the `post_status` clause.
+     *
+     * @since 3.15.0
+     *
+     * @param null|string|array $status The status values.
+     *
+     * @return string An empty string if $status is null, otherwise the status clause.
+     */
+    private static function and_status( $status = null ) {
+
+        if ( null === $status ) {
+            return '';
+        }
+
+        return " AND p.post_status IN ('" . implode( "', '", array_map( 'esc_sql', (array) $status ) ) . "')";
+    }
+
+    /**
+     * Add the `predicate` clause.
+     *
+     * @since 3.15.0
+     *
+     * @param null|string|array $predicate An array of predicates.
+     *
+     * @return string An empty string if $predicate is null otherwise the predicate
+     *                clause.
+     */
+    private static function and_predicate( $predicate = null ) {
+
+        if ( null === $predicate ) {
+            return '';
+        }
+
+        return " AND r.predicate IN ('" . implode( "', '", array_map( 'esc_sql', (array) $predicate ) ) . "')";
+    }
+
+    /**
+     * The select fields.
+     *
+     * @since 3.15.0
+     *
+     * @param string $fields Either 'ids' or '*', by default '*'.
+     *
+     * @return string The `id` field if `ids` otherwise `*`.
+     */
+    private static function fields( $fields = '*' ) {
+
+        // The output fields.
+        return 'ids' === $fields ? 'id' : '*';
+    }
+
+    /**
+     * The inner join clause for articles.
+     *
+     * @since 3.15.0
+     *
+     * @return string The articles inner join clause.
+     */
+    private static function inner_join_is_article() {
+        global $wpdb;
+
+        return $wpdb->prepare(
+            "
 			INNER JOIN $wpdb->term_relationships tr
 			 ON p.id = tr.object_id
 			INNER JOIN $wpdb->term_taxonomy tt
@@ -397,23 +397,23 @@ 
 			 ON t.term_id = tt.term_id
 			  AND t.slug = %s
 			",
-			'wl_entity_type',
-			'article'
-		);
-	}
-
-	/**
-	 * The inner join clause for non-articles.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @return string The non-articles inner join clause.
-	 */
-	private static function inner_join_is_not_article() {
-		global $wpdb;
-
-		return $wpdb->prepare(
-			"
+            'wl_entity_type',
+            'article'
+        );
+    }
+
+    /**
+     * The inner join clause for non-articles.
+     *
+     * @since 3.15.0
+     *
+     * @return string The non-articles inner join clause.
+     */
+    private static function inner_join_is_not_article() {
+        global $wpdb;
+
+        return $wpdb->prepare(
+            "
 			INNER JOIN $wpdb->term_relationships tr
 			 ON p.id = tr.object_id
 			INNER JOIN $wpdb->term_taxonomy tt
@@ -423,29 +423,29 @@ 
 			 ON t.term_id = tt.term_id
 			  AND NOT t.slug = %s
 			",
-			'wl_entity_type',
-			'article'
-		);
-	}
-
-	/**
-	 * Find all the subject IDs and their referenced/related object IDs. The
-	 * object IDs are returned as comma separated IDs in the `object_ids` key.
-	 *
-	 * @since 3.18.0
-	 * @return mixed Database query results
-	 */
-	public function find_all_grouped_by_subject_id() {
-		global $wpdb;
-
-		return $wpdb->get_results(
-			"
+            'wl_entity_type',
+            'article'
+        );
+    }
+
+    /**
+     * Find all the subject IDs and their referenced/related object IDs. The
+     * object IDs are returned as comma separated IDs in the `object_ids` key.
+     *
+     * @since 3.18.0
+     * @return mixed Database query results
+     */
+    public function find_all_grouped_by_subject_id() {
+        global $wpdb;
+
+        return $wpdb->get_results(
+            "
 			SELECT subject_id, GROUP_CONCAT( DISTINCT object_id ORDER BY object_id SEPARATOR ',' ) AS object_ids
 			FROM $this->relation_table
 			GROUP BY subject_id
 			"
-		);
+        );
 
-	}
+    }
 
 }

src/includes/intf-wordlift-post-converter.php

Indentation +12 added lines, -12 removed lines

@@ -18,17 +18,17 @@
  */
 interface Wordlift_Post_Converter {
 
-	/**
-	 * Convert the specified post id.
-	 *
-	 * @since 3.16.0 $references argument added.
-	 * @since 3.10.0
-	 *
-	 * @param int   $post_id    The post id.
-	 * @param array $references An array of posts referenced by the specified post.
-	 *
-	 * @return mixed The conversion result.
-	 */
-	public function convert( $post_id, &$references = array() );
+    /**
+     * Convert the specified post id.
+     *
+     * @since 3.16.0 $references argument added.
+     * @since 3.10.0
+     *
+     * @param int   $post_id    The post id.
+     * @param array $references An array of posts referenced by the specified post.
+     *
+     * @return mixed The conversion result.
+     */
+    public function convert( $post_id, &$references = array() );
 
 }

Spacing +1 added lines, -1 removed lines

@@ -29,6 +29,6 @@
 	 *
 	 * @return mixed The conversion result.
 	 */
-	public function convert( $post_id, &$references = array() );
+	public function convert($post_id, &$references = array());
 
 }

src/includes/class-wordlift-sample-data-service.php

Indentation +324 added lines, -324 removed lines

@@ -17,98 +17,98 @@ 
  */
 class Wordlift_Sample_Data_Service {
 
-	/**
-	 * An array of sample data.
-	 *
-	 * @since 3.12.0
-	 * @var array $samples An array of sample data.
-	 */
-	private $samples = array(
-		array(
-			'post'            => array(
-				'post_name'    => 'praesent_imperdiet_odio_sed_lectus_vulputate_finibus',
-				'post_title'   => 'Praesent imperdiet odio sed lectus vulputate finibus',
-				'post_content' => 'Praesent imperdiet odio sed lectus vulputate finibus. Donec placerat ex arcu, eget fermentum metus ullamcorper vitae. Cras interdum libero a tellus sagittis, sed ultricies sapien tincidunt. Aliquam sit amet vehicula sem. Mauris neque nisl, pellentesque ut molestie id, laoreet nec tortor. Sed tempus ornare est, nec dapibus enim ornare eu. Cras risus ligula, blandit ut faucibus ut, vulputate id ipsum. In vel purus at orci hendrerit cursus. Aliquam interdum lorem id dui maximus volutpat. Vestibulum mi velit, efficitur nec neque eu, posuere porta risus.',
-				'post_type'    => 'entity',
-				'post_status'  => 'publish',
-			),
-			'entity_type_uri' => 'http://schema.org/Event',
-		),
-		array(
-			'post'            => array(
-				'post_name'    => 'nullam_tempor_lectus_sit_amet_tincidunt_euismod',
-				'post_title'   => 'Nullam tempor lectus sit amet tincidunt euismod',
-				'post_content' => 'Nullam tempor lectus sit amet tincidunt euismod. Nunc posuere libero augue, eu pretium erat interdum id. Vivamus aliquam dui in mauris tempor, vitae vestibulum odio aliquet. Proin quis bibendum diam, nec tempus dui. Pellentesque sit amet justo vitae urna ornare volutpat quis consectetur nisl. Sed hendrerit purus et magna varius, sodales tincidunt velit finibus. Donec malesuada faucibus mattis. Morbi viverra sagittis justo nec luctus. Nullam et justo sed nisi fringilla rutrum sit amet a urna. Integer elementum, risus in condimentum rhoncus, nisi velit cursus tellus, sed sagittis ante tellus hendrerit ante. Donec et semper libero, vitae imperdiet ligula. Donec eleifend iaculis nisi sed mollis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Proin faucibus magna ac lectus tempor iaculis quis in nisi. Mauris ac nibh lacinia, ultrices erat quis, rhoncus lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.',
-				'post_type'    => 'entity',
-				'post_status'  => 'publish',
-			),
-			'entity_type_uri' => 'http://schema.org/Place',
-		),
-		array(
-			'post'            => array(
-				'post_name'    => 'praesent_luctus_tincidunt_odio_quis_aliquam',
-				'post_title'   => 'Praesent luctus tincidunt odio quis aliquam',
-				'post_content' => 'Praesent luctus tincidunt odio quis aliquam. Ut pellentesque odio nec turpis placerat, at rhoncus mauris elementum. Proin vehicula lectus a dolor bibendum, ut pretium lacus volutpat. Integer luctus enim sed odio dapibus tempus. Fusce elementum purus in diam dictum, sit amet ultricies leo molestie. Etiam id nunc tincidunt sapien tristique interdum ac at purus. Nulla eget laoreet turpis. Nullam id cursus nulla.',
-				'post_type'    => 'entity',
-				'post_status'  => 'publish',
-			),
-			'entity_type_uri' => 'http://schema.org/Organization',
-		),
-		array(
-			'post'            => array(
-				'post_name'    => 'lorem_ipsum_dolor_sit_amet__consectetur_adipiscing_elit',
-				'post_title'   => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit',
-				'post_content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
-				'post_type'    => 'entity',
-				'post_status'  => 'publish',
-			),
-			'entity_type_uri' => 'http://schema.org/CreativeWork',
-		),
-		array(
-			'post' =>
-				array(
-					'post_name'    => 'post_1',
-					'post_title'   => 'Praesent imperdiet odio sed lectus vulputate finibus',
-					'post_content' => '<span><span id="urn:enhancement-da554278-9522-2d83-76ad-8129d2292cb3" class="textannotation disambiguated wl-event" itemid="{dataset-uri}/entity/praesent_imperdiet_odio_sed_lectus_vulputate_finibus">Praesent imperdiet odio sed lectus vulputate finibus</span>. Donec placerat ex arcu, eget fermentum metus ullamcorper vitae. Cras interdum libero a tellus sagittis, sed ultricies sapien tincidunt. Aliquam sit amet vehicula sem. Mauris neque nisl, pellentesque ut molestie id, laoreet nec tortor. Sed tempus ornare est, nec dapibus enim ornare eu. Cras risus ligula, blandit ut faucibus ut, vulputate id ipsum. In vel purus at orci hendrerit cursus. Aliquam interdum lorem id dui maximus volutpat. Vestibulum mi velit, efficitur nec neque eu, posuere porta risus.</span>',
-					'post_type'    => 'post',
-					'post_status'  => 'publish',
-				),
-		),
-		array(
-			'post' =>
-				array(
-					'post_name'    => 'post_2',
-					'post_title'   => 'Nullam tempor lectus sit amet tincidunt euismod',
-					'post_content' => '<span><span id="urn:local-text-annotation-p8i5o4279ex3rsbwqkrx9z5mh1ox91ae" class="textannotation disambiguated wl-place" itemid="{dataset-uri}/entity/nullam_tempor_lectus_sit_amet_tincidunt_euismod">Nullam tempor lectus sit amet tincidunt euismod</span>. Nunc posuere libero augue, eu pretium erat interdum id. Vivamus aliquam dui in mauris tempor, vitae vestibulum odio aliquet. Proin quis bibendum diam, nec tempus dui. Pellentesque sit amet justo vitae urna ornare volutpat quis consectetur nisl. Sed hendrerit purus et magna varius, sodales tincidunt velit finibus. Donec malesuada faucibus mattis. Morbi viverra sagittis justo nec luctus. Nullam et justo sed nisi fringilla rutrum sit amet a urna. Integer elementum, risus in condimentum rhoncus, nisi velit cursus tellus, sed sagittis ante tellus hendrerit ante. Donec et semper libero, vitae imperdiet ligula. Donec eleifend iaculis nisi sed mollis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Proin faucibus magna ac lectus tempor iaculis quis in nisi. Mauris ac nibh lacinia, ultrices erat quis, rhoncus lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</span>',
-					'post_type'    => 'post',
-					'post_status'  => 'publish',
-				),
-		),
-		array(
-			'post' =>
-				array(
-					'post_name'    => 'post_3',
-					'post_title'   => 'Praesent luctus tincidunt odio quis aliquam',
-					'post_content' => '<span><span id="urn:enhancement-b3487a20-4696-b6d9-6c55-842445f5c263" class="textannotation disambiguated wl-organization" itemid="{dataset-uri}/entity/praesent_luctus_tincidunt_odio_quis_aliquam">Praesent luctus tincidunt odio quis aliquam</span>. Ut pellentesque odio nec turpis placerat, at rhoncus mauris elementum. Proin vehicula lectus a dolor bibendum, ut pretium lacus volutpat. Integer luctus enim sed odio dapibus tempus. Fusce elementum purus in diam dictum, sit amet ultricies leo molestie. Etiam id nunc tincidunt sapien tristique interdum ac at purus. Nulla eget laoreet turpis. Nullam id cursus nulla.</span>',
-					'post_type'    => 'post',
-					'post_status'  => 'publish',
-				),
-		),
-		array(
-			'post' =>
-				array(
-					'post_name'    => 'post_4',
-					'post_title'   => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit',
-					'post_content' => '<span><span id="urn:enhancement-4edc3bde-d275-22f9-8d50-0b707596b292" class="textannotation disambiguated wl-thing" itemid="{dataset-uri}/entity/lorem_ipsum_dolor_sit_amet__consectetur_adipiscing_elit">Lorem ipsum dolor sit amet, consectetur adipiscing elit</span>. Proin rutrum ultrices nulla ut elementum. Nunc nec lacus tortor. Curabitur bibendum imperdiet luctus. Vivamus a faucibus dolor. Donec blandit malesuada risus. Vestibulum volutpat ut tellus sed tincidunt. Sed id tincidunt velit. Integer sed felis id libero fringilla molestie vitae id orci. Ut vel purus ullamcorper, feugiat tortor non, iaculis neque. Vivamus vitae vehicula sem. Mauris fermentum, metus id vestibulum sodales, lorem lacus efficitur ante, non vestibulum ligula ligula a turpis. Vivamus quis scelerisque massa.</span>',
-					'post_type'    => 'post',
-					'post_status'  => 'publish',
-				),
-		),
-		array(
-			'post' => array(
-				'post_name'    => 'post_5',
-				'post_title'   => 'Lorem ipsum',
-				'post_content' => "
+    /**
+     * An array of sample data.
+     *
+     * @since 3.12.0
+     * @var array $samples An array of sample data.
+     */
+    private $samples = array(
+        array(
+            'post'            => array(
+                'post_name'    => 'praesent_imperdiet_odio_sed_lectus_vulputate_finibus',
+                'post_title'   => 'Praesent imperdiet odio sed lectus vulputate finibus',
+                'post_content' => 'Praesent imperdiet odio sed lectus vulputate finibus. Donec placerat ex arcu, eget fermentum metus ullamcorper vitae. Cras interdum libero a tellus sagittis, sed ultricies sapien tincidunt. Aliquam sit amet vehicula sem. Mauris neque nisl, pellentesque ut molestie id, laoreet nec tortor. Sed tempus ornare est, nec dapibus enim ornare eu. Cras risus ligula, blandit ut faucibus ut, vulputate id ipsum. In vel purus at orci hendrerit cursus. Aliquam interdum lorem id dui maximus volutpat. Vestibulum mi velit, efficitur nec neque eu, posuere porta risus.',
+                'post_type'    => 'entity',
+                'post_status'  => 'publish',
+            ),
+            'entity_type_uri' => 'http://schema.org/Event',
+        ),
+        array(
+            'post'            => array(
+                'post_name'    => 'nullam_tempor_lectus_sit_amet_tincidunt_euismod',
+                'post_title'   => 'Nullam tempor lectus sit amet tincidunt euismod',
+                'post_content' => 'Nullam tempor lectus sit amet tincidunt euismod. Nunc posuere libero augue, eu pretium erat interdum id. Vivamus aliquam dui in mauris tempor, vitae vestibulum odio aliquet. Proin quis bibendum diam, nec tempus dui. Pellentesque sit amet justo vitae urna ornare volutpat quis consectetur nisl. Sed hendrerit purus et magna varius, sodales tincidunt velit finibus. Donec malesuada faucibus mattis. Morbi viverra sagittis justo nec luctus. Nullam et justo sed nisi fringilla rutrum sit amet a urna. Integer elementum, risus in condimentum rhoncus, nisi velit cursus tellus, sed sagittis ante tellus hendrerit ante. Donec et semper libero, vitae imperdiet ligula. Donec eleifend iaculis nisi sed mollis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Proin faucibus magna ac lectus tempor iaculis quis in nisi. Mauris ac nibh lacinia, ultrices erat quis, rhoncus lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.',
+                'post_type'    => 'entity',
+                'post_status'  => 'publish',
+            ),
+            'entity_type_uri' => 'http://schema.org/Place',
+        ),
+        array(
+            'post'            => array(
+                'post_name'    => 'praesent_luctus_tincidunt_odio_quis_aliquam',
+                'post_title'   => 'Praesent luctus tincidunt odio quis aliquam',
+                'post_content' => 'Praesent luctus tincidunt odio quis aliquam. Ut pellentesque odio nec turpis placerat, at rhoncus mauris elementum. Proin vehicula lectus a dolor bibendum, ut pretium lacus volutpat. Integer luctus enim sed odio dapibus tempus. Fusce elementum purus in diam dictum, sit amet ultricies leo molestie. Etiam id nunc tincidunt sapien tristique interdum ac at purus. Nulla eget laoreet turpis. Nullam id cursus nulla.',
+                'post_type'    => 'entity',
+                'post_status'  => 'publish',
+            ),
+            'entity_type_uri' => 'http://schema.org/Organization',
+        ),
+        array(
+            'post'            => array(
+                'post_name'    => 'lorem_ipsum_dolor_sit_amet__consectetur_adipiscing_elit',
+                'post_title'   => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit',
+                'post_content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+                'post_type'    => 'entity',
+                'post_status'  => 'publish',
+            ),
+            'entity_type_uri' => 'http://schema.org/CreativeWork',
+        ),
+        array(
+            'post' =>
+                array(
+                    'post_name'    => 'post_1',
+                    'post_title'   => 'Praesent imperdiet odio sed lectus vulputate finibus',
+                    'post_content' => '<span><span id="urn:enhancement-da554278-9522-2d83-76ad-8129d2292cb3" class="textannotation disambiguated wl-event" itemid="{dataset-uri}/entity/praesent_imperdiet_odio_sed_lectus_vulputate_finibus">Praesent imperdiet odio sed lectus vulputate finibus</span>. Donec placerat ex arcu, eget fermentum metus ullamcorper vitae. Cras interdum libero a tellus sagittis, sed ultricies sapien tincidunt. Aliquam sit amet vehicula sem. Mauris neque nisl, pellentesque ut molestie id, laoreet nec tortor. Sed tempus ornare est, nec dapibus enim ornare eu. Cras risus ligula, blandit ut faucibus ut, vulputate id ipsum. In vel purus at orci hendrerit cursus. Aliquam interdum lorem id dui maximus volutpat. Vestibulum mi velit, efficitur nec neque eu, posuere porta risus.</span>',
+                    'post_type'    => 'post',
+                    'post_status'  => 'publish',
+                ),
+        ),
+        array(
+            'post' =>
+                array(
+                    'post_name'    => 'post_2',
+                    'post_title'   => 'Nullam tempor lectus sit amet tincidunt euismod',
+                    'post_content' => '<span><span id="urn:local-text-annotation-p8i5o4279ex3rsbwqkrx9z5mh1ox91ae" class="textannotation disambiguated wl-place" itemid="{dataset-uri}/entity/nullam_tempor_lectus_sit_amet_tincidunt_euismod">Nullam tempor lectus sit amet tincidunt euismod</span>. Nunc posuere libero augue, eu pretium erat interdum id. Vivamus aliquam dui in mauris tempor, vitae vestibulum odio aliquet. Proin quis bibendum diam, nec tempus dui. Pellentesque sit amet justo vitae urna ornare volutpat quis consectetur nisl. Sed hendrerit purus et magna varius, sodales tincidunt velit finibus. Donec malesuada faucibus mattis. Morbi viverra sagittis justo nec luctus. Nullam et justo sed nisi fringilla rutrum sit amet a urna. Integer elementum, risus in condimentum rhoncus, nisi velit cursus tellus, sed sagittis ante tellus hendrerit ante. Donec et semper libero, vitae imperdiet ligula. Donec eleifend iaculis nisi sed mollis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Proin faucibus magna ac lectus tempor iaculis quis in nisi. Mauris ac nibh lacinia, ultrices erat quis, rhoncus lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</span>',
+                    'post_type'    => 'post',
+                    'post_status'  => 'publish',
+                ),
+        ),
+        array(
+            'post' =>
+                array(
+                    'post_name'    => 'post_3',
+                    'post_title'   => 'Praesent luctus tincidunt odio quis aliquam',
+                    'post_content' => '<span><span id="urn:enhancement-b3487a20-4696-b6d9-6c55-842445f5c263" class="textannotation disambiguated wl-organization" itemid="{dataset-uri}/entity/praesent_luctus_tincidunt_odio_quis_aliquam">Praesent luctus tincidunt odio quis aliquam</span>. Ut pellentesque odio nec turpis placerat, at rhoncus mauris elementum. Proin vehicula lectus a dolor bibendum, ut pretium lacus volutpat. Integer luctus enim sed odio dapibus tempus. Fusce elementum purus in diam dictum, sit amet ultricies leo molestie. Etiam id nunc tincidunt sapien tristique interdum ac at purus. Nulla eget laoreet turpis. Nullam id cursus nulla.</span>',
+                    'post_type'    => 'post',
+                    'post_status'  => 'publish',
+                ),
+        ),
+        array(
+            'post' =>
+                array(
+                    'post_name'    => 'post_4',
+                    'post_title'   => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit',
+                    'post_content' => '<span><span id="urn:enhancement-4edc3bde-d275-22f9-8d50-0b707596b292" class="textannotation disambiguated wl-thing" itemid="{dataset-uri}/entity/lorem_ipsum_dolor_sit_amet__consectetur_adipiscing_elit">Lorem ipsum dolor sit amet, consectetur adipiscing elit</span>. Proin rutrum ultrices nulla ut elementum. Nunc nec lacus tortor. Curabitur bibendum imperdiet luctus. Vivamus a faucibus dolor. Donec blandit malesuada risus. Vestibulum volutpat ut tellus sed tincidunt. Sed id tincidunt velit. Integer sed felis id libero fringilla molestie vitae id orci. Ut vel purus ullamcorper, feugiat tortor non, iaculis neque. Vivamus vitae vehicula sem. Mauris fermentum, metus id vestibulum sodales, lorem lacus efficitur ante, non vestibulum ligula ligula a turpis. Vivamus quis scelerisque massa.</span>',
+                    'post_type'    => 'post',
+                    'post_status'  => 'publish',
+                ),
+        ),
+        array(
+            'post' => array(
+                'post_name'    => 'post_5',
+                'post_title'   => 'Lorem ipsum',
+                'post_content' => "
 					<span id=\"urn:enhancement-28cb4112-64cf-bd49-ef97-a2ee54727de7\" class=\"textannotation disambiguated wl-thing\" itemid=\"{dataset-uri}/entity/lorem_ipsum_dolor_sit_amet__consectetur_adipiscing_elit\">Lorem ipsum</span> dolor sit amet, consectetur adipiscing elit. Proin rutrum ultrices nulla ut elementum. Nunc nec lacus tortor. Curabitur bibendum imperdiet luctus. Vivamus a faucibus dolor. Donec blandit malesuada risus. Vestibulum volutpat ut tellus sed tincidunt. Sed id tincidunt velit. Integer sed felis id libero fringilla molestie vitae id orci. Ut vel purus ullamcorper, feugiat tortor non, iaculis neque. Vivamus vitae vehicula sem. Mauris fermentum, metus id vestibulum sodales, lorem lacus efficitur ante, non vestibulum ligula ligula a turpis. Vivamus quis scelerisque massa.
 					
 					[wl_navigator]
@@ -123,237 +123,237 @@ 
 					
 					<span id=\"urn:local-text-annotation-v0kqdtx685n6cg9jrfvl67amkhm28hxh\" class=\"textannotation disambiguated wl-event\" itemid=\"{dataset-uri}/entity/praesent_imperdiet_odio_sed_lectus_vulputate_finibus\">Praesent imperdiet odio sed lectus vulputate finibus</span>. Donec placerat ex arcu, eget fermentum metus ullamcorper vitae. Cras interdum libero a tellus sagittis, sed ultricies sapien tincidunt. Aliquam sit amet vehicula sem. Mauris neque nisl, pellentesque ut molestie id, laoreet nec tortor. Sed tempus ornare est, nec dapibus enim ornare eu. Cras risus ligula, blandit ut faucibus ut, vulputate id ipsum. In vel purus at orci hendrerit cursus. Aliquam interdum lorem id dui maximus volutpat. Vestibulum mi velit, efficitur nec neque eu, posuere porta risus.
 					",
-				'post_type'    => 'post',
-				'post_status'  => 'publish',
-			),
-		),
-	);
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.12.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.12.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.16.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * Create a {@link Wordlift_Sample_Data_Service} instance.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param \Wordlift_Entity_Type_Service   $entity_type_service   The {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 * @param \Wordlift_User_Service          $user_service          The {@link Wordlift_User_Service} instance.
-	 */
-	function __construct( $entity_type_service, $configuration_service, $user_service ) {
-
-		$this->entity_type_service   = $entity_type_service;
-		$this->configuration_service = $configuration_service;
-		$this->user_service          = $user_service;
-	}
-
-	/**
-	 * Create sample data in this WordPress instance.
-	 *
-	 * @since 3.12.0
-	 */
-	function create() {
-
-		// Get the source image path.
-		$source = plugin_dir_path( dirname( __FILE__ ) ) . 'images/rome.png';
-
-		// Create an attachment with the local file.
-		$attachment_id = $this->create_attachment_from_local_file( $source );
-
-		// Add a flag to signal the attachment is sample data and allow easy delete
-		// afterwards.
-		add_post_meta( $attachment_id, '_wl_sample_data', 1, true );
-
-		// Get the dataset URI, used for replacements in the `post_content`.
-		$dataset_uri = $this->configuration_service->get_dataset_uri();
-
-		// Create the author and get its id.
-		$author_id = $this->create_author();
-
-		// Create 4 entities.
-		// Create 4 posts referencing each one entity.
-		// Create 1 post referencing all the entities.
-		foreach ( $this->samples as $sample ) {
-
-			// Get the post data.
-			$post = array_replace_recursive( $sample['post'], array(
-				'post_content' => str_replace( '{dataset-uri}', $dataset_uri, $sample['post']['post_content'] ),
-			) );
-
-			// Set the author.
-			$post['post_author'] = $author_id;
-
-			// Insert the post.
-			$post_id = wp_insert_post( $post );
-
-			// Add a flag to signal the post is sample data and allow easy delete
-			// afterwards.
-			add_post_meta( $post_id, '_wl_sample_data', 1, true );
-
-			// Set the post thumbnail.
-			set_post_thumbnail( $post_id, $attachment_id );
-
-			// If the `entity_type_uri` property is set, set it on the post.
-			if ( isset( $sample['entity_type_uri'] ) ) {
-				$this->entity_type_service->set( $post_id, $sample['entity_type_uri'] );
-			}
-
-		}
-
-
-	}
-
-	/**
-	 * Create an author to bind to posts.
-	 *
-	 * @since 3.16.0
-	 *
-	 * @return int The {@link WP_User}'s id.
-	 */
-	private function create_author() {
-
-		$user_id   = wp_create_user( 'wl-sample-data', wp_generate_password() );
-		$author_post_id = wp_insert_post( array(
-			'post_type'  => 'entity',
-			'post_title' => 'WordLift Sample Data Person',
-		) );
-		// Add a flag to signal the attachment is sample data and allow easy delete
-		// afterwards.
-		add_post_meta( $author_post_id, '_wl_sample_data', 1, true );
-
-		$this->entity_type_service->set( $author_post_id, 'http://schema.org/Person' );
-		$this->user_service->set_entity( $user_id, $author_post_id );
-
-		return $user_id;
-	}
-
-	/**
-	 * Remove the sample data from this WordPress instance.
-	 *
-	 * @since 3.12.0
-	 */
-	function delete() {
-
-		$this->delete_by_type( 'post' );
-		$this->delete_by_type( 'entity' );
-		$this->delete_by_type( 'attachment' );
-
-		// Get and delete the user.
-		$user = get_user_by( 'login', 'wl-sample-data' );
-		wp_delete_user( $user->ID );
-
-	}
-
-	/**
-	 * Remove the sample data of the specified type (e.g. `post`, `entity`, `attachment`)
-	 * from the local WordPress instance.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param string $type WordPress {@link WP_Post}'s type, e.g. `post`, `entity`, `attachment`.
-	 */
-	private function delete_by_type( $type ) {
-
-		$posts = get_posts( array(
-			'meta_key'    => '_wl_sample_data',
-			'meta_value'  => 1,
-			'post_status' => 'any',
-			'post_type'   => $type,
-		) );
-
-		foreach ( $posts as $post ) {
-			wp_delete_post( $post->ID, true );
-		}
-
-	}
-
-	/**
-	 * Create a WordPress' attachment using the specified file.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param string $source The source file path.
-	 *
-	 * @return int WordPress' attachment's id.
-	 */
-	private function create_attachment_from_local_file( $source ) {
-
-		// Get the path to the upload directory.
-		$upload_dir  = wp_upload_dir();
-		$upload_path = $upload_dir['path'];
-
-		// Get the destination image path.
-		$destination = $upload_path . '/wl-sample-data.png';
-
-		// Copy the source file to the destination.
-		@copy( $source, $destination );
-
-		return $this->create_attachment( $destination );
-	}
-
-	/**
-	 * Create a WordPress attachment using the specified file in the upload folder.
-	 *
-	 * @see   https://codex.wordpress.org/Function_Reference/wp_insert_attachment
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param string $filename The image filename.
-	 *
-	 * @return int The attachment id.
-	 */
-	private function create_attachment( $filename ) {
-
-		// Check the type of file. We'll use this as the 'post_mime_type'.
-		$filetype = wp_check_filetype( basename( $filename ), null );
-
-		// Get the path to the upload directory.
-		$wp_upload_dir = wp_upload_dir();
-
-		// Prepare an array of post data for the attachment.
-		$attachment = array(
-			'guid'           => $wp_upload_dir['url'] . '/' . basename( $filename ),
-			'post_mime_type' => $filetype['type'],
-			'post_title'     => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ),
-			'post_content'   => '',
-			'post_status'    => 'inherit',
-		);
-
-		// Insert the attachment.
-		$attachment_id = wp_insert_attachment( $attachment, $filename );
-
-		// Generate the metadata for the attachment, and update the database record.
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-
-		// Update the attachment metadata.
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
-
-		return $attachment_id;
-	}
+                'post_type'    => 'post',
+                'post_status'  => 'publish',
+            ),
+        ),
+    );
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.12.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.12.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.16.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * Create a {@link Wordlift_Sample_Data_Service} instance.
+     *
+     * @since 3.12.0
+     *
+     * @param \Wordlift_Entity_Type_Service   $entity_type_service   The {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     * @param \Wordlift_User_Service          $user_service          The {@link Wordlift_User_Service} instance.
+     */
+    function __construct( $entity_type_service, $configuration_service, $user_service ) {
+
+        $this->entity_type_service   = $entity_type_service;
+        $this->configuration_service = $configuration_service;
+        $this->user_service          = $user_service;
+    }
+
+    /**
+     * Create sample data in this WordPress instance.
+     *
+     * @since 3.12.0
+     */
+    function create() {
+
+        // Get the source image path.
+        $source = plugin_dir_path( dirname( __FILE__ ) ) . 'images/rome.png';
+
+        // Create an attachment with the local file.
+        $attachment_id = $this->create_attachment_from_local_file( $source );
+
+        // Add a flag to signal the attachment is sample data and allow easy delete
+        // afterwards.
+        add_post_meta( $attachment_id, '_wl_sample_data', 1, true );
+
+        // Get the dataset URI, used for replacements in the `post_content`.
+        $dataset_uri = $this->configuration_service->get_dataset_uri();
+
+        // Create the author and get its id.
+        $author_id = $this->create_author();
+
+        // Create 4 entities.
+        // Create 4 posts referencing each one entity.
+        // Create 1 post referencing all the entities.
+        foreach ( $this->samples as $sample ) {
+
+            // Get the post data.
+            $post = array_replace_recursive( $sample['post'], array(
+                'post_content' => str_replace( '{dataset-uri}', $dataset_uri, $sample['post']['post_content'] ),
+            ) );
+
+            // Set the author.
+            $post['post_author'] = $author_id;
+
+            // Insert the post.
+            $post_id = wp_insert_post( $post );
+
+            // Add a flag to signal the post is sample data and allow easy delete
+            // afterwards.
+            add_post_meta( $post_id, '_wl_sample_data', 1, true );
+
+            // Set the post thumbnail.
+            set_post_thumbnail( $post_id, $attachment_id );
+
+            // If the `entity_type_uri` property is set, set it on the post.
+            if ( isset( $sample['entity_type_uri'] ) ) {
+                $this->entity_type_service->set( $post_id, $sample['entity_type_uri'] );
+            }
+
+        }
+
+
+    }
+
+    /**
+     * Create an author to bind to posts.
+     *
+     * @since 3.16.0
+     *
+     * @return int The {@link WP_User}'s id.
+     */
+    private function create_author() {
+
+        $user_id   = wp_create_user( 'wl-sample-data', wp_generate_password() );
+        $author_post_id = wp_insert_post( array(
+            'post_type'  => 'entity',
+            'post_title' => 'WordLift Sample Data Person',
+        ) );
+        // Add a flag to signal the attachment is sample data and allow easy delete
+        // afterwards.
+        add_post_meta( $author_post_id, '_wl_sample_data', 1, true );
+
+        $this->entity_type_service->set( $author_post_id, 'http://schema.org/Person' );
+        $this->user_service->set_entity( $user_id, $author_post_id );
+
+        return $user_id;
+    }
+
+    /**
+     * Remove the sample data from this WordPress instance.
+     *
+     * @since 3.12.0
+     */
+    function delete() {
+
+        $this->delete_by_type( 'post' );
+        $this->delete_by_type( 'entity' );
+        $this->delete_by_type( 'attachment' );
+
+        // Get and delete the user.
+        $user = get_user_by( 'login', 'wl-sample-data' );
+        wp_delete_user( $user->ID );
+
+    }
+
+    /**
+     * Remove the sample data of the specified type (e.g. `post`, `entity`, `attachment`)
+     * from the local WordPress instance.
+     *
+     * @since 3.12.0
+     *
+     * @param string $type WordPress {@link WP_Post}'s type, e.g. `post`, `entity`, `attachment`.
+     */
+    private function delete_by_type( $type ) {
+
+        $posts = get_posts( array(
+            'meta_key'    => '_wl_sample_data',
+            'meta_value'  => 1,
+            'post_status' => 'any',
+            'post_type'   => $type,
+        ) );
+
+        foreach ( $posts as $post ) {
+            wp_delete_post( $post->ID, true );
+        }
+
+    }
+
+    /**
+     * Create a WordPress' attachment using the specified file.
+     *
+     * @since 3.12.0
+     *
+     * @param string $source The source file path.
+     *
+     * @return int WordPress' attachment's id.
+     */
+    private function create_attachment_from_local_file( $source ) {
+
+        // Get the path to the upload directory.
+        $upload_dir  = wp_upload_dir();
+        $upload_path = $upload_dir['path'];
+
+        // Get the destination image path.
+        $destination = $upload_path . '/wl-sample-data.png';
+
+        // Copy the source file to the destination.
+        @copy( $source, $destination );
+
+        return $this->create_attachment( $destination );
+    }
+
+    /**
+     * Create a WordPress attachment using the specified file in the upload folder.
+     *
+     * @see   https://codex.wordpress.org/Function_Reference/wp_insert_attachment
+     *
+     * @since 3.12.0
+     *
+     * @param string $filename The image filename.
+     *
+     * @return int The attachment id.
+     */
+    private function create_attachment( $filename ) {
+
+        // Check the type of file. We'll use this as the 'post_mime_type'.
+        $filetype = wp_check_filetype( basename( $filename ), null );
+
+        // Get the path to the upload directory.
+        $wp_upload_dir = wp_upload_dir();
+
+        // Prepare an array of post data for the attachment.
+        $attachment = array(
+            'guid'           => $wp_upload_dir['url'] . '/' . basename( $filename ),
+            'post_mime_type' => $filetype['type'],
+            'post_title'     => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ),
+            'post_content'   => '',
+            'post_status'    => 'inherit',
+        );
+
+        // Insert the attachment.
+        $attachment_id = wp_insert_attachment( $attachment, $filename );
+
+        // Generate the metadata for the attachment, and update the database record.
+        $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+
+        // Update the attachment metadata.
+        wp_update_attachment_metadata( $attachment_id, $attachment_data );
+
+        return $attachment_id;
+    }
 
 }

Spacing +40 added lines, -40 removed lines

@@ -165,7 +165,7 @@ 
 	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
 	 * @param \Wordlift_User_Service          $user_service          The {@link Wordlift_User_Service} instance.
 	 */
-	function __construct( $entity_type_service, $configuration_service, $user_service ) {
+	function __construct($entity_type_service, $configuration_service, $user_service) {
 
 		$this->entity_type_service   = $entity_type_service;
 		$this->configuration_service = $configuration_service;
@@ -180,14 +180,14 @@ 
 	function create() {
 
 		// Get the source image path.
-		$source = plugin_dir_path( dirname( __FILE__ ) ) . 'images/rome.png';
+		$source = plugin_dir_path(dirname(__FILE__)).'images/rome.png';
 
 		// Create an attachment with the local file.
-		$attachment_id = $this->create_attachment_from_local_file( $source );
+		$attachment_id = $this->create_attachment_from_local_file($source);
 
 		// Add a flag to signal the attachment is sample data and allow easy delete
 		// afterwards.
-		add_post_meta( $attachment_id, '_wl_sample_data', 1, true );
+		add_post_meta($attachment_id, '_wl_sample_data', 1, true);
 
 		// Get the dataset URI, used for replacements in the `post_content`.
 		$dataset_uri = $this->configuration_service->get_dataset_uri();
@@ -198,29 +198,29 @@ 
 		// Create 4 entities.
 		// Create 4 posts referencing each one entity.
 		// Create 1 post referencing all the entities.
-		foreach ( $this->samples as $sample ) {
+		foreach ($this->samples as $sample) {
 
 			// Get the post data.
-			$post = array_replace_recursive( $sample['post'], array(
-				'post_content' => str_replace( '{dataset-uri}', $dataset_uri, $sample['post']['post_content'] ),
-			) );
+			$post = array_replace_recursive($sample['post'], array(
+				'post_content' => str_replace('{dataset-uri}', $dataset_uri, $sample['post']['post_content']),
+			));
 
 			// Set the author.
 			$post['post_author'] = $author_id;
 
 			// Insert the post.
-			$post_id = wp_insert_post( $post );
+			$post_id = wp_insert_post($post);
 
 			// Add a flag to signal the post is sample data and allow easy delete
 			// afterwards.
-			add_post_meta( $post_id, '_wl_sample_data', 1, true );
+			add_post_meta($post_id, '_wl_sample_data', 1, true);
 
 			// Set the post thumbnail.
-			set_post_thumbnail( $post_id, $attachment_id );
+			set_post_thumbnail($post_id, $attachment_id);
 
 			// If the `entity_type_uri` property is set, set it on the post.
-			if ( isset( $sample['entity_type_uri'] ) ) {
-				$this->entity_type_service->set( $post_id, $sample['entity_type_uri'] );
+			if (isset($sample['entity_type_uri'])) {
+				$this->entity_type_service->set($post_id, $sample['entity_type_uri']);
 			}
 
 		}
@@ -237,17 +237,17 @@ 
 	 */
 	private function create_author() {
 
-		$user_id   = wp_create_user( 'wl-sample-data', wp_generate_password() );
-		$author_post_id = wp_insert_post( array(
+		$user_id = wp_create_user('wl-sample-data', wp_generate_password());
+		$author_post_id = wp_insert_post(array(
 			'post_type'  => 'entity',
 			'post_title' => 'WordLift Sample Data Person',
-		) );
+		));
 		// Add a flag to signal the attachment is sample data and allow easy delete
 		// afterwards.
-		add_post_meta( $author_post_id, '_wl_sample_data', 1, true );
+		add_post_meta($author_post_id, '_wl_sample_data', 1, true);
 
-		$this->entity_type_service->set( $author_post_id, 'http://schema.org/Person' );
-		$this->user_service->set_entity( $user_id, $author_post_id );
+		$this->entity_type_service->set($author_post_id, 'http://schema.org/Person');
+		$this->user_service->set_entity($user_id, $author_post_id);
 
 		return $user_id;
 	}
@@ -259,13 +259,13 @@ 
 	 */
 	function delete() {
 
-		$this->delete_by_type( 'post' );
-		$this->delete_by_type( 'entity' );
-		$this->delete_by_type( 'attachment' );
+		$this->delete_by_type('post');
+		$this->delete_by_type('entity');
+		$this->delete_by_type('attachment');
 
 		// Get and delete the user.
-		$user = get_user_by( 'login', 'wl-sample-data' );
-		wp_delete_user( $user->ID );
+		$user = get_user_by('login', 'wl-sample-data');
+		wp_delete_user($user->ID);
 
 	}
 
@@ -277,17 +277,17 @@ 
 	 *
 	 * @param string $type WordPress {@link WP_Post}'s type, e.g. `post`, `entity`, `attachment`.
 	 */
-	private function delete_by_type( $type ) {
+	private function delete_by_type($type) {
 
-		$posts = get_posts( array(
+		$posts = get_posts(array(
 			'meta_key'    => '_wl_sample_data',
 			'meta_value'  => 1,
 			'post_status' => 'any',
 			'post_type'   => $type,
-		) );
+		));
 
-		foreach ( $posts as $post ) {
-			wp_delete_post( $post->ID, true );
+		foreach ($posts as $post) {
+			wp_delete_post($post->ID, true);
 		}
 
 	}
@@ -301,19 +301,19 @@ 
 	 *
 	 * @return int WordPress' attachment's id.
 	 */
-	private function create_attachment_from_local_file( $source ) {
+	private function create_attachment_from_local_file($source) {
 
 		// Get the path to the upload directory.
 		$upload_dir  = wp_upload_dir();
 		$upload_path = $upload_dir['path'];
 
 		// Get the destination image path.
-		$destination = $upload_path . '/wl-sample-data.png';
+		$destination = $upload_path.'/wl-sample-data.png';
 
 		// Copy the source file to the destination.
-		@copy( $source, $destination );
+		@copy($source, $destination);
 
-		return $this->create_attachment( $destination );
+		return $this->create_attachment($destination);
 	}
 
 	/**
@@ -327,31 +327,31 @@ 
 	 *
 	 * @return int The attachment id.
 	 */
-	private function create_attachment( $filename ) {
+	private function create_attachment($filename) {
 
 		// Check the type of file. We'll use this as the 'post_mime_type'.
-		$filetype = wp_check_filetype( basename( $filename ), null );
+		$filetype = wp_check_filetype(basename($filename), null);
 
 		// Get the path to the upload directory.
 		$wp_upload_dir = wp_upload_dir();
 
 		// Prepare an array of post data for the attachment.
 		$attachment = array(
-			'guid'           => $wp_upload_dir['url'] . '/' . basename( $filename ),
+			'guid'           => $wp_upload_dir['url'].'/'.basename($filename),
 			'post_mime_type' => $filetype['type'],
-			'post_title'     => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ),
+			'post_title'     => preg_replace('/\.[^.]+$/', '', basename($filename)),
 			'post_content'   => '',
 			'post_status'    => 'inherit',
 		);
 
 		// Insert the attachment.
-		$attachment_id = wp_insert_attachment( $attachment, $filename );
+		$attachment_id = wp_insert_attachment($attachment, $filename);
 
 		// Generate the metadata for the attachment, and update the database record.
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+		$attachment_data = wp_generate_attachment_metadata($attachment_id, $filename);
 
 		// Update the attachment metadata.
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+		wp_update_attachment_metadata($attachment_id, $attachment_data);
 
 		return $attachment_id;
 	}

src/includes/class-wordlift-activator.php

Spacing +7 added lines, -7 removed lines

@@ -31,17 +31,17 @@ 
 	public static function activate() {
 
 		// Do not let the plugin be activate on WordPress versions before 4.4.
-		$version = get_bloginfo( 'version' );
-		if ( version_compare( $version, '4.4', '<' ) ) {
-			die( esc_html__( 'The WordLift plugin requires WordPress version 4.4 or above.', 'wordlift' ) );
+		$version = get_bloginfo('version');
+		if (version_compare($version, '4.4', '<')) {
+			die(esc_html__('The WordLift plugin requires WordPress version 4.4 or above.', 'wordlift'));
 		}
 
 		$configuration_service = Wordlift_Configuration_Service::get_instance();
 
 		// Create a blank application key if there is none.
 		$key = $configuration_service->get_key();
-		if ( empty( $key ) ) {
-			$configuration_service->set_key( '' );
+		if (empty($key)) {
+			$configuration_service->set_key('');
 		}
 
 		// Intentionally go through the whole upgrade procedure to be DRY.
@@ -51,8 +51,8 @@ 
 
 		// If WordLift's key is not configured, set `_wl_activation_redirect` transient. We won't redirect here, because we can't give
 		// for granted that we're in a browser admin session.
-		if ( '' === $configuration_service->get_key() ) {
-			set_transient( '_wl_activation_redirect', true, 30 );
+		if ('' === $configuration_service->get_key()) {
+			set_transient('_wl_activation_redirect', true, 30);
 		}
 
 		// Clear caches.

Indentation +38 added lines, -38 removed lines

@@ -21,43 +21,43 @@
  */
 class Wordlift_Activator {
 
-	/**
-	 * Short Description. (use period)
-	 *
-	 * Long Description.
-	 *
-	 * @since    1.0.0
-	 */
-	public static function activate() {
-
-		// Do not let the plugin be activate on WordPress versions before 4.4.
-		$version = get_bloginfo( 'version' );
-		if ( version_compare( $version, '4.4', '<' ) ) {
-			die( esc_html__( 'The WordLift plugin requires WordPress version 4.4 or above.', 'wordlift' ) );
-		}
-
-		$configuration_service = Wordlift_Configuration_Service::get_instance();
-
-		// Create a blank application key if there is none.
-		$key = $configuration_service->get_key();
-		if ( empty( $key ) ) {
-			$configuration_service->set_key( '' );
-		}
-
-		// Intentionally go through the whole upgrade procedure to be DRY.
-		// The following function is called also from `init` so it's not necessary
-		// here.
-		// wl_core_update_db_check.
-
-		// If WordLift's key is not configured, set `_wl_activation_redirect` transient. We won't redirect here, because we can't give
-		// for granted that we're in a browser admin session.
-		if ( '' === $configuration_service->get_key() ) {
-			set_transient( '_wl_activation_redirect', true, 30 );
-		}
-
-		// Clear caches.
-		Wordlift_File_Cache_Service::flush_all();
-
-	}
+    /**
+     * Short Description. (use period)
+     *
+     * Long Description.
+     *
+     * @since    1.0.0
+     */
+    public static function activate() {
+
+        // Do not let the plugin be activate on WordPress versions before 4.4.
+        $version = get_bloginfo( 'version' );
+        if ( version_compare( $version, '4.4', '<' ) ) {
+            die( esc_html__( 'The WordLift plugin requires WordPress version 4.4 or above.', 'wordlift' ) );
+        }
+
+        $configuration_service = Wordlift_Configuration_Service::get_instance();
+
+        // Create a blank application key if there is none.
+        $key = $configuration_service->get_key();
+        if ( empty( $key ) ) {
+            $configuration_service->set_key( '' );
+        }
+
+        // Intentionally go through the whole upgrade procedure to be DRY.
+        // The following function is called also from `init` so it's not necessary
+        // here.
+        // wl_core_update_db_check.
+
+        // If WordLift's key is not configured, set `_wl_activation_redirect` transient. We won't redirect here, because we can't give
+        // for granted that we're in a browser admin session.
+        if ( '' === $configuration_service->get_key() ) {
+            set_transient( '_wl_activation_redirect', true, 30 );
+        }
+
+        // Clear caches.
+        Wordlift_File_Cache_Service::flush_all();
+
+    }
 
 }