insideout10 / wordlift-plugin

src/admin/wordlift_admin_save_post.php

Indentation +42 added lines, -42 removed lines

@@ -24,23 +24,23 @@ 
  */
 function wl_transition_post_status( $new_status, $old_status, $post ) {
 
-	// wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
-
-	// transition from *published* to any other status: delete the post.
-	if ( 'publish' === $old_status && 'publish' !== $new_status ) {
-		// Delete the post from the triple store.
-		rl_delete_post( $post );
-
-		// Remove all relation instances for the current post from `wl_relation_instances`.
-		wl_core_delete_relation_instances( $post->ID );
-	}
-
-	// when a post is published, then all the referenced entities must be published.
-	if ( 'publish' !== $old_status && 'publish' === $new_status ) {
-		foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
-			wl_update_post_status( $entity_id, 'publish' );
-		}
-	}
+    // wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
+
+    // transition from *published* to any other status: delete the post.
+    if ( 'publish' === $old_status && 'publish' !== $new_status ) {
+        // Delete the post from the triple store.
+        rl_delete_post( $post );
+
+        // Remove all relation instances for the current post from `wl_relation_instances`.
+        wl_core_delete_relation_instances( $post->ID );
+    }
+
+    // when a post is published, then all the referenced entities must be published.
+    if ( 'publish' !== $old_status && 'publish' === $new_status ) {
+        foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
+            wl_update_post_status( $entity_id, 'publish' );
+        }
+    }
 }
 
 // hook save events.
@@ -54,10 +54,10 @@ 
  */
 function rl_delete_post( $post ) {
 
-	$post_id = ( is_numeric( $post ) ? $post : $post->ID );
+    $post_id = ( is_numeric( $post ) ? $post : $post->ID );
 
-	// Remove the post.
-	Wordlift_Linked_Data_Service::get_instance()->remove( $post_id );
+    // Remove the post.
+    Wordlift_Linked_Data_Service::get_instance()->remove( $post_id );
 
 }
 
@@ -69,35 +69,35 @@ 
  */
 function wl_update_post_status( $post_id, $status ) {
 
-	wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
+    wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
 
-	global $wpdb;
+    global $wpdb;
 
-	if ( ! $post = get_post( $post_id ) ) {
-		return;
-	}
+    if ( ! $post = get_post( $post_id ) ) {
+        return;
+    }
 
-	if ( $status === $post->post_status ) {
-		return;
-	}
+    if ( $status === $post->post_status ) {
+        return;
+    }
 
-	wl_write_log( "wl_update_post_status, old and new post status do not match [ post ID :: $post_id ][ new status :: $status ][ old status :: $post->post_status ]." );
+    wl_write_log( "wl_update_post_status, old and new post status do not match [ post ID :: $post_id ][ new status :: $status ][ old status :: $post->post_status ]." );
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
+    $wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
 
-	clean_post_cache( $post->ID );
+    clean_post_cache( $post->ID );
 
-	$old_status        = $post->post_status;
-	$post->post_status = $status;
+    $old_status        = $post->post_status;
+    $post->post_status = $status;
 
-	wp_transition_post_status( $status, $old_status, $post );
+    wp_transition_post_status( $status, $old_status, $post );
 
-	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
-	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
-	/** This action is documented in wp-includes/post.php */
-	do_action( 'wl_linked_data_save_post', $post->ID );
-	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+    /** This action is documented in wp-includes/post.php */
+    do_action( 'edit_post', $post->ID, $post );
+    /** This action is documented in wp-includes/post.php */
+    do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+    /** This action is documented in wp-includes/post.php */
+    do_action( 'wl_linked_data_save_post', $post->ID );
+    /** This action is documented in wp-includes/post.php */
+    do_action( 'wp_insert_post', $post->ID, $post, true );
 }

Spacing +23 added lines, -23 removed lines

@@ -22,29 +22,29 @@ 
  * @param string $old_status The old post status
  * @param array  $post       An array with the post data
  */
