insideout10 / wordlift-plugin

src/shortcodes/wordlift_shortcode_geomap.php

Doc Comments -1 removed lines

@@ -10,7 +10,6 @@
 /**
  * Print both global or post related places in json. It's executed via Ajax
  *
- * @param array $places An array of place posts.
  *
  * @return array An array of place posts.
  *

Indentation +110 added lines, -110 removed lines

@@ -16,110 +16,110 @@ 
  *
  */
 function wl_shortcode_geomap_ajax() {
-	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+    // Get the post Id.
+    $post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+    $map_data = ( is_numeric( $post_id )
+        ? wl_shortcode_geomap_ajax_single_post( $post_id )
+        : wl_shortcode_geomap_ajax_all_posts() );
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+    wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
 }
 
 function wl_shortcode_geomap_ajax_all_posts() {
-	global $wpdb;
-
-	return $wpdb->get_results( $wpdb->prepare(
-		"SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
-		. " FROM {$wpdb->posts} p1 "
-		. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
-		. "  ON ri.object_id = p1.ID AND ri.predicate = %s"
-		. " INNER JOIN {$wpdb->postmeta} pm1"
-		. "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
-		. " INNER JOIN {$wpdb->postmeta} pm2"
-		. "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
-		. " WHERE p1.post_status = %s",
-		'where',
-		'wl_geo_latitude',
-		'wl_geo_longitude',
-		'publish'
-	) );
+    global $wpdb;
+
+    return $wpdb->get_results( $wpdb->prepare(
+        "SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
+        . " FROM {$wpdb->posts} p1 "
+        . " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
+        . "  ON ri.object_id = p1.ID AND ri.predicate = %s"
+        . " INNER JOIN {$wpdb->postmeta} pm1"
+        . "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
+        . " INNER JOIN {$wpdb->postmeta} pm2"
+        . "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
+        . " WHERE p1.post_status = %s",
+        'where',
+        'wl_geo_latitude',
+        'wl_geo_longitude',
+        'publish'
+    ) );
 }
 
 function wl_shortcode_geomap_ajax_single_post( $post_id ) {
-	global $wpdb;
-
-	return $wpdb->get_results( $wpdb->prepare(
-		"SELECT p2.ID, p2.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
-		. " FROM {$wpdb->posts} p1 "
-		. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
-		. "  ON ri.subject_id = p1.ID AND ri.predicate = %s"
-		. " INNER JOIN {$wpdb->posts} p2"
-		. "  ON p2.ID = ri.object_id AND p2.post_status = %s"
-		. " INNER JOIN {$wpdb->postmeta} pm1"
-		. "  ON pm1.post_id = p2.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
-		. " INNER JOIN {$wpdb->postmeta} pm2"
-		. "  ON pm2.post_id = p2.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
-		. " WHERE p1.ID = %d",
-		'where',
-		'publish',
-		'wl_geo_latitude',
-		'wl_geo_longitude',
-		$post_id
-	) );
+    global $wpdb;
+
+    return $wpdb->get_results( $wpdb->prepare(
+        "SELECT p2.ID, p2.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
+        . " FROM {$wpdb->posts} p1 "
+        . " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
+        . "  ON ri.subject_id = p1.ID AND ri.predicate = %s"
+        . " INNER JOIN {$wpdb->posts} p2"
+        . "  ON p2.ID = ri.object_id AND p2.post_status = %s"
+        . " INNER JOIN {$wpdb->postmeta} pm1"
+        . "  ON pm1.post_id = p2.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
+        . " INNER JOIN {$wpdb->postmeta} pm2"
+        . "  ON pm2.post_id = p2.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
+        . " WHERE p1.ID = %d",
+        'where',
+        'publish',
+        'wl_geo_latitude',
+        'wl_geo_longitude',
+        $post_id
+    ) );
 }
 
 function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
 
-	global $wpdb;
-
-	return $wpdb->get_results( $wpdb->prepare(
-		"SELECT p.ID, p.post_title"
-		. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-		" INNER JOIN {$wpdb->posts} p" .
-		"  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d" .
-		" WHERE ri.object_id = %d AND ri.predicate = %s",
-		'publish',
-		$exclude_post_id,
-		$post_id,
-		'where'
-	) );
+    global $wpdb;
+
+    return $wpdb->get_results( $wpdb->prepare(
+        "SELECT p.ID, p.post_title"
+        . " FROM {$wpdb->prefix}wl_relation_instances ri" .
+        " INNER JOIN {$wpdb->posts} p" .
+        "  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d" .
+        " WHERE ri.object_id = %d AND ri.predicate = %s",
+        'publish',
+        $exclude_post_id,
+        $post_id,
+        'where'
+    ) );
 }
 
 function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
 
-	$boundaries = array();
-	$features   = array_map( function ( $item ) use ( &$boundaries, $post_id ) {
+    $boundaries = array();
+    $features   = array_map( function ( $item ) use ( &$boundaries, $post_id ) {
 
-		$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-		$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+        $thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
+        $thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
 
-		// Related posts.
-		$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
-		$subjects_inner_html = array_reduce( $subjects, function ( $carry, $subject ) {
+        // Related posts.
+        $subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
+        $subjects_inner_html = array_reduce( $subjects, function ( $carry, $subject ) {
 
-			$permalink = get_permalink( $subject->ID );
+            $permalink = get_permalink( $subject->ID );
 
-			return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
-		}, '' );
-		$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+            return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
+        }, '' );
+        $subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
 
-		$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-		$latitude      = floatval( $item->latitude );
-		$longitude     = floatval( $item->longitude );
-		$coordinates   = array( $latitude, $longitude, );
-		$geometry      = array( 'type' => 'Point', 'coordinates' => $coordinates, );
+        $popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
+        $latitude      = floatval( $item->latitude );
+        $longitude     = floatval( $item->longitude );
+        $coordinates   = array( $latitude, $longitude, );
+        $geometry      = array( 'type' => 'Point', 'coordinates' => $coordinates, );
 
-		$boundaries[] = array( $longitude, $latitude, );
+        $boundaries[] = array( $longitude, $latitude, );
 
-		return array(
-			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $popup_content ),
-			'geometry'   => $geometry,
-		);
-	}, $results );
+        return array(
+            'type'       => 'Feature',
+            'properties' => array( 'popupContent' => $popup_content ),
+            'geometry'   => $geometry,
+        );
+    }, $results );
 
-	return array( 'features' => $features, 'boundaries' => $boundaries, );
+    return array( 'features' => $features, 'boundaries' => $boundaries, );
 }
 
 add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
@@ -130,36 +130,36 @@ 
  */
 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/geomap', array(
-		'editor_script'   => 'wl-block-editor',
-		'render_callback' => function ( $attributes ) {
-			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
-			}
-
-			return '[wl_geomap ' . $attr_code . ']';
-		},
-		'attributes'      => array(
-			'width'  => array(
-				'type'    => 'string',
-				'default' => '100%'
-			),
-			'height' => array(
-				'type'    => 'string',
-				'default' => '300px'
-			),
-			'global' => array(
-				'type'    => 'bool',
-				'default' => false
-			),
-		)
-	) );
+    // Bail out if the `register_block_type` function isn't available.
+    if ( ! function_exists( 'register_block_type' ) ) {
+        return;
+    }
+
+    register_block_type( 'wordlift/geomap', array(
+        'editor_script'   => 'wl-block-editor',
+        'render_callback' => function ( $attributes ) {
+            $attr_code = '';
+            foreach ( $attributes as $key => $value ) {
+                $attr_code .= $key . '="' . $value . '" ';
+            }
+
+            return '[wl_geomap ' . $attr_code . ']';
+        },
+        'attributes'      => array(
+            'width'  => array(
+                'type'    => 'string',
+                'default' => '100%'
+            ),
+            'height' => array(
+                'type'    => 'string',
+                'default' => '300px'
+            ),
+            'global' => array(
+                'type'    => 'bool',
+                'default' => false
+            ),
+        )
+    ) );
 } );
 
 ///**

Spacing +45 added lines, -45 removed lines

@@ -17,19 +17,19 @@ 
  */
 function wl_shortcode_geomap_ajax() {
 	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+	$post_id = (isset($_REQUEST['post_id']) ? $_REQUEST['post_id'] : null);
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+	$map_data = (is_numeric($post_id)
+		? wl_shortcode_geomap_ajax_single_post($post_id)
+		: wl_shortcode_geomap_ajax_all_posts());
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+	wl_core_send_json(wl_shortcode_geomap_format_results($map_data, $post_id));
 }
 
 function wl_shortcode_geomap_ajax_all_posts() {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		"SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
 		. " FROM {$wpdb->posts} p1 "
 		. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
@@ -43,13 +43,13 @@ 
 		'wl_geo_latitude',
 		'wl_geo_longitude',
 		'publish'
-	) );
+	));
 }
 
-function wl_shortcode_geomap_ajax_single_post( $post_id ) {
+function wl_shortcode_geomap_ajax_single_post($post_id) {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		"SELECT p2.ID, p2.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
 		. " FROM {$wpdb->posts} p1 "
 		. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
@@ -66,84 +66,84 @@ 
 		'wl_geo_latitude',
 		'wl_geo_longitude',
 		$post_id
-	) );
+	));
 }
 
-function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
+function wl_shortcode_geomap_get_subjects($post_id, $exclude_post_id) {
 
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		"SELECT p.ID, p.post_title"
-		. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-		" INNER JOIN {$wpdb->posts} p" .
-		"  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d" .
+		. " FROM {$wpdb->prefix}wl_relation_instances ri".
+		" INNER JOIN {$wpdb->posts} p".
+		"  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d".
 		" WHERE ri.object_id = %d AND ri.predicate = %s",
 		'publish',
 		$exclude_post_id,
 		$post_id,
 		'where'
-	) );
+	));
 }
 
-function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
+function wl_shortcode_geomap_format_results($results, $post_id = null) {
 
 	$boundaries = array();
-	$features   = array_map( function ( $item ) use ( &$boundaries, $post_id ) {
+	$features   = array_map(function($item) use (&$boundaries, $post_id) {
 
-		$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-		$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+		$thumbnail_url  = get_the_post_thumbnail_url($item->ID);
+		$thumbnail_html = ($thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '');
 
 		// Related posts.
-		$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
-		$subjects_inner_html = array_reduce( $subjects, function ( $carry, $subject ) {
+		$subjects            = wl_shortcode_geomap_get_subjects($item->ID, $post_id);
+		$subjects_inner_html = array_reduce($subjects, function($carry, $subject) {
 
-			$permalink = get_permalink( $subject->ID );
+			$permalink = get_permalink($subject->ID);
 
-			return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
-		}, '' );
-		$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+			return $carry.sprintf('<li><a href="%s">%s</a></li>', $permalink, esc_html($subject->post_title));
+		}, '');
+		$subjects_html = ( ! empty($subjects_inner_html) ? '<ul>'.$subjects_inner_html.'</ul>' : '');
 
-		$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-		$latitude      = floatval( $item->latitude );
-		$longitude     = floatval( $item->longitude );
-		$coordinates   = array( $latitude, $longitude, );
-		$geometry      = array( 'type' => 'Point', 'coordinates' => $coordinates, );
+		$popup_content = sprintf('<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink($item->ID), $thumbnail_html, esc_html($item->post_title), $subjects_html);
+		$latitude      = floatval($item->latitude);
+		$longitude     = floatval($item->longitude);
+		$coordinates   = array($latitude, $longitude,);
+		$geometry      = array('type' => 'Point', 'coordinates' => $coordinates,);
 
-		$boundaries[] = array( $longitude, $latitude, );
+		$boundaries[] = array($longitude, $latitude,);
 
 		return array(
 			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $popup_content ),
+			'properties' => array('popupContent' => $popup_content),
 			'geometry'   => $geometry,
 		);
-	}, $results );
+	}, $results);
 
-	return array( 'features' => $features, 'boundaries' => $boundaries, );
+	return array('features' => $features, 'boundaries' => $boundaries,);
 }
 
-add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
-add_action( 'wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax' );
+add_action('wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax');
+add_action('wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax');
 
 /**
  * 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/geomap', array(
+	register_block_type('wordlift/geomap', array(
 		'editor_script'   => 'wl-block-editor',
-		'render_callback' => function ( $attributes ) {
+		'render_callback' => function($attributes) {
 			$attr_code = '';
-			foreach ( $attributes as $key => $value ) {
-				$attr_code .= $key . '="' . $value . '" ';
+			foreach ($attributes as $key => $value) {
+				$attr_code .= $key.'="'.$value.'" ';
 			}
 
-			return '[wl_geomap ' . $attr_code . ']';
+			return '[wl_geomap '.$attr_code.']';
 		},
 		'attributes'      => array(
 			'width'  => array(
@@ -159,7 +159,7 @@ 
 				'default' => false
 			),
 		)
-	) );
+	));
 } );
 
 ///**

src/wordlift/autocomplete/class-linked-data-autocomplete-service.php

Doc Comments +7 added lines, -1 removed lines

@@ -108,6 +108,9 @@ 
 		return $mapped_results;
 	}
 
+	/**
+	 * @param string $query
+	 */
 	private function do_query( $query, $scope = 'cloud', $exclude = '' ) {
 		$url = $this->build_request_url( $query, $exclude, $scope );
 
@@ -139,7 +142,7 @@ 
 	 * Build the autocomplete url.
 	 *
 	 * @param string $query The search string.
-	 * @param array|string $exclude The exclude parameter.
+	 * @param string $exclude The exclude parameter.
 	 * @param string $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
 	 *                      in Wikipedia. By default is "cloud".
 	 *
@@ -171,6 +174,9 @@ 
 		return $request_url;
 	}
 
