insideout10 / wordlift-plugin

src/wordlift/no-editor-analysis/class-meta-box.php

Indentation +33 added lines, -33 removed lines

@@ -10,38 +10,38 @@
 
 class Meta_Box {
 
-	const META_BOX_ID = 'wl-no-editor-analysis-meta-box';
-
-	public function init() {
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_box' ) );
-	}
-
-	public function add_meta_box( $post_type ) {
-
-		// We enable it for only the post types which doesn't support the editor and
-		// enabled on the filter.
-		if ( ! No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( get_the_ID() ) ) {
-			return;
-		}
-
-		add_meta_box(
-			self::META_BOX_ID,
-			__( 'WordLift', 'wordlift' ),
-			array( $this, 'render_meta_box' ),
-			$post_type,
-			'side',
-			'high'
-		);
-
-	}
-
-	public function render_meta_box() {
-		echo sprintf(
-			"<div id='%s'></div><div id='%s'></div>",
-			esc_attr( 'wl-no-editor-analysis-meta-box-content' ),
-			// Div to store the entities.
-			esc_attr( 'wl-no-editor-analysis-meta-box-storage' )
-		);
-	}
+    const META_BOX_ID = 'wl-no-editor-analysis-meta-box';
+
+    public function init() {
+        add_action( 'add_meta_boxes', array( $this, 'add_meta_box' ) );
+    }
+
+    public function add_meta_box( $post_type ) {
+
+        // We enable it for only the post types which doesn't support the editor and
+        // enabled on the filter.
+        if ( ! No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( get_the_ID() ) ) {
+            return;
+        }
+
+        add_meta_box(
+            self::META_BOX_ID,
+            __( 'WordLift', 'wordlift' ),
+            array( $this, 'render_meta_box' ),
+            $post_type,
+            'side',
+            'high'
+        );
+
+    }
+
+    public function render_meta_box() {
+        echo sprintf(
+            "<div id='%s'></div><div id='%s'></div>",
+            esc_attr( 'wl-no-editor-analysis-meta-box-content' ),
+            // Div to store the entities.
+            esc_attr( 'wl-no-editor-analysis-meta-box-storage' )
+        );
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -13,21 +13,21 @@ 
 	const META_BOX_ID = 'wl-no-editor-analysis-meta-box';
 
 	public function init() {
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_box' ) );
+		add_action('add_meta_boxes', array($this, 'add_meta_box'));
 	}
 
-	public function add_meta_box( $post_type ) {
+	public function add_meta_box($post_type) {
 
 		// We enable it for only the post types which doesn't support the editor and
 		// enabled on the filter.
-		if ( ! No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( get_the_ID() ) ) {
+		if ( ! No_Editor_Analysis_Feature::can_no_editor_analysis_be_used(get_the_ID())) {
 			return;
 		}
 
 		add_meta_box(
 			self::META_BOX_ID,
-			__( 'WordLift', 'wordlift' ),
-			array( $this, 'render_meta_box' ),
+			__('WordLift', 'wordlift'),
+			array($this, 'render_meta_box'),
 			$post_type,
 			'side',
 			'high'
@@ -38,9 +38,9 @@ 
 	public function render_meta_box() {
 		echo sprintf(
 			"<div id='%s'></div><div id='%s'></div>",
-			esc_attr( 'wl-no-editor-analysis-meta-box-content' ),
+			esc_attr('wl-no-editor-analysis-meta-box-content'),
 			// Div to store the entities.
-			esc_attr( 'wl-no-editor-analysis-meta-box-storage' )
+			esc_attr('wl-no-editor-analysis-meta-box-storage')
 		);
 	}
 

src/wordlift/no-editor-analysis/class-post-type.php

Indentation +10 added lines, -10 removed lines

@@ -3,19 +3,19 @@
 
 class Post_Type {
 
-	public static function is_no_editor_analysis_enabled_for_post_type( $post_type ) {
+    public static function is_no_editor_analysis_enabled_for_post_type( $post_type ) {
 
-		if ( ! $post_type ) {
-			return false;
-		}
+        if ( ! $post_type ) {
+            return false;
+        }
 
-		if ( ! post_type_exists( $post_type ) ) {
-			return false;
-		}
+        if ( ! post_type_exists( $post_type ) ) {
+            return false;
+        }
 
-		// Enable it on post types which doesn't have editor by default.
-		return ! post_type_supports( $post_type, 'editor' );
+        // Enable it on post types which doesn't have editor by default.
+        return ! post_type_supports( $post_type, 'editor' );
 
-	}
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -3,18 +3,18 @@
 
 class Post_Type {
 
-	public static function is_no_editor_analysis_enabled_for_post_type( $post_type ) {
+	public static function is_no_editor_analysis_enabled_for_post_type($post_type) {
 
-		if ( ! $post_type ) {
+		if ( ! $post_type) {
 			return false;
 		}
 
-		if ( ! post_type_exists( $post_type ) ) {
+		if ( ! post_type_exists($post_type)) {
 			return false;
 		}
 
 		// Enable it on post types which doesn't have editor by default.
-		return ! post_type_supports( $post_type, 'editor' );
+		return ! post_type_supports($post_type, 'editor');
 
 	}
 

src/wordlift/no-editor-analysis/class-edit-post-scripts.php

Indentation +35 added lines, -35 removed lines

@@ -7,40 +7,40 @@
 
 class Edit_Post_Scripts extends Edit_Post_Loader {
 
-	const HANDLE = 'wl-no-editor-analysis-deps';
-
-	public function run_on_edit_post_screen() {
-
-		// Dont load this script if the post doesnt support it.
-		if ( ! No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( get_the_ID() ) ) {
-			return;
-		}
-
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			self::HANDLE,
-			plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/no-editor-analysis',
-			array(
-				'react',
-				'react-dom',
-				'wp-api-fetch',
-				'wp-blocks',
-				'wp-components',
-				'wp-data',
-				'wp-element',
-				'wp-hooks',
-				'wp-polyfill',
-				'wp-rich-text',
-			),
-			true
-		);
-
-		wp_enqueue_style(
-			self::HANDLE,
-			plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/no-editor-analysis.full.css',
-			array(),
-			WORDLIFT_VERSION
-		);
-
-	}
+    const HANDLE = 'wl-no-editor-analysis-deps';
+
+    public function run_on_edit_post_screen() {
+
+        // Dont load this script if the post doesnt support it.
+        if ( ! No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( get_the_ID() ) ) {
+            return;
+        }
+
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            self::HANDLE,
+            plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/no-editor-analysis',
+            array(
+                'react',
+                'react-dom',
+                'wp-api-fetch',
+                'wp-blocks',
+                'wp-components',
+                'wp-data',
+                'wp-element',
+                'wp-hooks',
+                'wp-polyfill',
+                'wp-rich-text',
+            ),
+            true
+        );
+
+        wp_enqueue_style(
+            self::HANDLE,
+            plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/no-editor-analysis.full.css',
+            array(),
+            WORDLIFT_VERSION
+        );
+
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -12,13 +12,13 @@ 
 	public function run_on_edit_post_screen() {
 
 		// Dont load this script if the post doesnt support it.
-		if ( ! No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( get_the_ID() ) ) {
+		if ( ! No_Editor_Analysis_Feature::can_no_editor_analysis_be_used(get_the_ID())) {
 			return;
 		}
 
 		Scripts_Helper::enqueue_based_on_wordpress_version(
 			self::HANDLE,
-			plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/no-editor-analysis',
+			plugin_dir_url(dirname(__DIR__)).'js/dist/no-editor-analysis',
 			array(
 				'react',
 				'react-dom',
@@ -36,7 +36,7 @@ 
 
 		wp_enqueue_style(
 			self::HANDLE,
-			plugin_dir_url( dirname( __DIR__ ) ) . 'js/dist/no-editor-analysis.full.css',
+			plugin_dir_url(dirname(__DIR__)).'js/dist/no-editor-analysis.full.css',
 			array(),
 			WORDLIFT_VERSION
 		);

src/wordlift/no-editor-analysis/class-edit-screen-setting.php

Indentation +7 added lines, -7 removed lines

@@ -10,13 +10,13 @@
  */
 class Edit_Screen_Setting {
 
-	public function add_setting() {
-		add_filter( 'wl_admin_settings', array( $this, 'wl_admin_settings' ) );
-	}
+    public function add_setting() {
+        add_filter( 'wl_admin_settings', array( $this, 'wl_admin_settings' ) );
+    }
 
-	public function wl_admin_settings( $settings ) {
-		$settings['analysis']['isNoEditorAnalysisActive'] = No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( get_the_ID() );
-		return $settings;
-	}
+    public function wl_admin_settings( $settings ) {
+        $settings['analysis']['isNoEditorAnalysisActive'] = No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( get_the_ID() );
+        return $settings;
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -11,11 +11,11 @@
 class Edit_Screen_Setting {
 
 	public function add_setting() {
-		add_filter( 'wl_admin_settings', array( $this, 'wl_admin_settings' ) );
+		add_filter('wl_admin_settings', array($this, 'wl_admin_settings'));
 	}
 
-	public function wl_admin_settings( $settings ) {
-		$settings['analysis']['isNoEditorAnalysisActive'] = No_Editor_Analysis_Feature::can_no_editor_analysis_be_used( get_the_ID() );
+	public function wl_admin_settings($settings) {
+		$settings['analysis']['isNoEditorAnalysisActive'] = No_Editor_Analysis_Feature::can_no_editor_analysis_be_used(get_the_ID());
 		return $settings;
 	}
 

src/wordlift/lod-import/index.php

Indentation +2 added lines, -2 removed lines

@@ -4,6 +4,6 @@
 
 // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 if ( apply_filters( 'wl_feature__enable__lod-import', false ) ) {
-	$lod_import = new Lod_Import();
-	$lod_import->register_hooks();
+    $lod_import = new Lod_Import();
+    $lod_import->register_hooks();
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Wordlift\Lod_Import\Lod_Import;
 
 // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-if ( apply_filters( 'wl_feature__enable__lod-import', false ) ) {
+if (apply_filters('wl_feature__enable__lod-import', false)) {
 	$lod_import = new Lod_Import();
 	$lod_import->register_hooks();
 }

src/wordlift/lod-import/class-lod-import.php

Indentation +42 added lines, -42 removed lines

@@ -10,30 +10,30 @@ 
 
 class Lod_Import {
 
-	public function __construct() {
+    public function __construct() {
 
-	}
+    }
 
-	public function register_hooks() {
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-	}
+    public function register_hooks() {
+        add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+    }
 
-	public function admin_menu() {
+    public function admin_menu() {
 
-		$callback = isset( $_SERVER['REQUEST_METHOD'] ) && 'POST' === sanitize_text_field( wp_unslash( $_SERVER['REQUEST_METHOD'] ) ) ? 'handle' : 'render';
+        $callback = isset( $_SERVER['REQUEST_METHOD'] ) && 'POST' === sanitize_text_field( wp_unslash( $_SERVER['REQUEST_METHOD'] ) ) ? 'handle' : 'render';
 
-		add_submenu_page(
-			'wl_admin_menu',
-			__( 'LOD Import', 'wordlift' ),
-			__( 'LOD Import', 'wordlift' ),
-			'manage_options',
-			'wl_lod_import',
-			array( $this, $callback )
-		);
-	}
+        add_submenu_page(
+            'wl_admin_menu',
+            __( 'LOD Import', 'wordlift' ),
+            __( 'LOD Import', 'wordlift' ),
+            'manage_options',
+            'wl_lod_import',
+            array( $this, $callback )
+        );
+    }
 
-	public function render() {
-		?>
+    public function render() {
+        ?>
 		<div class="wrap">
 			<h1><?php esc_html_e( 'LOD Import', 'wordlift' ); ?></h1>
 			<p><?php esc_html_e( 'Helpful stuff here', 'wordlift' ); ?></p>
@@ -48,38 +48,38 @@ 
 		</div>
 		<?php
 
-	}
+    }
 
-	public function handle() {
-		$item_ids = filter_input( INPUT_POST, 'item-ids' );
-		if ( ! $item_ids ) {
-			?>
+    public function handle() {
+        $item_ids = filter_input( INPUT_POST, 'item-ids' );
+        if ( ! $item_ids ) {
+            ?>
 			<p class="notice notice-error">Please type stgh</p>
 			<?php
-			return;
-		}
+            return;
+        }
 
-		foreach ( preg_split( '(\r\n|\r|\n)', $item_ids ) as $item_id ) {
-			$this->import_single( $item_id );
-		}
-	}
+        foreach ( preg_split( '(\r\n|\r|\n)', $item_ids ) as $item_id ) {
+            $this->import_single( $item_id );
+        }
+    }
 
-	private function import_single( $item_id ) {
+    private function import_single( $item_id ) {
 
-		$content_service = Wordpress_Content_Service::get_instance();
+        $content_service = Wordpress_Content_Service::get_instance();
 
-		// Do not create/update an existing entity.
-		if ( $content_service->get_by_entity_id_or_same_as( $item_id ) ) {
-			return;
-		}
+        // Do not create/update an existing entity.
+        if ( $content_service->get_by_entity_id_or_same_as( $item_id ) ) {
+            return;
+        }
 
-		$remote_entity = Url_To_Remote_Entity_Converter::convert( $item_id );
-		$importer      = Remote_Entity_Importer_Factory::from_entity( $remote_entity );
-		$content_id    = $importer->import();
-		if ( $content_id instanceof Content_Id && $content_id->get_type() === Object_Type_Enum::POST ) {
-			edit_post_link( null, null, null, $content_id->get_id() );
-		}
+        $remote_entity = Url_To_Remote_Entity_Converter::convert( $item_id );
+        $importer      = Remote_Entity_Importer_Factory::from_entity( $remote_entity );
+        $content_id    = $importer->import();
+        if ( $content_id instanceof Content_Id && $content_id->get_type() === Object_Type_Enum::POST ) {
+            edit_post_link( null, null, null, $content_id->get_id() );
+        }
 
-	}
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -15,35 +15,35 @@ 
 	}
 
 	public function register_hooks() {
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+		add_action('admin_menu', array($this, 'admin_menu'));
 	}
 
 	public function admin_menu() {
 
-		$callback = isset( $_SERVER['REQUEST_METHOD'] ) && 'POST' === sanitize_text_field( wp_unslash( $_SERVER['REQUEST_METHOD'] ) ) ? 'handle' : 'render';
+		$callback = isset($_SERVER['REQUEST_METHOD']) && 'POST' === sanitize_text_field(wp_unslash($_SERVER['REQUEST_METHOD'])) ? 'handle' : 'render';
 
 		add_submenu_page(
 			'wl_admin_menu',
-			__( 'LOD Import', 'wordlift' ),
-			__( 'LOD Import', 'wordlift' ),
+			__('LOD Import', 'wordlift'),
+			__('LOD Import', 'wordlift'),
 			'manage_options',
 			'wl_lod_import',
-			array( $this, $callback )
+			array($this, $callback)
 		);
 	}
 
 	public function render() {
 		?>
 		<div class="wrap">
-			<h1><?php esc_html_e( 'LOD Import', 'wordlift' ); ?></h1>
-			<p><?php esc_html_e( 'Helpful stuff here', 'wordlift' ); ?></p>
+			<h1><?php esc_html_e('LOD Import', 'wordlift'); ?></h1>
+			<p><?php esc_html_e('Helpful stuff here', 'wordlift'); ?></p>
 			<form method="post" novalidate="novalidate">
 				<div class="form-field">
-					<label for="item-ids"><?php esc_html_e( 'Linked Data IDs', 'wordlift' ); ?></label>
+					<label for="item-ids"><?php esc_html_e('Linked Data IDs', 'wordlift'); ?></label>
 					<textarea name="item-ids" id="item-ids" rows="5" cols="40"></textarea>
-					<p><?php esc_html_e( 'The description is not prominent by default; however, some themes may show it.', 'wordlift' ); ?></p>
+					<p><?php esc_html_e('The description is not prominent by default; however, some themes may show it.', 'wordlift'); ?></p>
 				</div>
-				<?php submit_button( 'Import' ); ?>
+				<?php submit_button('Import'); ?>
 			</form>
 		</div>
 		<?php
@@ -51,33 +51,33 @@ 
 	}
 
 	public function handle() {
-		$item_ids = filter_input( INPUT_POST, 'item-ids' );
-		if ( ! $item_ids ) {
+		$item_ids = filter_input(INPUT_POST, 'item-ids');
+		if ( ! $item_ids) {
 			?>
 			<p class="notice notice-error">Please type stgh</p>
 			<?php
 			return;
 		}
 
-		foreach ( preg_split( '(\r\n|\r|\n)', $item_ids ) as $item_id ) {
-			$this->import_single( $item_id );
+		foreach (preg_split('(\r\n|\r|\n)', $item_ids) as $item_id) {
+			$this->import_single($item_id);
 		}
 	}
 
-	private function import_single( $item_id ) {
+	private function import_single($item_id) {
 
 		$content_service = Wordpress_Content_Service::get_instance();
 
 		// Do not create/update an existing entity.
-		if ( $content_service->get_by_entity_id_or_same_as( $item_id ) ) {
+		if ($content_service->get_by_entity_id_or_same_as($item_id)) {
 			return;
 		}
 
-		$remote_entity = Url_To_Remote_Entity_Converter::convert( $item_id );
-		$importer      = Remote_Entity_Importer_Factory::from_entity( $remote_entity );
+		$remote_entity = Url_To_Remote_Entity_Converter::convert($item_id);
+		$importer      = Remote_Entity_Importer_Factory::from_entity($remote_entity);
 		$content_id    = $importer->import();
-		if ( $content_id instanceof Content_Id && $content_id->get_type() === Object_Type_Enum::POST ) {
-			edit_post_link( null, null, null, $content_id->get_id() );
+		if ($content_id instanceof Content_Id && $content_id->get_type() === Object_Type_Enum::POST) {
+			edit_post_link(null, null, null, $content_id->get_id());
 		}
 
 	}

src/wordlift/duplicate-markup-remover/class-duplicate-markup-remover.php

Indentation +106 added lines, -106 removed lines

@@ -4,111 +4,111 @@
 
 class Duplicate_Markup_Remover {
 
-	private $types_to_properties_map = array(
-		'HowTo'   => array(
-			'estimatedCost',
-			'totalTime',
-			'supply',
-			'tool',
-			'step',
-		),
-		'FAQPage' => array( 'mainEntity' ),
-		'Recipe'  => array(
-			'cookTime',
-			'cookingMethod',
-			'nutrition',
-			'recipeCategory',
-			'recipeCuisine',
-			'recipeIngredient',
-			'recipeInstructions',
-			'recipeYield',
-			'suitableForDiet',
-		),
-	);
-
-	public function __construct() {
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10 );
-	}
-
-	/**
-	 * @param $jsonld array The final jsonld.
-	 *
-	 * @return array Filtered jsonld.
-	 */
-	public function wl_after_get_jsonld( $jsonld ) {
-
-		foreach ( $this->types_to_properties_map as $type_to_remove => $properties_to_remove ) {
-			$jsonld = $this->remove_type( $jsonld, $type_to_remove, $properties_to_remove );
-		}
-
-		return $jsonld;
-	}
-
-	/**
-	 * @param array $jsonld
-	 *
-	 * @return bool
-	 */
-	protected function should_alter_jsonld( $jsonld ) {
-		return ! is_array( $jsonld )
-			   || ! count( $jsonld ) > 1
-			   || ! array_key_exists( 0, $jsonld );
-	}
-
-	/**
-	 * @param array $jsonld
-	 *
-	 * @return array
-	 */
-	private function remove_type( $jsonld, $type_to_remove, $properties_to_remove ) {
-
-		if ( $this->should_alter_jsonld( $jsonld ) ) {
-			// Return early if there are no referenced entities.
-			return $jsonld;
-		}
-
-		$post_jsonld = array_shift( $jsonld );
-
-		// we need to loop through all the items and remove the faq markup.
-		foreach ( $jsonld as $key => &$value ) {
-			if ( ! array_key_exists( '@type', $value ) ) {
-				continue;
-			}
-			$type = $value['@type'];
-
-			/**
-			 * Two possibilities:
-			 * 1. The referenced entity has only supplied SchemaType markup, in that case remove the complete entity.
-			 * 2. The referenced entity has multiple types, in that case completely remove the supplied SchemaType markup, but
-			 * retain the other entity data.
-			 */
-			// If the referenced entity is purely supplied SchemaType markup, then remove it.
-
-			if ( is_string( $type ) && $type === $type_to_remove ) {
-				// Remove the entity completely.
-				unset( $jsonld[ $key ] );
-			}
-
-			if ( is_array( $type ) && in_array( $type_to_remove, $type, true ) ) {
-				// Remove the supplied SchemaType markup.
-				$position = array_search( $type_to_remove, $type, true );
-				// Also update the type.
-				if ( false !== $position ) {
-					unset( $type[ $position ] );
-					$value['@type'] = array_values( $type );
-				}
-
-				foreach ( $properties_to_remove as $property ) {
-					// Remove keys of supplied SchemaType.
-					unset( $value[ $property ] );
-				}
-			}
-		}
-
-		// Add the post jsonld to front of jsonld array.
-		array_unshift( $jsonld, $post_jsonld );
-
-		return $jsonld;
-	}
+    private $types_to_properties_map = array(
+        'HowTo'   => array(
+            'estimatedCost',
+            'totalTime',
+            'supply',
+            'tool',
+            'step',
+        ),
+        'FAQPage' => array( 'mainEntity' ),
+        'Recipe'  => array(
+            'cookTime',
+            'cookingMethod',
+            'nutrition',
+            'recipeCategory',
+            'recipeCuisine',
+            'recipeIngredient',
+            'recipeInstructions',
+            'recipeYield',
+            'suitableForDiet',
+        ),
+    );
+
+    public function __construct() {
+        add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10 );
+    }
+
+    /**
+     * @param $jsonld array The final jsonld.
+     *
+     * @return array Filtered jsonld.
+     */
+    public function wl_after_get_jsonld( $jsonld ) {
+
+        foreach ( $this->types_to_properties_map as $type_to_remove => $properties_to_remove ) {
+            $jsonld = $this->remove_type( $jsonld, $type_to_remove, $properties_to_remove );
+        }
+
+        return $jsonld;
+    }
+
+    /**
+     * @param array $jsonld
+     *
+     * @return bool
+     */
+    protected function should_alter_jsonld( $jsonld ) {
+        return ! is_array( $jsonld )
+               || ! count( $jsonld ) > 1
+               || ! array_key_exists( 0, $jsonld );
+    }
+
+    /**
+     * @param array $jsonld
+     *
+     * @return array
+     */
+    private function remove_type( $jsonld, $type_to_remove, $properties_to_remove ) {
+
+        if ( $this->should_alter_jsonld( $jsonld ) ) {
+            // Return early if there are no referenced entities.
+            return $jsonld;
+        }
+
+        $post_jsonld = array_shift( $jsonld );
+
+        // we need to loop through all the items and remove the faq markup.
+        foreach ( $jsonld as $key => &$value ) {
+            if ( ! array_key_exists( '@type', $value ) ) {
+                continue;
+            }
+            $type = $value['@type'];
+
+            /**
+             * Two possibilities:
+             * 1. The referenced entity has only supplied SchemaType markup, in that case remove the complete entity.
+             * 2. The referenced entity has multiple types, in that case completely remove the supplied SchemaType markup, but
+             * retain the other entity data.
+             */
+            // If the referenced entity is purely supplied SchemaType markup, then remove it.
+
+            if ( is_string( $type ) && $type === $type_to_remove ) {
+                // Remove the entity completely.
+                unset( $jsonld[ $key ] );
+            }
+
+            if ( is_array( $type ) && in_array( $type_to_remove, $type, true ) ) {
+                // Remove the supplied SchemaType markup.
+                $position = array_search( $type_to_remove, $type, true );
+                // Also update the type.
+                if ( false !== $position ) {
+                    unset( $type[ $position ] );
+                    $value['@type'] = array_values( $type );
+                }
+
+                foreach ( $properties_to_remove as $property ) {
+                    // Remove keys of supplied SchemaType.
+                    unset( $value[ $property ] );
+                }
+            }
+        }
+
+        // Add the post jsonld to front of jsonld array.
+        array_unshift( $jsonld, $post_jsonld );
+
+        return $jsonld;
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -12,7 +12,7 @@ 
 			'tool',
 			'step',
 		),
-		'FAQPage' => array( 'mainEntity' ),
+		'FAQPage' => array('mainEntity'),
 		'Recipe'  => array(
 			'cookTime',
 			'cookingMethod',
@@ -27,7 +27,7 @@ 
 	);
 
 	public function __construct() {
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10 );
+		add_filter('wl_after_get_jsonld', array($this, 'wl_after_get_jsonld'), 10);
 	}
 
 	/**
@@ -35,10 +35,10 @@ 
 	 *
 	 * @return array Filtered jsonld.
 	 */
-	public function wl_after_get_jsonld( $jsonld ) {
+	public function wl_after_get_jsonld($jsonld) {
 
-		foreach ( $this->types_to_properties_map as $type_to_remove => $properties_to_remove ) {
-			$jsonld = $this->remove_type( $jsonld, $type_to_remove, $properties_to_remove );
+		foreach ($this->types_to_properties_map as $type_to_remove => $properties_to_remove) {
+			$jsonld = $this->remove_type($jsonld, $type_to_remove, $properties_to_remove);
 		}
 
 		return $jsonld;
@@ -49,10 +49,10 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function should_alter_jsonld( $jsonld ) {
-		return ! is_array( $jsonld )
-			   || ! count( $jsonld ) > 1
-			   || ! array_key_exists( 0, $jsonld );
+	protected function should_alter_jsonld($jsonld) {
+		return ! is_array($jsonld)
+			   || ! count($jsonld) > 1
+			   || ! array_key_exists(0, $jsonld);
 	}
 
 	/**
@@ -60,18 +60,18 @@ 
 	 *
 	 * @return array
 	 */
-	private function remove_type( $jsonld, $type_to_remove, $properties_to_remove ) {
+	private function remove_type($jsonld, $type_to_remove, $properties_to_remove) {
 
-		if ( $this->should_alter_jsonld( $jsonld ) ) {
+		if ($this->should_alter_jsonld($jsonld)) {
 			// Return early if there are no referenced entities.
 			return $jsonld;
 		}
 
-		$post_jsonld = array_shift( $jsonld );
+		$post_jsonld = array_shift($jsonld);
 
 		// we need to loop through all the items and remove the faq markup.
-		foreach ( $jsonld as $key => &$value ) {
-			if ( ! array_key_exists( '@type', $value ) ) {
+		foreach ($jsonld as $key => &$value) {
+			if ( ! array_key_exists('@type', $value)) {
 				continue;
 			}
 			$type = $value['@type'];
@@ -84,29 +84,29 @@ 
 			 */
 			// If the referenced entity is purely supplied SchemaType markup, then remove it.
 
-			if ( is_string( $type ) && $type === $type_to_remove ) {
+			if (is_string($type) && $type === $type_to_remove) {
 				// Remove the entity completely.
-				unset( $jsonld[ $key ] );
+				unset($jsonld[$key]);
 			}
 
-			if ( is_array( $type ) && in_array( $type_to_remove, $type, true ) ) {
+			if (is_array($type) && in_array($type_to_remove, $type, true)) {
 				// Remove the supplied SchemaType markup.
-				$position = array_search( $type_to_remove, $type, true );
+				$position = array_search($type_to_remove, $type, true);
 				// Also update the type.
-				if ( false !== $position ) {
-					unset( $type[ $position ] );
-					$value['@type'] = array_values( $type );
+				if (false !== $position) {
+					unset($type[$position]);
+					$value['@type'] = array_values($type);
 				}
 
-				foreach ( $properties_to_remove as $property ) {
+				foreach ($properties_to_remove as $property) {
 					// Remove keys of supplied SchemaType.
-					unset( $value[ $property ] );
+					unset($value[$property]);
 				}
 			}
 		}
 
 		// Add the post jsonld to front of jsonld array.
-		array_unshift( $jsonld, $post_jsonld );
+		array_unshift($jsonld, $post_jsonld);
 
 		return $jsonld;
 	}

src/wordlift/duplicate-markup-remover/class-videoobject-duplicate-remover.php

Indentation +42 added lines, -42 removed lines

@@ -10,47 +10,47 @@
  */
 class Videoobject_Duplicate_Remover {
 
-	public function __construct() {
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10 );
-	}
-
-	/**
-	 * @param $jsonld array The final jsonld.
-	 * @return array Filtered jsonld.
-	 */
-	public function wl_after_get_jsonld( $jsonld ) {
-
-		if ( ! is_array( $jsonld )
-			 || ! count( $jsonld ) > 1
-			 || ! array_key_exists( 0, $jsonld ) ) {
-			// Return early if there are no referenced entities.
-			return $jsonld;
-		}
-
-		$post_jsonld = array_shift( $jsonld );
-
-		// we need to loop through all the items and remove the faq markup.
-		foreach ( $jsonld as $key => &$value ) {
-			if ( ! array_key_exists( '@type', $value ) ) {
-				continue;
-			}
-			$type = $value['@type'];
-
-			if ( ( is_string( $type ) && 'Article' !== $type )
-				 || ( is_array( $type ) && ! in_array( 'Article', $type, true ) ) ) {
-				continue;
-			}
-			// Video doesnt exist, dont try to remove it.
-			if ( ! array_key_exists( 'video', $value ) ) {
-				continue;
-			}
-			unset( $jsonld[ $key ]['video'] );
-		}
-
-		// Add the post jsonld to front of jsonld array.
-		array_unshift( $jsonld, $post_jsonld );
-
-		return $jsonld;
-	}
+    public function __construct() {
+        add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10 );
+    }
+
+    /**
+     * @param $jsonld array The final jsonld.
+     * @return array Filtered jsonld.
+     */
+    public function wl_after_get_jsonld( $jsonld ) {
+
+        if ( ! is_array( $jsonld )
+             || ! count( $jsonld ) > 1
+             || ! array_key_exists( 0, $jsonld ) ) {
+            // Return early if there are no referenced entities.
+            return $jsonld;
+        }
+
+        $post_jsonld = array_shift( $jsonld );
+
+        // we need to loop through all the items and remove the faq markup.
+        foreach ( $jsonld as $key => &$value ) {
+            if ( ! array_key_exists( '@type', $value ) ) {
+                continue;
+            }
+            $type = $value['@type'];
+
+            if ( ( is_string( $type ) && 'Article' !== $type )
+                 || ( is_array( $type ) && ! in_array( 'Article', $type, true ) ) ) {
+                continue;
+            }
+            // Video doesnt exist, dont try to remove it.
+            if ( ! array_key_exists( 'video', $value ) ) {
+                continue;
+            }
+            unset( $jsonld[ $key ]['video'] );
+        }
+
+        // Add the post jsonld to front of jsonld array.
+        array_unshift( $jsonld, $post_jsonld );
+
+        return $jsonld;
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -11,44 +11,44 @@
 class Videoobject_Duplicate_Remover {
 
 	public function __construct() {
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10 );
+		add_filter('wl_after_get_jsonld', array($this, 'wl_after_get_jsonld'), 10);
 	}
 
 	/**
 	 * @param $jsonld array The final jsonld.
 	 * @return array Filtered jsonld.
 	 */
-	public function wl_after_get_jsonld( $jsonld ) {
+	public function wl_after_get_jsonld($jsonld) {
 
-		if ( ! is_array( $jsonld )
-			 || ! count( $jsonld ) > 1
-			 || ! array_key_exists( 0, $jsonld ) ) {
+		if ( ! is_array($jsonld)
+			 || ! count($jsonld) > 1
+			 || ! array_key_exists(0, $jsonld)) {
 			// Return early if there are no referenced entities.
 			return $jsonld;
 		}
 
-		$post_jsonld = array_shift( $jsonld );
+		$post_jsonld = array_shift($jsonld);
 
 		// we need to loop through all the items and remove the faq markup.
-		foreach ( $jsonld as $key => &$value ) {
-			if ( ! array_key_exists( '@type', $value ) ) {
+		foreach ($jsonld as $key => &$value) {
+			if ( ! array_key_exists('@type', $value)) {
 				continue;
 			}
 			$type = $value['@type'];
 
-			if ( ( is_string( $type ) && 'Article' !== $type )
-				 || ( is_array( $type ) && ! in_array( 'Article', $type, true ) ) ) {
+			if ((is_string($type) && 'Article' !== $type)
+				 || (is_array($type) && ! in_array('Article', $type, true))) {
 				continue;
 			}
 			// Video doesnt exist, dont try to remove it.
-			if ( ! array_key_exists( 'video', $value ) ) {
+			if ( ! array_key_exists('video', $value)) {
 				continue;
 			}
-			unset( $jsonld[ $key ]['video'] );
+			unset($jsonld[$key]['video']);
 		}
 
 		// Add the post jsonld to front of jsonld array.
-		array_unshift( $jsonld, $post_jsonld );
+		array_unshift($jsonld, $post_jsonld);
 
 		return $jsonld;
 	}

src/wordlift/content/wordpress/class-wordpress-permalink-content-service.php

Indentation +139 added lines, -139 removed lines

@@ -9,65 +9,65 @@ 
 // phpcs:ignore WordPress.WP.CapitalPDangit.MisspelledClassName
 class Wordpress_Permalink_Content_Service implements Content_Service {
 
-	private static $instance = null;
-
-	protected function __construct() {
-	}
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @return Content_Service
-	 */
-	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * @param $uri string In the form https://example.org/path/post#post/1
-	 *
-	 * @return Wordpress_Content|null
-	 */
-	public function get_by_entity_id( $uri ) {
-		if ( ! preg_match( '@.*#(\w+)/(\d+)@', $uri, $matches ) ) {
-			return null;
-		}
-
-		$type_name = $matches[1];
-		$id        = $matches[2];
-		switch ( Object_Type_Enum::from_string( $type_name ) ) {
-			case Object_Type_Enum::POST:
-				return new Wordpress_Content( get_post( $id ) );
-			case Object_Type_Enum::TERM:
-				return new Wordpress_Content( get_term( $id ) );
-			case Object_Type_Enum::USER:
-				return new Wordpress_Content( get_user_by( 'ID', $id ) );
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get a
-	 *
-	 * @throws Exception in case of error.
-	 */
-	public function get_by_entity_id_or_same_as( $uri ) {
-		// If the URL is in the local site URL, then try to find a corresponding post.
-		if ( 0 === strpos( $uri, site_url() ) ) {
-			return $this->get_by_entity_id( $uri );
-		}
-
-		// Otherwise look in sameAs.
-		global $wpdb;
-
-		$row = $wpdb->get_row(
-			$wpdb->prepare(
-				"
+    private static $instance = null;
+
+    protected function __construct() {
+    }
+
+    /**
+     * The singleton instance.
+     *
+     * @return Content_Service
+     */
+    public static function get_instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * @param $uri string In the form https://example.org/path/post#post/1
+     *
+     * @return Wordpress_Content|null
+     */
+    public function get_by_entity_id( $uri ) {
+        if ( ! preg_match( '@.*#(\w+)/(\d+)@', $uri, $matches ) ) {
+            return null;
+        }
+
+        $type_name = $matches[1];
+        $id        = $matches[2];
+        switch ( Object_Type_Enum::from_string( $type_name ) ) {
+            case Object_Type_Enum::POST:
+                return new Wordpress_Content( get_post( $id ) );
+            case Object_Type_Enum::TERM:
+                return new Wordpress_Content( get_term( $id ) );
+            case Object_Type_Enum::USER:
+                return new Wordpress_Content( get_user_by( 'ID', $id ) );
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a
+     *
+     * @throws Exception in case of error.
+     */
+    public function get_by_entity_id_or_same_as( $uri ) {
+        // If the URL is in the local site URL, then try to find a corresponding post.
+        if ( 0 === strpos( $uri, site_url() ) ) {
+            return $this->get_by_entity_id( $uri );
+        }
+
+        // Otherwise look in sameAs.
+        global $wpdb;
+
+        $row = $wpdb->get_row(
+            $wpdb->prepare(
+                "
 			SELECT content_type, content_id
 			FROM (
 			    SELECT %d AS content_type, post_id AS content_id
@@ -84,84 +84,84 @@ 
 			) _tmp_same_as 
 			LIMIT 1
 		",
-				Object_Type_Enum::POST,
-				$uri,
-				Object_Type_Enum::TERM,
-				$uri,
-				Object_Type_Enum::USER,
-				$uri
-			)
-		);
-
-		if ( ! isset( $row ) ) {
-			return null;
-		}
-
-		switch ( (int) $row->content_type ) {
-			case Object_Type_Enum::POST:
-				return new Wordpress_Content( get_post( $row->content_id ) );
-			case Object_Type_Enum::TERM:
-				return new Wordpress_Content( get_term( $row->content_id ) );
-			case Object_Type_Enum::USER:
-				return new Wordpress_Content( get_user_by( 'ID', $row->content_id ) );
-			default:
-				return null;
-		}
-
-	}
-
-	/**
-	 * @param Wordpress_Content_Id $content_id
-	 *
-	 * @return string|void|null
-	 */
-	public function get_entity_id( $content_id ) {
-		$type = $content_id->get_type();
-		$id   = $content_id->get_id();
-
-		switch ( $type ) {
-			case Object_Type_Enum::POST:
-				$base_uri = get_permalink( $id );
-				break;
-			case Object_Type_Enum::TERM:
-				$base_uri = get_term_link( $id );
-				break;
-			case Object_Type_Enum::USER:
-				$base_uri = get_author_posts_url( $id );
-				break;
-			default:
-				return null;
-		}
-
-		$type_name = Object_Type_Enum::to_string( $type );
-
-		return "$base_uri#$type_name/$id";
-	}
-
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function set_entity_id( $content_id, $uri ) {
-		// do nothing.
-	}
-
-	/**
-	 * @param Wordpress_Content_Id $content_id
-	 *
-	 * @return bool|void
-	 */
-	public function supports( $content_id ) {
-		return in_array(
-			$content_id->get_type(),
-			array(
-				Object_Type_Enum::POST,
-				Object_Type_Enum::TERM,
-				Object_Type_Enum::USER,
-			),
-			true
-		);
-	}
-
-	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function delete( $content_id ) {
-		// Ignore, we don't store any data.
-	}
+                Object_Type_Enum::POST,
+                $uri,
+                Object_Type_Enum::TERM,
+                $uri,
+                Object_Type_Enum::USER,
+                $uri
+            )
+        );
+
+        if ( ! isset( $row ) ) {
+            return null;
+        }
+
+        switch ( (int) $row->content_type ) {
+            case Object_Type_Enum::POST:
+                return new Wordpress_Content( get_post( $row->content_id ) );
+            case Object_Type_Enum::TERM:
+                return new Wordpress_Content( get_term( $row->content_id ) );
+            case Object_Type_Enum::USER:
+                return new Wordpress_Content( get_user_by( 'ID', $row->content_id ) );
+            default:
+                return null;
+        }
+
+    }
+
+    /**
+     * @param Wordpress_Content_Id $content_id
+     *
+     * @return string|void|null
+     */
+    public function get_entity_id( $content_id ) {
+        $type = $content_id->get_type();
+        $id   = $content_id->get_id();
+
+        switch ( $type ) {
+            case Object_Type_Enum::POST:
+                $base_uri = get_permalink( $id );
+                break;
+            case Object_Type_Enum::TERM:
+                $base_uri = get_term_link( $id );
+                break;
+            case Object_Type_Enum::USER:
+                $base_uri = get_author_posts_url( $id );
+                break;
+            default:
+                return null;
+        }
+
+        $type_name = Object_Type_Enum::to_string( $type );
+
+        return "$base_uri#$type_name/$id";
+    }
+
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function set_entity_id( $content_id, $uri ) {
+        // do nothing.
+    }
+
+    /**
+     * @param Wordpress_Content_Id $content_id
+     *
+     * @return bool|void
+     */
+    public function supports( $content_id ) {
+        return in_array(
+            $content_id->get_type(),
+            array(
+                Object_Type_Enum::POST,
+                Object_Type_Enum::TERM,
+                Object_Type_Enum::USER,
+            ),
+            true
+        );
+    }
+
+    // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function delete( $content_id ) {
+        // Ignore, we don't store any data.
+    }
 }

Spacing +24 added lines, -24 removed lines

@@ -20,7 +20,7 @@ 
 	 * @return Content_Service
 	 */
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -32,20 +32,20 @@ 
 	 *
 	 * @return Wordpress_Content|null
 	 */
-	public function get_by_entity_id( $uri ) {
-		if ( ! preg_match( '@.*#(\w+)/(\d+)@', $uri, $matches ) ) {
+	public function get_by_entity_id($uri) {
+		if ( ! preg_match('@.*#(\w+)/(\d+)@', $uri, $matches)) {
 			return null;
 		}
 
 		$type_name = $matches[1];
 		$id        = $matches[2];
-		switch ( Object_Type_Enum::from_string( $type_name ) ) {
+		switch (Object_Type_Enum::from_string($type_name)) {
 			case Object_Type_Enum::POST:
-				return new Wordpress_Content( get_post( $id ) );
+				return new Wordpress_Content(get_post($id));
 			case Object_Type_Enum::TERM:
-				return new Wordpress_Content( get_term( $id ) );
+				return new Wordpress_Content(get_term($id));
 			case Object_Type_Enum::USER:
-				return new Wordpress_Content( get_user_by( 'ID', $id ) );
+				return new Wordpress_Content(get_user_by('ID', $id));
 		}
 
 		return null;
@@ -56,10 +56,10 @@ 
 	 *
 	 * @throws Exception in case of error.
 	 */
-	public function get_by_entity_id_or_same_as( $uri ) {
+	public function get_by_entity_id_or_same_as($uri) {
 		// If the URL is in the local site URL, then try to find a corresponding post.
-		if ( 0 === strpos( $uri, site_url() ) ) {
-			return $this->get_by_entity_id( $uri );
+		if (0 === strpos($uri, site_url())) {
+			return $this->get_by_entity_id($uri);
 		}
 
 		// Otherwise look in sameAs.
@@ -93,17 +93,17 @@ 
 			)
 		);
 
-		if ( ! isset( $row ) ) {
+		if ( ! isset($row)) {
 			return null;
 		}
 
-		switch ( (int) $row->content_type ) {
+		switch ((int) $row->content_type) {
 			case Object_Type_Enum::POST:
-				return new Wordpress_Content( get_post( $row->content_id ) );
+				return new Wordpress_Content(get_post($row->content_id));
 			case Object_Type_Enum::TERM:
-				return new Wordpress_Content( get_term( $row->content_id ) );
+				return new Wordpress_Content(get_term($row->content_id));
 			case Object_Type_Enum::USER:
-				return new Wordpress_Content( get_user_by( 'ID', $row->content_id ) );
+				return new Wordpress_Content(get_user_by('ID', $row->content_id));
 			default:
 				return null;
 		}
@@ -115,31 +115,31 @@ 
 	 *
 	 * @return string|void|null
 	 */
-	public function get_entity_id( $content_id ) {
+	public function get_entity_id($content_id) {
 		$type = $content_id->get_type();
 		$id   = $content_id->get_id();
 
-		switch ( $type ) {
+		switch ($type) {
 			case Object_Type_Enum::POST:
-				$base_uri = get_permalink( $id );
+				$base_uri = get_permalink($id);
 				break;
 			case Object_Type_Enum::TERM:
-				$base_uri = get_term_link( $id );
+				$base_uri = get_term_link($id);
 				break;
 			case Object_Type_Enum::USER:
-				$base_uri = get_author_posts_url( $id );
+				$base_uri = get_author_posts_url($id);
 				break;
 			default:
 				return null;
 		}
 
-		$type_name = Object_Type_Enum::to_string( $type );
+		$type_name = Object_Type_Enum::to_string($type);
 
 		return "$base_uri#$type_name/$id";
 	}
 
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function set_entity_id( $content_id, $uri ) {
+	public function set_entity_id($content_id, $uri) {
 		// do nothing.
 	}
 
@@ -148,7 +148,7 @@ 
 	 *
 	 * @return bool|void
 	 */
-	public function supports( $content_id ) {
+	public function supports($content_id) {
 		return in_array(
 			$content_id->get_type(),
 			array(
@@ -161,7 +161,7 @@ 
 	}
 
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	public function delete( $content_id ) {
+	public function delete($content_id) {
 		// Ignore, we don't store any data.
 	}
 }