insideout10 / wordlift-plugin

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

Indentation +171 added lines, -171 removed lines

@@ -4,177 +4,177 @@
 
 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'
-		),
-		'Product' => array(
-			'additionalProperty',
-			'aggregateRating',
-			'audience',
-			'award',
-			'brand',
-			'category',
-			'color',
-			'countryOfAssembly',
-			'countryOfLastProcessing',
-			'countryOfOrigin',
-			'depth',
-			'funding',
-			'gtin',
-			'gtin12',
-			'gtin13',
-			'gtin14',
-			'gtin8',
-			'hasAdultConsideration',
-			'hasEnergyConsumptionDetails',
-			'hasMeasurement',
-			'hasMerchantReturnPolicy',
-			'height',
-			'inProductGroupWithID',
-			'isAccessoryOrSparePartFor',
-			'isConsumableFor',
-			'isFamilyFriendly',
-			'isRelatedTo',
-			'isSimilarTo',
-			'isVariantOf',
-			'itemCondition',
-			'keywords',
-			'logo',
-			'manufacturer',
-			'material',
-			'model',
-			'mpn',
-			'nsn',
-			'offers',
-			'pattern',
-			'productID',
-			'productionDate',
-			'purchaseDate',
-			'releaseDate',
-			'review',
-			'size',
-			'sku',
-			'slogan',
-			'weight',
-			'width'
-		)
-	);
-
-	public function __construct() {
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10, 2 );
-	}
-
-
-	/**
-	 * @param $jsonld array The final jsonld.
-	 * @param $post_id int The post id.
-	 *
-	 * @return array Filtered jsonld.
-	 */
-	public function wl_after_get_jsonld( $jsonld, $post_id ) {
-
-		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, $type_to_remove ) {
-		return ! is_array( $jsonld )
-		       || ! count( $jsonld ) > 1
-		       || ! array_key_exists( 0, $jsonld )
-		       || ! $this->schema_type_matches_post( $jsonld, $type_to_remove );
-	}
-
-	/**
-	 * @param array $jsonld
-	 *
-	 * @return array
-	 */
-	private function remove_type( $jsonld, $type_to_remove, $properties_to_remove ) {
-
-
-		if ( $this->should_alter_jsonld( $jsonld, $type_to_remove ) ) {
-			// 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 ) ) {
-				// Remove the supplied SchemaType markup.
-				$position = array_search( $type_to_remove, $type );
-				// Also update the type.
-				if ( $position !== false ) {
-					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 function schema_type_matches_post( $jsonld, $type_to_remove ) {
-		$type = isset( $jsonld[0]['@type'] ) ? $jsonld[0]['@type'] : array();
-		if ( is_string( $type ) ) {
-			$type = array( $type );
-		}
-		return in_array( $type_to_remove, $type );
-	}
+    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'
+        ),
+        'Product' => array(
+            'additionalProperty',
+            'aggregateRating',
+            'audience',
+            'award',
+            'brand',
+            'category',
+            'color',
+            'countryOfAssembly',
+            'countryOfLastProcessing',
+            'countryOfOrigin',
+            'depth',
+            'funding',
+            'gtin',
+            'gtin12',
+            'gtin13',
+            'gtin14',
+            'gtin8',
+            'hasAdultConsideration',
+            'hasEnergyConsumptionDetails',
+            'hasMeasurement',
+            'hasMerchantReturnPolicy',
+            'height',
+            'inProductGroupWithID',
+            'isAccessoryOrSparePartFor',
+            'isConsumableFor',
+            'isFamilyFriendly',
+            'isRelatedTo',
+            'isSimilarTo',
+            'isVariantOf',
+            'itemCondition',
+            'keywords',
+            'logo',
+            'manufacturer',
+            'material',
+            'model',
+            'mpn',
+            'nsn',
+            'offers',
+            'pattern',
+            'productID',
+            'productionDate',
+            'purchaseDate',
+            'releaseDate',
+            'review',
+            'size',
+            'sku',
+            'slogan',
+            'weight',
+            'width'
+        )
+    );
+
+    public function __construct() {
+        add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10, 2 );
+    }
+
+
+    /**
+     * @param $jsonld array The final jsonld.
+     * @param $post_id int The post id.
+     *
+     * @return array Filtered jsonld.
+     */
+    public function wl_after_get_jsonld( $jsonld, $post_id ) {
+
+        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, $type_to_remove ) {
+        return ! is_array( $jsonld )
+               || ! count( $jsonld ) > 1
+               || ! array_key_exists( 0, $jsonld )
+               || ! $this->schema_type_matches_post( $jsonld, $type_to_remove );
+    }
+
+    /**
+     * @param array $jsonld
+     *
+     * @return array
+     */
+    private function remove_type( $jsonld, $type_to_remove, $properties_to_remove ) {
+
+
+        if ( $this->should_alter_jsonld( $jsonld, $type_to_remove ) ) {
+            // 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 ) ) {
+                // Remove the supplied SchemaType markup.
+                $position = array_search( $type_to_remove, $type );
+                // Also update the type.
+                if ( $position !== false ) {
+                    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 function schema_type_matches_post( $jsonld, $type_to_remove ) {
+        $type = isset( $jsonld[0]['@type'] ) ? $jsonld[0]['@type'] : array();
+        if ( is_string( $type ) ) {
+            $type = array( $type );
+        }
+        return in_array( $type_to_remove, $type );
+    }
 
 
 }
\ No newline at end of file

Spacing +30 added lines, -30 removed lines

@@ -12,7 +12,7 @@ 
 			'tool',
 			'step'
 		),
-		'FAQPage' => array( 'mainEntity' ),
+		'FAQPage' => array('mainEntity'),
 		'Recipe'  => array(
 			'cookTime',
 			'cookingMethod',
@@ -78,7 +78,7 @@ 
 	);
 
 	public function __construct() {
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 10, 2 );
+		add_filter('wl_after_get_jsonld', array($this, 'wl_after_get_jsonld'), 10, 2);
 	}
 
 
