Completed
Pull Request — develop (#1701)
by
unknown
01:26
created
src/public/class-wordlift-term-jsonld-adapter.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
 	 *
51 51
 	 * @since 3.20.0
52 52
 	 */
53
-	public function __construct( $entity_uri_service, $post_id_to_jsonld_converter ) {
53
+	public function __construct($entity_uri_service, $post_id_to_jsonld_converter) {
54 54
 
55
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
55
+		add_action('wp_head', array($this, 'wp_head'));
56 56
 
57 57
 		$this->entity_uri_service          = $entity_uri_service;
58 58
 		$this->post_id_to_jsonld_converter = $post_id_to_jsonld_converter;
@@ -74,31 +74,31 @@  discard block
 block discarded – undo
74 74
 	 *
75 75
 	 * @return array|boolean
76 76
 	 */
77
-	public function get_carousel_jsonld( $id = null ) {
78
-		$posts       = $this->get_posts( $id );
77
+	public function get_carousel_jsonld($id = null) {
78
+		$posts       = $this->get_posts($id);
79 79
 		$post_jsonld = array();
80
-		if ( ! is_array( $posts ) || count( $posts ) < 2 ) {
80
+		if ( ! is_array($posts) || count($posts) < 2) {
81 81
 			// Bail out if no posts are present.
82 82
 			return false;
83 83
 		}
84 84
 
85
-		if ( $id !== null ) {
86
-			$term                       = get_term( $id );
87
-			$post_jsonld['description'] = wp_strip_all_tags( strip_shortcodes( $term->description ) );
88
-			$thumbnail_id               = get_term_meta( $id, 'thumbnail_id', true );
89
-			if ( ! empty( $thumbnail_id ) ) {
90
-				$post_jsonld['image'] = wp_get_attachment_url( $thumbnail_id );
85
+		if ($id !== null) {
86
+			$term                       = get_term($id);
87
+			$post_jsonld['description'] = wp_strip_all_tags(strip_shortcodes($term->description));
88
+			$thumbnail_id               = get_term_meta($id, 'thumbnail_id', true);
89
+			if ( ! empty($thumbnail_id)) {
90
+				$post_jsonld['image'] = wp_get_attachment_url($thumbnail_id);
91 91
 			}
92 92
 		}
93 93
 
94 94
 		// More than 2 items are present, so construct the post_jsonld data
95 95
 		$post_jsonld['@context']        = 'https://schema.org';
96 96
 		$post_jsonld['@type']           = 'ItemList';
97
-		$post_jsonld['url']             = $this->get_term_url( $id );
97
+		$post_jsonld['url']             = $this->get_term_url($id);
98 98
 		$post_jsonld['itemListElement'] = array();
99 99
 		$position                       = 1;
100 100
 
101
-		foreach ( $posts as $post_id ) {
101
+		foreach ($posts as $post_id) {
102 102
 			$result = array(
103 103
 				'@type'    => 'ListItem',
104 104
 				'position' => $position,
@@ -107,10 +107,10 @@  discard block
 block discarded – undo
107 107
 				 *
108 108
 				 * See https://developers.google.com/search/docs/data-types/carousel
109 109
 				 */
110
-				'url'      => apply_filters( 'wl_carousel_post_list_item_url', get_permalink( $post_id ), $post_id ),
110
+				'url'      => apply_filters('wl_carousel_post_list_item_url', get_permalink($post_id), $post_id),
111 111
 			);
112
-			array_push( $post_jsonld['itemListElement'], $result );
113
-			++ $position;
112
+			array_push($post_jsonld['itemListElement'], $result);
113
+			++$position;
114 114
 		}
115 115
 
116 116
 		return $post_jsonld;
@@ -123,25 +123,25 @@  discard block
 block discarded – undo
123 123
 	 *
124 124
 	 * @return array|int[]|string[]|WP_Error|null
125 125
 	 */
126
-	private function get_posts( $id ) {
126
+	private function get_posts($id) {
127 127
 		global $wp_query;
128 128
 
129
-		if ( $wp_query->posts !== null ) {
129
+		if ($wp_query->posts !== null) {
130 130
 			return array_map(
131
-				function ( $post ) {
131
+				function($post) {
132 132
 					return $post->ID;
133 133
 				},
134 134
 				$wp_query->posts
135 135
 			);
136 136
 		}
137 137
 
138
-		if ( $id === null ) {
138
+		if ($id === null) {
139 139
 			return null;
140 140
 		}
141 141
 
142
-		$term = get_term( $id );
142
+		$term = get_term($id);
143 143
 
144
-		return get_objects_in_term( $id, $term->taxonomy );
144
+		return get_objects_in_term($id, $term->taxonomy);
145 145
 	}
146 146
 
147 147
 	/**
@@ -153,28 +153,28 @@  discard block
 block discarded – undo
153 153
 		$query_object = get_queried_object();
154 154
 
155 155
 		// Check if it is a term page.
156
-		if ( ! $query_object instanceof WP_Term ) {
156
+		if ( ! $query_object instanceof WP_Term) {
157 157
 			return;
158 158
 		}
159 159
 
160 160
 		// Bail out if `wl_jsonld_enabled` isn't enabled.
161
-		if ( ! apply_filters( 'wl_jsonld_enabled', true ) ) {
161
+		if ( ! apply_filters('wl_jsonld_enabled', true)) {
162 162
 			return;
163 163
 		}
164 164
 
165 165
 		$term_id = $query_object->term_id;
166 166
 
167
-		$jsonld = $this->get( $term_id, Jsonld_Context_Enum::PAGE );
167
+		$jsonld = $this->get($term_id, Jsonld_Context_Enum::PAGE);
168 168
 
169 169
 		// Bail out if the JSON-LD is empty.
170
-		if ( empty( $jsonld ) ) {
170
+		if (empty($jsonld)) {
171 171
 			return;
172 172
 		}
173 173
 
174
-		$jsonld_string = wp_json_encode( $jsonld );
174
+		$jsonld_string = wp_json_encode($jsonld);
175 175
 
176
-		$jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">' . $jsonld_string . '</script>';
177
-		$jsonld_term_html_output = apply_filters( 'wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id );
176
+		$jsonld_term_html_output = '<script type="application/ld+json" id="wl-jsonld-term">'.$jsonld_string.'</script>';
177
+		$jsonld_term_html_output = apply_filters('wl_jsonld_term_html_output', $jsonld_term_html_output, $term_id);
178 178
 
179 179
 		echo $jsonld_term_html_output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- It's an application/ld+json output.
180 180
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	 *
190 190
 	 * @return array
191 191
 	 */
192
-	public function get( $id, $context, $is_recursive_call = false ) {
192
+	public function get($id, $context, $is_recursive_call = false) {
193 193
 		/**
194 194
 		 * Support for carousel rich snippet, get jsonld data present
195 195
 		 * for all the posts shown in the term page, and add the jsonld data
@@ -201,17 +201,17 @@  discard block
 block discarded – undo
201 201
 		 */
202 202
 		$jsonld_array = array();
203 203
 
204
-		if ( Jsonld_Context_Enum::PAGE === $context ) {
205
-			$carousel_data = $this->get_carousel_jsonld( $id );
206
-			if ( $carousel_data ) {
204
+		if (Jsonld_Context_Enum::PAGE === $context) {
205
+			$carousel_data = $this->get_carousel_jsonld($id);
206
+			if ($carousel_data) {
207 207
 				$jsonld_array[] = $carousel_data;
208 208
 			}
209 209
 		}
210 210
 
211
-		$entities_jsonld_array = $this->get_entity_jsonld( $id, $context );
211
+		$entities_jsonld_array = $this->get_entity_jsonld($id, $context);
212 212
 
213 213
 		$result = array(
214
-			'jsonld'     => array_merge( $jsonld_array, $entities_jsonld_array ),
214
+			'jsonld'     => array_merge($jsonld_array, $entities_jsonld_array),
215 215
 			'references' => array(),
216 216
 		);
217 217
 
@@ -222,20 +222,20 @@  discard block
 block discarded – undo
222 222
 		 * @var $jsonld_array array An array containing jsonld for term and entities.
223 223
 		 * @var $context int A context for the JSON-LD generation, valid values in Jsonld_Context_Enum
224 224
 		 */
225
-		$arr = apply_filters( 'wl_term_jsonld_array', $result, $id, $context );
225
+		$arr = apply_filters('wl_term_jsonld_array', $result, $id, $context);
226 226
 
227 227
 		$references = array();
228 228
 
229 229
 		// Don't expand nested references, it will lead to an infinite loop.
230
-		if ( ! $is_recursive_call ) {
230
+		if ( ! $is_recursive_call) {
231 231
 			/**
232 232
 			 * @since 3.32.0
233 233
 			 * Expand the references returned by this filter.
234 234
 			 */
235
-			$references = $this->expand_references( $arr['references'] );
235
+			$references = $this->expand_references($arr['references']);
236 236
 		}
237 237
 
238
-		$jsonld_array = array_merge( $arr['jsonld'], $references );
238
+		$jsonld_array = array_merge($arr['jsonld'], $references);
239 239
 
240 240
 		return $jsonld_array;
241 241
 	}
@@ -247,17 +247,17 @@  discard block
 block discarded – undo
247 247
 	 *
248 248
 	 * @return array|false|int|mixed|string|WP_Error|WP_Term|null
249 249
 	 */
250
-	private function get_term_url( $id ) {
251
-		if ( null === $id ) {
252
-			return isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ), FILTER_SANITIZE_URL ) : '';
250
+	private function get_term_url($id) {
251
+		if (null === $id) {
252
+			return isset($_SERVER['REQUEST_URI']) ? filter_var(wp_unslash($_SERVER['REQUEST_URI']), FILTER_SANITIZE_URL) : '';
253 253
 		}
254 254
 
255
-		$maybe_url = get_term_meta( $id, Wordlift_Url_Property_Service::META_KEY, true );
256
-		if ( ! empty( $maybe_url ) ) {
255
+		$maybe_url = get_term_meta($id, Wordlift_Url_Property_Service::META_KEY, true);
256
+		if ( ! empty($maybe_url)) {
257 257
 			return $maybe_url;
258 258
 		}
259 259
 
260
-		return get_term_link( $id );
260
+		return get_term_link($id);
261 261
 	}
262 262
 
263 263
 	/**
@@ -269,30 +269,30 @@  discard block
 block discarded – undo
269 269
 	 * @return array
270 270
 	 */
271 271
 	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
272
-	private function get_entity_jsonld( $term_id, $context ) {
272
+	private function get_entity_jsonld($term_id, $context) {
273 273
 
274 274
 		// The `_wl_entity_id` are URIs.
275
-		$entity_ids         = get_term_meta( $term_id, '_wl_entity_id' );
275
+		$entity_ids         = get_term_meta($term_id, '_wl_entity_id');
276 276
 		$entity_uri_service = $this->entity_uri_service;
277 277
 
278 278
 		$wordlift_jsonld_service = Wordlift_Jsonld_Service::get_instance();
279 279
 
280 280
 		$local_entity_ids = array_filter(
281 281
 			$entity_ids,
282
-			function ( $uri ) use ( $entity_uri_service ) {
283
-				return $entity_uri_service->is_internal( $uri );
282
+			function($uri) use ($entity_uri_service) {
283
+				return $entity_uri_service->is_internal($uri);
284 284
 			}
285 285
 		);
286 286
 
287 287
 		// Bail out if there are no entities.
288
-		if ( empty( $local_entity_ids ) ) {
288
+		if (empty($local_entity_ids)) {
289 289
 			return array();
290 290
 		}
291 291
 
292
-		$post            = $this->entity_uri_service->get_entity( array_shift( $local_entity_ids ) );
293
-		$entities_jsonld = $wordlift_jsonld_service->get_jsonld( false, $post->ID );
292
+		$post            = $this->entity_uri_service->get_entity(array_shift($local_entity_ids));
293
+		$entities_jsonld = $wordlift_jsonld_service->get_jsonld(false, $post->ID);
294 294
 		// Reset the `url` to the term page.
295
-		$entities_jsonld[0]['url'] = get_term_link( $term_id );
295
+		$entities_jsonld[0]['url'] = get_term_link($term_id);
296 296
 
297 297
 		return $entities_jsonld;
298 298
 	}
@@ -302,24 +302,24 @@  discard block
 block discarded – undo
302 302
 	 *
303 303
 	 * @return array
304 304
 	 */
305
-	private function expand_references( $references ) {
306
-		if ( ! is_array( $references ) ) {
305
+	private function expand_references($references) {
306
+		if ( ! is_array($references)) {
307 307
 			return array();
308 308
 		}
309 309
 		$references_jsonld = array();
310 310
 		// Expand the references.
311
-		foreach ( $references as $reference ) {
312
-			if ( $reference instanceof Term_Reference ) {
311
+		foreach ($references as $reference) {
312
+			if ($reference instanceof Term_Reference) {
313 313
 				// Second level references won't be expanded.
314
-				$references_jsonld[] = current( $this->get( $reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true ) );
315
-			} elseif ( is_numeric( $reference ) ) {
314
+				$references_jsonld[] = current($this->get($reference->get_id(), Jsonld_Context_Enum::UNKNOWN, true));
315
+			} elseif (is_numeric($reference)) {
316 316
 				$ref_2               = array();
317 317
 				$ref_info_2          = array();
318
-				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $reference, $ref_2, $ref_info_2, new Relations() );
319
-			} elseif ( $reference instanceof Post_Reference ) {
318
+				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert($reference, $ref_2, $ref_info_2, new Relations());
319
+			} elseif ($reference instanceof Post_Reference) {
320 320
 				$ref_2               = array();
321 321
 				$ref_info_2          = array();
322
-				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert( $reference->get_id(), $ref_2, $ref_info_2, new Relations() );
322
+				$references_jsonld[] = $this->post_id_to_jsonld_converter->convert($reference->get_id(), $ref_2, $ref_info_2, new Relations());
323 323
 			}
324 324
 		}
325 325
 
Please login to merge, or discard this patch.
src/includes/class-wordlift-jsonld-service.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	 *
258 258
 	 * @since 3.8.0
259 259
 	 */
260
-	public function __construct( $entity_service, $converter, $website_converter, $term_jsonld_adapter ) {
260
+	public function __construct($entity_service, $converter, $website_converter, $term_jsonld_adapter) {
261 261
 		$this->entity_service      = $entity_service;
262 262
 		$this->converter           = $converter;
263 263
 		$this->website_converter   = $website_converter;
@@ -290,11 +290,11 @@  discard block
 block discarded – undo
290 290
 		@ob_clean();
291 291
 
292 292
 		// Get the parameter from the request.
293
-		$is_homepage = isset( $_REQUEST['homepage'] ); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
294
-		$post_id     = isset( $_REQUEST['id'] ) && is_numeric( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
293
+		$is_homepage = isset($_REQUEST['homepage']); //phpcs:ignore WordPress.Security.NonceVerification.Recommended
294
+		$post_id     = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? intval($_REQUEST['id']) : null; //phpcs:ignore WordPress.Security.NonceVerification.Recommended
295 295
 
296 296
 		// Send the generated JSON-LD.
297
-		$this->send_jsonld( $this->get_jsonld( $is_homepage, $post_id ) );
297
+		$this->send_jsonld($this->get_jsonld($is_homepage, $post_id));
298 298
 
299 299
 	}
300 300
 
@@ -306,11 +306,11 @@  discard block
 block discarded – undo
306 306
 	 *
307 307
 	 * @since 3.18.5
308 308
 	 */
309
-	private function send_jsonld( $response ) {
309
+	private function send_jsonld($response) {
310 310
 		// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
311
-		@header( 'Content-Type: application/ld+json; charset=' . get_option( 'blog_charset' ) );
312
-		echo wp_json_encode( $response );
313
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
311
+		@header('Content-Type: application/ld+json; charset='.get_option('blog_charset'));
312
+		echo wp_json_encode($response);
313
+		if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX)) {
314 314
 			wp_die();
315 315
 		} else {
316 316
 			die;
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 	 * @return array A JSON-LD structure.
328 328
 	 * @since 3.15.1
329 329
 	 */
330
-	public function get_jsonld( $is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN ) {
330
+	public function get_jsonld($is_homepage = false, $post_id = null, $context = Jsonld_Context_Enum::UNKNOWN) {
331 331
 		// Tell NewRelic to ignore us, otherwise NewRelic customers might receive
332 332
 		// e-mails with a low apdex score.
333 333
 		//
@@ -335,14 +335,14 @@  discard block
 block discarded – undo
335 335
 		Wordlift_NewRelic_Adapter::ignore_apdex();
336 336
 
337 337
 		// Switch to Website converter if is home page.
338
-		if ( $is_homepage ) {
338
+		if ($is_homepage) {
339 339
 			/**
340 340
 			 * Filter: 'wordlift_disable_website_json_ld' - Allow disabling of the json+ld output.
341 341
 			 *
342 342
 			 * @since  3.14.0
343 343
 			 * @api    bool $display_search Whether or not to display json+ld search on the frontend.
344 344
 			 */
345
-			if ( apply_filters( 'wordlift_disable_website_json_ld', false ) ) {
345
+			if (apply_filters('wordlift_disable_website_json_ld', false)) {
346 346
 				return array();
347 347
 			}
348 348
 
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 		}
355 355
 
356 356
 		// If no id has been provided return an empty array.
357
-		if ( ! isset( $post_id ) ) {
357
+		if ( ! isset($post_id)) {
358 358
 			return array();
359 359
 		}
360 360
 
@@ -367,32 +367,32 @@  discard block
 block discarded – undo
367 367
 		$entity_to_jsonld_converter = $this->converter;
368 368
 
369 369
 		$relations = new Relations();
370
-		$jsonld    = $entity_to_jsonld_converter->convert( $post_id, $references, $references_infos, $relations );
370
+		$jsonld    = $entity_to_jsonld_converter->convert($post_id, $references, $references_infos, $relations);
371 371
 
372
-		$graph = new Graph( $jsonld, $entity_to_jsonld_converter, Wordlift_Term_JsonLd_Adapter::get_instance() );
372
+		$graph = new Graph($jsonld, $entity_to_jsonld_converter, Wordlift_Term_JsonLd_Adapter::get_instance());
373 373
 
374
-		$schema_type = is_array( $jsonld['@type'] ) ? $jsonld['@type'] : array( $jsonld['@type'] );
374
+		$schema_type = is_array($jsonld['@type']) ? $jsonld['@type'] : array($jsonld['@type']);
375 375
 
376 376
 		// Add `about`/`mentions` only for `CreativeWork` and descendants.
377
-		if ( array_intersect( $schema_type, self::$creative_work_types ) ) {
377
+		if (array_intersect($schema_type, self::$creative_work_types)) {
378 378
 
379
-			foreach ( $relations->toArray() as $relation ) {
379
+			foreach ($relations->toArray() as $relation) {
380 380
 
381 381
 				// Setting about or mentions by label match is currently supported only for posts
382
-				if ( Object_Type_Enum::POST !== $relation->get_object()->get_type() ) {
382
+				if (Object_Type_Enum::POST !== $relation->get_object()->get_type()) {
383 383
 					continue;
384 384
 				}
385 385
 
386 386
 				// Add the `mentions`/`about` prop.
387
-				$this->add_mention_or_about( $jsonld, $post_id, $relation );
387
+				$this->add_mention_or_about($jsonld, $post_id, $relation);
388 388
 			}
389
-			$graph->set_main_jsonld( $jsonld );
389
+			$graph->set_main_jsonld($jsonld);
390 390
 		}
391 391
 
392
-		$jsonld_arr = $graph->add_references( $references )
393
-			->add_relations( $relations )
394
-			->add_required_reference_infos( $references_infos )
395
-			->render( $context );
392
+		$jsonld_arr = $graph->add_references($references)
393
+			->add_relations($relations)
394
+			->add_required_reference_infos($references_infos)
395
+			->render($context);
396 396
 
397 397
 		/**
398 398
 		 * Filter name: wl_after_get_jsonld
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
 		 * @var $jsonld_arr array The final jsonld before outputting to page.
403 403
 		 * @var $post_id int The post id for which the jsonld is generated.
404 404
 		 */
405
-		$jsonld_arr = apply_filters( 'wl_after_get_jsonld', $jsonld_arr, $post_id, $context );
405
+		$jsonld_arr = apply_filters('wl_after_get_jsonld', $jsonld_arr, $post_id, $context);
406 406
 
407 407
 		return $jsonld_arr;
408 408
 	}
@@ -421,9 +421,9 @@  discard block
 block discarded – undo
421 421
 		$is_homepage = is_home() || is_front_page();
422 422
 		$post_id     = is_singular() ? get_the_ID() : null;
423 423
 
424
-		$jsonld = wp_json_encode( $this->get_jsonld( $is_homepage, $post_id, Jsonld_Context_Enum::PAGE ) );
424
+		$jsonld = wp_json_encode($this->get_jsonld($is_homepage, $post_id, Jsonld_Context_Enum::PAGE));
425 425
 		?>
426
-		<script type="application/ld+json"><?php echo esc_html( $jsonld ); ?></script>
426
+		<script type="application/ld+json"><?php echo esc_html($jsonld); ?></script>
427 427
 		<?php
428 428
 	}
429 429
 
@@ -433,17 +433,17 @@  discard block
 block discarded – undo
433 433
 	 *
434 434
 	 * @return void
435 435
 	 */
436
-	private function add_mention_or_about( &$jsonld, $post_id, $relation ) {
436
+	private function add_mention_or_about(&$jsonld, $post_id, $relation) {
437 437
 		$content_service = Wordpress_Content_Service::get_instance();
438 438
 		$entity_service  = Wordlift_Entity_Service::get_instance();
439 439
 
440 440
 		$object     = $relation->get_object();
441
-		$entity_uri = $content_service->get_entity_id( $object );
442
-		$labels     = $entity_service->get_labels( $object->get_id(), $object->get_type() );
441
+		$entity_uri = $content_service->get_entity_id($object);
442
+		$labels     = $entity_service->get_labels($object->get_id(), $object->get_type());
443 443
 
444 444
 		$escaped_labels = array_map(
445
-			function ( $value ) {
446
-				return preg_quote( $value, '/' );
445
+			function($value) {
446
+				return preg_quote($value, '/');
447 447
 			},
448 448
 			$labels
449 449
 		);
@@ -451,17 +451,17 @@  discard block
 block discarded – undo
451 451
 		$matches = false;
452 452
 
453 453
 		// When the title is empty, then we shouldn't yield a match to about section.
454
-		if ( array_filter( $escaped_labels ) ) {
454
+		if (array_filter($escaped_labels)) {
455 455
 			// Check if the labels match any part of the title.
456
-			$post    = get_post( $post_id );
457
-			$matches = $this->check_title_match( $escaped_labels, $post->post_title );
456
+			$post    = get_post($post_id);
457
+			$matches = $this->check_title_match($escaped_labels, $post->post_title);
458 458
 		}
459 459
 
460
-		if ( $entity_uri ) {
460
+		if ($entity_uri) {
461 461
 			// If the title matches, assign the entity to the about, otherwise to the mentions.
462 462
 			$property_name              = $matches ? 'about' : 'mentions';
463
-			$jsonld[ $property_name ]   = isset( $jsonld[ $property_name ] ) ? (array) $jsonld[ $property_name ] : array();
464
-			$jsonld[ $property_name ][] = array( '@id' => $entity_uri );
463
+			$jsonld[$property_name]   = isset($jsonld[$property_name]) ? (array) $jsonld[$property_name] : array();
464
+			$jsonld[$property_name][] = array('@id' => $entity_uri);
465 465
 		}
466 466
 
467 467
 	}
@@ -474,15 +474,15 @@  discard block
 block discarded – undo
474 474
 	 *
475 475
 	 * @return boolean
476 476
 	 */
477
-	public function check_title_match( $labels, $title ) {
477
+	public function check_title_match($labels, $title) {
478 478
 
479 479
 		// If the title is empty, then we shouldn't yield a match to about section.
480
-		if ( empty( $title ) ) {
480
+		if (empty($title)) {
481 481
 			return false;
482 482
 		}
483 483
 
484 484
 		// Check if the labels match any part of the title.
485
-		return 1 === preg_match( '/\b(' . implode( '|', $labels ) . ')\b/iu', $title );
485
+		return 1 === preg_match('/\b('.implode('|', $labels).')\b/iu', $title);
486 486
 
487 487
 	}
488 488
 
Please login to merge, or discard this patch.
src/classes/vocabulary/jsonld/class-term-jsonld.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 	public function init() {
33 33
 		$this->api_service = Default_Api_Service::get_instance();
34 34
 
35
-		add_filter( 'wl_term_jsonld_array', array( $this, 'wl_term_jsonld_array' ), 10, 2 );
36
-		add_filter( 'wl_term_jsonld_array', array( $this, 'wl_term_jsonld_array_event' ), 90, 3 );
35
+		add_filter('wl_term_jsonld_array', array($this, 'wl_term_jsonld_array'), 10, 2);
36
+		add_filter('wl_term_jsonld_array', array($this, 'wl_term_jsonld_array_event'), 90, 3);
37 37
 	}
38 38
 
39 39
 	/**
@@ -44,23 +44,23 @@  discard block
 block discarded – undo
44 44
 	 *
45 45
 	 * @return array|mixed
46 46
 	 */
47
-	public function wl_term_jsonld_array( $jsonld_array, $term_id ) {
47
+	public function wl_term_jsonld_array($jsonld_array, $term_id) {
48 48
 
49
-		$entities = Jsonld_Utils::get_matched_entities_for_term( $term_id );
49
+		$entities = Jsonld_Utils::get_matched_entities_for_term($term_id);
50 50
 
51
-		if ( count( $entities ) > 0 ) {
52
-			$entity             = array_shift( $entities );
51
+		if (count($entities) > 0) {
52
+			$entity             = array_shift($entities);
53 53
 			$entity['@context'] = 'http://schema.org';
54 54
 
55
-			$term_link = get_term_link( $term_id );
56
-			if ( is_wp_error( $term_link ) ) {
57
-				Wordlift_Log_Service::get_logger( get_class() )
58
-					->error( "Term $term_id returned an error: " . $term_link->get_error_message() );
55
+			$term_link = get_term_link($term_id);
56
+			if (is_wp_error($term_link)) {
57
+				Wordlift_Log_Service::get_logger(get_class())
58
+					->error("Term $term_id returned an error: ".$term_link->get_error_message());
59 59
 
60 60
 				return $jsonld_array;
61 61
 			}
62 62
 
63
-			$entity['@id']              = $term_link . '/#id';
63
+			$entity['@id']              = $term_link.'/#id';
64 64
 			$entity['url']              = $term_link;
65 65
 			$entity['mainEntityOfPage'] = $term_link;
66 66
 			$jsonld_array['jsonld'][]   = $entity;
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
78 78
 	 *
79 79
 	 * @return array
80 80
 	 */
81
-	public function wl_term_jsonld_array_event( $jsonld_arr, $term_id, $context ) {
81
+	public function wl_term_jsonld_array_event($jsonld_arr, $term_id, $context) {
82 82
 		// If context is not PAGE or the array is empty, return early.
83
-		if ( Jsonld_Context_Enum::PAGE !== $context || empty( $jsonld_arr[0] ) ) {
83
+		if (Jsonld_Context_Enum::PAGE !== $context || empty($jsonld_arr[0])) {
84 84
 			return $jsonld_arr;
85 85
 		}
86 86
 
@@ -92,47 +92,47 @@  discard block
 block discarded – undo
92 92
 
93 93
 		// Fetch the initial 'about' and 'mentions' counts from term meta.
94 94
 		$counts = array(
95
-			'about'    => get_term_meta( $term_id, 'wl_about_count', true ) ? get_term_meta( $term_id, 'wl_about_count', true ) : 0,
96
-			'mentions' => get_term_meta( $term_id, 'wl_mentions_count', true ) ? get_term_meta( $term_id, 'wl_mentions_count', true ) : 0,
95
+			'about'    => get_term_meta($term_id, 'wl_about_count', true) ? get_term_meta($term_id, 'wl_about_count', true) : 0,
96
+			'mentions' => get_term_meta($term_id, 'wl_mentions_count', true) ? get_term_meta($term_id, 'wl_mentions_count', true) : 0,
97 97
 		);
98 98
 
99 99
 		// Iterate over the counts array.
100
-		foreach ( $counts as $key => $count ) {
100
+		foreach ($counts as $key => $count) {
101 101
 			// Check if data has 'about' or 'mentions' and the count is different from the existing meta value.
102
-			if ( ! empty( $data[ $key ] ) ) {
103
-				$new_count = count( $data[ $key ] );
104
-				if ( $count !== $new_count ) {
102
+			if ( ! empty($data[$key])) {
103
+				$new_count = count($data[$key]);
104
+				if ($count !== $new_count) {
105 105
 					// Set flag to true if counts have changed.
106 106
 					$change_status = true;
107 107
 
108 108
 					// Update the counts array with new count.
109
-					$counts[ $key ] = $new_count;
109
+					$counts[$key] = $new_count;
110 110
 
111 111
 					// Update term meta with new count.
112
-					update_term_meta( $term_id, 'wl_' . $key . '_count', $new_count );
112
+					update_term_meta($term_id, 'wl_'.$key.'_count', $new_count);
113 113
 				}
114 114
 			}
115 115
 		}
116 116
 
117 117
 		// If the count has changed, make the API request.
118
-		if ( $change_status ) {
118
+		if ($change_status) {
119 119
 			$this->api_service->request(
120 120
 				'POST',
121 121
 				'/plugin/events',
122
-				array( 'Content-Type' => 'application/json' ),
122
+				array('Content-Type' => 'application/json'),
123 123
 				wp_json_encode(
124 124
 					array(
125 125
 						'source' => 'jsonld',
126 126
 						'args'   => array(
127
-							array( 'about_count' => $counts['about'] ),
128
-							array( 'mentions_count' => $counts['mentions'] ),
127
+							array('about_count' => $counts['about']),
128
+							array('mentions_count' => $counts['mentions']),
129 129
 						),
130
-						'url'    => $this->get_term_url( $term_id ),
130
+						'url'    => $this->get_term_url($term_id),
131 131
 					)
132 132
 				),
133 133
 				0.001,
134 134
 				null,
135
-				array( 'blocking' => false )
135
+				array('blocking' => false)
136 136
 			);
137 137
 		}
138 138
 
@@ -146,17 +146,17 @@  discard block
 block discarded – undo
146 146
 	 *
147 147
 	 * @return array|false|int|mixed|string|\WP_Error|\WP_Term|null
148 148
 	 */
149
-	private function get_term_url( $id ) {
150
-		if ( null === $id ) {
151
-			return isset( $_SERVER['REQUEST_URI'] ) ? filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ), FILTER_SANITIZE_URL ) : '';
149
+	private function get_term_url($id) {
150
+		if (null === $id) {
151
+			return isset($_SERVER['REQUEST_URI']) ? filter_var(wp_unslash($_SERVER['REQUEST_URI']), FILTER_SANITIZE_URL) : '';
152 152
 		}
153 153
 
154
-		$maybe_url = get_term_meta( $id, Wordlift_Url_Property_Service::META_KEY, true );
155
-		if ( ! empty( $maybe_url ) ) {
154
+		$maybe_url = get_term_meta($id, Wordlift_Url_Property_Service::META_KEY, true);
155
+		if ( ! empty($maybe_url)) {
156 156
 			return $maybe_url;
157 157
 		}
158 158
 
159
-		return get_term_link( $id );
159
+		return get_term_link($id);
160 160
 	}
161 161
 
162 162
 }
Please login to merge, or discard this patch.
src/classes/vocabulary/jsonld/class-post-jsonld.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	public function enhance_post_jsonld() {
32 32
 		$this->api_service = Default_Api_Service::get_instance();
33 33
 
34
-		add_filter( 'wl_post_jsonld_array', array( $this, 'wl_post_jsonld_array' ), 11, 2 );
35
-		add_filter( 'wl_after_get_jsonld', array( $this, 'wl_after_get_jsonld' ), 11 );
36
-		add_filter( 'wl_after_get_jsonld', array( $this, 'set_events_request' ), 90, 3 );
34
+		add_filter('wl_post_jsonld_array', array($this, 'wl_post_jsonld_array'), 11, 2);
35
+		add_filter('wl_after_get_jsonld', array($this, 'wl_after_get_jsonld'), 11);
36
+		add_filter('wl_after_get_jsonld', array($this, 'set_events_request'), 90, 3);
37 37
 	}
38 38
 
39 39
 	/**
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
44 44
 	 *
45 45
 	 * @return array
46 46
 	 */
47
-	public function wl_post_jsonld_array( $arr, $post_id ) {
47
+	public function wl_post_jsonld_array($arr, $post_id) {
48 48
 		$jsonld     = $arr['jsonld'];
49 49
 		$references = $arr['references'];
50 50
 
51
-		$this->add_mentions( $post_id, $jsonld );
51
+		$this->add_mentions($post_id, $jsonld);
52 52
 
53 53
 		return array(
54 54
 			'jsonld'     => $jsonld,
@@ -62,44 +62,44 @@  discard block
 block discarded – undo
62 62
 	 * @param $post_id
63 63
 	 * @param $jsonld
64 64
 	 */
65
-	public function add_mentions( $post_id, &$jsonld ) {
65
+	public function add_mentions($post_id, &$jsonld) {
66 66
 
67 67
 		$taxonomies = Terms_Compat::get_public_taxonomies();
68 68
 		$terms      = array();
69 69
 
70
-		foreach ( $taxonomies as $taxonomy ) {
71
-			$taxonomy_terms = get_the_terms( $post_id, $taxonomy );
72
-			if ( ! $taxonomy_terms ) {
70
+		foreach ($taxonomies as $taxonomy) {
71
+			$taxonomy_terms = get_the_terms($post_id, $taxonomy);
72
+			if ( ! $taxonomy_terms) {
73 73
 				continue;
74 74
 			}
75
-			$terms = array_merge( $taxonomy_terms, $terms );
75
+			$terms = array_merge($taxonomy_terms, $terms);
76 76
 		}
77 77
 
78
-		if ( ! $terms ) {
78
+		if ( ! $terms) {
79 79
 			return;
80 80
 		}
81 81
 
82
-		if ( ! array_key_exists( 'mentions', $jsonld ) && count( $terms ) > 0 ) {
82
+		if ( ! array_key_exists('mentions', $jsonld) && count($terms) > 0) {
83 83
 			$jsonld['mentions'] = array();
84 84
 		}
85 85
 
86
-		foreach ( $terms as $term ) {
86
+		foreach ($terms as $term) {
87 87
 
88
-			$is_matched = intval( get_term_meta( $term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true ) ) === 1;
88
+			$is_matched = intval(get_term_meta($term->term_id, Entity_Rest_Endpoint::IGNORE_TAG_FROM_LISTING, true)) === 1;
89 89
 
90
-			if ( ! $is_matched ) {
90
+			if ( ! $is_matched) {
91 91
 				continue;
92 92
 			}
93 93
 
94
-			$entities = Jsonld_Utils::get_matched_entities_for_term( $term->term_id );
94
+			$entities = Jsonld_Utils::get_matched_entities_for_term($term->term_id);
95 95
 
96
-			if ( count( $entities ) === 0 ) {
96
+			if (count($entities) === 0) {
97 97
 				continue;
98 98
 			}
99 99
 
100
-			$add_additional_attrs = self::add_additional_attrs( $term, $entities );
100
+			$add_additional_attrs = self::add_additional_attrs($term, $entities);
101 101
 
102
-			$jsonld['mentions'] = array_merge( $jsonld['mentions'], $add_additional_attrs );
102
+			$jsonld['mentions'] = array_merge($jsonld['mentions'], $add_additional_attrs);
103 103
 		}
104 104
 
105 105
 	}
@@ -110,12 +110,12 @@  discard block
 block discarded – undo
110 110
 	 *
111 111
 	 * @return array
112 112
 	 */
113
-	public static function add_additional_attrs( $term, $entities ) {
113
+	public static function add_additional_attrs($term, $entities) {
114 114
 
115 115
 		return array_map(
116
-			function ( $entity ) use ( $term ) {
117
-				$entity['@id'] = get_term_link( $term->term_id ) . '#id';
118
-				if ( ! empty( $term->description ) ) {
116
+			function($entity) use ($term) {
117
+				$entity['@id'] = get_term_link($term->term_id).'#id';
118
+				if ( ! empty($term->description)) {
119 119
 					$entity['description'] = $term->description;
120 120
 				}
121 121
 
@@ -134,23 +134,23 @@  discard block
 block discarded – undo
134 134
 	 *
135 135
 	 * @return array|mixed
136 136
 	 */
137
-	public function wl_after_get_jsonld( $jsonld ) {
137
+	public function wl_after_get_jsonld($jsonld) {
138 138
 
139
-		if ( ! is_array( $jsonld ) || count( $jsonld ) === 0 ) {
139
+		if ( ! is_array($jsonld) || count($jsonld) === 0) {
140 140
 			return $jsonld;
141 141
 		}
142 142
 
143
-		foreach ( $jsonld as $key => $value ) {
144
-			if ( 'Article' === $value['@type'] && isset( $value['image'] ) ) {
143
+		foreach ($jsonld as $key => $value) {
144
+			if ('Article' === $value['@type'] && isset($value['image'])) {
145 145
 				$image = $value['image'];
146 146
 			}
147
-			if ( 'Recipe' === $value['@type'] && ! isset( $value['image'] ) ) {
147
+			if ('Recipe' === $value['@type'] && ! isset($value['image'])) {
148 148
 				$index = $key;
149 149
 			}
150 150
 		}
151 151
 
152
-		if ( isset( $index ) && ! empty( $image ) ) {
153
-			$jsonld[ $index ]['image'] = $image;
152
+		if (isset($index) && ! empty($image)) {
153
+			$jsonld[$index]['image'] = $image;
154 154
 		}
155 155
 
156 156
 		return $jsonld;
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
 	 *
166 166
 	 * @return array
167 167
 	 */
168
-	public function set_events_request( $jsonld_arr, $post_id, $context ) {
168
+	public function set_events_request($jsonld_arr, $post_id, $context) {
169 169
 		// If context is not PAGE or the array is empty, return early.
170
-		if ( Jsonld_Context_Enum::PAGE !== $context || empty( $jsonld_arr[0] ) ) {
170
+		if (Jsonld_Context_Enum::PAGE !== $context || empty($jsonld_arr[0])) {
171 171
 			return $jsonld_arr;
172 172
 		}
173 173
 
@@ -179,47 +179,47 @@  discard block
 block discarded – undo
179 179
 
180 180
 		// Fetch the initial 'about' and 'mentions' counts from post meta.
181 181
 		$counts = array(
182
-			'about'    => get_post_meta( $post_id, 'wl_about_count', true ) ? get_post_meta( $post_id, 'wl_about_count', true ) : 0,
183
-			'mentions' => get_post_meta( $post_id, 'wl_mentions_count', true ) ? get_post_meta( $post_id, 'wl_mentions_count', true ) : 0,
182
+			'about'    => get_post_meta($post_id, 'wl_about_count', true) ? get_post_meta($post_id, 'wl_about_count', true) : 0,
183
+			'mentions' => get_post_meta($post_id, 'wl_mentions_count', true) ? get_post_meta($post_id, 'wl_mentions_count', true) : 0,
184 184
 		);
185 185
 
186 186
 		// Iterate over the counts array.
187
-		foreach ( $counts as $key => $count ) {
187
+		foreach ($counts as $key => $count) {
188 188
 			// Check if data has 'about' or 'mentions' and the count is different from the existing meta value.
189
-			if ( ! empty( $data[ $key ] ) ) {
190
-				$new_count = count( $data[ $key ] );
191
-				if ( $count !== $new_count ) {
189
+			if ( ! empty($data[$key])) {
190
+				$new_count = count($data[$key]);
191
+				if ($count !== $new_count) {
192 192
 					// Set flag to true if counts have changed.
193 193
 					$change_status = true;
194 194
 
195 195
 					// Update the counts array with new count.
196
-					$counts[ $key ] = $new_count;
196
+					$counts[$key] = $new_count;
197 197
 
198 198
 					// Update post meta with new count.
199
-					update_post_meta( $post_id, 'wl_' . $key . '_count', $new_count );
199
+					update_post_meta($post_id, 'wl_'.$key.'_count', $new_count);
200 200
 				}
201 201
 			}
202 202
 		}
203 203
 
204 204
 		// If the count has changed, make the API request.
205
-		if ( $change_status ) {
205
+		if ($change_status) {
206 206
 			$this->api_service->request(
207 207
 				'POST',
208 208
 				'/plugin/events',
209
-				array( 'Content-Type' => 'application/json' ),
209
+				array('Content-Type' => 'application/json'),
210 210
 				wp_json_encode(
211 211
 					array(
212 212
 						'source' => 'jsonld',
213 213
 						'args'   => array(
214
-							array( 'about_count' => $counts['about'] ),
215
-							array( 'mentions_count' => $counts['mentions'] ),
214
+							array('about_count' => $counts['about']),
215
+							array('mentions_count' => $counts['mentions']),
216 216
 						),
217
-						'url'    => get_permalink( $post_id ),
217
+						'url'    => get_permalink($post_id),
218 218
 					)
219 219
 				),
220 220
 				0.001,
221 221
 				null,
222
-				array( 'blocking' => false )
222
+				array('blocking' => false)
223 223
 			);
224 224
 		}
225 225
 
Please login to merge, or discard this patch.