insideout10 / wordlift-plugin

src/install/class-wordlift-install-3-10-0.php

Indentation +31 added lines, -31 removed lines

@@ -15,41 +15,41 @@
  * @subpackage Wordlift/install
  */
 class Wordlift_Install_3_10_0 extends Wordlift_Install {
-	/**
-	 * @inheritdoc
-	 */
-	protected static $version = '3.10.0';
+    /**
+     * @inheritdoc
+     */
+    protected static $version = '3.10.0';
 
-	/**
-	 * @inheritdoc
-	 */
-	public function install() {
+    /**
+     * @inheritdoc
+     */
+    public function install() {
 
-		$term_slugs = array(
-			'thing',
-			'creative-work',
-			'event',
-			'organization',
-			'person',
-			'place',
-			'localbusiness',
-		);
+        $term_slugs = array(
+            'thing',
+            'creative-work',
+            'event',
+            'organization',
+            'person',
+            'place',
+            'localbusiness',
+        );
 
-		foreach ( $term_slugs as $slug ) {
+        foreach ( $term_slugs as $slug ) {
 
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            $term = get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
 
-			// Set the term's parent to 0.
-			if ( $term ) {
-				wp_update_term(
-					$term->term_id,
-					Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					array(
-						'parent' => 0,
-					)
-				);
-			}
-		}
-	}
+            // Set the term's parent to 0.
+            if ( $term ) {
+                wp_update_term(
+                    $term->term_id,
+                    Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    array(
+                        'parent' => 0,
+                    )
+                );
+            }
+        }
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -35,12 +35,12 @@
 			'localbusiness',
 		);
 
-		foreach ( $term_slugs as $slug ) {
+		foreach ($term_slugs as $slug) {
 
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+			$term = get_term_by('slug', $slug, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 
 			// Set the term's parent to 0.
-			if ( $term ) {
+			if ($term) {
 				wp_update_term(
 					$term->term_id,
 					Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,

src/install/class-wordlift-install-3-12-0.php

Indentation +13 added lines, -13 removed lines

@@ -15,23 +15,23 @@
  * @subpackage Wordlift/install
  */
 class Wordlift_Install_3_12_0 extends Wordlift_Install {
-	/**
-	 * @inheritdoc
-	 */
-	protected static $version = '3.12.0';
+    /**
+     * @inheritdoc
+     */
+    protected static $version = '3.12.0';
 
-	/**
-	 * @inheritdoc
-	 */
-	public function install() {
-		/*
+    /**
+     * @inheritdoc
+     */
+    public function install() {
+        /*
 		 * As this upgrade functionality runs on the init hook, and the AMP plugin
 		 * initialization does the same, avoid possible race conditions by
 		 * deferring the actual flush to a later hook.
 		 */
-		add_action( 'wp_loaded', function () {
-			flush_rewrite_rules();
-		} );
-	}
+        add_action( 'wp_loaded', function () {
+            flush_rewrite_rules();
+        } );
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		 * initialization does the same, avoid possible race conditions by
 		 * deferring the actual flush to a later hook.
 		 */
-		add_action( 'wp_loaded', function () {
+		add_action('wp_loaded', function() {
 			flush_rewrite_rules();
 		} );
 	}

src/shortcodes/wordlift_shortcode_chord.php

Indentation +137 added lines, -137 removed lines

@@ -15,45 +15,45 @@ 
  * @return mixed
  */
 function wl_shortcode_chord_most_referenced_entity_id() {
-	// Get the last 20 articles by post date.
-	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
-		'numberposts' => 20,
-		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-		'fields'      => 'ids', // Only get post IDs.
-		'post_status' => 'publish',
-		'tax_query'   => array(
-			'relation' => 'OR',
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'operator' => 'NOT EXISTS',
-			),
-			array(
-				'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-				'field'    => 'slug',
-				'terms'    => 'article',
-			),
-		),
-		'orderby'     => 'post_date',
-		'order'       => 'DESC',
-	) );
-
-	if ( empty( $post_ids ) ) {
-		return null;
-	}
-
-	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
-	}
-
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
-	} else {
-		return $post_ids[0];
-	}
+    // Get the last 20 articles by post date.
+    // For each article get the entities they reference.
+    $post_ids = get_posts( array(
+        'numberposts' => 20,
+        'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+        'fields'      => 'ids', // Only get post IDs.
+        'post_status' => 'publish',
+        'tax_query'   => array(
+            'relation' => 'OR',
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'operator' => 'NOT EXISTS',
+            ),
+            array(
+                'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                'field'    => 'slug',
+                'terms'    => 'article',
+            ),
+        ),
+        'orderby'     => 'post_date',
+        'order'       => 'DESC',
+    ) );
+
+    if ( empty( $post_ids ) ) {
+        return null;
+    }
+
+    $entities = array();
+    foreach ( $post_ids as $id ) {
+        $entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+    }
+
+    $famous_entities = array_count_values( $entities );
+    arsort( $famous_entities );
+    if ( sizeof( $famous_entities ) >= 1 ) {
+        return key( $famous_entities );
+    } else {
+        return $post_ids[0];
+    }
 
 }
 
@@ -71,60 +71,60 @@ 
  */
 function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
-			return $related;
-		}
-	}
+    if ( ! is_null( $related ) ) {
+        if ( 0 === $depth ) {
+            return $related;
+        }
+    }
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+    wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
 
-	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
-		$related = array(
-			'entities'  => array( $entity_id ),
-			'relations' => array(),
-		);
-	}
+    // Create a related array which will hold entities and relations.
+    if ( is_null( $related ) ) {
+        $related = array(
+            'entities'  => array( $entity_id ),
+            'relations' => array(),
+        );
+    }
 
-	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
-		'status' => 'publish',
-	) );
+    // Get related entities
+    $related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+        'status' => 'publish',
+    ) );
 
-	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
-			'status' => 'publish',
-		) ) :
-		array();
+    // If the current node is an entity, add related posts too
+    $related_post_ids = ( Wordlift_Entity_Service::get_instance()
+                                                    ->is_entity( $entity_id ) ) ?
+        wl_core_get_related_post_ids( $entity_id, array(
+            'status' => 'publish',
+        ) ) :
+        array();
 
-	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+    // Merge results and remove duplicated entries
+    $related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
 
-	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+    // TODO: List of entities ($rel) should be ordered by interest factors.
+    shuffle( $related_ids );
 
