insideout10 / wordlift-plugin

src/public/class-wordlift-context-cards.php

Doc Comments +5 added lines

@@ -49,6 +49,11 @@
 		}
 	}
 
+	/**
+	 * @param string $url
+	 *
+	 * @return integer|null
+	 */
 	private function url_to_postid( $url ){
 		// Try with url_to_postid
 		$post_id = url_to_postid( $url );

Indentation +50 added lines, -50 removed lines

@@ -9,55 +9,55 @@
 
 class Wordlift_Context_Cards_Service {
 
-	/**
-	 * @var string
-	 */
-	private $endpoint;
-
-	function __construct() {
-
-		$this->endpoint = '/jsonld';
-
-		// PHP 5.3 compatibility as `$this` cannot be used in closures.
-		$that = $this;
-
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
-				'methods'  => 'GET',
-				'callback' => array( $that, 'context_data' ),
-			) );
-		} );
-
-	}
-
-	public function context_data( $request ) {
-
-		$entity_uri = urldecode( $request->get_param( 'entity_url' ) );
-		$entity_id  = $this->url_to_postid( $entity_uri );
-		$jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $entity_id );
-
-		return $jsonld;
-
-	}
-
-	public function enqueue_scripts() {
-		$show_context_cards = true;
-		$show_context_cards = apply_filters( 'wl_show_context_cards', $show_context_cards );
-		if ( $show_context_cards ) {
-			wp_enqueue_script( 'wordlift-cloud' );
-			wp_add_inline_script( 'wordlift-cloud', "wordliftCloud.contextCards('a.wl-entity-page-link', '" . get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint . "')" );
-		}
-	}
-
-	private function url_to_postid( $url ){
-		// Try with url_to_postid
-		$post_id = url_to_postid( $url );
-		if ( $post_id == 0 ) {
-			// Try with get_page_by_path
-			$post = get_page_by_path( basename( untrailingslashit( $url ) ) , OBJECT, 'entity');
-			if($post) $post_id = $post->ID;
-		}
-		return $post_id;
-	}
+    /**
+     * @var string
+     */
+    private $endpoint;
+
+    function __construct() {
+
+        $this->endpoint = '/jsonld';
+
+        // PHP 5.3 compatibility as `$this` cannot be used in closures.
+        $that = $this;
+
+        add_action( 'rest_api_init', function () use ( $that ) {
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
+                'methods'  => 'GET',
+                'callback' => array( $that, 'context_data' ),
+            ) );
+        } );
+
+    }
+
+    public function context_data( $request ) {
+
+        $entity_uri = urldecode( $request->get_param( 'entity_url' ) );
+        $entity_id  = $this->url_to_postid( $entity_uri );
+        $jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $entity_id );
+
+        return $jsonld;
+
+    }
+
+    public function enqueue_scripts() {
+        $show_context_cards = true;
+        $show_context_cards = apply_filters( 'wl_show_context_cards', $show_context_cards );
+        if ( $show_context_cards ) {
+            wp_enqueue_script( 'wordlift-cloud' );
+            wp_add_inline_script( 'wordlift-cloud', "wordliftCloud.contextCards('a.wl-entity-page-link', '" . get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint . "')" );
+        }
+    }
+
+    private function url_to_postid( $url ){
+        // Try with url_to_postid
+        $post_id = url_to_postid( $url );
+        if ( $post_id == 0 ) {
+            // Try with get_page_by_path
+            $post = get_page_by_path( basename( untrailingslashit( $url ) ) , OBJECT, 'entity');
+            if($post) $post_id = $post->ID;
+        }
+        return $post_id;
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -21,20 +21,20 @@ 
 		// PHP 5.3 compatibility as `$this` cannot be used in closures.
 		$that = $this;
 
-		add_action( 'rest_api_init', function () use ( $that ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
+		add_action('rest_api_init', function() use ($that) {
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, $that->endpoint, array(
 				'methods'  => 'GET',
-				'callback' => array( $that, 'context_data' ),
-			) );
+				'callback' => array($that, 'context_data'),
+			));
 		} );
 
 	}
 
