insideout10 / wordlift-plugin

src/admin/class-wordlift-admin.php

Indentation +299 added lines, -299 removed lines

@@ -22,342 +22,342 @@ 
  */
 class Wordlift_Admin {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
-	 *
-	 * @since 3.20.0
-	 * @access private
-	 * @var \Wordlift_Batch_Operation_Ajax_Adapter $sync_batch_operation_ajax_adapter The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
-	 */
-	private $sync_batch_operation_ajax_adapter;
-
-	/**
-	 * The singleton instance.
-	 *
-	 * @since 3.19.4
-	 * @access private
-	 * @var Wordlift_Admin $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @param string $plugin_name The name of this plugin.
-	 * @param string $version The version of this plugin.
-	 * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
-	 * @param \Wordlift_Notice_Service $notice_service The notice service.
-	 * @param \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  1.0.0
-	 *
-	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-		$this->configuration_service = $configuration_service;
-		$this->user_service          = $user_service;
-
-		$dataset_uri = $configuration_service->get_dataset_uri();
-		$key         = $configuration_service->get_key();
-
-		if ( empty( $dataset_uri ) ) {
-			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			}
-			$notice_service->add_error( $error );
-		}
-
-		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
-
-			// Require the PHP files for the next code fragment.
-			self::require_files();
-
-			/*
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
+     *
+     * @since 3.20.0
+     * @access private
+     * @var \Wordlift_Batch_Operation_Ajax_Adapter $sync_batch_operation_ajax_adapter The {@link Wordlift_Batch_Operation_Ajax_Adapter} instance.
+     */
+    private $sync_batch_operation_ajax_adapter;
+
+    /**
+     * The singleton instance.
+     *
+     * @since 3.19.4
+     * @access private
+     * @var Wordlift_Admin $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @param string $plugin_name The name of this plugin.
+     * @param string $version The version of this plugin.
+     * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
+     * @param \Wordlift_Notice_Service $notice_service The notice service.
+     * @param \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     *
+     * @since  1.0.0
+     *
+     */
+    public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+        $this->configuration_service = $configuration_service;
+        $this->user_service          = $user_service;
+
+        $dataset_uri = $configuration_service->get_dataset_uri();
+        $key         = $configuration_service->get_key();
+
+        if ( empty( $dataset_uri ) ) {
+            $settings_page = Wordlift_Admin_Settings_Page::get_instance();
+            if ( empty( $key ) ) {
+                $error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            } else {
+                $error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            }
+            $notice_service->add_error( $error );
+        }
+
+        // Load additional code if we're in the admin UI.
+        if ( is_admin() ) {
+
+            // Require the PHP files for the next code fragment.
+            self::require_files();
+
+            /*
 			 * @since 3.24.2 This function isn't called anymore because it was causing the Block Category to
 			 * multiply in Block Editor.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/1004
 			 */
-			// Add Wordlift custom block category.
-			// self::add_block_category();
+            // Add Wordlift custom block category.
+            // self::add_block_category();
 
-			new Wordlift_Dashboard_Latest_News();
+            new Wordlift_Dashboard_Latest_News();
 
-			// Search Rankings.
-			$search_rankings_service = new Wordlift_Admin_Search_Rankings_Service( Wordlift_Api_Service::get_instance() );
-			new Wordlift_Admin_Search_Rankings_Ajax_Adapter( $search_rankings_service );
+            // Search Rankings.
+            $search_rankings_service = new Wordlift_Admin_Search_Rankings_Service( Wordlift_Api_Service::get_instance() );
+            new Wordlift_Admin_Search_Rankings_Ajax_Adapter( $search_rankings_service );
 
-			/*
+            /*
 			 * Add support for `All Entity Types`.
 			 *
 			 * @since 3.20.0
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-property-metabox.php';
+            if ( WL_ALL_ENTITY_TYPES ) {
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-property-metabox.php';
 
-				// new Wordlift_Admin_Schemaorg_Property_Metabox( Wordlift_Schemaorg_Property_Service::get_instance() );
-				/*
+                // new Wordlift_Admin_Schemaorg_Property_Metabox( Wordlift_Schemaorg_Property_Service::get_instance() );
+                /*
 				 * The `Mappings` admin page.
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-mappings-page.php';
-				new Wordlift_Admin_Mappings_Page();
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-mappings-page.php';
+                new Wordlift_Admin_Mappings_Page();
 
-				/*
+                /*
 				 * Allow sync'ing the schema.org taxonomy with the schema.org json file.
 				 *
 				 * @since 3.20.0
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
+                require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
 
-				$this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter( new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync' );
+                $this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter( new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync' );
 
-			}
+            }
 
-			/*
+            /*
 			 * Add the {@link Wordlift_Admin_Term_Adapter}.
 			 *
 			 * @since 3.20.0
 			 */
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-term-adapter.php';
-			new Wordlift_Admin_Term_Adapter();
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-term-adapter.php';
+            new Wordlift_Admin_Term_Adapter();
 
-			/*
+            /*
 			 * The new dashboard.
 			 *
 			 * @since 3.20.0
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/879
 			 */
-			new Wordlift_Admin_Dashboard_V2(
-				$search_rankings_service,
-				Wordlift::get_instance()->get_dashboard_service(),
-				Wordlift_Entity_Service::get_instance()
-			);
-			new Wordlift_Admin_Not_Enriched_Filter();
-
-		}
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance.
-	 *
-	 * @return \Wordlift_Admin The singleton instance.
-	 * @since 3.19.4
-	 *
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/*
+            new Wordlift_Admin_Dashboard_V2(
+                $search_rankings_service,
+                Wordlift::get_instance()->get_dashboard_service(),
+                Wordlift_Entity_Service::get_instance()
+            );
+            new Wordlift_Admin_Not_Enriched_Filter();
+
+        }
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @return \Wordlift_Admin The singleton instance.
+     * @since 3.19.4
+     *
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /*
 		 * Do not load our scripts on the Filter Urls plugin admin pages.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/901
 		 * @since 3.20.0
 		 */
-		$screen = get_current_screen();
-		if ( is_a( $screen, 'WP_Screen' ) && 'filter-urls_page_filter_urls_form' === $screen->id ) {
-			return;
-		}
+        $screen = get_current_screen();
+        if ( is_a( $screen, 'WP_Screen' ) && 'filter-urls_page_filter_urls_form' === $screen->id ) {
+            return;
+        }
 
-		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
-			'jquery',
-			'underscore',
-			'backbone',
-		), $this->version, false );
+        // Enqueue the admin scripts.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+            'jquery',
+            'underscore',
+            'backbone',
+        ), $this->version, false );
 
 
-		$can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
+        $can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
 
-		/*
+        /*
 		 * People that can create entities will see the scope set in the wp-config.php file (by default `cloud`). People
 		 * that cannot edit create entities will always see the local entities.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/839
 		 */
-		$autocomplete_scope = $can_edit_wordlift_entities ? WL_AUTOCOMPLETE_SCOPE : "local";
-
-		// Set the basic params.
-		$params = array(
-			// @todo scripts in admin should use wp.post.
-			'ajax_url'                   => admin_url( 'admin-ajax.php' ),
-			// @todo remove specific actions from settings.
-			'action'                     => 'entity_by_title',
-			'datasetUri'                 => $this->configuration_service->get_dataset_uri(),
-			'language'                   => $this->configuration_service->get_language_code(),
-			'link_by_default'            => $this->configuration_service->is_link_by_default(),
-			// Whether the current user is allowed to create new entities.
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'        => $can_edit_wordlift_entities ? 'yes' : 'no',
-			'l10n'                       => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
-				'Add keywords to track'                                              => __( 'Add Keywords to track', 'wordlift' ),
-			),
-			'wl_autocomplete_nonce'      => wp_create_nonce( 'wl_autocomplete' ),
-			'autocomplete_scope'         => $autocomplete_scope,
-			/**
-			 * Allow 3rd parties to define the default editor id. This turns useful if 3rd parties load
-			 * or change the TinyMCE id.
-			 *
-			 * The editor id is currently referenced by `src/coffee/editpost-widget/app.services.EditorAdapter.coffee`.
-			 *
-			 * @param string $editor The default editor id, by default `content`.
-			 *
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/848
-			 *
-			 * @since 3.19.4
-			 *
-			 */
-			'default_editor_id'          => apply_filters( 'wl_default_editor_id', 'content' ),
-			/**
-			 * Add the link to the Search Keywords admin page.
-			 *
-			 * @since 3.20.0
-			 */
-			'search_keywords_admin_page' => admin_url( 'admin.php?page=wl_configuration_admin_menu&tab=search-keywords' ),
-
-			'analysis' => array( '_wpnonce' => wp_create_nonce( 'wl_analyze' ), )
-		);
-
-		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
-
-			$params['post_id']           = $entity_being_edited->ID;
-			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
-			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
-			// from the results, since we don't want the current entity to be discovered by the analysis.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId']                      = $entity_service->get_uri( $entity_being_edited->ID );
-			$params['wl_schemaorg_property_nonce'] = wp_create_nonce( 'wl_schemaorg_property' );
-
-			/*
+        $autocomplete_scope = $can_edit_wordlift_entities ? WL_AUTOCOMPLETE_SCOPE : "local";
+
+        // Set the basic params.
+        $params = array(
+            // @todo scripts in admin should use wp.post.
+            'ajax_url'                   => admin_url( 'admin-ajax.php' ),
+            // @todo remove specific actions from settings.
+            'action'                     => 'entity_by_title',
+            'datasetUri'                 => $this->configuration_service->get_dataset_uri(),
+            'language'                   => $this->configuration_service->get_language_code(),
+            'link_by_default'            => $this->configuration_service->is_link_by_default(),
+            // Whether the current user is allowed to create new entities.
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/561
+            'can_create_entities'        => $can_edit_wordlift_entities ? 'yes' : 'no',
+            'l10n'                       => array(
+                'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
+                'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
+                'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+                'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
+                'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
+                'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+                'Add keywords to track'                                              => __( 'Add Keywords to track', 'wordlift' ),
+            ),
+            'wl_autocomplete_nonce'      => wp_create_nonce( 'wl_autocomplete' ),
+            'autocomplete_scope'         => $autocomplete_scope,
+            /**
+             * Allow 3rd parties to define the default editor id. This turns useful if 3rd parties load
+             * or change the TinyMCE id.
+             *
+             * The editor id is currently referenced by `src/coffee/editpost-widget/app.services.EditorAdapter.coffee`.
+             *
+             * @param string $editor The default editor id, by default `content`.
+             *
+             * @see https://github.com/insideout10/wordlift-plugin/issues/848
+             *
+             * @since 3.19.4
+             *
+             */
+            'default_editor_id'          => apply_filters( 'wl_default_editor_id', 'content' ),
+            /**
+             * Add the link to the Search Keywords admin page.
+             *
+             * @since 3.20.0
+             */
+            'search_keywords_admin_page' => admin_url( 'admin.php?page=wl_configuration_admin_menu&tab=search-keywords' ),
+
+            'analysis' => array( '_wpnonce' => wp_create_nonce( 'wl_analyze' ), )
+        );
+
+        // Set post-related values if there's a current post.
+        if ( null !== $post = $entity_being_edited = get_post() ) {
+
+            $params['post_id']           = $entity_being_edited->ID;
+            $entity_service              = Wordlift_Entity_Service::get_instance();
+            $params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+            // We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
+            // from the results, since we don't want the current entity to be discovered by the analysis.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/345
+            $params['itemId']                      = $entity_service->get_uri( $entity_being_edited->ID );
+            $params['wl_schemaorg_property_nonce'] = wp_create_nonce( 'wl_schemaorg_property' );
+
+            /*
 			 * Add the `properties` if `WL_ALL_ENTITY_TYPES` is enabled.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				$params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all( $post->ID );
-			}
-
-		}
-
-		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', apply_filters( 'wl_admin_settings', $params ) );
-
-	}
-
-	/**
-	 * Require files needed for the Admin UI.
-	 *
-	 * @since 3.20.0
-	 */
-	private static function require_files() {
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-v2.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-not-enriched-filter.php';
-
-	}
-
-	/**
-	 * Add Wordlift custom block category.
-	 *
-	 * @since 3.21.0
-	 * @since 3.24.2 this function isn't called anymore as it was causing the WordLift block category to multiply
-	 *   in Block Editor, https://github.com/insideout10/wordlift-plugin/issues/1004
-	 */
+            if ( WL_ALL_ENTITY_TYPES ) {
+                $params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all( $post->ID );
+            }
+
+        }
+
+        // Finally output the params as `wlSettings` for JavaScript code.
+        wp_localize_script( $this->plugin_name, 'wlSettings', apply_filters( 'wl_admin_settings', $params ) );
+
+    }
+
+    /**
+     * Require files needed for the Admin UI.
+     *
+     * @since 3.20.0
+     */
+    private static function require_files() {
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-v2.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-not-enriched-filter.php';
+
+    }
+
+    /**
+     * Add Wordlift custom block category.
+     *
+     * @since 3.21.0
+     * @since 3.24.2 this function isn't called anymore as it was causing the WordLift block category to multiply
+     *   in Block Editor, https://github.com/insideout10/wordlift-plugin/issues/1004
+     */
 //	private static function add_block_category() {
 //		add_filter( 'block_categories', function ( $categories, $post ) {
 //			return array_merge(
