insideout10 / wordlift-plugin

src/modules/core/wordlift_core_entity_api.php

Indentation +77 added lines, -77 removed lines

@@ -20,48 +20,48 @@ 
  */
 function wl_entity_get_by_title( $title, $autocomplete = false, $include_alias = true ) {
 
-	global $wpdb;
-
-	// Search by substring
-	if ( $autocomplete ) {
-		$title = '%' . $title . '%';
-	}
-
-	// The title is a LIKE query.
-	$query = "SELECT DISTINCT p.ID AS id, p.post_title AS title, t.name AS schema_type_name, t.slug AS type_slug"
-			 . " FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t"
-			 . "  WHERE p.post_title LIKE %s"
-			 . "   AND t.term_id = tt.term_id"
-			 . "   AND tt.taxonomy = %s"
-			 . "   AND tt.term_taxonomy_id = tr.term_taxonomy_id"
-			 . "   AND tr.object_id = p.ID"
-			 // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
-			 . "   AND p.post_status != 'trash'";
-
-	if ( $include_alias ) {
-
-		$query .= " UNION"
-				  . "  SELECT DISTINCT p.ID AS id, CONCAT( m.meta_value, ' (', p.post_title, ')' ) AS title, t.name AS schema_type_name, t.slug AS type_slug"
-				  . "  FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t, $wpdb->postmeta m"
-				  . "   WHERE m.meta_key = %s AND m.meta_value LIKE %s"
-				  . "    AND m.post_id = p.ID"
-				  . "    AND t.term_id = tt.term_id"
-				  . "    AND tt.taxonomy = %s"
-				  . "    AND tt.term_taxonomy_id = tr.term_taxonomy_id"
-				  . "    AND tr.object_id = p.ID"
-				  // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
-				  . "    AND p.post_status != 'trash'";
-	}
-
-	return $wpdb->get_results( $wpdb->prepare(
-		$query,
-		$title,
-		Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-		Wordlift_Entity_Service::TYPE_NAME,
-		Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
-		$title,
-		Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME
-	) );
+    global $wpdb;
+
+    // Search by substring
+    if ( $autocomplete ) {
+        $title = '%' . $title . '%';
+    }
+
+    // The title is a LIKE query.
+    $query = "SELECT DISTINCT p.ID AS id, p.post_title AS title, t.name AS schema_type_name, t.slug AS type_slug"
+                . " FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t"
+                . "  WHERE p.post_title LIKE %s"
+                . "   AND t.term_id = tt.term_id"
+                . "   AND tt.taxonomy = %s"
+                . "   AND tt.term_taxonomy_id = tr.term_taxonomy_id"
+                . "   AND tr.object_id = p.ID"
+                // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
+                . "   AND p.post_status != 'trash'";
+
+    if ( $include_alias ) {
+
+        $query .= " UNION"
+                    . "  SELECT DISTINCT p.ID AS id, CONCAT( m.meta_value, ' (', p.post_title, ')' ) AS title, t.name AS schema_type_name, t.slug AS type_slug"
+                    . "  FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t, $wpdb->postmeta m"
+                    . "   WHERE m.meta_key = %s AND m.meta_value LIKE %s"
+                    . "    AND m.post_id = p.ID"
+                    . "    AND t.term_id = tt.term_id"
+                    . "    AND tt.taxonomy = %s"
+                    . "    AND tt.term_taxonomy_id = tr.term_taxonomy_id"
+                    . "    AND tr.object_id = p.ID"
+                    // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
+                    . "    AND p.post_status != 'trash'";
+    }
+
+    return $wpdb->get_results( $wpdb->prepare(
+        $query,
+        $title,
+        Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+        Wordlift_Entity_Service::TYPE_NAME,
+        Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
+        $title,
+        Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME
+    ) );
 }
 
 /**
@@ -71,41 +71,41 @@ 
  */
 function wl_entity_ajax_get_by_title() {
 
-	// `wl_entity_metaboxes_utilities.js` still uses `GET`.
-	//
-	// See https://github.com/insideout10/wordlift-plugin/issues/438.
-	// Get the title to search.
-	if ( empty( $_POST['title'] ) && empty( $_GET['title'] ) ) {
-		@ob_clean();
-		wp_send_json_error( 'The title parameter is required.' );
-	}
-
-	// `wl_entity_metaboxes_utilities.js` still uses `GET`.
-	//
-	// See https://github.com/insideout10/wordlift-plugin/issues/438.
-	$title = $_POST['title'] ?: $_GET['title'];
-
-	// Are we searching for a specific title or for a containing title?
-	$autocomplete = isset( $_GET['autocomplete'] );
-
-	// Are we searching also for the aliases?
-	$include_alias = isset( $_GET['alias'] );
-
-	// Get the edit link.
-	$post_type_object = get_post_type_object( Wordlift_Entity_Service::TYPE_NAME );
-	$edit_link        = $post_type_object->_edit_link . '&action=edit';
-
-	// Prepare the response with the edit link.
-	$response = array(
-		'edit_link' => $edit_link,
-		'results'   => wl_entity_get_by_title( $title, $autocomplete, $include_alias ),
-	);
-
-	// Clean any buffer.
-	ob_clean();
-
-	// Send the success response.
-	wp_send_json_success( $response );
+    // `wl_entity_metaboxes_utilities.js` still uses `GET`.
+    //
+    // See https://github.com/insideout10/wordlift-plugin/issues/438.
+    // Get the title to search.
+    if ( empty( $_POST['title'] ) && empty( $_GET['title'] ) ) {
+        @ob_clean();
+        wp_send_json_error( 'The title parameter is required.' );
+    }
+
+    // `wl_entity_metaboxes_utilities.js` still uses `GET`.
+    //
+    // See https://github.com/insideout10/wordlift-plugin/issues/438.
+    $title = $_POST['title'] ?: $_GET['title'];
+
+    // Are we searching for a specific title or for a containing title?
+    $autocomplete = isset( $_GET['autocomplete'] );
+
+    // Are we searching also for the aliases?
+    $include_alias = isset( $_GET['alias'] );
+
+    // Get the edit link.
+    $post_type_object = get_post_type_object( Wordlift_Entity_Service::TYPE_NAME );
+    $edit_link        = $post_type_object->_edit_link . '&action=edit';
+
+    // Prepare the response with the edit link.
+    $response = array(
+        'edit_link' => $edit_link,
+        'results'   => wl_entity_get_by_title( $title, $autocomplete, $include_alias ),
+    );
+
+    // Clean any buffer.
+    ob_clean();
+
+    // Send the success response.
+    wp_send_json_success( $response );
 
 }
 

Spacing +15 added lines, -15 removed lines

@@ -18,13 +18,13 @@ 
  *
  * @return array An array of WP_Post instances.
  */
-function wl_entity_get_by_title( $title, $autocomplete = false, $include_alias = true ) {
+function wl_entity_get_by_title($title, $autocomplete = false, $include_alias = true) {
 
 	global $wpdb;
 
 	// Search by substring
-	if ( $autocomplete ) {
-		$title = '%' . $title . '%';
+	if ($autocomplete) {
+		$title = '%'.$title.'%';
 	}
 
 	// The title is a LIKE query.
@@ -38,7 +38,7 @@ 
 			 // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
 			 . "   AND p.post_status != 'trash'";
 
-	if ( $include_alias ) {
+	if ($include_alias) {
 
 		$query .= " UNION"
 				  . "  SELECT DISTINCT p.ID AS id, CONCAT( m.meta_value, ' (', p.post_title, ')' ) AS title, t.name AS schema_type_name, t.slug AS type_slug"
@@ -53,7 +53,7 @@ 
 				  . "    AND p.post_status != 'trash'";
 	}
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		$query,
 		$title,
 		Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
@@ -61,7 +61,7 @@ 
 		Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
 		$title,
 		Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME
-	) );
+	));
 }
 
 /**
@@ -75,9 +75,9 @@ 
 	//
 	// See https://github.com/insideout10/wordlift-plugin/issues/438.
 	// Get the title to search.
-	if ( empty( $_POST['title'] ) && empty( $_GET['title'] ) ) {
+	if (empty($_POST['title']) && empty($_GET['title'])) {
 		@ob_clean();
-		wp_send_json_error( 'The title parameter is required.' );
+		wp_send_json_error('The title parameter is required.');
 	}
 
 	// `wl_entity_metaboxes_utilities.js` still uses `GET`.
@@ -86,27 +86,27 @@ 
 	$title = $_POST['title'] ?: $_GET['title'];
 
 	// Are we searching for a specific title or for a containing title?
-	$autocomplete = isset( $_GET['autocomplete'] );
+	$autocomplete = isset($_GET['autocomplete']);
 
 	// Are we searching also for the aliases?
-	$include_alias = isset( $_GET['alias'] );
+	$include_alias = isset($_GET['alias']);
 
 	// Get the edit link.
-	$post_type_object = get_post_type_object( Wordlift_Entity_Service::TYPE_NAME );
-	$edit_link        = $post_type_object->_edit_link . '&action=edit';
+	$post_type_object = get_post_type_object(Wordlift_Entity_Service::TYPE_NAME);
+	$edit_link        = $post_type_object->_edit_link.'&action=edit';
 
 	// Prepare the response with the edit link.
 	$response = array(
 		'edit_link' => $edit_link,
-		'results'   => wl_entity_get_by_title( $title, $autocomplete, $include_alias ),
+		'results'   => wl_entity_get_by_title($title, $autocomplete, $include_alias),
 	);
 
 	// Clean any buffer.
 	ob_clean();
 
 	// Send the success response.
-	wp_send_json_success( $response );
+	wp_send_json_success($response);
 
 }
 
-add_action( 'wp_ajax_entity_by_title', 'wl_entity_ajax_get_by_title' );
+add_action('wp_ajax_entity_by_title', 'wl_entity_ajax_get_by_title');

src/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +157 added lines, -157 removed lines

@@ -14,73 +14,73 @@ 
  */
 function wl_shortcode_faceted_search( $atts ) {
 
-	// Extract attributes and set default values.
-	$shortcode_atts = shortcode_atts( array(
-		'title'          => __( 'Related articles', 'wordlift' ),
-		'show_facets'    => true,
-		'with_carousel'  => true,
-		'squared_thumbs' => false,
-		'limit'          => 20,
-
-	), $atts );
-
-	foreach (
-		array(
-			'show_facets',
-			'with_carousel',
-			'squared_thumbs',
-		) as $att
-	) {
-
-		// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode.
-		$shortcode_atts[ $att ] = filter_var(
-			$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
-		);
-	}
-
-	// If the current post is not an entity and has no related entities
-	// than the shortcode cannot be rendered
-	// TODO Add an alert visibile only for connected admin users.
-	$current_post = get_post();
-
-	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		$current_post->ID :
-		wl_core_get_related_entity_ids( $current_post->ID );
-
-	if ( 0 === count( $entity_ids ) ) {
-		return '';
-	}
-
-	$div_id = 'wordlift-faceted-entity-search-widget';
-
-	wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
-
-	wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
-
-	wp_localize_script(
-		'wordlift-faceted-search',
-		'wl_faceted_search_params', array(
-			'ajax_url'             => admin_url( 'admin-ajax.php' ),
-			'action'               => 'wl_faceted_search',
-			'post_id'              => $current_post->ID,
-			'entity_ids'           => $entity_ids,
-			'limit'                => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
-			'div_id'               => $div_id,
-			'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
-			'attrs'                => $shortcode_atts,
-			'l10n'                 => array(
-				'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-				'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-				'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-				'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
-			),
-		)
-	);
-
-	return '<div id="' . $div_id . '" style="width:100%"></div>';
+    // Extract attributes and set default values.
+    $shortcode_atts = shortcode_atts( array(
+        'title'          => __( 'Related articles', 'wordlift' ),
+        'show_facets'    => true,
+        'with_carousel'  => true,
+        'squared_thumbs' => false,
+        'limit'          => 20,
+
+    ), $atts );
+
+    foreach (
+        array(
+            'show_facets',
+            'with_carousel',
+            'squared_thumbs',
+        ) as $att
+    ) {
+
+        // See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode.
+        $shortcode_atts[ $att ] = filter_var(
+            $shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+        );
+    }
+
+    // If the current post is not an entity and has no related entities
+    // than the shortcode cannot be rendered
+    // TODO Add an alert visibile only for connected admin users.
+    $current_post = get_post();
+
+    $entity_service = Wordlift_Entity_Service::get_instance();
+    $entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
+        $current_post->ID :
+        wl_core_get_related_entity_ids( $current_post->ID );
+
+    if ( 0 === count( $entity_ids ) ) {
+        return '';
+    }
+
+    $div_id = 'wordlift-faceted-entity-search-widget';
+
+    wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css' );
+    wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
+    wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
+
+    wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
+
+    wp_localize_script(
+        'wordlift-faceted-search',
+        'wl_faceted_search_params', array(
+            'ajax_url'             => admin_url( 'admin-ajax.php' ),
+            'action'               => 'wl_faceted_search',
+            'post_id'              => $current_post->ID,
+            'entity_ids'           => $entity_ids,
+            'limit'                => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+            'div_id'               => $div_id,
+            'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
+            'attrs'                => $shortcode_atts,
+            'l10n'                 => array(
+                'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
+                'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
+                'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
+                'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+            ),
+        )
+    );
+
+    return '<div id="' . $div_id . '" style="width:100%"></div>';
 }
 
 add_shortcode( 'wl_faceted_search', 'wl_shortcode_faceted_search' );
@@ -91,106 +91,106 @@ 
  */
 function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
 
-	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
+    // Post ID must be defined.
+    if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
+        wp_die( 'No post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	// Extract filtering conditions.
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+    // Extract filtering conditions.
+    $filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
+    $filtering_entity_uris = json_decode( $filtering_entity_uris );
 
-	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
+    $current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
+    $current_post    = get_post( $current_post_id );
 
-	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+    // Post ID has to match an existing item.
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	// If the current post is an entity,
-	// the current post is used as main entity.
-	// Otherwise, current post related entities are used.
-	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+    // If the current post is an entity,
+    // the current post is used as main entity.
+    // Otherwise, current post related entities are used.
+    $entity_service = Wordlift_Entity_Service::get_instance();
+    $entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
+        array( $current_post->ID ) :
+        wl_core_get_related_entity_ids( $current_post->ID );
 
-	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
+    // If there are no entities we cannot render the widget.
+    if ( 0 === count( $entity_ids ) ) {
+        wp_die( 'No entities available' );
 
-		return;
-	}
+        return;
+    }
 
-	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+    // Retrieve requested type
+    $required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+    $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
 
-	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-		$entity_ids,
-		'*',
-		null,
-		'publish',
-		array( $current_post_id ),
-		$limit
-	);
+    $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+        $entity_ids,
+        '*',
+        null,
+        'publish',
+        array( $current_post_id ),
+        $limit
+    );
 
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-	$results              = array();
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+    $results              = array();
 