-	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+    // Now we have all the related IDs.
+    foreach ( $related_ids as $related_id ) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
-			return $related;
-		}
+        if ( count( $related['entities'] ) >= $max_size ) {
+            return $related;
+        }
 
-		$related['relations'][] = array( $entity_id, $related_id );
+        $related['relations'][] = array( $entity_id, $related_id );
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
-			// Found new related entity!
-			$related['entities'][] = $related_id;
+        if ( ! in_array( $related_id, $related['entities'] ) ) {
+            // Found new related entity!
+            $related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
-		}
-	}
+            $related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+        }
+    }
 
-	// End condition 2: no more entities to search for.
-	return $related;
+    // End condition 2: no more entities to search for.
+    return $related;
 }
 
 /**
@@ -138,57 +138,57 @@ 
  */
 function wl_shortcode_chord_get_graph( $data ) {
 
-	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
-
-		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
-
-			return $item;
-		}
-
-		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
-
-		// The following log may create a circular loop.
-		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
-
-		// TODO: get all images
-		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
-			}
-		}
-
-		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
-			'label'      => $post->post_title,
-			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
-		);
-
-		$item = $entity;
-	} );
-
-	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
-		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
-		);
-
-		$item = $relation;
-	} );
-
-	// Return the JSON representation.
-	return $data;
+    // Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
+    array_walk( $data['entities'], function ( &$item ) {
+        $post = get_post( $item );
+
+        // Skip non-existing posts.
+        if ( is_null( $post ) ) {
+            wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+
+            return $item;
+        }
+
+        // Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
+        $term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+
+        // The following log may create a circular loop.
+        // wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
+
+        // TODO: get all images
+        $thumbnail    = null;
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id ) {
+            $attachment = wp_get_attachment_image_src( $thumbnail_id );
+            if ( false !== $attachment ) {
+                $thumbnail = esc_attr( $attachment[0] );
+            }
+        }
+
+        $entity = array(
+            'uri'        => wl_get_entity_uri( $item ),
+            'url'        => get_permalink( $item ),
+            'label'      => $post->post_title,
+            'type'       => $post->post_type,
+            'thumbnails' => array( $thumbnail ),
+            'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+        );
+
+        $item = $entity;
+    } );
+
+    // Refactor the relations.
+    array_walk( $data['relations'], function ( &$item ) {
+        $relation = array(
+            's' => wl_get_entity_uri( $item[0] ),
+            'o' => wl_get_entity_uri( $item[1] ),
+        );
+
+        $item = $relation;
+    } );
+
+    // Return the JSON representation.
+    return $data;
 }
 
 /**
@@ -199,13 +199,13 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	$post_id = $_REQUEST['post_id'];
-	$depth   = $_REQUEST['depth'];
+    $post_id = $_REQUEST['post_id'];
+    $depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+    $relations = wl_shortcode_chord_get_relations( $post_id, $depth );
+    $graph     = wl_shortcode_chord_get_graph( $relations );
 
-	wl_core_send_json( $graph );
+    wl_core_send_json( $graph );
 }
 
 add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );

Spacing +51 added lines, -52 removed lines

@@ -17,7 +17,7 @@ 
 function wl_shortcode_chord_most_referenced_entity_id() {
 	// Get the last 20 articles by post date.
 	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
+	$post_ids = get_posts(array(
 		'numberposts' => 20,
 		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
 		'fields'      => 'ids', // Only get post IDs.
@@ -36,21 +36,21 @@ 
 		),
 		'orderby'     => 'post_date',
 		'order'       => 'DESC',
-	) );
+	));
 
-	if ( empty( $post_ids ) ) {
+	if (empty($post_ids)) {
 		return null;
 	}
 
 	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+	foreach ($post_ids as $id) {
+		$entities = array_merge($entities, wl_core_get_related_entity_ids($id));
 	}
 
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
+	$famous_entities = array_count_values($entities);
+	arsort($famous_entities);
+	if (sizeof($famous_entities) >= 1) {
+		return key($famous_entities);
 	} else {
 		return $post_ids[0];
 	}
@@ -69,57 +69,56 @@ 
  *
  * @return array
  */
-function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
+function wl_shortcode_chord_get_relations($entity_id, $depth = 2, $related = null, $max_size = 9) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
+	if ( ! is_null($related)) {
+		if (0 === $depth) {
 			return $related;
 		}
 	}
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+	wl_write_log("wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: ".(is_null($related) ? 'yes' : 'no')." ]");
 
 	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
+	if (is_null($related)) {
 		$related = array(
-			'entities'  => array( $entity_id ),
+			'entities'  => array($entity_id),
 			'relations' => array(),
 		);
 	}
 
 	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+	$related_entity_ids = wl_core_get_related_entity_ids($entity_id, array(
 		'status' => 'publish',
-	) );
+	));
 
 	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
+	$related_post_ids = (Wordlift_Entity_Service::get_instance()
+	                                             ->is_entity($entity_id)) ?
+		wl_core_get_related_post_ids($entity_id, array(
 			'status' => 'publish',
-		) ) :
-		array();
+		)) : array();
 
 	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+	$related_ids = array_unique(array_merge($related_post_ids, $related_entity_ids));
 
 	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+	shuffle($related_ids);
 
 	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+	foreach ($related_ids as $related_id) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
+		if (count($related['entities']) >= $max_size) {
 			return $related;
 		}
 
-		$related['relations'][] = array( $entity_id, $related_id );
+		$related['relations'][] = array($entity_id, $related_id);
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
+		if ( ! in_array($related_id, $related['entities'])) {
 			// Found new related entity!
 			$related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+			$related = wl_shortcode_chord_get_relations($related_id, ($depth - 1), $related, $max_size);
 		}
 	}
 
@@ -136,52 +135,52 @@ 
  *
  * @return mixed|string
  */
-function wl_shortcode_chord_get_graph( $data ) {
+function wl_shortcode_chord_get_graph($data) {
 
 	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
+	array_walk($data['entities'], function(&$item) {
+		$post = get_post($item);
 
 		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+		if (is_null($post)) {
+			wl_write_log("wl_shortcode_chord_get_graph : post not found [ post id :: $item ]");
 
 			return $item;
 		}
 
 		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+		$term = Wordlift_Entity_Type_Service::get_instance()->get($item);
 
 		// The following log may create a circular loop.
 		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
 
 		// TODO: get all images
 		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id) {
+			$attachment = wp_get_attachment_image_src($thumbnail_id);
+			if (false !== $attachment) {
+				$thumbnail = esc_attr($attachment[0]);
 			}
 		}
 
 		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
+			'uri'        => wl_get_entity_uri($item),
+			'url'        => get_permalink($item),
 			'label'      => $post->post_title,
 			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+			'thumbnails' => array($thumbnail),
+			'css_class'  => (isset($term['css_class']) ? $term['css_class'] : ''),
 		);
 
 		$item = $entity;
 	} );
 
 	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
