insideout10 / wordlift-plugin

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

Indentation +145 added lines, -145 removed lines

@@ -60,54 +60,54 @@ 
  * @subpackage Wordlift/install
  */
 class Wordlift_Install_3_25_0 extends Wordlift_Install {
-	/**
-	 * @inheritdoc
-	 */
-	protected static $version = '3.25.3';
-
-	/**
-	 * Reference to global $wpdb instance.
-	 *
-	 * @var $wpdb
-	 * */
-	private $wpdb;
-
-	/** Constructor for 3_25_0 installer. */
-	public function __construct() {
-		global $wpdb;
-		$this->wpdb = $wpdb;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function install() {
-		$this->create_mappings_table();
-		$this->create_rule_group_table();
-		$this->create_rule_table();
-		$this->create_property_table();
-	}
-
-	/**
-	 * Install mappings table.
-	 *
-	 * +----------------+--------------+------+-----+---------+----------------+
-	 * | Field          | Type         | Null | Key | Default | Extra          |
-	 * +----------------+--------------+------+-----+---------+----------------+
-	 * | mapping_id     | int(11)      | NO   | PRI | NULL    | auto_increment |
-	 * | mapping_title  | varchar(255) | NO   |     | NULL    |                |
-	 * | mapping_status | varchar(255) | NO   |     | active  |                |
-	 * +----------------+--------------+------+-----+---------+----------------+
-	 *
-	 * @return void
-	 * @since 3.25.0
-	 *
-	 */
-	public function create_mappings_table() {
-		$table_name      = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
-		$charset_collate = $this->wpdb->get_charset_collate();
-		// @@todo: is necessary to prefix the column names with `mapping_` ? we're the mappings table already.
-		$sql = <<<EOF
+    /**
+     * @inheritdoc
+     */
+    protected static $version = '3.25.3';
+
+    /**
+     * Reference to global $wpdb instance.
+     *
+     * @var $wpdb
+     * */
+    private $wpdb;
+
+    /** Constructor for 3_25_0 installer. */
+    public function __construct() {
+        global $wpdb;
+        $this->wpdb = $wpdb;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function install() {
+        $this->create_mappings_table();
+        $this->create_rule_group_table();
+        $this->create_rule_table();
+        $this->create_property_table();
+    }
+
+    /**
+     * Install mappings table.
+     *
+     * +----------------+--------------+------+-----+---------+----------------+
+     * | Field          | Type         | Null | Key | Default | Extra          |
+     * +----------------+--------------+------+-----+---------+----------------+
+     * | mapping_id     | int(11)      | NO   | PRI | NULL    | auto_increment |
+     * | mapping_title  | varchar(255) | NO   |     | NULL    |                |
+     * | mapping_status | varchar(255) | NO   |     | active  |                |
+     * +----------------+--------------+------+-----+---------+----------------+
+     *
+     * @return void
+     * @since 3.25.0
+     *
+     */
+    public function create_mappings_table() {
+        $table_name      = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
+        $charset_collate = $this->wpdb->get_charset_collate();
+        // @@todo: is necessary to prefix the column names with `mapping_` ? we're the mappings table already.
+        $sql = <<<EOF
         CREATE TABLE $table_name (
 			mapping_id INT(11) NOT NULL AUTO_INCREMENT, 
 			mapping_title VARCHAR(255) NOT NULL,
@@ -115,33 +115,33 @@ 
 			PRIMARY KEY  (mapping_id)
         ) $charset_collate;
 EOF;
-		// Execute the query for mappings table.
-		dbDelta( $sql );
-	}
-
-
-	/**
-	 * Install rule table
-	 *
-	 * +------------------+--------------+------+-----+---------+----------------+
-	 * | Field            | Type         | Null | Key | Default | Extra          |
-	 * +------------------+--------------+------+-----+---------+----------------+
-	 * | rule_id          | int(11)      | NO   | PRI | NULL    | auto_increment |
-	 * | rule_field_one   | varchar(255) | NO   |     | NULL    |                |
-	 * | rule_logic_field | varchar(255) | NO   |     | NULL    |                |
-	 * | rule_field_two   | varchar(255) | NO   |     | NULL    |                |
-	 * | rule_group_id    | int(11)      | NO   | MUL | NULL    |                |
-	 * +------------------+--------------+------+-----+---------+----------------+
-	 *
-	 * @return void
-	 * @since 3.25.0
-	 */
-	public function create_rule_table() {
-		$table_name            = $this->wpdb->prefix . WL_RULE_TABLE_NAME;
-		$rule_group_table_name = $this->wpdb->prefix . WL_RULE_GROUP_TABLE_NAME;
-		$charset_collate       = $this->wpdb->get_charset_collate();
-		// @@todo: is necessary to prefix the column names with `rule_` ? we're the rules table already.
-		$sql = <<<EOF
+        // Execute the query for mappings table.
+        dbDelta( $sql );
+    }
+
+
+    /**
+     * Install rule table
+     *
+     * +------------------+--------------+------+-----+---------+----------------+
+     * | Field            | Type         | Null | Key | Default | Extra          |
+     * +------------------+--------------+------+-----+---------+----------------+
+     * | rule_id          | int(11)      | NO   | PRI | NULL    | auto_increment |
+     * | rule_field_one   | varchar(255) | NO   |     | NULL    |                |
+     * | rule_logic_field | varchar(255) | NO   |     | NULL    |                |
+     * | rule_field_two   | varchar(255) | NO   |     | NULL    |                |
+     * | rule_group_id    | int(11)      | NO   | MUL | NULL    |                |
+     * +------------------+--------------+------+-----+---------+----------------+
+     *
+     * @return void
+     * @since 3.25.0
+     */
+    public function create_rule_table() {
+        $table_name            = $this->wpdb->prefix . WL_RULE_TABLE_NAME;
+        $rule_group_table_name = $this->wpdb->prefix . WL_RULE_GROUP_TABLE_NAME;
+        $charset_collate       = $this->wpdb->get_charset_collate();
+        // @@todo: is necessary to prefix the column names with `rule_` ? we're the rules table already.
+        $sql = <<<EOF
         CREATE TABLE IF NOT EXISTS $table_name (
 				rule_id INT(11) NOT NULL AUTO_INCREMENT,
 				rule_field_one VARCHAR(255) NOT NULL,
@@ -153,31 +153,31 @@ 
 				PRIMARY KEY  (rule_id)
         ) $charset_collate;
 EOF;
-		// Execute the query for mappings table.
-		$this->wpdb->query( $sql );
-	}
-
-	/**
-	 * Install rule group table, should run after creating mapping and
-	 * rule table due to foreign key reference.
-	 *
-	 * +---------------+---------+------+-----+---------+----------------+
-	 * | Field         | Type    | Null | Key | Default | Extra          |
-	 * +---------------+---------+------+-----+---------+----------------+
-	 * | rule_group_id | int(11) | NO   | PRI | NULL    | auto_increment |
-	 * | mapping_id    | int(11) | NO   | MUL | NULL    |                |
-	 * +---------------+---------+------+-----+---------+----------------+
-	 *
-	 * @return void
-	 * @since 3.25.0
-	 */
-	public function create_rule_group_table() {
-		$table_name      = $this->wpdb->prefix . WL_RULE_GROUP_TABLE_NAME;
-		$charset_collate = $this->wpdb->get_charset_collate();
-
-		$mapping_table_name = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
-		// @@todo is this table actually needed? I am not understanding what it does.
-		$sql = <<<EOF
+        // Execute the query for mappings table.
+        $this->wpdb->query( $sql );
+    }
+
+    /**
+     * Install rule group table, should run after creating mapping and
+     * rule table due to foreign key reference.
+     *
+     * +---------------+---------+------+-----+---------+----------------+
+     * | Field         | Type    | Null | Key | Default | Extra          |
+     * +---------------+---------+------+-----+---------+----------------+
+     * | rule_group_id | int(11) | NO   | PRI | NULL    | auto_increment |
+     * | mapping_id    | int(11) | NO   | MUL | NULL    |                |
+     * +---------------+---------+------+-----+---------+----------------+
+     *
+     * @return void
+     * @since 3.25.0
+     */
+    public function create_rule_group_table() {
+        $table_name      = $this->wpdb->prefix . WL_RULE_GROUP_TABLE_NAME;
+        $charset_collate = $this->wpdb->get_charset_collate();
+
+        $mapping_table_name = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
+        // @@todo is this table actually needed? I am not understanding what it does.
+        $sql = <<<EOF
         CREATE TABLE IF NOT EXISTS $table_name (
                 rule_group_id INT(11) NOT NULL AUTO_INCREMENT,
                 mapping_id INT(11) NOT NULL,
@@ -186,38 +186,38 @@ 
                 ON DELETE CASCADE
         ) $charset_collate;
 EOF;
-		// Execute the query for rule group table, we cant use db delta
-		// due to lack of support for foreign keys.
-		$this->wpdb->query( $sql );
-	}
-
-
-	/**
-	 * Install property table, should run after mapping table due to
-	 * foreign key reference.
-	 *
-	 * +--------------------+--------------+------+-----+---------+----------------+
-	 * | Field              | Type         | Null | Key | Default | Extra          |
-	 * +--------------------+--------------+------+-----+---------+----------------+
-	 * | property_id        | int(11)      | NO   | PRI | NULL    | auto_increment |
-	 * | mapping_id         | int(11)      | NO   | MUL | NULL    |                |
-	 * | property_name      | varchar(255) | NO   |     | NULL    |                |
-	 * | field_type         | varchar(255) | NO   |     | NULL    |                |
-	 * | field_name         | varchar(255) | NO   |     | NULL    |                |
-	 * | transform_function | varchar(255) | NO   |     | NULL    |                |
-	 * | property_status    | varchar(255) | NO   |     | active  |                |
-	 * +--------------------+--------------+------+-----+---------+----------------+
-	 *
-	 * @return void
-	 * @since 3.25.0
-	 */
-	public function create_property_table() {
-		$table_name      = $this->wpdb->prefix . WL_PROPERTY_TABLE_NAME;
-		$charset_collate = $this->wpdb->get_charset_collate();
-
-		$mapping_table_name = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
-		// @@todo do you we need the `property_` prefix? this is the property table anyway.
-		$sql = <<<EOF
+        // Execute the query for rule group table, we cant use db delta
+        // due to lack of support for foreign keys.
+        $this->wpdb->query( $sql );
+    }
+
+
+    /**
+     * Install property table, should run after mapping table due to
+     * foreign key reference.
+     *
+     * +--------------------+--------------+------+-----+---------+----------------+
+     * | Field              | Type         | Null | Key | Default | Extra          |
+     * +--------------------+--------------+------+-----+---------+----------------+
+     * | property_id        | int(11)      | NO   | PRI | NULL    | auto_increment |
+     * | mapping_id         | int(11)      | NO   | MUL | NULL    |                |
+     * | property_name      | varchar(255) | NO   |     | NULL    |                |
+     * | field_type         | varchar(255) | NO   |     | NULL    |                |
+     * | field_name         | varchar(255) | NO   |     | NULL    |                |
+     * | transform_function | varchar(255) | NO   |     | NULL    |                |
+     * | property_status    | varchar(255) | NO   |     | active  |                |
+     * +--------------------+--------------+------+-----+---------+----------------+
+     *
+     * @return void
+     * @since 3.25.0
+     */
+    public function create_property_table() {
+        $table_name      = $this->wpdb->prefix . WL_PROPERTY_TABLE_NAME;
+        $charset_collate = $this->wpdb->get_charset_collate();
+
+        $mapping_table_name = $this->wpdb->prefix . WL_MAPPING_TABLE_NAME;
+        // @@todo do you we need the `property_` prefix? this is the property table anyway.
+        $sql = <<<EOF
         CREATE TABLE IF NOT EXISTS $table_name (
                 property_id INT(11) NOT NULL AUTO_INCREMENT,
                 mapping_id INT(11) NOT NULL,
@@ -231,18 +231,18 @@ 
                 ON DELETE CASCADE
         ) $charset_collate;
 EOF;
-		// Execute the query for property table, we cant use db delta
-		// due to lack of support for foreign keys.
-		$this->wpdb->query( $sql );
-	}
-
-	public static function drop_tables() {
-		global $wpdb;
-
-		$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_PROPERTY_TABLE_NAME );
-		$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_RULE_TABLE_NAME );
-		$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_RULE_GROUP_TABLE_NAME );
-		$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_MAPPING_TABLE_NAME );
-	}
+        // Execute the query for property table, we cant use db delta
+        // due to lack of support for foreign keys.
+        $this->wpdb->query( $sql );
+    }
+
+    public static function drop_tables() {
+        global $wpdb;
+
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_PROPERTY_TABLE_NAME );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_RULE_TABLE_NAME );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_RULE_GROUP_TABLE_NAME );
+        $wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . WL_MAPPING_TABLE_NAME );
+    }
 
 }

