Skip to content

Commit

Permalink
Merge pull request #3671 from 10up/chore/remove-unused-alias
Browse files Browse the repository at this point in the history
Remove unnecessary class aliases
  • Loading branch information
felipeelia committed Sep 29, 2023
2 parents 2e4f9aa + fc084b5 commit 0834f7a
Show file tree
Hide file tree
Showing 47 changed files with 118 additions and 133 deletions.
2 changes: 1 addition & 1 deletion elasticpress.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

namespace ElasticPress;

use \WP_CLI as WP_CLI;
use \WP_CLI;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
2 changes: 1 addition & 1 deletion includes/classes/DeprecatedCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace ElasticPress;

use \WP_CLI as WP_CLI;
use \WP_CLI;

if ( ! defined( 'ABSPATH' ) ) {
// @codeCoverageIgnoreStart
Expand Down
4 changes: 2 additions & 2 deletions includes/classes/Elasticsearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace ElasticPress;

use ElasticPress\Utils as Utils;
use \WP_Error;
use ElasticPress\Indexables;
use \WP_Error as WP_Error;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
4 changes: 2 additions & 2 deletions includes/classes/Feature.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace ElasticPress;

use ElasticPress\FeatureRequirementsStatus as FeatureRequirementsStatus;
use ElasticPress\Utils as Utils;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
10 changes: 5 additions & 5 deletions includes/classes/Feature/Autosuggest/Autosuggest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

namespace ElasticPress\Feature\Autosuggest;

use ElasticPress\Feature as Feature;
use ElasticPress\Features as Features;
use ElasticPress\Utils as Utils;
use ElasticPress\FeatureRequirementsStatus as FeatureRequirementsStatus;
use ElasticPress\Indexables as Indexables;
use ElasticPress\Elasticsearch;
use ElasticPress\Feature;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Features;
use ElasticPress\Indexables;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
10 changes: 5 additions & 5 deletions includes/classes/Feature/Comments/Comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace ElasticPress\Feature\Comments;

use ElasticPress\Feature as Feature;
use ElasticPress\Indexables as Indexables;
use ElasticPress\Indexable as Indexable;
use ElasticPress\Features as Features;
use ElasticPress\FeatureRequirementsStatus as FeatureRequirementsStatus;
use ElasticPress\Feature;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Features;
use ElasticPress\Indexable;
use ElasticPress\Indexables;
use ElasticPress\Utils;

/**
Expand Down
6 changes: 1 addition & 5 deletions includes/classes/Feature/Comments/Widget.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,14 @@

namespace ElasticPress\Feature\Comments;

use \WP_Widget as WP_Widget;
use ElasticPress\Features as Features;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}

/**
* Search comment widget class
*/
class Widget extends WP_Widget {
class Widget extends \WP_Widget {

/**
* Initialize the widget
Expand Down
10 changes: 5 additions & 5 deletions includes/classes/Feature/Documents/Documents.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

namespace ElasticPress\Feature\Documents;

use ElasticPress\Feature as Feature;
use ElasticPress\Elasticsearch as Elasticsearch;
use ElasticPress\FeatureRequirementsStatus as FeatureRequirementsStatus;
use ElasticPress\Indexables as Indexables;
use ElasticPress\Utils as Utils;
use ElasticPress\Elasticsearch;
use ElasticPress\Feature;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Indexables;
use ElasticPress\Utils;

/**
* Documents feature class.
Expand Down
8 changes: 4 additions & 4 deletions includes/classes/Feature/Facets/Facets.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace ElasticPress\Feature\Facets;

use ElasticPress\Feature as Feature;
use ElasticPress\Features as Features;
use ElasticPress\Utils as Utils;
use ElasticPress\Indexables as Indexables;
use ElasticPress\Feature;
use ElasticPress\Features;
use ElasticPress\Indexables;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
2 changes: 1 addition & 1 deletion includes/classes/Feature/Facets/Types/Meta/Renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace ElasticPress\Feature\Facets\Types\Meta;

use ElasticPress\Features as Features;
use ElasticPress\Features;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace ElasticPress\Feature\Facets\Types\MetaRange;

use ElasticPress\Features as Features;
use ElasticPress\Features;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace ElasticPress\Feature\Facets\Types\PostType;

use ElasticPress\Features as Features;
use ElasticPress\Features;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
4 changes: 2 additions & 2 deletions includes/classes/Feature/Facets/Types/Taxonomy/Renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

namespace ElasticPress\Feature\Facets\Types\Taxonomy;

use ElasticPress\Features as Features;
use ElasticPress\Utils as Utils;
use ElasticPress\Features;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
5 changes: 2 additions & 3 deletions includes/classes/Feature/Facets/Types/Taxonomy/Widget.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

namespace ElasticPress\Feature\Facets\Types\Taxonomy;

use \WP_Widget as WP_Widget;
use ElasticPress\Features as Features;
use ElasticPress\Features;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand All @@ -17,7 +16,7 @@
/**
* Facets widget class
*/
class Widget extends WP_Widget {
class Widget extends \WP_Widget {
/**
* The renderer instance.
*
Expand Down
10 changes: 5 additions & 5 deletions includes/classes/Feature/InstantResults/InstantResults.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

namespace ElasticPress\Feature\InstantResults;

use ElasticPress\Elasticsearch as Elasticsearch;
use ElasticPress\Feature as Feature;
use ElasticPress\Elasticsearch;
use ElasticPress\Feature;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Features as Features;
use ElasticPress\Indexables as Indexables;
use ElasticPress\Utils as Utils;
use ElasticPress\Features;
use ElasticPress\Indexables;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace ElasticPress\Feature\ProtectedContent;

use ElasticPress\Utils as Utils;
use ElasticPress\Feature as Feature;
use ElasticPress\Features as Features;
use ElasticPress\FeatureRequirementsStatus as FeatureRequirementsStatus;
use ElasticPress\Feature;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Features;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
7 changes: 3 additions & 4 deletions includes/classes/Feature/RelatedPosts/RelatedPosts.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@

namespace ElasticPress\Feature\RelatedPosts;

use ElasticPress\Feature as Feature;
use ElasticPress\Elasticsearch as Elasticsearch;
use \WP_Query;
use ElasticPress\Elasticsearch;
use ElasticPress\Feature;
use ElasticPress\Utils;
use ElasticPress\Post\Post as Post;
use \WP_Query as WP_Query;

/**
* Related posts feature class
Expand Down
5 changes: 2 additions & 3 deletions includes/classes/Feature/RelatedPosts/Widget.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

namespace ElasticPress\Feature\RelatedPosts;

use \WP_Widget as WP_Widget;
use ElasticPress\Features as Features;
use ElasticPress\Features;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand All @@ -18,7 +17,7 @@
/**
* Related posts widget class
*/
class Widget extends WP_Widget {
class Widget extends \WP_Widget {

/**
* Initialize the widget
Expand Down
7 changes: 3 additions & 4 deletions includes/classes/Feature/Search/Synonyms.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@

namespace ElasticPress\Feature\Search;

use ElasticPress\Feature;
use ElasticPress\Features;
use ElasticPress\Indexables;
use ElasticPress\Elasticsearch;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Utils as Utils;
use ElasticPress\Features;
use ElasticPress\Indexables;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
3 changes: 1 addition & 2 deletions includes/classes/Feature/SearchOrdering/SearchOrdering.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
namespace ElasticPress\Feature\SearchOrdering;

use ElasticPress\Feature;
use ElasticPress\FeatureRequirementsStatus as FeatureRequirementsStatus;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Features;
use ElasticPress\Indexable\Post\Post;
use ElasticPress\Indexables;
use ElasticPress\Utils;

Expand Down
8 changes: 4 additions & 4 deletions includes/classes/Feature/Terms/Terms.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

namespace ElasticPress\Feature\Terms;

use ElasticPress\Feature as Feature;
use ElasticPress\Indexables as Indexables;
use ElasticPress\Indexable as Indexable;
use ElasticPress\FeatureRequirementsStatus as FeatureRequirementsStatus;
use ElasticPress\Feature;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Indexable;
use ElasticPress\Indexables;

/**
* Terms feature class
Expand Down
10 changes: 5 additions & 5 deletions includes/classes/Feature/Users/Users.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace ElasticPress\Feature\Users;

use ElasticPress\Feature as Feature;
use ElasticPress\Indexables as Indexables;
use ElasticPress\Indexable as Indexable;
use ElasticPress\FeatureRequirementsStatus as FeatureRequirementsStatus;
use ElasticPress\Utils as Utils;
use ElasticPress\Feature;
use ElasticPress\FeatureRequirementsStatus;
use ElasticPress\Indexable;
use ElasticPress\Indexables;
use ElasticPress\Utils;

/**
* Users feature class
Expand Down
2 changes: 1 addition & 1 deletion includes/classes/Features.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace ElasticPress;

use ElasticPress\Utils as Utils;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
6 changes: 3 additions & 3 deletions includes/classes/HealthCheck/HealthCheckElasticsearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace ElasticPress\HealthCheck;

use ElasticPress\HealthCheck as HealthCheck;
use ElasticPress\Utils as Utils;
use ElasticPress\Elasticsearch as Elasticsearch;
use ElasticPress\Elasticsearch;
use ElasticPress\HealthCheck;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
// @codeCoverageIgnoreStart
Expand Down
2 changes: 1 addition & 1 deletion includes/classes/IndexHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace ElasticPress;

use ElasticPress\Utils as Utils;
use ElasticPress\Utils;

/**
* Index Helper Class.
Expand Down
4 changes: 2 additions & 2 deletions includes/classes/Indexable.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

namespace ElasticPress;

use ElasticPress\Elasticsearch as Elasticsearch;
use ElasticPress\SyncManager as SyncManager;
use ElasticPress\Elasticsearch;
use ElasticPress\SyncManager;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
12 changes: 6 additions & 6 deletions includes/classes/Indexable/Comment/Comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

namespace ElasticPress\Indexable\Comment;

use ElasticPress\Indexable as Indexable;
use ElasticPress\Indexables as Indexables;
use ElasticPress\Elasticsearch as Elasticsearch;
use ElasticPress\Indexable\Post\DateQuery as DateQuery;
use \WP_Comment_Query as WP_Comment_Query;
use ElasticPress\Features as Features;
use \WP_Comment_Query;
use ElasticPress\Elasticsearch;
use ElasticPress\Features;
use ElasticPress\Indexable;
use ElasticPress\Indexable\Post\DateQuery;
use ElasticPress\Indexables;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
6 changes: 3 additions & 3 deletions includes/classes/Indexable/Comment/QueryIntegration.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

namespace ElasticPress\Indexable\Comment;

use ElasticPress\Indexables as Indexables;
use \WP_Comment_Query as WP_Comment_Query;
use ElasticPress\Utils as Utils;
use \WP_Comment_Query;
use ElasticPress\Indexables;
use ElasticPress\Utils;

if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
Expand Down
Loading

0 comments on commit 0834f7a

Please sign in to comment.