-	public function context_data( $request ) {
+	public function context_data($request) {
 
-		$entity_uri = urldecode( $request->get_param( 'entity_url' ) );
-		$entity_id  = $this->url_to_postid( $entity_uri );
-		$jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld( false, $entity_id );
+		$entity_uri = urldecode($request->get_param('entity_url'));
+		$entity_id  = $this->url_to_postid($entity_uri);
+		$jsonld     = Wordlift_Jsonld_Service::get_instance()->get_jsonld(false, $entity_id);
 
 		return $jsonld;
 
@@ -42,20 +42,20 @@ 
 
 	public function enqueue_scripts() {
 		$show_context_cards = true;
-		$show_context_cards = apply_filters( 'wl_show_context_cards', $show_context_cards );
-		if ( $show_context_cards ) {
-			wp_enqueue_script( 'wordlift-cloud' );
-			wp_add_inline_script( 'wordlift-cloud', "wordliftCloud.contextCards('a.wl-entity-page-link', '" . get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint . "')" );
+		$show_context_cards = apply_filters('wl_show_context_cards', $show_context_cards);
+		if ($show_context_cards) {
+			wp_enqueue_script('wordlift-cloud');
+			wp_add_inline_script('wordlift-cloud', "wordliftCloud.contextCards('a.wl-entity-page-link', '".get_rest_url().WL_REST_ROUTE_DEFAULT_NAMESPACE.$this->endpoint."')");
 		}
 	}
 
-	private function url_to_postid( $url ){
+	private function url_to_postid($url) {
 		// Try with url_to_postid
-		$post_id = url_to_postid( $url );
-		if ( $post_id == 0 ) {
+		$post_id = url_to_postid($url);
+		if ($post_id == 0) {
 			// Try with get_page_by_path
-			$post = get_page_by_path( basename( untrailingslashit( $url ) ) , OBJECT, 'entity');
-			if($post) $post_id = $post->ID;
+			$post = get_page_by_path(basename(untrailingslashit($url)), OBJECT, 'entity');
+			if ($post) $post_id = $post->ID;
 		}
 		return $post_id;
 	}

Braces +3 added lines, -1 removed lines

@@ -55,7 +55,9 @@
 		if ( $post_id == 0 ) {
 			// Try with get_page_by_path
 			$post = get_page_by_path( basename( untrailingslashit( $url ) ) , OBJECT, 'entity');
-			if($post) $post_id = $post->ID;
+			if($post) {
+			    $post_id = $post->ID;
+			}
 		}
 		return $post_id;
 	}

src/shortcodes/wordlift_shortcode_navigator.php

Indentation +135 added lines, -135 removed lines

@@ -14,117 +14,117 @@ 
  */
 function wl_shortcode_navigator_data() {
 
-	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_die( 'No post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	// Limit the results (defaults to 4)
-	$navigator_length = isset( $_GET['limit'] ) ? intval($_GET['limit']) : 4;
-	$navigator_offset = isset( $_GET['offset'] ) ? intval($_GET['offset']) : 0;
+    // Limit the results (defaults to 4)
+    $navigator_length = isset( $_GET['limit'] ) ? intval($_GET['limit']) : 4;
+    $navigator_offset = isset( $_GET['offset'] ) ? intval($_GET['offset']) : 0;
 
-	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+    $current_post_id = $_GET['post_id'];
+    $current_post    = get_post( $current_post_id );
 
-	$navigator_id = $_GET['uniqid'];
+    $navigator_id = $_GET['uniqid'];
 
-	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+    // Post ID has to match an existing item
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	// prepare structures to memorize other related posts
-	$results          = array();
-	$blacklist_ids    = array( $current_post_id );
-	$related_entities = array();
+    // prepare structures to memorize other related posts
+    $results          = array();
+    $blacklist_ids    = array( $current_post_id );
+    $related_entities = array();
 
 
-	$relation_service = Wordlift_Relation_Service::get_instance();
+    $relation_service = Wordlift_Relation_Service::get_instance();
 
-	// Get the related entities, ordering them by WHO, WHAT, WHERE, WHEN
-	// TODO Replace with a single query if it is possible
-	// We select in inverse order to give priority to less used entities
-	foreach (
-		array(
-			WL_WHEN_RELATION,
-			WL_WHERE_RELATION,
-			WL_WHAT_RELATION,
-			WL_WHO_RELATION,
-		) as $predicate
-	) {
+    // Get the related entities, ordering them by WHO, WHAT, WHERE, WHEN
+    // TODO Replace with a single query if it is possible
+    // We select in inverse order to give priority to less used entities
+    foreach (
+        array(
+            WL_WHEN_RELATION,
+            WL_WHERE_RELATION,
+            WL_WHAT_RELATION,
+            WL_WHO_RELATION,
+        ) as $predicate
+    ) {
 
-		$related_entities = array_merge( $related_entities,
-			$relation_service->get_objects( $current_post_id, '*', $predicate, 'publish' )
+        $related_entities = array_merge( $related_entities,
+            $relation_service->get_objects( $current_post_id, '*', $predicate, 'publish' )
 //			wl_core_get_related_entities( $current_post_id, array(
 //					'predicate' => $predicate,
 //					'status'    => 'publish',
 //				)
-		);
+        );
 
-	}
+    }
 
-	foreach ( $related_entities as $related_entity ) {
+    foreach ( $related_entities as $related_entity ) {
 
-		// take the id of posts referencing the entity
-		$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects( $related_entity->ID, '*', null, 'publish' );
+        // take the id of posts referencing the entity
+        $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects( $related_entity->ID, '*', null, 'publish' );
 
-		// loop over them and take the first one which is not already in the $related_posts
-		foreach ( $referencing_posts as $referencing_post ) {
+        // loop over them and take the first one which is not already in the $related_posts
+        foreach ( $referencing_posts as $referencing_post ) {
 
-			if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
+            if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
 
-				$blacklist_ids[]   = $referencing_post->ID;
-				$serialized_entity = wl_serialize_entity( $related_entity );
+                $blacklist_ids[]   = $referencing_post->ID;
+                $serialized_entity = wl_serialize_entity( $related_entity );
 
-				/**
-				 * Use the thumbnail.
-				 *
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-				 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-				 *
-				 * @since 3.19.3 We're using the medium size image.
-				 */
-				$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+                /**
+                 * Use the thumbnail.
+                 *
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+                 * @see https://github.com/insideout10/wordlift-plugin/issues/837
+                 *
+                 * @since 3.19.3 We're using the medium size image.
+                 */
+                $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
 
-				if ( $thumbnail ) {
+                if ( $thumbnail ) {
 
-					$result = array(
-						'post'   => array(
-							'permalink' => get_permalink( $referencing_post->ID ),
-							'title'     => $referencing_post->post_title,
-							'thumbnail' => $thumbnail,
-						),
-						'entity' => array(
-							'label'     => $serialized_entity['label'],
-							'mainType'  => $serialized_entity['mainType'],
-							'permalink' => get_permalink( $related_entity->ID ),
-						),
-					);
+                    $result = array(
+                        'post'   => array(
+                            'permalink' => get_permalink( $referencing_post->ID ),
+                            'title'     => $referencing_post->post_title,
+                            'thumbnail' => $thumbnail,
+                        ),
+                        'entity' => array(
+                            'label'     => $serialized_entity['label'],
+                            'mainType'  => $serialized_entity['mainType'],
+                            'permalink' => get_permalink( $related_entity->ID ),
+                        ),
+                    );
 
-					$result['post'] = apply_filters( 'wl_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id );
-					$result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval($related_entity->ID), $navigator_id );
+                    $result['post'] = apply_filters( 'wl_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id );
+                    $result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval($related_entity->ID), $navigator_id );
 
-					$results[] = $result;
+                    $results[] = $result;
 
-					// Be sure no more than 1 post for entity is returned
-					break;
-				}
-			}
-		}
-	}
+                    // Be sure no more than 1 post for entity is returned
+                    break;
+                }
+            }
+        }
+    }
 
-	$results = array_reverse( $results );
+    $results = array_reverse( $results );
 
-	if(count($results) < ($navigator_offset + $navigator_length)){
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id );
-	}
+    if(count($results) < ($navigator_offset + $navigator_length)){
+        $results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id );
+    }
 
-	// Return first 4 results in json accordingly to 4 columns layout
-	return array_slice( $results, $navigator_offset, $navigator_length );
+    // Return first 4 results in json accordingly to 4 columns layout
+    return array_slice( $results, $navigator_offset, $navigator_length );
 
 }
 
@@ -135,8 +135,8 @@ 
  */
 function wl_shortcode_navigator_ajax() {
 
-	$results = wl_shortcode_navigator_data();
-	wl_core_send_json($results);
+    $results = wl_shortcode_navigator_data();
+    wl_core_send_json($results);
 
 }
 
@@ -148,15 +148,15 @@ 
  */
 function wl_shortcode_navigator_wp_json() {
 
-	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
-	return array(
-		'items' => array(
-			array('values' => $results)
-		)
-	);
+    $results = wl_shortcode_navigator_data();
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
+    return array(
+        'items' => array(
+            array('values' => $results)
+        )
+    );
 
 }
 
@@ -164,53 +164,53 @@ 
  * Adding `rest_api_init` action for amp backend of navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
-	  'methods' => 'GET',
-	  'callback' => 'wl_shortcode_navigator_wp_json',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+        'methods' => 'GET',
+        'callback' => 'wl_shortcode_navigator_wp_json',
+    ) );
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
 add_action( 'init', function() {
-	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
-		return;
-	}
-
-	register_block_type('wordlift/navigator', array(
-		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
-			$attr_code = '';
-			foreach ($attributes as $key => $value) {
-				$attr_code .= $key.'="'.$value.'" ';
-			}
-			return '[wl_navigator '.$attr_code.']';
-		},
-		'attributes' => array(
-			'title' => array(
-				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' )
-			),
-			'limit'      => array(
-				'type'    => 'number',
-				'default' => 4,
-			),
-			'template_id' => array(
-				'type'    => 'string'
-			),
-			'post_id'      => array(
-				'type'    => 'number'
-			),
-			'offset'      => array(
-				'type'    => 'number',
-				'default' => 0,
-			),
-			'uniqid'      => array(
-				'type'    => 'string',
-				'default' => uniqid( 'wl-navigator-widget-' ),
-			)
-		)
-	));
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type('wordlift/navigator', array(
+        'editor_script' => 'wordlift-admin-edit-gutenberg',
+        'render_callback' => function($attributes){
+            $attr_code = '';
+            foreach ($attributes as $key => $value) {
+                $attr_code .= $key.'="'.$value.'" ';
+            }
+            return '[wl_navigator '.$attr_code.']';
+        },
+        'attributes' => array(
+            'title' => array(
+                'type'    => 'string',
+                'default' => __( 'Related articles', 'wordlift' )
+            ),
+            'limit'      => array(
+                'type'    => 'number',
+                'default' => 4,
+            ),
+            'template_id' => array(
+                'type'    => 'string'
+            ),
+            'post_id'      => array(
+                'type'    => 'number'
+            ),
+            'offset'      => array(
+                'type'    => 'number',
+                'default' => 0,
+            ),
+            'uniqid'      => array(
+                'type'    => 'string',
+                'default' => uniqid( 'wl-navigator-widget-' ),
+            )
+        )
+    ));
 } );