+	/**
+	 * @param \WP_Post|null $post
+	 */
 	private function post_to_autocomplete_result( $uri, $post ) {
 
 		return array(

Indentation +172 added lines, -172 removed lines

@@ -15,177 +15,177 @@
 
 class Linked_Data_Autocomplete_Service implements Autocomplete_Service {
 
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-	private $entity_helper;
-	private $entity_uri_service;
-	/**
-	 * @var \Wordlift_Entity_Service
-	 */
-	private $entity_service;
-
-	/**
-	 * The {@link Class_Wordlift_Autocomplete_Service} instance.
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 * @param Entity_Helper $entity_helper
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service
-	 * @param \Wordlift_Entity_Service $entity_service
-	 *
-	 * @since 3.15.0
-	 */
-	public function __construct( $configuration_service, $entity_helper, $entity_uri_service, $entity_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
-
-		$this->configuration_service = $configuration_service;
-		$this->entity_helper         = $entity_helper;
-		$this->entity_uri_service    = $entity_uri_service;
-		$this->entity_service        = $entity_service;
-
-	}
-
-	/**
-	 * Make request to external API and return the response.
-	 *
-	 * @param string $query The search string.
-	 * @param string $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
-	 *                      in Wikipedia. By default is "cloud".
-	 * @param array|string $excludes The exclude parameter string.
-	 *
-	 * @return array $response The API response.
-	 * @since 3.15.0
-	 *
-	 */
-	public function query( $query, $scope = 'cloud', $excludes = array() ) {
-
-		$results = $this->do_query( $query, $scope, $excludes );
-
-		$uris = array_reduce( $results, function ( $carry, $result ) {
-
-			$carry[] = $result['id'];
-
-			return array_merge( $carry, $result['sameAss'] );
-		}, array() );
-
-		$mappings = $this->entity_helper->map_many_to_local( $uris );
-
-		$that           = $this;
-		$mapped_results = array_map( function ( $result ) use ( $that, $mappings ) {
-
-			if ( $that->entity_uri_service->is_internal( $result['id'] ) ) {
-				return $result;
-			}
-
-			$uris = array_merge( (array) $result['id'], $result['sameAss'] );
-
-			foreach ( $uris as $uri ) {
-				if ( isset( $mappings[ $uri ] ) ) {
-					$local_entity = $that->entity_uri_service->get_entity( $mappings[ $uri ] );
-
-					return $that->post_to_autocomplete_result( $mappings[ $uri ], $local_entity );
-				}
-			}
-
-			return $result;
-		}, $results );
-
-		return $mapped_results;
-	}
-
-	private function do_query( $query, $scope = 'cloud', $exclude = '' ) {
-		$url = $this->build_request_url( $query, $exclude, $scope );
-
-		// Return the response.
-		$response = wp_remote_get( $url, array(
-			'timeout' => 30
-		) );
-
-		// If the response is valid, then send the suggestions.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
-			// Echo the response.
-			return json_decode( wp_remote_retrieve_body( $response ), true );
-		} else {
-			// Default error message.
-			$error_message = 'Something went wrong.';
-
-			// Get the real error message if there is WP_Error.
-			if ( is_wp_error( $response ) ) {
-				$error_message = $response->get_error_message();
-			}
-
-			$this->log->error( $error_message );
-
-			return array();
-		}
-	}
-
-	/**
-	 * Build the autocomplete url.
-	 *
-	 * @param string $query The search string.
-	 * @param array|string $exclude The exclude parameter.
-	 * @param string $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
-	 *                      in Wikipedia. By default is "cloud".
-	 *
-	 * @return string Built url.
-	 * @since 3.15.0
-	 *
-	 */
-	private function build_request_url( $query, $exclude, $scope ) {
-		$args = array(
-			'key'      => $this->configuration_service->get_key(),
-			'language' => $this->configuration_service->get_language_code(),
-			'query'    => $query,
-			'scope'    => $scope,
-			'limit'    => 10,
-		);
-
-		// Add args to URL.
-		$request_url = add_query_arg(
-			urlencode_deep( $args ),
-			$this->configuration_service->get_autocomplete_url()
-		);
-
-		// Add the exclude parameter.
-		if ( ! empty( $exclude ) ) {
-			$request_url .= "&exclude=" . implode( '&exclude=', array_map( 'urlencode', (array) $exclude ) );
-		}
-
-		// return the built url.
-		return $request_url;
-	}
-
-	private function post_to_autocomplete_result( $uri, $post ) {
-
-		return array(
-			'id'           => $uri,
-			'label'        => array( $post->post_title ),
-			'labels'       => $this->entity_service->get_alternative_labels( $post->ID ),
-			'descriptions' => array( Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post ) ),
-			'scope'        => 'local',
-			'sameAss'      => get_post_meta( $post->ID, \Wordlift_Schema_Service::FIELD_SAME_AS ),
-			// The following properties are less relevant because we're linking entities that exist already in the
-			// vocabulary. That's why we don't make an effort to load the real data.
-			'types'        => array( 'http://schema.org/Thing' ),
-			'urls'         => array(),
-			'images'       => array(),
-		);
-	}
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+    private $entity_helper;
+    private $entity_uri_service;
+    /**
+     * @var \Wordlift_Entity_Service
+     */
+    private $entity_service;
+
+    /**
+     * The {@link Class_Wordlift_Autocomplete_Service} instance.
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     * @param Entity_Helper $entity_helper
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service
+     * @param \Wordlift_Entity_Service $entity_service
+     *
+     * @since 3.15.0
+     */
+    public function __construct( $configuration_service, $entity_helper, $entity_uri_service, $entity_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+
+        $this->configuration_service = $configuration_service;
+        $this->entity_helper         = $entity_helper;
+        $this->entity_uri_service    = $entity_uri_service;
+        $this->entity_service        = $entity_service;
+
+    }
+
+    /**
+     * Make request to external API and return the response.
+     *
+     * @param string $query The search string.
+     * @param string $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
+     *                      in Wikipedia. By default is "cloud".
+     * @param array|string $excludes The exclude parameter string.
+     *
+     * @return array $response The API response.
+     * @since 3.15.0
+     *
+     */
+    public function query( $query, $scope = 'cloud', $excludes = array() ) {
+
+        $results = $this->do_query( $query, $scope, $excludes );
+
+        $uris = array_reduce( $results, function ( $carry, $result ) {
+
+            $carry[] = $result['id'];
+
+            return array_merge( $carry, $result['sameAss'] );
+        }, array() );
+
+        $mappings = $this->entity_helper->map_many_to_local( $uris );
+
+        $that           = $this;
+        $mapped_results = array_map( function ( $result ) use ( $that, $mappings ) {
+
+            if ( $that->entity_uri_service->is_internal( $result['id'] ) ) {
+                return $result;
+            }
+
+            $uris = array_merge( (array) $result['id'], $result['sameAss'] );
+
+            foreach ( $uris as $uri ) {
+                if ( isset( $mappings[ $uri ] ) ) {
+                    $local_entity = $that->entity_uri_service->get_entity( $mappings[ $uri ] );
+
+                    return $that->post_to_autocomplete_result( $mappings[ $uri ], $local_entity );
+                }
+            }
+
+            return $result;
+        }, $results );
+
+        return $mapped_results;
+    }
+
+    private function do_query( $query, $scope = 'cloud', $exclude = '' ) {
+        $url = $this->build_request_url( $query, $exclude, $scope );
+
+        // Return the response.
+        $response = wp_remote_get( $url, array(
+            'timeout' => 30
+        ) );
+
+        // If the response is valid, then send the suggestions.
+        if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+            // Echo the response.
+            return json_decode( wp_remote_retrieve_body( $response ), true );
+        } else {
+            // Default error message.
+            $error_message = 'Something went wrong.';
+
+            // Get the real error message if there is WP_Error.
+            if ( is_wp_error( $response ) ) {
+                $error_message = $response->get_error_message();
+            }
+
+            $this->log->error( $error_message );
+
+            return array();
+        }
+    }
+
+    /**
+     * Build the autocomplete url.
+     *
+     * @param string $query The search string.
+     * @param array|string $exclude The exclude parameter.
+     * @param string $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
+     *                      in Wikipedia. By default is "cloud".
+     *
+     * @return string Built url.
+     * @since 3.15.0
+     *
+     */
+    private function build_request_url( $query, $exclude, $scope ) {
+        $args = array(
+            'key'      => $this->configuration_service->get_key(),
+            'language' => $this->configuration_service->get_language_code(),
+            'query'    => $query,
+            'scope'    => $scope,
+            'limit'    => 10,
+        );
+
+        // Add args to URL.
+        $request_url = add_query_arg(
+            urlencode_deep( $args ),
+            $this->configuration_service->get_autocomplete_url()
+        );
+
+        // Add the exclude parameter.
+        if ( ! empty( $exclude ) ) {
+            $request_url .= "&exclude=" . implode( '&exclude=', array_map( 'urlencode', (array) $exclude ) );
+        }
+
+        // return the built url.
+        return $request_url;
+    }
+
+    private function post_to_autocomplete_result( $uri, $post ) {
+
+        return array(
+            'id'           => $uri,
+            'label'        => array( $post->post_title ),
+            'labels'       => $this->entity_service->get_alternative_labels( $post->ID ),
+            'descriptions' => array( Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post ) ),
+            'scope'        => 'local',
+            'sameAss'      => get_post_meta( $post->ID, \Wordlift_Schema_Service::FIELD_SAME_AS ),
+            // The following properties are less relevant because we're linking entities that exist already in the
+            // vocabulary. That's why we don't make an effort to load the real data.
+            'types'        => array( 'http://schema.org/Thing' ),
+            'urls'         => array(),
+            'images'       => array(),
+        );
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -49,9 +49,9 @@ 
 	 *
 	 * @since 3.15.0
 	 */
