Removed Interface suffix.

ezsystems · Oct 6, 2020 · 313a2ce · 313a2ce
1 parent f450e1a
commit 313a2ce
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 32 deletions.
diff --git a/eZ/Publish/API/Repository/Tests/SearchServiceAggregationTest.php b/eZ/Publish/API/Repository/Tests/SearchServiceAggregationTest.php
@@ -35,7 +35,7 @@
 use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\SectionTermAggregation;
 use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation;
 use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\AggregationInterface;
+use eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeIdentifier;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion\MatchAll;
 use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult;
@@ -94,7 +94,7 @@ protected function setUp(): void
      * @dataProvider dataProviderForTestAggregation
      */
     public function testFindContentWithAggregation(
-        AggregationInterface $aggregation,
+        Aggregation $aggregation,
         AggregationResult $expectedResult
     ): void {
         $searchService = $this->getRepository()->getSearchService();
@@ -114,7 +114,7 @@ public function testFindContentWithAggregation(
      * @dataProvider dataProviderForTestAggregation
      */
     public function testFindLocationWithAggregation(
-        AggregationInterface $aggregation,
+        Aggregation $aggregation,
         AggregationResult $expectedResult
     ): void {
         $searchService = $this->getRepository()->getSearchService();
@@ -343,10 +343,10 @@ function (string $identifier): ObjectState {
     /**
      * @dataProvider dataProviderForTestFieldAggregation
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Query\AggregationInterface|\eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregationInterface $aggregation
+     * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation|\eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregation $aggregation
      */
     public function testFindContentWithFieldAggregation(
-        AggregationInterface $aggregation,
+        Aggregation $aggregation,
         string $fieldTypeIdentifier,
         iterable $fieldValues,
         AggregationResult $expectedResult,
@@ -379,10 +379,10 @@ public function testFindContentWithFieldAggregation(
     /**
      * @dataProvider dataProviderForTestFieldAggregation
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Query\AggregationInterface|\eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregationInterface $aggregation
+     * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation|\eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregation $aggregation
      */
     public function testFindLocationWithFieldAggregation(
-        AggregationInterface $aggregation,
+        Aggregation $aggregation,
         string $fieldTypeIdentifier,
         iterable $fieldValues,
         AggregationResult $expectedResult,
@@ -802,7 +802,7 @@ static function (FieldDefinitionCreateStruct $createStruct): void {
     }
 
     private function createTermAggregationTestCase(
-        AggregationInterface $aggregation,
+        Aggregation $aggregation,
         iterable $expectedEntries,
         ?callable $mapper = null
     ): array {

diff --git a/eZ/Publish/API/Repository/Values/Content/Query.php b/eZ/Publish/API/Repository/Values/Content/Query.php
@@ -67,7 +67,7 @@ class Query extends ValueObject
     public $facetBuilders = [];
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Query\AggregationInterface[]
+     * @var \eZ\Publish\API\Repository\Values\Content\Query\Aggregation[]
      */
     public $aggregations = [];
 

diff --git a/...es/Content/Query/AggregationInterface.php → ...tory/Values/Content/Query/Aggregation.php b/...es/Content/Query/AggregationInterface.php → ...tory/Values/Content/Query/Aggregation.php
@@ -8,7 +8,7 @@
 
 namespace eZ\Publish\API\Repository\Values\Content\Query;
 
-interface AggregationInterface
+interface Aggregation
 {
     public function getName(): string;
 }
diff --git a/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/AbstractRangeAggregation.php b/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/AbstractRangeAggregation.php
@@ -8,9 +8,9 @@
 
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\AggregationInterface;
+use eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-abstract class AbstractRangeAggregation implements AggregationInterface
+abstract class AbstractRangeAggregation implements Aggregation
 {
     /**
      * The name of the aggregation.

diff --git a/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/AbstractStatsAggregation.php b/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/AbstractStatsAggregation.php
@@ -8,9 +8,9 @@
 
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\AggregationInterface;
+use eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-abstract class AbstractStatsAggregation implements AggregationInterface
+abstract class AbstractStatsAggregation implements Aggregation
 {
     /**
      * The name of the aggregation.

diff --git a/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/AbstractTermAggregation.php b/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/AbstractTermAggregation.php
@@ -8,9 +8,9 @@
 
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-use eZ\Publish\API\Repository\Values\Content\Query\AggregationInterface;
+use eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-abstract class AbstractTermAggregation implements AggregationInterface
+abstract class AbstractTermAggregation implements Aggregation
 {
     public const DEFAULT_LIMIT = 10;
     public const DEFAULT_MIN_COUNT = 1;

diff --git a/...h/API/Repository/Values/Content/Query/Aggregation/Field/AbstractFieldRangeAggregation.php b/...h/API/Repository/Values/Content/Query/Aggregation/Field/AbstractFieldRangeAggregation.php
@@ -9,9 +9,9 @@
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field;
 
 use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregationInterface;
+use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregation;
 
-abstract class AbstractFieldRangeAggregation extends AbstractRangeAggregation implements FieldAggregationInterface
+abstract class AbstractFieldRangeAggregation extends AbstractRangeAggregation implements FieldAggregation
 {
     use FieldAggregationTrait;
 

diff --git a/...h/API/Repository/Values/Content/Query/Aggregation/Field/AbstractFieldStatsAggregation.php b/...h/API/Repository/Values/Content/Query/Aggregation/Field/AbstractFieldStatsAggregation.php
@@ -9,9 +9,9 @@
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field;
 
 use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregationInterface;
+use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregation;
 
-abstract class AbstractFieldStatsAggregation extends AbstractStatsAggregation implements FieldAggregationInterface
+abstract class AbstractFieldStatsAggregation extends AbstractStatsAggregation implements FieldAggregation
 {
     use FieldAggregationTrait;
 

diff --git a/...sh/API/Repository/Values/Content/Query/Aggregation/Field/AbstractFieldTermAggregation.php b/...sh/API/Repository/Values/Content/Query/Aggregation/Field/AbstractFieldTermAggregation.php
@@ -9,9 +9,9 @@
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field;
 
 use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregationInterface;
+use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregation;
 
-abstract class AbstractFieldTermAggregation extends AbstractTermAggregation implements FieldAggregationInterface
+abstract class AbstractFieldTermAggregation extends AbstractTermAggregation implements FieldAggregation
 {
     use FieldAggregationTrait;
 

diff --git a/...Aggregation/FieldAggregationInterface.php → ...nt/Query/Aggregation/FieldAggregation.php b/...Aggregation/FieldAggregationInterface.php → ...nt/Query/Aggregation/FieldAggregation.php
@@ -8,7 +8,7 @@
 
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-interface FieldAggregationInterface
+interface FieldAggregation
 {
     public function getContentTypeIdentifier(): string;
 

diff --git a/...blish/API/Repository/Values/Content/Query/Aggregation/Location/SubtreeTermAggregation.php b/...blish/API/Repository/Values/Content/Query/Aggregation/Location/SubtreeTermAggregation.php
@@ -9,8 +9,8 @@
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location;
 
 use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation;
-use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\LocationAggregationInterface;
+use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\LocationAggregation;
 
-final class SubtreeTermAggregation extends AbstractTermAggregation implements LocationAggregationInterface
+final class SubtreeTermAggregation extends AbstractTermAggregation implements LocationAggregation
 {
 }
diff --git a/...regation/LocationAggregationInterface.php → ...Query/Aggregation/LocationAggregation.php b/...regation/LocationAggregationInterface.php → ...Query/Aggregation/LocationAggregation.php
@@ -11,6 +11,6 @@
 /**
  * Marker interface for location based aggregation.
  */
-interface LocationAggregationInterface
+interface LocationAggregation
 {
 }
diff --git a/...y/Aggregation/RawAggregationInterface.php → ...tent/Query/Aggregation/RawAggregation.php b/...y/Aggregation/RawAggregationInterface.php → ...tent/Query/Aggregation/RawAggregation.php
@@ -8,7 +8,7 @@
 
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-interface RawAggregationInterface
+interface RawAggregation
 {
     public function getFieldName(): string;
 }
diff --git a/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/RawRangeAggregation.php b/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/RawRangeAggregation.php
@@ -8,7 +8,7 @@
 
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-final class RawRangeAggregation extends AbstractRangeAggregation implements RawAggregationInterface
+final class RawRangeAggregation extends AbstractRangeAggregation implements RawAggregation
 {
     /** @var string */
     private $fieldName;

diff --git a/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/RawStatsAggregation.php b/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/RawStatsAggregation.php
@@ -8,7 +8,7 @@
 
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-final class RawStatsAggregation extends AbstractStatsAggregation implements RawAggregationInterface
+final class RawStatsAggregation extends AbstractStatsAggregation implements RawAggregation
 {
     /** @var string */
     private $fieldName;

diff --git a/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/RawTermAggregation.php b/eZ/Publish/API/Repository/Values/Content/Query/Aggregation/RawTermAggregation.php
@@ -8,7 +8,7 @@
 
 namespace eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 
-final class RawTermAggregation extends AbstractTermAggregation implements RawAggregationInterface
+final class RawTermAggregation extends AbstractTermAggregation implements RawAggregation
 {
     /** @var string */
     private $fieldName;

diff --git a/eZ/Publish/API/Repository/Values/Content/Search/AggregationResult/TermAggregationResult.php b/eZ/Publish/API/Repository/Values/Content/Search/AggregationResult/TermAggregationResult.php
@@ -10,7 +10,7 @@
 
 use ArrayIterator;
 use Countable;
-use eZ\Publish\API\Repository\Values\Content\Query\AggregationInterface;
+use eZ\Publish\API\Repository\Values\Content\Query\Aggregation;
 use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult;
 use Iterator;
 use IteratorAggregate;
@@ -78,7 +78,7 @@ public function getIterator(): Iterator
         }
     }
 
-    public static function createForAggregation(AggregationInterface $aggregation, iterable $entries = []): self
+    public static function createForAggregation(Aggregation $aggregation, iterable $entries = []): self
     {
         return new self($aggregation->getName(), $entries);
     }