+	array_walk($data['relations'], function(&$item) {
 		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
+			's' => wl_get_entity_uri($item[0]),
+			'o' => wl_get_entity_uri($item[1]),
 		);
 
 		$item = $relation;
@@ -202,11 +201,11 @@ 
 	$post_id = $_REQUEST['post_id'];
 	$depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+	$relations = wl_shortcode_chord_get_relations($post_id, $depth);
+	$graph     = wl_shortcode_chord_get_graph($relations);
 
-	wl_core_send_json( $graph );
+	wl_core_send_json($graph);
 }
 
-add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
-add_action( 'wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax' );
+add_action('wp_ajax_wl_chord', 'wl_shortcode_chord_ajax');
+add_action('wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax');

src/uninstall.php

Indentation +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
 
 // If uninstall not called from WordPress, then exit.
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
-	exit;
+    exit;
 }
 
 // Get a reference to WP and the Wordlift plugin
@@ -40,10 +40,10 @@ 
 
 // Do a db search for posts of type entity
 $args           = array(
-	'posts_per_page' => - 1,
-	'post_type'      => Wordlift_Entity_Service::TYPE_NAME,
-	'post_status'    => array( 'publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash' ),
-	'fields'         => 'ids'
+    'posts_per_page' => - 1,
+    'post_type'      => Wordlift_Entity_Service::TYPE_NAME,
+    'post_status'    => array( 'publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash' ),
+    'fields'         => 'ids'
 );
 $entities_array = get_posts( $args );
 
@@ -52,8 +52,8 @@ 
 wl_write_log( 'Deleting entities and their meta... ' );
 wl_write_log( $entities_array );
 foreach ( $entities_array as $entity_id ) {
-	// Delete the whole entity and its metas.
-	wp_delete_post( $entity_id, true );
+    // Delete the whole entity and its metas.
+    wp_delete_post( $entity_id, true );
 }
 wl_write_log( 'Done.' );
 