Spacing +36 added lines, -36 removed lines

@@ -15,31 +15,31 @@ 
 function wl_shortcode_navigator_data() {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	// Limit the results (defaults to 4)
-	$navigator_length = isset( $_GET['limit'] ) ? intval($_GET['limit']) : 4;
-	$navigator_offset = isset( $_GET['offset'] ) ? intval($_GET['offset']) : 0;
+	$navigator_length = isset($_GET['limit']) ? intval($_GET['limit']) : 4;
+	$navigator_offset = isset($_GET['offset']) ? intval($_GET['offset']) : 0;
 
 	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	$navigator_id = $_GET['uniqid'];
 
 	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
 
 	// prepare structures to memorize other related posts
 	$results          = array();
-	$blacklist_ids    = array( $current_post_id );
+	$blacklist_ids    = array($current_post_id);
 	$related_entities = array();
 
 
@@ -57,8 +57,8 @@ 
 		) as $predicate
 	) {
 
-		$related_entities = array_merge( $related_entities,
-			$relation_service->get_objects( $current_post_id, '*', $predicate, 'publish' )
+		$related_entities = array_merge($related_entities,
+			$relation_service->get_objects($current_post_id, '*', $predicate, 'publish')
 //			wl_core_get_related_entities( $current_post_id, array(
 //					'predicate' => $predicate,
 //					'status'    => 'publish',
@@ -67,18 +67,18 @@ 
 
 	}
 
-	foreach ( $related_entities as $related_entity ) {
+	foreach ($related_entities as $related_entity) {
 
 		// take the id of posts referencing the entity
-		$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects( $related_entity->ID, '*', null, 'publish' );
+		$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects($related_entity->ID, '*', null, 'publish');
 
 		// loop over them and take the first one which is not already in the $related_posts
-		foreach ( $referencing_posts as $referencing_post ) {
+		foreach ($referencing_posts as $referencing_post) {
 
-			if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
+			if ( ! in_array($referencing_post->ID, $blacklist_ids)) {
 
 				$blacklist_ids[]   = $referencing_post->ID;
-				$serialized_entity = wl_serialize_entity( $related_entity );
+				$serialized_entity = wl_serialize_entity($related_entity);
 
 				/**
 				 * Use the thumbnail.
@@ -88,25 +88,25 @@ 
 				 *
 				 * @since 3.19.3 We're using the medium size image.
 				 */
-				$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+				$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
-				if ( $thumbnail ) {
+				if ($thumbnail) {
 
 					$result = array(
 						'post'   => array(
-							'permalink' => get_permalink( $referencing_post->ID ),
+							'permalink' => get_permalink($referencing_post->ID),
 							'title'     => $referencing_post->post_title,
 							'thumbnail' => $thumbnail,
 						),
 						'entity' => array(
 							'label'     => $serialized_entity['label'],
 							'mainType'  => $serialized_entity['mainType'],
-							'permalink' => get_permalink( $related_entity->ID ),
+							'permalink' => get_permalink($related_entity->ID),
 						),
 					);
 
-					$result['post'] = apply_filters( 'wl_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id );
-					$result['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval($related_entity->ID), $navigator_id );
+					$result['post'] = apply_filters('wl_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id);
+					$result['entity'] = apply_filters('wl_navigator_data_entity', $result['entity'], intval($related_entity->ID), $navigator_id);
 
 					$results[] = $result;
 
@@ -117,14 +117,14 @@ 
 		}
 	}
 
-	$results = array_reverse( $results );
+	$results = array_reverse($results);
 
-	if(count($results) < ($navigator_offset + $navigator_length)){
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id );
+	if (count($results) < ($navigator_offset + $navigator_length)) {
+		$results = apply_filters('wl_navigator_data_placeholder', $results, $navigator_id);
 	}
 
 	// Return first 4 results in json accordingly to 4 columns layout
-	return array_slice( $results, $navigator_offset, $navigator_length );
+	return array_slice($results, $navigator_offset, $navigator_length);
 
 }
 
@@ -140,8 +140,8 @@ 
 
 }
 
-add_action( 'wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax' );
-add_action( 'wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax' );
+add_action('wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax');
+add_action('wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax');
 
 /**
  * wp-json call for the navigator widget
@@ -149,7 +149,7 @@ 
 function wl_shortcode_navigator_wp_json() {
 
 	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 	return array(
@@ -163,25 +163,25 @@ 
 /**
  * Adding `rest_api_init` action for amp backend of navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
 	  'methods' => 'GET',
 	  'callback' => 'wl_shortcode_navigator_wp_json',
-	) );
+	));
 } );
 
 /**
  * register_block_type for Gutenberg blocks
  */
-add_action( 'init', function() {
+add_action('init', function() {
 	// Bail out if the `register_block_type` function isn't available.
-	if ( ! function_exists( 'register_block_type' ) ) {
+	if ( ! function_exists('register_block_type')) {
 		return;
 	}
 
 	register_block_type('wordlift/navigator', array(
 		'editor_script' => 'wordlift-admin-edit-gutenberg',
-		'render_callback' => function($attributes){
+		'render_callback' => function($attributes) {
 			$attr_code = '';
 			foreach ($attributes as $key => $value) {
 				$attr_code .= $key.'="'.$value.'" ';
@@ -191,7 +191,7 @@ 
 		'attributes' => array(
 			'title' => array(
 				'type'    => 'string',
-				'default' => __( 'Related articles', 'wordlift' )
+				'default' => __('Related articles', 'wordlift')
 			),
 			'limit'      => array(
 				'type'    => 'number',
@@ -209,7 +209,7 @@ 
 			),
 			'uniqid'      => array(
 				'type'    => 'string',
-				'default' => uniqid( 'wl-navigator-widget-' ),
+				'default' => uniqid('wl-navigator-widget-'),
 			)
 		)
 	));

src/public/class-wordlift-faceted-search-shortcode.php

Indentation +190 added lines, -190 removed lines

@@ -17,194 +17,194 @@ 
  */
 class Wordlift_Faceted_Search_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_faceted_search';
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
-
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
-	}
-
-	/**
-	 * Shared function used by web_shortcode and amp_shortcode
-	 * Bootstrap logic for attributes extraction and boolean filtering
-	 *
-	 * @since      3.20.0
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return array $shortcode_atts
-	 */
-	private function make_shortcode_atts( $atts ) {
-
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'          => __( 'Related articles', 'wordlift' ),
-			'show_facets'    => true,
-			'with_carousel'  => true,
-			'squared_thumbs' => false,
-			'limit'          => 20,
-		), $atts );
-
-		foreach (
-			array(
-				'show_facets',
-				'with_carousel',
-				'squared_thumbs',
-			) as $att
-		) {
-
-			// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
-			$shortcode_atts[ $att ] = filter_var(
-				$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
-			);
-		}
-
-		return $shortcode_atts;
-	}
-
-	/**
-	 * Function in charge of diplaying the [wl-faceted-search] in web mode.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for web
-	 */
-	private function web_shortcode( $atts ) {
-
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
-
-		// If the current post is not an entity and has no related entities
-		// than the shortcode cannot be rendered
-		// TODO Add an alert visibile only for connected admin users.
-		$current_post = get_post();
-
-		$entity_service = Wordlift_Entity_Service::get_instance();
-		$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-			array( $current_post->ID ) :
-			wl_core_get_related_entity_ids( $current_post->ID );
-
-		// Bail if there are no entity ids.
-		if ( 0 === count( $entity_ids ) ) {
-			return '';
-		}
-
-		$div_id = 'wordlift-faceted-entity-search-widget';
-
-		// Enqueue common shortcode scripts.
-		$this->enqueue_scripts();
-
-		// Enqueue shortcode specific scripts and styles.
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
-			: array();
-		wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css', $deps, Wordlift::get_instance()->get_version() );
-		wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.js' );
-
-		wp_localize_script(
-			'wordlift-faceted-search',
-			'wl_faceted_search_params', array(
-				'ajax_url'             => admin_url( 'admin-ajax.php' ),
-				'action'               => 'wl_faceted_search',
-				'post_id'              => $current_post->ID,
-				'entity_ids'           => $entity_ids,
-				'limit'                => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
-				'div_id'               => $div_id,
-				'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
-				'attrs'                => $shortcode_atts,
-				'l10n'                 => array(
-					'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-					'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-					'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-					'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
-				),
-			)
-		);
-
-		return '<div id="' . $div_id . '" style="width:100%"></div>';
-	}
-
-	/**
-	 * Function in charge of diplaying the [wl-faceted-search] in amp mode.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for amp
-	 */
-	private function amp_shortcode( $atts ) {
-
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
-
-		// If the current post is not an entity and has no related entities
-		// than the shortcode cannot be rendered
-		// TODO Add an alert visibile only for connected admin users.
-		$current_post = get_post();
-
-		$entity_service = Wordlift_Entity_Service::get_instance();
-		$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-			array( $current_post->ID ) :
-			wl_core_get_related_entity_ids( $current_post->ID );
-
-		// Bail if there are no entity ids.
-		if ( 0 === count( $entity_ids ) ) {
-			return '';
-		}
-
-		$div_id = 'wordlift-faceted-entity-search-widget';
-
-		// Enqueue amp specific styles
-		wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
-
-		$wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
-
-		$query_posts = array(
-			'post_id' => $current_post->ID,
-			'limit'   => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
-			'type'    => 'posts',
-		);
-
-		$query_facets = array(
-			'post_id' => $current_post->ID,
-			'limit'   => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
-			'type'    => 'facets',
-			'l10n'    => array(
-				'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-				'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-				'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-				'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
-			),
-		);
-
-		if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
-			$delimiter = '?';
-		} else {
-			$delimiter = '&';
-		}
-
-		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
-		// This is a hackish way, but this works for http and https URLs
-		$wp_json_url_posts  = str_replace( array(
-				'http:',
-				'https:',
-			), '', $wp_json_base ) . '/faceted-search' . $delimiter . http_build_query( $query_posts );
-		$wp_json_url_facets = str_replace( array(
-				'http:',
-				'https:',
-			), '', $wp_json_base ) . '/faceted-search' . $delimiter . http_build_query( $query_facets );
-
-		/*
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_faceted_search';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
+
+        return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
+            : $this->web_shortcode( $atts );
+    }
+
+    /**
+     * Shared function used by web_shortcode and amp_shortcode
+     * Bootstrap logic for attributes extraction and boolean filtering
+     *
+     * @since      3.20.0
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return array $shortcode_atts
+     */
+    private function make_shortcode_atts( $atts ) {
+
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts( array(
+            'title'          => __( 'Related articles', 'wordlift' ),
+            'show_facets'    => true,
+            'with_carousel'  => true,
+            'squared_thumbs' => false,
+            'limit'          => 20,
+        ), $atts );
+
+        foreach (
+            array(
+                'show_facets',
+                'with_carousel',
+                'squared_thumbs',
+            ) as $att
+        ) {
+
+            // See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
+            $shortcode_atts[ $att ] = filter_var(
+                $shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+            );
+        }
+
+        return $shortcode_atts;
+    }
+
+    /**
+     * Function in charge of diplaying the [wl-faceted-search] in web mode.
+     *
+     * @since 3.20.0
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for web
+     */
+    private function web_shortcode( $atts ) {
+
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
+
+        // If the current post is not an entity and has no related entities
+        // than the shortcode cannot be rendered
+        // TODO Add an alert visibile only for connected admin users.
+        $current_post = get_post();
+
+        $entity_service = Wordlift_Entity_Service::get_instance();
+        $entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
+            array( $current_post->ID ) :
+            wl_core_get_related_entity_ids( $current_post->ID );
+
+        // Bail if there are no entity ids.
+        if ( 0 === count( $entity_ids ) ) {
+            return '';
+        }
+
+        $div_id = 'wordlift-faceted-entity-search-widget';
+
+        // Enqueue common shortcode scripts.
+        $this->enqueue_scripts();
+
+        // Enqueue shortcode specific scripts and styles.
+        $deps = apply_filters( 'wl_include_font_awesome', true )
+            ? array( 'wordlift-font-awesome' )
+            : array();
+        wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css', $deps, Wordlift::get_instance()->get_version() );
+        wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.js' );
+
+        wp_localize_script(
+            'wordlift-faceted-search',
+            'wl_faceted_search_params', array(
+                'ajax_url'             => admin_url( 'admin-ajax.php' ),
+                'action'               => 'wl_faceted_search',
+                'post_id'              => $current_post->ID,
+                'entity_ids'           => $entity_ids,
+                'limit'                => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+                'div_id'               => $div_id,
+                'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
+                'attrs'                => $shortcode_atts,
+                'l10n'                 => array(
+                    'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
+                    'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
+                    'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
+                    'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+                ),
+            )
+        );
+
+        return '<div id="' . $div_id . '" style="width:100%"></div>';
+    }
+
+    /**
+     * Function in charge of diplaying the [wl-faceted-search] in amp mode.
+     *
+     * @since 3.20.0
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for amp
+     */
+    private function amp_shortcode( $atts ) {
+
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
+
+        // If the current post is not an entity and has no related entities
+        // than the shortcode cannot be rendered
+        // TODO Add an alert visibile only for connected admin users.
+        $current_post = get_post();
+
+        $entity_service = Wordlift_Entity_Service::get_instance();
+        $entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
+            array( $current_post->ID ) :
+            wl_core_get_related_entity_ids( $current_post->ID );
+
+        // Bail if there are no entity ids.
+        if ( 0 === count( $entity_ids ) ) {
+            return '';
+        }
+
+        $div_id = 'wordlift-faceted-entity-search-widget';
+
+        // Enqueue amp specific styles
+        wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
+
+        $wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
+
+        $query_posts = array(
+            'post_id' => $current_post->ID,
+            'limit'   => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+            'type'    => 'posts',
+        );
+
+        $query_facets = array(
+            'post_id' => $current_post->ID,
+            'limit'   => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+            'type'    => 'facets',
+            'l10n'    => array(
+                'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
+                'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
+                'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
+                'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+            ),
+        );
+
+        if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
+            $delimiter = '?';
+        } else {
+            $delimiter = '&';
+        }
+
+        // Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
+        // This is a hackish way, but this works for http and https URLs
+        $wp_json_url_posts  = str_replace( array(
+                'http:',
+                'https:',
+            ), '', $wp_json_base ) . '/faceted-search' . $delimiter . http_build_query( $query_posts );
+        $wp_json_url_facets = str_replace( array(
+                'http:',
+                'https:',
+            ), '', $wp_json_base ) . '/faceted-search' . $delimiter . http_build_query( $query_facets );
+
+        /*
 		 * Notes about amp code:
 		 *
 		 * amp-list src is the only way to do an xhr fetch so we need it for both facets and posts
@@ -218,7 +218,7 @@ 
 		 * All JS code in amp has to be done using limited JS expressions `see https://www.ampproject.org/docs/reference/components/amp-bind#expressions`
 		 */
 
-		return <<<HTML
+        return <<<HTML
 		<div id="{$div_id}" class="wl-amp-fs">
 			<amp-state id="currentEntities">
 				<script type="application/json">
@@ -307,6 +307,6 @@ 
 			</amp-list>			
 		</div>
 HTML;
-	}
+    }
 
 }

Spacing +43 added lines, -45 removed lines

@@ -25,10 +25,10 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
+		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode($atts)
+			: $this->web_shortcode($atts);
 	}
 
 	/**
@@ -41,16 +41,16 @@ 
 	 *
 	 * @return array $shortcode_atts
 	 */
-	private function make_shortcode_atts( $atts ) {
+	private function make_shortcode_atts($atts) {
 
 		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'          => __( 'Related articles', 'wordlift' ),
+		$shortcode_atts = shortcode_atts(array(
+			'title'          => __('Related articles', 'wordlift'),
 			'show_facets'    => true,
 			'with_carousel'  => true,
 			'squared_thumbs' => false,
 			'limit'          => 20,
-		), $atts );
+		), $atts);
 
 		foreach (
 			array(
@@ -61,8 +61,8 @@ 
 		) {
 
 			// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
-			$shortcode_atts[ $att ] = filter_var(
-				$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+			$shortcode_atts[$att] = filter_var(
+				$shortcode_atts[$att], FILTER_VALIDATE_BOOLEAN
 			);
 		}
 
@@ -78,10 +78,10 @@ 
 	 *
 	 * @return string Shortcode HTML for web
 	 */
-	private function web_shortcode( $atts ) {
+	private function web_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// If the current post is not an entity and has no related entities
 		// than the shortcode cannot be rendered
@@ -89,12 +89,11 @@ 
 		$current_post = get_post();
 
 		$entity_service = Wordlift_Entity_Service::get_instance();
-		$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-			array( $current_post->ID ) :
-			wl_core_get_related_entity_ids( $current_post->ID );
+		$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+			array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 		// Bail if there are no entity ids.
-		if ( 0 === count( $entity_ids ) ) {
+		if (0 === count($entity_ids)) {
 			return '';
 		}
 
@@ -104,33 +103,33 @@ 
 		$this->enqueue_scripts();
 
 		// Enqueue shortcode specific scripts and styles.
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
+		$deps = apply_filters('wl_include_font_awesome', true)
+			? array('wordlift-font-awesome')
 			: array();
-		wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css', $deps, Wordlift::get_instance()->get_version() );
-		wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.js' );
+		wp_enqueue_style('wordlift-faceted-search', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-faceted-entity-search-widget.min.css', $deps, Wordlift::get_instance()->get_version());
+		wp_enqueue_script('wordlift-faceted-search', dirname(plugin_dir_url(__FILE__)).'/js/wordlift-faceted-entity-search-widget.js');
 
 		wp_localize_script(
 			'wordlift-faceted-search',
 			'wl_faceted_search_params', array(
-				'ajax_url'             => admin_url( 'admin-ajax.php' ),
+				'ajax_url'             => admin_url('admin-ajax.php'),
 				'action'               => 'wl_faceted_search',
 				'post_id'              => $current_post->ID,
 				'entity_ids'           => $entity_ids,
-				'limit'                => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+				'limit'                => apply_filters('wl_faceted_search_limit', $shortcode_atts['limit']),
 				'div_id'               => $div_id,
 				'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
 				'attrs'                => $shortcode_atts,
 				'l10n'                 => array(
-					'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-					'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-					'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-					'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+					'what'  => _x('What', 'Faceted Search Widget', 'wordlift'),
+					'who'   => _x('Who', 'Faceted Search Widget', 'wordlift'),
+					'where' => _x('Where', 'Faceted Search Widget', 'wordlift'),
+					'when'  => _x('When', 'Faceted Search Widget', 'wordlift'),
 				),
 			)
 		);
 
-		return '<div id="' . $div_id . '" style="width:100%"></div>';
+		return '<div id="'.$div_id.'" style="width:100%"></div>';
 	}
 
 	/**
@@ -142,10 +141,10 @@ 
 	 *
 	 * @return string Shortcode HTML for amp
 	 */
-	private function amp_shortcode( $atts ) {
+	private function amp_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// If the current post is not an entity and has no related entities
 		// than the shortcode cannot be rendered
@@ -153,41 +152,40 @@ 
 		$current_post = get_post();
 
 		$entity_service = Wordlift_Entity_Service::get_instance();
-		$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-			array( $current_post->ID ) :
-			wl_core_get_related_entity_ids( $current_post->ID );
+		$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+			array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 		// Bail if there are no entity ids.
-		if ( 0 === count( $entity_ids ) ) {
+		if (0 === count($entity_ids)) {
 			return '';
 		}
 
 		$div_id = 'wordlift-faceted-entity-search-widget';
 
 		// Enqueue amp specific styles
-		wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
+		wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(dirname(__FILE__)).'/css/wordlift-amp-custom.min.css');
 
-		$wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
+		$wp_json_base = get_rest_url().WL_REST_ROUTE_DEFAULT_NAMESPACE;
 
 		$query_posts = array(
 			'post_id' => $current_post->ID,
-			'limit'   => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+			'limit'   => apply_filters('wl_faceted_search_limit', $shortcode_atts['limit']),
 			'type'    => 'posts',
 		);
 
 		$query_facets = array(
 			'post_id' => $current_post->ID,
-			'limit'   => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+			'limit'   => apply_filters('wl_faceted_search_limit', $shortcode_atts['limit']),
 			'type'    => 'facets',
 			'l10n'    => array(
-				'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-				'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-				'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-				'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+				'what'  => _x('What', 'Faceted Search Widget', 'wordlift'),
+				'who'   => _x('Who', 'Faceted Search Widget', 'wordlift'),
+				'where' => _x('Where', 'Faceted Search Widget', 'wordlift'),
+				'when'  => _x('When', 'Faceted Search Widget', 'wordlift'),
 			),
 		);
 
-		if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
+		if (strpos($wp_json_base, 'wp-json/'.WL_REST_ROUTE_DEFAULT_NAMESPACE)) {
 			$delimiter = '?';
 		} else {
 			$delimiter = '&';
@@ -195,14 +193,14 @@ 
 
 		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
 		// This is a hackish way, but this works for http and https URLs
-		$wp_json_url_posts  = str_replace( array(
+		$wp_json_url_posts = str_replace(array(
 				'http:',
 				'https:',
-			), '', $wp_json_base ) . '/faceted-search' . $delimiter . http_build_query( $query_posts );
-		$wp_json_url_facets = str_replace( array(
+			), '', $wp_json_base).'/faceted-search'.$delimiter.http_build_query($query_posts);
+		$wp_json_url_facets = str_replace(array(
 				'http:',
 				'https:',
-			), '', $wp_json_base ) . '/faceted-search' . $delimiter . http_build_query( $query_facets );
+			), '', $wp_json_base).'/faceted-search'.$delimiter.http_build_query($query_facets);
 
 		/*
 		 * Notes about amp code:

src/public/class-wordlift-navigator-shortcode.php

Indentation +132 added lines, -132 removed lines

@@ -17,137 +17,137 @@ 
  */
 class Wordlift_Navigator_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_navigator';
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
-
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
-	}
-
-	/**
-	 * Shared function used by web_shortcode and amp_shortcode
-	 * Bootstrap logic for attributes extraction and boolean filtering
-	 *
-	 * @since      3.20.0
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return array $shortcode_atts
-	 */
-	private function make_shortcode_atts( $atts ) {
-
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'             => __( 'Related articles', 'wordlift' ),
-			'limit'             => 4,
-			'offset'            => 0,
-			'template_id'       => '',
-			'post_id'           => '',
-			'uniqid'            => uniqid( 'wl-navigator-widget-' )
-		), $atts );
-
-		return $shortcode_atts;
-	}
-
-	/**
-	 * Function in charge of diplaying the [wl-navigator] in web mode.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for web
-	 */
-	private function web_shortcode( $atts ) {
-
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
-
-		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty($shortcode_atts['post_id']) && !is_singular() ) {
-			return;
-		}
-
-		$post = !empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
-		$navigator_id = $shortcode_atts['uniqid'];
-		$rest_url = $post ? admin_url( sprintf('admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset']) ) : false;
-
-		// avoid building the widget when no valid $rest_url
-		if ( !$rest_url ) {
-			return;
-		}
-
-		wp_enqueue_script( 'wordlift-cloud' );
-		wp_add_inline_script( 'wordlift-cloud', "wordliftCloud.navigator('#".$navigator_id."')" );
-
-		return sprintf(
-			'<div id="%s" class="%s" data-rest-url="%s" data-title="%s" data-template-id="%s" data-limit="%s"></div>',
-			$navigator_id,
-			'wl-navigator',
-			$rest_url,
-			$shortcode_atts['title'],
-			$shortcode_atts['template_id'],
-			$shortcode_atts['limit']
-		);
-	}
-
-	/**
-	 * Function in charge of diplaying the [wl-faceted-search] in amp mode.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param array $atts Shortcode attributes.
-	 *
-	 * @return string Shortcode HTML for amp
-	 */
-	private function amp_shortcode( $atts ) {
-
-		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
-
-		// avoid building the widget when there is a list of posts.
-		if ( ! is_singular() ) {
-			return '';
-		}
-
-		$current_post = get_post();
-
-		// Enqueue amp specific styles
-		wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
-
-		$post = !empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
-		$navigator_id = $shortcode_atts['uniqid'];
-
-		$wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
-
-		$navigator_query = array(
-			'uniqid'  => $navigator_id,
-			'post_id' => $post->ID,
-			'limit'   => $shortcode_atts['limit'],
-			'offset'  => $shortcode_atts['offset']
-		);
-
-		if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
-			$delimiter = '?';
-		} else {
-			$delimiter = '&';
-		}
-
-		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
-		// This is a hackish way, but this works for http and https URLs
-		$wp_json_url_posts = str_replace( array(
-				'http:',
-				'https:',
-			), '', $wp_json_base ) . '/navigator' . $delimiter . http_build_query( $navigator_query );
-
-		return <<<HTML
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_navigator';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
+
+        return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
+            : $this->web_shortcode( $atts );
+    }
+
+    /**
+     * Shared function used by web_shortcode and amp_shortcode
+     * Bootstrap logic for attributes extraction and boolean filtering
+     *
+     * @since      3.20.0
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return array $shortcode_atts
+     */
+    private function make_shortcode_atts( $atts ) {
+
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts( array(
+            'title'             => __( 'Related articles', 'wordlift' ),
+            'limit'             => 4,
+            'offset'            => 0,
+            'template_id'       => '',
+            'post_id'           => '',
+            'uniqid'            => uniqid( 'wl-navigator-widget-' )
+        ), $atts );
+
+        return $shortcode_atts;
+    }
+
+    /**
+     * Function in charge of diplaying the [wl-navigator] in web mode.
+     *
+     * @since 3.20.0
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for web
+     */
+    private function web_shortcode( $atts ) {
+
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
+
+        // avoid building the widget when no post_id is specified and there is a list of posts.
+        if ( empty($shortcode_atts['post_id']) && !is_singular() ) {
+            return;
+        }
+
+        $post = !empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
+        $navigator_id = $shortcode_atts['uniqid'];
+        $rest_url = $post ? admin_url( sprintf('admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset']) ) : false;
+
+        // avoid building the widget when no valid $rest_url
+        if ( !$rest_url ) {
+            return;
+        }
+
+        wp_enqueue_script( 'wordlift-cloud' );
+        wp_add_inline_script( 'wordlift-cloud', "wordliftCloud.navigator('#".$navigator_id."')" );
+
+        return sprintf(
+            '<div id="%s" class="%s" data-rest-url="%s" data-title="%s" data-template-id="%s" data-limit="%s"></div>',
+            $navigator_id,
+            'wl-navigator',
+            $rest_url,
+            $shortcode_atts['title'],
+            $shortcode_atts['template_id'],
+            $shortcode_atts['limit']
+        );
+    }
+
+    /**
+     * Function in charge of diplaying the [wl-faceted-search] in amp mode.
+     *
+     * @since 3.20.0
+     *
+     * @param array $atts Shortcode attributes.
+     *
+     * @return string Shortcode HTML for amp
+     */
+    private function amp_shortcode( $atts ) {
+
+        // attributes extraction and boolean filtering
+        $shortcode_atts = $this->make_shortcode_atts( $atts );
+
+        // avoid building the widget when there is a list of posts.
+        if ( ! is_singular() ) {
+            return '';
+        }
+
+        $current_post = get_post();
+
+        // Enqueue amp specific styles
+        wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
+
+        $post = !empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
+        $navigator_id = $shortcode_atts['uniqid'];
+
+        $wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
+
+        $navigator_query = array(
+            'uniqid'  => $navigator_id,
+            'post_id' => $post->ID,
+            'limit'   => $shortcode_atts['limit'],
+            'offset'  => $shortcode_atts['offset']
+        );
+
+        if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
+            $delimiter = '?';
+        } else {
+            $delimiter = '&';
+        }
+
+        // Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
+        // This is a hackish way, but this works for http and https URLs
+        $wp_json_url_posts = str_replace( array(
+                'http:',
+                'https:',
+            ), '', $wp_json_base ) . '/navigator' . $delimiter . http_build_query( $navigator_query );
+
+        return <<<HTML
 		<div id="{$navigator_id}" class="wl-navigator-widget">
 			<h3 class="wl-headline">{$shortcode_atts['title']}</h3>
 			<amp-list 
@@ -204,6 +204,6 @@ 
 			</amp-list>	
 		</div>
 HTML;
-	}
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -25,10 +25,10 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
-		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode( $atts )
-			: $this->web_shortcode( $atts );
+		return Wordlift_AMP_Service::is_amp_endpoint() ? $this->amp_shortcode($atts)
+			: $this->web_shortcode($atts);
 	}
 
 	/**
@@ -41,17 +41,17 @@ 
 	 *
 	 * @return array $shortcode_atts
 	 */
-	private function make_shortcode_atts( $atts ) {
+	private function make_shortcode_atts($atts) {
 
 		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'             => __( 'Related articles', 'wordlift' ),
+		$shortcode_atts = shortcode_atts(array(
+			'title'             => __('Related articles', 'wordlift'),
 			'limit'             => 4,
 			'offset'            => 0,
 			'template_id'       => '',
 			'post_id'           => '',
-			'uniqid'            => uniqid( 'wl-navigator-widget-' )
-		), $atts );
+			'uniqid'            => uniqid('wl-navigator-widget-')
+		), $atts);
 
 		return $shortcode_atts;
 	}
@@ -65,27 +65,27 @@ 
 	 *
 	 * @return string Shortcode HTML for web
 	 */
-	private function web_shortcode( $atts ) {
+	private function web_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when no post_id is specified and there is a list of posts.
-		if ( empty($shortcode_atts['post_id']) && !is_singular() ) {
+		if (empty($shortcode_atts['post_id']) && ! is_singular()) {
 			return;
 		}
 
-		$post = !empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
+		$post = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
 		$navigator_id = $shortcode_atts['uniqid'];
-		$rest_url = $post ? admin_url( sprintf('admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset']) ) : false;
+		$rest_url = $post ? admin_url(sprintf('admin-ajax.php?action=wl_navigator&uniqid=%s&post_id=%s&limit=%s&offset=%s', $navigator_id, $post->ID, $shortcode_atts['limit'], $shortcode_atts['offset'])) : false;
 
 		// avoid building the widget when no valid $rest_url
-		if ( !$rest_url ) {
+		if ( ! $rest_url) {
 			return;
 		}
 
-		wp_enqueue_script( 'wordlift-cloud' );
-		wp_add_inline_script( 'wordlift-cloud', "wordliftCloud.navigator('#".$navigator_id."')" );
+		wp_enqueue_script('wordlift-cloud');
+		wp_add_inline_script('wordlift-cloud', "wordliftCloud.navigator('#".$navigator_id."')");
 
 		return sprintf(
 			'<div id="%s" class="%s" data-rest-url="%s" data-title="%s" data-template-id="%s" data-limit="%s"></div>',
@@ -107,25 +107,25 @@ 
 	 *
 	 * @return string Shortcode HTML for amp
 	 */
-	private function amp_shortcode( $atts ) {
+	private function amp_shortcode($atts) {
 
 		// attributes extraction and boolean filtering
-		$shortcode_atts = $this->make_shortcode_atts( $atts );
+		$shortcode_atts = $this->make_shortcode_atts($atts);
 
 		// avoid building the widget when there is a list of posts.
-		if ( ! is_singular() ) {
+		if ( ! is_singular()) {
 			return '';
 		}
 
 		$current_post = get_post();
 
 		// Enqueue amp specific styles
-		wp_enqueue_style( 'wordlift-amp-custom', plugin_dir_url( dirname( __FILE__ ) ) . '/css/wordlift-amp-custom.min.css' );
+		wp_enqueue_style('wordlift-amp-custom', plugin_dir_url(dirname(__FILE__)).'/css/wordlift-amp-custom.min.css');
 
-		$post = !empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
+		$post = ! empty($shortcode_atts['post_id']) ? get_post(intval($shortcode_atts['post_id'])) : get_post();
 		$navigator_id = $shortcode_atts['uniqid'];
 
-		$wp_json_base = get_rest_url() . WL_REST_ROUTE_DEFAULT_NAMESPACE;
+		$wp_json_base = get_rest_url().WL_REST_ROUTE_DEFAULT_NAMESPACE;
 
 		$navigator_query = array(
 			'uniqid'  => $navigator_id,
@@ -134,7 +134,7 @@ 
 			'offset'  => $shortcode_atts['offset']
 		);
 
-		if ( strpos( $wp_json_base, 'wp-json/' . WL_REST_ROUTE_DEFAULT_NAMESPACE ) ) {
+		if (strpos($wp_json_base, 'wp-json/'.WL_REST_ROUTE_DEFAULT_NAMESPACE)) {
 			$delimiter = '?';
 		} else {
 			$delimiter = '&';
@@ -142,10 +142,10 @@ 
 
 		// Use a protocol-relative URL as amp-list spec says that URL's protocol must be HTTPS.
 		// This is a hackish way, but this works for http and https URLs
-		$wp_json_url_posts = str_replace( array(
+		$wp_json_url_posts = str_replace(array(
 				'http:',
 				'https:',
-			), '', $wp_json_base ) . '/navigator' . $delimiter . http_build_query( $navigator_query );
+			), '', $wp_json_base).'/navigator'.$delimiter.http_build_query($navigator_query);
 
 		return <<<HTML
 		<div id="{$navigator_id}" class="wl-navigator-widget">