@@ -88,10 +88,10 @@ 
 	 *
 	 * @return array Filtered jsonld.
 	 */
-	public function wl_after_get_jsonld( $jsonld, $post_id ) {
+	public function wl_after_get_jsonld($jsonld, $post_id) {
 
-		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;
@@ -103,11 +103,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function should_alter_jsonld( $jsonld, $type_to_remove ) {
-		return ! is_array( $jsonld )
-		       || ! count( $jsonld ) > 1
-		       || ! array_key_exists( 0, $jsonld )
-		       || ! $this->schema_type_matches_post( $jsonld, $type_to_remove );
+	protected function should_alter_jsonld($jsonld, $type_to_remove) {
+		return ! is_array($jsonld)
+		       || ! count($jsonld) > 1
+		       || ! array_key_exists(0, $jsonld)
+		       || ! $this->schema_type_matches_post($jsonld, $type_to_remove);
 	}
 
 	/**
@@ -115,19 +115,19 @@ 
 	 *
 	 * @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, $type_to_remove ) ) {
+		if ($this->should_alter_jsonld($jsonld, $type_to_remove)) {
 			// 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'];
@@ -140,40 +140,40 @@ 
 			 */
 			// 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 ) ) {
+			if (is_array($type) && in_array($type_to_remove, $type)) {
 				// Remove the supplied SchemaType markup.
-				$position = array_search( $type_to_remove, $type );
+				$position = array_search($type_to_remove, $type);
 				// Also update the type.
-				if ( $position !== false ) {
-					unset( $type[ $position ] );
-					$value['@type'] = array_values( $type );
+				if ($position !== false) {
+					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;
 	}
 
-	private function schema_type_matches_post( $jsonld, $type_to_remove ) {
-		$type = isset( $jsonld[0]['@type'] ) ? $jsonld[0]['@type'] : array();
-		if ( is_string( $type ) ) {
-			$type = array( $type );
+	private function schema_type_matches_post($jsonld, $type_to_remove) {
+		$type = isset($jsonld[0]['@type']) ? $jsonld[0]['@type'] : array();
+		if (is_string($type)) {
+			$type = array($type);
 		}
-		return in_array( $type_to_remove, $type );
+		return in_array($type_to_remove, $type);
 	}