@@ -373,22 +373,22 @@ 
 //		}, 10, 2 );
 //	}
 
-	public static function is_gutenberg() {
-		if ( function_exists( 'is_gutenberg_page' ) &&
-		     is_gutenberg_page()
-		) {
-			// The Gutenberg plugin is on.
-			return true;
-		}
-		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) &&
-		     $current_screen->is_block_editor()
-		) {
-			// Gutenberg page on 5+.
-			return true;
-		}
-
-		return false;
-	}
+    public static function is_gutenberg() {
+        if ( function_exists( 'is_gutenberg_page' ) &&
+             is_gutenberg_page()
+        ) {
+            // The Gutenberg plugin is on.
+            return true;
+        }
+        $current_screen = get_current_screen();
+        if ( method_exists( $current_screen, 'is_block_editor' ) &&
+             $current_screen->is_block_editor()
+        ) {
+            // Gutenberg page on 5+.
+            return true;
+        }
+
+        return false;
+    }
 
 }

Spacing +47 added lines, -47 removed lines

@@ -88,7 +88,7 @@ 
 	 * @since  1.0.0
 	 *
 	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+	public function __construct($plugin_name, $version, $configuration_service, $notice_service, $user_service) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -99,18 +99,18 @@ 
 		$dataset_uri = $configuration_service->get_dataset_uri();
 		$key         = $configuration_service->get_key();
 
-		if ( empty( $dataset_uri ) ) {
+		if (empty($dataset_uri)) {
 			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+			if (empty($key)) {
+				$error = sprintf(esc_html__("WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+				$error = sprintf(esc_html__("WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			}
-			$notice_service->add_error( $error );
+			$notice_service->add_error($error);
 		}
 
 		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
+		if (is_admin()) {
 
 			// Require the PHP files for the next code fragment.
 			self::require_files();
@@ -127,8 +127,8 @@ 
 			new Wordlift_Dashboard_Latest_News();
 
 			// Search Rankings.
-			$search_rankings_service = new Wordlift_Admin_Search_Rankings_Service( Wordlift_Api_Service::get_instance() );
-			new Wordlift_Admin_Search_Rankings_Ajax_Adapter( $search_rankings_service );
+			$search_rankings_service = new Wordlift_Admin_Search_Rankings_Service(Wordlift_Api_Service::get_instance());
+			new Wordlift_Admin_Search_Rankings_Ajax_Adapter($search_rankings_service);
 
 			/*
 			 * Add support for `All Entity Types`.
@@ -137,15 +137,15 @@ 
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-schemaorg-property-metabox.php';
+			if (WL_ALL_ENTITY_TYPES) {
+				require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php';
+				require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-schemaorg-property-metabox.php';
 
 				// new Wordlift_Admin_Schemaorg_Property_Metabox( Wordlift_Schemaorg_Property_Service::get_instance() );
 				/*
 				 * The `Mappings` admin page.
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-mappings-page.php';
+				require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-mappings-page.php';
 				new Wordlift_Admin_Mappings_Page();
 
 				/*
@@ -153,9 +153,9 @@ 
 				 *
 				 * @since 3.20.0
 				 */
-				require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
+				require_once plugin_dir_path(dirname(__FILE__)).'includes/schemaorg/class-wordlift-schemaorg-sync-batch-operation.php';
 
-				$this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter( new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync' );
+				$this->sync_batch_operation_ajax_adapter = new Wordlift_Batch_Operation_Ajax_Adapter(new Wordlift_Schemaorg_Sync_Batch_Operation(), 'wl_schemaorg_sync');
 
 			}
 
@@ -164,7 +164,7 @@ 
 			 *
 			 * @since 3.20.0
 			 */
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-term-adapter.php';
+			require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-term-adapter.php';
 			new Wordlift_Admin_Term_Adapter();
 
 			/*
@@ -219,7 +219,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -237,19 +237,19 @@ 
 		 * @since 3.20.0
 		 */
 		$screen = get_current_screen();
-		if ( is_a( $screen, 'WP_Screen' ) && 'filter-urls_page_filter_urls_form' === $screen->id ) {
+		if (is_a($screen, 'WP_Screen') && 'filter-urls_page_filter_urls_form' === $screen->id) {
 			return;
 		}
 
 		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/1/admin.js', array(
 			'jquery',
 			'underscore',
 			'backbone',
-		), $this->version, false );
+		), $this->version, false);
 
 
-		$can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
+		$can_edit_wordlift_entities = current_user_can('edit_wordlift_entities');
 
 		/*
 		 * People that can create entities will see the scope set in the wp-config.php file (by default `cloud`). People
@@ -262,7 +262,7 @@ 
 		// Set the basic params.
 		$params = array(
 			// @todo scripts in admin should use wp.post.
-			'ajax_url'                   => admin_url( 'admin-ajax.php' ),
+			'ajax_url'                   => admin_url('admin-ajax.php'),
 			// @todo remove specific actions from settings.
 			'action'                     => 'entity_by_title',
 			'datasetUri'                 => $this->configuration_service->get_dataset_uri(),
@@ -273,15 +273,15 @@ 
 			// @see https://github.com/insideout10/wordlift-plugin/issues/561
 			'can_create_entities'        => $can_edit_wordlift_entities ? 'yes' : 'no',
 			'l10n'                       => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
-				'Add keywords to track'                                              => __( 'Add Keywords to track', 'wordlift' ),
+				'You already published an entity with the same name'                 => __('You already published an entity with the same name: ', 'wordlift'),
+				'logo_selection_title'                                               => __('WordLift Choose Logo', 'wordlift'),
+				'logo_selection_button'                                              => array('text' => __('Choose Logo', 'wordlift')),
+				'Type at least 3 characters to search...'                            => _x('Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift'),
+				'No results found for your search.'                                  => _x('No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift'),
+				'Please wait while we look for entities in the linked data cloud...' => _x('Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift'),
+				'Add keywords to track'                                              => __('Add Keywords to track', 'wordlift'),
 			),
-			'wl_autocomplete_nonce'      => wp_create_nonce( 'wl_autocomplete' ),
+			'wl_autocomplete_nonce'      => wp_create_nonce('wl_autocomplete'),
 			'autocomplete_scope'         => $autocomplete_scope,
 			/**
 			 * Allow 3rd parties to define the default editor id. This turns useful if 3rd parties load
@@ -296,43 +296,43 @@ 
 			 * @since 3.19.4
 			 *
 			 */
-			'default_editor_id'          => apply_filters( 'wl_default_editor_id', 'content' ),
+			'default_editor_id'          => apply_filters('wl_default_editor_id', 'content'),
 			/**
 			 * Add the link to the Search Keywords admin page.
 			 *
 			 * @since 3.20.0
 			 */
-			'search_keywords_admin_page' => admin_url( 'admin.php?page=wl_configuration_admin_menu&tab=search-keywords' ),
+			'search_keywords_admin_page' => admin_url('admin.php?page=wl_configuration_admin_menu&tab=search-keywords'),
 
-			'analysis' => array( '_wpnonce' => wp_create_nonce( 'wl_analyze' ), )
+			'analysis' => array('_wpnonce' => wp_create_nonce('wl_analyze'),)
 		);
 
 		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