src/includes/class-wordlift-entity-type-taxonomy-service.php

Indentation +150 added lines, -150 removed lines

@@ -14,160 +14,160 @@
  */
 class Wordlift_Entity_Type_Taxonomy_Service {
 
-	/**
-	 * The WordPress taxonomy name.
-	 *
-	 * @since 1.0.0
-	 */
-	const TAXONOMY_NAME = 'wl_entity_type';
-
-	/**
-	 * Register the taxonomies.
-	 *
-	 * @since 3.23.6 we hook to `wp_get_object_terms` to ensure that a term is returned when a post is queries for the
-	 *               `wl_entity_type` taxonomy.
-	 * @since 3.18.0
-	 */
-	public function init() {
-
-		$labels = array(
-			'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Entity Types', 'wordlift' ),
-			'all_items'         => __( 'All Entity Types', 'wordlift' ),
-			'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
-			'update_item'       => __( 'Update Entity Type', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
-			'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
-			'menu_name'         => __( 'Entity Types', 'wordlift' ),
-		);
-
-		// Take away GUI for taxonomy editing.
-		// TODO: read capabilities when editing of the WL <-> schema.org mapping is possible.
-		$capabilities = array(
-			// We enable editors to change the title/description of terms:
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/398.
-			'manage_terms' => 'manage_options',
-			'edit_terms'   => 'wl_entity_type_edit_term',
-			'delete_terms' => 'wl_entity_type_delete_term',
-			'assign_terms' => 'edit_posts',
-		);
-
-		$args = array(
-			'labels'             => $labels,
-			'capabilities'       => $capabilities,
-			'hierarchical'       => true,
-			'show_admin_column'  => true,
-			'show_in_rest'       => true,
-			'show_in_quick_edit' => false,
-		);
-
-		/*
+    /**
+     * The WordPress taxonomy name.
+     *
+     * @since 1.0.0
+     */
+    const TAXONOMY_NAME = 'wl_entity_type';
+
+    /**
+     * Register the taxonomies.
+     *
+     * @since 3.23.6 we hook to `wp_get_object_terms` to ensure that a term is returned when a post is queries for the
+     *               `wl_entity_type` taxonomy.
+     * @since 3.18.0
+     */
+    public function init() {
+
+        $labels = array(
+            'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
+            'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
+            'search_items'      => __( 'Search Entity Types', 'wordlift' ),
+            'all_items'         => __( 'All Entity Types', 'wordlift' ),
+            'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
+            'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
+            'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
+            'update_item'       => __( 'Update Entity Type', 'wordlift' ),
+            'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
+            'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
+            'menu_name'         => __( 'Entity Types', 'wordlift' ),
+        );
+
+        // Take away GUI for taxonomy editing.
+        // TODO: read capabilities when editing of the WL <-> schema.org mapping is possible.
+        $capabilities = array(
+            // We enable editors to change the title/description of terms:
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/398.
+            'manage_terms' => 'manage_options',
+            'edit_terms'   => 'wl_entity_type_edit_term',
+            'delete_terms' => 'wl_entity_type_delete_term',
+            'assign_terms' => 'edit_posts',
+        );
+
+        $args = array(
+            'labels'             => $labels,
+            'capabilities'       => $capabilities,
+            'hierarchical'       => true,
+            'show_admin_column'  => true,
+            'show_in_rest'       => true,
+            'show_in_quick_edit' => false,
+        );
+
+        /*
 		 * If `All Entity Types` is enabled, use the new metabox.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 * @since 3.20.0
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			$args['meta_box_cb'] = array( 'Wordlift_Admin_Schemaorg_Taxonomy_Metabox', 'render' );
-		}
-
-		register_taxonomy(
-			self::TAXONOMY_NAME, // Taxonomy name.
-			Wordlift_Entity_Service::valid_entity_post_types(), // Taxonomy post types.
-			$args // Taxonomy args.
-		);
-
-		/**
-		 * Register meta wl_entities_gutenberg for use in Gutenberg
-		 */
-		register_meta( 'post', 'wl_entities_gutenberg', array(
-			'show_in_rest' => true,
-			'single'       => true,
-			'type'         => 'string',
-		) );
-
-		/**
-		 * Register meta _wl_alt_label for use in Gutenberg
-		 */
-		register_meta( 'post', Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY, array(
-			'object_subtype' => '',
-			'show_in_rest'   => true,
-			'single'         => false,
-			'type'           => 'string',
-			'auth_callback'  => function () {
-				return current_user_can( 'edit_posts' );
-			}
-		) );
-
-		// Add filter to change the metabox CSS class.
-		add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
-
-		// Add a filter to preset the object term if none is set.
-		//
-		// DO NOT hook to `wp_get_object_terms`, because `wp_get_object_terms` returns imploded values for SQL queries.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/995
-		// @since 3.23.6
-		add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
-
-	}
-
-	/**
-	 * Hook to the `get_object_terms` filter.
-	 *
-	 * We check if our taxonomy is requested and whether a term has been returned. If no term has been returned we
-	 * preset `Article` for posts/pages and 'Thing' for everything else and we query the terms again.
-	 *
-	 * @param array $terms Array of terms for the given object or objects.
-	 * @param int[] $object_ids Array of object IDs for which terms were retrieved.
-	 * @param string[] $taxonomies Array of taxonomy names from which terms were retrieved.
-	 * @param array $args Array of arguments for retrieving terms for the given
-	 *                             object(s). See get_object_terms() for details.
-	 *
-	 * @return array|WP_Error
-	 * @since 3.23.6
-	 */
-	public function get_object_terms( $terms, $object_ids, $taxonomies, $args ) {
-		// Get our entity type.
-		$entity_type = self::TAXONOMY_NAME;
-
-		// Check if this is a query for our entity type, that no terms have been found and that we have an article
-		// term to preset in case.
-		if ( ! taxonomy_exists( $entity_type )
-		     || array( $entity_type ) !== (array) $taxonomies
-		     || ! empty( $terms )
-		     || ! term_exists( 'article', $entity_type )
-		     || ! term_exists( 'thing', $entity_type ) ) {
-
-			// Return the input value.
-			return $terms;
-		}
-
-		// Avoid nested calls in case of issues.
-		remove_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10 );
-
-		// Set the default term for all the queried object.
-		foreach ( (array) $object_ids as $object_id ) {
-			$post_type = get_post_type( $object_id );
-			if ( Wordlift_Entity_Type_Service::is_valid_entity_post_type( $post_type ) ) {
-				// Set the term to article for posts and pages, or to thing for everything else.
-				$term = Wordlift_Entity_Service::TYPE_NAME === $post_type
-					? 'thing' : 'article';
-				wp_set_object_terms( $object_id, $term, $entity_type, true );
-			}
-		}
-
-		// Finally return the object terms.
-		$terms = wp_get_object_terms( $object_ids, $taxonomies, $args );
-
-		// Re-enable nested calls in case of issues.
-		add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
-
-		return $terms;
-	}
+        if ( WL_ALL_ENTITY_TYPES ) {
+            $args['meta_box_cb'] = array( 'Wordlift_Admin_Schemaorg_Taxonomy_Metabox', 'render' );
+        }
+
+        register_taxonomy(
+            self::TAXONOMY_NAME, // Taxonomy name.
+            Wordlift_Entity_Service::valid_entity_post_types(), // Taxonomy post types.
+            $args // Taxonomy args.
+        );
+
+        /**
+         * Register meta wl_entities_gutenberg for use in Gutenberg
+         */
+        register_meta( 'post', 'wl_entities_gutenberg', array(
+            'show_in_rest' => true,
+            'single'       => true,
+            'type'         => 'string',
+        ) );
+
+        /**
+         * Register meta _wl_alt_label for use in Gutenberg
+         */
+        register_meta( 'post', Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY, array(
+            'object_subtype' => '',
+            'show_in_rest'   => true,
+            'single'         => false,
+            'type'           => 'string',
+            'auth_callback'  => function () {
+                return current_user_can( 'edit_posts' );
+            }
+        ) );
+
+        // Add filter to change the metabox CSS class.
+        add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
+
+        // Add a filter to preset the object term if none is set.
+        //
+        // DO NOT hook to `wp_get_object_terms`, because `wp_get_object_terms` returns imploded values for SQL queries.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/995
+        // @since 3.23.6
+        add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
+
+    }
+
+    /**
+     * Hook to the `get_object_terms` filter.
+     *
+     * We check if our taxonomy is requested and whether a term has been returned. If no term has been returned we
+     * preset `Article` for posts/pages and 'Thing' for everything else and we query the terms again.
+     *
+     * @param array $terms Array of terms for the given object or objects.
+     * @param int[] $object_ids Array of object IDs for which terms were retrieved.
+     * @param string[] $taxonomies Array of taxonomy names from which terms were retrieved.
+     * @param array $args Array of arguments for retrieving terms for the given
+     *                             object(s). See get_object_terms() for details.
+     *
+     * @return array|WP_Error
+     * @since 3.23.6
+     */
+    public function get_object_terms( $terms, $object_ids, $taxonomies, $args ) {
+        // Get our entity type.
+        $entity_type = self::TAXONOMY_NAME;
+
+        // Check if this is a query for our entity type, that no terms have been found and that we have an article
+        // term to preset in case.
+        if ( ! taxonomy_exists( $entity_type )
+             || array( $entity_type ) !== (array) $taxonomies
+             || ! empty( $terms )
+             || ! term_exists( 'article', $entity_type )
+             || ! term_exists( 'thing', $entity_type ) ) {
+
+            // Return the input value.
+            return $terms;
+        }
+
+        // Avoid nested calls in case of issues.
+        remove_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10 );
+
+        // Set the default term for all the queried object.
+        foreach ( (array) $object_ids as $object_id ) {
+            $post_type = get_post_type( $object_id );
+            if ( Wordlift_Entity_Type_Service::is_valid_entity_post_type( $post_type ) ) {
+                // Set the term to article for posts and pages, or to thing for everything else.
+                $term = Wordlift_Entity_Service::TYPE_NAME === $post_type
+                    ? 'thing' : 'article';
+                wp_set_object_terms( $object_id, $term, $entity_type, true );
+            }
+        }
+
+        // Finally return the object terms.
+        $terms = wp_get_object_terms( $object_ids, $taxonomies, $args );
+
+        // Re-enable nested calls in case of issues.
+        add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
+
+        return $terms;
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -31,17 +31,17 @@ 
 	public function init() {
 
 		$labels = array(
-			'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Entity Types', 'wordlift' ),
-			'all_items'         => __( 'All Entity Types', 'wordlift' ),
-			'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
-			'update_item'       => __( 'Update Entity Type', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
-			'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
-			'menu_name'         => __( 'Entity Types', 'wordlift' ),
+			'name'              => _x('Entity Types', 'taxonomy general name', 'wordlift'),
+			'singular_name'     => _x('Entity Type', 'taxonomy singular name', 'wordlift'),
+			'search_items'      => __('Search Entity Types', 'wordlift'),
+			'all_items'         => __('All Entity Types', 'wordlift'),
+			'parent_item'       => __('Parent Entity Type', 'wordlift'),
+			'parent_item_colon' => __('Parent Entity Type:', 'wordlift'),
+			'edit_item'         => __('Edit Entity Type', 'wordlift'),
+			'update_item'       => __('Update Entity Type', 'wordlift'),
+			'add_new_item'      => __('Add New Entity Type', 'wordlift'),
+			'new_item_name'     => __('New Entity Type', 'wordlift'),
+			'menu_name'         => __('Entity Types', 'wordlift'),
 		);
 
 		// Take away GUI for taxonomy editing.
@@ -71,8 +71,8 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 * @since 3.20.0
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			$args['meta_box_cb'] = array( 'Wordlift_Admin_Schemaorg_Taxonomy_Metabox', 'render' );
+		if (WL_ALL_ENTITY_TYPES) {
+			$args['meta_box_cb'] = array('Wordlift_Admin_Schemaorg_Taxonomy_Metabox', 'render');
 		}
 
 		register_taxonomy(
@@ -84,27 +84,27 @@ 
 		/**
 		 * Register meta wl_entities_gutenberg for use in Gutenberg
 		 */
-		register_meta( 'post', 'wl_entities_gutenberg', array(
+		register_meta('post', 'wl_entities_gutenberg', array(
 			'show_in_rest' => true,
 			'single'       => true,
 			'type'         => 'string',
-		) );
+		));
 
 		/**
 		 * Register meta _wl_alt_label for use in Gutenberg
 		 */
-		register_meta( 'post', Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY, array(
+		register_meta('post', Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY, array(
 			'object_subtype' => '',
 			'show_in_rest'   => true,
 			'single'         => false,
 			'type'           => 'string',
-			'auth_callback'  => function () {
-				return current_user_can( 'edit_posts' );
+			'auth_callback'  => function() {
+				return current_user_can('edit_posts');
 			}
-		) );
+		));
 
 		// Add filter to change the metabox CSS class.
-		add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
+		add_filter('postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class');
 
 		// Add a filter to preset the object term if none is set.
 		//
@@ -112,7 +112,7 @@ 
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/995
 		// @since 3.23.6
-		add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
+		add_filter('get_object_terms', array($this, 'get_object_terms'), 10, 4);
 
 	}
 
@@ -131,41 +131,41 @@ 
 	 * @return array|WP_Error
 	 * @since 3.23.6
 	 */
-	public function get_object_terms( $terms, $object_ids, $taxonomies, $args ) {
+	public function get_object_terms($terms, $object_ids, $taxonomies, $args) {
 		// Get our entity type.
 		$entity_type = self::TAXONOMY_NAME;
 
 		// Check if this is a query for our entity type, that no terms have been found and that we have an article
 		// term to preset in case.
-		if ( ! taxonomy_exists( $entity_type )
-		     || array( $entity_type ) !== (array) $taxonomies
-		     || ! empty( $terms )
-		     || ! term_exists( 'article', $entity_type )
-		     || ! term_exists( 'thing', $entity_type ) ) {
+		if ( ! taxonomy_exists($entity_type)
+		     || array($entity_type) !== (array) $taxonomies
+		     || ! empty($terms)
+		     || ! term_exists('article', $entity_type)
+		     || ! term_exists('thing', $entity_type)) {
 
 			// Return the input value.
 			return $terms;
 		}
 
 		// Avoid nested calls in case of issues.
-		remove_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10 );
+		remove_filter('get_object_terms', array($this, 'get_object_terms'), 10);
 
 		// Set the default term for all the queried object.
-		foreach ( (array) $object_ids as $object_id ) {
-			$post_type = get_post_type( $object_id );
-			if ( Wordlift_Entity_Type_Service::is_valid_entity_post_type( $post_type ) ) {
+		foreach ((array) $object_ids as $object_id) {
+			$post_type = get_post_type($object_id);
+			if (Wordlift_Entity_Type_Service::is_valid_entity_post_type($post_type)) {
 				// Set the term to article for posts and pages, or to thing for everything else.
 				$term = Wordlift_Entity_Service::TYPE_NAME === $post_type
 					? 'thing' : 'article';
-				wp_set_object_terms( $object_id, $term, $entity_type, true );
+				wp_set_object_terms($object_id, $term, $entity_type, true);
 			}
 		}
 
 		// Finally return the object terms.
-		$terms = wp_get_object_terms( $object_ids, $taxonomies, $args );
+		$terms = wp_get_object_terms($object_ids, $taxonomies, $args);
 
 		// Re-enable nested calls in case of issues.
-		add_filter( 'get_object_terms', array( $this, 'get_object_terms' ), 10, 4 );
+		add_filter('get_object_terms', array($this, 'get_object_terms'), 10, 4);
 
 		return $terms;
 	}