-	if ( 'posts' === $required_type ) {
+    if ( 'posts' === $required_type ) {
 
-		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+        // Required filtered posts.
+        wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
 
-		$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-			$referencing_posts :
-			Wordlift_Relation_Service::get_instance()->get_article_subjects(
-				wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
-				'*',
-				null,
-				null,
-				array(),
-				null,
-				$referencing_post_ids
-			);
+        $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
+            $referencing_posts :
+            Wordlift_Relation_Service::get_instance()->get_article_subjects(
+                wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+                '*',
+                null,
+                null,
+                array(),
+                null,
+                $referencing_post_ids
+            );
 
-		if ( $filtered_posts ) {
-			foreach ( $filtered_posts as $post_obj ) {
+        if ( $filtered_posts ) {
+            foreach ( $filtered_posts as $post_obj ) {
 
-				$thumbnail           = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
-				$post_obj->thumbnail = ( $thumbnail ) ?
-					$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-				$post_obj->permalink = get_post_permalink( $post_obj->ID );
+                $thumbnail           = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
+                $post_obj->thumbnail = ( $thumbnail ) ?
+                    $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+                $post_obj->permalink = get_post_permalink( $post_obj->ID );
 
-				$results[] = $post_obj;
-			}
-		}
-	} else {
+                $results[] = $post_obj;
+            }
+        }
+    } else {
 
-		global $wpdb;
+        global $wpdb;
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
 
-		// Retrieve Wordlift relation instances table name.
-		$table_name = wl_core_get_relation_instances_table_name();
+        // Retrieve Wordlift relation instances table name.
+        $table_name = wl_core_get_relation_instances_table_name();
 
-		/*
+        /*
 		 * Make sure we have some referenced post, otherwise the IN parts of
 		 * the SQL will produce an SQL error.
 		 */
-		if ( ! empty( $referencing_post_ids ) ) {
-			$subject_ids = implode( ',', $referencing_post_ids );
+        if ( ! empty( $referencing_post_ids ) ) {
+            $subject_ids = implode( ',', $referencing_post_ids );
 
-			$query = "
+            $query = "
 				SELECT
 					object_id AS ID,
 					count( object_id ) AS counter
@@ -202,29 +202,29 @@ 
 				LIMIT $limit;
 			";
 
-			wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+            wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
 
-			$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+            $entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
 
-			wl_write_log( 'Entities found ' . count( $entities ) );
+            wl_write_log( 'Entities found ' . count( $entities ) );
 
-			foreach ( $entities as $obj ) {
+            foreach ( $entities as $obj ) {
 
-				$entity = get_post( $obj->ID );
-				// Ensure only valid and published entities are returned.
-				if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+                $entity = get_post( $obj->ID );
+                // Ensure only valid and published entities are returned.
+                if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
 
-					$serialized_entity              = wl_serialize_entity( $entity );
-					$serialized_entity['counter']   = $obj->counter;
-					$serialized_entity['createdAt'] = $entity->post_date;
+                    $serialized_entity              = wl_serialize_entity( $entity );
+                    $serialized_entity['counter']   = $obj->counter;
+                    $serialized_entity['createdAt'] = $entity->post_date;
 
-					$results[] = $serialized_entity;
-				}
-			}
-		}
-	}
+                    $results[] = $serialized_entity;
+                }
+            }
+        }
+    }
 
-	wl_core_send_json( $results );
+    wl_core_send_json( $results );
 
 }
 

Spacing +61 added lines, -64 removed lines

@@ -12,17 +12,17 @@ 
  *
  * @param array $atts Shortcode attributes.
  */