-	public function __construct( $configuration_service, $entity_helper, $entity_uri_service, $entity_service ) {
+	public function __construct($configuration_service, $entity_helper, $entity_uri_service, $entity_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Autocomplete_Service');
 
 		$this->configuration_service = $configuration_service;
 		$this->entity_helper         = $entity_helper;
@@ -72,64 +72,64 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public function query( $query, $scope = 'cloud', $excludes = array() ) {
+	public function query($query, $scope = 'cloud', $excludes = array()) {
 
-		$results = $this->do_query( $query, $scope, $excludes );
+		$results = $this->do_query($query, $scope, $excludes);
 
-		$uris = array_reduce( $results, function ( $carry, $result ) {
+		$uris = array_reduce($results, function($carry, $result) {
 
 			$carry[] = $result['id'];
 
-			return array_merge( $carry, $result['sameAss'] );
-		}, array() );
+			return array_merge($carry, $result['sameAss']);
+		}, array());
 
-		$mappings = $this->entity_helper->map_many_to_local( $uris );
+		$mappings = $this->entity_helper->map_many_to_local($uris);
 
 		$that           = $this;
-		$mapped_results = array_map( function ( $result ) use ( $that, $mappings ) {
+		$mapped_results = array_map(function($result) use ($that, $mappings) {
 
-			if ( $that->entity_uri_service->is_internal( $result['id'] ) ) {
+			if ($that->entity_uri_service->is_internal($result['id'])) {
 				return $result;
 			}
 
-			$uris = array_merge( (array) $result['id'], $result['sameAss'] );
+			$uris = array_merge((array) $result['id'], $result['sameAss']);
 
-			foreach ( $uris as $uri ) {
-				if ( isset( $mappings[ $uri ] ) ) {
-					$local_entity = $that->entity_uri_service->get_entity( $mappings[ $uri ] );
+			foreach ($uris as $uri) {
+				if (isset($mappings[$uri])) {
+					$local_entity = $that->entity_uri_service->get_entity($mappings[$uri]);
 
-					return $that->post_to_autocomplete_result( $mappings[ $uri ], $local_entity );
+					return $that->post_to_autocomplete_result($mappings[$uri], $local_entity);
 				}
 			}
 
 			return $result;
-		}, $results );
+		}, $results);
 
 		return $mapped_results;
 	}
 
-	private function do_query( $query, $scope = 'cloud', $exclude = '' ) {
-		$url = $this->build_request_url( $query, $exclude, $scope );
+	private function do_query($query, $scope = 'cloud', $exclude = '') {
+		$url = $this->build_request_url($query, $exclude, $scope);
 
 		// Return the response.
-		$response = wp_remote_get( $url, array(
+		$response = wp_remote_get($url, array(
 			'timeout' => 30
-		) );
+		));
 
 		// If the response is valid, then send the suggestions.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+		if ( ! is_wp_error($response) && 200 === (int) $response['response']['code']) {
 			// Echo the response.
-			return json_decode( wp_remote_retrieve_body( $response ), true );
+			return json_decode(wp_remote_retrieve_body($response), true);
 		} else {
 			// Default error message.
 			$error_message = 'Something went wrong.';
 
 			// Get the real error message if there is WP_Error.
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				$error_message = $response->get_error_message();
 			}
 
-			$this->log->error( $error_message );
+			$this->log->error($error_message);
 
 			return array();
 		}
@@ -147,7 +147,7 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	private function build_request_url( $query, $exclude, $scope ) {
+	private function build_request_url($query, $exclude, $scope) {
 		$args = array(
 			'key'      => $this->configuration_service->get_key(),
 			'language' => $this->configuration_service->get_language_code(),
@@ -158,31 +158,31 @@ 
 
 		// Add args to URL.
 		$request_url = add_query_arg(
-			urlencode_deep( $args ),
+			urlencode_deep($args),
 			$this->configuration_service->get_autocomplete_url()
 		);
 
 		// Add the exclude parameter.
-		if ( ! empty( $exclude ) ) {
-			$request_url .= "&exclude=" . implode( '&exclude=', array_map( 'urlencode', (array) $exclude ) );
+		if ( ! empty($exclude)) {
+			$request_url .= "&exclude=".implode('&exclude=', array_map('urlencode', (array) $exclude));
 		}
 
 		// return the built url.
 		return $request_url;
 	}
 
-	private function post_to_autocomplete_result( $uri, $post ) {
+	private function post_to_autocomplete_result($uri, $post) {
 
 		return array(
 			'id'           => $uri,
-			'label'        => array( $post->post_title ),
-			'labels'       => $this->entity_service->get_alternative_labels( $post->ID ),
-			'descriptions' => array( Wordlift_Post_Excerpt_Helper::get_text_excerpt( $post ) ),
+			'label'        => array($post->post_title),
+			'labels'       => $this->entity_service->get_alternative_labels($post->ID),
+			'descriptions' => array(Wordlift_Post_Excerpt_Helper::get_text_excerpt($post)),
 			'scope'        => 'local',
-			'sameAss'      => get_post_meta( $post->ID, \Wordlift_Schema_Service::FIELD_SAME_AS ),
+			'sameAss'      => get_post_meta($post->ID, \Wordlift_Schema_Service::FIELD_SAME_AS),
 			// The following properties are less relevant because we're linking entities that exist already in the
 			// vocabulary. That's why we don't make an effort to load the real data.
-			'types'        => array( 'http://schema.org/Thing' ),
+			'types'        => array('http://schema.org/Thing'),
 			'urls'         => array(),
 			'images'       => array(),
 		);

src/modules/analyzer/wordlift_analyzer.php

Indentation +32 added lines, -32 removed lines

@@ -14,11 +14,11 @@ 
  */
 function wl_ajax_analyze_action() {
 
-	check_admin_referer( 'wl_analyze' );
+    check_admin_referer( 'wl_analyze' );
 
-	$data = filter_input( INPUT_POST, 'data' );
+    $data = filter_input( INPUT_POST, 'data' );
 
-	wp_send_json_success( wl_analyze_content( $data, 'application/json; ' . get_bloginfo( 'charset' ) ) );
+    wp_send_json_success( wl_analyze_content( $data, 'application/json; ' . get_bloginfo( 'charset' ) ) );
 
 }
 
@@ -45,47 +45,47 @@ 
 //	// Set the content type to the request content type or to text/plain by default.
 //	$content_type = isset( $_SERVER['CONTENT_TYPE'] ) ? $_SERVER['CONTENT_TYPE'] : 'text/plain';
 
-	add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
-	$json = Wordlift_Api_Service::get_instance()
-	                            ->post_custom_content_type( 'analysis/single', $data, $content_type );
-	remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+    add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+    $json = Wordlift_Api_Service::get_instance()
+                                ->post_custom_content_type( 'analysis/single', $data, $content_type );
+    remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
 
-	// If it's an error log it.
-	if ( is_wp_error( $json ) ) {
-		$request_body = json_decode( $data, true );
+    // If it's an error log it.
+    if ( is_wp_error( $json ) ) {
+        $request_body = json_decode( $data, true );
 
-		return Analysis_Response_Ops_Factory::get_instance()
-		                                    ->create( json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' ) )
-		                                    ->make_entities_local()
-		                                    ->add_occurrences( $request_body['content'] )
-		                                    ->get_json();
-	}
+        return Analysis_Response_Ops_Factory::get_instance()
+                                            ->create( json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' ) )
+                                            ->make_entities_local()
+                                            ->add_occurrences( $request_body['content'] )
+                                            ->get_json();
+    }
 
-	/*
+    /*
 	 * We pass the response to the Analysis_Response_Ops to ensure that we make remote entities local.
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/944
 	 * @since 3.21.5
 	 */
 
-	// Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
-	// the occurrences for the local entities.
-	if ( 0 === strpos( $content_type, 'application/json' ) ) {
-		$request_json    = json_decode( $data );
-		$request_content = $request_json->content;
-	} else {
-		$request_content = $data;
-	}
-
-	return Analysis_Response_Ops_Factory::get_instance()
-	                                    ->create( $json )
-	                                    ->make_entities_local()
-	                                    ->add_occurrences( $request_content )
-	                                    ->get_json();
+    // Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
+    // the occurrences for the local entities.
+    if ( 0 === strpos( $content_type, 'application/json' ) ) {
+        $request_json    = json_decode( $data );
+        $request_content = $request_json->content;
+    } else {
+        $request_content = $data;
+    }
+
+    return Analysis_Response_Ops_Factory::get_instance()
+                                        ->create( $json )
+                                        ->make_entities_local()
+                                        ->add_occurrences( $request_content )
+                                        ->get_json();
 
 }
 
 function wl_use_analysis_on_api_wordlift_io( $value ) {
 
-	return preg_replace( '|https://api\.wordlift\.it/|', 'https://api.wordlift.io/', $value );
+    return preg_replace( '|https://api\.wordlift\.it/|', 'https://api.wordlift.io/', $value );
 }

Spacing +18 added lines, -18 removed lines

@@ -14,15 +14,15 @@ 
  */
 function wl_ajax_analyze_action() {
 
-	check_admin_referer( 'wl_analyze' );
+	check_admin_referer('wl_analyze');
 
-	$data = filter_input( INPUT_POST, 'data' );
+	$data = filter_input(INPUT_POST, 'data');
 
-	wp_send_json_success( wl_analyze_content( $data, 'application/json; ' . get_bloginfo( 'charset' ) ) );
+	wp_send_json_success(wl_analyze_content($data, 'application/json; '.get_bloginfo('charset')));
 
 }
 
-add_action( 'wp_ajax_wl_analyze', 'wl_ajax_analyze_action' );
+add_action('wp_ajax_wl_analyze', 'wl_ajax_analyze_action');
 
 /**
  * Analyze the provided content. The analysis will make use of the method *wl_ajax_analyze_action*
@@ -40,24 +40,24 @@ 
  * @since 3.24.2 We don't return an error anymore, but an empty analysis response. This is required to allow the editor
  *   to manage entities or to manually add them even when analysis isn't available.
  */
-function wl_analyze_content( $data, $content_type ) {
+function wl_analyze_content($data, $content_type) {
 
 //	// Set the content type to the request content type or to text/plain by default.
 //	$content_type = isset( $_SERVER['CONTENT_TYPE'] ) ? $_SERVER['CONTENT_TYPE'] : 'text/plain';
 
-	add_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+	add_filter('wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io');
 	$json = Wordlift_Api_Service::get_instance()
-	                            ->post_custom_content_type( 'analysis/single', $data, $content_type );
-	remove_filter( 'wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io' );
+	                            ->post_custom_content_type('analysis/single', $data, $content_type);
+	remove_filter('wl_api_service_api_url_path', 'wl_use_analysis_on_api_wordlift_io');
 
 	// If it's an error log it.
-	if ( is_wp_error( $json ) ) {
-		$request_body = json_decode( $data, true );
+	if (is_wp_error($json)) {
+		$request_body = json_decode($data, true);
 
 		return Analysis_Response_Ops_Factory::get_instance()
-		                                    ->create( json_decode( '{ "entities": {}, "annotations": {}, "topics": {} }' ) )
+		                                    ->create(json_decode('{ "entities": {}, "annotations": {}, "topics": {} }'))
 		                                    ->make_entities_local()
-		                                    ->add_occurrences( $request_body['content'] )
+		                                    ->add_occurrences($request_body['content'])
 		                                    ->get_json();
 	}
 
@@ -70,22 +70,22 @@ 
 
 	// Get the actual content sent to the analysis, so that we can pass it to the Analysis_Response_Ops to populate
 	// the occurrences for the local entities.
-	if ( 0 === strpos( $content_type, 'application/json' ) ) {
-		$request_json    = json_decode( $data );
+	if (0 === strpos($content_type, 'application/json')) {
+		$request_json    = json_decode($data);
 		$request_content = $request_json->content;
 	} else {
 		$request_content = $data;
 	}
 
 	return Analysis_Response_Ops_Factory::get_instance()
-	                                    ->create( $json )
+	                                    ->create($json)
 	                                    ->make_entities_local()
-	                                    ->add_occurrences( $request_content )
+	                                    ->add_occurrences($request_content)
 	                                    ->get_json();
 
 }
 
-function wl_use_analysis_on_api_wordlift_io( $value ) {
+function wl_use_analysis_on_api_wordlift_io($value) {
 
-	return preg_replace( '|https://api\.wordlift\.it/|', 'https://api.wordlift.io/', $value );
+	return preg_replace('|https://api\.wordlift\.it/|', 'https://api.wordlift.io/', $value);
 }

src/public/class-wordlift-public.php

Indentation +187 added lines, -187 removed lines

@@ -22,109 +22,109 @@ 
  */
 class Wordlift_Public {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @param string $plugin_name The name of the plugin.
-	 * @param string $version The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 *
-	 */
-	public function __construct( $plugin_name, $version ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since 3.19.3 Register the `wordlift-ui` css.
-	 * @since 3.19.2 The call to this function is commented out in `class-wordlift.php` because `wordlift-public.css`
-	 *               is empty.
-	 * @since 1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		/**
-		 * Add the `wordlift-font-awesome` unless some 3rd party sets the flag to false.
-		 *
-		 * @param bool $include Whether to include or not font-awesome (default true).
-		 *
-		 * @since 3.19.3
-		 *
-		 */
-		$deps = apply_filters( 'wl_include_font_awesome', true )
-			? array( 'wordlift-font-awesome' )
-			: array();
-		wp_register_style( 'wordlift-font-awesome', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
-
-		// You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/821
-		//
-		// wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the stylesheets for the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		$settings = self::get_settings();
-
-		// Note that we switched the js to be loaded in footer, since it is loading
-		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
-
-		/*
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @param string $plugin_name The name of the plugin.
+     * @param string $version The version of this plugin.
+     *
+     * @since    1.0.0
+     *
+     */
+    public function __construct( $plugin_name, $version ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since 3.19.3 Register the `wordlift-ui` css.
+     * @since 3.19.2 The call to this function is commented out in `class-wordlift.php` because `wordlift-public.css`
+     *               is empty.
+     * @since 1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        /**
+         * Add the `wordlift-font-awesome` unless some 3rd party sets the flag to false.
+         *
+         * @param bool $include Whether to include or not font-awesome (default true).
+         *
+         * @since 3.19.3
+         *
+         */
+        $deps = apply_filters( 'wl_include_font_awesome', true )
+            ? array( 'wordlift-font-awesome' )
+            : array();
+        wp_register_style( 'wordlift-font-awesome', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
+        wp_register_style( 'wordlift-ui', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
+
+        // You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/821
+        //
+        // wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-public.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the stylesheets for the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        $settings = self::get_settings();
+
+        // Note that we switched the js to be loaded in footer, since it is loading
+        // the json-ld representation.
+        wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
+        wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+
+        /*
 		 * Add WordLift's version.
 		 * Can be disabled via filter 'wl_disable_version_js' since 3.21.1
 		 *
@@ -133,96 +133,96 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/843.
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/926.
 		 */
-		$show_version_default = false;
-		$show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
+        $show_version_default = false;
+        $show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
 
-		if ( $show_version ) {
-			wp_localize_script( $this->plugin_name, 'wordlift', array(
-				'version' => $this->version,
-			) );
-		}
+        if ( $show_version ) {
+            wp_localize_script( $this->plugin_name, 'wordlift', array(
+                'version' => $this->version,
+            ) );
+        }
 
-		/*
+        /*
 		 * Register wordlift-cloud script which is shared by
 		 * Context Cards and Navigator
 		 *
 		 * @since 3.22.0
 		 *
 		 */
-		wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), array(), Wordlift::get_instance()->get_version(), true );
-
-	}
-
-	/**
-	 * Get the settings array.
-	 *
-	 * @return array An array with the settings.
-	 * @since 3.19.1
-	 *
-	 */
-	public static function get_settings() {
-
-		// Prepare a settings array for client-side functions.
-		$settings = array(
-			'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
-			'apiUrl'     => get_home_url( null, 'wl-api/' ),
-			'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' )
-		);
-
-		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
-			$settings['postId'] = get_the_ID();
-		}
-
-		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
-			$settings['isHome'] = true;
-		}
-
-		// As of 2020-02-15, we publish the JSON-LD in the head, see Jsonld_Adaper.
-		$settings['jsonld_enabled'] = false;
-
-		// By default only enable JSON-LD on supported entity pages (includes
-		// `page`, `post` and `entity` by default) and on the home page.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/733
-		//	$jsonld_enabled = is_home() || is_front_page() || Wordlift_Entity_Type_Service::is_valid_entity_post_type( get_post_type() );
-
-		// Add the JSON-LD enabled flag, when set to false, the JSON-LD won't
-		// be loaded.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/642.
-		// $settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', $jsonld_enabled );
-
-		return $settings;
-	}
-
-	/**
-	 * Get the public JavaScript URL.
-	 *
-	 * Using this function is encouraged, since the public JavaScript is also used by the {@link Wordlift_WpRocket_Adapter}
-	 * in order to avoid breaking optimizations.
-	 *
-	 * @return string The URL to the public JavaScript.
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/842.
-	 *
-	 * @since 3.19.4
-	 *
-	 */
-	public static function get_public_js_url() {
-
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/bundle.js';
-	}
-
-	/**
-	 * Get the Cloud JavaScript URL.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/971
-	 * @since 3.23.0
-	 * @return string The URL to the Cloud JavaScript.
-	 */
-	public static function get_cloud_js_url() {
-
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/wordlift-cloud.js';
-	}
+        wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), array(), Wordlift::get_instance()->get_version(), true );
+
+    }
+
+    /**
+     * Get the settings array.
+     *
+     * @return array An array with the settings.
+     * @since 3.19.1
+     *
+     */
+    public static function get_settings() {
+
+        // Prepare a settings array for client-side functions.
+        $settings = array(
+            'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
+            'apiUrl'     => get_home_url( null, 'wl-api/' ),
+            'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' )
+        );
+
+        // If we're in a single page, then print out the post id.
+        if ( is_singular() ) {
+            $settings['postId'] = get_the_ID();
+        }
+
+        // Add flag that we are on home/blog page.
+        if ( is_home() || is_front_page() ) {
+            $settings['isHome'] = true;
+        }
+
+        // As of 2020-02-15, we publish the JSON-LD in the head, see Jsonld_Adaper.
+        $settings['jsonld_enabled'] = false;
+
+        // By default only enable JSON-LD on supported entity pages (includes
+        // `page`, `post` and `entity` by default) and on the home page.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/733
+        //	$jsonld_enabled = is_home() || is_front_page() || Wordlift_Entity_Type_Service::is_valid_entity_post_type( get_post_type() );
+
+        // Add the JSON-LD enabled flag, when set to false, the JSON-LD won't
+        // be loaded.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/642.
+        // $settings['jsonld_enabled'] = apply_filters( 'wl_jsonld_enabled', $jsonld_enabled );
+
+        return $settings;
+    }
+
+    /**
+     * Get the public JavaScript URL.
+     *
+     * Using this function is encouraged, since the public JavaScript is also used by the {@link Wordlift_WpRocket_Adapter}
+     * in order to avoid breaking optimizations.
+     *
+     * @return string The URL to the public JavaScript.
+     * @see https://github.com/insideout10/wordlift-plugin/issues/842.
+     *
+     * @since 3.19.4
+     *
+     */
+    public static function get_public_js_url() {
+
+        return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/bundle.js';
+    }
+
+    /**
+     * Get the Cloud JavaScript URL.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/971
+     * @since 3.23.0
+     * @return string The URL to the Cloud JavaScript.
+     */
+    public static function get_cloud_js_url() {
+
+        return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/wordlift-cloud.js';
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -49,7 +49,7 @@ 
 	 * @since    1.0.0
 	 *
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -84,11 +84,11 @@ 
 		 * @since 3.19.3
 		 *
 		 */
-		$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_register_style( 'wordlift-font-awesome', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-font-awesome' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), $this->version, 'all' );
-		wp_register_style( 'wordlift-ui', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-ui' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', $deps, $this->version, 'all' );
+		wp_register_style('wordlift-font-awesome', plugin_dir_url(dirname(__FILE__)).'css/wordlift-font-awesome'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', array(), $this->version, 'all');
+		wp_register_style('wordlift-ui', plugin_dir_url(dirname(__FILE__)).'css/wordlift-ui'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', $deps, $this->version, 'all');
 
 		// You need to re-enable the enqueue_styles in `class-wordlift.php` to make this effective.
 		//
@@ -121,8 +121,8 @@ 
 
 		// Note that we switched the js to be loaded in footer, since it is loading
 		// the json-ld representation.
-		wp_enqueue_script( $this->plugin_name, self::get_public_js_url(), array(), $this->version, true );
-		wp_localize_script( $this->plugin_name, 'wlSettings', $settings );
+		wp_enqueue_script($this->plugin_name, self::get_public_js_url(), array(), $this->version, true);
+		wp_localize_script($this->plugin_name, 'wlSettings', $settings);
 
 		/*
 		 * Add WordLift's version.
@@ -134,12 +134,12 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/926.
 		 */
 		$show_version_default = false;
-		$show_version         = apply_filters( 'wl_disable_version_js', $show_version_default );
+		$show_version         = apply_filters('wl_disable_version_js', $show_version_default);
 
-		if ( $show_version ) {
-			wp_localize_script( $this->plugin_name, 'wordlift', array(
+		if ($show_version) {
+			wp_localize_script($this->plugin_name, 'wordlift', array(
 				'version' => $this->version,
-			) );
+			));
 		}
 
 		/*
@@ -149,7 +149,7 @@ 
 		 * @since 3.22.0
 		 *
 		 */
-		wp_register_script( 'wordlift-cloud', self::get_cloud_js_url(), array(), Wordlift::get_instance()->get_version(), true );
+		wp_register_script('wordlift-cloud', self::get_cloud_js_url(), array(), Wordlift::get_instance()->get_version(), true);
 
 	}
 
@@ -164,18 +164,18 @@ 
 
 		// Prepare a settings array for client-side functions.
 		$settings = array(
-			'ajaxUrl'    => admin_url( 'admin-ajax.php' ),
-			'apiUrl'     => get_home_url( null, 'wl-api/' ),
-			'jsonld_url' => rest_url( '/wordlift/v1/jsonld/' )
+			'ajaxUrl'    => admin_url('admin-ajax.php'),
+			'apiUrl'     => get_home_url(null, 'wl-api/'),
+			'jsonld_url' => rest_url('/wordlift/v1/jsonld/')
 		);
 
 		// If we're in a single page, then print out the post id.
-		if ( is_singular() ) {
+		if (is_singular()) {
 			$settings['postId'] = get_the_ID();
 		}
 
 		// Add flag that we are on home/blog page.
-		if ( is_home() || is_front_page() ) {
+		if (is_home() || is_front_page()) {
 			$settings['isHome'] = true;
 		}
 
@@ -211,7 +211,7 @@ 
 	 */
 	public static function get_public_js_url() {
 
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/bundle.js';
+		return plugin_dir_url(dirname(__FILE__)).'js/dist/bundle.js';
 	}
 
 	/**
@@ -223,6 +223,6 @@ 
 	 */
 	public static function get_cloud_js_url() {
 
-		return plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/wordlift-cloud.js';
+		return plugin_dir_url(dirname(__FILE__)).'js/dist/wordlift-cloud.js';
 	}
 }

src/wordlift_entity_type.php

Indentation +25 added lines, -25 removed lines

@@ -11,8 +11,8 @@ 
  */
 function wl_set_entity_main_type( $post_id, $type_uri ) {
 
-	Wordlift_Entity_Type_Service::get_instance()
-	                            ->set( $post_id, $type_uri );
+    Wordlift_Entity_Type_Service::get_instance()
+                                ->set( $post_id, $type_uri );
 
 }
 
@@ -21,35 +21,35 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'get' => 'all', ) );
+    $terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'get' => 'all', ) );
 
-	// Load the type data.
-	$schema_service = Wordlift_Schema_Service::get_instance();
-	$entity_types   = array_reduce( $terms, function ( $carry, $term ) use ( $schema_service ) {
-		$type = $schema_service->get_schema( $term->slug );
+    // Load the type data.
+    $schema_service = Wordlift_Schema_Service::get_instance();
+    $entity_types   = array_reduce( $terms, function ( $carry, $term ) use ( $schema_service ) {
+        $type = $schema_service->get_schema( $term->slug );
 
-		// Skip if no `uri`.
-		if ( empty( $type['uri'] ) ) {
-			return $carry;
-		}
+        // Skip if no `uri`.
+        if ( empty( $type['uri'] ) ) {
+            return $carry;
+        }
 
-		$carry[] = array(
-			'label'     => $term->name,
-			'uri'       => $type['uri'],
-			'css'       => $type['css_class'],
-			'sameAs'    => isset( $type['same_as'] ) ? $type['same_as'] : array(),
-			'slug'      => $term->slug,
-			'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
-		);
+        $carry[] = array(
+            'label'     => $term->name,
+            'uri'       => $type['uri'],
+            'css'       => $type['css_class'],
+            'sameAs'    => isset( $type['same_as'] ) ? $type['same_as'] : array(),
+            'slug'      => $term->slug,
+            'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
+        );
 
-		return $carry;
-	}, array() );
+        return $carry;
+    }, array() );
 
-	// Hook to the Block Editor script.
-	wp_localize_script( 'wl-block-editor', '_wlEntityTypes', $entity_types );
+    // Hook to the Block Editor script.
+    wp_localize_script( 'wl-block-editor', '_wlEntityTypes', $entity_types );
 
-	// Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
-	wp_localize_script( 'wl-classic-editor', '_wlEntityTypes', $entity_types );
+    // Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
+    wp_localize_script( 'wl-classic-editor', '_wlEntityTypes', $entity_types );
 
 }
 

Spacing +13 added lines, -13 removed lines

@@ -9,10 +9,10 @@ 
  * @deprecated use Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri )
  *
  */
-function wl_set_entity_main_type( $post_id, $type_uri ) {
+function wl_set_entity_main_type($post_id, $type_uri) {
 
 	Wordlift_Entity_Type_Service::get_instance()
-	                            ->set( $post_id, $type_uri );
+	                            ->set($post_id, $type_uri);
 
 }
 
@@ -21,15 +21,15 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array( 'get' => 'all', ) );
+	$terms = get_terms(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, array('get' => 'all',));
 
 	// Load the type data.
 	$schema_service = Wordlift_Schema_Service::get_instance();
-	$entity_types   = array_reduce( $terms, function ( $carry, $term ) use ( $schema_service ) {
-		$type = $schema_service->get_schema( $term->slug );
+	$entity_types   = array_reduce($terms, function($carry, $term) use ($schema_service) {
+		$type = $schema_service->get_schema($term->slug);
 
 		// Skip if no `uri`.
-		if ( empty( $type['uri'] ) ) {
+		if (empty($type['uri'])) {
 			return $carry;
 		}
 
@@ -37,22 +37,22 @@ 
 			'label'     => $term->name,
 			'uri'       => $type['uri'],
 			'css'       => $type['css_class'],
-			'sameAs'    => isset( $type['same_as'] ) ? $type['same_as'] : array(),
+			'sameAs'    => isset($type['same_as']) ? $type['same_as'] : array(),
 			'slug'      => $term->slug,
-			'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
+			'templates' => (isset($type['templates']) ? $type['templates'] : array()),
 		);
 
 		return $carry;
-	}, array() );
+	}, array());
 
 	// Hook to the Block Editor script.
-	wp_localize_script( 'wl-block-editor', '_wlEntityTypes', $entity_types );
+	wp_localize_script('wl-block-editor', '_wlEntityTypes', $entity_types);
 
 	// Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
-	wp_localize_script( 'wl-classic-editor', '_wlEntityTypes', $entity_types );
+	wp_localize_script('wl-classic-editor', '_wlEntityTypes', $entity_types);
 
 }
 
 // Allow Classic and Block Editor scripts to register first.
-add_action( 'admin_print_scripts-post.php', 'wl_print_entity_type_inline_js', 11 );
-add_action( 'admin_print_scripts-post-new.php', 'wl_print_entity_type_inline_js', 11 );
+add_action('admin_print_scripts-post.php', 'wl_print_entity_type_inline_js', 11);
+add_action('admin_print_scripts-post-new.php', 'wl_print_entity_type_inline_js', 11);

src/admin/class-wordlift-admin-dashboard-v2.php

Indentation +191 added lines, -191 removed lines

@@ -5,133 +5,133 @@ 
 
 class Wordlift_Admin_Dashboard_V2 {
 
-	const TODAYS_TIP = 'wl_todays_tip_data';
-	const AVERAGE_POSITION = 'wl_search_rankings_average_position';
-
-	/**
-	 * The {@link Wordlift_Admin_Search_Rankings_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Admin_Search_Rankings_Service $search_rankings_service The {@link Wordlift_Admin_Search_Rankings_Service} instance.
-	 */
-	private $search_rankings_service;
-
-	/**
-	 * The {@link Wordlift_Dashboard_Service} instance.
-	 *
-	 * @var \Wordlift_Dashboard_Service $dashboard_service The {@link Wordlift_Dashboard_Service} instance.
-	 * @access private
-	 * @since 3.20.0
-	 */
-	private $dashboard_service;
-
-	/**
-	 * @var \Wordlift_Entity_Service $entity_service
-	 */
-	private $entity_service;
-
-	/**
-	 * Wordlift_Admin_Dashboard_V2 constructor.
-	 *
-	 * @param \Wordlift_Admin_Search_Rankings_Service $search_rankings_service The {@link Wordlift_Admin_Search_Rankings_Service} instance.
-	 * @param                                         $dashboard_service
-	 *
-	 * @since 3.20.0
-	 *
-	 */
-	public function __construct( $search_rankings_service, $dashboard_service, $entity_service ) {
-
-		add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
-
-		// Define where to access the tip.
-		defined( 'WL_TODAYS_TIP_JSON_URL' ) || define( 'WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_IT' ) || define( 'WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_EN' ) || define( 'WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38' );
-
-		$this->search_rankings_service = $search_rankings_service;
-		$this->dashboard_service       = $dashboard_service;
-		$this->entity_service          = $entity_service;
-
-	}
-
-	/**
-	 * Set up the dashboard metabox.
-	 *
-	 * @since 3.20.0
-	 */
-	public function dashboard_setup() {
-
-		wp_add_dashboard_widget(
-			'wl-dashboard-v2',
-			__( 'WordLift Dashboard', 'wordlift' ),
-			array( $this, 'dashboard_setup_callback' )
-		);
-
-	}
-
-	/**
-	 * The dashboard setup callback.
-	 *
-	 * @since 3.20.0
-	 */
-	public function dashboard_setup_callback() {
-
-		// Get the average position.
-		$average_position_string = $this->get_average_position();
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-dashboard-v2.php';
-
-	}
-
-	/**
-	 * Get the keyword average position.
-	 *
-	 * @return string The formatted average position string (or `n/a` if not available).
-	 * @since 3.20.0
-	 *
-	 */
-	private function get_average_position() {
-
-		// Get the cache value.
-		$average_position = get_transient( self::AVERAGE_POSITION );
-
-		// If there's no cached value, load it.
-		if ( false === $average_position ) {
-			// Get the average position from Search Ranking Service.
-			$average_position = @$this->search_rankings_service->get_average_position();
-
-			// If there was an error return 'n/a'.
-			if ( false === $average_position ) {
-				return esc_html( _x( 'n/a', 'Dashboard', 'wordlift' ) );
-			}
-		}
-
-		// Store the value for one day.
-		set_transient( self::AVERAGE_POSITION, $average_position, 86400 ); // One day.
-
-		// Format the average position with one decimal.
-		return number_format( $average_position, 1 );
-	}
-
-	/**
-	 * Get the top entities.
-	 *
-	 * @return array|object|null An array of top entities.
-	 * @since 3.20.0
-	 *
-	 */
-	private function get_top_entities() {
-
-		// Get the cached results.
-		$results = get_transient( '_wl_admin_dashboard_v2__top_entities' );
-		if ( false !== $results ) {
-			return $results;
-		}
-
-		global $wpdb;
-
-		$query = <<<EOF
+    const TODAYS_TIP = 'wl_todays_tip_data';
+    const AVERAGE_POSITION = 'wl_search_rankings_average_position';
+
+    /**
+     * The {@link Wordlift_Admin_Search_Rankings_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Admin_Search_Rankings_Service $search_rankings_service The {@link Wordlift_Admin_Search_Rankings_Service} instance.
+     */
+    private $search_rankings_service;
+
+    /**
+     * The {@link Wordlift_Dashboard_Service} instance.
+     *
+     * @var \Wordlift_Dashboard_Service $dashboard_service The {@link Wordlift_Dashboard_Service} instance.
+     * @access private
+     * @since 3.20.0
+     */
+    private $dashboard_service;
+
+    /**
+     * @var \Wordlift_Entity_Service $entity_service
+     */
+    private $entity_service;
+
+    /**
+     * Wordlift_Admin_Dashboard_V2 constructor.
+     *
+     * @param \Wordlift_Admin_Search_Rankings_Service $search_rankings_service The {@link Wordlift_Admin_Search_Rankings_Service} instance.
+     * @param                                         $dashboard_service
+     *
+     * @since 3.20.0
+     *
+     */
+    public function __construct( $search_rankings_service, $dashboard_service, $entity_service ) {
+
+        add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
+
+        // Define where to access the tip.
+        defined( 'WL_TODAYS_TIP_JSON_URL' ) || define( 'WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog' );
+        defined( 'WL_TODAYS_TIP_JSON_URL_IT' ) || define( 'WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27' );
+        defined( 'WL_TODAYS_TIP_JSON_URL_EN' ) || define( 'WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38' );
+
+        $this->search_rankings_service = $search_rankings_service;
+        $this->dashboard_service       = $dashboard_service;
+        $this->entity_service          = $entity_service;
+
+    }
+
+    /**
+     * Set up the dashboard metabox.
+     *
+     * @since 3.20.0
+     */
+    public function dashboard_setup() {
+
+        wp_add_dashboard_widget(
+            'wl-dashboard-v2',
+            __( 'WordLift Dashboard', 'wordlift' ),
+            array( $this, 'dashboard_setup_callback' )
+        );
+
+    }
+
+    /**
+     * The dashboard setup callback.
+     *
+     * @since 3.20.0
+     */
+    public function dashboard_setup_callback() {
+
+        // Get the average position.
+        $average_position_string = $this->get_average_position();
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-dashboard-v2.php';
+
+    }
+
+    /**
+     * Get the keyword average position.
+     *
+     * @return string The formatted average position string (or `n/a` if not available).
+     * @since 3.20.0
+     *
+     */
+    private function get_average_position() {
+
+        // Get the cache value.
+        $average_position = get_transient( self::AVERAGE_POSITION );
+
+        // If there's no cached value, load it.
+        if ( false === $average_position ) {
+            // Get the average position from Search Ranking Service.
+            $average_position = @$this->search_rankings_service->get_average_position();
+
+            // If there was an error return 'n/a'.
+            if ( false === $average_position ) {
+                return esc_html( _x( 'n/a', 'Dashboard', 'wordlift' ) );
+            }
+        }
+
+        // Store the value for one day.
+        set_transient( self::AVERAGE_POSITION, $average_position, 86400 ); // One day.
+
+        // Format the average position with one decimal.
+        return number_format( $average_position, 1 );
+    }
+
+    /**
+     * Get the top entities.
+     *
+     * @return array|object|null An array of top entities.
+     * @since 3.20.0
+     *
+     */
+    private function get_top_entities() {
+
+        // Get the cached results.
+        $results = get_transient( '_wl_admin_dashboard_v2__top_entities' );
+        if ( false !== $results ) {
+            return $results;
+        }
+
+        global $wpdb;
+
+        $query = <<<EOF
 SELECT p.ID
      , p.post_title
      , coalesce(sum(case when obj_t.slug is null then 1 end), 0)     entities
@@ -161,26 +161,26 @@ 
 LIMIT 20;
 EOF;
 
-		$results = $wpdb->get_results( $query );
-		set_transient( '_wl_admin_dashboard_v2__top_entities', $results, 900 );
+        $results = $wpdb->get_results( $query );
+        set_transient( '_wl_admin_dashboard_v2__top_entities', $results, 900 );
 
-		return $results;
-	}
+        return $results;
+    }
 
-	/**
-	 * Get the today's tip block.
-	 *
-	 * @since 3.20.0
-	 */
-	public static function get_todays_tip_block() {
+    /**
+     * Get the today's tip block.
+     *
+     * @since 3.20.0
+     */
+    public static function get_todays_tip_block() {
 
-		$data = @self::get_todays_tip_data();
+        $data = @self::get_todays_tip_data();
 
-		// Unable to get data from the local cache, nor from the remote URL.
-		if ( false === $data ) {
-			return;
-		}
-		?>
+        // Unable to get data from the local cache, nor from the remote URL.
+        if ( false === $data ) {
+            return;
+        }
+        ?>
 
         <div id="wl-todays-tip" class="wl-dashboard__block wl-dashboard__block--todays-tip">
             <header>
@@ -195,53 +195,53 @@ 
         </div>
 		<?php
 
-	}
-
-	/**
-	 * Get the today's tip data.
-	 *
-	 * @return array|false The today's tip data or false in case of error.
-	 * @since 3.20.0
-	 *
-	 */
-	private static function get_todays_tip_data() {
-
-		// Return the transient.
-		if ( false !== get_transient( self::TODAYS_TIP ) ) {
-			return get_transient( self::TODAYS_TIP );
-		}
-
-		// If the transient isn't available, query the remote web site.
-		$url = WL_TODAYS_TIP_JSON_URL
-		       . ( 'it' === get_bloginfo( 'language' ) ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN );
-
-		$response = wp_remote_get( $url );
-
-		if ( is_wp_error( $response )
-		     || ! isset( $response['response']['code'] )
-		     || 2 !== (int) $response['response']['code'] / 100 ) {
-			return false;
-		}
-
-		$json = json_decode( $response['body'], true );
-
-		if ( empty( $json )
-		     || ! isset( $json[0]['title']['rendered'] )
-		     || ! isset( $json[0]['excerpt']['rendered'] )
-		     || ! isset( $json[0]['link'] ) ) {
-			return false;
-		}
-
-		$value = array(
-			'title'   => $json[0]['title']['rendered'],
-			'excerpt' => '<!-- cached -->' . $json[0]['excerpt']['rendered'],
-			'link'    => $json[0]['link'],
-		);
-
-		// Store the results for one day.
-		set_transient( self::TODAYS_TIP, $value, 86400 );
-
-		return $value;
-	}
+    }
+
+    /**
+     * Get the today's tip data.
+     *
+     * @return array|false The today's tip data or false in case of error.
+     * @since 3.20.0
+     *
+     */
+    private static function get_todays_tip_data() {
+
+        // Return the transient.
+        if ( false !== get_transient( self::TODAYS_TIP ) ) {
+            return get_transient( self::TODAYS_TIP );
+        }
+
+        // If the transient isn't available, query the remote web site.
+        $url = WL_TODAYS_TIP_JSON_URL
+                . ( 'it' === get_bloginfo( 'language' ) ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN );
+
+        $response = wp_remote_get( $url );
+
+        if ( is_wp_error( $response )
+             || ! isset( $response['response']['code'] )
+             || 2 !== (int) $response['response']['code'] / 100 ) {
+            return false;
+        }
+
+        $json = json_decode( $response['body'], true );
+
+        if ( empty( $json )
+             || ! isset( $json[0]['title']['rendered'] )
+             || ! isset( $json[0]['excerpt']['rendered'] )
+             || ! isset( $json[0]['link'] ) ) {
+            return false;
+        }
+
+        $value = array(
+            'title'   => $json[0]['title']['rendered'],
+            'excerpt' => '<!-- cached -->' . $json[0]['excerpt']['rendered'],
+            'link'    => $json[0]['link'],
+        );
+
+        // Store the results for one day.
+        set_transient( self::TODAYS_TIP, $value, 86400 );
+
+        return $value;
+    }
 
 }

Spacing +37 added lines, -37 removed lines

@@ -40,14 +40,14 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function __construct( $search_rankings_service, $dashboard_service, $entity_service ) {
+	public function __construct($search_rankings_service, $dashboard_service, $entity_service) {
 
-		add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
+		add_action('wp_dashboard_setup', array($this, 'dashboard_setup'));
 
 		// Define where to access the tip.
-		defined( 'WL_TODAYS_TIP_JSON_URL' ) || define( 'WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_IT' ) || define( 'WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27' );
-		defined( 'WL_TODAYS_TIP_JSON_URL_EN' ) || define( 'WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38' );
+		defined('WL_TODAYS_TIP_JSON_URL') || define('WL_TODAYS_TIP_JSON_URL', 'https://wordlift.io/blog');
+		defined('WL_TODAYS_TIP_JSON_URL_IT') || define('WL_TODAYS_TIP_JSON_URL_IT', '/it/wp-json/wp/v2/posts?context=embed&per_page=1&categories=27');
+		defined('WL_TODAYS_TIP_JSON_URL_EN') || define('WL_TODAYS_TIP_JSON_URL_EN', '/en/wp-json/wp/v2/posts?context=embed&per_page=1&categories=38');
 
 		$this->search_rankings_service = $search_rankings_service;
 		$this->dashboard_service       = $dashboard_service;
@@ -64,8 +64,8 @@ 
 
 		wp_add_dashboard_widget(
 			'wl-dashboard-v2',
-			__( 'WordLift Dashboard', 'wordlift' ),
-			array( $this, 'dashboard_setup_callback' )
+			__('WordLift Dashboard', 'wordlift'),
+			array($this, 'dashboard_setup_callback')
 		);
 
 	}
@@ -80,7 +80,7 @@ 
 		// Get the average position.
 		$average_position_string = $this->get_average_position();
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-dashboard-v2.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/partials/wordlift-admin-dashboard-v2.php';
 
 	}
 
@@ -94,24 +94,24 @@ 
 	private function get_average_position() {
 
 		// Get the cache value.
-		$average_position = get_transient( self::AVERAGE_POSITION );
+		$average_position = get_transient(self::AVERAGE_POSITION);
 
 		// If there's no cached value, load it.
-		if ( false === $average_position ) {
+		if (false === $average_position) {
 			// Get the average position from Search Ranking Service.
 			$average_position = @$this->search_rankings_service->get_average_position();
 
 			// If there was an error return 'n/a'.
-			if ( false === $average_position ) {
-				return esc_html( _x( 'n/a', 'Dashboard', 'wordlift' ) );
+			if (false === $average_position) {
+				return esc_html(_x('n/a', 'Dashboard', 'wordlift'));
 			}
 		}
 
 		// Store the value for one day.
-		set_transient( self::AVERAGE_POSITION, $average_position, 86400 ); // One day.
+		set_transient(self::AVERAGE_POSITION, $average_position, 86400); // One day.
 
 		// Format the average position with one decimal.
-		return number_format( $average_position, 1 );
+		return number_format($average_position, 1);
 	}
 
 	/**
@@ -124,8 +124,8 @@ 
 	private function get_top_entities() {
 
 		// Get the cached results.
-		$results = get_transient( '_wl_admin_dashboard_v2__top_entities' );
-		if ( false !== $results ) {
+		$results = get_transient('_wl_admin_dashboard_v2__top_entities');
+		if (false !== $results) {
 			return $results;
 		}
 
@@ -161,8 +161,8 @@ 
 LIMIT 20;
 EOF;
 
-		$results = $wpdb->get_results( $query );
-		set_transient( '_wl_admin_dashboard_v2__top_entities', $results, 900 );
+		$results = $wpdb->get_results($query);
+		set_transient('_wl_admin_dashboard_v2__top_entities', $results, 900);
 
 		return $results;
 	}
@@ -177,20 +177,20 @@ 
 		$data = @self::get_todays_tip_data();
 
 		// Unable to get data from the local cache, nor from the remote URL.
-		if ( false === $data ) {
+		if (false === $data) {
 			return;
 		}
 		?>
 
         <div id="wl-todays-tip" class="wl-dashboard__block wl-dashboard__block--todays-tip">
             <header>
-                <h3><?php echo __( "Today's Tip", 'wordlift' ); ?></h3>
+                <h3><?php echo __("Today's Tip", 'wordlift'); ?></h3>
             </header>
             <article>
-                <p><strong><?php echo esc_html( wp_strip_all_tags( $data['title'] ) ); ?></strong>
-					<?php echo esc_html( wp_strip_all_tags( $data['excerpt'] ) ); ?>
+                <p><strong><?php echo esc_html(wp_strip_all_tags($data['title'])); ?></strong>
+					<?php echo esc_html(wp_strip_all_tags($data['excerpt'])); ?>
                     <a target="_blank"
-                       href="<?php echo esc_attr( $data['link'] ); ?>"><?php echo esc_html( __( 'Read more', 'wordlift' ) ); ?></a>
+                       href="<?php echo esc_attr($data['link']); ?>"><?php echo esc_html(__('Read more', 'wordlift')); ?></a>
                 </p>
         </div>
 		<?php
@@ -207,39 +207,39 @@ 
 	private static function get_todays_tip_data() {
 
 		// Return the transient.
-		if ( false !== get_transient( self::TODAYS_TIP ) ) {
-			return get_transient( self::TODAYS_TIP );
+		if (false !== get_transient(self::TODAYS_TIP)) {
+			return get_transient(self::TODAYS_TIP);
 		}
 
 		// If the transient isn't available, query the remote web site.
 		$url = WL_TODAYS_TIP_JSON_URL
-		       . ( 'it' === get_bloginfo( 'language' ) ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN );
+		       . ('it' === get_bloginfo('language') ? WL_TODAYS_TIP_JSON_URL_IT : WL_TODAYS_TIP_JSON_URL_EN);
 
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
-		if ( is_wp_error( $response )
-		     || ! isset( $response['response']['code'] )
-		     || 2 !== (int) $response['response']['code'] / 100 ) {
+		if (is_wp_error($response)
+		     || ! isset($response['response']['code'])
+		     || 2 !== (int) $response['response']['code'] / 100) {
 			return false;
 		}
 
-		$json = json_decode( $response['body'], true );
+		$json = json_decode($response['body'], true);
 
-		if ( empty( $json )
-		     || ! isset( $json[0]['title']['rendered'] )
-		     || ! isset( $json[0]['excerpt']['rendered'] )
-		     || ! isset( $json[0]['link'] ) ) {
+		if (empty($json)
+		     || ! isset($json[0]['title']['rendered'])
+		     || ! isset($json[0]['excerpt']['rendered'])
+		     || ! isset($json[0]['link'])) {
 			return false;
 		}
 
 		$value = array(
 			'title'   => $json[0]['title']['rendered'],
-			'excerpt' => '<!-- cached -->' . $json[0]['excerpt']['rendered'],
+			'excerpt' => '<!-- cached -->'.$json[0]['excerpt']['rendered'],
 			'link'    => $json[0]['link'],
 		);
 
 		// Store the results for one day.
-		set_transient( self::TODAYS_TIP, $value, 86400 );
+		set_transient(self::TODAYS_TIP, $value, 86400);
 
 		return $value;
 	}

src/admin/class-wordlift-admin-search-rankings-ajax-adapter.php

Indentation +40 added lines, -40 removed lines

@@ -14,54 +14,54 @@
  */
 class Wordlift_Admin_Search_Rankings_Ajax_Adapter {
 
-	/**
-	 * The {@link Wordlift_Admin_Search_Rankings_Service} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Admin_Search_Rankings_Service The {@link Wordlift_Admin_Search_Rankings_Service} instance.
-	 */
-	private $service;
+    /**
+     * The {@link Wordlift_Admin_Search_Rankings_Service} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Admin_Search_Rankings_Service The {@link Wordlift_Admin_Search_Rankings_Service} instance.
+     */
+    private $service;
 
-	/**
-	 * Wordlift_Admin_Search_Rankings_Ajax_Adapter constructor.
-	 *
-	 * @param $service \Wordlift_Admin_Search_Rankings_Service The {@link Wordlift_Admin_Search_Rankings_Service} instance.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct( $service ) {
+    /**
+     * Wordlift_Admin_Search_Rankings_Ajax_Adapter constructor.
+     *
+     * @param $service \Wordlift_Admin_Search_Rankings_Service The {@link Wordlift_Admin_Search_Rankings_Service} instance.
+     *
+     * @since 3.20.0
+     */
+    public function __construct( $service ) {
 
-		$this->service = $service;
+        $this->service = $service;
 
-		add_action( 'wp_ajax_wl_search_rankings', array( $this, 'search_rankings' ) );
+        add_action( 'wp_ajax_wl_search_rankings', array( $this, 'search_rankings' ) );
 
-	}
+    }
 
-	/**
-	 * Get the Search Rankings.
-	 *
-	 * The Search Rankings are printed to the output as `application/json`.
-	 *
-	 * @since 3.20.0
-	 */
-	public function search_rankings() {
+    /**
+     * Get the Search Rankings.
+     *
+     * The Search Rankings are printed to the output as `application/json`.
+     *
+     * @since 3.20.0
+     */
+    public function search_rankings() {
 
-		$value = $this->service->get();
+        $value = $this->service->get();
 
-		if ( is_wp_error( $value ) ) {
-			wp_send_json_error( $value );
-		} else {
-			wp_send_json_success( $value );
-		}
+        if ( is_wp_error( $value ) ) {
+            wp_send_json_error( $value );
+        } else {
+            wp_send_json_success( $value );
+        }
 
-		// We use this to maintain compatibility with WP 4.4.0.
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die();
-		} else {
-			die;
-		}
+        // We use this to maintain compatibility with WP 4.4.0.
+        if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+            wp_die();
+        } else {
+            die;
+        }
 
-	}
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -30,11 +30,11 @@ 
 	 *
 	 * @since 3.20.0
 	 */
-	public function __construct( $service ) {
+	public function __construct($service) {
 
 		$this->service = $service;
 
-		add_action( 'wp_ajax_wl_search_rankings', array( $this, 'search_rankings' ) );
+		add_action('wp_ajax_wl_search_rankings', array($this, 'search_rankings'));
 
 	}
 
@@ -49,14 +49,14 @@ 
 
 		$value = $this->service->get();
 
-		if ( is_wp_error( $value ) ) {
-			wp_send_json_error( $value );
+		if (is_wp_error($value)) {
+			wp_send_json_error($value);
 		} else {
-			wp_send_json_success( $value );
+			wp_send_json_success($value);
 		}
 
 		// We use this to maintain compatibility with WP 4.4.0.
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+		if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX)) {
 			wp_die();
 		} else {
 			die;

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

Indentation +226 added lines, -226 removed lines

@@ -20,116 +20,116 @@ 
  */
 class Wordlift_Admin_Post_Edit_Page {
 
-	/**
-	 * The {@link Wordlift} plugin instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	private $plugin;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.4
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
-	 *
-	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 */
-	function __construct( $plugin ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
-
-			return;
-		}
-
-		// Define the callbacks.
-		$callback                  = array( $this, 'enqueue_scripts', );
-
-		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
-		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg', ) );
-
-		$this->plugin = $plugin;
-	}
-
-	/**
-	 * Check whether the current post opens with G'berg or not.
-	 *
-	 * @return bool True if G'berg is used otherwise false.
-	 * @since 3.22.3
-	 */
-	function is_gutenberg_page() {
-		if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
-			// The Gutenberg plugin is on.
-			return true;
-		}
-
-		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
-			// Gutenberg page on 5+.
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if we're in UX builder.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/691
-	 *
-	 * @since 3.15.4
-	 *
-	 * @return bool True if we're in UX builder, otherwise false.
-	 */
-	private function is_ux_builder_editor() {
-
-		return function_exists( 'ux_builder_is_editor' )
-		       && ux_builder_is_editor();
-	}
-
-	/**
-	 * Enqueue scripts and styles for the edit page.
-	 *
-	 * @since 3.11.0
-	 */
-	public function enqueue_scripts() {
-
-		// Bail out if this is G'berg.
-		if ( $this->is_gutenberg_page() ) {
-			return;
-		}
-
-		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
-
-		// If Gutenberg is enabled for the post, do not load the legacy edit.js.
-		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
-			return;
-		}
-
-
-		/*
+    /**
+     * The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     *
+     * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    private $plugin;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.4
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
+     *
+     * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     *
+     */
+    function __construct( $plugin ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        // Bail out if we're in the UX Builder editor.
+        if ( $this->is_ux_builder_editor() ) {
+            $this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+
+            return;
+        }
+
+        // Define the callbacks.
+        $callback                  = array( $this, 'enqueue_scripts', );
+
+        // Set a hook to enqueue scripts only when the edit page is displayed.
+        add_action( 'admin_print_scripts-post.php', $callback );
+        add_action( 'admin_print_scripts-post-new.php', $callback );
+        add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg', ) );
+
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * Check whether the current post opens with G'berg or not.
+     *
+     * @return bool True if G'berg is used otherwise false.
+     * @since 3.22.3
+     */
+    function is_gutenberg_page() {
+        if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+            // The Gutenberg plugin is on.
+            return true;
+        }
+
+        $current_screen = get_current_screen();
+        if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+            // Gutenberg page on 5+.
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if we're in UX builder.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/691
+     *
+     * @since 3.15.4
+     *
+     * @return bool True if we're in UX builder, otherwise false.
+     */
+    private function is_ux_builder_editor() {
+
+        return function_exists( 'ux_builder_is_editor' )
+               && ux_builder_is_editor();
+    }
+
+    /**
+     * Enqueue scripts and styles for the edit page.
+     *
+     * @since 3.11.0
+     */
+    public function enqueue_scripts() {
+
+        // Bail out if this is G'berg.
+        if ( $this->is_gutenberg_page() ) {
+            return;
+        }
+
+        // Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/832
+        wp_dequeue_script( 'ontrapagesAngular' );
+        wp_dequeue_script( 'ontrapagesApp' );
+        wp_dequeue_script( 'ontrapagesController' );
+
+        // If Gutenberg is enabled for the post, do not load the legacy edit.js.
+        if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
+            return;
+        }
+
+
+        /*
 		 * Enqueue the edit screen JavaScript. The `wordlift-admin.bundle.js` file
 		 * is scheduled to replace the older `wordlift-admin.min.js` once client-side
 		 * code is properly refactored.
@@ -138,129 +138,129 @@ 
 		 *
 		 * @since 3.20.0 edit.js has been migrated to the new webpack configuration.
 		 */
-		$script_name = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/edit';
-		/**
-		 * Scripts_Helper introduced.
-		 *
-		 * @since 3.25.0 Scripts are loaded using script helper to ensure WP 4.4 compatibiility.
-		 * @since 3.25.1 The handle is used to hook the wp_localize_script for the _wlEntityTypes global object.
-		 */
-		Scripts_Helper::enqueue_based_on_wordpress_version(
-			'wl-classic-editor',
-			$script_name,
-			array(
-				$this->plugin->get_plugin_name(),
-				'jquery',
-				// Require wp.ajax.
-				'wp-util',
-				// @@todo: provide the following dependencies when we're in WP < 5.0 (i.e. when these dependencies aren't already defined).
-				'react',
-				'react-dom',
-				'wp-element',
-				'wp-polyfill',
-				/*
+        $script_name = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/edit';
+        /**
+         * Scripts_Helper introduced.
+         *
+         * @since 3.25.0 Scripts are loaded using script helper to ensure WP 4.4 compatibiility.
+         * @since 3.25.1 The handle is used to hook the wp_localize_script for the _wlEntityTypes global object.
+         */
+        Scripts_Helper::enqueue_based_on_wordpress_version(
+            'wl-classic-editor',
+            $script_name,
+            array(
+                $this->plugin->get_plugin_name(),
+                'jquery',
+                // Require wp.ajax.
+                'wp-util',
+                // @@todo: provide the following dependencies when we're in WP < 5.0 (i.e. when these dependencies aren't already defined).
+                'react',
+                'react-dom',
+                'wp-element',
+                'wp-polyfill',
+                /*
 				* Angular isn't loaded anymore remotely, but it is loaded within wordlift-reloaded.js.
 				*
 				* See https://github.com/insideout10/wordlift-plugin/issues/865.
 				*
 				* @since 3.19.6
 				*/
-				//				// Require Angular.
-				//				'wl-angular',
-				//				'wl-angular-geolocation',
-				//				'wl-angular-touch',
-				//				'wl-angular-animate',
-				/**
-				 * We need the `wp.hooks` global to allow the edit.js script to send actions.
-				 *
-				 * @since 3.23.0
-				 */
-				'wp-hooks',
-			)
-		);
-
-		wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
-
-	}
-
-	/**
-	 * This function loads the javascript file according to the WordPress version.
-	 *
-	 * For WordPress < 5.0 it'll load the javascript file using the `.full` suffix i.e. the file that embeds all the
-	 * dependencies.
-	 *
-	 * For WordPress >= 5.0 it'll load the stripped down js.
-	 *
-	 * @param string $handle The handle name.
-	 * @param string $script_name The full script URL without the `.js` extension.
-	 * @param array $dependencies An array of dependencies to be added only in WordPress > 5.0.
-	 */
-	private function enqueue_based_on_wordpress_version( $handle, $script_name, $dependencies ) {
-		global $wp_version;
-
-		if ( version_compare( $wp_version, '5.0', '<' ) ) {
-			$actual_script_name  = "$script_name.full.js";
-			$actual_dependencies = array();
-		} else {
-			$actual_script_name  = "$script_name.js";
-			$actual_dependencies = $dependencies;
-		}
-
-		wp_enqueue_script( $handle, $actual_script_name, $actual_dependencies, $this->plugin->get_version(), false );
-
-	}
-
-	/**
-	 * Enqueue scripts and styles for the gutenberg edit page.
-	 *
-	 * @since 3.21.0
-	 */
-	public function enqueue_scripts_gutenberg() {
-
-		wp_register_script(
-			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.js',
-			array(
-				'react',
-				'wordlift',
-				'wp-hooks',
-				'wp-data',
-				'wp-rich-text',
-				'wp-blocks',
-				'wp-plugins',
-				'wp-edit-post',
-			),
-			$this->plugin->get_version()
-		);
-		wp_localize_script( 'wl-block-editor', '_wlBlockEditorSettings', array(
-			'root'  => esc_url_raw( rest_url() ),
-			'nonce' => wp_create_nonce( 'wp_rest' )
-		) );
-
-		/*
+                //				// Require Angular.
+                //				'wl-angular',
+                //				'wl-angular-geolocation',
+                //				'wl-angular-touch',
+                //				'wl-angular-animate',
+                /**
+                 * We need the `wp.hooks` global to allow the edit.js script to send actions.
+                 *
+                 * @since 3.23.0
+                 */
+                'wp-hooks',
+            )
+        );
+
+        wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
+
+    }
+
+    /**
+     * This function loads the javascript file according to the WordPress version.
+     *
+     * For WordPress < 5.0 it'll load the javascript file using the `.full` suffix i.e. the file that embeds all the
+     * dependencies.
+     *
+     * For WordPress >= 5.0 it'll load the stripped down js.
+     *
+     * @param string $handle The handle name.
+     * @param string $script_name The full script URL without the `.js` extension.
+     * @param array $dependencies An array of dependencies to be added only in WordPress > 5.0.
+     */
+    private function enqueue_based_on_wordpress_version( $handle, $script_name, $dependencies ) {
+        global $wp_version;
+
+        if ( version_compare( $wp_version, '5.0', '<' ) ) {
+            $actual_script_name  = "$script_name.full.js";
+            $actual_dependencies = array();
+        } else {
+            $actual_script_name  = "$script_name.js";
+            $actual_dependencies = $dependencies;
+        }
+
+        wp_enqueue_script( $handle, $actual_script_name, $actual_dependencies, $this->plugin->get_version(), false );
+
+    }
+
+    /**
+     * Enqueue scripts and styles for the gutenberg edit page.
+     *
+     * @since 3.21.0
+     */
+    public function enqueue_scripts_gutenberg() {
+
+        wp_register_script(
+            'wl-block-editor',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.js',
+            array(
+                'react',
+                'wordlift',
+                'wp-hooks',
+                'wp-data',
+                'wp-rich-text',
+                'wp-blocks',
+                'wp-plugins',
+                'wp-edit-post',
+            ),
+            $this->plugin->get_version()
+        );
+        wp_localize_script( 'wl-block-editor', '_wlBlockEditorSettings', array(
+            'root'  => esc_url_raw( rest_url() ),
+            'nonce' => wp_create_nonce( 'wp_rest' )
+        ) );
+
+        /*
 		 * @since 3.25.1 The hook is used by the wp_localize_script to register the _wlEntityTypes global object.
 		 */
-		wp_enqueue_style(
-			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.css',
-			array(),
-			$this->plugin->get_version()
-		);
-
-		wp_enqueue_script(
-			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.js',
-			array(),
-			$this->plugin->get_version(),
-			true
-		);
-
-		wp_enqueue_style(
-			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.css',
-			array(),
-			$this->plugin->get_version()
-		);
-	}
+        wp_enqueue_style(
+            'wl-block-editor',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.css',
+            array(),
+            $this->plugin->get_version()
+        );
+
+        wp_enqueue_script(
+            'wl-autocomplete-select',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.js',
+            array(),
+            $this->plugin->get_version(),
+            true
+        );
+
+        wp_enqueue_style(
+            'wl-autocomplete-select',
+            plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.css',
+            array(),
+            $this->plugin->get_version()
+        );
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -46,24 +46,24 @@ 
 	 * @since 3.11.0
 	 *
 	 */
-	function __construct( $plugin ) {
+	function __construct($plugin) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+		if ($this->is_ux_builder_editor()) {
+			$this->log->info('WordLift will not show, since we are in UX Builder editor.');
 
 			return;
 		}
 
 		// Define the callbacks.
-		$callback                  = array( $this, 'enqueue_scripts', );
+		$callback = array($this, 'enqueue_scripts',);
 
 		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
-		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_scripts_gutenberg', ) );
+		add_action('admin_print_scripts-post.php', $callback);
+		add_action('admin_print_scripts-post-new.php', $callback);
+		add_action('enqueue_block_editor_assets', array($this, 'enqueue_scripts_gutenberg',));
 
 		$this->plugin = $plugin;
 	}
@@ -75,13 +75,13 @@ 
 	 * @since 3.22.3
 	 */
 	function is_gutenberg_page() {
-		if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+		if (function_exists('is_gutenberg_page') && is_gutenberg_page()) {
 			// The Gutenberg plugin is on.
 			return true;
 		}
 
 		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+		if (method_exists($current_screen, 'is_block_editor') && $current_screen->is_block_editor()) {
 			// Gutenberg page on 5+.
 			return true;
 		}
@@ -100,7 +100,7 @@ 
 	 */
 	private function is_ux_builder_editor() {
 
-		return function_exists( 'ux_builder_is_editor' )
+		return function_exists('ux_builder_is_editor')
 		       && ux_builder_is_editor();
 	}
 
@@ -112,19 +112,19 @@ 
 	public function enqueue_scripts() {
 
 		// Bail out if this is G'berg.
-		if ( $this->is_gutenberg_page() ) {
+		if ($this->is_gutenberg_page()) {
 			return;
 		}
 
 		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
+		wp_dequeue_script('ontrapagesAngular');
+		wp_dequeue_script('ontrapagesApp');
+		wp_dequeue_script('ontrapagesController');
 
 		// If Gutenberg is enabled for the post, do not load the legacy edit.js.
-		if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( get_post() ) ) {
+		if (function_exists('use_block_editor_for_post') && use_block_editor_for_post(get_post())) {
 			return;
 		}
 
@@ -138,7 +138,7 @@ 
 		 *
 		 * @since 3.20.0 edit.js has been migrated to the new webpack configuration.
 		 */
-		$script_name = plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/edit';
+		$script_name = plugin_dir_url(dirname(__FILE__)).'js/dist/edit';
 		/**
 		 * Scripts_Helper introduced.
 		 *
@@ -179,7 +179,7 @@ 
 			)
 		);
 
-		wp_enqueue_style( 'wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version() );
+		wp_enqueue_style('wl-classic-editor', "$script_name.css", array(), $this->plugin->get_version());
 
 	}
 
@@ -195,10 +195,10 @@ 
 	 * @param string $script_name The full script URL without the `.js` extension.
 	 * @param array $dependencies An array of dependencies to be added only in WordPress > 5.0.
 	 */
-	private function enqueue_based_on_wordpress_version( $handle, $script_name, $dependencies ) {
+	private function enqueue_based_on_wordpress_version($handle, $script_name, $dependencies) {
 		global $wp_version;
 
-		if ( version_compare( $wp_version, '5.0', '<' ) ) {
+		if (version_compare($wp_version, '5.0', '<')) {
 			$actual_script_name  = "$script_name.full.js";
 			$actual_dependencies = array();
 		} else {
@@ -206,7 +206,7 @@ 
 			$actual_dependencies = $dependencies;
 		}
 
-		wp_enqueue_script( $handle, $actual_script_name, $actual_dependencies, $this->plugin->get_version(), false );
+		wp_enqueue_script($handle, $actual_script_name, $actual_dependencies, $this->plugin->get_version(), false);
 
 	}
 
@@ -219,7 +219,7 @@ 
 
 		wp_register_script(
 			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.js',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/block-editor.js',
 			array(
 				'react',
 				'wordlift',
@@ -232,24 +232,24 @@ 
 			),
 			$this->plugin->get_version()
 		);
-		wp_localize_script( 'wl-block-editor', '_wlBlockEditorSettings', array(
-			'root'  => esc_url_raw( rest_url() ),
-			'nonce' => wp_create_nonce( 'wp_rest' )
-		) );
+		wp_localize_script('wl-block-editor', '_wlBlockEditorSettings', array(
+			'root'  => esc_url_raw(rest_url()),
+			'nonce' => wp_create_nonce('wp_rest')
+		));
 
 		/*
 		 * @since 3.25.1 The hook is used by the wp_localize_script to register the _wlEntityTypes global object.
 		 */
 		wp_enqueue_style(
 			'wl-block-editor',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/block-editor.css',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/block-editor.css',
 			array(),
 			$this->plugin->get_version()
 		);
 
 		wp_enqueue_script(
 			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.js',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/autocomplete-select.js',
 			array(),
 			$this->plugin->get_version(),
 			true
@@ -257,7 +257,7 @@ 
 
 		wp_enqueue_style(
 			'wl-autocomplete-select',
-			plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/autocomplete-select.css',
+			plugin_dir_url(dirname(__FILE__)).'js/dist/autocomplete-select.css',
 			array(),
 			$this->plugin->get_version()
 		);

src/admin/wordlift_admin_meta_box_entities.php

Indentation +156 added lines, -156 removed lines

@@ -10,15 +10,15 @@ 
  */
 function wl_register_metaboxes() {
 
-	// Load metabox classes.
-	require_once( 'WL_Metabox/class-wl-metabox.php' );
+    // Load metabox classes.
+    require_once( 'WL_Metabox/class-wl-metabox.php' );
 
-	$wl_metabox = new WL_Metabox();     // Everything is done inside here with the correct timing.
+    $wl_metabox = new WL_Metabox();     // Everything is done inside here with the correct timing.
 }
 
 if ( is_admin() ) {
-	add_action( 'load-post.php', 'wl_register_metaboxes' );
-	add_action( 'load-post-new.php', 'wl_register_metaboxes' );
+    add_action( 'load-post.php', 'wl_register_metaboxes' );
+    add_action( 'load-post-new.php', 'wl_register_metaboxes' );
 }
 
 /**
@@ -28,28 +28,28 @@ 
  */
 function wl_admin_add_entities_meta_box( $post_type ) {
 
-	/*
+    /*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
 	 *
 	 * @since 3.20.3
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
-		return;
-	}
-
-	// Bail out if the post type doesn't support a TinyMCE editor.
-	if ( ! wl_post_type_supports_editor( $post_type ) ) {
-		return;
-	}
-
-	if ( ! Wordlift_Admin::is_gutenberg() ) {
-		// Add main meta box for related entities and 4W only if not Gutenberg
-		add_meta_box(
-			'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
-		);
-	}
+    if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+        return;
+    }
+
+    // Bail out if the post type doesn't support a TinyMCE editor.
+    if ( ! wl_post_type_supports_editor( $post_type ) ) {
+        return;
+    }
+
+    if ( ! Wordlift_Admin::is_gutenberg() ) {
+        // Add main meta box for related entities and 4W only if not Gutenberg
+        add_meta_box(
+            'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
+        );
+    }
 
 }
 
@@ -66,19 +66,19 @@ 
  */
 function wl_post_type_supports_editor( $post_type ) {
 
-	$default = post_type_supports( $post_type, 'editor' );
-
-	/**
-	 * Allow 3rd parties to force the classification to load.
-	 *
-	 * @param bool $default The preset value as gathered by the `post_type_supports` call.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
-	 *
-	 * @since 3.19.4
-	 *
-	 */
-	return apply_filters( 'wl_post_type_supports_editor', $default, $post_type );
+    $default = post_type_supports( $post_type, 'editor' );
+
+    /**
+     * Allow 3rd parties to force the classification to load.
+     *
+     * @param bool $default The preset value as gathered by the `post_type_supports` call.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/847.
+     *
+     * @since 3.19.4
+     *
+     */
+    return apply_filters( 'wl_post_type_supports_editor', $default, $post_type );
 }
 
 /**
@@ -88,112 +88,112 @@ 
  */
 function wl_entities_box_content( $post, $wrapper = true ) {
 
-	// Angularjs edit-post widget wrapper.
-	if ( $wrapper ) {
-		echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
-	}
+    // Angularjs edit-post widget wrapper.
+    if ( $wrapper ) {
+        echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
+    }
 }
 
 function wl_entities_box_content_scripts() {
-	$post = get_post();
+    $post = get_post();
 
-	// Angularjs edit-post widget classification boxes configuration.
-	$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+    // Angularjs edit-post widget classification boxes configuration.
+    $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
 
-	// Array to store all related entities ids.
-	$all_referenced_entities_ids = array();
+    // Array to store all related entities ids.
+    $all_referenced_entities_ids = array();
 
-	// Add selected entities to classification_boxes.
-	foreach ( $classification_boxes as $i => $box ) {
-		// Build the proper relation name.
-		$relation_name = $box['id'];
+    // Add selected entities to classification_boxes.
+    foreach ( $classification_boxes as $i => $box ) {
+        // Build the proper relation name.
+        $relation_name = $box['id'];
 
-		// Get the entity referenced from the post content.
-		/*
+        // Get the entity referenced from the post content.
+        /*
 		 * Allow 3rd parties to provide another post content.
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		$entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris( $post_content );
-
-		// Enhance current box selected entities.
-		$classification_boxes[ $i ]['selectedEntities'] = $entity_uris;
-
-		// Maps the URIs to entity posts.
-		$entity_service = Wordlift_Entity_Service::get_instance();
-
-		// Replace all entity URI's with post ID's if found or null if there is no related post.
-		$entity_ids = array_map( function ( $item ) use ( $entity_service ) {
-			// Return entity post by the entity URI or null.
-			$post = $entity_service->get_entity_post_by_uri( $item );
-
-			// Check that the post object is not null.
-			if ( ! empty( $post ) ) {
-				return $post->ID;
-			}
-		}, $entity_uris );
-		// Store the entity ids for all the 4W.
-		$all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
-
-	}
-
-	// Json encoding for classification boxes structure.
-	$classification_boxes = wp_json_encode( $classification_boxes );
-
-	// Ensure there are no repetitions of the referenced entities.
-	$all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
-
-	// Remove all null, false and empty strings.
-	// NULL is being returned in some cases, when there is not related post, so we need to remove it.
-	$all_referenced_entities_ids = array_filter( $all_referenced_entities_ids );
-
-	// Build the entity storage object.
-	$referenced_entities_obj = array();
-	foreach ( $all_referenced_entities_ids as $referenced_entity ) {
-		$entity = wl_serialize_entity( $referenced_entity );
-		// Set a default confidence of `PHP_INT_MAX` for already annotated entities.
-		$referenced_entities_obj[ $entity['id'] ] = $entity
-		                                            + array( 'confidence' => PHP_INT_MAX );
-	}
-
-	$referenced_entities_obj = empty( $referenced_entities_obj ) ?
-		'{}' : wp_json_encode( $referenced_entities_obj );
-
-	$published_place_id  = get_post_meta(
-		$post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
-	);
-	$published_place_obj = ( $published_place_id ) ?
-		wp_json_encode( wl_serialize_entity( $published_place_id ) ) :
-		'undefined';
-
-	$topic_id  = get_post_meta(
-		$post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
-	);
-	$topic_obj = ( $topic_id ) ?
-		wp_json_encode( wl_serialize_entity( $topic_id ) ) :
-		'undefined';
-
-	$configuration_service = Wordlift_Configuration_Service::get_instance();
-
-	$default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
-	$default_path           = WL_DEFAULT_PATH;
-	$dataset_uri            = $configuration_service->get_dataset_uri();
-	$current_post_uri       = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-	$is_entity              = Wordlift_Entity_Service::get_instance()->is_entity( $post->ID );
-
-	// Retrieve the current post author.
-	$post_author = get_userdata( $post->post_author )->display_name;
-	// Retrive the published date.
-	$published_date = get_the_time( 'Y-m-d', $post->ID );
-	// Current language.
-	$current_language            = $configuration_service->get_language_code();
-	$wordlift_timeline_shortcode = new Wordlift_Timeline_Shortcode();
-	$timelinejs_default_options  = json_encode( $wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT );
-	$addslashes_post_author      = addslashes( $post_author );
-	$ajax_url                    = json_encode( admin_url( 'admin-ajax.php' ) );
-
-	$js_code = <<<JS
+        $post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+        $entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris( $post_content );
+
+        // Enhance current box selected entities.
+        $classification_boxes[ $i ]['selectedEntities'] = $entity_uris;
+
+        // Maps the URIs to entity posts.
+        $entity_service = Wordlift_Entity_Service::get_instance();
+
+        // Replace all entity URI's with post ID's if found or null if there is no related post.
+        $entity_ids = array_map( function ( $item ) use ( $entity_service ) {
+            // Return entity post by the entity URI or null.
+            $post = $entity_service->get_entity_post_by_uri( $item );
+
+            // Check that the post object is not null.
+            if ( ! empty( $post ) ) {
+                return $post->ID;
+            }
+        }, $entity_uris );
+        // Store the entity ids for all the 4W.
+        $all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
+
+    }
+
+    // Json encoding for classification boxes structure.
+    $classification_boxes = wp_json_encode( $classification_boxes );
+
+    // Ensure there are no repetitions of the referenced entities.
+    $all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
+
+    // Remove all null, false and empty strings.
+    // NULL is being returned in some cases, when there is not related post, so we need to remove it.
+    $all_referenced_entities_ids = array_filter( $all_referenced_entities_ids );
+
+    // Build the entity storage object.
+    $referenced_entities_obj = array();
+    foreach ( $all_referenced_entities_ids as $referenced_entity ) {
+        $entity = wl_serialize_entity( $referenced_entity );
+        // Set a default confidence of `PHP_INT_MAX` for already annotated entities.
+        $referenced_entities_obj[ $entity['id'] ] = $entity
+                                                    + array( 'confidence' => PHP_INT_MAX );
+    }
+
+    $referenced_entities_obj = empty( $referenced_entities_obj ) ?
+        '{}' : wp_json_encode( $referenced_entities_obj );
+
+    $published_place_id  = get_post_meta(
+        $post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
+    );
+    $published_place_obj = ( $published_place_id ) ?
+        wp_json_encode( wl_serialize_entity( $published_place_id ) ) :
+        'undefined';
+
+    $topic_id  = get_post_meta(
+        $post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
+    );
+    $topic_obj = ( $topic_id ) ?
+        wp_json_encode( wl_serialize_entity( $topic_id ) ) :
+        'undefined';
+
+    $configuration_service = Wordlift_Configuration_Service::get_instance();
+
+    $default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
+    $default_path           = WL_DEFAULT_PATH;
+    $dataset_uri            = $configuration_service->get_dataset_uri();
+    $current_post_uri       = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
+    $is_entity              = Wordlift_Entity_Service::get_instance()->is_entity( $post->ID );
+
+    // Retrieve the current post author.
+    $post_author = get_userdata( $post->post_author )->display_name;
+    // Retrive the published date.
+    $published_date = get_the_time( 'Y-m-d', $post->ID );
+    // Current language.
+    $current_language            = $configuration_service->get_language_code();
+    $wordlift_timeline_shortcode = new Wordlift_Timeline_Shortcode();
+    $timelinejs_default_options  = json_encode( $wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT );
+    $addslashes_post_author      = addslashes( $post_author );
+    $ajax_url                    = json_encode( admin_url( 'admin-ajax.php' ) );
+
+    $js_code = <<<JS
 		if ('undefined' == typeof window.wordlift) {
 			window.wordlift = {};
 			window.wordlift.entities = {};
@@ -217,33 +217,33 @@ 
 		window.wordlift.ajax_url = $ajax_url;
 JS;
 
-	echo '<script type="text/javascript">' . PHP_EOL . $js_code . PHP_EOL . '</script>';
-
-	$metabox_settings = array(
-		"classificationBoxes"      => json_decode( $classification_boxes ),
-		"entities"                 => json_decode( $referenced_entities_obj ),
-		"currentPostId"            => intval( $post->ID ),
-		"currentPostUri"           => $current_post_uri,
-		"currentPostType"          => $post->post_type,
-		"isEntity"                 => ! empty( $is_entity ),
-		"defaultThumbnailPath"     => $default_thumbnail_path,
-		"defaultWordLiftPath"      => $default_path,
-		"datasetUri"               => $dataset_uri,
-		"currentUser"              => $addslashes_post_author,
-		"publishedDate"            => $published_date,
-		"publishedPlace"           => $published_place_obj,
-		"topic"                    => json_decode( $topic_obj ),
-		"currentLanguage"          => $current_language,
-		"timelinejsDefaultOptions" => json_decode( $timelinejs_default_options ),
-		"ajax_url"                 => admin_url( 'admin-ajax.php' ),
-	);
-
-	// Allow Classic and Block Editor scripts to register first.
-	// Hook to the Block Editor script.
-	wp_localize_script( 'wl-block-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
-
-	// Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
-	wp_localize_script( 'wl-classic-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
+    echo '<script type="text/javascript">' . PHP_EOL . $js_code . PHP_EOL . '</script>';
+
+    $metabox_settings = array(
+        "classificationBoxes"      => json_decode( $classification_boxes ),
+        "entities"                 => json_decode( $referenced_entities_obj ),
+        "currentPostId"            => intval( $post->ID ),
+        "currentPostUri"           => $current_post_uri,
+        "currentPostType"          => $post->post_type,
+        "isEntity"                 => ! empty( $is_entity ),
+        "defaultThumbnailPath"     => $default_thumbnail_path,
+        "defaultWordLiftPath"      => $default_path,
+        "datasetUri"               => $dataset_uri,
+        "currentUser"              => $addslashes_post_author,
+        "publishedDate"            => $published_date,
+        "publishedPlace"           => $published_place_obj,
+        "topic"                    => json_decode( $topic_obj ),
+        "currentLanguage"          => $current_language,
+        "timelinejsDefaultOptions" => json_decode( $timelinejs_default_options ),
+        "ajax_url"                 => admin_url( 'admin-ajax.php' ),
+    );
+
+    // Allow Classic and Block Editor scripts to register first.
+    // Hook to the Block Editor script.
+    wp_localize_script( 'wl-block-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
+
+    // Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
+    wp_localize_script( 'wl-classic-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
 
 }
 

Spacing +58 added lines, -60 removed lines

@@ -11,14 +11,14 @@ 
 function wl_register_metaboxes() {
 
 	// Load metabox classes.
-	require_once( 'WL_Metabox/class-wl-metabox.php' );
+	require_once('WL_Metabox/class-wl-metabox.php');
 
-	$wl_metabox = new WL_Metabox();     // Everything is done inside here with the correct timing.
+	$wl_metabox = new WL_Metabox(); // Everything is done inside here with the correct timing.
 }
 
-if ( is_admin() ) {
-	add_action( 'load-post.php', 'wl_register_metaboxes' );
-	add_action( 'load-post-new.php', 'wl_register_metaboxes' );
+if (is_admin()) {
+	add_action('load-post.php', 'wl_register_metaboxes');
+	add_action('load-post-new.php', 'wl_register_metaboxes');
 }
 
 /**
@@ -26,7 +26,7 @@ 
  *
  * @param string $post_type The type of the current open post.
  */
-function wl_admin_add_entities_meta_box( $post_type ) {
+function wl_admin_add_entities_meta_box($post_type) {
 
 	/*
 	 * Call the `wl_can_see_classification_box` filter to determine whether we can display the classification box.
@@ -35,25 +35,25 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/914
 	 */
-	if ( ! apply_filters( 'wl_can_see_classification_box', true ) ) {
+	if ( ! apply_filters('wl_can_see_classification_box', true)) {
 		return;
 	}
 
 	// Bail out if the post type doesn't support a TinyMCE editor.
-	if ( ! wl_post_type_supports_editor( $post_type ) ) {
+	if ( ! wl_post_type_supports_editor($post_type)) {
 		return;
 	}
 
-	if ( ! Wordlift_Admin::is_gutenberg() ) {
+	if ( ! Wordlift_Admin::is_gutenberg()) {
 		// Add main meta box for related entities and 4W only if not Gutenberg
 		add_meta_box(
-			'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
+			'wordlift_entities_box', __('WordLift', 'wordlift'), 'wl_entities_box_content', $post_type, 'side', 'high'
 		);
 	}
 
 }
 
-add_action( 'add_meta_boxes', 'wl_admin_add_entities_meta_box' );
+add_action('add_meta_boxes', 'wl_admin_add_entities_meta_box');
 
 /**
  * Whether the post type supports the editor UI.
@@ -64,9 +64,9 @@ 
  *
  * @return bool True if the editor UI is supported otherwise false.
  */
-function wl_post_type_supports_editor( $post_type ) {
+function wl_post_type_supports_editor($post_type) {
 
-	$default = post_type_supports( $post_type, 'editor' );
+	$default = post_type_supports($post_type, 'editor');
 
 	/**
 	 * Allow 3rd parties to force the classification to load.
@@ -78,7 +78,7 @@ 
 	 * @since 3.19.4
 	 *
 	 */
-	return apply_filters( 'wl_post_type_supports_editor', $default, $post_type );
+	return apply_filters('wl_post_type_supports_editor', $default, $post_type);
 }
 
 /**
@@ -86,10 +86,10 @@ 
  *
  * @param WP_Post $post The current post.
  */
-function wl_entities_box_content( $post, $wrapper = true ) {
+function wl_entities_box_content($post, $wrapper = true) {
 
 	// Angularjs edit-post widget wrapper.
-	if ( $wrapper ) {
+	if ($wrapper) {
 		echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
 	}
 }
@@ -98,13 +98,13 @@ 
 	$post = get_post();
 
 	// Angularjs edit-post widget classification boxes configuration.
-	$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+	$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
 
 	// Array to store all related entities ids.
 	$all_referenced_entities_ids = array();
 
 	// Add selected entities to classification_boxes.
-	foreach ( $classification_boxes as $i => $box ) {
+	foreach ($classification_boxes as $i => $box) {
 		// Build the proper relation name.
 		$relation_name = $box['id'];
 
@@ -114,84 +114,82 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		$entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris( $post_content );
+		$post_content = apply_filters('wl_post_content', $post->post_content, $post);
+		$entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris($post_content);
 
 		// Enhance current box selected entities.
-		$classification_boxes[ $i ]['selectedEntities'] = $entity_uris;
+		$classification_boxes[$i]['selectedEntities'] = $entity_uris;
 
 		// Maps the URIs to entity posts.
 		$entity_service = Wordlift_Entity_Service::get_instance();
 
 		// Replace all entity URI's with post ID's if found or null if there is no related post.
-		$entity_ids = array_map( function ( $item ) use ( $entity_service ) {
+		$entity_ids = array_map(function($item) use ($entity_service) {
 			// Return entity post by the entity URI or null.
-			$post = $entity_service->get_entity_post_by_uri( $item );
+			$post = $entity_service->get_entity_post_by_uri($item);
 
 			// Check that the post object is not null.
-			if ( ! empty( $post ) ) {
+			if ( ! empty($post)) {
 				return $post->ID;
 			}
-		}, $entity_uris );
+		}, $entity_uris);
 		// Store the entity ids for all the 4W.
-		$all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
+		$all_referenced_entities_ids = array_merge($all_referenced_entities_ids, $entity_ids);
 
 	}
 
 	// Json encoding for classification boxes structure.
-	$classification_boxes = wp_json_encode( $classification_boxes );
+	$classification_boxes = wp_json_encode($classification_boxes);
 
 	// Ensure there are no repetitions of the referenced entities.
-	$all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
+	$all_referenced_entities_ids = array_unique($all_referenced_entities_ids);
 
 	// Remove all null, false and empty strings.
 	// NULL is being returned in some cases, when there is not related post, so we need to remove it.
-	$all_referenced_entities_ids = array_filter( $all_referenced_entities_ids );
+	$all_referenced_entities_ids = array_filter($all_referenced_entities_ids);
 
 	// Build the entity storage object.
 	$referenced_entities_obj = array();
-	foreach ( $all_referenced_entities_ids as $referenced_entity ) {
-		$entity = wl_serialize_entity( $referenced_entity );
+	foreach ($all_referenced_entities_ids as $referenced_entity) {
+		$entity = wl_serialize_entity($referenced_entity);
 		// Set a default confidence of `PHP_INT_MAX` for already annotated entities.
-		$referenced_entities_obj[ $entity['id'] ] = $entity
-		                                            + array( 'confidence' => PHP_INT_MAX );
+		$referenced_entities_obj[$entity['id']] = $entity
+		                                            + array('confidence' => PHP_INT_MAX);
 	}
 
-	$referenced_entities_obj = empty( $referenced_entities_obj ) ?
-		'{}' : wp_json_encode( $referenced_entities_obj );
+	$referenced_entities_obj = empty($referenced_entities_obj) ?
+		'{}' : wp_json_encode($referenced_entities_obj);
 
 	$published_place_id  = get_post_meta(
 		$post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
 	);
-	$published_place_obj = ( $published_place_id ) ?
-		wp_json_encode( wl_serialize_entity( $published_place_id ) ) :
-		'undefined';
+	$published_place_obj = ($published_place_id) ?
+		wp_json_encode(wl_serialize_entity($published_place_id)) : 'undefined';
 
 	$topic_id  = get_post_meta(
 		$post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
 	);
-	$topic_obj = ( $topic_id ) ?
-		wp_json_encode( wl_serialize_entity( $topic_id ) ) :
-		'undefined';
+	$topic_obj = ($topic_id) ?
+		wp_json_encode(wl_serialize_entity($topic_id)) : 'undefined';
 
 	$configuration_service = Wordlift_Configuration_Service::get_instance();
 
 	$default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
 	$default_path           = WL_DEFAULT_PATH;
 	$dataset_uri            = $configuration_service->get_dataset_uri();
-	$current_post_uri       = Wordlift_Entity_Service::get_instance()->get_uri( $post->ID );
-	$is_entity              = Wordlift_Entity_Service::get_instance()->is_entity( $post->ID );
+	$current_post_uri       = Wordlift_Entity_Service::get_instance()->get_uri($post->ID);
+	$is_entity              = Wordlift_Entity_Service::get_instance()->is_entity($post->ID);
 
 	// Retrieve the current post author.
-	$post_author = get_userdata( $post->post_author )->display_name;
+	$post_author = get_userdata($post->post_author)->display_name;
 	// Retrive the published date.
-	$published_date = get_the_time( 'Y-m-d', $post->ID );
+	$published_date = get_the_time('Y-m-d', $post->ID);
 	// Current language.
 	$current_language            = $configuration_service->get_language_code();
 	$wordlift_timeline_shortcode = new Wordlift_Timeline_Shortcode();
-	$timelinejs_default_options  = json_encode( $wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT );
-	$addslashes_post_author      = addslashes( $post_author );
-	$ajax_url                    = json_encode( admin_url( 'admin-ajax.php' ) );
+	$timelinejs_default_options  = json_encode($wordlift_timeline_shortcode->get_timelinejs_default_options(), JSON_PRETTY_PRINT);
+	$addslashes_post_author      = addslashes($post_author);
+	$ajax_url                    = json_encode(admin_url('admin-ajax.php'));
 
 	$js_code = <<<JS
 		if ('undefined' == typeof window.wordlift) {
@@ -217,35 +215,35 @@ 
 		window.wordlift.ajax_url = $ajax_url;
 JS;
 
-	echo '<script type="text/javascript">' . PHP_EOL . $js_code . PHP_EOL . '</script>';
+	echo '<script type="text/javascript">'.PHP_EOL.$js_code.PHP_EOL.'</script>';
 
 	$metabox_settings = array(
-		"classificationBoxes"      => json_decode( $classification_boxes ),
-		"entities"                 => json_decode( $referenced_entities_obj ),
-		"currentPostId"            => intval( $post->ID ),
+		"classificationBoxes"      => json_decode($classification_boxes),
+		"entities"                 => json_decode($referenced_entities_obj),
+		"currentPostId"            => intval($post->ID),
 		"currentPostUri"           => $current_post_uri,
 		"currentPostType"          => $post->post_type,
-		"isEntity"                 => ! empty( $is_entity ),
+		"isEntity"                 => ! empty($is_entity),
 		"defaultThumbnailPath"     => $default_thumbnail_path,
 		"defaultWordLiftPath"      => $default_path,
 		"datasetUri"               => $dataset_uri,
 		"currentUser"              => $addslashes_post_author,
 		"publishedDate"            => $published_date,
 		"publishedPlace"           => $published_place_obj,
-		"topic"                    => json_decode( $topic_obj ),
+		"topic"                    => json_decode($topic_obj),
 		"currentLanguage"          => $current_language,
-		"timelinejsDefaultOptions" => json_decode( $timelinejs_default_options ),
-		"ajax_url"                 => admin_url( 'admin-ajax.php' ),
+		"timelinejsDefaultOptions" => json_decode($timelinejs_default_options),
+		"ajax_url"                 => admin_url('admin-ajax.php'),
 	);
 
 	// Allow Classic and Block Editor scripts to register first.
 	// Hook to the Block Editor script.
-	wp_localize_script( 'wl-block-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
+	wp_localize_script('wl-block-editor', '_wlMetaBoxSettings', array('settings' => $metabox_settings));
 
 	// Hook to the Classic Editor script, see Wordlift_Admin_Post_Edit_Page.
-	wp_localize_script( 'wl-classic-editor', '_wlMetaBoxSettings', array( 'settings' => $metabox_settings ) );
+	wp_localize_script('wl-classic-editor', '_wlMetaBoxSettings', array('settings' => $metabox_settings));
 
 }
 
-add_action( 'admin_print_scripts-post.php', 'wl_entities_box_content_scripts', 11 );
-add_action( 'admin_print_scripts-post-new.php', 'wl_entities_box_content_scripts', 11 );
+add_action('admin_print_scripts-post.php', 'wl_entities_box_content_scripts', 11);
+add_action('admin_print_scripts-post-new.php', 'wl_entities_box_content_scripts', 11);