-function wl_transition_post_status( $new_status, $old_status, $post ) {
+function wl_transition_post_status($new_status, $old_status, $post) {
 
 	// wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
 
 	// transition from *published* to any other status: delete the post.
-	if ( 'publish' === $old_status && 'publish' !== $new_status ) {
+	if ('publish' === $old_status && 'publish' !== $new_status) {
 		// Delete the post from the triple store.
-		rl_delete_post( $post );
+		rl_delete_post($post);
 
 		// Remove all relation instances for the current post from `wl_relation_instances`.
-		wl_core_delete_relation_instances( $post->ID );
+		wl_core_delete_relation_instances($post->ID);
 	}
 
 	// when a post is published, then all the referenced entities must be published.
-	if ( 'publish' !== $old_status && 'publish' === $new_status ) {
-		foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
-			wl_update_post_status( $entity_id, 'publish' );
+	if ('publish' !== $old_status && 'publish' === $new_status) {
+		foreach (wl_core_get_related_entity_ids($post->ID) as $entity_id) {
+			wl_update_post_status($entity_id, 'publish');
 		}
 	}
 }
 
 // hook save events.
-add_action( 'transition_post_status', 'wl_transition_post_status', 10, 3 );
+add_action('transition_post_status', 'wl_transition_post_status', 10, 3);
 
 
 /**
@@ -52,12 +52,12 @@ 
  *
  * @param array|int $post An array of post data
  */
-function rl_delete_post( $post ) {
+function rl_delete_post($post) {
 
-	$post_id = ( is_numeric( $post ) ? $post : $post->ID );
+	$post_id = (is_numeric($post) ? $post : $post->ID);
 
 	// Remove the post.
-	Wordlift_Linked_Data_Service::get_instance()->remove( $post_id );
+	Wordlift_Linked_Data_Service::get_instance()->remove($post_id);
 
 }
 
@@ -67,37 +67,37 @@ 
  * @param int    $post_id The post ID
  * @param string $status  The new status
  */
-function wl_update_post_status( $post_id, $status ) {
+function wl_update_post_status($post_id, $status) {
 
-	wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
+	wl_write_log("wl_update_post_status [ post ID :: $post_id ][ status :: $status ]");
 
 	global $wpdb;
 
-	if ( ! $post = get_post( $post_id ) ) {
+	if ( ! $post = get_post($post_id)) {
 		return;
 	}
 
-	if ( $status === $post->post_status ) {
+	if ($status === $post->post_status) {
 		return;
 	}
 
-	wl_write_log( "wl_update_post_status, old and new post status do not match [ post ID :: $post_id ][ new status :: $status ][ old status :: $post->post_status ]." );
+	wl_write_log("wl_update_post_status, old and new post status do not match [ post ID :: $post_id ][ new status :: $status ][ old status :: $post->post_status ].");
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
+	$wpdb->update($wpdb->posts, array('post_status' => $status), array('ID' => $post->ID));
 
-	clean_post_cache( $post->ID );
+	clean_post_cache($post->ID);
 
 	$old_status        = $post->post_status;
 	$post->post_status = $status;
 
-	wp_transition_post_status( $status, $old_status, $post );
+	wp_transition_post_status($status, $old_status, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
+	do_action('edit_post', $post->ID, $post);
 	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+	do_action("save_post_{$post->post_type}", $post->ID, $post, true);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wl_linked_data_save_post', $post->ID );
+	do_action('wl_linked_data_save_post', $post->ID);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+	do_action('wp_insert_post', $post->ID, $post, true);
 }

src/admin/class-wordlift-admin-term-adapter.php

Indentation +96 added lines, -96 removed lines

@@ -16,42 +16,42 @@ 
  */
 class Wordlift_Admin_Term_Adapter {
 
-	/**
-	 * The meta key holding the entity id.
-	 *
-	 * @since 3.20.0
-	 */
-	const META_KEY = '_wl_entity_id';
-
-	/**
-	 * Create a Wordlift_Admin_Term_Adapter instance.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct() {
-
-		add_action( 'registered_taxonomy', array( $this, 'add_action', ) );
-		add_action( 'edit_term', array( $this, 'edit_term', ), 10, 3 );
-
-	}
-
-	/**
-	 * Add the form fields to the entity edit screen.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param object $tag Current taxonomy term object.
-	 * @param string $taxonomy Current taxonomy slug.
-	 */
-	public function edit_form_fields( $tag, $taxonomy ) {
-
-		// Enqueue the JavaScript app.
-		wp_enqueue_script( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.js', array( 'wp-util', ), Wordlift::get_instance()->get_version(), true );
-		wp_enqueue_style( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.css', array(), Wordlift::get_instance()->get_version() );
-
-		$values = get_term_meta( $tag->term_id, self::META_KEY );
-
-		?>
+    /**
+     * The meta key holding the entity id.
+     *
+     * @since 3.20.0
+     */
+    const META_KEY = '_wl_entity_id';
+
+    /**
+     * Create a Wordlift_Admin_Term_Adapter instance.
+     *
+     * @since 3.20.0
+     */
+    public function __construct() {
+
+        add_action( 'registered_taxonomy', array( $this, 'add_action', ) );
+        add_action( 'edit_term', array( $this, 'edit_term', ), 10, 3 );
+
+    }
+
+    /**
+     * Add the form fields to the entity edit screen.
+     *
+     * @since 3.20.0
+     *
+     * @param object $tag Current taxonomy term object.
+     * @param string $taxonomy Current taxonomy slug.
+     */
+    public function edit_form_fields( $tag, $taxonomy ) {
+
+        // Enqueue the JavaScript app.
+        wp_enqueue_script( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.js', array( 'wp-util', ), Wordlift::get_instance()->get_version(), true );
+        wp_enqueue_style( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.css', array(), Wordlift::get_instance()->get_version() );
+
+        $values = get_term_meta( $tag->term_id, self::META_KEY );
+
+        ?>
         <tr class="form-field term-name-wrap">
             <th scope="row"><label for="wl-entity-id"><?php _ex( 'Entity', 'term entity', 'wordlift' ); ?></label></th>
             <td>
@@ -63,65 +63,65 @@ 
             </td>
         </tr>
 		<?php
-	}
-
-	/**
-	 * Bind the new fields to the edit term screen.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $taxonomy The taxonomy name.
-	 */
-	public function add_action( $taxonomy ) {
-
-		add_action( "{$taxonomy}_edit_form_fields", array( $this, 'edit_form_fields' ), 10, 2 );
-	}
-
-	/**
-	 * Hook to the edit term to handle our own custom fields.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param int    $term_id The term id.
-	 * @param int    $tt_id The term taxonomy id.
-	 * @param string $taxonomy The taxonomy.
-	 */
-	public function edit_term( $term_id, $tt_id, $taxonomy ) {
-
-		// Bail if the action isn't related to the term currently being edited.
-		if ( ! isset( $_POST['tag_ID'] ) || $term_id !== (int) (int) $_POST['tag_ID'] ) {
-			return;
-		}
-
-		// Delete.
-		if ( ! isset( $_POST['wl_entity_id'] ) || ! is_array( $_POST['wl_entity_id'] ) || empty( $_POST['wl_entity_id'] ) ) {
-			delete_term_meta( $term_id, self::META_KEY );
-
-			return;
-		}
-
-		// Update.
-		//
-		// Only use mb_* functions when mbstring is available.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/693.
-		if ( extension_loaded( 'mbstring' ) ) {
-			mb_regex_encoding( 'UTF-8' );
-
-			$merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
-				return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
-			}, array() );
-		} else {
-			$merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
-				return array_merge( $carry, preg_split( "/\x{2063}/u", wp_unslash( $item ) ) );
-			}, array() );
-		}
-
-		delete_term_meta( $term_id, self::META_KEY );
-		foreach ( array_unique( array_filter( $merged ) ) as $single ) {
-			add_term_meta( $term_id, self::META_KEY, $single );
-		}
-
-	}
+    }
+
+    /**
+     * Bind the new fields to the edit term screen.
+     *
+     * @since 3.20.0
+     *
+     * @param string $taxonomy The taxonomy name.
+     */
+    public function add_action( $taxonomy ) {
+
+        add_action( "{$taxonomy}_edit_form_fields", array( $this, 'edit_form_fields' ), 10, 2 );
+    }
+
+    /**
+     * Hook to the edit term to handle our own custom fields.
+     *
+     * @since 3.20.0
+     *
+     * @param int    $term_id The term id.
+     * @param int    $tt_id The term taxonomy id.
+     * @param string $taxonomy The taxonomy.
+     */
+    public function edit_term( $term_id, $tt_id, $taxonomy ) {
+
+        // Bail if the action isn't related to the term currently being edited.
+        if ( ! isset( $_POST['tag_ID'] ) || $term_id !== (int) (int) $_POST['tag_ID'] ) {
+            return;
+        }
+
+        // Delete.
+        if ( ! isset( $_POST['wl_entity_id'] ) || ! is_array( $_POST['wl_entity_id'] ) || empty( $_POST['wl_entity_id'] ) ) {
+            delete_term_meta( $term_id, self::META_KEY );
+
+            return;
+        }
+
+        // Update.
+        //
+        // Only use mb_* functions when mbstring is available.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/693.
+        if ( extension_loaded( 'mbstring' ) ) {
+            mb_regex_encoding( 'UTF-8' );
+
+            $merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
+                return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
+            }, array() );
+        } else {
+            $merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
+                return array_merge( $carry, preg_split( "/\x{2063}/u", wp_unslash( $item ) ) );
+            }, array() );
+        }
+
+        delete_term_meta( $term_id, self::META_KEY );
+        foreach ( array_unique( array_filter( $merged ) ) as $single ) {
+            add_term_meta( $term_id, self::META_KEY, $single );
+        }
+
+    }
 
 }
\ No newline at end of file

Spacing +27 added lines, -27 removed lines

@@ -30,8 +30,8 @@ 
 	 */
 	public function __construct() {
 
-		add_action( 'registered_taxonomy', array( $this, 'add_action', ) );
-		add_action( 'edit_term', array( $this, 'edit_term', ), 10, 3 );
+		add_action('registered_taxonomy', array($this, 'add_action',));
+		add_action('edit_term', array($this, 'edit_term',), 10, 3);
 
 	}
 
@@ -43,23 +43,23 @@ 
 	 * @param object $tag Current taxonomy term object.
 	 * @param string $taxonomy Current taxonomy slug.
 	 */
-	public function edit_form_fields( $tag, $taxonomy ) {
+	public function edit_form_fields($tag, $taxonomy) {
 
 		// Enqueue the JavaScript app.
-		wp_enqueue_script( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.js', array( 'wp-util', ), Wordlift::get_instance()->get_version(), true );
-		wp_enqueue_style( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.css', array(), Wordlift::get_instance()->get_version() );
+		wp_enqueue_script('wl-term', plugin_dir_url(dirname(__FILE__)).'js/dist/term.js', array('wp-util',), Wordlift::get_instance()->get_version(), true);
+		wp_enqueue_style('wl-term', plugin_dir_url(dirname(__FILE__)).'js/dist/term.css', array(), Wordlift::get_instance()->get_version());
 
-		$values = get_term_meta( $tag->term_id, self::META_KEY );
+		$values = get_term_meta($tag->term_id, self::META_KEY);
 
 		?>
         <tr class="form-field term-name-wrap">
-            <th scope="row"><label for="wl-entity-id"><?php _ex( 'Entity', 'term entity', 'wordlift' ); ?></label></th>
+            <th scope="row"><label for="wl-entity-id"><?php _ex('Entity', 'term entity', 'wordlift'); ?></label></th>
             <td>
-				<?php foreach ( $values as $value ) { ?>
-                    <input type="text" name="wl_entity_id[]" value="<?php echo esc_attr( $value ); ?>"/>
+				<?php foreach ($values as $value) { ?>
+                    <input type="text" name="wl_entity_id[]" value="<?php echo esc_attr($value); ?>"/>
 				<?php } ?>
                 <div id="wl-term-entity-id"></div>
-                <p class="description"><?php _e( 'The entity bound to the term.', 'wordlift' ); ?></p>
+                <p class="description"><?php _e('The entity bound to the term.', 'wordlift'); ?></p>
             </td>
         </tr>
 		<?php
@@ -72,9 +72,9 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy name.
 	 */
-	public function add_action( $taxonomy ) {
+	public function add_action($taxonomy) {
 
-		add_action( "{$taxonomy}_edit_form_fields", array( $this, 'edit_form_fields' ), 10, 2 );
+		add_action("{$taxonomy}_edit_form_fields", array($this, 'edit_form_fields'), 10, 2);
 	}
 
 	/**
@@ -86,16 +86,16 @@ 
 	 * @param int    $tt_id The term taxonomy id.
 	 * @param string $taxonomy The taxonomy.
 	 */
-	public function edit_term( $term_id, $tt_id, $taxonomy ) {
+	public function edit_term($term_id, $tt_id, $taxonomy) {
 
 		// Bail if the action isn't related to the term currently being edited.
-		if ( ! isset( $_POST['tag_ID'] ) || $term_id !== (int) (int) $_POST['tag_ID'] ) {
+		if ( ! isset($_POST['tag_ID']) || $term_id !== (int) (int) $_POST['tag_ID']) {
 			return;
 		}
 
 		// Delete.
-		if ( ! isset( $_POST['wl_entity_id'] ) || ! is_array( $_POST['wl_entity_id'] ) || empty( $_POST['wl_entity_id'] ) ) {
-			delete_term_meta( $term_id, self::META_KEY );
+		if ( ! isset($_POST['wl_entity_id']) || ! is_array($_POST['wl_entity_id']) || empty($_POST['wl_entity_id'])) {
+			delete_term_meta($term_id, self::META_KEY);
 
 			return;
 		}
@@ -105,21 +105,21 @@ 
 		// Only use mb_* functions when mbstring is available.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/693.
-		if ( extension_loaded( 'mbstring' ) ) {
-			mb_regex_encoding( 'UTF-8' );
+		if (extension_loaded('mbstring')) {
+			mb_regex_encoding('UTF-8');
 
-			$merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
-				return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
-			}, array() );
+			$merged = array_reduce((array) $_POST['wl_entity_id'], function($carry, $item) {
+				return array_merge($carry, mb_split("\x{2063}", wp_unslash($item)));
+			}, array());
 		} else {
-			$merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
-				return array_merge( $carry, preg_split( "/\x{2063}/u", wp_unslash( $item ) ) );
-			}, array() );
+			$merged = array_reduce((array) $_POST['wl_entity_id'], function($carry, $item) {
+				return array_merge($carry, preg_split("/\x{2063}/u", wp_unslash($item)));
+			}, array());
 		}
 
-		delete_term_meta( $term_id, self::META_KEY );
-		foreach ( array_unique( array_filter( $merged ) ) as $single ) {
-			add_term_meta( $term_id, self::META_KEY, $single );
+		delete_term_meta($term_id, self::META_KEY);
+		foreach (array_unique(array_filter($merged)) as $single) {
+			add_term_meta($term_id, self::META_KEY, $single);
 		}
 
 	}

src/admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php

Indentation +76 added lines, -76 removed lines

@@ -17,40 +17,40 @@ 
  */
 class Wordlift_Admin_Schemaorg_Taxonomy_Metabox {
 
-	/**
-	 * Render the metabox.
-	 *
-	 * @since 3.20.0
-	 */
-	public static function render() {
+    /**
+     * Render the metabox.
+     *
+     * @since 3.20.0
+     */
+    public static function render() {
 
-		Wordlift_Admin_Schemaorg_Taxonomy_Metabox::post_categories_meta_box( get_post(), array(
-			'args' =>
-				array( 'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ),
-		) );
+        Wordlift_Admin_Schemaorg_Taxonomy_Metabox::post_categories_meta_box( get_post(), array(
+            'args' =>
+                array( 'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ),
+        ) );
 
-	}
+    }
 
-	/**
-	 * A function which resembles WordPress' own to display a metabox, but which customizes the output
-	 * to display the Schema.org classes tree.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param WP_Post $post The {@link WP_Post} being edited.
-	 * @param array   $box An array of arguments.
-	 */
-	private static function post_categories_meta_box( $post, $box ) {
-		$defaults = array( 'taxonomy' => 'category' );
-		if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
-			$args = array();
-		} else {
-			$args = $box['args'];
-		}
-		$r        = wp_parse_args( $args, $defaults );
-		$tax_name = esc_attr( $r['taxonomy'] );
-		$taxonomy = get_taxonomy( $r['taxonomy'] );
-		?>
+    /**
+     * A function which resembles WordPress' own to display a metabox, but which customizes the output
+     * to display the Schema.org classes tree.
+     *
+     * @since 3.20.0
+     *
+     * @param WP_Post $post The {@link WP_Post} being edited.
+     * @param array   $box An array of arguments.
+     */
+    private static function post_categories_meta_box( $post, $box ) {
+        $defaults = array( 'taxonomy' => 'category' );
+        if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+            $args = array();
+        } else {
+            $args = $box['args'];
+        }
+        $r        = wp_parse_args( $args, $defaults );
+        $tax_name = esc_attr( $r['taxonomy'] );
+        $taxonomy = get_taxonomy( $r['taxonomy'] );
+        ?>
         <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
             <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
                 <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a>
@@ -75,15 +75,15 @@ 
 
             <div id="<?php echo $tax_name; ?>-legacy" class="tabs-panel" style="display: none;">
 				<?php
-				$name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
-				echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
-				?>
+                $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+                echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
+                ?>
                 <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>"
                     class="categorychecklist form-no-clear">
 					<?php wp_terms_checklist( $post->ID, array(
-						'taxonomy'     => $tax_name,
-						'popular_cats' => $popular_ids,
-					) ); ?>
+                        'taxonomy'     => $tax_name,
+                        'popular_cats' => $popular_ids,
+                    ) ); ?>
                 </ul>
             </div>
 			<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
@@ -91,9 +91,9 @@ 
                     <a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add"
                        class="taxonomy-add-new">
 						<?php
-						/* translators: %s: add new taxonomy label */
-						printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
-						?>
+                        /* translators: %s: add new taxonomy label */
+                        printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+                        ?>
                     </a>
                     <p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
                         <label class="screen-reader-text"
@@ -106,43 +106,43 @@ 
 							<?php echo $taxonomy->labels->parent_item_colon; ?>
                         </label>
 						<?php
-						$parent_dropdown_args = array(
-							'taxonomy'         => $tax_name,
-							'hide_empty'       => 0,
-							'name'             => 'new' . $tax_name . '_parent',
-							'orderby'          => 'name',
-							'hierarchical'     => 1,
-							'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
-						);
+                        $parent_dropdown_args = array(
+                            'taxonomy'         => $tax_name,
+                            'hide_empty'       => 0,
+                            'name'             => 'new' . $tax_name . '_parent',
+                            'orderby'          => 'name',
+                            'hierarchical'     => 1,
+                            'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
+                        );
 
-						/**
-						 * Filters the arguments for the taxonomy parent dropdown on the Post Edit page.
-						 *
-						 * @since 4.4.0
-						 *
-						 * @param array   $parent_dropdown_args {
-						 *     Optional. Array of arguments to generate parent dropdown.
-						 *
-						 * @type string   $taxonomy Name of the taxonomy to retrieve.
-						 * @type bool     $hide_if_empty True to skip generating markup if no
-						 *                                      categories are found. Default 0.
-						 * @type string   $name Value for the 'name' attribute
-						 *                                      of the select element.
-						 *                                      Default "new{$tax_name}_parent".
-						 * @type string   $orderby Which column to use for ordering
-						 *                                      terms. Default 'name'.
-						 * @type bool|int $hierarchical Whether to traverse the taxonomy
-						 *                                      hierarchy. Default 1.
-						 * @type string   $show_option_none Text to display for the "none" option.
-						 *                                      Default "&mdash; {$parent} &mdash;",
-						 *                                      where `$parent` is 'parent_item'
-						 *                                      taxonomy label.
-						 * }
-						 */
-						$parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
+                        /**
+                         * Filters the arguments for the taxonomy parent dropdown on the Post Edit page.
+                         *
+                         * @since 4.4.0
+                         *
+                         * @param array   $parent_dropdown_args {
+                         *     Optional. Array of arguments to generate parent dropdown.
+                         *
+                         * @type string   $taxonomy Name of the taxonomy to retrieve.
+                         * @type bool     $hide_if_empty True to skip generating markup if no
+                         *                                      categories are found. Default 0.
+                         * @type string   $name Value for the 'name' attribute
+                         *                                      of the select element.
+                         *                                      Default "new{$tax_name}_parent".
+                         * @type string   $orderby Which column to use for ordering
+                         *                                      terms. Default 'name'.
+                         * @type bool|int $hierarchical Whether to traverse the taxonomy
+                         *                                      hierarchy. Default 1.
+                         * @type string   $show_option_none Text to display for the "none" option.
+                         *                                      Default "&mdash; {$parent} &mdash;",
+                         *                                      where `$parent` is 'parent_item'
+                         *                                      taxonomy label.
+                         * }
+                         */
+                        $parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
 
-						wp_dropdown_categories( $parent_dropdown_args );
-						?>
+                        wp_dropdown_categories( $parent_dropdown_args );
+                        ?>
                         <input type="button" id="<?php echo $tax_name; ?>-add-submit"
                                data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add"
                                class="button category-add-submit"
@@ -154,6 +154,6 @@ 
 			<?php endif; ?>
         </div>
 		<?php
-	}
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -24,10 +24,10 @@ 
 	 */
 	public static function render() {
 
-		Wordlift_Admin_Schemaorg_Taxonomy_Metabox::post_categories_meta_box( get_post(), array(
+		Wordlift_Admin_Schemaorg_Taxonomy_Metabox::post_categories_meta_box(get_post(), array(
 			'args' =>
-				array( 'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ),
-		) );
+				array('taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME),
+		));
 
 	}
 
@@ -40,26 +40,26 @@ 
 	 * @param WP_Post $post The {@link WP_Post} being edited.
 	 * @param array   $box An array of arguments.
 	 */
-	private static function post_categories_meta_box( $post, $box ) {
-		$defaults = array( 'taxonomy' => 'category' );
-		if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+	private static function post_categories_meta_box($post, $box) {
+		$defaults = array('taxonomy' => 'category');
+		if ( ! isset($box['args']) || ! is_array($box['args'])) {
 			$args = array();
 		} else {
 			$args = $box['args'];
 		}
-		$r        = wp_parse_args( $args, $defaults );
-		$tax_name = esc_attr( $r['taxonomy'] );
-		$taxonomy = get_taxonomy( $r['taxonomy'] );
+		$r        = wp_parse_args($args, $defaults);
+		$tax_name = esc_attr($r['taxonomy']);
+		$taxonomy = get_taxonomy($r['taxonomy']);
 		?>
         <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
             <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
                 <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a>
                 </li>
                 <li><a
-                            href="#<?php echo $tax_name; ?>-pop"><?php echo esc_html( $taxonomy->labels->most_used ); ?></a>
+                            href="#<?php echo $tax_name; ?>-pop"><?php echo esc_html($taxonomy->labels->most_used); ?></a>
                 </li>
                 <li><a href="#<?php echo $tax_name; ?>-legacy">
-						<?php echo esc_html_x( 'A-Z', 'Entity Types metabox', 'wordlift' ); ?></a>
+						<?php echo esc_html_x('A-Z', 'Entity Types metabox', 'wordlift'); ?></a>
                 </li>
             </ul>
 
@@ -69,30 +69,30 @@ 
 
             <div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
                 <ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear">
-					<?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
+					<?php $popular_ids = wp_popular_terms_checklist($tax_name); ?>
                 </ul>
             </div>
 
             <div id="<?php echo $tax_name; ?>-legacy" class="tabs-panel" style="display: none;">
 				<?php
-				$name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+				$name = ($tax_name == 'category') ? 'post_category' : 'tax_input['.$tax_name.']';
 				echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
 				?>
                 <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>"
                     class="categorychecklist form-no-clear">
-					<?php wp_terms_checklist( $post->ID, array(
+					<?php wp_terms_checklist($post->ID, array(
 						'taxonomy'     => $tax_name,
 						'popular_cats' => $popular_ids,
-					) ); ?>
+					)); ?>
                 </ul>
             </div>
-			<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+			<?php if (current_user_can($taxonomy->cap->edit_terms)) : ?>
                 <div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
                     <a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add"
                        class="taxonomy-add-new">
 						<?php
 						/* translators: %s: add new taxonomy label */
-						printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+						printf(__('+ %s'), $taxonomy->labels->add_new_item);
 						?>
                     </a>
                     <p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
@@ -100,7 +100,7 @@ 
                                for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
                         <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>"
                                class="form-required form-input-tip"
-                               value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>"
+                               value="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>"
                                aria-required="true"/>
                         <label class="screen-reader-text" for="new<?php echo $tax_name; ?>_parent">
 							<?php echo $taxonomy->labels->parent_item_colon; ?>
@@ -109,10 +109,10 @@ 
 						$parent_dropdown_args = array(
 							'taxonomy'         => $tax_name,
 							'hide_empty'       => 0,
-							'name'             => 'new' . $tax_name . '_parent',
+							'name'             => 'new'.$tax_name.'_parent',
 							'orderby'          => 'name',
 							'hierarchical'     => 1,
-							'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
+							'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;',
 						);
 
 						/**
@@ -139,15 +139,15 @@ 
 						 *                                      taxonomy label.
 						 * }
 						 */
-						$parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
+						$parent_dropdown_args = apply_filters('post_edit_category_parent_dropdown_args', $parent_dropdown_args);
 
-						wp_dropdown_categories( $parent_dropdown_args );
+						wp_dropdown_categories($parent_dropdown_args);
 						?>
                         <input type="button" id="<?php echo $tax_name; ?>-add-submit"
                                data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add"
                                class="button category-add-submit"
-                               value="<?php echo esc_attr( $taxonomy->labels->add_new_item ); ?>"/>
-						<?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?>
+                               value="<?php echo esc_attr($taxonomy->labels->add_new_item); ?>"/>
+						<?php wp_nonce_field('add-'.$tax_name, '_ajax_nonce-add-'.$tax_name, false); ?>
                         <span id="<?php echo $tax_name; ?>-ajax-response"></span>
                     </p>
                 </div>

src/admin/class-wordlift-admin-mappings-page.php

Indentation +24 added lines, -24 removed lines

@@ -16,37 +16,37 @@
  */
 class Wordlift_Admin_Mappings_Page extends Wordlift_Admin_Page {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	function get_page_title() {
+    /**
+     * {@inheritdoc}
+     */
+    function get_page_title() {
 
-		return __( 'Mappings', 'wordlift' );
-	}
+        return __( 'Mappings', 'wordlift' );
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	function get_menu_title() {
+    /**
+     * {@inheritdoc}
+     */
+    function get_menu_title() {
 
-		return __( 'Mappings', 'wordlift' );
-	}
+        return __( 'Mappings', 'wordlift' );
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	function get_menu_slug() {
+    /**
+     * {@inheritdoc}
+     */
+    function get_menu_slug() {
 
-		return 'wl_mappings';
-	}
+        return 'wl_mappings';
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
+    /**
+     * {@inheritdoc}
+     */
 
-	function get_partial_name() {
+    function get_partial_name() {
 
-		return 'wordlift-admin-mappings-page.php';
-	}
+        return 'wordlift-admin-mappings-page.php';
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	function get_page_title() {
 
-		return __( 'Mappings', 'wordlift' );
+		return __('Mappings', 'wordlift');
 	}
 
 	/**
@@ -29,7 +29,7 @@ 
 	 */
 	function get_menu_title() {
 
-		return __( 'Mappings', 'wordlift' );
+		return __('Mappings', 'wordlift');
 	}
 
 	/**

src/admin/class-wordlift-admin.php

Indentation +266 added lines, -266 removed lines

@@ -22,314 +22,314 @@
  */
 class Wordlift_Admin {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.14.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.14.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Batch_Operation_Ajax_Adapter $sync_batch_operation_ajax_adapter The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
-	 */
-	private $sync_batch_operation_ajax_adapter;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since 3.19.4
-	 * @access private
-	 * @var Wordlift_Admin $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since  1.0.0
-	 *
-	 * @param string                          $plugin_name The name of this plugin.
-	 * @param string                          $version The version of this plugin.
-	 * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
-	 * @param \Wordlift_Notice_Service        $notice_service The notice service.
-	 * @param \Wordlift_User_Service          $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-		$this->configuration_service = $configuration_service;
-		$this->user_service          = $user_service;
-
-		$dataset_uri = $configuration_service->get_dataset_uri();
-		$key         = $configuration_service->get_key();
-
-		if ( empty( $dataset_uri ) ) {
-			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			}
-			$notice_service->add_error( $error );
-		}
-
-		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
-
-			// Require the PHP files for the next code fragment.
-			self::require_files();
-
-			new Wordlift_Dashboard_Latest_News();
-
-			// Search Rankings.
-			$search_rankings_service = new Wordlift_Admin_Search_Rankings_Service( Wordlift_Api_Service::get_instance() );
-			new Wordlift_Admin_Search_Rankings_Ajax_Adapter( $search_rankings_service );
-
-			/*
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.14.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.14.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Batch_Operation_Ajax_Adapter $sync_batch_operation_ajax_adapter The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
+     */
+    private $sync_batch_operation_ajax_adapter;
+
+    /**
+     * The singleton instance.
+     *
+     * @since 3.19.4
+     * @access private
+     * @var Wordlift_Admin $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since  1.0.0
+     *
+     * @param string                          $plugin_name The name of this plugin.
+     * @param string                          $version The version of this plugin.
+     * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
+     * @param \Wordlift_Notice_Service        $notice_service The notice service.
+     * @param \Wordlift_User_Service          $user_service The {@link Wordlift_User_Service} instance.
+     */
+    public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+        $this->configuration_service = $configuration_service;
+        $this->user_service          = $user_service;
+
+        $dataset_uri = $configuration_service->get_dataset_uri();
+        $key         = $configuration_service->get_key();
+
+        if ( empty( $dataset_uri ) ) {
+            $settings_page = Wordlift_Admin_Settings_Page::get_instance();
+            if ( empty( $key ) ) {
+                $error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            } else {
+                $error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            }
+            $notice_service->add_error( $error );
+        }
+
+        // Load additional code if we're in the admin UI.
+        if ( is_admin() ) {
+
+            // Require the PHP files for the next code fragment.
+            self::require_files();
+
+            new Wordlift_Dashboard_Latest_News();
+
+            // Search Rankings.
+            $search_rankings_service = new Wordlift_Admin_Search_Rankings_Service( Wordlift_Api_Service::get_instance() );
+            new Wordlift_Admin_Search_Rankings_Ajax_Adapter( $search_rankings_service );
+
+            /*
 			 * Add support for `All Entity Types`.
 			 *
 			 * @since 3.20.0
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-property-metabox.php';
+            if ( WL_ALL_ENTITY_TYPES ) {
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-property-metabox.php';
 
-				// new Wordlift_Admin_Schemaorg_Property_Metabox( Wordlift_Schemaorg_Property_Service::get_instance() );
-				/*
+                // new Wordlift_Admin_Schemaorg_Property_Metabox( Wordlift_Schemaorg_Property_Service::get_instance() );
+                /*
 				 * The `Mappings` admin page.
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-mappings-page.php';
-				new Wordlift_Admin_Mappings_Page();
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-mappings-page.php';
+                new Wordlift_Admin_Mappings_Page();
 
-				/*
+                /*
 				 * Allow sync'ing the schema.org taxonomy with the schema.org json file.
 				 *
 				 * @since 3.20.0
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
 
-				$this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter( new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync' );
+                $this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter( new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync' );
 
-			}
+            }
 
-			/*
+            /*
 			 * Add the {@link Wordlift_Admin_Term_Adapter}.
 			 *
 			 * @since 3.20.0
 			 */
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-term-adapter.php';
-			new Wordlift_Admin_Term_Adapter();
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-term-adapter.php';
+            new Wordlift_Admin_Term_Adapter();
 
-			/*
+            /*
 			 * The new dashboard.
 			 *
 			 * @since 3.20.0
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/879
 			 */
-			new Wordlift_Admin_Dashboard_V2(
-				$search_rankings_service,
-				Wordlift::get_instance()->get_dashboard_service(),
-				Wordlift_Entity_Service::get_instance()
-			);
-			new Wordlift_Admin_Not_Enriched_Filter();
-
-		}
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @return \Wordlift_Admin The singleton instance.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined Wordlift_Schemaorg_Property_Servicehooks and the functions defined in this
-		 * class.
-		 */
-
-		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
-			'jquery',
-			'underscore',
-			'backbone',
-		), $this->version, false );
-
-
-		$can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
-
-		/*
+            new Wordlift_Admin_Dashboard_V2(
+                $search_rankings_service,
+                Wordlift::get_instance()->get_dashboard_service(),
+                Wordlift_Entity_Service::get_instance()
+            );
+            new Wordlift_Admin_Not_Enriched_Filter();
+
+        }
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @since 3.19.4
+     *
+     * @return \Wordlift_Admin The singleton instance.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined Wordlift_Schemaorg_Property_Servicehooks and the functions defined in this
+         * class.
+         */
+
+        // Enqueue the admin scripts.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+            'jquery',
+            'underscore',
+            'backbone',
+        ), $this->version, false );
+
+
+        $can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
+
+        /*
 		 * People that can create entities will see the scope set in the wp-config.php file (by default `cloud`). People
 		 * that cannot edit create entities will always see the local entities.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/839
 		 */
-		$autocomplete_scope = $can_edit_wordlift_entities ? WL_AUTOCOMPLETE_SCOPE : "local";
-
-		// Set the basic params.
-		$params = array(
-			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
-			// @todo remove specific actions from settings.
-			'action'                => 'entity_by_title',
-			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
-			'language'              => $this->configuration_service->get_language_code(),
-			'link_by_default'       => $this->configuration_service->is_link_by_default(),
-			// Whether the current user is allowed to create new entities.
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'   => $can_edit_wordlift_entities ? 'yes' : 'no',
-			'l10n'                  => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
-			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
-			'autocomplete_scope'    => $autocomplete_scope,
-			/**
-			 * Allow 3rd parties to define the default editor id. This turns useful if 3rd parties load
-			 * or change the TinyMCE id.
-			 *
-			 * The editor id is currently referenced by `src/coffee/editpost-widget/app.services.EditorAdapter.coffee`.
-			 *
-			 * @since 3.19.4
-			 *
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/848
-			 *
-			 * @param string $editor The default editor id, by default `content`.
-			 */
-			'default_editor_id'     => apply_filters( 'wl_default_editor_id', 'content' ),
-		);
-
-		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
-
-			$params['post_id']           = $entity_being_edited->ID;
-			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
-			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
-			// from the results, since we don't want the current entity to be discovered by the analysis.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId']                      = $entity_service->get_uri( $entity_being_edited->ID );
-			$params['wl_schemaorg_property_nonce'] = wp_create_nonce( 'wl_schemaorg_property' );
-
-			/*
+        $autocomplete_scope = $can_edit_wordlift_entities ? WL_AUTOCOMPLETE_SCOPE : "local";
+
+        // Set the basic params.
+        $params = array(
+            // @todo scripts in admin should use wp.post.
+            'ajax_url'              => admin_url( 'admin-ajax.php' ),
+            // @todo remove specific actions from settings.
+            'action'                => 'entity_by_title',
+            'datasetUri'            => $this->configuration_service->get_dataset_uri(),
+            'language'              => $this->configuration_service->get_language_code(),
+            'link_by_default'       => $this->configuration_service->is_link_by_default(),
+            // Whether the current user is allowed to create new entities.
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/561
+            'can_create_entities'   => $can_edit_wordlift_entities ? 'yes' : 'no',
+            'l10n'                  => array(
+                'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
+                'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
+                'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+                'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
+                'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
+                'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+            ),
+            'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+            'autocomplete_scope'    => $autocomplete_scope,
+            /**
+             * Allow 3rd parties to define the default editor id. This turns useful if 3rd parties load
+             * or change the TinyMCE id.
+             *
+             * The editor id is currently referenced by `src/coffee/editpost-widget/app.services.EditorAdapter.coffee`.
+             *
+             * @since 3.19.4
+             *
+             * @see https://github.com/insideout10/wordlift-plugin/issues/848
+             *
+             * @param string $editor The default editor id, by default `content`.
+             */
+            'default_editor_id'     => apply_filters( 'wl_default_editor_id', 'content' ),
+        );
+
+        // Set post-related values if there's a current post.
+        if ( null !== $post = $entity_being_edited = get_post() ) {
+
+            $params['post_id']           = $entity_being_edited->ID;
+            $entity_service              = Wordlift_Entity_Service::get_instance();
+            $params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+            // We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
+            // from the results, since we don't want the current entity to be discovered by the analysis.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/345
+            $params['itemId']                      = $entity_service->get_uri( $entity_being_edited->ID );
+            $params['wl_schemaorg_property_nonce'] = wp_create_nonce( 'wl_schemaorg_property' );
+
+            /*
 			 * Add the `properties` if `WL_ALL_ENTITY_TYPES` is enabled.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				$params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all( $post->ID );
-			}
+            if ( WL_ALL_ENTITY_TYPES ) {
+                $params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all( $post->ID );
+            }
 
-		}
+        }
 
-		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', apply_filters( 'wl_admin_settings', $params ) );
+        // Finally output the params as `wlSettings` for JavaScript code.
+        wp_localize_script( $this->plugin_name, 'wlSettings', apply_filters( 'wl_admin_settings', $params ) );
 
-	}
+    }
 
-	/**
-	 * Require files needed for the Admin UI.
-	 *
-	 * @since 3.20.0
-	 */
-	private static function require_files() {
+    /**
+     * Require files needed for the Admin UI.
+     *
+     * @since 3.20.0
+     */
+    private static function require_files() {
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-v2.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-not-enriched-filter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-v2.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-not-enriched-filter.php';
 
-	}
+    }
 
 }

Spacing +41 added lines, -41 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param \Wordlift_Notice_Service        $notice_service The notice service.
 	 * @param \Wordlift_User_Service          $user_service The {@link Wordlift_User_Service} instance.
 	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+	public function __construct($plugin_name, $version, $configuration_service, $notice_service, $user_service) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -98,18 +98,18 @@ 
 		$dataset_uri = $configuration_service->get_dataset_uri();
 		$key         = $configuration_service->get_key();
 
-		if ( empty( $dataset_uri ) ) {
+		if (empty($dataset_uri)) {
 			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+			if (empty($key)) {
+				$error = sprintf(esc_html__("WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+				$error = sprintf(esc_html__("WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			}
-			$notice_service->add_error( $error );
+			$notice_service->add_error($error);
 		}
 
 		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
+		if (is_admin()) {
 
 			// Require the PHP files for the next code fragment.
 			self::require_files();
@@ -117,8 +117,8 @@ 
 			new Wordlift_Dashboard_Latest_News();
 
 			// Search Rankings.
-			$search_rankings_service = new Wordlift_Admin_Search_Rankings_Service( Wordlift_Api_Service::get_instance() );
-			new Wordlift_Admin_Search_Rankings_Ajax_Adapter( $search_rankings_service );
+			$search_rankings_service = new Wordlift_Admin_Search_Rankings_Service(Wordlift_Api_Service::get_instance());
+			new Wordlift_Admin_Search_Rankings_Ajax_Adapter($search_rankings_service);
 
 			/*
 			 * Add support for `All Entity Types`.
@@ -127,15 +127,15 @@ 
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-property-metabox.php';
+			if (WL_ALL_ENTITY_TYPES) {
+				require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
+				require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-schemaorg-property-metabox.php';
 
 				// new Wordlift_Admin_Schemaorg_Property_Metabox( Wordlift_Schemaorg_Property_Service::get_instance() );
 				/*
 				 * The `Mappings` admin page.
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-mappings-page.php';
+				require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-mappings-page.php';
 				new Wordlift_Admin_Mappings_Page();
 
 				/*
@@ -143,9 +143,9 @@ 
 				 *
 				 * @since 3.20.0
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
+				require_once plugin_dir_path(dirname(__FILE__)).'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
 
-				$this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter( new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync' );
+				$this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter(new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync');
 
 			}
 
@@ -154,7 +154,7 @@ 
 			 *
 			 * @since 3.20.0
 			 */
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-term-adapter.php';
+			require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-term-adapter.php';
 			new Wordlift_Admin_Term_Adapter();
 
 			/*
@@ -209,7 +209,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -233,14 +233,14 @@ 
 		 */
 
 		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/1/admin.js', array(
 			'jquery',
 			'underscore',
 			'backbone',
-		), $this->version, false );
+		), $this->version, false);
 
 
-		$can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
+		$can_edit_wordlift_entities = current_user_can('edit_wordlift_entities');
 
 		/*
 		 * People that can create entities will see the scope set in the wp-config.php file (by default `cloud`). People
@@ -253,7 +253,7 @@ 
 		// Set the basic params.
 		$params = array(
 			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
+			'ajax_url'              => admin_url('admin-ajax.php'),
 			// @todo remove specific actions from settings.
 			'action'                => 'entity_by_title',
 			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
@@ -264,14 +264,14 @@ 
 			// @see https://github.com/insideout10/wordlift-plugin/issues/561
 			'can_create_entities'   => $can_edit_wordlift_entities ? 'yes' : 'no',
 			'l10n'                  => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+				'You already published an entity with the same name'                 => __('You already published an entity with the same name: ', 'wordlift'),
+				'logo_selection_title'                                               => __('WordLift Choose Logo', 'wordlift'),
+				'logo_selection_button'                                              => array('text' => __('Choose Logo', 'wordlift')),
+				'Type at least 3 characters to search...'                            => _x('Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift'),
+				'No results found for your search.'                                  => _x('No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift'),
+				'Please wait while we look for entities in the linked data cloud...' => _x('Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift'),
 			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+			'wl_autocomplete_nonce' => wp_create_nonce('wordlift_autocomplete'),
 			'autocomplete_scope'    => $autocomplete_scope,
 			/**
 			 * Allow 3rd parties to define the default editor id. This turns useful if 3rd parties load
@@ -285,35 +285,35 @@ 
 			 *
 			 * @param string $editor The default editor id, by default `content`.
 			 */
-			'default_editor_id'     => apply_filters( 'wl_default_editor_id', 'content' ),
+			'default_editor_id'     => apply_filters('wl_default_editor_id', 'content'),
 		);
 
 		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
+		if (null !== $post = $entity_being_edited = get_post()) {
 
 			$params['post_id']           = $entity_being_edited->ID;
 			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+			$params['entityBeingEdited'] = isset($entity_being_edited->post_type) && $entity_service->is_entity($post->ID) && is_numeric(get_the_ID());
 			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
 			// from the results, since we don't want the current entity to be discovered by the analysis.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId']                      = $entity_service->get_uri( $entity_being_edited->ID );
-			$params['wl_schemaorg_property_nonce'] = wp_create_nonce( 'wl_schemaorg_property' );
+			$params['itemId']                      = $entity_service->get_uri($entity_being_edited->ID);
+			$params['wl_schemaorg_property_nonce'] = wp_create_nonce('wl_schemaorg_property');
 
 			/*
 			 * Add the `properties` if `WL_ALL_ENTITY_TYPES` is enabled.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				$params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all( $post->ID );
+			if (WL_ALL_ENTITY_TYPES) {
+				$params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all($post->ID);
 			}
 
 		}
 
 		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', apply_filters( 'wl_admin_settings', $params ) );
+		wp_localize_script($this->plugin_name, 'wlSettings', apply_filters('wl_admin_settings', $params));
 
 	}
 
@@ -324,11 +324,11 @@ 
 	 */
 	private static function require_files() {
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-v2.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-not-enriched-filter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard-latest-news.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-search-rankings-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard-v2.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-not-enriched-filter.php';
 
 	}
 

src/admin/class-wordlift-admin-search-rankings-page.php

Indentation +40 added lines, -40 removed lines

@@ -16,56 +16,56 @@
  */
 class Wordlift_Admin_Search_Rankings_Page extends Wordlift_Admin_Page {
 
-	/**
-	 * We decide whether to load this page from {@link Wordlift} if the user subscription is editorial or business.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct() {
-		// Do nothing. We need this because the parent class calls the `admin_menu` hook.
-	}
+    /**
+     * We decide whether to load this page from {@link Wordlift} if the user subscription is editorial or business.
+     *
+     * @since 3.20.0
+     */
+    public function __construct() {
+        // Do nothing. We need this because the parent class calls the `admin_menu` hook.
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function get_page_title() {
+    /**
+     * @inheritdoc
+     */
+    function get_page_title() {
 
-		return _x( 'Search Rankings', 'Search Rankings', 'wordlift' );
-	}
+        return _x( 'Search Rankings', 'Search Rankings', 'wordlift' );
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_title() {
+    /**
+     * @inheritdoc
+     */
+    function get_menu_title() {
 
-		return _x( 'Search Rankings', 'Search Rankings', 'wordlift' );
-	}
+        return _x( 'Search Rankings', 'Search Rankings', 'wordlift' );
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_slug() {
+    /**
+     * @inheritdoc
+     */
+    function get_menu_slug() {
 
-		return 'wl_search_rankings';
-	}
+        return 'wl_search_rankings';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function get_partial_name() {
+    /**
+     * @inheritdoc
+     */
+    function get_partial_name() {
 
-		return 'wordlift-admin-search-rankings.php';
-	}
+        return 'wordlift-admin-search-rankings.php';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function enqueue_scripts() {
-		parent::enqueue_scripts();
+    /**
+     * @inheritdoc
+     */
+    public function enqueue_scripts() {
+        parent::enqueue_scripts();
 
-		wp_enqueue_script( 'wl-admin-search-rankings', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/search-rankings.js', array(), Wordlift::get_instance()->get_version() );
-		wp_enqueue_style( 'wl-admin-search-rankings', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/search-rankings.css', array(), Wordlift::get_instance()->get_version() );
+        wp_enqueue_script( 'wl-admin-search-rankings', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/search-rankings.js', array(), Wordlift::get_instance()->get_version() );
+        wp_enqueue_style( 'wl-admin-search-rankings', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/search-rankings.css', array(), Wordlift::get_instance()->get_version() );
 
-	}
+    }
 
 }

src/admin/class-wordlift-admin-page.php

Indentation +136 added lines, -136 removed lines

@@ -18,141 +18,141 @@
  */
 abstract class Wordlift_Admin_Page {
 
-	/**
-	 * Define the {@link Wordlift_Admin_Page} constructor.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct() {
-
-		add_action( 'admin_menu', array( $this, 'admin_menu' ), 10, 0 );
-
-	}
-
-	/**
-	 * Get the parent slug.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The parent slug (default 'wl_admin_menu').
-	 */
-	protected function get_parent_slug() {
-
-		return 'wl_admin_menu';
-	}
-
-	/**
-	 * Get the required capability.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The capability (default 'manage_options').
-	 */
-	protected function get_capability() {
-
-		return 'manage_options';
-	}
-
-	/**
-	 * Get the page title. Will be translated.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The page title.
-	 */
-	abstract function get_page_title();
-
-	/**
-	 * Get the menu title. Will be translated.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The menu title.
-	 */
-	abstract function get_menu_title();
-
-	/**
-	 * Get the menu slug.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The menu slug.
-	 */
-	abstract function get_menu_slug();
-
-	/**
-	 * Get the page url.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @return string The escaped url of the admin page
-	 */
-	function get_url() {
-
-		// ideally should have used menu_page_url, but it is loaded later than some usages.
-		$url = admin_url( 'admin.php?page=' . $this->get_menu_slug() );
-
-		return esc_url( $url );
-	}
-
-	/**
-	 * Get the partial file name, used in the {@link render} function.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return string The partial file name.
-	 */
-	abstract function get_partial_name();
-
-	/**
-	 * The `admin_menu` callback. Will call {@link add_submenu_page} to add the
-	 * page to the admin menu.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
-	 */
-	public function admin_menu() {
-
-		// Add the sub-menu page.
-		//
-		// See http://codex.wordpress.org/Function_Reference/add_submenu_page
-		$page = add_submenu_page(
-			$this->get_parent_slug(),
-			$this->get_page_title(),
-			$this->get_menu_title(),
-			$this->get_capability(),                   // The required capability, provided by the calling hook.
-			$this->get_menu_slug(),
-			array( $this, 'render' )
-		);
-
-		// Set a hook to enqueue scripts only when the settings page is displayed.
-		add_action( 'admin_print_scripts-' . $page, array(
-			$this,
-			'enqueue_scripts',
-		) );
-
-		// Finally return the page hook_suffix.
-		return $page;
-	}
-
-	/**
-	 * Enqueue scripts for the specific page. Subclasses can override this function
-	 * to provide their own styles/scripts.
-	 *
-	 * @since 3.11.0
-	 */
-	public function enqueue_scripts() {
-	}
-
-	/**
-	 * Render the page.
-	 */
-	public function render() {
-
-		// Include the partial.
-		include( plugin_dir_path( __FILE__ ) . 'partials/' . $this->get_partial_name() );
-
-	}
+    /**
+     * Define the {@link Wordlift_Admin_Page} constructor.
+     *
+     * @since 3.20.0
+     */
+    public function __construct() {
+
+        add_action( 'admin_menu', array( $this, 'admin_menu' ), 10, 0 );
+
+    }
+
+    /**
+     * Get the parent slug.
+     *
+     * @since 3.11.0
+     *
+     * @return string The parent slug (default 'wl_admin_menu').
+     */
+    protected function get_parent_slug() {
+
+        return 'wl_admin_menu';
+    }
+
+    /**
+     * Get the required capability.
+     *
+     * @since 3.11.0
+     *
+     * @return string The capability (default 'manage_options').
+     */
+    protected function get_capability() {
+
+        return 'manage_options';
+    }
+
+    /**
+     * Get the page title. Will be translated.
+     *
+     * @since 3.11.0
+     *
+     * @return string The page title.
+     */
+    abstract function get_page_title();
+
+    /**
+     * Get the menu title. Will be translated.
+     *
+     * @since 3.11.0
+     *
+     * @return string The menu title.
+     */
+    abstract function get_menu_title();
+
+    /**
+     * Get the menu slug.
+     *
+     * @since 3.11.0
+     *
+     * @return string The menu slug.
+     */
+    abstract function get_menu_slug();
+
+    /**
+     * Get the page url.
+     *
+     * @since 3.14.0
+     *
+     * @return string The escaped url of the admin page
+     */
+    function get_url() {
+
+        // ideally should have used menu_page_url, but it is loaded later than some usages.
+        $url = admin_url( 'admin.php?page=' . $this->get_menu_slug() );
+
+        return esc_url( $url );
+    }
+
+    /**
+     * Get the partial file name, used in the {@link render} function.
+     *
+     * @since 3.11.0
+     *
+     * @return string The partial file name.
+     */
+    abstract function get_partial_name();
+
+    /**
+     * The `admin_menu` callback. Will call {@link add_submenu_page} to add the
+     * page to the admin menu.
+     *
+     * @since 3.11.0
+     *
+     * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
+     */
+    public function admin_menu() {
+
+        // Add the sub-menu page.
+        //
+        // See http://codex.wordpress.org/Function_Reference/add_submenu_page
+        $page = add_submenu_page(
+            $this->get_parent_slug(),
+            $this->get_page_title(),
+            $this->get_menu_title(),
+            $this->get_capability(),                   // The required capability, provided by the calling hook.
+            $this->get_menu_slug(),
+            array( $this, 'render' )
+        );
+
+        // Set a hook to enqueue scripts only when the settings page is displayed.
+        add_action( 'admin_print_scripts-' . $page, array(
+            $this,
+            'enqueue_scripts',
+        ) );
+
+        // Finally return the page hook_suffix.
+        return $page;
+    }
+
+    /**
+     * Enqueue scripts for the specific page. Subclasses can override this function
+     * to provide their own styles/scripts.
+     *
+     * @since 3.11.0
+     */
+    public function enqueue_scripts() {
+    }
+
+    /**
+     * Render the page.
+     */
+    public function render() {
+
+        // Include the partial.
+        include( plugin_dir_path( __FILE__ ) . 'partials/' . $this->get_partial_name() );
+
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -25,7 +25,7 @@ 
 	 */
 	public function __construct() {
 
-		add_action( 'admin_menu', array( $this, 'admin_menu' ), 10, 0 );
+		add_action('admin_menu', array($this, 'admin_menu'), 10, 0);
 
 	}
 
@@ -90,9 +90,9 @@ 
 	function get_url() {
 
 		// ideally should have used menu_page_url, but it is loaded later than some usages.
-		$url = admin_url( 'admin.php?page=' . $this->get_menu_slug() );
+		$url = admin_url('admin.php?page='.$this->get_menu_slug());
 
-		return esc_url( $url );
+		return esc_url($url);
 	}
 
 	/**
@@ -121,16 +121,16 @@ 
 			$this->get_parent_slug(),
 			$this->get_page_title(),
 			$this->get_menu_title(),
-			$this->get_capability(),                   // The required capability, provided by the calling hook.
+			$this->get_capability(), // The required capability, provided by the calling hook.
 			$this->get_menu_slug(),
-			array( $this, 'render' )
+			array($this, 'render')
 		);
 
 		// Set a hook to enqueue scripts only when the settings page is displayed.
-		add_action( 'admin_print_scripts-' . $page, array(
+		add_action('admin_print_scripts-'.$page, array(
 			$this,
 			'enqueue_scripts',
-		) );
+		));
 
 		// Finally return the page hook_suffix.
 		return $page;
@@ -151,7 +151,7 @@ 
 	public function render() {
 
 		// Include the partial.
-		include( plugin_dir_path( __FILE__ ) . 'partials/' . $this->get_partial_name() );
+		include(plugin_dir_path(__FILE__).'partials/'.$this->get_partial_name());
 
 	}
 

src/admin/partials/wordlift-admin-mappings-page.php

Indentation +36 added lines, -36 removed lines

@@ -17,50 +17,50 @@ 
 
 	<?php
 
-	$mappings = array_reduce(
-	// The list of valid post types.
-		Wordlift_Entity_Service::valid_entity_post_types(),
+    $mappings = array_reduce(
+    // The list of valid post types.
+        Wordlift_Entity_Service::valid_entity_post_types(),
 
-		function ( $carry, $post_type ) use ( $mapping_service ) {
-			$entity_types = array_filter( Wordlift_Entity_Type_Adapter::get_entity_types( $post_type ),
-				function ( $item ) {
-					return 'http://schema.org/Article' !== $item;
-				} );
+        function ( $carry, $post_type ) use ( $mapping_service ) {
+            $entity_types = array_filter( Wordlift_Entity_Type_Adapter::get_entity_types( $post_type ),
+                function ( $item ) {
+                    return 'http://schema.org/Article' !== $item;
+                } );
 
-			if ( empty( $entity_types ) ) {
-				return $carry;
-			}
+            if ( empty( $entity_types ) ) {
+                return $carry;
+            }
 
-			return $carry + array(
-					$post_type => array(
-						'entity_types' => $entity_types,
-						'count'        => $mapping_service->count( $post_type, $entity_types ),
-					),
-				);
-		},
-		array() );
+            return $carry + array(
+                    $post_type => array(
+                        'entity_types' => $entity_types,
+                        'count'        => $mapping_service->count( $post_type, $entity_types ),
+                    ),
+                );
+        },
+        array() );
 
-	$mappings['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
+    $mappings['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
 
 
-	$json = wp_json_encode( $mappings );
-	echo "<script type='application/javascript'>var wlMappings = $json;</script>";
+    $json = wp_json_encode( $mappings );
+    echo "<script type='application/javascript'>var wlMappings = $json;</script>";
 
-	?>
+    ?>
 
 	<?php
 
-	foreach ( $mappings as $key => $value ) {
-		// Continue if this is the nonce.
-		if ( '_nonce' == $key ) {
-			continue;
-		}
-
-		// Continue if the count isn't set or it's zero, i.e. no need to apply the taxonomy.
-		if ( ! isset( $value['count'] ) || 0 === $value['count'] ) {
-			continue;
-		}
-		?>
+    foreach ( $mappings as $key => $value ) {
+        // Continue if this is the nonce.
+        if ( '_nonce' == $key ) {
+            continue;
+        }
+
+        // Continue if the count isn't set or it's zero, i.e. no need to apply the taxonomy.
+        if ( ! isset( $value['count'] ) || 0 === $value['count'] ) {
+            continue;
+        }
+        ?>
         <div class="post-type-to-entity-types">
             <button data-post-type="<?php echo esc_attr( $key ); ?>"
                     data-entity-types="<?php echo esc_attr( wp_json_encode( $value['entity_types'] ) ); ?>"
@@ -68,9 +68,9 @@ 
             <div><?php echo esc_html( $value['count'] ); ?></div>
         </div>
 		<?php
-	}
+    }
 
-	?>
+    ?>
 
     <div id="schemaorg-sync">
         <button>Sync Schema.org classes</button>

Spacing +17 added lines, -17 removed lines

@@ -6,13 +6,13 @@ 
  * @package Wordlift
  * @subpackage Wordlift/admin/partials
  */
-wp_enqueue_script( 'wp-util' );
+wp_enqueue_script('wp-util');
 
 $mapping_service = Wordlift_Mapping_Service::get_instance();
 ?>
 <div id="wpbody-content" aria-label="Main content" tabindex="0">
     <div class="wrap">
-        <h1><?php echo esc_html__( 'Mappings', 'wordlift' ); ?></h1>
+        <h1><?php echo esc_html__('Mappings', 'wordlift'); ?></h1>
     </div>
 
 	<?php
@@ -21,51 +21,51 @@ 
 	// The list of valid post types.
 		Wordlift_Entity_Service::valid_entity_post_types(),
 
-		function ( $carry, $post_type ) use ( $mapping_service ) {
-			$entity_types = array_filter( Wordlift_Entity_Type_Adapter::get_entity_types( $post_type ),
-				function ( $item ) {
+		function($carry, $post_type) use ($mapping_service) {
+			$entity_types = array_filter(Wordlift_Entity_Type_Adapter::get_entity_types($post_type),
+				function($item) {
 					return 'http://schema.org/Article' !== $item;
 				} );
 
-			if ( empty( $entity_types ) ) {
+			if (empty($entity_types)) {
 				return $carry;
 			}
 
 			return $carry + array(
 					$post_type => array(
 						'entity_types' => $entity_types,
-						'count'        => $mapping_service->count( $post_type, $entity_types ),
+						'count'        => $mapping_service->count($post_type, $entity_types),
 					),
 				);
 		},
 		array() );
 
-	$mappings['_nonce'] = wp_create_nonce( 'update_post_type_entity_types' );
+	$mappings['_nonce'] = wp_create_nonce('update_post_type_entity_types');
 
 
-	$json = wp_json_encode( $mappings );
+	$json = wp_json_encode($mappings);
 	echo "<script type='application/javascript'>var wlMappings = $json;</script>";
 
 	?>
 
 	<?php
 
-	foreach ( $mappings as $key => $value ) {
+	foreach ($mappings as $key => $value) {
 		// Continue if this is the nonce.
-		if ( '_nonce' == $key ) {
+		if ('_nonce' == $key) {
 			continue;
 		}
 
 		// Continue if the count isn't set or it's zero, i.e. no need to apply the taxonomy.
-		if ( ! isset( $value['count'] ) || 0 === $value['count'] ) {
+		if ( ! isset($value['count']) || 0 === $value['count']) {
 			continue;
 		}
 		?>
         <div class="post-type-to-entity-types">
-            <button data-post-type="<?php echo esc_attr( $key ); ?>"
-                    data-entity-types="<?php echo esc_attr( wp_json_encode( $value['entity_types'] ) ); ?>"
-            ><?php echo esc_html( $key ); ?></button>
-            <div><?php echo esc_html( $value['count'] ); ?></div>
+            <button data-post-type="<?php echo esc_attr($key); ?>"
+                    data-entity-types="<?php echo esc_attr(wp_json_encode($value['entity_types'])); ?>"
+            ><?php echo esc_html($key); ?></button>
+            <div><?php echo esc_html($value['count']); ?></div>
         </div>
 		<?php
 	}
@@ -74,7 +74,7 @@ 
 
     <div id="schemaorg-sync">
         <button>Sync Schema.org classes</button>
-        <div class="count"><?php echo( Wordlift_Schemaorg_Sync_Batch_Operation::get_instance()->count() ); ?></div>
+        <div class="count"><?php echo(Wordlift_Schemaorg_Sync_Batch_Operation::get_instance()->count()); ?></div>
     </div>
 
     <div class="clear"></div>

src/includes/class-wordlift-entity-post-to-jsonld-converter.php

Indentation +227 added lines, -227 removed lines

@@ -13,238 +13,238 @@
  */
 class Wordlift_Entity_Post_To_Jsonld_Converter extends Wordlift_Abstract_Post_To_Jsonld_Converter {
 
-	/**
-	 * A {@link Wordlift_Property_Getter} instance.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Property_Getter $property_getter A {@link Wordlift_Property_Getter} instance.
-	 */
-	private $property_getter;
-
-	/**
-	 * The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var null|Wordlift_Schemaorg_Property_Service The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
-	 */
-	private $schemaorg_property_service;
-
-	/**
-	 * Wordlift_Entity_To_Jsonld_Converter constructor.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param \Wordlift_Entity_Type_Service        $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
-	 * @param \Wordlift_Entity_Service             $entity_service A {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_User_Service               $user_service A {@link Wordlift_User_Service} instance.
-	 * @param \Wordlift_Attachment_Service         $attachment_service A {@link Wordlift_Attachment_Service} instance.
-	 * @param \Wordlift_Property_Getter            $property_getter A {@link Wordlift_Property_Getter} instance.
-	 * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service A {@link Wordlift_Schemaorg_Property_Service} instance.
-	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service = null ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
-
-		$this->property_getter            = $property_getter;
-		$this->schemaorg_property_service = $schemaorg_property_service;
-
-	}
-
-	/**
-	 * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
-	 * found while processing the post is set in the $references array.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param int   $post_id The {@link WP_Post} id.
-	 *
-	 * @param array $references An array of entity references.
-	 *
-	 * @return array A JSON-LD array.
-	 */
-	public function convert( $post_id, &$references = array() ) {
-
-		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
-			// Post not found.
-			return null;
-		}
-
-		// Get the base JSON-LD and the list of entities referenced by this entity.
-		$jsonld = parent::convert( $post_id, $references );
-
-		// Get the entity name.
-		$jsonld['name'] = $post->post_title;
-
-		// 3.13.0, add alternate names.
-		$alternative_labels = $this->entity_service->get_alternative_labels( $post_id );
-		if ( 0 < count( $alternative_labels ) ) {
-			$jsonld['alternateName'] = $alternative_labels;
-		}
-
-		// Get the entity `@type` with custom fields set by the Wordlift_Schema_Service.
-		//
-		// This allows us to gather the basic properties as defined by the `Thing` entity type.
-		$type = $this->entity_type_service->get( $post_id );
-
-		// Get the configured type custom fields.
-		if ( isset( $type['custom_fields'] ) ) {
-			$this->process_type_custom_fields( $jsonld, $type['custom_fields'], $post, $references );
-		}
-
-		/*
+    /**
+     * A {@link Wordlift_Property_Getter} instance.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Property_Getter $property_getter A {@link Wordlift_Property_Getter} instance.
+     */
+    private $property_getter;
+
+    /**
+     * The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var null|Wordlift_Schemaorg_Property_Service The {@link Wordlift_Schemaorg_Property_Service} or null if not provided.
+     */
+    private $schemaorg_property_service;
+
+    /**
+     * Wordlift_Entity_To_Jsonld_Converter constructor.
+     *
+     * @since 3.8.0
+     *
+     * @param \Wordlift_Entity_Type_Service        $entity_type_service A {@link Wordlift_Entity_Type_Service} instance.
+     * @param \Wordlift_Entity_Service             $entity_service A {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_User_Service               $user_service A {@link Wordlift_User_Service} instance.
+     * @param \Wordlift_Attachment_Service         $attachment_service A {@link Wordlift_Attachment_Service} instance.
+     * @param \Wordlift_Property_Getter            $property_getter A {@link Wordlift_Property_Getter} instance.
+     * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service A {@link Wordlift_Schemaorg_Property_Service} instance.
+     */
+    public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service = null ) {
+        parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+
+        $this->property_getter            = $property_getter;
+        $this->schemaorg_property_service = $schemaorg_property_service;
+
+    }
+
+    /**
+     * Convert the provided {@link WP_Post} to a JSON-LD array. Any entity reference
+     * found while processing the post is set in the $references array.
+     *
+     * @since 3.8.0
+     *
+     * @param int   $post_id The {@link WP_Post} id.
+     *
+     * @param array $references An array of entity references.
+     *
+     * @return array A JSON-LD array.
+     */
+    public function convert( $post_id, &$references = array() ) {
+
+        // Get the post instance.
+        $post = get_post( $post_id );
+        if ( null === $post ) {
+            // Post not found.
+            return null;
+        }
+
+        // Get the base JSON-LD and the list of entities referenced by this entity.
+        $jsonld = parent::convert( $post_id, $references );
+
+        // Get the entity name.
+        $jsonld['name'] = $post->post_title;
+
+        // 3.13.0, add alternate names.
+        $alternative_labels = $this->entity_service->get_alternative_labels( $post_id );
+        if ( 0 < count( $alternative_labels ) ) {
+            $jsonld['alternateName'] = $alternative_labels;
+        }
+
+        // Get the entity `@type` with custom fields set by the Wordlift_Schema_Service.
+        //
+        // This allows us to gather the basic properties as defined by the `Thing` entity type.
+        $type = $this->entity_type_service->get( $post_id );
+
+        // Get the configured type custom fields.
+        if ( isset( $type['custom_fields'] ) ) {
+            $this->process_type_custom_fields( $jsonld, $type['custom_fields'], $post, $references );
+        }
+
+        /*
 		 * Get the properties attached to the post.
 		 *
 		 * @since 3.20.0 We attach properties directly to the posts.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			$this->process_post_properties( $jsonld, $post_id );
-		}
-
-		/**
-		 * Call the `wl_entity_jsonld` filter.
-		 *
-		 * @api
-		 *
-		 * @since 3.20.0
-		 *
-		 * @param array $jsonld The JSON-LD structure.
-		 * @param int   $post_id The {@link WP_Post} `id`.
-		 * @param array $references The array of referenced entities.
-		 */
-		return apply_filters( 'wl_entity_jsonld', $this->post_process( $jsonld ), $post_id, $references );
-	}
-
-	/**
-	 * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
-	 * for the post entity type.
-	 *
-	 * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
-	 *  the {@link Wordlift_Schema_Service} class.
-	 *
-	 * @param array   $jsonld The JSON-LD array.
-	 * @param array   $fields The entity types field array.
-	 * @param WP_Post $post The target {@link WP_Post} instance.
-	 * @param array   $references The references array.
-	 */
-	private function process_type_custom_fields( &$jsonld, $fields, $post, &$references ) {
-
-		// Set a reference to use in closures.
-		$converter = $this;
-
-		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
-
-			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
-
-			// Get the value, the property service will get the right extractor
-			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key );
-
-			if ( empty( $value ) ) {
-				continue;
-			}
-
-			// Map the value to the property name.
-			// If we got an array with just one value, we return that one value.
-			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one( array_map( function ( $item ) use ( $converter, &$references ) {
-
-				if ( $item instanceof Wordlift_Property_Entity_Reference ) {
-
-					$url = $item->getURL();
-
-					// The refactored converters require the entity id.
-					$references[] = $item->getID();
-
-					return array(
-						'@id' => $url,
-					);
-				}
-
-				return $converter->relative_to_context( $item );
-			}, $value ) );
-
-		}
-
-	}
-
-	/**
-	 * Process the properties attached to the {@link WP_Post}.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $jsonld The JSON-LD array.
-	 * @param int   $post_id The target {@link WP_Post} id.
-	 */
-	private function process_post_properties( &$jsonld, $post_id ) {
-
-		// Get all the props.
-		$props = $this->schemaorg_property_service->get_all( $post_id );
-
-		// Process all the props.
-		foreach ( $props as $name => $instances ) {
-
-			// Get the values.
-			$values = array_map( function ( $instance ) {
-				return $instance['value'];
-			}, $instances );
-
-			// We might receive empty values, remove them.
-			$non_empty_values = array_filter( $values, function ( $value ) {
-				return ! empty( $value );
-			} );
-
-			// Skip empty properties.
-			if ( empty( $non_empty_values ) ) {
-				continue;
-			}
-
-			// @@todo: need to handle maybe Numbers and URLs differently.
-			// Make an array a single value when possible.
-			$jsonld[ $name ] = self::make_one( $non_empty_values );
-		}
-
-	}
-
-	/**
-	 * Post process the generated JSON to reorganize values which are stored as 1st
-	 * level in WP but are really 2nd level.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param array $jsonld An array of JSON-LD properties and values.
-	 *
-	 * @return array The array remapped.
-	 */
-	private function post_process( $jsonld ) {
-
-		foreach ( $jsonld as $key => $value ) {
-			if ( 'streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key ) {
-				$jsonld['address']['@type'] = 'PostalAddress';
-				$jsonld['address'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
-			}
-
-			if ( 'latitude' === $key || 'longitude' === $key ) {
-				$jsonld['geo']['@type'] = 'GeoCoordinates';
-				$jsonld['geo'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
-			}
-
-			if ( 'calories' === $key ) {
-				$jsonld['nutrition']['@type'] = 'NutritionInformation';
-				$jsonld['nutrition'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
-			}
-		}
-
-		return $jsonld;
-	}
+        if ( WL_ALL_ENTITY_TYPES ) {
+            $this->process_post_properties( $jsonld, $post_id );
+        }
+
+        /**
+         * Call the `wl_entity_jsonld` filter.
+         *
+         * @api
+         *
+         * @since 3.20.0
+         *
+         * @param array $jsonld The JSON-LD structure.
+         * @param int   $post_id The {@link WP_Post} `id`.
+         * @param array $references The array of referenced entities.
+         */
+        return apply_filters( 'wl_entity_jsonld', $this->post_process( $jsonld ), $post_id, $references );
+    }
+
+    /**
+     * Add data to the JSON-LD using the `custom_fields` array which contains the definitions of property
+     * for the post entity type.
+     *
+     * @since 3.20.0 This code moved from the above function `convert`, used for entity types defined in
+     *  the {@link Wordlift_Schema_Service} class.
+     *
+     * @param array   $jsonld The JSON-LD array.
+     * @param array   $fields The entity types field array.
+     * @param WP_Post $post The target {@link WP_Post} instance.
+     * @param array   $references The references array.
+     */
+    private function process_type_custom_fields( &$jsonld, $fields, $post, &$references ) {
+
+        // Set a reference to use in closures.
+        $converter = $this;
+
+        // Try each field on the entity.
+        foreach ( $fields as $key => $value ) {
+
+            // Get the predicate.
+            $name = $this->relative_to_context( $value['predicate'] );
+
+            // Get the value, the property service will get the right extractor
+            // for that property.
+            $value = $this->property_getter->get( $post->ID, $key );
+
+            if ( empty( $value ) ) {
+                continue;
+            }
+
+            // Map the value to the property name.
+            // If we got an array with just one value, we return that one value.
+            // If we got a Wordlift_Property_Entity_Reference we get the URL.
+            $jsonld[ $name ] = self::make_one( array_map( function ( $item ) use ( $converter, &$references ) {
+
+                if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+
+                    $url = $item->getURL();
+
+                    // The refactored converters require the entity id.
+                    $references[] = $item->getID();
+
+                    return array(
+                        '@id' => $url,
+                    );
+                }
+
+                return $converter->relative_to_context( $item );
+            }, $value ) );
+
+        }
+
+    }
+
+    /**
+     * Process the properties attached to the {@link WP_Post}.
+     *
+     * @since 3.20.0
+     *
+     * @param array $jsonld The JSON-LD array.
+     * @param int   $post_id The target {@link WP_Post} id.
+     */
+    private function process_post_properties( &$jsonld, $post_id ) {
+
+        // Get all the props.
+        $props = $this->schemaorg_property_service->get_all( $post_id );
+
+        // Process all the props.
+        foreach ( $props as $name => $instances ) {
+
+            // Get the values.
+            $values = array_map( function ( $instance ) {
+                return $instance['value'];
+            }, $instances );
+
+            // We might receive empty values, remove them.
+            $non_empty_values = array_filter( $values, function ( $value ) {
+                return ! empty( $value );
+            } );
+
+            // Skip empty properties.
+            if ( empty( $non_empty_values ) ) {
+                continue;
+            }
+
+            // @@todo: need to handle maybe Numbers and URLs differently.
+            // Make an array a single value when possible.
+            $jsonld[ $name ] = self::make_one( $non_empty_values );
+        }
+
+    }
+
+    /**
+     * Post process the generated JSON to reorganize values which are stored as 1st
+     * level in WP but are really 2nd level.
+     *
+     * @since 3.8.0
+     *
+     * @param array $jsonld An array of JSON-LD properties and values.
+     *
+     * @return array The array remapped.
+     */
+    private function post_process( $jsonld ) {
+
+        foreach ( $jsonld as $key => $value ) {
+            if ( 'streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key ) {
+                $jsonld['address']['@type'] = 'PostalAddress';
+                $jsonld['address'][ $key ]  = $value;
+                unset( $jsonld[ $key ] );
+            }
+
+            if ( 'latitude' === $key || 'longitude' === $key ) {
+                $jsonld['geo']['@type'] = 'GeoCoordinates';
+                $jsonld['geo'][ $key ]  = $value;
+                unset( $jsonld[ $key ] );
+            }
+
+            if ( 'calories' === $key ) {
+                $jsonld['nutrition']['@type'] = 'NutritionInformation';
+                $jsonld['nutrition'][ $key ]  = $value;
+                unset( $jsonld[ $key ] );
+            }
+        }
+
+        return $jsonld;
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -43,8 +43,8 @@ 
 	 * @param \Wordlift_Property_Getter            $property_getter A {@link Wordlift_Property_Getter} instance.
 	 * @param \Wordlift_Schemaorg_Property_Service $schemaorg_property_service A {@link Wordlift_Schemaorg_Property_Service} instance.
 	 */
-	public function __construct( $entity_type_service, $entity_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service = null ) {
-		parent::__construct( $entity_type_service, $entity_service, $user_service, $attachment_service );
+	public function __construct($entity_type_service, $entity_service, $user_service, $attachment_service, $property_getter, $schemaorg_property_service = null) {
+		parent::__construct($entity_type_service, $entity_service, $user_service, $attachment_service);
 
 		$this->property_getter            = $property_getter;
 		$this->schemaorg_property_service = $schemaorg_property_service;
@@ -63,35 +63,35 @@ 
 	 *
 	 * @return array A JSON-LD array.
 	 */
-	public function convert( $post_id, &$references = array() ) {
+	public function convert($post_id, &$references = array()) {
 
 		// Get the post instance.
-		$post = get_post( $post_id );
-		if ( null === $post ) {
+		$post = get_post($post_id);
+		if (null === $post) {
 			// Post not found.
 			return null;
 		}
 
 		// Get the base JSON-LD and the list of entities referenced by this entity.
-		$jsonld = parent::convert( $post_id, $references );
+		$jsonld = parent::convert($post_id, $references);
 
 		// Get the entity name.
 		$jsonld['name'] = $post->post_title;
 
 		// 3.13.0, add alternate names.
-		$alternative_labels = $this->entity_service->get_alternative_labels( $post_id );
-		if ( 0 < count( $alternative_labels ) ) {
+		$alternative_labels = $this->entity_service->get_alternative_labels($post_id);
+		if (0 < count($alternative_labels)) {
 			$jsonld['alternateName'] = $alternative_labels;
 		}
 
 		// Get the entity `@type` with custom fields set by the Wordlift_Schema_Service.
 		//
 		// This allows us to gather the basic properties as defined by the `Thing` entity type.
-		$type = $this->entity_type_service->get( $post_id );
+		$type = $this->entity_type_service->get($post_id);
 
 		// Get the configured type custom fields.
-		if ( isset( $type['custom_fields'] ) ) {
-			$this->process_type_custom_fields( $jsonld, $type['custom_fields'], $post, $references );
+		if (isset($type['custom_fields'])) {
+			$this->process_type_custom_fields($jsonld, $type['custom_fields'], $post, $references);
 		}
 
 		/*
@@ -101,8 +101,8 @@ 
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			$this->process_post_properties( $jsonld, $post_id );
+		if (WL_ALL_ENTITY_TYPES) {
+			$this->process_post_properties($jsonld, $post_id);
 		}
 
 		/**
@@ -116,7 +116,7 @@ 
 		 * @param int   $post_id The {@link WP_Post} `id`.
 		 * @param array $references The array of referenced entities.
 		 */
-		return apply_filters( 'wl_entity_jsonld', $this->post_process( $jsonld ), $post_id, $references );
+		return apply_filters('wl_entity_jsonld', $this->post_process($jsonld), $post_id, $references);
 	}
 
 	/**
@@ -131,31 +131,31 @@ 
 	 * @param WP_Post $post The target {@link WP_Post} instance.
 	 * @param array   $references The references array.
 	 */
-	private function process_type_custom_fields( &$jsonld, $fields, $post, &$references ) {
+	private function process_type_custom_fields(&$jsonld, $fields, $post, &$references) {
 
 		// Set a reference to use in closures.
 		$converter = $this;
 
 		// Try each field on the entity.
-		foreach ( $fields as $key => $value ) {
+		foreach ($fields as $key => $value) {
 
 			// Get the predicate.
-			$name = $this->relative_to_context( $value['predicate'] );
+			$name = $this->relative_to_context($value['predicate']);
 
 			// Get the value, the property service will get the right extractor
 			// for that property.
-			$value = $this->property_getter->get( $post->ID, $key );
+			$value = $this->property_getter->get($post->ID, $key);
 
-			if ( empty( $value ) ) {
+			if (empty($value)) {
 				continue;
 			}
 
 			// Map the value to the property name.
 			// If we got an array with just one value, we return that one value.
 			// If we got a Wordlift_Property_Entity_Reference we get the URL.
-			$jsonld[ $name ] = self::make_one( array_map( function ( $item ) use ( $converter, &$references ) {
+			$jsonld[$name] = self::make_one(array_map(function($item) use ($converter, &$references) {
 
-				if ( $item instanceof Wordlift_Property_Entity_Reference ) {
+				if ($item instanceof Wordlift_Property_Entity_Reference) {
 
 					$url = $item->getURL();
 
@@ -167,8 +167,8 @@ 
 					);
 				}
 
-				return $converter->relative_to_context( $item );
-			}, $value ) );
+				return $converter->relative_to_context($item);
+			}, $value));
 
 		}
 
@@ -182,32 +182,32 @@ 
 	 * @param array $jsonld The JSON-LD array.
 	 * @param int   $post_id The target {@link WP_Post} id.
 	 */
-	private function process_post_properties( &$jsonld, $post_id ) {
+	private function process_post_properties(&$jsonld, $post_id) {
 
 		// Get all the props.
-		$props = $this->schemaorg_property_service->get_all( $post_id );
+		$props = $this->schemaorg_property_service->get_all($post_id);
 
 		// Process all the props.
-		foreach ( $props as $name => $instances ) {
+		foreach ($props as $name => $instances) {
 
 			// Get the values.
-			$values = array_map( function ( $instance ) {
+			$values = array_map(function($instance) {
 				return $instance['value'];
-			}, $instances );
+			}, $instances);
 
 			// We might receive empty values, remove them.
-			$non_empty_values = array_filter( $values, function ( $value ) {
-				return ! empty( $value );
+			$non_empty_values = array_filter($values, function($value) {
+				return ! empty($value);
 			} );
 
 			// Skip empty properties.
-			if ( empty( $non_empty_values ) ) {
+			if (empty($non_empty_values)) {
 				continue;
 			}
 
 			// @@todo: need to handle maybe Numbers and URLs differently.
 			// Make an array a single value when possible.
-			$jsonld[ $name ] = self::make_one( $non_empty_values );
+			$jsonld[$name] = self::make_one($non_empty_values);
 		}
 
 	}
@@ -222,25 +222,25 @@ 
 	 *
 	 * @return array The array remapped.
 	 */
-	private function post_process( $jsonld ) {
+	private function post_process($jsonld) {
 
-		foreach ( $jsonld as $key => $value ) {
-			if ( 'streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key ) {
+		foreach ($jsonld as $key => $value) {
+			if ('streetAddress' === $key || 'postalCode' === $key || 'addressLocality' === $key || 'addressRegion' === $key || 'addressCountry' === $key || 'postOfficeBoxNumber' === $key) {
 				$jsonld['address']['@type'] = 'PostalAddress';
-				$jsonld['address'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
+				$jsonld['address'][$key]  = $value;
+				unset($jsonld[$key]);
 			}
 
-			if ( 'latitude' === $key || 'longitude' === $key ) {
+			if ('latitude' === $key || 'longitude' === $key) {
 				$jsonld['geo']['@type'] = 'GeoCoordinates';
-				$jsonld['geo'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
+				$jsonld['geo'][$key]  = $value;
+				unset($jsonld[$key]);
 			}
 
-			if ( 'calories' === $key ) {
+			if ('calories' === $key) {
 				$jsonld['nutrition']['@type'] = 'NutritionInformation';
-				$jsonld['nutrition'][ $key ]  = $value;
-				unset( $jsonld[ $key ] );
+				$jsonld['nutrition'][$key]  = $value;
+				unset($jsonld[$key]);
 			}
 		}