remove deprecated annotations of PHPUnit_Framework_MockObject_MockObject

84m · 84m · commit b45d6642f1f4 · 2021-02-23T11:53:55.000+01:00
diff --git a/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php b/tests/Unit/Aggregation/Bucketing/AdjacencyMatrixAggregationTest.php
@@ -12,7 +12,6 @@
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\AdjacencyMatrixAggregation;
-use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Unit test for adjacency matrix aggregation.
@@ -95,9 +94,7 @@ public function testToArray()
      */
     public function testFilterConstructor()
     {
-        /** @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject $builderInterface1 */
         $builderInterface1 = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface');
-        /** @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject $builderInterface2 */
         $builderInterface2 = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface');
 
         $aggregation = new AdjacencyMatrixAggregation(
diff --git a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php
@@ -114,7 +114,6 @@ public function getDateRangeAggregationConstructorProvider()
      */
     public function testDateRangeAggregationConstructor($field = null, $format = null, array $ranges = null)
     {
-        /** @var DateRangeAggregation|\PHPUnit_Framework_MockObject_MockObject $aggregation */
         $aggregation = $this->getMockBuilder('ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateRangeAggregation')
             ->setMethods(['setField', 'setFormat', 'addRange'])
             ->disableOriginalConstructor()
diff --git a/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php b/tests/Unit/Aggregation/Bucketing/FiltersAggregationTest.php
@@ -12,7 +12,6 @@
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Aggregation\Bucketing;
 
 use ONGR\ElasticsearchDSL\Aggregation\Bucketing\FiltersAggregation;
-use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Unit test for filters aggregation.
@@ -94,9 +93,7 @@ public function testToArray()
      */
     public function testConstructorFilter()
     {
-        /** @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject $builderInterface1 */
         $builderInterface1 = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface');
-        /** @var BuilderInterface|\PHPUnit_Framework_MockObject_MockObject $builderInterface2 */
         $builderInterface2 = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface');
 
         $aggregation = new FiltersAggregation(
diff --git a/tests/Unit/BuilderBagTest.php b/tests/Unit/BuilderBagTest.php
@@ -13,6 +13,7 @@
 
 use ONGR\ElasticsearchDSL\BuilderBag;
 use ONGR\ElasticsearchDSL\BuilderInterface;
+use PHPUnit\Framework\MockObject\MockBuilder;
 
 class BuilderBagTest extends \PHPUnit\Framework\TestCase
 {
@@ -79,7 +80,7 @@ public function testGet()
      *
      * @param string $name
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|BuilderInterface
+     * @return MockBuilder|BuilderInterface
      */
     private function getBuilder($name)
     {
diff --git a/tests/Unit/Query/Compound/FunctionScoreQueryTest.php b/tests/Unit/Query/Compound/FunctionScoreQueryTest.php
@@ -11,10 +11,8 @@
 
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Compound;
 
-use ONGR\ElasticsearchDSL\BuilderInterface;
 use ONGR\ElasticsearchDSL\Query\Compound\FunctionScoreQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Tests for FunctionScoreQuery.
@@ -66,21 +64,19 @@ public function addRandomFunctionProvider()
      */
     public function testAddRandomFunction($seed, $expectedArray)
     {
-        /** @var MatchAllQuery|MockObject $matchAllQuery */
         $matchAllQuery = $this->getMockBuilder(MatchAllQuery::class)->getMock();
 
         $functionScoreQuery = new FunctionScoreQuery($matchAllQuery);
         $functionScoreQuery->addRandomFunction($seed);
 
         $this->assertEquals(['function_score' => $expectedArray], $functionScoreQuery->toArray());
     }
-    
+
     /**
      * Tests default argument values.
      */
     public function testAddFieldValueFactorFunction()
     {
-        /** @var BuilderInterface|MockObject $builderInterface */
         $builderInterface = $this->getMockForAbstractClass('ONGR\ElasticsearchDSL\BuilderInterface');
         $functionScoreQuery = new FunctionScoreQuery($builderInterface);
         $functionScoreQuery->addFieldValueFactorFunction('field1', 2);
diff --git a/tests/Unit/Query/Span/SpanContainingQueryTest.php b/tests/Unit/Query/Span/SpanContainingQueryTest.php
@@ -12,6 +12,7 @@
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Span;
 
 use ONGR\ElasticsearchDSL\Query\Span\SpanContainingQuery;
+use PHPUnit\Framework\MockObject\MockBuilder;
 
 /**
  * Unit test for SpanContainingQuery.
@@ -43,7 +44,7 @@ public function testToArray()
     /**
      * @param string $value
      *
-     * @returns \PHPUnit_Framework_MockObject_MockObject
+     * @returns MockBuilder
      */
     private function getSpanQueryMock($value)
     {
diff --git a/tests/Unit/Query/Span/SpanWithinQueryTest.php b/tests/Unit/Query/Span/SpanWithinQueryTest.php
@@ -12,6 +12,7 @@
 namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Span;
 
 use ONGR\ElasticsearchDSL\Query\Span\SpanWithinQuery;
+use PHPUnit\Framework\MockObject\MockBuilder;
 
 /**
  * Unit test for SpanWithinQuery.
@@ -43,7 +44,7 @@ public function testToArray()
     /**
      * @param string $value
      *
-     * @returns \PHPUnit_Framework_MockObject_MockObject
+     * @returns MockBuilder
      */
     private function getSpanQueryMock($value)
     {
diff --git a/tests/Unit/SearchEndpoint/HighlightEndpointTest.php b/tests/Unit/SearchEndpoint/HighlightEndpointTest.php
@@ -14,7 +14,6 @@
 use ONGR\ElasticsearchDSL\Highlight\Highlight;
 use ONGR\ElasticsearchDSL\SearchEndpoint\HighlightEndpoint;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class HighlightEndpointTest.
@@ -35,7 +34,6 @@ public function testItCanBeInstantiated()
     public function testNormalization()
     {
         $instance = new HighlightEndpoint();
-        /** @var NormalizerInterface|MockObject $normalizerInterface */
         $normalizerInterface = $this->getMockForAbstractClass(
             NormalizerInterface::class
         );
diff --git a/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php b/tests/Unit/SearchEndpoint/PostFilterEndpointTest.php
@@ -13,8 +13,6 @@
 
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
 use ONGR\ElasticsearchDSL\SearchEndpoint\PostFilterEndpoint;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class PostFilterEndpointTest.
@@ -44,7 +42,6 @@ public function testGetOrder()
     public function testNormalization()
     {
         $instance = new PostFilterEndpoint();
-        /** @var NormalizerInterface|MockObject $normalizerInterface */
         $normalizerInterface = $this->getMockForAbstractClass(
             'Symfony\Component\Serializer\Normalizer\NormalizerInterface'
         );
diff --git a/tests/Unit/SearchEndpoint/QueryEndpointTest.php b/tests/Unit/SearchEndpoint/QueryEndpointTest.php
@@ -13,8 +13,6 @@
 
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
 use ONGR\ElasticsearchDSL\SearchEndpoint\QueryEndpoint;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * Unit test class for the QueryEndpoint.
@@ -44,7 +42,6 @@ public function testGetOrder()
     public function testEndpoint()
     {
         $instance = new QueryEndpoint();
-        /** @var NormalizerInterface|MockObject $normalizerInterface */
         $normalizerInterface = $this->getMockForAbstractClass(
             'Symfony\Component\Serializer\Normalizer\NormalizerInterface'
         );
diff --git a/tests/Unit/SearchEndpoint/SortEndpointTest.php b/tests/Unit/SearchEndpoint/SortEndpointTest.php
@@ -13,8 +13,6 @@
 
 use ONGR\ElasticsearchDSL\SearchEndpoint\SortEndpoint;
 use ONGR\ElasticsearchDSL\Sort\FieldSort;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * Class SortEndpointTest.
@@ -36,7 +34,6 @@ public function testNormalize()
     {
         $instance = new SortEndpoint();
 
-        /** @var NormalizerInterface|MockObject $normalizerInterface */
         $normalizerInterface = $this->getMockForAbstractClass(
             'Symfony\Component\Serializer\Normalizer\NormalizerInterface'
         );
diff --git a/tests/Unit/SearchEndpoint/SuggestEndpointTest.php b/tests/Unit/SearchEndpoint/SuggestEndpointTest.php
@@ -13,8 +13,6 @@
 
 use ONGR\ElasticsearchDSL\SearchEndpoint\SuggestEndpoint;
 use ONGR\ElasticsearchDSL\Suggest\Suggest;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class SuggestEndpointTest extends \PHPUnit\Framework\TestCase
 {
@@ -49,7 +47,6 @@ public function testNormalize()
     {
         $instance = new SuggestEndpoint();
 
-        /** @var NormalizerInterface|MockObject $normalizerInterface */
         $normalizerInterface = $this->getMockForAbstractClass(
             'Symfony\Component\Serializer\Normalizer\NormalizerInterface'
         );

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ public function getDateRangeAggregationConstructorProvider()`
`114`	`114`	`*/`
`115`	`115`	`public function testDateRangeAggregationConstructor($field = null, $format = null, array $ranges = null)`
`116`	`116`	`{`
`117`		`- /** @var DateRangeAggregation\|\PHPUnit_Framework_MockObject_MockObject $aggregation */`
`118`	`117`	`$aggregation = $this->getMockBuilder('ONGR\ElasticsearchDSL\Aggregation\Bucketing\DateRangeAggregation')`
`119`	`118`	`->setMethods(['setField', 'setFormat', 'addRange'])`
`120`	`119`	`->disableOriginalConstructor()`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use ONGR\ElasticsearchDSL\BuilderBag;`
`15`	`15`	`use ONGR\ElasticsearchDSL\BuilderInterface;`
	`16`	`+use PHPUnit\Framework\MockObject\MockBuilder;`
`16`	`17`
`17`	`18`	`class BuilderBagTest extends \PHPUnit\Framework\TestCase`
`18`	`19`	`{`
`@@ -79,7 +80,7 @@ public function testGet()`
`79`	`80`	`*`
`80`	`81`	`* @param string $name`
`81`	`82`	`*`
`82`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|BuilderInterface`
	`83`	`+ * @return MockBuilder\|BuilderInterface`
`83`	`84`	`*/`
`84`	`85`	`private function getBuilder($name)`
`85`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace ONGR\ElasticsearchDSL\Tests\Unit\Query\Span;`
`13`	`13`
`14`	`14`	`use ONGR\ElasticsearchDSL\Query\Span\SpanContainingQuery;`
	`15`	`+use PHPUnit\Framework\MockObject\MockBuilder;`
`15`	`16`
`16`	`17`	`/**`
`17`	`18`	`* Unit test for SpanContainingQuery.`
`@@ -43,7 +44,7 @@ public function testToArray()`
`43`	`44`	`/**`
`44`	`45`	`* @param string $value`
`45`	`46`	`*`
`46`		`- * @returns \PHPUnit_Framework_MockObject_MockObject`
	`47`	`+ * @returns MockBuilder`
`47`	`48`	`*/`
`48`	`49`	`private function getSpanQueryMock($value)`
`49`	`50`	`{`