-function wl_shortcode_faceted_search( $atts ) {
+function wl_shortcode_faceted_search($atts) {
 
 	// Extract attributes and set default values.
-	$shortcode_atts = shortcode_atts( array(
-		'title'          => __( 'Related articles', 'wordlift' ),
+	$shortcode_atts = shortcode_atts(array(
+		'title'          => __('Related articles', 'wordlift'),
 		'show_facets'    => true,
 		'with_carousel'  => true,
 		'squared_thumbs' => false,
 		'limit'          => 20,
 
-	), $atts );
+	), $atts);
 
 	foreach (
 		array(
@@ -33,8 +33,8 @@ 
 	) {
 
 		// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode.
-		$shortcode_atts[ $att ] = filter_var(
-			$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+		$shortcode_atts[$att] = filter_var(
+			$shortcode_atts[$att], FILTER_VALIDATE_BOOLEAN
 		);
 	}
 
@@ -44,70 +44,69 @@ 
 	$current_post = get_post();
 
 	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		$current_post->ID :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+		$current_post->ID : wl_core_get_related_entity_ids($current_post->ID);
 
-	if ( 0 === count( $entity_ids ) ) {
+	if (0 === count($entity_ids)) {
 		return '';
 	}
 
 	$div_id = 'wordlift-faceted-entity-search-widget';
 
-	wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
+	wp_enqueue_style('wordlift-faceted-search', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-faceted-entity-search-widget.min.css');
+	wp_enqueue_script('angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js');
+	wp_enqueue_script('angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js');
 
-	wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
+	wp_enqueue_script('wordlift-faceted-search', dirname(plugin_dir_url(__FILE__)).'/js/wordlift-faceted-entity-search-widget.min.js');
 
 	wp_localize_script(
 		'wordlift-faceted-search',
 		'wl_faceted_search_params', array(
-			'ajax_url'             => admin_url( 'admin-ajax.php' ),
+			'ajax_url'             => admin_url('admin-ajax.php'),
 			'action'               => 'wl_faceted_search',
 			'post_id'              => $current_post->ID,
 			'entity_ids'           => $entity_ids,
-			'limit'                => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+			'limit'                => apply_filters('wl_faceted_search_limit', $shortcode_atts['limit']),
 			'div_id'               => $div_id,
 			'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
 			'attrs'                => $shortcode_atts,
 			'l10n'                 => array(
-				'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-				'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-				'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-				'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+				'what'  => _x('What', 'Faceted Search Widget', 'wordlift'),
+				'who'   => _x('Who', 'Faceted Search Widget', 'wordlift'),
+				'where' => _x('Where', 'Faceted Search Widget', 'wordlift'),
+				'when'  => _x('When', 'Faceted Search Widget', 'wordlift'),
 			),
 		)
 	);
 
-	return '<div id="' . $div_id . '" style="width:100%"></div>';
+	return '<div id="'.$div_id.'" style="width:100%"></div>';
 }
 
-add_shortcode( 'wl_faceted_search', 'wl_shortcode_faceted_search' );
+add_shortcode('wl_faceted_search', 'wl_shortcode_faceted_search');
 
 
 /**
  * Ajax call for the faceted search widget
  */
-function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_ajax($http_raw_data = null) {
 
 	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) { // WPCS: input var ok; CSRF ok.
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	// Extract filtering conditions.
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( 'php://input' ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+	$filtering_entity_uris = (null == $http_raw_data) ? file_get_contents('php://input') : $http_raw_data;
+	$filtering_entity_uris = json_decode($filtering_entity_uris);
 
 	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
@@ -116,45 +115,43 @@ 
 	// the current post is used as main entity.
 	// Otherwise, current post related entities are used.
 	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
+	if (0 === count($entity_ids)) {
+		wp_die('No entities available');
 
 		return;
 	}
 
 	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+	$required_type = (isset($_GET['type'])) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+	$limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 20; // WPCS: input var ok; CSRF ok.
 
 	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
 		$entity_ids,
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit
 	);
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 	$results              = array();
 
-	if ( 'posts' === $required_type ) {
+	if ('posts' === $required_type) {
 
 		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related posts for the current post [ post ID :: $current_post_id ]");
 
-		$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-			$referencing_posts :
-			Wordlift_Relation_Service::get_instance()->get_article_subjects(
-				wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+		$filtered_posts = (empty($filtering_entity_uris)) ?
+			$referencing_posts : Wordlift_Relation_Service::get_instance()->get_article_subjects(
+				wl_get_entity_post_ids_by_uris($filtering_entity_uris),
 				'*',
 				null,
 				null,
@@ -163,13 +160,13 @@ 
 				$referencing_post_ids
 			);
 
-		if ( $filtered_posts ) {
-			foreach ( $filtered_posts as $post_obj ) {
+		if ($filtered_posts) {
+			foreach ($filtered_posts as $post_obj) {
 
-				$thumbnail           = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
-				$post_obj->thumbnail = ( $thumbnail ) ?
+				$thumbnail           = wp_get_attachment_url(get_post_thumbnail_id($post_obj->ID, 'thumbnail'));
+				$post_obj->thumbnail = ($thumbnail) ?
 					$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-				$post_obj->permalink = get_post_permalink( $post_obj->ID );
+				$post_obj->permalink = get_post_permalink($post_obj->ID);
 
 				$results[] = $post_obj;
 			}
@@ -178,7 +175,7 @@ 
 
 		global $wpdb;
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ]");
 
 		// Retrieve Wordlift relation instances table name.
 		$table_name = wl_core_get_relation_instances_table_name();
@@ -187,8 +184,8 @@ 
 		 * Make sure we have some referenced post, otherwise the IN parts of
 		 * the SQL will produce an SQL error.
 		 */
-		if ( ! empty( $referencing_post_ids ) ) {
-			$subject_ids = implode( ',', $referencing_post_ids );
+		if ( ! empty($referencing_post_ids)) {
+			$subject_ids = implode(',', $referencing_post_ids);
 
 			$query = "
 				SELECT
@@ -202,19 +199,19 @@ 
 				LIMIT $limit;
 			";
 
-			wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+			wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]");
 
-			$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+			$entities = $wpdb->get_results($query, OBJECT); // No cache ok.
 
-			wl_write_log( 'Entities found ' . count( $entities ) );
+			wl_write_log('Entities found '.count($entities));
 
-			foreach ( $entities as $obj ) {
+			foreach ($entities as $obj) {
 
-				$entity = get_post( $obj->ID );
+				$entity = get_post($obj->ID);
 				// Ensure only valid and published entities are returned.
-				if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+				if ((null !== $entity) && ('publish' === $entity->post_status)) {
 
-					$serialized_entity              = wl_serialize_entity( $entity );
+					$serialized_entity              = wl_serialize_entity($entity);
 					$serialized_entity['counter']   = $obj->counter;
 					$serialized_entity['createdAt'] = $entity->post_date;
 
@@ -224,9 +221,9 @@ 
 		}
 	}
 
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
-add_action( 'wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
-add_action( 'wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
+add_action('wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');
+add_action('wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');

src/admin/class-wordlift-admin-settings-page.php

Indentation +317 added lines, -317 removed lines

@@ -18,322 +18,322 @@
  */
 class Wordlift_Admin_Settings_Page extends Wordlift_Admin_Page {
 
-	/**
-	 * A singleton instance of the Notice service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
-	 */
-	private $input_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 *
-	 * @since  3.13.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	private $radio_input_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	private $language_select_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 */
-	private $publisher_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Settings_Page} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Configuration_Service         $configuration_service
-	 * @param \Wordlift_Entity_Service                $entity_service
-	 * @param \Wordlift_Admin_Input_Element           $input_element
-	 * @param \Wordlift_Admin_Language_Select_Element $language_select_element
-	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element
-	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
-	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
-
-		$this->configuration_service = $configuration_service;
-		$this->entity_service        = $entity_service;
-
-		// Set a reference to the UI elements.
-		$this->input_element           = $input_element;
-		$this->radio_input_element     = $radio_input_element;
-		$this->language_select_element = $language_select_element;
-		$this->publisher_element       = $publisher_element;
-
-		self::$instance = $this;
-	}
-
-	/**
-	 * Get the singleton instance of the Notice service.
-	 *
-	 * @since 3.14.0
-	 * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_parent_slug() {
-
-		return 'wl_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_capability() {
-
-		return 'manage_options';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_page_title() {
-
-		return 'WorldLift Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_title() {
-
-		return 'Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_slug() {
-
-		return 'wl_configuration_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_partial_name() {
-
-		return 'wordlift-admin-settings-page.php';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function enqueue_scripts() {
-
-		// Enqueue the media scripts to be used for the publisher's logo selection.
-		wp_enqueue_media();
-
-		// JavaScript required for the settings page.
-		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
-		wp_enqueue_style( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.css' );
-
-	}
-
-	/**
-	 * Configure all the configuration parameters.
-	 *
-	 * Called by the *admin_init* hook.
-	 *
-	 * @since 3.11.0
-	 */
-	function admin_init() {
-
-		// Register WordLift's general settings, providing our own sanitize callback
-		// which will also check whether the user filled the WL Publisher form.
-		register_setting(
-			'wl_general_settings',
-			'wl_general_settings',
-			array( $this, 'sanitize_callback', )
-		);
-
-		// Add the general settings section.
-		add_settings_section(
-			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
-			'wl_general_settings'          // Page on which to add this section of options.
-		);
-
-		$key_args = array(
-			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
-			'value'       => $this->configuration_service->get_key(),
-			'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
-		);
-
-		// Set the class for the key field based on the validity of the key.
-		// Class should be "untouched" for an empty (virgin) value, "valid"
-		// if the key is valid, or "invalid" otherwise.
-		$validation_service = new Wordlift_Key_Validation_Service( $this->configuration_service );
-
-		if ( empty( $key_args['value'] ) ) {
-			$key_args['css_class'] = 'untouched';
-		} elseif ( $validation_service->is_valid( $key_args['value'] ) ) {
-			$key_args['css_class'] = 'valid';
-		} else {
-			$key_args['css_class'] = 'invalid';
-		}
-
-		// Add the `key` field.
-		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			_x( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
-			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
-			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
-		);
-
-		// Entity Base Path input.
-		$entity_base_path_args = array(
-			// The array of arguments to pass to the callback. In this case, just a description.
-			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
-			'value'       => $this->configuration_service->get_entity_base_path(),
-			'description' => sprintf( _x( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
-		);
-
-		$entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
-
-		// Add the `wl_entity_base_path` field.
-		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			_x( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
-			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
-			$entity_base_path_args
-		);
-
-		// Add the `language_name` field.
-		add_settings_field(
-			'wl-site-language',
-			_x( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				// The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
-				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
-			)
-		);
-
-		// Add the `publisher` field.
-		add_settings_field(
-			'wl-publisher-id',
-			_x( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
-			)
-		);
-
-		// Add the `link by default` field.
-		add_settings_field(
-			'wl-link-by-default',
-			_x( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
-				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => _x( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Sanitize the configuration settings to be stored.
-	 *
-	 * If a new entity is being created for the publisher, create it and set The
-	 * publisher setting.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $input The configuration settings array.
-	 *
-	 * @return array The sanitized input array.
-	 */
-	function sanitize_callback( $input ) {
-
-		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
-			$name         = $_POST['wl_publisher']['name'];
-			$type         = $_POST['wl_publisher']['type'];
-			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
-
-			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
-
-			// Create an entity for the publisher and assign it to the input
-			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
-		}
-
-		return $input;
-	}
+    /**
+     * A singleton instance of the Notice service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
+     */
+    private $input_element;
+
+    /**
+     * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     *
+     * @since  3.13.0
+     * @access protected
+     * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    private $radio_input_element;
+
+    /**
+     * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    private $language_select_element;
+
+    /**
+     * A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     */
+    private $publisher_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Settings_Page} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Configuration_Service         $configuration_service
+     * @param \Wordlift_Entity_Service                $entity_service
+     * @param \Wordlift_Admin_Input_Element           $input_element
+     * @param \Wordlift_Admin_Language_Select_Element $language_select_element
+     * @param \Wordlift_Admin_Publisher_Element       $publisher_element
+     * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
+     */
+    function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
+
+        $this->configuration_service = $configuration_service;
+        $this->entity_service        = $entity_service;
+
+        // Set a reference to the UI elements.
+        $this->input_element           = $input_element;
+        $this->radio_input_element     = $radio_input_element;
+        $this->language_select_element = $language_select_element;
+        $this->publisher_element       = $publisher_element;
+
+        self::$instance = $this;
+    }
+
+    /**
+     * Get the singleton instance of the Notice service.
+     *
+     * @since 3.14.0
+     * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_parent_slug() {
+
+        return 'wl_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_capability() {
+
+        return 'manage_options';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_page_title() {
+
+        return 'WorldLift Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_title() {
+
+        return 'Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_slug() {
+
+        return 'wl_configuration_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_partial_name() {
+
+        return 'wordlift-admin-settings-page.php';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enqueue_scripts() {
+
+        // Enqueue the media scripts to be used for the publisher's logo selection.
+        wp_enqueue_media();
+
+        // JavaScript required for the settings page.
+        // @todo: try to move to the `wordlift-admin.bundle.js`.
+        wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
+        wp_enqueue_style( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.css' );
+
+    }
+
+    /**
+     * Configure all the configuration parameters.
+     *
+     * Called by the *admin_init* hook.
+     *
+     * @since 3.11.0
+     */
+    function admin_init() {
+
+        // Register WordLift's general settings, providing our own sanitize callback
+        // which will also check whether the user filled the WL Publisher form.
+        register_setting(
+            'wl_general_settings',
+            'wl_general_settings',
+            array( $this, 'sanitize_callback', )
+        );
+
+        // Add the general settings section.
+        add_settings_section(
+            'wl_general_settings_section', // ID used to identify this section and with which to register options.
+            '',                            // Section header.
+            '',                            // Callback used to render the description of the section.
+            'wl_general_settings'          // Page on which to add this section of options.
+        );
+
+        $key_args = array(
+            'id'          => 'wl-key',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+            'value'       => $this->configuration_service->get_key(),
+            'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+        );
+
+        // Set the class for the key field based on the validity of the key.
+        // Class should be "untouched" for an empty (virgin) value, "valid"
+        // if the key is valid, or "invalid" otherwise.
+        $validation_service = new Wordlift_Key_Validation_Service( $this->configuration_service );
+
+        if ( empty( $key_args['value'] ) ) {
+            $key_args['css_class'] = 'untouched';
+        } elseif ( $validation_service->is_valid( $key_args['value'] ) ) {
+            $key_args['css_class'] = 'valid';
+        } else {
+            $key_args['css_class'] = 'invalid';
+        }
+
+        // Add the `key` field.
+        add_settings_field(
+            'wl-key',                                       // Element id used to identify the field throughout the theme.
+            _x( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+            // The name of the function responsible for rendering the option interface.
+            array( $this->input_element, 'render', ),
+            'wl_general_settings',                          // The page on which this option will be displayed.
+            'wl_general_settings_section',                  // The name of the section to which this field belongs.
+            $key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
+        );
+
+        // Entity Base Path input.
+        $entity_base_path_args = array(
+            // The array of arguments to pass to the callback. In this case, just a description.
+            'id'          => 'wl-entity-base-path',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+            'value'       => $this->configuration_service->get_entity_base_path(),
+            'description' => sprintf( _x( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+        );
+
+        $entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
+
+        // Add the `wl_entity_base_path` field.
+        add_settings_field(
+            'wl-entity-base-path',                                // ID used to identify the field throughout the theme
+            _x( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+            // The name of the function responsible for rendering the option interface
+            array( $this->input_element, 'render', ),
+            'wl_general_settings',                                // The page on which this option will be displayed
+            'wl_general_settings_section',                        // The name of the section to which this field belongs
+            $entity_base_path_args
+        );
+
+        // Add the `language_name` field.
+        add_settings_field(
+            'wl-site-language',
+            _x( 'Site Language', 'wordlift' ),
+            array( $this->language_select_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-site-language',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+                'value'       => $this->configuration_service->get_language_code(),
+                'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+            )
+        );
+
+        // Add the `publisher` field.
+        add_settings_field(
+            'wl-publisher-id',
+            _x( 'Publisher', 'wordlift' ),
+            array( $this->publisher_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'   => 'wl-publisher-id',
+                'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+            )
+        );
+
+        // Add the `link by default` field.
+        add_settings_field(
+            'wl-link-by-default',
+            _x( 'Link by Default', 'wordlift' ),
+            array( $this->radio_input_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'          => 'wl-link-by-default',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+                'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
+                'description' => _x( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+            )
+        );
+
+    }
+
+    /**
+     * Sanitize the configuration settings to be stored.
+     *
+     * If a new entity is being created for the publisher, create it and set The
+     * publisher setting.
+     *
+     * @since 3.11.0
+     *
+     * @param array $input The configuration settings array.
+     *
+     * @return array The sanitized input array.
+     */
+    function sanitize_callback( $input ) {
+
+        // Check whether a publisher name has been set.
+        if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
+            $name         = $_POST['wl_publisher']['name'];
+            $type         = $_POST['wl_publisher']['type'];
+            $thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
+
+            // Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
+            $type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+
+            // Create an entity for the publisher and assign it to the input
+            // parameter which WordPress automatically saves into the settings.
+            $input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+        }
+
+        return $input;
+    }
 
 }

Spacing +38 added lines, -38 removed lines

@@ -93,7 +93,7 @@ 
 	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element
 	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
 	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
+	function __construct($configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element) {
 
 		$this->configuration_service = $configuration_service;
 		$this->entity_service        = $entity_service;
@@ -176,8 +176,8 @@ 
 
 		// JavaScript required for the settings page.
 		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
-		wp_enqueue_style( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.css' );
+		wp_enqueue_script('wordlift-admin-settings-page', plugin_dir_url(dirname(__FILE__)).'admin/js/1/settings.js', array('wp-util'));
+		wp_enqueue_style('wordlift-admin-settings-page', plugin_dir_url(dirname(__FILE__)).'admin/js/1/settings.css');
 
 	}
 
@@ -195,32 +195,32 @@ 
 		register_setting(
 			'wl_general_settings',
 			'wl_general_settings',
-			array( $this, 'sanitize_callback', )
+			array($this, 'sanitize_callback',)
 		);
 
 		// Add the general settings section.
 		add_settings_section(
 			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
+			'', // Section header.
+			'', // Callback used to render the description of the section.
 			'wl_general_settings'          // Page on which to add this section of options.
 		);
 
 		$key_args = array(
 			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::KEY.']',
 			'value'       => $this->configuration_service->get_key(),
-			'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+			'description' => __('Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift'),
 		);
 
 		// Set the class for the key field based on the validity of the key.
 		// Class should be "untouched" for an empty (virgin) value, "valid"
 		// if the key is valid, or "invalid" otherwise.
-		$validation_service = new Wordlift_Key_Validation_Service( $this->configuration_service );
+		$validation_service = new Wordlift_Key_Validation_Service($this->configuration_service);
 
-		if ( empty( $key_args['value'] ) ) {
+		if (empty($key_args['value'])) {
 			$key_args['css_class'] = 'untouched';
-		} elseif ( $validation_service->is_valid( $key_args['value'] ) ) {
+		} elseif ($validation_service->is_valid($key_args['value'])) {
 			$key_args['css_class'] = 'valid';
 		} else {
 			$key_args['css_class'] = 'invalid';
@@ -228,12 +228,12 @@ 
 
 		// Add the `key` field.
 		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			_x( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+			'wl-key', // Element id used to identify the field throughout the theme.
+			_x('WordLift Key', 'wordlift'), // The label to the left of the option interface element.
 			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
+			array($this->input_element, 'render',),
+			'wl_general_settings', // The page on which this option will be displayed.
+			'wl_general_settings_section', // The name of the section to which this field belongs.
 			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
 		);
 
@@ -241,65 +241,65 @@ 
 		$entity_base_path_args = array(
 			// The array of arguments to pass to the callback. In this case, just a description.
 			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY.']',
 			'value'       => $this->configuration_service->get_entity_base_path(),
-			'description' => sprintf( _x( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+			'description' => sprintf(_x('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift'), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary'),
 		);
 
 		$entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
 
 		// Add the `wl_entity_base_path` field.
 		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			_x( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+			'wl-entity-base-path', // ID used to identify the field throughout the theme
+			_x('Entity Base Path', 'wordlift'), // The label to the left of the option interface element
 			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
+			array($this->input_element, 'render',),
+			'wl_general_settings', // The page on which this option will be displayed
+			'wl_general_settings_section', // The name of the section to which this field belongs
 			$entity_base_path_args
 		);
 
 		// Add the `language_name` field.
 		add_settings_field(
 			'wl-site-language',
-			_x( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
+			_x('Site Language', 'wordlift'),
+			array($this->language_select_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				// The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LANGUAGE.']',
 				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+				'description' => __('Each WordLift Key can be used only in one language. Pick yours.', 'wordlift'),
 			)
 		);
 
 		// Add the `publisher` field.
 		add_settings_field(
 			'wl-publisher-id',
-			_x( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
+			_x('Publisher', 'wordlift'),
+			array($this->publisher_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+				'name' => 'wl_general_settings['.Wordlift_Configuration_Service::PUBLISHER_ID.']',
 			)
 		);
 
 		// Add the `link by default` field.
 		add_settings_field(
 			'wl-link-by-default',
-			_x( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
+			_x('Link by Default', 'wordlift'),
+			array($this->radio_input_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LINK_BY_DEFAULT.']',
 				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => _x( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+				'description' => _x('Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift'),
 			)
 		);
 
@@ -317,20 +317,20 @@ 
 	 *
 	 * @return array The sanitized input array.
 	 */
-	function sanitize_callback( $input ) {
+	function sanitize_callback($input) {
 
 		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
+		if (isset($_POST['wl_publisher']) && ! empty($_POST['wl_publisher']['name'])) {
 			$name         = $_POST['wl_publisher']['name'];
 			$type         = $_POST['wl_publisher']['type'];
 			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
 
 			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+			$type_uri = sprintf('http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person');
 
 			// Create an entity for the publisher and assign it to the input
 			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+			$input['publisher_id'] = $this->entity_service->create($name, $type_uri, $thumbnail_id, 'publish');
 		}
 
 		return $input;

src/admin/class-wordlift-admin.php

Indentation +161 added lines, -161 removed lines

@@ -22,166 +22,166 @@
  */
 class Wordlift_Admin {
 
-	/**
-	 * 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;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since  1.0.0
-	 *
-	 * @param string                          $plugin_name           The name of this plugin.
-	 * @param string                          $version               The version of this plugin.
-	 * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
-	 * @param \Wordlift_Notice_Service        $notice_service        The notice service.
-	 * @param \Wordlift_User_Service          $user_service          The {@link Wordlift_User_Service} instance.
-	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-		$this->configuration_service = $configuration_service;
-		$this->user_service          = $user_service;
-
-		$dataset_uri = $configuration_service->get_dataset_uri();
-		$key         = $configuration_service->get_key();
-
-		if ( empty( $dataset_uri ) ) {
-			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			}
-			$notice_service->add_error( $error );
-		}
-
-	}
-
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * 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.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @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.
-		 */
-
-		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
-			'jquery',
-			'underscore',
-			'backbone',
-		), $this->version, false );
-
-		// Set the basic params.
-		$params = array(
-			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
-			// @todo remove specific actions from settings.
-			'action'                => 'entity_by_title',
-			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
-			'language'              => $this->configuration_service->get_language_code(),
-			'link_by_default'       => $this->configuration_service->is_link_by_default(),
-			// Whether the current user is allowed to create new entities.
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'   => current_user_can( 'edit_wordlift_entities' ) ? 'yes' : 'no',
-			'l10n'                  => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
-			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
-		);
-
-		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
-
-			$params['post_id']           = $entity_being_edited->ID;
-			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
-			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
-			// from the results, since we don't want the current entity to be discovered by the analysis.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
-
-		}
-
-		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
-
-	}
+    /**
+     * 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;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since  1.0.0
+     *
+     * @param string                          $plugin_name           The name of this plugin.
+     * @param string                          $version               The version of this plugin.
+     * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
+     * @param \Wordlift_Notice_Service        $notice_service        The notice service.
+     * @param \Wordlift_User_Service          $user_service          The {@link Wordlift_User_Service} instance.
+     */
+    public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+        $this->configuration_service = $configuration_service;
+        $this->user_service          = $user_service;
+
+        $dataset_uri = $configuration_service->get_dataset_uri();
+        $key         = $configuration_service->get_key();
+
+        if ( empty( $dataset_uri ) ) {
+            $settings_page = Wordlift_Admin_Settings_Page::get_instance();
+            if ( empty( $key ) ) {
+                $error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            } else {
+                $error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            }
+            $notice_service->add_error( $error );
+        }
+
+    }
+
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * 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.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @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.
+         */
+
+        // Enqueue the admin scripts.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+            'jquery',
+            'underscore',
+            'backbone',
+        ), $this->version, false );
+
+        // Set the basic params.
+        $params = array(
+            // @todo scripts in admin should use wp.post.
+            'ajax_url'              => admin_url( 'admin-ajax.php' ),
+            // @todo remove specific actions from settings.
+            'action'                => 'entity_by_title',
+            'datasetUri'            => $this->configuration_service->get_dataset_uri(),
+            'language'              => $this->configuration_service->get_language_code(),
+            'link_by_default'       => $this->configuration_service->is_link_by_default(),
+            // Whether the current user is allowed to create new entities.
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/561
+            'can_create_entities'   => current_user_can( 'edit_wordlift_entities' ) ? 'yes' : 'no',
+            'l10n'                  => array(
+                'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
+                'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
+                'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+                'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
+                'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
+                'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+            ),
+            'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+        );
+
+        // Set post-related values if there's a current post.
+        if ( null !== $post = $entity_being_edited = get_post() ) {
+
+            $params['post_id']           = $entity_being_edited->ID;
+            $entity_service              = Wordlift_Entity_Service::get_instance();
+            $params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+            // We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
+            // from the results, since we don't want the current entity to be discovered by the analysis.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/345
+            $params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
+
+        }
+
+        // Finally output the params as `wlSettings` for JavaScript code.
+        wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+
+    }
 
 }

Spacing +22 added lines, -22 removed lines

@@ -69,7 +69,7 @@ 
 	 * @param \Wordlift_Notice_Service        $notice_service        The notice service.
 	 * @param \Wordlift_User_Service          $user_service          The {@link Wordlift_User_Service} instance.
 	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+	public function __construct($plugin_name, $version, $configuration_service, $notice_service, $user_service) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -80,14 +80,14 @@ 
 		$dataset_uri = $configuration_service->get_dataset_uri();
 		$key         = $configuration_service->get_key();
 
-		if ( empty( $dataset_uri ) ) {
+		if (empty($dataset_uri)) {
 			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+			if (empty($key)) {
+				$error = sprintf(esc_html__("WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+				$error = sprintf(esc_html__("WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			}
-			$notice_service->add_error( $error );
+			$notice_service->add_error($error);
 		}
 
 	}
@@ -111,7 +111,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -135,16 +135,16 @@ 
 		 */
 
 		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/1/admin.js', array(
 			'jquery',
 			'underscore',
 			'backbone',
-		), $this->version, false );
+		), $this->version, false);
 
 		// Set the basic params.
 		$params = array(
 			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
+			'ajax_url'              => admin_url('admin-ajax.php'),
 			// @todo remove specific actions from settings.
 			'action'                => 'entity_by_title',
 			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
@@ -153,34 +153,34 @@ 
 			// Whether the current user is allowed to create new entities.
 			//
 			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'   => current_user_can( 'edit_wordlift_entities' ) ? 'yes' : 'no',
+			'can_create_entities'   => current_user_can('edit_wordlift_entities') ? 'yes' : 'no',
 			'l10n'                  => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+				'You already published an entity with the same name'                 => __('You already published an entity with the same name: ', 'wordlift'),
+				'logo_selection_title'                                               => __('WordLift Choose Logo', 'wordlift'),
+				'logo_selection_button'                                              => array('text' => __('Choose Logo', 'wordlift')),
+				'Type at least 3 characters to search...'                            => _x('Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift'),
+				'No results found for your search.'                                  => _x('No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift'),
+				'Please wait while we look for entities in the linked data cloud...' => _x('Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift'),
 			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+			'wl_autocomplete_nonce' => wp_create_nonce('wordlift_autocomplete'),
 		);
 
 		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
+		if (null !== $post = $entity_being_edited = get_post()) {
 
 			$params['post_id']           = $entity_being_edited->ID;
 			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+			$params['entityBeingEdited'] = isset($entity_being_edited->post_type) && $entity_service->is_entity($post->ID) && is_numeric(get_the_ID());
 			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
 			// from the results, since we don't want the current entity to be discovered by the analysis.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
+			$params['itemId'] = $entity_service->get_uri($entity_being_edited->ID);
 
 		}
 
 		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+		wp_localize_script($this->plugin_name, 'wlSettings', $params);
 
 	}
 

src/admin/WL_Metabox/class-wl-metabox-field.php

Indentation +387 added lines, -387 removed lines

@@ -19,400 +19,400 @@
  */
 class WL_Metabox_Field {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access protected
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	protected $log;
-
-	/**
-	 * The meta name for this field's value.
-	 *
-	 * @var string $meta_name The meta name for this field's value.
-	 */
-	public $meta_name;
-
-	/**
-	 * The custom field settings.
-	 *
-	 * @var null|array $raw_custom_field The custom field settings.
-	 */
-	public $raw_custom_field;
-
-	/**
-	 * The schema.org predicate.
-	 *
-	 * @var string $predicate The schema.org predicate.
-	 */
-	public $predicate;
-
-	/**
-	 * The field's label.
-	 *
-	 * @var string $label The field's label.
-	 */
-	public $label;
-
-	/**
-	 * The WordLift data type.
-	 *
-	 * @var string $expected_wl_type The WordLift data type.
-	 */
-	public $expected_wl_type;
-
-	/**
-	 * The RDF data type.
-	 *
-	 * @var string $expected_uri_type The RDF data type.
-	 */
-	public $expected_uri_type;
-
-	/**
-	 * The cardinality.
-	 *
-	 * @var int $cardinality The cardinality.
-	 */
-	public $cardinality;
-
-	/**
-	 * The current value.
-	 *
-	 * @var array $data The current value.
-	 */
-	public $data;
-
-	/**
-	 * Create a {@link WL_Metabox_Field} instance.
-	 *
-	 * @param array $args An array of parameters.
-	 */
-	public function __construct( $args ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'WL_Metabox_Field' );
-
-		if ( empty( $args ) ) {
-			return;
-		}
-
-		// Save a copy of the custom field's params.
-		$this->raw_custom_field = reset( $args );
-
-		// Extract meta name (post_meta key for the DB).
-		$this->meta_name = key( $args );
-
-		// Extract linked data predicate.
-		if ( isset( $this->raw_custom_field['predicate'] ) ) {
-			$this->predicate = $this->raw_custom_field['predicate'];
-		} else {
-			return;
-		}
-
-		// Extract human readable label.
-		$exploded_predicate = explode( '/', $this->predicate );
-
-		// Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
-		$this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? $this->raw_custom_field['metabox']['label'] : end( $exploded_predicate );
-
-		// Extract field constraints (numerosity, expected type).
-		// Default constaints: accept one string..
-		if ( isset( $this->raw_custom_field['type'] ) ) {
-			$this->expected_wl_type = $this->raw_custom_field['type'];
-		} else {
-			$this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
-		}
-
-		$this->cardinality = 1;
-		if ( isset( $this->raw_custom_field['constraints'] ) ) {
-
-			$constraints = $this->raw_custom_field['constraints'];
-
-			// Extract cardinality.
-			if ( isset( $constraints['cardinality'] ) ) {
-				$this->cardinality = $constraints['cardinality'];
-			}
-
-			// Which type of entity can we accept (e.g. Place, Event, ecc.)? .
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI === $this->expected_wl_type && isset( $constraints['uri_type'] ) ) {
-				$this->expected_uri_type = is_array( $constraints['uri_type'] )
-					? $constraints['uri_type']
-					: array( $constraints['uri_type'] );
-			}
-		}
-
-	}
-
-	/**
-	 * Return nonce HTML.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function html_nonce() {
-
-		return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', true, false );
-	}
-
-	/**
-	 * Verify nonce.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @return boolean Nonce verification.
-	 */
-	public function verify_nonce() {
-
-		$nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
-		$nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
-
-		if ( ! isset( $_POST[ $nonce_name ] ) ) {
-			return false;
-		}
-
-		// Verify that the nonce is valid.
-		return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
-	}
-
-	/**
-	 * Load data from DB and store the resulting array in $this->data.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function get_data() {
-
-		$data = get_post_meta( get_the_ID(), $this->meta_name );
-
-		// Values are always contained in an array (makes it easier to manage cardinality).
-		if ( ! is_array( $data ) ) {
-			$data = array( $data );
-		}
-
-		$this->data = $data;
-	}
-
-	/**
-	 * Sanitizes data before saving to DB. Default sanitization trashes empty
-	 * values.
-	 *
-	 * Stores the sanitized values into $this->data so they can be later processed.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @param array $values Array of values to be sanitized and then stored into
-	 *                      $this->data.
-	 */
-	public function sanitize_data( $values ) {
-
-		$sanitized_data = array();
-
-		if ( ! is_array( $values ) ) {
-			$values = array( $values );
-		}
-
-		foreach ( $values as $value ) {
-			$sanitized_value = $this->sanitize_data_filter( $value );
-			if ( ! is_null( $sanitized_value ) ) {
-				$sanitized_data[] = $sanitized_value;
-			}
-		}
-
-		$this->data = $sanitized_data;
-	}
-
-	/**
-	 * Sanitize a single value. Called from $this->sanitize_data. Default
-	 * sanitization excludes empty values.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @param string $value The value to sanitize.
-	 *
-	 * @return mixed Returns sanitized value, or null.
-	 */
-	public function sanitize_data_filter( $value ) {
-
-		// TODO: all fields should provide their own sanitize which shouldn't
-		// be part of a UI class.
-
-		// If the field provides its own validation, use it.
-		if ( isset( $this->raw_custom_field['sanitize'] ) ) {
-			return call_user_func( $this->raw_custom_field['sanitize'], $value );
-		}
-
-		if ( ! is_null( $value ) && '' !== $value ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
-			return $value;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Save data to DB.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @param array $values Array of values to be sanitized and then stored into $this->data.
-	 */
-	public function save_data( $values ) {
-
-		// Will sanitize data and store them in $field->data.
-		$this->sanitize_data( $values );
-
-		$entity_id = get_the_ID();
-
-		// Take away old values.
-		delete_post_meta( $entity_id, $this->meta_name );
-
-		// insert new values, respecting cardinality.
-		$single = ( 1 === $this->cardinality );
-		foreach ( $this->data as $value ) {
-			add_post_meta( $entity_id, $this->meta_name, $value, $single );
-		}
-	}
-
-	/**
-	 * Returns the HTML tag that will contain the Field. By default the we
-	 * return a <div> with data- attributes on cardinality and expected types.
-	 *
-	 * It is useful to provide data- attributes for the JS scripts.
-	 *
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function html_wrapper_open() {
-
-		return "<div class='wl-field' data-cardinality='$this->cardinality'>";
-	}
-
-	/**
-	 * Returns Field HTML (nonce included).
-	 *
-	 * Overwrite this method (or methods called from this method) in a child
-	 * class to obtain custom behaviour.
-	 *
-	 * The HTML fragment includes the following parts:
-	 * * html wrapper open.
-	 * * heading.
-	 * * nonce.
-	 * * stored values.
-	 * * an empty input when there are no stored values.
-	 * * an add button to add more values.
-	 * * html wrapper close.
-	 */
-	public function html() {
-
-		// Open main <div> for the Field.
-		$html = $this->html_wrapper_open();
-
-		// Label.
-		$html .= $this->get_heading_html();
-
-		// print nonce.
-		$html .= $this->html_nonce();
-
-		// print data loaded from DB.
-		$count = 0;
-		$html  .= $this->get_stored_values_html( $count );
-
-		// Print the empty <input> to add new values.
-		if ( 0 === $count ) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
-			$html .= $this->html_input( '' );    // Will print an empty <input>.
-			$count ++;
-		}
-
-		// If cardinality allows it, print button to add new values.
-		$html .= $this->get_add_button_html( $count );
-
-		// Close the HTML wrapper.
-		$html .= $this->html_wrapper_close();
-
-		return $html;
-	}
-
-	/**
-	 * Print the heading with the label for the metabox.
-	 *
-	 * @since 3.15.0
-	 * @return string The heading html fragment.
-	 */
-	protected function get_heading_html() {
-
-		return "<h3>$this->label</h3>";
-	}
-
-	/**
-	 * Print the stored values.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int $count An output value: the number of printed values.
-	 *
-	 * @return string The html fragment.
-	 */
-	protected function get_stored_values_html( &$count ) {
-
-		$html = '';
-
-		// print data loaded from DB.
-		$count = 0;
-		if ( $this->data ) {
-			foreach ( $this->data as $value ) {
-				if ( $count < $this->cardinality ) {
-					$html .= $this->html_input( $value );
-				}
-				$count ++;
-			}
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Get the add button html.
-	 *
-	 * This function is protected, allowing extending class to further customize
-	 * the add button html code.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param int $count The current number of values.
-	 *
-	 * @return string The add button html code.
-	 */
-	protected function get_add_button_html( $count ) {
-
-		// If cardinality allows it, print button to add new values.
-		if ( $count < $this->cardinality ) {
-			return '<button class="button wl-add-input wl-button" type="button">' . esc_html__( 'Add' ) . '</button>';
-		}
-
-		// Return an empty string.
-		return '';
-	}
-
-	/**
-	 * Return a single <input> tag for the Field.
-	 *
-	 * @param mixed $value Input value.
-	 *
-	 * @return string The html code fragment.
-	 */
-	public function html_input( $value ) {
-		$html = <<<EOF
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.15.0
+     * @access protected
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    protected $log;
+
+    /**
+     * The meta name for this field's value.
+     *
+     * @var string $meta_name The meta name for this field's value.
+     */
+    public $meta_name;
+
+    /**
+     * The custom field settings.
+     *
+     * @var null|array $raw_custom_field The custom field settings.
+     */
+    public $raw_custom_field;
+
+    /**
+     * The schema.org predicate.
+     *
+     * @var string $predicate The schema.org predicate.
+     */
+    public $predicate;
+
+    /**
+     * The field's label.
+     *
+     * @var string $label The field's label.
+     */
+    public $label;
+
+    /**
+     * The WordLift data type.
+     *
+     * @var string $expected_wl_type The WordLift data type.
+     */
+    public $expected_wl_type;
+
+    /**
+     * The RDF data type.
+     *
+     * @var string $expected_uri_type The RDF data type.
+     */
+    public $expected_uri_type;
+
+    /**
+     * The cardinality.
+     *
+     * @var int $cardinality The cardinality.
+     */
+    public $cardinality;
+
+    /**
+     * The current value.
+     *
+     * @var array $data The current value.
+     */
+    public $data;
+
+    /**
+     * Create a {@link WL_Metabox_Field} instance.
+     *
+     * @param array $args An array of parameters.
+     */
+    public function __construct( $args ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'WL_Metabox_Field' );
+
+        if ( empty( $args ) ) {
+            return;
+        }
+
+        // Save a copy of the custom field's params.
+        $this->raw_custom_field = reset( $args );
+
+        // Extract meta name (post_meta key for the DB).
+        $this->meta_name = key( $args );
+
+        // Extract linked data predicate.
+        if ( isset( $this->raw_custom_field['predicate'] ) ) {
+            $this->predicate = $this->raw_custom_field['predicate'];
+        } else {
+            return;
+        }
+
+        // Extract human readable label.
+        $exploded_predicate = explode( '/', $this->predicate );
+
+        // Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
+        $this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? $this->raw_custom_field['metabox']['label'] : end( $exploded_predicate );
+
+        // Extract field constraints (numerosity, expected type).
+        // Default constaints: accept one string..
+        if ( isset( $this->raw_custom_field['type'] ) ) {
+            $this->expected_wl_type = $this->raw_custom_field['type'];
+        } else {
+            $this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
+        }
+
+        $this->cardinality = 1;
+        if ( isset( $this->raw_custom_field['constraints'] ) ) {
+
+            $constraints = $this->raw_custom_field['constraints'];
+
+            // Extract cardinality.
+            if ( isset( $constraints['cardinality'] ) ) {
+                $this->cardinality = $constraints['cardinality'];
+            }
+
+            // Which type of entity can we accept (e.g. Place, Event, ecc.)? .
+            if ( Wordlift_Schema_Service::DATA_TYPE_URI === $this->expected_wl_type && isset( $constraints['uri_type'] ) ) {
+                $this->expected_uri_type = is_array( $constraints['uri_type'] )
+                    ? $constraints['uri_type']
+                    : array( $constraints['uri_type'] );
+            }
+        }
+
+    }
+
+    /**
+     * Return nonce HTML.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function html_nonce() {
+
+        return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', true, false );
+    }
+
+    /**
+     * Verify nonce.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @return boolean Nonce verification.
+     */
+    public function verify_nonce() {
+
+        $nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
+        $nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
+
+        if ( ! isset( $_POST[ $nonce_name ] ) ) {
+            return false;
+        }
+
+        // Verify that the nonce is valid.
+        return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
+    }
+
+    /**
+     * Load data from DB and store the resulting array in $this->data.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function get_data() {
+
+        $data = get_post_meta( get_the_ID(), $this->meta_name );
+
+        // Values are always contained in an array (makes it easier to manage cardinality).
+        if ( ! is_array( $data ) ) {
+            $data = array( $data );
+        }
+
+        $this->data = $data;
+    }
+
+    /**
+     * Sanitizes data before saving to DB. Default sanitization trashes empty
+     * values.
+     *
+     * Stores the sanitized values into $this->data so they can be later processed.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @param array $values Array of values to be sanitized and then stored into
+     *                      $this->data.
+     */
+    public function sanitize_data( $values ) {
+
+        $sanitized_data = array();
+
+        if ( ! is_array( $values ) ) {
+            $values = array( $values );
+        }
+
+        foreach ( $values as $value ) {
+            $sanitized_value = $this->sanitize_data_filter( $value );
+            if ( ! is_null( $sanitized_value ) ) {
+                $sanitized_data[] = $sanitized_value;
+            }
+        }
+
+        $this->data = $sanitized_data;
+    }
+
+    /**
+     * Sanitize a single value. Called from $this->sanitize_data. Default
+     * sanitization excludes empty values.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @param string $value The value to sanitize.
+     *
+     * @return mixed Returns sanitized value, or null.
+     */
+    public function sanitize_data_filter( $value ) {
+
+        // TODO: all fields should provide their own sanitize which shouldn't
+        // be part of a UI class.
+
+        // If the field provides its own validation, use it.
+        if ( isset( $this->raw_custom_field['sanitize'] ) ) {
+            return call_user_func( $this->raw_custom_field['sanitize'], $value );
+        }
+
+        if ( ! is_null( $value ) && '' !== $value ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
+            return $value;
+        }
+
+        return null;
+    }
+
+    /**
+     * Save data to DB.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @param array $values Array of values to be sanitized and then stored into $this->data.
+     */
+    public function save_data( $values ) {
+
+        // Will sanitize data and store them in $field->data.
+        $this->sanitize_data( $values );
+
+        $entity_id = get_the_ID();
+
+        // Take away old values.
+        delete_post_meta( $entity_id, $this->meta_name );
+
+        // insert new values, respecting cardinality.
+        $single = ( 1 === $this->cardinality );
+        foreach ( $this->data as $value ) {
+            add_post_meta( $entity_id, $this->meta_name, $value, $single );
+        }
+    }
+
+    /**
+     * Returns the HTML tag that will contain the Field. By default the we
+     * return a <div> with data- attributes on cardinality and expected types.
+     *
+     * It is useful to provide data- attributes for the JS scripts.
+     *
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function html_wrapper_open() {
+
+        return "<div class='wl-field' data-cardinality='$this->cardinality'>";
+    }
+
+    /**
+     * Returns Field HTML (nonce included).
+     *
+     * Overwrite this method (or methods called from this method) in a child
+     * class to obtain custom behaviour.
+     *
+     * The HTML fragment includes the following parts:
+     * * html wrapper open.
+     * * heading.
+     * * nonce.
+     * * stored values.
+     * * an empty input when there are no stored values.
+     * * an add button to add more values.
+     * * html wrapper close.
+     */
+    public function html() {
+
+        // Open main <div> for the Field.
+        $html = $this->html_wrapper_open();
+
+        // Label.
+        $html .= $this->get_heading_html();
+
+        // print nonce.
+        $html .= $this->html_nonce();
+
+        // print data loaded from DB.
+        $count = 0;
+        $html  .= $this->get_stored_values_html( $count );
+
+        // Print the empty <input> to add new values.
+        if ( 0 === $count ) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
+            $html .= $this->html_input( '' );    // Will print an empty <input>.
+            $count ++;
+        }
+
+        // If cardinality allows it, print button to add new values.
+        $html .= $this->get_add_button_html( $count );
+
+        // Close the HTML wrapper.
+        $html .= $this->html_wrapper_close();
+
+        return $html;
+    }
+
+    /**
+     * Print the heading with the label for the metabox.
+     *
+     * @since 3.15.0
+     * @return string The heading html fragment.
+     */
+    protected function get_heading_html() {
+
+        return "<h3>$this->label</h3>";
+    }
+
+    /**
+     * Print the stored values.
+     *
+     * @since 3.15.0
+     *
+     * @param int $count An output value: the number of printed values.
+     *
+     * @return string The html fragment.
+     */
+    protected function get_stored_values_html( &$count ) {
+
+        $html = '';
+
+        // print data loaded from DB.
+        $count = 0;
+        if ( $this->data ) {
+            foreach ( $this->data as $value ) {
+                if ( $count < $this->cardinality ) {
+                    $html .= $this->html_input( $value );
+                }
+                $count ++;
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Get the add button html.
+     *
+     * This function is protected, allowing extending class to further customize
+     * the add button html code.
+     *
+     * @since 3.15.0
+     *
+     * @param int $count The current number of values.
+     *
+     * @return string The add button html code.
+     */
+    protected function get_add_button_html( $count ) {
+
+        // If cardinality allows it, print button to add new values.
+        if ( $count < $this->cardinality ) {
+            return '<button class="button wl-add-input wl-button" type="button">' . esc_html__( 'Add' ) . '</button>';
+        }
+
+        // Return an empty string.
+        return '';
+    }
+
+    /**
+     * Return a single <input> tag for the Field.
+     *
+     * @param mixed $value Input value.
+     *
+     * @return string The html code fragment.
+     */
+    public function html_input( $value ) {
+        $html = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" id="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$value" style="width:88%" />
 				<button class="button wl-remove-input wl-button" type="button">Remove</button>
 			</div>
 EOF;
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Returns closing for the wrapper HTML tag.
-	 */
-	public function html_wrapper_close() {
+    /**
+     * Returns closing for the wrapper HTML tag.
+     */
+    public function html_wrapper_close() {
 
-		return '</div><hr>';
-	}
+        return '</div><hr>';
+    }
 
 }

Spacing +53 added lines, -53 removed lines

@@ -89,56 +89,56 @@ 
 	 *
 	 * @param array $args An array of parameters.
 	 */
-	public function __construct( $args ) {
+	public function __construct($args) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'WL_Metabox_Field' );
+		$this->log = Wordlift_Log_Service::get_logger('WL_Metabox_Field');
 
-		if ( empty( $args ) ) {
+		if (empty($args)) {
 			return;
 		}
 
 		// Save a copy of the custom field's params.
-		$this->raw_custom_field = reset( $args );
+		$this->raw_custom_field = reset($args);
 
 		// Extract meta name (post_meta key for the DB).
-		$this->meta_name = key( $args );
+		$this->meta_name = key($args);
 
 		// Extract linked data predicate.
-		if ( isset( $this->raw_custom_field['predicate'] ) ) {
+		if (isset($this->raw_custom_field['predicate'])) {
 			$this->predicate = $this->raw_custom_field['predicate'];
 		} else {
 			return;
 		}
 
 		// Extract human readable label.
-		$exploded_predicate = explode( '/', $this->predicate );
+		$exploded_predicate = explode('/', $this->predicate);
 
 		// Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
-		$this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? $this->raw_custom_field['metabox']['label'] : end( $exploded_predicate );
+		$this->label = isset($this->raw_custom_field['metabox']['label']) ? $this->raw_custom_field['metabox']['label'] : end($exploded_predicate);
 
 		// Extract field constraints (numerosity, expected type).
 		// Default constaints: accept one string..
-		if ( isset( $this->raw_custom_field['type'] ) ) {
+		if (isset($this->raw_custom_field['type'])) {
 			$this->expected_wl_type = $this->raw_custom_field['type'];
 		} else {
 			$this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
 		}
 
 		$this->cardinality = 1;
-		if ( isset( $this->raw_custom_field['constraints'] ) ) {
+		if (isset($this->raw_custom_field['constraints'])) {
 
 			$constraints = $this->raw_custom_field['constraints'];
 
 			// Extract cardinality.
-			if ( isset( $constraints['cardinality'] ) ) {
+			if (isset($constraints['cardinality'])) {
 				$this->cardinality = $constraints['cardinality'];
 			}
 
 			// Which type of entity can we accept (e.g. Place, Event, ecc.)? .
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI === $this->expected_wl_type && isset( $constraints['uri_type'] ) ) {
-				$this->expected_uri_type = is_array( $constraints['uri_type'] )
+			if (Wordlift_Schema_Service::DATA_TYPE_URI === $this->expected_wl_type && isset($constraints['uri_type'])) {
+				$this->expected_uri_type = is_array($constraints['uri_type'])
 					? $constraints['uri_type']
-					: array( $constraints['uri_type'] );
+					: array($constraints['uri_type']);
 			}
 		}
 
@@ -151,7 +151,7 @@ 
 	 */
 	public function html_nonce() {
 
-		return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', true, false );
+		return wp_nonce_field('wordlift_'.$this->meta_name.'_entity_box', 'wordlift_'.$this->meta_name.'_entity_box_nonce', true, false);
 	}
 
 	/**
@@ -163,15 +163,15 @@ 
 	 */
 	public function verify_nonce() {
 
-		$nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
-		$nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
+		$nonce_name   = 'wordlift_'.$this->meta_name.'_entity_box_nonce';
+		$nonce_verify = 'wordlift_'.$this->meta_name.'_entity_box';
 
-		if ( ! isset( $_POST[ $nonce_name ] ) ) {
+		if ( ! isset($_POST[$nonce_name])) {
 			return false;
 		}
 
 		// Verify that the nonce is valid.
-		return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
+		return wp_verify_nonce($_POST[$nonce_name], $nonce_verify);
 	}
 
 	/**
@@ -181,11 +181,11 @@ 
 	 */
 	public function get_data() {
 
-		$data = get_post_meta( get_the_ID(), $this->meta_name );
+		$data = get_post_meta(get_the_ID(), $this->meta_name);
 
 		// Values are always contained in an array (makes it easier to manage cardinality).
-		if ( ! is_array( $data ) ) {
-			$data = array( $data );
+		if ( ! is_array($data)) {
+			$data = array($data);
 		}
 
 		$this->data = $data;
@@ -201,17 +201,17 @@ 
 	 * @param array $values Array of values to be sanitized and then stored into
 	 *                      $this->data.
 	 */
-	public function sanitize_data( $values ) {
+	public function sanitize_data($values) {
 
 		$sanitized_data = array();
 
-		if ( ! is_array( $values ) ) {
-			$values = array( $values );
+		if ( ! is_array($values)) {
+			$values = array($values);
 		}
 
-		foreach ( $values as $value ) {
-			$sanitized_value = $this->sanitize_data_filter( $value );
-			if ( ! is_null( $sanitized_value ) ) {
+		foreach ($values as $value) {
+			$sanitized_value = $this->sanitize_data_filter($value);
+			if ( ! is_null($sanitized_value)) {
 				$sanitized_data[] = $sanitized_value;
 			}
 		}
@@ -229,17 +229,17 @@ 
 	 *
 	 * @return mixed Returns sanitized value, or null.
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
 		// TODO: all fields should provide their own sanitize which shouldn't
 		// be part of a UI class.
 
 		// If the field provides its own validation, use it.
-		if ( isset( $this->raw_custom_field['sanitize'] ) ) {
-			return call_user_func( $this->raw_custom_field['sanitize'], $value );
+		if (isset($this->raw_custom_field['sanitize'])) {
+			return call_user_func($this->raw_custom_field['sanitize'], $value);
 		}
 
-		if ( ! is_null( $value ) && '' !== $value ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
+		if ( ! is_null($value) && '' !== $value) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
 			return $value;
 		}
 
@@ -253,20 +253,20 @@ 
 	 *
 	 * @param array $values Array of values to be sanitized and then stored into $this->data.
 	 */
-	public function save_data( $values ) {
+	public function save_data($values) {
 
 		// Will sanitize data and store them in $field->data.
-		$this->sanitize_data( $values );
+		$this->sanitize_data($values);
 
 		$entity_id = get_the_ID();
 
 		// Take away old values.
-		delete_post_meta( $entity_id, $this->meta_name );
+		delete_post_meta($entity_id, $this->meta_name);
 
 		// insert new values, respecting cardinality.
-		$single = ( 1 === $this->cardinality );
-		foreach ( $this->data as $value ) {
-			add_post_meta( $entity_id, $this->meta_name, $value, $single );
+		$single = (1 === $this->cardinality);
+		foreach ($this->data as $value) {
+			add_post_meta($entity_id, $this->meta_name, $value, $single);
 		}
 	}
 
@@ -311,16 +311,16 @@ 
 
 		// print data loaded from DB.
 		$count = 0;
-		$html  .= $this->get_stored_values_html( $count );
+		$html .= $this->get_stored_values_html($count);
 
 		// Print the empty <input> to add new values.
-		if ( 0 === $count ) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
-			$html .= $this->html_input( '' );    // Will print an empty <input>.
-			$count ++;
+		if (0 === $count) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
+			$html .= $this->html_input(''); // Will print an empty <input>.
+			$count++;
 		}
 
 		// If cardinality allows it, print button to add new values.
-		$html .= $this->get_add_button_html( $count );
+		$html .= $this->get_add_button_html($count);
 
 		// Close the HTML wrapper.
 		$html .= $this->html_wrapper_close();
@@ -348,18 +348,18 @@ 
 	 *
 	 * @return string The html fragment.
 	 */
-	protected function get_stored_values_html( &$count ) {
+	protected function get_stored_values_html(&$count) {
 
 		$html = '';
 
 		// print data loaded from DB.
 		$count = 0;
-		if ( $this->data ) {
-			foreach ( $this->data as $value ) {
-				if ( $count < $this->cardinality ) {
-					$html .= $this->html_input( $value );
+		if ($this->data) {
+			foreach ($this->data as $value) {
+				if ($count < $this->cardinality) {
+					$html .= $this->html_input($value);
 				}
-				$count ++;
+				$count++;
 			}
 		}
 
@@ -378,11 +378,11 @@ 
 	 *
 	 * @return string The add button html code.
 	 */
-	protected function get_add_button_html( $count ) {
+	protected function get_add_button_html($count) {
 
 		// If cardinality allows it, print button to add new values.
-		if ( $count < $this->cardinality ) {
-			return '<button class="button wl-add-input wl-button" type="button">' . esc_html__( 'Add' ) . '</button>';
+		if ($count < $this->cardinality) {
+			return '<button class="button wl-add-input wl-button" type="button">'.esc_html__('Add').'</button>';
 		}
 
 		// Return an empty string.
@@ -396,7 +396,7 @@ 
 	 *
 	 * @return string The html code fragment.
 	 */
-	public function html_input( $value ) {
+	public function html_input($value) {
 		$html = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" id="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$value" style="width:88%" />

src/admin/WL_Metabox/class-wl-metabox-field-sameas.php

Indentation +115 added lines, -115 removed lines

@@ -16,126 +16,126 @@
  */
 class WL_Metabox_Field_sameas extends WL_Metabox_Field {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function __construct( $args ) {
-		parent::__construct( $args['sameas'] );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function save_data( $values ) {
-		// The autocomplete select may send JSON arrays in input values.
-		mb_regex_encoding( 'UTF-8' );
-		$merged = array_reduce( (array) $values, function ( $carry, $item ) {
-			return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
-		}, array() );
-
-		parent::save_data( $merged );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function sanitize_data_filter( $value ) {
-
-		// Call our sanitizer helper.
-		return Wordlift_Sanitizer::sanitize_url( $value );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	protected function get_heading_html() {
-
-		// Add the select html fragment after the heading.
-		return parent::get_heading_html()
-			   . $this->get_select_html();
-	}
-
-	/**
-	 * Get the select html fragment.
-	 *
-	 * @since 3.15.0
-	 * @return string The html fragment.
-	 */
-	private function get_select_html() {
-		// Return an element where the new Autocomplete Select will attach to.
-		return '<p>'
-			   . esc_html__( 'Use the search below to link this entity with equivalent entities in the linked data cloud.', 'wordlift' )
-			   . '<div id="wl-metabox-field-sameas"></div></p>';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	protected function get_add_button_html( $count ) {
-
-		$placeholder = esc_attr_x( 'Type here the URL of an equivalent entity from another dataset.', 'sameAs metabox input', 'wordlift' );
-
-		return
-			"<label for='$this->meta_name'>"
-			. esc_html__( 'If you already know the URL of the entity that you would like to link, add it in the field below.', 'wordlift' )
-			. '</label>'
-			. '<div class="wl-input-wrapper">'
-			. "<input type='text' id='$this->meta_name' name='wl_metaboxes[$this->meta_name][]' placeholder='$placeholder' style='width:88%' />"
-			. '<button class="button wl-remove-input wl-button" type="button">Remove</button>'
-			. '</div>'
-			. parent::get_add_button_html( $count );
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	protected function get_stored_values_html( &$count ) {
-
-		return '<p>'
-			   . parent::get_stored_values_html( $count )
-			   . '</p>';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function html() {
-
-		// Open main <div> for the Field.
-		$html = $this->html_wrapper_open();
-
-		// Label.
-		$html .= $this->get_heading_html();
-
-		// print nonce.
-		$html .= $this->html_nonce();
-
-		// print data loaded from DB.
-		$count = 0;
-
-		// If cardinality allows it, print button to add new values.
-		$html .= $this->get_add_button_html( $count );
-
-		$html .= $this->get_stored_values_html( $count );
-
-		// Close the HTML wrapper.
-		$html .= $this->html_wrapper_close();
-
-		return $html;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function html_input( $value ) {
-		$html = <<<EOF
+    /**
+     * @inheritdoc
+     */
+    public function __construct( $args ) {
+        parent::__construct( $args['sameas'] );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function save_data( $values ) {
+        // The autocomplete select may send JSON arrays in input values.
+        mb_regex_encoding( 'UTF-8' );
+        $merged = array_reduce( (array) $values, function ( $carry, $item ) {
+            return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
+        }, array() );
+
+        parent::save_data( $merged );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function sanitize_data_filter( $value ) {
+
+        // Call our sanitizer helper.
+        return Wordlift_Sanitizer::sanitize_url( $value );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function get_heading_html() {
+
+        // Add the select html fragment after the heading.
+        return parent::get_heading_html()
+                . $this->get_select_html();
+    }
+
+    /**
+     * Get the select html fragment.
+     *
+     * @since 3.15.0
+     * @return string The html fragment.
+     */
+    private function get_select_html() {
+        // Return an element where the new Autocomplete Select will attach to.
+        return '<p>'
+                . esc_html__( 'Use the search below to link this entity with equivalent entities in the linked data cloud.', 'wordlift' )
+                . '<div id="wl-metabox-field-sameas"></div></p>';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function get_add_button_html( $count ) {
+
+        $placeholder = esc_attr_x( 'Type here the URL of an equivalent entity from another dataset.', 'sameAs metabox input', 'wordlift' );
+
+        return
+            "<label for='$this->meta_name'>"
+            . esc_html__( 'If you already know the URL of the entity that you would like to link, add it in the field below.', 'wordlift' )
+            . '</label>'
+            . '<div class="wl-input-wrapper">'
+            . "<input type='text' id='$this->meta_name' name='wl_metaboxes[$this->meta_name][]' placeholder='$placeholder' style='width:88%' />"
+            . '<button class="button wl-remove-input wl-button" type="button">Remove</button>'
+            . '</div>'
+            . parent::get_add_button_html( $count );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function get_stored_values_html( &$count ) {
+
+        return '<p>'
+                . parent::get_stored_values_html( $count )
+                . '</p>';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function html() {
+
+        // Open main <div> for the Field.
+        $html = $this->html_wrapper_open();
+
+        // Label.
+        $html .= $this->get_heading_html();
+
+        // print nonce.
+        $html .= $this->html_nonce();
+
+        // print data loaded from DB.
+        $count = 0;
+
+        // If cardinality allows it, print button to add new values.
+        $html .= $this->get_add_button_html( $count );
+
+        $html .= $this->get_stored_values_html( $count );
+
+        // Close the HTML wrapper.
+        $html .= $this->html_wrapper_close();
+
+        return $html;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function html_input( $value ) {
+        $html = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" readonly="readonly" id="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$value" style="width:88%" />
 				<button class="button wl-remove-input wl-button" type="button">Remove</button>
 			</div>
 EOF;
 
-		return $html;
-	}
+        return $html;
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -19,30 +19,30 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function __construct( $args ) {
-		parent::__construct( $args['sameas'] );
+	public function __construct($args) {
+		parent::__construct($args['sameas']);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public function save_data( $values ) {
+	public function save_data($values) {
 		// The autocomplete select may send JSON arrays in input values.
-		mb_regex_encoding( 'UTF-8' );
-		$merged = array_reduce( (array) $values, function ( $carry, $item ) {
-			return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
-		}, array() );
+		mb_regex_encoding('UTF-8');
+		$merged = array_reduce((array) $values, function($carry, $item) {
+			return array_merge($carry, mb_split("\x{2063}", wp_unslash($item)));
+		}, array());
 
-		parent::save_data( $merged );
+		parent::save_data($merged);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
 		// Call our sanitizer helper.
-		return Wordlift_Sanitizer::sanitize_url( $value );
+		return Wordlift_Sanitizer::sanitize_url($value);
 	}
 
 	/**
@@ -64,35 +64,35 @@ 
 	private function get_select_html() {
 		// Return an element where the new Autocomplete Select will attach to.
 		return '<p>'
-			   . esc_html__( 'Use the search below to link this entity with equivalent entities in the linked data cloud.', 'wordlift' )
+			   . esc_html__('Use the search below to link this entity with equivalent entities in the linked data cloud.', 'wordlift')
 			   . '<div id="wl-metabox-field-sameas"></div></p>';
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	protected function get_add_button_html( $count ) {
+	protected function get_add_button_html($count) {
 
-		$placeholder = esc_attr_x( 'Type here the URL of an equivalent entity from another dataset.', 'sameAs metabox input', 'wordlift' );
+		$placeholder = esc_attr_x('Type here the URL of an equivalent entity from another dataset.', 'sameAs metabox input', 'wordlift');
 
 		return
 			"<label for='$this->meta_name'>"
-			. esc_html__( 'If you already know the URL of the entity that you would like to link, add it in the field below.', 'wordlift' )
+			. esc_html__('If you already know the URL of the entity that you would like to link, add it in the field below.', 'wordlift')
 			. '</label>'
 			. '<div class="wl-input-wrapper">'
 			. "<input type='text' id='$this->meta_name' name='wl_metaboxes[$this->meta_name][]' placeholder='$placeholder' style='width:88%' />"
 			. '<button class="button wl-remove-input wl-button" type="button">Remove</button>'
 			. '</div>'
-			. parent::get_add_button_html( $count );
+			. parent::get_add_button_html($count);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	protected function get_stored_values_html( &$count ) {
+	protected function get_stored_values_html(&$count) {
 
 		return '<p>'
-			   . parent::get_stored_values_html( $count )
+			   . parent::get_stored_values_html($count)
 			   . '</p>';
 	}
 
@@ -114,9 +114,9 @@ 
 		$count = 0;
 
 		// If cardinality allows it, print button to add new values.
-		$html .= $this->get_add_button_html( $count );
+		$html .= $this->get_add_button_html($count);
 
-		$html .= $this->get_stored_values_html( $count );
+		$html .= $this->get_stored_values_html($count);
 
 		// Close the HTML wrapper.
 		$html .= $this->html_wrapper_close();
@@ -127,7 +127,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function html_input( $value ) {
+	public function html_input($value) {
 		$html = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" readonly="readonly" id="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$value" style="width:88%" />

src/admin/class-wordlift-admin-author-element.php

Indentation +108 added lines, -108 removed lines

@@ -19,113 +19,113 @@
  */
 class Wordlift_Admin_Author_Element implements Wordlift_Admin_Element {
 
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	private $publisher_service;
-
-	/**
-	 * A {@link Wordlift_Admin_Select2_Element} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Admin_Select2_Element $select_element A {@link Wordlift_Admin_Select2_Element} instance.
-	 */
-	private $select_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Person_Element} instance.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param \Wordlift_Publisher_Service     $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 * @param \Wordlift_Admin_Select2_Element $select_element    The {@link Wordlift_Admin_Select_Element} instance.
-	 */
-	function __construct( $publisher_service, $select_element ) {
-
-		$this->publisher_service = $publisher_service;
-
-		// Child elements.
-		$this->select_element = $select_element;
-
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function render( $args ) {
-
-		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'             => uniqid( 'wl-input-' ),
-			'name'           => uniqid( 'wl-input-' ),
-			'current_entity' => 0,
-		) );
-
-		$current_entity_id = $params['current_entity'];
-		$data              = $this->publisher_service->query();
-
-		// Set a default to show when no entity is associated and a way to unassign.
-		array_unshift( $data, array(
-			'id'            => '0',
-			'text'          => __( '<em>(none)</em>', 'wordlift' ),
-			'type'          => '',
-			'thumbnail_url' => plugin_dir_url( dirname( __FILE__ ) ) . 'images/pixel.png',
-		) );
-
-		// Finally do the render, passing along also the current selected entity
-		// id and the options data.
-		return $this->do_render( $params, $current_entity_id, $data );
-	}
-
-	/**
-	 * Render the `select` using the provided parameters.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param array $params          The array of parameters from the `render` function.
-	 * @param int   $current_post_id The currently selected {@link WP_Post} `id`.
-	 * @param array $data            An array of Select2 options.
-	 *
-	 * @return \Wordlift_Admin_Author_Element $this Return this element.
-	 */
-	protected function do_render( $params, $current_post_id, $data ) {
-
-		// Queue the script which will initialize the select and style it.
-		wp_enqueue_script( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/author.js', array( 'wordlift-select2' ) );
-		wp_enqueue_style( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/author.css' );
-
-		// Prepare the URLs for entities which don't have logos.
-		$person_thumbnail_url       = plugin_dir_url( dirname( __FILE__ ) ) . 'images/person.png';
-		$organization_thumbnail_url = plugin_dir_url( dirname( __FILE__ ) ) . 'images/organization.png';
-
-		// Get the current post.
-		$current_post = $current_post_id ? get_post( $current_post_id ) : null;
-
-		// Finally render the Select.
-		$this->select_element->render( array(
-			// Id.
-			'id'                 => $params['id'],
-			// Name.
-			'name'               => $params['name'],
-			// The selected id.
-			'value'              => $current_post_id,
-			// The selected item (must be in the options for Select2 to display it).
-			'options'            => $current_post ? array( $current_post->ID => $current_post->post_title ) : array(),
-			// The list of available options.
-			'data'               => $data,
-			// The HTML template for each option.
-			'template-result'    => "<div class='wl-select2-result'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
-			// The HTML template for the selected option.
-			'template-selection' => "<div class='wl-select2-selection'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
-		) );
-
-		// Finally return the element instance.
-		return $this;
-	}
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    private $publisher_service;
+
+    /**
+     * A {@link Wordlift_Admin_Select2_Element} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Admin_Select2_Element $select_element A {@link Wordlift_Admin_Select2_Element} instance.
+     */
+    private $select_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Person_Element} instance.
+     *
+     * @since 3.14.0
+     *
+     * @param \Wordlift_Publisher_Service     $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     * @param \Wordlift_Admin_Select2_Element $select_element    The {@link Wordlift_Admin_Select_Element} instance.
+     */
+    function __construct( $publisher_service, $select_element ) {
+
+        $this->publisher_service = $publisher_service;
+
+        // Child elements.
+        $this->select_element = $select_element;
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render( $args ) {
+
+        // Parse the arguments and merge with default values.
+        $params = wp_parse_args( $args, array(
+            'id'             => uniqid( 'wl-input-' ),
+            'name'           => uniqid( 'wl-input-' ),
+            'current_entity' => 0,
+        ) );
+
+        $current_entity_id = $params['current_entity'];
+        $data              = $this->publisher_service->query();
+
+        // Set a default to show when no entity is associated and a way to unassign.
+        array_unshift( $data, array(
+            'id'            => '0',
+            'text'          => __( '<em>(none)</em>', 'wordlift' ),
+            'type'          => '',
+            'thumbnail_url' => plugin_dir_url( dirname( __FILE__ ) ) . 'images/pixel.png',
+        ) );
+
+        // Finally do the render, passing along also the current selected entity
+        // id and the options data.
+        return $this->do_render( $params, $current_entity_id, $data );
+    }
+
+    /**
+     * Render the `select` using the provided parameters.
+     *
+     * @since 3.14.0
+     *
+     * @param array $params          The array of parameters from the `render` function.
+     * @param int   $current_post_id The currently selected {@link WP_Post} `id`.
+     * @param array $data            An array of Select2 options.
+     *
+     * @return \Wordlift_Admin_Author_Element $this Return this element.
+     */
+    protected function do_render( $params, $current_post_id, $data ) {
+
+        // Queue the script which will initialize the select and style it.
+        wp_enqueue_script( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/author.js', array( 'wordlift-select2' ) );
+        wp_enqueue_style( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/author.css' );
+
+        // Prepare the URLs for entities which don't have logos.
+        $person_thumbnail_url       = plugin_dir_url( dirname( __FILE__ ) ) . 'images/person.png';
+        $organization_thumbnail_url = plugin_dir_url( dirname( __FILE__ ) ) . 'images/organization.png';
+
+        // Get the current post.
+        $current_post = $current_post_id ? get_post( $current_post_id ) : null;
+
+        // Finally render the Select.
+        $this->select_element->render( array(
+            // Id.
+            'id'                 => $params['id'],
+            // Name.
+            'name'               => $params['name'],
+            // The selected id.
+            'value'              => $current_post_id,
+            // The selected item (must be in the options for Select2 to display it).
+            'options'            => $current_post ? array( $current_post->ID => $current_post->post_title ) : array(),
+            // The list of available options.
+            'data'               => $data,
+            // The HTML template for each option.
+            'template-result'    => "<div class='wl-select2-result'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
+            // The HTML template for the selected option.
+            'template-selection' => "<div class='wl-select2-selection'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
+        ) );
+
+        // Finally return the element instance.
+        return $this;
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param \Wordlift_Publisher_Service     $publisher_service The {@link Wordlift_Publisher_Service} instance.
 	 * @param \Wordlift_Admin_Select2_Element $select_element    The {@link Wordlift_Admin_Select_Element} instance.
 	 */
-	function __construct( $publisher_service, $select_element ) {
+	function __construct($publisher_service, $select_element) {
 
 		$this->publisher_service = $publisher_service;
 
@@ -57,29 +57,29 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'             => uniqid( 'wl-input-' ),
-			'name'           => uniqid( 'wl-input-' ),
+		$params = wp_parse_args($args, array(
+			'id'             => uniqid('wl-input-'),
+			'name'           => uniqid('wl-input-'),
 			'current_entity' => 0,
-		) );
+		));
 
 		$current_entity_id = $params['current_entity'];
 		$data              = $this->publisher_service->query();
 
 		// Set a default to show when no entity is associated and a way to unassign.
-		array_unshift( $data, array(
+		array_unshift($data, array(
 			'id'            => '0',
-			'text'          => __( '<em>(none)</em>', 'wordlift' ),
+			'text'          => __('<em>(none)</em>', 'wordlift'),
 			'type'          => '',
-			'thumbnail_url' => plugin_dir_url( dirname( __FILE__ ) ) . 'images/pixel.png',
-		) );
+			'thumbnail_url' => plugin_dir_url(dirname(__FILE__)).'images/pixel.png',
+		));
 
 		// Finally do the render, passing along also the current selected entity
 		// id and the options data.
-		return $this->do_render( $params, $current_entity_id, $data );
+		return $this->do_render($params, $current_entity_id, $data);
 	}
 
 	/**
@@ -93,21 +93,21 @@ 
 	 *
 	 * @return \Wordlift_Admin_Author_Element $this Return this element.
 	 */
-	protected function do_render( $params, $current_post_id, $data ) {
+	protected function do_render($params, $current_post_id, $data) {
 
 		// Queue the script which will initialize the select and style it.
-		wp_enqueue_script( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/author.js', array( 'wordlift-select2' ) );
-		wp_enqueue_style( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/author.css' );
+		wp_enqueue_script('wl-author-element', plugin_dir_url(dirname(__FILE__)).'admin/js/1/author.js', array('wordlift-select2'));
+		wp_enqueue_style('wl-author-element', plugin_dir_url(dirname(__FILE__)).'admin/js/1/author.css');
 
 		// Prepare the URLs for entities which don't have logos.
-		$person_thumbnail_url       = plugin_dir_url( dirname( __FILE__ ) ) . 'images/person.png';
-		$organization_thumbnail_url = plugin_dir_url( dirname( __FILE__ ) ) . 'images/organization.png';
+		$person_thumbnail_url       = plugin_dir_url(dirname(__FILE__)).'images/person.png';
+		$organization_thumbnail_url = plugin_dir_url(dirname(__FILE__)).'images/organization.png';
 
 		// Get the current post.
-		$current_post = $current_post_id ? get_post( $current_post_id ) : null;
+		$current_post = $current_post_id ? get_post($current_post_id) : null;
 
 		// Finally render the Select.
-		$this->select_element->render( array(
+		$this->select_element->render(array(
 			// Id.
 			'id'                 => $params['id'],
 			// Name.
@@ -115,14 +115,14 @@ 
 			// The selected id.
 			'value'              => $current_post_id,
 			// The selected item (must be in the options for Select2 to display it).
-			'options'            => $current_post ? array( $current_post->ID => $current_post->post_title ) : array(),
+			'options'            => $current_post ? array($current_post->ID => $current_post->post_title) : array(),
 			// The list of available options.
 			'data'               => $data,
 			// The HTML template for each option.
 			'template-result'    => "<div class='wl-select2-result'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
 			// The HTML template for the selected option.
 			'template-selection' => "<div class='wl-select2-selection'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
-		) );
+		));
 
 		// Finally return the element instance.
 		return $this;

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

Indentation +40 added lines, -40 removed lines

@@ -18,52 +18,52 @@
  */
 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;
+    /**
+     * The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     *
+     * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    private $plugin;
 
-	/**
-	 * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	function __construct( $plugin ) {
+    /**
+     * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    function __construct( $plugin ) {
 
-		// Define the callback.
-		$callback = array( $this, 'enqueue_scripts', );
+        // Define the callback.
+        $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 );
+        // 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 );
 
-		$this->plugin = $plugin;
-	}
+        $this->plugin = $plugin;
+    }
 
-	/**
-	 * Enqueue scripts and styles for the edit page.
-	 *
-	 * @since 3.11.0
-	 */
-	public function enqueue_scripts() {
+    /**
+     * Enqueue scripts and styles for the edit page.
+     *
+     * @since 3.11.0
+     */
+    public function enqueue_scripts() {
 
-		// 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.
-		wp_enqueue_script(
-			'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.js',
-			array( $this->plugin->get_plugin_name(), 'jquery' ),
-			$this->plugin->get_version(),
-			false
-		);
-		wp_enqueue_style( 'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.css', array(), $this->plugin->get_version() );
+        // 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.
+        wp_enqueue_script(
+            'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.js',
+            array( $this->plugin->get_plugin_name(), 'jquery' ),
+            $this->plugin->get_version(),
+            false
+        );
+        wp_enqueue_style( 'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.css', array(), $this->plugin->get_version() );
 
-	}
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -34,14 +34,14 @@ 
 	 *
 	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
 	 */
-	function __construct( $plugin ) {
+	function __construct($plugin) {
 
 		// Define the callback.
-		$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('admin_print_scripts-post.php', $callback);
+		add_action('admin_print_scripts-post-new.php', $callback);
 
 		$this->plugin = $plugin;
 	}
@@ -57,12 +57,12 @@ 
 		// is scheduled to replace the older `wordlift-admin.min.js` once client-side
 		// code is properly refactored.
 		wp_enqueue_script(
-			'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.js',
-			array( $this->plugin->get_plugin_name(), 'jquery' ),
+			'wordlift-admin-edit-page', plugin_dir_url(__FILE__).'js/1/edit.js',
+			array($this->plugin->get_plugin_name(), 'jquery'),
 			$this->plugin->get_version(),
 			false
 		);
-		wp_enqueue_style( 'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.css', array(), $this->plugin->get_version() );
+		wp_enqueue_style('wordlift-admin-edit-page', plugin_dir_url(__FILE__).'js/1/edit.css', array(), $this->plugin->get_version());
 
 	}
 

src/includes/class-wordlift-autocomplete-service.php

Indentation +76 added lines, -76 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -20,88 +20,88 @@ 
  * @since 3.15.0
  */
 class Wordlift_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;
+    /**
+     * 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;
+    /**
+     * 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;
 
-	/**
-	 * The {@link Class_Wordlift_Autocomplete_Service} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	public function __construct( $configuration_service ) {
-		$this->configuration_service = $configuration_service;
-		$this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
-	}
+    /**
+     * The {@link Class_Wordlift_Autocomplete_Service} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    public function __construct( $configuration_service ) {
+        $this->configuration_service = $configuration_service;
+        $this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+    }
 
-	/**
-	 * Make request to external API and return the response.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string       $query   The search string.
-	 * @param array|string $exclude The exclude parameter string.
-	 *
-	 * @return array $response The API response.
-	 */
-	public function make_request( $query, $exclude = '' ) {
-		$url = $this->build_request_url( $query, $exclude );
+    /**
+     * Make request to external API and return the response.
+     *
+     * @since 3.15.0
+     *
+     * @param string       $query   The search string.
+     * @param array|string $exclude The exclude parameter string.
+     *
+     * @return array $response The API response.
+     */
+    public function make_request( $query, $exclude = '' ) {
+        $url = $this->build_request_url( $query, $exclude );
 
-		// Make request.
-		$response = wp_remote_get( $url );
+        // Make request.
+        $response = wp_remote_get( $url );
 
-		// Return the response.
-		return $response;
-	}
+        // Return the response.
+        return $response;
+    }
 
-	/**
-	 * Build the autocomplete url.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string       $query   The search string.
-	 * @param array|string $exclude The exclude parameter.
-	 *
-	 * @return string Built url.
-	 */
-	private function build_request_url( $query, $exclude ) {
-		$args = array(
-			'key'      => $this->configuration_service->get_key(),
-			'language' => $this->configuration_service->get_language_code(),
-			'query'    => $query,
-			'limit'    => 100,
-		);
+    /**
+     * Build the autocomplete url.
+     *
+     * @since 3.15.0
+     *
+     * @param string       $query   The search string.
+     * @param array|string $exclude The exclude parameter.
+     *
+     * @return string Built url.
+     */
+    private function build_request_url( $query, $exclude ) {
+        $args = array(
+            'key'      => $this->configuration_service->get_key(),
+            'language' => $this->configuration_service->get_language_code(),
+            'query'    => $query,
+            'limit'    => 100,
+        );
 
-		// Add args to URL.
-		$request_url = add_query_arg(
-			urlencode_deep( $args ),
-			$this->configuration_service->get_autocomplete_url()
-		);
+        // 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 ) ) {
-			foreach ( (array) $exclude as $item ) {
-				$request_url .= "&exclude=" . urlencode( $item );
-			}
-		}
+        // Add the exclude parameter.
+        if ( ! empty( $exclude ) ) {
+            foreach ( (array) $exclude as $item ) {
+                $request_url .= "&exclude=" . urlencode( $item );
+            }
+        }
 
-		// return the built url.
-		return $request_url;
-	}
+        // return the built url.
+        return $request_url;
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -10,7 +10,7 @@ 
  * @since      3.15.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -45,9 +45,9 @@ 
 	 *
 	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 		$this->configuration_service = $configuration_service;
-		$this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+		$this->log                   = Wordlift_Log_Service::get_logger('Wordlift_Autocomplete_Service');
 	}
 
 	/**
@@ -60,11 +60,11 @@ 
 	 *
 	 * @return array $response The API response.
 	 */
-	public function make_request( $query, $exclude = '' ) {
-		$url = $this->build_request_url( $query, $exclude );
+	public function make_request($query, $exclude = '') {
+		$url = $this->build_request_url($query, $exclude);
 
 		// Make request.
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
 		// Return the response.
 		return $response;
@@ -80,7 +80,7 @@ 
 	 *
 	 * @return string Built url.
 	 */
-	private function build_request_url( $query, $exclude ) {
+	private function build_request_url($query, $exclude) {
 		$args = array(
 			'key'      => $this->configuration_service->get_key(),
 			'language' => $this->configuration_service->get_language_code(),
@@ -90,14 +90,14 @@ 
 
 		// 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 ) ) {
-			foreach ( (array) $exclude as $item ) {
-				$request_url .= "&exclude=" . urlencode( $item );
+		if ( ! empty($exclude)) {
+			foreach ((array) $exclude as $item) {
+				$request_url .= "&exclude=".urlencode($item);
 			}
 		}