@@ -74,8 +74,8 @@ 
 // We loop over terms in this rude way because in the uninstall script
 // is not possible to call WP custom taxonomy functions.
 foreach ( range( 0, 100 ) as $index ) {
-	delete_option( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME . '_' . $index );
-	wp_delete_term( $index, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+    delete_option( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME . '_' . $index );
+    wp_delete_term( $index, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
 }
 delete_option( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME . '_children' );  // it's a hierarchical taxonomy
 wl_write_log( 'Done.' );

Spacing +26 added lines, -26 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }
 
@@ -39,53 +39,53 @@ 
  */
 
 // Do a db search for posts of type entity
-$args           = array(
-	'posts_per_page' => - 1,
+$args = array(
+	'posts_per_page' => -1,
 	'post_type'      => Wordlift_Entity_Service::TYPE_NAME,
-	'post_status'    => array( 'publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash' ),
+	'post_status'    => array('publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash'),
 	'fields'         => 'ids'
 );
-$entities_array = get_posts( $args );
+$entities_array = get_posts($args);
 
 // Loop over entities and delete them.
 // TODO: thumbnails?
-wl_write_log( 'Deleting entities and their meta... ' );
-wl_write_log( $entities_array );
-foreach ( $entities_array as $entity_id ) {
+wl_write_log('Deleting entities and their meta... ');
+wl_write_log($entities_array);
+foreach ($entities_array as $entity_id) {
 	// Delete the whole entity and its metas.
-	wp_delete_post( $entity_id, true );
+	wp_delete_post($entity_id, true);
 }
-wl_write_log( 'Done.' );
+wl_write_log('Done.');
 
 /*
  * Delete post-entity relationships
  */
-wl_write_log( 'Deleting post-entity relationships... ' );
-$sql = 'DROP TABLE IF EXISTS ' . wl_core_get_relation_instances_table_name() . ';';
-$wpdb->query( $sql );
-delete_option( 'wl_db_version' );
-wl_write_log( 'Done.' );
+wl_write_log('Deleting post-entity relationships... ');
+$sql = 'DROP TABLE IF EXISTS '.wl_core_get_relation_instances_table_name().';';
+$wpdb->query($sql);
+delete_option('wl_db_version');
+wl_write_log('Done.');
 
 /*
  * Delete taxonomy
  */
-wl_write_log( 'Cleaning entities taxonomy... ' );
+wl_write_log('Cleaning entities taxonomy... ');
 // Delte custom taxonomy terms.
 // We loop over terms in this rude way because in the uninstall script
 // is not possible to call WP custom taxonomy functions.
-foreach ( range( 0, 100 ) as $index ) {
-	delete_option( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME . '_' . $index );
-	wp_delete_term( $index, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+foreach (range(0, 100) as $index) {
+	delete_option(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME.'_'.$index);
+	wp_delete_term($index, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 }
-delete_option( Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME . '_children' );  // it's a hierarchical taxonomy
-wl_write_log( 'Done.' );
+delete_option(Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME.'_children'); // it's a hierarchical taxonomy
+wl_write_log('Done.');
 
 /**
  * Delete options
  */
-wl_write_log( 'Cleaning WordLift options... ' );
+wl_write_log('Cleaning WordLift options... ');
 // delete_option( WL_OPTIONS_NAME );
-delete_option( 'wl_option_prefixes' );
-delete_option( 'wl_general_settings' );
-delete_option( 'wl_advanced_settings' );
-wl_write_log( 'Done. WordLift successfully uninstalled.' );
+delete_option('wl_option_prefixes');
+delete_option('wl_general_settings');
+delete_option('wl_advanced_settings');
+wl_write_log('Done. WordLift successfully uninstalled.');

src/modules/core/wordlift_core.php

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 // Include constants
-require_once( 'wordlift_core_constants.php' );
+require_once('wordlift_core_constants.php');
 
 // Include methods that deal with post/entity relations
-require_once( 'wordlift_core_post_entity_relations.php' );
+require_once('wordlift_core_post_entity_relations.php');
 
 // Include wl_schema api
-require_once( 'wordlift_core_schema_api.php' );
+require_once('wordlift_core_schema_api.php');
 
 // Include the Entity API which allow to query for entity posts.
-require_once( 'wordlift_core_entity_api.php' );
+require_once('wordlift_core_entity_api.php');
 
 // Include utility global functions 
-require_once( 'wordlift_core_functions.php' );
\ No newline at end of file
+require_once('wordlift_core_functions.php');
\ No newline at end of file

src/modules/core/wordlift_core_entity_api.php

Indentation +83 added lines, -83 removed lines

@@ -20,54 +20,54 @@ 
  */
 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'";
-
-	$params = array(
-		$title,
-		Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-	);
-
-	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'";
-
-		$params = array_merge( $params, array(
-			Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
-			$title,
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-		) );
-	}
-
-	return $wpdb->get_results( $wpdb->prepare(
-		$query,
-		$params
-	) );
+    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'";
+
+    $params = array(
+        $title,
+        Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+    );
+
+    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'";
+
+        $params = array_merge( $params, array(
+            Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
+            $title,
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+        ) );
+    }
+
+    return $wpdb->get_results( $wpdb->prepare(
+        $query,
+        $params
+    ) );
 }
 
 /**
@@ -77,41 +77,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 +17 added lines, -17 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.
@@ -43,7 +43,7 @@ 
 		Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 	);
 
-	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"
@@ -57,17 +57,17 @@ 
 				  // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
 				  . "    AND p.post_status != 'trash'";
 
-		$params = array_merge( $params, array(
+		$params = array_merge($params, array(
 			Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
 			$title,
 			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-		) );
+		));
 	}
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		$query,
 		$params
-	) );
+	));
 }
 
 /**
@@ -81,9 +81,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`.
@@ -92,27 +92,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/admin/class-wordlift-entity-types-taxonomy-walker.php

Indentation +109 added lines, -109 removed lines

@@ -10,7 +10,7 @@ 
  * @subpackage Wordlift/includes
  */
 if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/template.php' );
+    require_once( ABSPATH . 'wp-admin/includes/template.php' );
 }
 
 /**
@@ -23,113 +23,113 @@ 
  */
 class Wordlift_Entity_Types_Taxonomy_Walker extends Walker_Category_Checklist {
 
-	/**
-	 * Entity taxonomy metabox must show exclusive options, no checkboxes.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param       $args     {
-	 *                        An array of arguments.
-	 *
-	 * @type string $taxonomy The taxonomy name.
-	 *              }
-	 *
-	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
-	 */
-	function terms_checklist_args( $args ) {
-
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			return $args;
-		}
-
-		// We override the way WP prints the taxonomy metabox HTML.
-		$args['walker']        = $this;
-		$args['checked_ontop'] = false;
-
-		return $args;
-
-	}
-
-	/**
-	 * Change checkboxes to radios.
-	 *
-	 * $max_depth = -1 means flatly display every element.
-	 * $max_depth = 0 means display all levels.
-	 * $max_depth > 0 specifies the number of display levels.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param array $elements  An array of elements.
-	 * @param int   $max_depth The maximum hierarchical depth.
-	 *
-	 * @param array $args      Additional arguments.
-	 *
-	 * @return string The hierarchical item output.
-	 */
-	public function walk( $elements, $max_depth, $args = array() ) {
-
-		// `max_depth` force to -1 to display a flat taxonomy.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/305
-		$output = parent::walk( $elements, - 1, $args );
-
-		$output = str_replace(
-			array( "type=\"checkbox\"", "type='checkbox'" ),
-			array( "type=\"radio\"", "type='radio'" ),
-			$output
-		);
-
-		return $output;
-	}
-
-	/**
-	 * Start the element output, output nothing in case of article term.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 * @param int    $id       ID of the current term.
-	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		global $post;
-
-		if ( ! isset( $post ) ) {
-			return;
-		}
-
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
-		     || 'article' !== $category->slug
-		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::start_el( $output, $category, $depth, $args, $id );
-		}
-	}
-
-	/**
-	 * End the element output, output nothing in case of article term.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string $output   Passed by reference. Used to append additional content.
-	 * @param object $category The current term object.
-	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
-	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
-	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
-		global $post;
-
-		if ( ! isset( $post ) ) {
-			return;
-		}
-
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
-		     || 'article' !== $category->slug
-		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::end_el( $output, $category, $depth, $args );
-		}
-
-	}
+    /**
+     * Entity taxonomy metabox must show exclusive options, no checkboxes.
+     *
+     * @since 3.1.0
+     *
+     * @param       $args     {
+     *                        An array of arguments.
+     *
+     * @type string $taxonomy The taxonomy name.
+     *              }
+     *
+     * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
+     */
+    function terms_checklist_args( $args ) {
+
+        if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            return $args;
+        }
+
+        // We override the way WP prints the taxonomy metabox HTML.
+        $args['walker']        = $this;
+        $args['checked_ontop'] = false;
+
+        return $args;
+
+    }
+
+    /**
+     * Change checkboxes to radios.
+     *
+     * $max_depth = -1 means flatly display every element.
+     * $max_depth = 0 means display all levels.
+     * $max_depth > 0 specifies the number of display levels.
+     *
+     * @since 3.1.0
+     *
+     * @param array $elements  An array of elements.
+     * @param int   $max_depth The maximum hierarchical depth.
+     *
+     * @param array $args      Additional arguments.
+     *
+     * @return string The hierarchical item output.
+     */
+    public function walk( $elements, $max_depth, $args = array() ) {
+
+        // `max_depth` force to -1 to display a flat taxonomy.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/305
+        $output = parent::walk( $elements, - 1, $args );
+
+        $output = str_replace(
+            array( "type=\"checkbox\"", "type='checkbox'" ),
+            array( "type=\"radio\"", "type='radio'" ),
+            $output
+        );
+
+        return $output;
+    }
+
+    /**
+     * Start the element output, output nothing in case of article term.
+     *
+     * @since 3.15.0
+     *
+     * @param string $output   Passed by reference. Used to append additional content.
+     * @param object $category The current term object.
+     * @param int    $depth    Depth of the term in reference to parents. Default 0.
+     * @param array  $args     An array of arguments. @see wp_terms_checklist()
+     * @param int    $id       ID of the current term.
+     */
+    public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+        global $post;
+
+        if ( ! isset( $post ) ) {
+            return;
+        }
+
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+             || 'article' !== $category->slug
+             || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            parent::start_el( $output, $category, $depth, $args, $id );
+        }
+    }
+
+    /**
+     * End the element output, output nothing in case of article term.
+     *
+     * @since 3.15.0
+     *
+     * @param string $output   Passed by reference. Used to append additional content.
+     * @param object $category The current term object.
+     * @param int    $depth    Depth of the term in reference to parents. Default 0.
+     * @param array  $args     An array of arguments. @see wp_terms_checklist()
+     */
+    public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+        global $post;
+
+        if ( ! isset( $post ) ) {
+            return;
+        }
+
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+             || 'article' !== $category->slug
+             || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            parent::end_el( $output, $category, $depth, $args );
+        }
+
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -9,8 +9,8 @@ 
  * @package    Wordlift
  * @subpackage Wordlift/includes
  */