+		if (null !== $post = $entity_being_edited = get_post()) {
 
 			$params['post_id']           = $entity_being_edited->ID;
 			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+			$params['entityBeingEdited'] = isset($entity_being_edited->post_type) && $entity_service->is_entity($post->ID) && is_numeric(get_the_ID());
 			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
 			// from the results, since we don't want the current entity to be discovered by the analysis.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId']                      = $entity_service->get_uri( $entity_being_edited->ID );
-			$params['wl_schemaorg_property_nonce'] = wp_create_nonce( 'wl_schemaorg_property' );
+			$params['itemId']                      = $entity_service->get_uri($entity_being_edited->ID);
+			$params['wl_schemaorg_property_nonce'] = wp_create_nonce('wl_schemaorg_property');
 
 			/*
 			 * Add the `properties` if `WL_ALL_ENTITY_TYPES` is enabled.
 			 *
 			 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 			 */
-			if ( WL_ALL_ENTITY_TYPES ) {
-				$params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all( $post->ID );
+			if (WL_ALL_ENTITY_TYPES) {
+				$params['properties'] = Wordlift_Schemaorg_Property_Service::get_instance()->get_all($post->ID);
 			}
 
 		}
 
 		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', apply_filters( 'wl_admin_settings', $params ) );
+		wp_localize_script($this->plugin_name, 'wlSettings', apply_filters('wl_admin_settings', $params));
 
 	}
 
@@ -343,11 +343,11 @@ 
 	 */
 	private static function require_files() {
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-v2.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-not-enriched-filter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard-latest-news.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-search-rankings-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-search-rankings-ajax-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard-v2.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-not-enriched-filter.php';
 
 	}
 