-if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/template.php' );
+if ( ! class_exists('Walker_Category_Checklist')) {
+	require_once(ABSPATH.'wp-admin/includes/template.php');
 }
 
 /**
@@ -36,9 +36,9 @@ 
 	 *
 	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
 	 */
-	function terms_checklist_args( $args ) {
+	function terms_checklist_args($args) {
 
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+		if ( ! isset($args['taxonomy']) || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
 			return $args;
 		}
 
@@ -66,16 +66,16 @@ 
 	 *
 	 * @return string The hierarchical item output.
 	 */
-	public function walk( $elements, $max_depth, $args = array() ) {
+	public function walk($elements, $max_depth, $args = array()) {
 
 		// `max_depth` force to -1 to display a flat taxonomy.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/305
-		$output = parent::walk( $elements, - 1, $args );
+		$output = parent::walk($elements, - 1, $args);
 
 		$output = str_replace(
-			array( "type=\"checkbox\"", "type='checkbox'" ),
-			array( "type=\"radio\"", "type='radio'" ),
+			array("type=\"checkbox\"", "type='checkbox'"),
+			array("type=\"radio\"", "type='radio'"),
 			$output
 		);
 
@@ -93,17 +93,17 @@ 
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 * @param int    $id       ID of the current term.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
 		global $post;
 
-		if ( ! isset( $post ) ) {
+		if ( ! isset($post)) {
 			return;
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+		if (Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
 		     || 'article' !== $category->slug
-		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::start_el( $output, $category, $depth, $args, $id );
+		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
+			parent::start_el($output, $category, $depth, $args, $id);
 		}
 	}
 
@@ -117,17 +117,17 @@ 
 	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+	public function end_el(&$output, $category, $depth = 0, $args = array()) {
 		global $post;
 
-		if ( ! isset( $post ) ) {
+		if ( ! isset($post)) {
 			return;
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
+		if (Wordlift_Entity_Service::TYPE_NAME !== $post->post_type
 		     || 'article' !== $category->slug
-		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			parent::end_el( $output, $category, $depth, $args );
+		     || Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
+			parent::end_el($output, $category, $depth, $args);
 		}
 
 	}

src/admin/wordlift_admin_menu.php

Indentation +31 added lines, -31 removed lines

@@ -15,24 +15,24 @@ 
  */
 function wl_admin_menu() {
 
-	$menu_slug  = 'wl_admin_menu';
-	$capability = 'manage_options';
+    $menu_slug  = 'wl_admin_menu';
+    $capability = 'manage_options';
 
-	// see http://codex.wordpress.org/Function_Reference/add_menu_page
-	add_menu_page(
-		__( 'WordLift', 'wordlift' ), // page title
-		__( 'WordLift', 'wordlift' ), // menu title
-		$capability,                 // capabilities
-		$menu_slug,                  // menu slug
-		//'wl_admin_menu_callback',  // TODO: function callback to draw the coming dashboard
-		'wl_configuration_admin_menu_callback',
-		WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-logo-icon.svg' );  // icon URL 20x20 px
+    // see http://codex.wordpress.org/Function_Reference/add_menu_page
+    add_menu_page(
+        __( 'WordLift', 'wordlift' ), // page title
+        __( 'WordLift', 'wordlift' ), // menu title
+        $capability,                 // capabilities
+        $menu_slug,                  // menu slug
+        //'wl_admin_menu_callback',  // TODO: function callback to draw the coming dashboard
+        'wl_configuration_admin_menu_callback',
+        WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-logo-icon.svg' );  // icon URL 20x20 px
 
-	// Call hooked functions.
-	do_action( 'wl_admin_menu', $menu_slug, $capability );
+    // Call hooked functions.
+    do_action( 'wl_admin_menu', $menu_slug, $capability );
 
-	// Remove duplicate 'WordLift' subpage created by WordPress.
-	remove_submenu_page( $menu_slug, $menu_slug );
+    // Remove duplicate 'WordLift' subpage created by WordPress.
+    remove_submenu_page( $menu_slug, $menu_slug );
 
 }
 
@@ -46,20 +46,20 @@ 
  * @since 3.15.0
  */
 function wl_remove_entity_type_menu() {
-	/*
+    /*
 	 * Remove from the menu links to the entity type admin page when
 	 * under non entity hierarchy.
 	 */
-	foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $post_type ) {
-		// In the context of admin menues post has no explicit indication of post type in the urls.
-		if ( 'post' !== $post_type ) {
-			remove_submenu_page( 'edit.php', 'edit-tags.php?taxonomy=' . Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-		}
+    foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $post_type ) {
+        // In the context of admin menues post has no explicit indication of post type in the urls.
+        if ( 'post' !== $post_type ) {
+            remove_submenu_page( 'edit.php', 'edit-tags.php?taxonomy=' . Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+        }
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post_type ) {
-			remove_submenu_page( 'edit.php?post_type=' . $post_type, 'edit-tags.php?taxonomy=' . Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME . '&post_type=' . $post_type );
-		}
-	}
+        if ( Wordlift_Entity_Service::TYPE_NAME !== $post_type ) {
+            remove_submenu_page( 'edit.php?post_type=' . $post_type, 'edit-tags.php?taxonomy=' . Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME . '&post_type=' . $post_type );
+        }
+    }
 }
 
 add_action( 'admin_menu', 'wl_remove_entity_type_menu', 100 );
@@ -71,12 +71,12 @@ 
  */
 function wl_admin_menu_callback() {
 
-	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
-	}
+    if ( ! current_user_can( 'manage_options' ) ) {
+        wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
+    }
 
-	echo '<div class="wrap">';
-	echo '<p>Here is where the form would go if I actually had options.</p>';
-	echo '</div>';
+    echo '<div class="wrap">';
+    echo '<p>Here is where the form would go if I actually had options.</p>';
+    echo '</div>';
 
 }

Spacing +16 added lines, -16 removed lines

@@ -20,23 +20,23 @@ 
 
 	// see http://codex.wordpress.org/Function_Reference/add_menu_page
 	add_menu_page(
-		__( 'WordLift', 'wordlift' ), // page title
-		__( 'WordLift', 'wordlift' ), // menu title
-		$capability,                 // capabilities
-		$menu_slug,                  // menu slug
+		__('WordLift', 'wordlift'), // page title
+		__('WordLift', 'wordlift'), // menu title
+		$capability, // capabilities
+		$menu_slug, // menu slug
 		//'wl_admin_menu_callback',  // TODO: function callback to draw the coming dashboard
 		'wl_configuration_admin_menu_callback',
-		WP_CONTENT_URL . '/plugins/wordlift/images/svg/wl-logo-icon.svg' );  // icon URL 20x20 px
+		WP_CONTENT_URL.'/plugins/wordlift/images/svg/wl-logo-icon.svg' ); // icon URL 20x20 px
 
 	// Call hooked functions.
-	do_action( 'wl_admin_menu', $menu_slug, $capability );
+	do_action('wl_admin_menu', $menu_slug, $capability);
 
 	// Remove duplicate 'WordLift' subpage created by WordPress.
-	remove_submenu_page( $menu_slug, $menu_slug );
+	remove_submenu_page($menu_slug, $menu_slug);
 
 }
 
-add_action( 'admin_menu', 'wl_admin_menu' );
+add_action('admin_menu', 'wl_admin_menu');
 
 /**
  * This function is called by the *admin_menu* hook to remove for the admin menu
@@ -50,19 +50,19 @@ 
 	 * Remove from the menu links to the entity type admin page when
 	 * under non entity hierarchy.
 	 */
-	foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $post_type ) {
+	foreach (Wordlift_Entity_Service::valid_entity_post_types() as $post_type) {
 		// In the context of admin menues post has no explicit indication of post type in the urls.
-		if ( 'post' !== $post_type ) {
-			remove_submenu_page( 'edit.php', 'edit-tags.php?taxonomy=' . Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+		if ('post' !== $post_type) {
+			remove_submenu_page('edit.php', 'edit-tags.php?taxonomy='.Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
 		}
 
-		if ( Wordlift_Entity_Service::TYPE_NAME !== $post_type ) {
-			remove_submenu_page( 'edit.php?post_type=' . $post_type, 'edit-tags.php?taxonomy=' . Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME . '&post_type=' . $post_type );
+		if (Wordlift_Entity_Service::TYPE_NAME !== $post_type) {
+			remove_submenu_page('edit.php?post_type='.$post_type, 'edit-tags.php?taxonomy='.Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME.'&post_type='.$post_type);
 		}
 	}
 }
 
-add_action( 'admin_menu', 'wl_remove_entity_type_menu', 100 );
+add_action('admin_menu', 'wl_remove_entity_type_menu', 100);
 
 /**
  * This function is called as a callback by the *wl_admin_menu* to display the actual page.
@@ -71,8 +71,8 @@ 
  */
 function wl_admin_menu_callback() {
 
-	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
+	if ( ! current_user_can('manage_options')) {
+		wp_die(__('You do not have sufficient permissions to access this page.'));
 	}
 
 	echo '<div class="wrap">';

src/admin/class-wordlift-entity-type-settings.php

Indentation +188 added lines, -188 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -30,208 +30,208 @@ 
  */
 class Wordlift_Admin_Entity_Type_Settings {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Entity_Type_Settings} instance.
-	 *
-	 * @since 3.14.0
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Admin_Entity_Type_Settings' );
-
-	}
-
-	/**
-	 * Handle menu registration.
-	 *
-	 * The registration is required, although we do not want to actually to add
-	 * an item to the menu, in order to "whitelist" the access to the settings page in
-	 * the admin.
-	 *
-	 * @since 3.11.0
-	 */
-	public function admin_menu() {
-
-		/*
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create a {@link Wordlift_Admin_Entity_Type_Settings} instance.
+     *
+     * @since 3.14.0
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Admin_Entity_Type_Settings' );
+
+    }
+
+    /**
+     * Handle menu registration.
+     *
+     * The registration is required, although we do not want to actually to add
+     * an item to the menu, in order to "whitelist" the access to the settings page in
+     * the admin.
+     *
+     * @since 3.11.0
+     */
+    public function admin_menu() {
+
+        /*
 		 * Before anything else check if an settings form was submitted.
 		 * This has to be done before any output happens in order to be able to
 		 * display proper "die" error messages and redirect.
 		 */
-		if ( isset( $_GET['page'] ) && ( 'wl_entity_type_settings' === $_GET['page'] ) ) {
+        if ( isset( $_GET['page'] ) && ( 'wl_entity_type_settings' === $_GET['page'] ) ) {
 
-			// Validate inputs. Do not return on invalid parameters or capabilities.
-			$this->validate_proper_term();
+            // Validate inputs. Do not return on invalid parameters or capabilities.
+            $this->validate_proper_term();
 
-			// If proper form submission, handle it and redirect back to the settings page.
-			if ( isset( $_POST['action'] ) && ( 'wl_edit_entity_type_term' === $_POST['action'] ) ) {
-				$this->handle_form_submission();
-			}
+            // If proper form submission, handle it and redirect back to the settings page.
+            if ( isset( $_POST['action'] ) && ( 'wl_edit_entity_type_term' === $_POST['action'] ) ) {
+                $this->handle_form_submission();
+            }
 
-			// Register admin notices handler.
-			add_action( 'admin_notices', array( $this, 'admin_notice' ) );
+            // Register admin notices handler.
+            add_action( 'admin_notices', array( $this, 'admin_notice' ) );
 
-		}
+        }
 
-		/*
+        /*
 		 * Use a null parent slug to prevent the menu from actually appearing
 		 * in the admin menu.
 		 */
-		// @todo: use the new {@link Wordlift_Admin_Page}.
-		add_submenu_page(
-			null,
-			__( 'Edit Entity term', 'wordlift' ),
-			__( 'Edit Entity term', 'wordlift' ),
-			'manage_options',
-			'wl_entity_type_settings',
-			array( $this, 'render' )
-		);
-	}
-
-	/**
-	 * Output admin notices if needed, based on the message url parameter.
-	 * A value of 1 indicates that a successful save was done.
-	 *
-	 * @since 3.11.0
-	 */
-	function admin_notice() {
-		if ( isset( $_GET['message'] ) && ( '1' === $_GET['message'] ) ) {
-			?>
+        // @todo: use the new {@link Wordlift_Admin_Page}.
+        add_submenu_page(
+            null,
+            __( 'Edit Entity term', 'wordlift' ),
+            __( 'Edit Entity term', 'wordlift' ),
+            'manage_options',
+            'wl_entity_type_settings',
+            array( $this, 'render' )
+        );
+    }
+
+    /**
+     * Output admin notices if needed, based on the message url parameter.
+     * A value of 1 indicates that a successful save was done.
+     *
+     * @since 3.11.0
+     */
+    function admin_notice() {
+        if ( isset( $_GET['message'] ) && ( '1' === $_GET['message'] ) ) {
+            ?>
 			<div class="notice notice-success is-dismissible">
 				<p><?php esc_html_e( 'Settings saved', 'wordlift' ) ?></p>
 			</div>
 			<?php
-		}
-	}
-
-	/**
-	 * Validate the existence of the entity type indicated by the tag_ID url
-	 * parameter before doing any processing. Done before any output to mimic
-	 * the way WordPress handles same situation with "normal" term editing screens.
-	 *
-	 * @since 3.11.0
-	 */
-	function validate_proper_term() {
-
-		// Validate capabilities.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
-				403
-			);
-		}
-
-		// Get the term id and the actual term.
-		$term_id = (int) $_REQUEST['tag_ID'];
-
-		if ( ! term_exists( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) ) {
-			wp_die( __( 'You attempted to edit an entity type term that doesn&#8217;t exist.', 'wordlift' ) );
-		}
-
-	}
-
-	/**
-	 * Handle the form submission of the settings form. On successful
-	 * handling redirect tp the setting edit page.
-	 *
-	 * @since 3.11.0
-	 */
-	function handle_form_submission() {
-
-		$term_id = (int) $_POST['tag_ID'];
-
-		// Check the nonce.
-		check_admin_referer( 'update-entity_type_term_' . $term_id );
-
-		$term = get_term( $term_id, 'wl_entity_type' );
-
-		$this->set_setting(
-			$term_id,
-			trim( wp_unslash( $_POST['title'] ) ),
-			wp_unslash( $_POST['description'] )
-		);
-
-		// Redirect back to the term settings page and indicate a save was done.
-		$url = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id&message=1" );
-
-		wp_redirect( $url );
-		exit;
-
-	}
-
-	/**
-	 * Render the settings page for the term.
-	 *
-	 * Access and parameter validity is assumed to be done earlier.
-	 *
-	 * @since 3.11.0
-	 */
-	function render() {
-
-		// Set variables used by the partial
-		$term_id  = absint( $_REQUEST['tag_ID'] );
-		$settings = $this->get_setting( $term_id );
-
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-entity-type-settings.php';
-
-	}
-
-	/**
-	 * Store the entity type term settings in the DB
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param    integer $term_id     The ID of the entity type term
-	 * @param    string  $title       The override for the terms title.
-	 * @param    string  $description The override for the terms description.
-	 *
-	 */
-	function set_setting( $term_id, $title, $description ) {
-
-		$settings             = get_option( 'wl_entity_type_settings', array() );
-		$settings[ $term_id ] = array(
-			'title'       => $title,
-			'description' => $description,
-		);
-		update_option( 'wl_entity_type_settings', $settings );
-
-	}
-
-	/**
-	 * Retrieve the entity type term settings from the DB
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param    integer $term_id The ID of the entity type term
-	 *
-	 * @return    null|array {
-	 *                null is returned when there are no settings otherwise
-	 *                an array is returned with following fields
-	 *
-	 * @type    string    title    The overriding title for the term
-	 * @type    string    description    The overriding description for the term
-	 *            }
-	 */
-	function get_setting( $term_id ) {
-
-		$settings = get_option( 'wl_entity_type_settings', array() );
-
-		if ( isset( $settings[ $term_id ] ) ) {
-			return $settings[ $term_id ];
-		}
-
-		$this->log->warn( "No settings found for term id $term_id." );
-
-		return null;
-	}
+        }
+    }
+
+    /**
+     * Validate the existence of the entity type indicated by the tag_ID url
+     * parameter before doing any processing. Done before any output to mimic
+     * the way WordPress handles same situation with "normal" term editing screens.
+     *
+     * @since 3.11.0
+     */
+    function validate_proper_term() {
+
+        // Validate capabilities.
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_die(
+                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+                403
+            );
+        }
+
+        // Get the term id and the actual term.
+        $term_id = (int) $_REQUEST['tag_ID'];
+
+        if ( ! term_exists( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) ) {
+            wp_die( __( 'You attempted to edit an entity type term that doesn&#8217;t exist.', 'wordlift' ) );
+        }
+
+    }
+
+    /**
+     * Handle the form submission of the settings form. On successful
+     * handling redirect tp the setting edit page.
+     *
+     * @since 3.11.0
+     */
+    function handle_form_submission() {
+
+        $term_id = (int) $_POST['tag_ID'];
+
+        // Check the nonce.
+        check_admin_referer( 'update-entity_type_term_' . $term_id );
+
+        $term = get_term( $term_id, 'wl_entity_type' );
+
+        $this->set_setting(
+            $term_id,
+            trim( wp_unslash( $_POST['title'] ) ),
+            wp_unslash( $_POST['description'] )
+        );
+
+        // Redirect back to the term settings page and indicate a save was done.
+        $url = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id&message=1" );
+
+        wp_redirect( $url );
+        exit;
+
+    }
+
+    /**
+     * Render the settings page for the term.
+     *
+     * Access and parameter validity is assumed to be done earlier.
+     *
+     * @since 3.11.0
+     */
+    function render() {
+
+        // Set variables used by the partial
+        $term_id  = absint( $_REQUEST['tag_ID'] );
+        $settings = $this->get_setting( $term_id );
+
+        include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-entity-type-settings.php';
+
+    }
+
+    /**
+     * Store the entity type term settings in the DB
+     *
+     * @since 3.11.0
+     *
+     * @param    integer $term_id     The ID of the entity type term
+     * @param    string  $title       The override for the terms title.
+     * @param    string  $description The override for the terms description.
+     *
+     */
+    function set_setting( $term_id, $title, $description ) {
+
+        $settings             = get_option( 'wl_entity_type_settings', array() );
+        $settings[ $term_id ] = array(
+            'title'       => $title,
+            'description' => $description,
+        );
+        update_option( 'wl_entity_type_settings', $settings );
+
+    }
+
+    /**
+     * Retrieve the entity type term settings from the DB
+     *
+     * @since 3.11.0
+     *
+     * @param    integer $term_id The ID of the entity type term
+     *
+     * @return    null|array {
+     *                null is returned when there are no settings otherwise
+     *                an array is returned with following fields
+     *
+     * @type    string    title    The overriding title for the term
+     * @type    string    description    The overriding description for the term
+     *            }
+     */
+    function get_setting( $term_id ) {
+
+        $settings = get_option( 'wl_entity_type_settings', array() );
+
+        if ( isset( $settings[ $term_id ] ) ) {
+            return $settings[ $term_id ];
+        }
+
+        $this->log->warn( "No settings found for term id $term_id." );
+
+        return null;
+    }
 
 }

Spacing +33 added lines, -33 removed lines

@@ -12,7 +12,7 @@ 
  * @since      3.11.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -46,7 +46,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Admin_Entity_Type_Settings' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Admin_Entity_Type_Settings');
 
 	}
 
@@ -66,18 +66,18 @@ 
 		 * This has to be done before any output happens in order to be able to
 		 * display proper "die" error messages and redirect.
 		 */
-		if ( isset( $_GET['page'] ) && ( 'wl_entity_type_settings' === $_GET['page'] ) ) {
+		if (isset($_GET['page']) && ('wl_entity_type_settings' === $_GET['page'])) {
 
 			// Validate inputs. Do not return on invalid parameters or capabilities.
 			$this->validate_proper_term();
 
 			// If proper form submission, handle it and redirect back to the settings page.
-			if ( isset( $_POST['action'] ) && ( 'wl_edit_entity_type_term' === $_POST['action'] ) ) {
+			if (isset($_POST['action']) && ('wl_edit_entity_type_term' === $_POST['action'])) {
 				$this->handle_form_submission();
 			}
 
 			// Register admin notices handler.
-			add_action( 'admin_notices', array( $this, 'admin_notice' ) );
+			add_action('admin_notices', array($this, 'admin_notice'));
 
 		}
 
@@ -88,11 +88,11 @@ 
 		// @todo: use the new {@link Wordlift_Admin_Page}.
 		add_submenu_page(
 			null,
-			__( 'Edit Entity term', 'wordlift' ),
-			__( 'Edit Entity term', 'wordlift' ),
+			__('Edit Entity term', 'wordlift'),
+			__('Edit Entity term', 'wordlift'),
 			'manage_options',
 			'wl_entity_type_settings',
-			array( $this, 'render' )
+			array($this, 'render')
 		);
 	}
 
@@ -103,10 +103,10 @@ 
 	 * @since 3.11.0
 	 */
 	function admin_notice() {
-		if ( isset( $_GET['message'] ) && ( '1' === $_GET['message'] ) ) {
+		if (isset($_GET['message']) && ('1' === $_GET['message'])) {
 			?>
 			<div class="notice notice-success is-dismissible">
-				<p><?php esc_html_e( 'Settings saved', 'wordlift' ) ?></p>
+				<p><?php esc_html_e('Settings saved', 'wordlift') ?></p>
 			</div>
 			<?php
 		}
@@ -122,10 +122,10 @@ 
 	function validate_proper_term() {
 
 		// Validate capabilities.
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('Sorry, you are not allowed to edit this item.').'</p>',
 				403
 			);
 		}
@@ -133,8 +133,8 @@ 
 		// Get the term id and the actual term.
 		$term_id = (int) $_REQUEST['tag_ID'];
 
-		if ( ! term_exists( $term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ) ) {
-			wp_die( __( 'You attempted to edit an entity type term that doesn&#8217;t exist.', 'wordlift' ) );
+		if ( ! term_exists($term_id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME)) {
+			wp_die(__('You attempted to edit an entity type term that doesn&#8217;t exist.', 'wordlift'));
 		}
 
 	}
@@ -150,20 +150,20 @@ 
 		$term_id = (int) $_POST['tag_ID'];
 
 		// Check the nonce.
-		check_admin_referer( 'update-entity_type_term_' . $term_id );
+		check_admin_referer('update-entity_type_term_'.$term_id);
 
-		$term = get_term( $term_id, 'wl_entity_type' );
+		$term = get_term($term_id, 'wl_entity_type');
 
 		$this->set_setting(
 			$term_id,
-			trim( wp_unslash( $_POST['title'] ) ),
-			wp_unslash( $_POST['description'] )
+			trim(wp_unslash($_POST['title'])),
+			wp_unslash($_POST['description'])
 		);
 
 		// Redirect back to the term settings page and indicate a save was done.
-		$url = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id&message=1" );
+		$url = admin_url("admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id&message=1");
 
-		wp_redirect( $url );
+		wp_redirect($url);
 		exit;
 
 	}
@@ -178,10 +178,10 @@ 
 	function render() {
 
 		// Set variables used by the partial
-		$term_id  = absint( $_REQUEST['tag_ID'] );
-		$settings = $this->get_setting( $term_id );
+		$term_id  = absint($_REQUEST['tag_ID']);
+		$settings = $this->get_setting($term_id);
 
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-entity-type-settings.php';
+		include plugin_dir_path(dirname(__FILE__)).'admin/partials/wordlift-admin-entity-type-settings.php';
 
 	}
 
@@ -195,14 +195,14 @@ 
 	 * @param    string  $description The override for the terms description.
 	 *
 	 */
-	function set_setting( $term_id, $title, $description ) {
+	function set_setting($term_id, $title, $description) {
 
-		$settings             = get_option( 'wl_entity_type_settings', array() );
-		$settings[ $term_id ] = array(
+		$settings             = get_option('wl_entity_type_settings', array());
+		$settings[$term_id] = array(
 			'title'       => $title,
 			'description' => $description,
 		);
-		update_option( 'wl_entity_type_settings', $settings );
+		update_option('wl_entity_type_settings', $settings);
 
 	}
 
@@ -221,15 +221,15 @@ 
 	 * @type    string    description    The overriding description for the term
 	 *            }
 	 */
-	function get_setting( $term_id ) {
+	function get_setting($term_id) {
 
-		$settings = get_option( 'wl_entity_type_settings', array() );
+		$settings = get_option('wl_entity_type_settings', array());
 
-		if ( isset( $settings[ $term_id ] ) ) {
-			return $settings[ $term_id ];
+		if (isset($settings[$term_id])) {
+			return $settings[$term_id];
 		}
 
-		$this->log->warn( "No settings found for term id $term_id." );
+		$this->log->warn("No settings found for term id $term_id.");
 
 		return null;
 	}