@@ -374,14 +374,14 @@ 
 //	}
 
 	public static function is_gutenberg() {
-		if ( function_exists( 'is_gutenberg_page' ) &&
+		if (function_exists('is_gutenberg_page') &&
 		     is_gutenberg_page()
 		) {
 			// The Gutenberg plugin is on.
 			return true;
 		}
 		$current_screen = get_current_screen();
-		if ( method_exists( $current_screen, 'is_block_editor' ) &&
+		if (method_exists($current_screen, 'is_block_editor') &&
 		     $current_screen->is_block_editor()
 		) {
 			// Gutenberg page on 5+.

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

Indentation +217 added lines, -217 removed lines

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

Spacing +31 added lines, -31 removed lines

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

src/admin/class-wordlift-admin-schemaorg-taxonomy-metabox.php

Indentation +77 added lines, -77 removed lines

@@ -17,41 +17,41 @@ 
  */
 class Wordlift_Admin_Schemaorg_Taxonomy_Metabox {
 
-	/**
-	 * Render the metabox.
-	 *
-	 * @since 3.20.0
-	 */
-	public static function render() {
+    /**
+     * Render the metabox.
+     *
+     * @since 3.20.0
+     */
+    public static function render() {
 
-		Wordlift_Admin_Schemaorg_Taxonomy_Metabox::post_categories_meta_box( get_post(), array(
-			'args' =>
-				array( 'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ),
-		) );
+        Wordlift_Admin_Schemaorg_Taxonomy_Metabox::post_categories_meta_box( get_post(), array(
+            'args' =>
+                array( 'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ),
+        ) );
 
-	}
+    }
 
-	/**
-	 * A function which resembles WordPress' own to display a metabox, but which customizes the output
-	 * to display the Schema.org classes tree.
-	 *
-	 * @param WP_Post $post The {@link WP_Post} being edited.
-	 * @param array $box An array of arguments.
-	 *
-	 * @since 3.20.0
-	 *
-	 */
-	private static function post_categories_meta_box( $post, $box ) {
-		$defaults = array( 'taxonomy' => 'category' );
-		if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
-			$args = array();
-		} else {
-			$args = $box['args'];
-		}
-		$r        = wp_parse_args( $args, $defaults );
-		$tax_name = esc_attr( $r['taxonomy'] );
-		$taxonomy = get_taxonomy( $r['taxonomy'] );
-		?>
+    /**
+     * A function which resembles WordPress' own to display a metabox, but which customizes the output
+     * to display the Schema.org classes tree.
+     *
+     * @param WP_Post $post The {@link WP_Post} being edited.
+     * @param array $box An array of arguments.
+     *
+     * @since 3.20.0
+     *
+     */
+    private static function post_categories_meta_box( $post, $box ) {
+        $defaults = array( 'taxonomy' => 'category' );
+        if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+            $args = array();
+        } else {
+            $args = $box['args'];
+        }
+        $r        = wp_parse_args( $args, $defaults );
+        $tax_name = esc_attr( $r['taxonomy'] );
+        $taxonomy = get_taxonomy( $r['taxonomy'] );
+        ?>
         <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
             <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
                 <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a>
@@ -74,15 +74,15 @@ 
 
             <div id="<?php echo $tax_name; ?>-legacy" class="tabs-panel" style="display: none;">
 				<?php
-				$name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
-				echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
-				?>
+                $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+                echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
+                ?>
                 <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>"
                     class="categorychecklist form-no-clear">
 					<?php wp_terms_checklist( $post->ID, array(
-						'taxonomy'     => $tax_name,
-						'popular_cats' => $popular_ids,
-					) ); ?>
+                        'taxonomy'     => $tax_name,
+                        'popular_cats' => $popular_ids,
+                    ) ); ?>
                 </ul>
             </div>
 			<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
@@ -90,9 +90,9 @@ 
                     <a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add"
                        class="taxonomy-add-new">
 						<?php
-						/* translators: %s: add new taxonomy label */
-						printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
-						?>
+                        /* translators: %s: add new taxonomy label */
+                        printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+                        ?>
                     </a>
                     <p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
                         <label class="screen-reader-text"
@@ -105,43 +105,43 @@ 
 							<?php echo $taxonomy->labels->parent_item_colon; ?>
                         </label>
 						<?php
-						$parent_dropdown_args = array(
-							'taxonomy'         => $tax_name,
-							'hide_empty'       => 0,
-							'name'             => 'new' . $tax_name . '_parent',
-							'orderby'          => 'name',
-							'hierarchical'     => 1,
-							'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
-						);
+                        $parent_dropdown_args = array(
+                            'taxonomy'         => $tax_name,
+                            'hide_empty'       => 0,
+                            'name'             => 'new' . $tax_name . '_parent',
+                            'orderby'          => 'name',
+                            'hierarchical'     => 1,
+                            'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
+                        );
 
-						/**
-						 * Filters the arguments for the taxonomy parent dropdown on the Post Edit page.
-						 *
-						 * @param array $parent_dropdown_args {
-						 *     Optional. Array of arguments to generate parent dropdown.
-						 *
-						 * @type string $taxonomy Name of the taxonomy to retrieve.
-						 * @type bool $hide_if_empty True to skip generating markup if no
-						 *                                      categories are found. Default 0.
-						 * @type string $name Value for the 'name' attribute
-						 *                                      of the select element.
-						 *                                      Default "new{$tax_name}_parent".
-						 * @type string $orderby Which column to use for ordering
-						 *                                      terms. Default 'name'.
-						 * @type bool|int $hierarchical Whether to traverse the taxonomy
-						 *                                      hierarchy. Default 1.
-						 * @type string $show_option_none Text to display for the "none" option.
-						 *                                      Default "&mdash; {$parent} &mdash;",
-						 *                                      where `$parent` is 'parent_item'
-						 *                                      taxonomy label.
-						 * }
-						 * @since 4.4.0
-						 *
-						 */
-						$parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
+                        /**
+                         * Filters the arguments for the taxonomy parent dropdown on the Post Edit page.
+                         *
+                         * @param array $parent_dropdown_args {
+                         *     Optional. Array of arguments to generate parent dropdown.
+                         *
+                         * @type string $taxonomy Name of the taxonomy to retrieve.
+                         * @type bool $hide_if_empty True to skip generating markup if no
+                         *                                      categories are found. Default 0.
+                         * @type string $name Value for the 'name' attribute
+                         *                                      of the select element.
+                         *                                      Default "new{$tax_name}_parent".
+                         * @type string $orderby Which column to use for ordering
+                         *                                      terms. Default 'name'.
+                         * @type bool|int $hierarchical Whether to traverse the taxonomy
+                         *                                      hierarchy. Default 1.
+                         * @type string $show_option_none Text to display for the "none" option.
+                         *                                      Default "&mdash; {$parent} &mdash;",
+                         *                                      where `$parent` is 'parent_item'
+                         *                                      taxonomy label.
+                         * }
+                         * @since 4.4.0
+                         *
+                         */
+                        $parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
 
-						wp_dropdown_categories( $parent_dropdown_args );
-						?>
+                        wp_dropdown_categories( $parent_dropdown_args );
+                        ?>
                         <input type="button" id="<?php echo $tax_name; ?>-add-submit"
                                data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add"
                                class="button category-add-submit"
@@ -153,6 +153,6 @@ 
 			<?php endif; ?>
         </div>
 		<?php
-	}
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -24,10 +24,10 @@ 
 	 */
 	public static function render() {
 
-		Wordlift_Admin_Schemaorg_Taxonomy_Metabox::post_categories_meta_box( get_post(), array(
+		Wordlift_Admin_Schemaorg_Taxonomy_Metabox::post_categories_meta_box(get_post(), array(
 			'args' =>
-				array( 'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME ),
-		) );
+				array('taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME),
+		));
 
 	}
 
@@ -41,24 +41,24 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	private static function post_categories_meta_box( $post, $box ) {
-		$defaults = array( 'taxonomy' => 'category' );
-		if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+	private static function post_categories_meta_box($post, $box) {
+		$defaults = array('taxonomy' => 'category');
+		if ( ! isset($box['args']) || ! is_array($box['args'])) {
 			$args = array();
 		} else {
 			$args = $box['args'];
 		}
-		$r        = wp_parse_args( $args, $defaults );
-		$tax_name = esc_attr( $r['taxonomy'] );
-		$taxonomy = get_taxonomy( $r['taxonomy'] );
+		$r        = wp_parse_args($args, $defaults);
+		$tax_name = esc_attr($r['taxonomy']);
+		$taxonomy = get_taxonomy($r['taxonomy']);
 		?>
         <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
             <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
                 <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a>
                 </li>
-                <li><a href="#<?php echo $tax_name; ?>-pop"><?php echo esc_html__( 'Most Used' ); ?></a></li>
+                <li><a href="#<?php echo $tax_name; ?>-pop"><?php echo esc_html__('Most Used'); ?></a></li>
                 <li><a href="#<?php echo $tax_name; ?>-legacy">
-						<?php echo esc_html_x( 'A-Z', 'Entity Types metabox', 'wordlift' ); ?></a>
+						<?php echo esc_html_x('A-Z', 'Entity Types metabox', 'wordlift'); ?></a>
                 </li>
             </ul>
 
@@ -68,30 +68,30 @@ 
 
             <div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
                 <ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear">
-					<?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
+					<?php $popular_ids = wp_popular_terms_checklist($tax_name); ?>
                 </ul>
             </div>
 
             <div id="<?php echo $tax_name; ?>-legacy" class="tabs-panel" style="display: none;">
 				<?php
-				$name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+				$name = ($tax_name == 'category') ? 'post_category' : 'tax_input['.$tax_name.']';
 				echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
 				?>
                 <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>"
                     class="categorychecklist form-no-clear">
-					<?php wp_terms_checklist( $post->ID, array(
+					<?php wp_terms_checklist($post->ID, array(
 						'taxonomy'     => $tax_name,
 						'popular_cats' => $popular_ids,
-					) ); ?>
+					)); ?>
                 </ul>
             </div>
-			<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+			<?php if (current_user_can($taxonomy->cap->edit_terms)) : ?>
                 <div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
                     <a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add"
                        class="taxonomy-add-new">
 						<?php
 						/* translators: %s: add new taxonomy label */
-						printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+						printf(__('+ %s'), $taxonomy->labels->add_new_item);
 						?>
                     </a>
                     <p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
@@ -99,7 +99,7 @@ 
                                for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
                         <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>"
                                class="form-required form-input-tip"
-                               value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>"
+                               value="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>"
                                aria-required="true"/>
                         <label class="screen-reader-text" for="new<?php echo $tax_name; ?>_parent">
 							<?php echo $taxonomy->labels->parent_item_colon; ?>
@@ -108,10 +108,10 @@ 
 						$parent_dropdown_args = array(
 							'taxonomy'         => $tax_name,
 							'hide_empty'       => 0,
-							'name'             => 'new' . $tax_name . '_parent',
+							'name'             => 'new'.$tax_name.'_parent',
 							'orderby'          => 'name',
 							'hierarchical'     => 1,
-							'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
+							'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;',
 						);
 
 						/**
@@ -138,15 +138,15 @@ 
 						 * @since 4.4.0
 						 *
 						 */
-						$parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
+						$parent_dropdown_args = apply_filters('post_edit_category_parent_dropdown_args', $parent_dropdown_args);
 
-						wp_dropdown_categories( $parent_dropdown_args );
+						wp_dropdown_categories($parent_dropdown_args);
 						?>
                         <input type="button" id="<?php echo $tax_name; ?>-add-submit"
                                data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add"
                                class="button category-add-submit"
-                               value="<?php echo esc_attr( $taxonomy->labels->add_new_item ); ?>"/>
-						<?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?>
+                               value="<?php echo esc_attr($taxonomy->labels->add_new_item); ?>"/>
+						<?php wp_nonce_field('add-'.$tax_name, '_ajax_nonce-add-'.$tax_name, false); ?>
                         <span id="<?php echo $tax_name; ?>-ajax-response"></span>
                     </p>
                 </div>

src/wordlift/analysis/response/class-analysis-response-ops.php

Indentation +314 added lines, -314 removed lines

@@ -7,319 +7,319 @@
 
 class Analysis_Response_Ops {
 
-	/**
-	 * The analysis response json.
-	 *
-	 * @since 3.21.5
-	 * @access private
-	 * @var mixed $json Holds the analysis response json.
-	 */
-	private $json;
-
-	/**
-	 * Holds the {@link Wordlift_Entity_Uri_Service}.
-	 *
-	 * @since 3.21.5
-	 * @access private
-	 * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
-	 */
-	private $entity_uri_service;
-
-	private $entity_service;
-
-	/**
-	 * @var \Wordlift_Entity_Type_Service
-	 */
-	private $entity_type_service;
-	/**
-	 * @var \Wordlift_Post_Image_Storage
-	 */
-	private $post_image_storage;
-
-	/**
-	 * Analysis_Response_Ops constructor.
-	 *
-	 * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service}.
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service}.
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service}.
-	 * @param \Wordlift_Post_Image_Storage $post_image_storage A {@link Wordlift_Post_Image_Storage} instance.
-	 * @param mixed $json The analysis response json.
-	 *
-	 * @since 3.21.5
-	 */
-	public function __construct( $entity_uri_service, $entity_service, $entity_type_service, $post_image_storage, $json ) {
-
-		$this->json                = $json;
-		$this->entity_uri_service  = $entity_uri_service;
-		$this->entity_service      = $entity_service;
-		$this->entity_type_service = $entity_type_service;
-		$this->post_image_storage  = $post_image_storage;
-
-	}
-
-	/**
-	 * Switches remote entities, i.e. entities with id outside the local dataset, to local entities.
-	 *
-	 * The function takes all the entities that have an id which is not local. For each remote entity, a list of URIs
-	 * is built comprising the entity id and the sameAs. Then a query is issued in the local database to find potential
-	 * matches from the local vocabulary.
-	 *
-	 * If found, the entity id is swapped with the local id and the remote id is added to the sameAs.
-	 *
-	 * @return Analysis_Response_Ops The current Analysis_Response_Ops instance.
-	 */
-	public function make_entities_local() {
-
-		if ( ! isset( $this->json->entities ) ) {
-			return $this;
-		}
-
-		// Get the URIs.
-		$uris = array_keys( get_object_vars( $this->json->entities ) );
-
-		// Filter only the external URIs.
-		$entity_uri_service = $this->entity_uri_service;
-		$external_uris      = array_filter( $uris, function ( $item ) use ( $entity_uri_service ) {
-			return ! $entity_uri_service->is_internal( $item );
-		} );
-
-		// Preload the URIs.
-		$entity_uri_service->preload_uris( $external_uris );
-
-		$mappings = array();
-		foreach ( $external_uris as $external_uri ) {
-			$entity = $entity_uri_service->get_entity( $external_uri );
-			if ( null !== $entity ) {
-
-				// Get the internal URI.
-				$internal_uri              = $this->entity_service->get_uri( $entity->ID );
-				$mappings[ $external_uri ] = $internal_uri;
-			}
-		}
-
-		foreach ( $mappings as $external_uri => $internal_uri ) {
-
-			// Move the data from the external URI to the internal URI.
-			if ( ! isset( $this->json->entities->{$internal_uri} ) ) {
-				$this->json->entities->{$internal_uri} = $this->json->entities->{$external_uri};
-			}
-
-			// Ensure sameAs is an array.
-			if ( ! isset( $this->json->entities->{$internal_uri}->sameAs )
-			     || ! is_array( $this->json->entities->{$internal_uri}->sameAs ) ) {
-				$this->json->entities->{$internal_uri}->sameAs = array();
-			}
-
-			// Add the external URI as sameAs.
-			$this->json->entities->{$internal_uri}->sameAs[] = $external_uri;
-
-			// Finally remove the external URI.
-			unset( $this->json->entities->{$external_uri} );
-		}
-
-		if ( isset( $this->json->annotations ) ) {
-			foreach ( $this->json->annotations as $key => $annotation ) {
-				if ( isset( $annotation->entityMatches ) ) {
-					foreach ( $annotation->entityMatches as $match ) {
-						if ( isset( $match->entityId ) && isset( $mappings[ $match->entityId ] ) ) {
-							$match->entityId = $mappings[ $match->entityId ];
-						}
-					}
-				}
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Add occurrences by parsing the provided html content.
-	 *
-	 * @param string $content The html content with annotations.
-	 *
-	 * @return Analysis_Response_Ops The {@link Analysis_Response_Ops} instance.
-	 *
-	 * @since 3.23.7 refactor the regex pattern to take into account that there might be css classes between textannotation
-	 *  and disambiguated.
-	 *
-	 * @link https://github.com/insideout10/wordlift-plugin/issues/1001
-	 */
-	public function add_occurrences( $content ) {
-
-		// Try to get all the disambiguated annotations and bail out if an error occurs.
-		if ( false === preg_match_all(
-				'|<span\s+id="([^"]+)"\s+class="textannotation\s+(?:\S+\s+)?disambiguated(?=[\s"])[^"]*"\s+itemid="([^"]*)">(.*?)</span>|',
-				$content,
-				$matches,
-				PREG_OFFSET_CAPTURE
-			) ) {
-			return $this;
-		}
-
-		if ( empty( $matches ) ) {
-			return $this;
-		}
-
-		$parse_data = array_reduce( range( 0, count( $matches[1] ) - 1 ), function ( $carry, $i ) use ( $matches ) {
-			if ( empty( $matches[0] ) ) {
-				return $carry;
-			}
-
-			$start         = $matches[0][ $i ][1];
-			$end           = $start + strlen( $matches[0][ $i ][0] );
-			$annotation_id = $matches[1][ $i ][0];
-			$item_id       = $matches[2][ $i ][0];
-			$text          = $matches[3][ $i ][0];
-
-			$annotation               = new StdClass;
-			$annotation->annotationId = $annotation_id;
-			$annotation->start        = $start;
-			$annotation->end          = $end;
-			$annotation->text         = $text;
-
-			$entity_match                = new StdClass;
-			$entity_match->confidence    = 100;
-			$entity_match->entityId      = $item_id;
-			$annotation->entityMatches[] = $entity_match;
-
-			$carry['annotations'][ $annotation_id ] = $annotation;
-			$carry['occurrences'][ $item_id ][]     = $annotation_id;
-
-			return $carry;
-		}, array( 'annotations' => array(), 'occurrences' => array(), ) );
-
-		$annotations = $parse_data['annotations'];
-		$occurrences = $parse_data['occurrences'];
-
-		foreach ( array_keys( $occurrences ) as $item_id ) {
-
-			// If the entity isn't there, add it.
-			if ( ! isset( $this->json->entities->{$item_id} ) ) {
-				$entity = $this->get_local_entity( $item_id );
-
-				// Entity not found in the local vocabulary, continue to the next one.
-				if ( false === $entity ) {
-					continue;
-				}
-
-				$this->json->entities->{$item_id} = $entity;
-			}
-		}
-
-		// Here we're adding back some data structures required by the client-side code.
-		//
-		// We're adding:
-		//  1. the .entities[entity_id].occurrences array with the annotations' ids.
-		//  2. the .entities[entity_id].annotations[annotation_id] = { id: annotation_id } map.
-		//
-		// Before 3.23.0 this was done by the client-side code located in src/coffee/editpost-widget/app.services.AnalysisService.coffee
-		// function `preselect`, which was called by src/coffee/editpost-widget/app.services.EditorService.coffee in
-		// `embedAnalysis`.
-		foreach ( $this->json->entities as $id => $entity ) {
-			$this->json->entities->{$id}->occurrences = isset( $occurrences[ $id ] ) ? $occurrences[ $id ] : array();;
-
-			foreach ( $this->json->entities->{$id}->occurrences as $annotation_id ) {
-				$this->json->entities->{$id}->annotations[ $annotation_id ] = array(
-					'id' => $annotation_id,
-				);
-			}
-		}
-
-		// Add the missing annotations. This allows the analysis response to work also if we didn't receive results
-		// from the analysis API.
-		foreach ( $annotations as $annotation_id => $annotation ) {
-
-			if ( ! isset( $this->json->annotations->{$annotation_id} ) ) {
-				$this->json->annotations->{$annotation_id} = $annotation;
-			}
-
-		}
-
-		return $this;
-	}
-
-	private function get_local_entity( $uri ) {
-
-		$entity = $this->entity_uri_service->get_entity( $uri );
-
-		if ( null === $entity ) {
-			return false;
-		}
-
-		$type   = $this->entity_type_service->get( $entity->ID );
-		$images = $this->post_image_storage->get( $entity->ID );
-
-		return (object) array(
-			'id'          => $uri,
-			'label'       => $entity->post_title,
-			'description' => $entity->post_content,
-			'sameAs'      => wl_schema_get_value( $entity->ID, 'sameAs' ),
-			'mainType'    => str_replace( 'wl-', '', $type['css_class'] ),
-			'types'       => wl_get_entity_rdf_types( $entity->ID ),
-			'images'      => $images,
-		);
-	}
-
-	/**
-	 * Return the JSON response.
-	 *
-	 * @return mixed The JSON response.
-	 * @since 3.24.2
-	 */
-	public function get_json() {
-
-		return $this->json;
-	}
-
-	/**
-	 * Get the string representation of the JSON.
-	 *
-	 * @return false|string The string representation or false in case of error.
-	 */
-	public function to_string() {
-
-		// Add the `JSON_UNESCAPED_UNICODE` only for PHP 5.4+.
-		$options = ( version_compare( PHP_VERSION, '5.4', '>=' )
-			? 256 : 0 );
-
-		return wp_json_encode( $this->json, $options );
-	}
-
-	/**
-	 * Create an Analysis_Response_Ops instance given the provided JSON structure.
-	 *
-	 * @param mixed $json The JSON structure.
-	 *
-	 * @return Analysis_Response_Ops A new Analysis_Response_Ops instance.
-	 */
-	public static function create( $json ) {
-
-		return new static(
-			\Wordlift_Entity_Uri_Service::get_instance(),
-			\Wordlift_Entity_Service::get_instance(),
-			\Wordlift_Entity_Type_Service::get_instance(),
-			\Wordlift_Storage_Factory::get_instance()->post_images(),
-			$json );
-	}
-
-	/**
-	 * Create an Analysis_Response_Ops instance given the provided http response.
-	 *
-	 * @param array $response {
-	 *
-	 * @type string $body The response body.
-	 * }
-	 *
-	 * @return Analysis_Response_Ops A new Analysis_Response_Ops instance.
-	 * @throws \Exception if the provided response doesn't contain a `body` element.
-	 */
-	public static function create_with_response( $response ) {
-
-		if ( ! isset( $response['body'] ) ) {
-			throw new \Exception( "`body` is required in response." );
-		}
-
-		return static::create( json_decode( $response['body'] ) );
-	}
+    /**
+     * The analysis response json.
+     *
+     * @since 3.21.5
+     * @access private
+     * @var mixed $json Holds the analysis response json.
+     */
+    private $json;
+
+    /**
+     * Holds the {@link Wordlift_Entity_Uri_Service}.
+     *
+     * @since 3.21.5
+     * @access private
+     * @var \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service} instance.
+     */
+    private $entity_uri_service;
+
+    private $entity_service;
+
+    /**
+     * @var \Wordlift_Entity_Type_Service
+     */
+    private $entity_type_service;
+    /**
+     * @var \Wordlift_Post_Image_Storage
+     */
+    private $post_image_storage;
+
+    /**
+     * Analysis_Response_Ops constructor.
+     *
+     * @param \Wordlift_Entity_Uri_Service $entity_uri_service The {@link Wordlift_Entity_Uri_Service}.
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service}.
+     * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service}.
+     * @param \Wordlift_Post_Image_Storage $post_image_storage A {@link Wordlift_Post_Image_Storage} instance.
+     * @param mixed $json The analysis response json.
+     *
+     * @since 3.21.5
+     */
+    public function __construct( $entity_uri_service, $entity_service, $entity_type_service, $post_image_storage, $json ) {
+
+        $this->json                = $json;
+        $this->entity_uri_service  = $entity_uri_service;
+        $this->entity_service      = $entity_service;
+        $this->entity_type_service = $entity_type_service;
+        $this->post_image_storage  = $post_image_storage;
+
+    }
+
+    /**
+     * Switches remote entities, i.e. entities with id outside the local dataset, to local entities.
+     *
+     * The function takes all the entities that have an id which is not local. For each remote entity, a list of URIs
+     * is built comprising the entity id and the sameAs. Then a query is issued in the local database to find potential
+     * matches from the local vocabulary.
+     *
+     * If found, the entity id is swapped with the local id and the remote id is added to the sameAs.
+     *
+     * @return Analysis_Response_Ops The current Analysis_Response_Ops instance.
+     */
+    public function make_entities_local() {
+
+        if ( ! isset( $this->json->entities ) ) {
+            return $this;
+        }
+
+        // Get the URIs.
+        $uris = array_keys( get_object_vars( $this->json->entities ) );
+
+        // Filter only the external URIs.
+        $entity_uri_service = $this->entity_uri_service;
+        $external_uris      = array_filter( $uris, function ( $item ) use ( $entity_uri_service ) {
+            return ! $entity_uri_service->is_internal( $item );
+        } );
+
+        // Preload the URIs.
+        $entity_uri_service->preload_uris( $external_uris );
+
+        $mappings = array();
+        foreach ( $external_uris as $external_uri ) {
+            $entity = $entity_uri_service->get_entity( $external_uri );
+            if ( null !== $entity ) {
+
+                // Get the internal URI.
+                $internal_uri              = $this->entity_service->get_uri( $entity->ID );
+                $mappings[ $external_uri ] = $internal_uri;
+            }
+        }
+
+        foreach ( $mappings as $external_uri => $internal_uri ) {
+
+            // Move the data from the external URI to the internal URI.
+            if ( ! isset( $this->json->entities->{$internal_uri} ) ) {
+                $this->json->entities->{$internal_uri} = $this->json->entities->{$external_uri};
+            }
+
+            // Ensure sameAs is an array.
+            if ( ! isset( $this->json->entities->{$internal_uri}->sameAs )
+                 || ! is_array( $this->json->entities->{$internal_uri}->sameAs ) ) {
+                $this->json->entities->{$internal_uri}->sameAs = array();
+            }
+
+            // Add the external URI as sameAs.
+            $this->json->entities->{$internal_uri}->sameAs[] = $external_uri;
+
+            // Finally remove the external URI.
+            unset( $this->json->entities->{$external_uri} );
+        }
+
+        if ( isset( $this->json->annotations ) ) {
+            foreach ( $this->json->annotations as $key => $annotation ) {
+                if ( isset( $annotation->entityMatches ) ) {
+                    foreach ( $annotation->entityMatches as $match ) {
+                        if ( isset( $match->entityId ) && isset( $mappings[ $match->entityId ] ) ) {
+                            $match->entityId = $mappings[ $match->entityId ];
+                        }
+                    }
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add occurrences by parsing the provided html content.
+     *
+     * @param string $content The html content with annotations.
+     *
+     * @return Analysis_Response_Ops The {@link Analysis_Response_Ops} instance.
+     *
+     * @since 3.23.7 refactor the regex pattern to take into account that there might be css classes between textannotation
+     *  and disambiguated.
+     *
+     * @link https://github.com/insideout10/wordlift-plugin/issues/1001
+     */
+    public function add_occurrences( $content ) {
+
+        // Try to get all the disambiguated annotations and bail out if an error occurs.
+        if ( false === preg_match_all(
+                '|<span\s+id="([^"]+)"\s+class="textannotation\s+(?:\S+\s+)?disambiguated(?=[\s"])[^"]*"\s+itemid="([^"]*)">(.*?)</span>|',
+                $content,
+                $matches,
+                PREG_OFFSET_CAPTURE
+            ) ) {
+            return $this;
+        }
+
+        if ( empty( $matches ) ) {
+            return $this;
+        }
+
+        $parse_data = array_reduce( range( 0, count( $matches[1] ) - 1 ), function ( $carry, $i ) use ( $matches ) {
+            if ( empty( $matches[0] ) ) {
+                return $carry;
+            }
+
+            $start         = $matches[0][ $i ][1];
+            $end           = $start + strlen( $matches[0][ $i ][0] );
+            $annotation_id = $matches[1][ $i ][0];
+            $item_id       = $matches[2][ $i ][0];
+            $text          = $matches[3][ $i ][0];
+
+            $annotation               = new StdClass;
+            $annotation->annotationId = $annotation_id;
+            $annotation->start        = $start;
+            $annotation->end          = $end;
+            $annotation->text         = $text;
+
+            $entity_match                = new StdClass;
+            $entity_match->confidence    = 100;
+            $entity_match->entityId      = $item_id;
+            $annotation->entityMatches[] = $entity_match;
+
+            $carry['annotations'][ $annotation_id ] = $annotation;
+            $carry['occurrences'][ $item_id ][]     = $annotation_id;
+
+            return $carry;
+        }, array( 'annotations' => array(), 'occurrences' => array(), ) );
+
+        $annotations = $parse_data['annotations'];
+        $occurrences = $parse_data['occurrences'];
+
+        foreach ( array_keys( $occurrences ) as $item_id ) {
+
+            // If the entity isn't there, add it.
+            if ( ! isset( $this->json->entities->{$item_id} ) ) {
+                $entity = $this->get_local_entity( $item_id );
+
+                // Entity not found in the local vocabulary, continue to the next one.
+                if ( false === $entity ) {
+                    continue;
+                }
+
+                $this->json->entities->{$item_id} = $entity;
+            }
+        }
+
+        // Here we're adding back some data structures required by the client-side code.
+        //
+        // We're adding:
+        //  1. the .entities[entity_id].occurrences array with the annotations' ids.
+        //  2. the .entities[entity_id].annotations[annotation_id] = { id: annotation_id } map.
+        //
+        // Before 3.23.0 this was done by the client-side code located in src/coffee/editpost-widget/app.services.AnalysisService.coffee
+        // function `preselect`, which was called by src/coffee/editpost-widget/app.services.EditorService.coffee in
+        // `embedAnalysis`.
+        foreach ( $this->json->entities as $id => $entity ) {
+            $this->json->entities->{$id}->occurrences = isset( $occurrences[ $id ] ) ? $occurrences[ $id ] : array();;
+
+            foreach ( $this->json->entities->{$id}->occurrences as $annotation_id ) {
+                $this->json->entities->{$id}->annotations[ $annotation_id ] = array(
+                    'id' => $annotation_id,
+                );
+            }
+        }
+
+        // Add the missing annotations. This allows the analysis response to work also if we didn't receive results
+        // from the analysis API.
+        foreach ( $annotations as $annotation_id => $annotation ) {
+
+            if ( ! isset( $this->json->annotations->{$annotation_id} ) ) {
+                $this->json->annotations->{$annotation_id} = $annotation;
+            }
+
+        }
+
+        return $this;
+    }
+
+    private function get_local_entity( $uri ) {
+
+        $entity = $this->entity_uri_service->get_entity( $uri );
+
+        if ( null === $entity ) {
+            return false;
+        }
+
+        $type   = $this->entity_type_service->get( $entity->ID );
+        $images = $this->post_image_storage->get( $entity->ID );
+
+        return (object) array(
+            'id'          => $uri,
+            'label'       => $entity->post_title,
+            'description' => $entity->post_content,
+            'sameAs'      => wl_schema_get_value( $entity->ID, 'sameAs' ),
+            'mainType'    => str_replace( 'wl-', '', $type['css_class'] ),
+            'types'       => wl_get_entity_rdf_types( $entity->ID ),
+            'images'      => $images,
+        );
+    }
+
+    /**
+     * Return the JSON response.
+     *
+     * @return mixed The JSON response.
+     * @since 3.24.2
+     */
+    public function get_json() {
+
+        return $this->json;
+    }
+
+    /**
+     * Get the string representation of the JSON.
+     *
+     * @return false|string The string representation or false in case of error.
+     */
+    public function to_string() {
+
+        // Add the `JSON_UNESCAPED_UNICODE` only for PHP 5.4+.
+        $options = ( version_compare( PHP_VERSION, '5.4', '>=' )
+            ? 256 : 0 );
+
+        return wp_json_encode( $this->json, $options );
+    }
+
+    /**
+     * Create an Analysis_Response_Ops instance given the provided JSON structure.
+     *
+     * @param mixed $json The JSON structure.
+     *
+     * @return Analysis_Response_Ops A new Analysis_Response_Ops instance.
+     */
+    public static function create( $json ) {
+
+        return new static(
+            \Wordlift_Entity_Uri_Service::get_instance(),
+            \Wordlift_Entity_Service::get_instance(),
+            \Wordlift_Entity_Type_Service::get_instance(),
+            \Wordlift_Storage_Factory::get_instance()->post_images(),
+            $json );
+    }
+
+    /**
+     * Create an Analysis_Response_Ops instance given the provided http response.
+     *
+     * @param array $response {
+     *
+     * @type string $body The response body.
+     * }
+     *
+     * @return Analysis_Response_Ops A new Analysis_Response_Ops instance.
+     * @throws \Exception if the provided response doesn't contain a `body` element.
+     */
+    public static function create_with_response( $response ) {
+
+        if ( ! isset( $response['body'] ) ) {
+            throw new \Exception( "`body` is required in response." );
+        }
+
+        return static::create( json_decode( $response['body'] ) );
+    }
 
 }

Spacing +62 added lines, -62 removed lines

@@ -47,7 +47,7 @@ 
 	 *
 	 * @since 3.21.5
 	 */
-	public function __construct( $entity_uri_service, $entity_service, $entity_type_service, $post_image_storage, $json ) {
+	public function __construct($entity_uri_service, $entity_service, $entity_type_service, $post_image_storage, $json) {
 
 		$this->json                = $json;
 		$this->entity_uri_service  = $entity_uri_service;
@@ -70,43 +70,43 @@ 
 	 */
 	public function make_entities_local() {
 
-		if ( ! isset( $this->json->entities ) ) {
+		if ( ! isset($this->json->entities)) {
 			return $this;
 		}
 
 		// Get the URIs.
-		$uris = array_keys( get_object_vars( $this->json->entities ) );
+		$uris = array_keys(get_object_vars($this->json->entities));
 
 		// Filter only the external URIs.
 		$entity_uri_service = $this->entity_uri_service;
-		$external_uris      = array_filter( $uris, function ( $item ) use ( $entity_uri_service ) {
-			return ! $entity_uri_service->is_internal( $item );
+		$external_uris      = array_filter($uris, function($item) use ($entity_uri_service) {
+			return ! $entity_uri_service->is_internal($item);
 		} );
 
 		// Preload the URIs.
-		$entity_uri_service->preload_uris( $external_uris );
+		$entity_uri_service->preload_uris($external_uris);
 
 		$mappings = array();
-		foreach ( $external_uris as $external_uri ) {
-			$entity = $entity_uri_service->get_entity( $external_uri );
-			if ( null !== $entity ) {
+		foreach ($external_uris as $external_uri) {
+			$entity = $entity_uri_service->get_entity($external_uri);
+			if (null !== $entity) {
 
 				// Get the internal URI.
-				$internal_uri              = $this->entity_service->get_uri( $entity->ID );
-				$mappings[ $external_uri ] = $internal_uri;
+				$internal_uri              = $this->entity_service->get_uri($entity->ID);
+				$mappings[$external_uri] = $internal_uri;
 			}
 		}
 
-		foreach ( $mappings as $external_uri => $internal_uri ) {
+		foreach ($mappings as $external_uri => $internal_uri) {
 
 			// Move the data from the external URI to the internal URI.
-			if ( ! isset( $this->json->entities->{$internal_uri} ) ) {
+			if ( ! isset($this->json->entities->{$internal_uri} )) {
 				$this->json->entities->{$internal_uri} = $this->json->entities->{$external_uri};
 			}
 
 			// Ensure sameAs is an array.
-			if ( ! isset( $this->json->entities->{$internal_uri}->sameAs )
-			     || ! is_array( $this->json->entities->{$internal_uri}->sameAs ) ) {
+			if ( ! isset($this->json->entities->{$internal_uri}->sameAs)
+			     || ! is_array($this->json->entities->{$internal_uri}->sameAs)) {
 				$this->json->entities->{$internal_uri}->sameAs = array();
 			}
 
@@ -114,15 +114,15 @@ 
 			$this->json->entities->{$internal_uri}->sameAs[] = $external_uri;
 
 			// Finally remove the external URI.
-			unset( $this->json->entities->{$external_uri} );
+			unset($this->json->entities->{$external_uri} );
 		}
 
-		if ( isset( $this->json->annotations ) ) {
-			foreach ( $this->json->annotations as $key => $annotation ) {
-				if ( isset( $annotation->entityMatches ) ) {
-					foreach ( $annotation->entityMatches as $match ) {
-						if ( isset( $match->entityId ) && isset( $mappings[ $match->entityId ] ) ) {
-							$match->entityId = $mappings[ $match->entityId ];
+		if (isset($this->json->annotations)) {
+			foreach ($this->json->annotations as $key => $annotation) {
+				if (isset($annotation->entityMatches)) {
+					foreach ($annotation->entityMatches as $match) {
+						if (isset($match->entityId) && isset($mappings[$match->entityId])) {
+							$match->entityId = $mappings[$match->entityId];
 						}
 					}
 				}
@@ -144,32 +144,32 @@ 
 	 *
 	 * @link https://github.com/insideout10/wordlift-plugin/issues/1001
 	 */
-	public function add_occurrences( $content ) {
+	public function add_occurrences($content) {
 
 		// Try to get all the disambiguated annotations and bail out if an error occurs.
-		if ( false === preg_match_all(
+		if (false === preg_match_all(
 				'|<span\s+id="([^"]+)"\s+class="textannotation\s+(?:\S+\s+)?disambiguated(?=[\s"])[^"]*"\s+itemid="([^"]*)">(.*?)</span>|',
 				$content,
 				$matches,
 				PREG_OFFSET_CAPTURE
-			) ) {
+			)) {
 			return $this;
 		}
 
-		if ( empty( $matches ) ) {
+		if (empty($matches)) {
 			return $this;
 		}
 
-		$parse_data = array_reduce( range( 0, count( $matches[1] ) - 1 ), function ( $carry, $i ) use ( $matches ) {
-			if ( empty( $matches[0] ) ) {
+		$parse_data = array_reduce(range(0, count($matches[1]) - 1), function($carry, $i) use ($matches) {
+			if (empty($matches[0])) {
 				return $carry;
 			}
 
-			$start         = $matches[0][ $i ][1];
-			$end           = $start + strlen( $matches[0][ $i ][0] );
-			$annotation_id = $matches[1][ $i ][0];
-			$item_id       = $matches[2][ $i ][0];
-			$text          = $matches[3][ $i ][0];
+			$start         = $matches[0][$i][1];
+			$end           = $start + strlen($matches[0][$i][0]);
+			$annotation_id = $matches[1][$i][0];
+			$item_id       = $matches[2][$i][0];
+			$text          = $matches[3][$i][0];
 
 			$annotation               = new StdClass;
 			$annotation->annotationId = $annotation_id;
@@ -182,23 +182,23 @@ 
 			$entity_match->entityId      = $item_id;
 			$annotation->entityMatches[] = $entity_match;
 
-			$carry['annotations'][ $annotation_id ] = $annotation;
-			$carry['occurrences'][ $item_id ][]     = $annotation_id;
+			$carry['annotations'][$annotation_id] = $annotation;
+			$carry['occurrences'][$item_id][]     = $annotation_id;
 
 			return $carry;
-		}, array( 'annotations' => array(), 'occurrences' => array(), ) );
+		}, array('annotations' => array(), 'occurrences' => array(),));
 
 		$annotations = $parse_data['annotations'];
 		$occurrences = $parse_data['occurrences'];
 
-		foreach ( array_keys( $occurrences ) as $item_id ) {
+		foreach (array_keys($occurrences) as $item_id) {
 
 			// If the entity isn't there, add it.
-			if ( ! isset( $this->json->entities->{$item_id} ) ) {
-				$entity = $this->get_local_entity( $item_id );
+			if ( ! isset($this->json->entities->{$item_id} )) {
+				$entity = $this->get_local_entity($item_id);
 
 				// Entity not found in the local vocabulary, continue to the next one.
-				if ( false === $entity ) {
+				if (false === $entity) {
 					continue;
 				}
 
@@ -215,11 +215,11 @@ 
 		// Before 3.23.0 this was done by the client-side code located in src/coffee/editpost-widget/app.services.AnalysisService.coffee
 		// function `preselect`, which was called by src/coffee/editpost-widget/app.services.EditorService.coffee in
 		// `embedAnalysis`.
-		foreach ( $this->json->entities as $id => $entity ) {
-			$this->json->entities->{$id}->occurrences = isset( $occurrences[ $id ] ) ? $occurrences[ $id ] : array();;
+		foreach ($this->json->entities as $id => $entity) {
+			$this->json->entities->{$id}->occurrences = isset($occurrences[$id]) ? $occurrences[$id] : array(); ;
 
-			foreach ( $this->json->entities->{$id}->occurrences as $annotation_id ) {
-				$this->json->entities->{$id}->annotations[ $annotation_id ] = array(
+			foreach ($this->json->entities->{$id}->occurrences as $annotation_id) {
+				$this->json->entities->{$id}->annotations[$annotation_id] = array(
 					'id' => $annotation_id,
 				);
 			}
@@ -227,9 +227,9 @@ 
 
 		// Add the missing annotations. This allows the analysis response to work also if we didn't receive results
 		// from the analysis API.
-		foreach ( $annotations as $annotation_id => $annotation ) {
+		foreach ($annotations as $annotation_id => $annotation) {
 
-			if ( ! isset( $this->json->annotations->{$annotation_id} ) ) {
+			if ( ! isset($this->json->annotations->{$annotation_id} )) {
 				$this->json->annotations->{$annotation_id} = $annotation;
 			}
 
@@ -238,24 +238,24 @@ 
 		return $this;
 	}
 
-	private function get_local_entity( $uri ) {
+	private function get_local_entity($uri) {
 
-		$entity = $this->entity_uri_service->get_entity( $uri );
+		$entity = $this->entity_uri_service->get_entity($uri);
 
-		if ( null === $entity ) {
+		if (null === $entity) {
 			return false;
 		}
 
-		$type   = $this->entity_type_service->get( $entity->ID );
-		$images = $this->post_image_storage->get( $entity->ID );
+		$type   = $this->entity_type_service->get($entity->ID);
+		$images = $this->post_image_storage->get($entity->ID);
 
 		return (object) array(
 			'id'          => $uri,
 			'label'       => $entity->post_title,
 			'description' => $entity->post_content,
-			'sameAs'      => wl_schema_get_value( $entity->ID, 'sameAs' ),
-			'mainType'    => str_replace( 'wl-', '', $type['css_class'] ),
-			'types'       => wl_get_entity_rdf_types( $entity->ID ),
+			'sameAs'      => wl_schema_get_value($entity->ID, 'sameAs'),
+			'mainType'    => str_replace('wl-', '', $type['css_class']),
+			'types'       => wl_get_entity_rdf_types($entity->ID),
 			'images'      => $images,
 		);
 	}
@@ -279,10 +279,10 @@ 
 	public function to_string() {
 
 		// Add the `JSON_UNESCAPED_UNICODE` only for PHP 5.4+.
-		$options = ( version_compare( PHP_VERSION, '5.4', '>=' )
-			? 256 : 0 );
+		$options = (version_compare(PHP_VERSION, '5.4', '>=')
+			? 256 : 0);
 
-		return wp_json_encode( $this->json, $options );
+		return wp_json_encode($this->json, $options);
 	}
 
 	/**
@@ -292,7 +292,7 @@ 
 	 *
 	 * @return Analysis_Response_Ops A new Analysis_Response_Ops instance.
 	 */
-	public static function create( $json ) {
+	public static function create($json) {
 
 		return new static(
 			\Wordlift_Entity_Uri_Service::get_instance(),
@@ -313,13 +313,13 @@ 
 	 * @return Analysis_Response_Ops A new Analysis_Response_Ops instance.
 	 * @throws \Exception if the provided response doesn't contain a `body` element.
 	 */
-	public static function create_with_response( $response ) {
+	public static function create_with_response($response) {
 
-		if ( ! isset( $response['body'] ) ) {
-			throw new \Exception( "`body` is required in response." );
+		if ( ! isset($response['body'])) {
+			throw new \Exception("`body` is required in response.");
 		}
 
-		return static::create( json_decode( $response['body'] ) );
+		return static::create(json_decode($response['body']));
 	}
 
 }

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

Indentation +9 added lines, -9 removed lines

@@ -4,17 +4,17 @@
 
 abstract class Abstract_Autocomplete_Service implements Autocomplete_Service {
 
-	protected function filter( $results, $excludes ) {
+    protected function filter( $results, $excludes ) {
 
-		$excludes_array = (array) $excludes;
+        $excludes_array = (array) $excludes;
 
-		return array_filter( $results, function ( $item ) use ( $excludes_array ) {
+        return array_filter( $results, function ( $item ) use ( $excludes_array ) {
 
-			return 0 === count( array_intersect(
-					array_merge( (array) $item['id'], $item['sameAss'] ),
-					$excludes_array
-				) );
-		} );
-	}
+            return 0 === count( array_intersect(
+                    array_merge( (array) $item['id'], $item['sameAss'] ),
+                    $excludes_array
+                ) );
+        } );
+    }
 
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -4,16 +4,16 @@
 
 abstract class Abstract_Autocomplete_Service implements Autocomplete_Service {
 
-	protected function filter( $results, $excludes ) {
+	protected function filter($results, $excludes) {
 
 		$excludes_array = (array) $excludes;
 
-		return array_filter( $results, function ( $item ) use ( $excludes_array ) {
+		return array_filter($results, function($item) use ($excludes_array) {
 
-			return 0 === count( array_intersect(
-					array_merge( (array) $item['id'], $item['sameAss'] ),
+			return 0 === count(array_intersect(
+					array_merge((array) $item['id'], $item['sameAss']),
 					$excludes_array
-				) );
+				));
 		} );
 	}
 

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

Indentation +10 added lines, -10 removed lines

@@ -11,15 +11,15 @@
 
 interface Autocomplete_Service {
 
-	/**
-	 * Query the service for the specified data.
-	 *
-	 * @param string $query The query.
-	 * @param string $scope The scope.
-	 * @param string|string[] $excludes URLs to exclude.
-	 *
-	 * @return array An array of results.
-	 */
-	public function query( $query, $scope, $excludes );
+    /**
+     * Query the service for the specified data.
+     *
+     * @param string $query The query.
+     * @param string $scope The scope.
+     * @param string|string[] $excludes URLs to exclude.
+     *
+     * @return array An array of results.
+     */
+    public function query( $query, $scope, $excludes );
 
 }

Spacing +1 added lines, -1 removed lines

@@ -20,6 +20,6 @@
 	 *
 	 * @return array An array of results.
 	 */
-	public function query( $query, $scope, $excludes );
+	public function query($query, $scope, $excludes);
 
 }

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

Indentation +37 added lines, -37 removed lines

@@ -14,42 +14,42 @@
 
 class Local_Autocomplete_Service extends Abstract_Autocomplete_Service {
 
-	/**
-	 * @inheritDoc
-	 */
-	public function query( $query, $scope, $excludes ) {
-
-		$args = Wordlift_Entity_Service::add_criterias( array(
-			'numberposts'         => 50,
-			'post_status'         => 'any',
-			's'                   => $query,
-			'ignore_sticky_posts' => true,
-			'suppress_filters'    => true,
-		) );
-
-		$posts = get_posts( $args );
-
-		$results = array_map( function ( $item ) {
-
-			$entity_service = Wordlift_Entity_Service::get_instance();
-			$uri            = $entity_service->get_uri( $item->ID );
-
-			return array(
-				'id'           => $uri,
-				'label'        => array( $item->post_title ),
-				'labels'       => $entity_service->get_alternative_labels( $item->ID ),
-				'descriptions' => array( Wordlift_Post_Excerpt_Helper::get_text_excerpt( $item ) ),
-				'scope'        => 'local',
-				'sameAss'      => get_post_meta( $item->ID, \Wordlift_Schema_Service::FIELD_SAME_AS ),
-				// The following properties are less relevant because we're linking entities that exist already in the
-				// vocabulary. That's why we don't make an effort to load the real data.
-				'types'        => array( 'http://schema.org/Thing' ),
-				'urls'         => array(),
-				'images'       => array(),
-			);
-		}, $posts );
-
-		return $this->filter( $results, $excludes );
-	}
+    /**
+     * @inheritDoc
+     */
+    public function query( $query, $scope, $excludes ) {
+
+        $args = Wordlift_Entity_Service::add_criterias( array(
+            'numberposts'         => 50,
+            'post_status'         => 'any',
+            's'                   => $query,
+            'ignore_sticky_posts' => true,
+            'suppress_filters'    => true,
+        ) );
+
+        $posts = get_posts( $args );
+
+        $results = array_map( function ( $item ) {
+
+            $entity_service = Wordlift_Entity_Service::get_instance();
+            $uri            = $entity_service->get_uri( $item->ID );
+
+            return array(
+                'id'           => $uri,
+                'label'        => array( $item->post_title ),
+                'labels'       => $entity_service->get_alternative_labels( $item->ID ),
+                'descriptions' => array( Wordlift_Post_Excerpt_Helper::get_text_excerpt( $item ) ),
+                'scope'        => 'local',
+                'sameAss'      => get_post_meta( $item->ID, \Wordlift_Schema_Service::FIELD_SAME_AS ),
+                // The following properties are less relevant because we're linking entities that exist already in the
+                // vocabulary. That's why we don't make an effort to load the real data.
+                'types'        => array( 'http://schema.org/Thing' ),
+                'urls'         => array(),
+                'images'       => array(),
+            );
+        }, $posts );
+
+        return $this->filter( $results, $excludes );
+    }
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -17,39 +17,39 @@
 	/**
 	 * @inheritDoc
 	 */
-	public function query( $query, $scope, $excludes ) {
+	public function query($query, $scope, $excludes) {
 
-		$args = Wordlift_Entity_Service::add_criterias( array(
+		$args = Wordlift_Entity_Service::add_criterias(array(
 			'numberposts'         => 50,
 			'post_status'         => 'any',
 			's'                   => $query,
 			'ignore_sticky_posts' => true,
 			'suppress_filters'    => true,
-		) );
+		));
 
-		$posts = get_posts( $args );
+		$posts = get_posts($args);
 
-		$results = array_map( function ( $item ) {
+		$results = array_map(function($item) {
 
 			$entity_service = Wordlift_Entity_Service::get_instance();
-			$uri            = $entity_service->get_uri( $item->ID );
+			$uri            = $entity_service->get_uri($item->ID);
 
 			return array(
 				'id'           => $uri,
-				'label'        => array( $item->post_title ),
-				'labels'       => $entity_service->get_alternative_labels( $item->ID ),
-				'descriptions' => array( Wordlift_Post_Excerpt_Helper::get_text_excerpt( $item ) ),
+				'label'        => array($item->post_title),
+				'labels'       => $entity_service->get_alternative_labels($item->ID),
+				'descriptions' => array(Wordlift_Post_Excerpt_Helper::get_text_excerpt($item)),
 				'scope'        => 'local',
-				'sameAss'      => get_post_meta( $item->ID, \Wordlift_Schema_Service::FIELD_SAME_AS ),
+				'sameAss'      => get_post_meta($item->ID, \Wordlift_Schema_Service::FIELD_SAME_AS),
 				// The following properties are less relevant because we're linking entities that exist already in the
 				// vocabulary. That's why we don't make an effort to load the real data.
-				'types'        => array( 'http://schema.org/Thing' ),
+				'types'        => array('http://schema.org/Thing'),
 				'urls'         => array(),
 				'images'       => array(),
 			);
-		}, $posts );
+		}, $posts);
 
-		return $this->filter( $results, $excludes );
+		return $this->filter($results, $excludes);
 	}
 
 }
\ No newline at end of file

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

Indentation +107 added lines, -107 removed lines

@@ -13,112 +13,112 @@
 
 class Linked_Data_Autocomplete_Service implements Autocomplete_Service {
 
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Class_Wordlift_Autocomplete_Service} instance.
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 */
-	public function __construct( $configuration_service ) {
-		$this->configuration_service = $configuration_service;
-		$this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
-	}
-
-	/**
-	 * Make request to external API and return the response.
-	 *
-	 * @param string $query The search string.
-	 * @param string $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
-	 *                      in Wikipedia. By default is "cloud".
-	 * @param array|string $exclude The exclude parameter string.
-	 *
-	 * @return array $response The API response.
-	 * @since 3.15.0
-	 *
-	 */
-	public function query( $query, $scope = 'cloud', $exclude = '' ) {
-		$url = $this->build_request_url( $query, $exclude, $scope );
-
-		// Return the response.
-		$response = wp_remote_get( $url, array(
-			'timeout' => 30
-		) );
-
-		// If the response is valid, then send the suggestions.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
-			// Echo the response.
-			return json_decode( wp_remote_retrieve_body( $response ), true );
-		} else {
-			// Default error message.
-			$error_message = 'Something went wrong.';
-
-			// Get the real error message if there is WP_Error.
-			if ( is_wp_error( $response ) ) {
-				$error_message = $response->get_error_message();
-			}
-
-			$this->log->error( $error_message );
-
-			return array();
-		}
-	}
-
-	/**
-	 * Build the autocomplete url.
-	 *
-	 * @param string $query The search string.
-	 * @param array|string $exclude The exclude parameter.
-	 * @param string $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
-	 *                      in Wikipedia. By default is "cloud".
-	 *
-	 * @return string Built url.
-	 * @since 3.15.0
-	 *
-	 */
-	private function build_request_url( $query, $exclude, $scope ) {
-		$args = array(
-			'key'      => $this->configuration_service->get_key(),
-			'language' => $this->configuration_service->get_language_code(),
-			'query'    => $query,
-			'scope'    => $scope,
-			'limit'    => 10,
-		);
-
-		// Add args to URL.
-		$request_url = add_query_arg(
-			urlencode_deep( $args ),
-			$this->configuration_service->get_autocomplete_url()
-		);
-
-		// Add the exclude parameter.
-		if ( ! empty( $exclude ) ) {
-			foreach ( (array) $exclude as $item ) {
-				$request_url .= "&exclude=" . urlencode( $item );
-			}
-		}
-
-		// return the built url.
-		return $request_url;
-	}
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Class_Wordlift_Autocomplete_Service} instance.
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since 3.15.0
+     *
+     */
+    public function __construct( $configuration_service ) {
+        $this->configuration_service = $configuration_service;
+        $this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+    }
+
+    /**
+     * Make request to external API and return the response.
+     *
+     * @param string $query The search string.
+     * @param string $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
+     *                      in Wikipedia. By default is "cloud".
+     * @param array|string $exclude The exclude parameter string.
+     *
+     * @return array $response The API response.
+     * @since 3.15.0
+     *
+     */
+    public function query( $query, $scope = 'cloud', $exclude = '' ) {
+        $url = $this->build_request_url( $query, $exclude, $scope );
+
+        // Return the response.
+        $response = wp_remote_get( $url, array(
+            'timeout' => 30
+        ) );
+
+        // If the response is valid, then send the suggestions.
+        if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+            // Echo the response.
+            return json_decode( wp_remote_retrieve_body( $response ), true );
+        } else {
+            // Default error message.
+            $error_message = 'Something went wrong.';
+
+            // Get the real error message if there is WP_Error.
+            if ( is_wp_error( $response ) ) {
+                $error_message = $response->get_error_message();
+            }
+
+            $this->log->error( $error_message );
+
+            return array();
+        }
+    }
+
+    /**
+     * Build the autocomplete url.
+     *
+     * @param string $query The search string.
+     * @param array|string $exclude The exclude parameter.
+     * @param string $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
+     *                      in Wikipedia. By default is "cloud".
+     *
+     * @return string Built url.
+     * @since 3.15.0
+     *
+     */
+    private function build_request_url( $query, $exclude, $scope ) {
+        $args = array(
+            'key'      => $this->configuration_service->get_key(),
+            'language' => $this->configuration_service->get_language_code(),
+            'query'    => $query,
+            'scope'    => $scope,
+            'limit'    => 10,
+        );
+
+        // Add args to URL.
+        $request_url = add_query_arg(
+            urlencode_deep( $args ),
+            $this->configuration_service->get_autocomplete_url()
+        );
+
+        // Add the exclude parameter.
+        if ( ! empty( $exclude ) ) {
+            foreach ( (array) $exclude as $item ) {
+                $request_url .= "&exclude=" . urlencode( $item );
+            }
+        }
+
+        // return the built url.
+        return $request_url;
+    }
 
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -39,9 +39,9 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 		$this->configuration_service = $configuration_service;
-		$this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+		$this->log                   = Wordlift_Log_Service::get_logger('Wordlift_Autocomplete_Service');
 	}
 
 	/**
@@ -56,28 +56,28 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	public function query( $query, $scope = 'cloud', $exclude = '' ) {
-		$url = $this->build_request_url( $query, $exclude, $scope );
+	public function query($query, $scope = 'cloud', $exclude = '') {
+		$url = $this->build_request_url($query, $exclude, $scope);
 
 		// Return the response.
-		$response = wp_remote_get( $url, array(
+		$response = wp_remote_get($url, array(
 			'timeout' => 30
-		) );
+		));
 
 		// If the response is valid, then send the suggestions.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+		if ( ! is_wp_error($response) && 200 === (int) $response['response']['code']) {
 			// Echo the response.
-			return json_decode( wp_remote_retrieve_body( $response ), true );
+			return json_decode(wp_remote_retrieve_body($response), true);
 		} else {
 			// Default error message.
 			$error_message = 'Something went wrong.';
 
 			// Get the real error message if there is WP_Error.
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				$error_message = $response->get_error_message();
 			}
 
-			$this->log->error( $error_message );
+			$this->log->error($error_message);
 
 			return array();
 		}
@@ -95,7 +95,7 @@ 
 	 * @since 3.15.0
 	 *
 	 */
-	private function build_request_url( $query, $exclude, $scope ) {
+	private function build_request_url($query, $exclude, $scope) {
 		$args = array(
 			'key'      => $this->configuration_service->get_key(),
 			'language' => $this->configuration_service->get_language_code(),
@@ -106,14 +106,14 @@ 
 
 		// Add args to URL.
 		$request_url = add_query_arg(
-			urlencode_deep( $args ),
+			urlencode_deep($args),
 			$this->configuration_service->get_autocomplete_url()
 		);
 
 		// Add the exclude parameter.
-		if ( ! empty( $exclude ) ) {
-			foreach ( (array) $exclude as $item ) {
-				$request_url .= "&exclude=" . urlencode( $item );
+		if ( ! empty($exclude)) {
+			foreach ((array) $exclude as $item) {
+				$request_url .= "&exclude=".urlencode($item);
 			}
 		}
 

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

Indentation +22 added lines, -22 removed lines

@@ -5,34 +5,34 @@
 class All_Autocomplete_Service implements Autocomplete_Service {
 
 
-	/**
-	 * @var Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
-	 */
-	private $autocomplete_services;
+    /**
+     * @var Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
+     */
+    private $autocomplete_services;
 
-	/**
-	 * All_Autocomplete_Service constructor.
-	 *
-	 * @param Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
-	 */
-	public function __construct( $autocomplete_services ) {
+    /**
+     * All_Autocomplete_Service constructor.
+     *
+     * @param Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
+     */
+    public function __construct( $autocomplete_services ) {
 
-		$this->autocomplete_services = (array) $autocomplete_services;
-	}
+        $this->autocomplete_services = (array) $autocomplete_services;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function query( $query, $scope, $excludes ) {
+    /**
+     * {@inheritDoc}
+     */
+    public function query( $query, $scope, $excludes ) {
 
-		// Query each Autocomplete service and merge the results.
-		return array_reduce( $this->autocomplete_services, function ( $carry, $item ) use ( $query, $scope, $excludes ) {
+        // Query each Autocomplete service and merge the results.
+        return array_reduce( $this->autocomplete_services, function ( $carry, $item ) use ( $query, $scope, $excludes ) {
 
-			$results = $item->query( $query, $scope, $excludes );
+            $results = $item->query( $query, $scope, $excludes );
 
-			return array_merge( $carry, $results );
-		}, array() );
+            return array_merge( $carry, $results );
+        }, array() );
 
-	}
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
 	 *
 	 * @param Autocomplete_Service|Autocomplete_Service[] $autocomplete_services
 	 */
-	public function __construct( $autocomplete_services ) {
+	public function __construct($autocomplete_services) {
 
 		$this->autocomplete_services = (array) $autocomplete_services;
 	}
@@ -23,15 +23,15 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function query( $query, $scope, $excludes ) {
+	public function query($query, $scope, $excludes) {
 
 		// Query each Autocomplete service and merge the results.
-		return array_reduce( $this->autocomplete_services, function ( $carry, $item ) use ( $query, $scope, $excludes ) {
+		return array_reduce($this->autocomplete_services, function($carry, $item) use ($query, $scope, $excludes) {
 
-			$results = $item->query( $query, $scope, $excludes );
+			$results = $item->query($query, $scope, $excludes);
 
-			return array_merge( $carry, $results );
-		}, array() );
+			return array_merge($carry, $results);
+		}, array());
 
 	}