Merge pull request #1864 from bohdan-harniuk/improvement/ASI-33709-update-phpunit-to-9-5-8

ASI-33709: Eliminated deprecated function at

Author: sivaschenko

AdobeStockClient/Test/Unit/Model/StockFileToDocumentTest.php

@@ -70,14 +70,12 @@ protected function setUp(): void
     public function testConvert(StockFile $stockFile, array $attributesData): void
     {
         $item = $this->createMock(Document::class);
+        $attributeValueFactoryReturn = [];
 
-        $i = 0;
         foreach ($attributesData as $attributeKey => $attributeValue) {
             $attribute = $this->createMock(AttributeValue::class);
 
-            $this->attributeValueFactory->expects($this->at($i))
-                ->method('create')
-                ->willReturn($attribute);
+            $attributeValueFactoryReturn[] = $attribute;
 
             $attribute->expects($this->once())
                 ->method('setValue')
@@ -86,8 +84,10 @@ public function testConvert(StockFile $stockFile, array $attributesData): void
             $attribute->expects($this->once())
                 ->method('setAttributeCode')
                 ->with($attributeKey);
-            $i++;
         }
+        $this->attributeValueFactory
+            ->method('create')
+            ->willReturnOnConsecutiveCalls(...$attributeValueFactoryReturn);
 
         $this->documentFactory->expects($this->once())
             ->method('create')

AdobeStockImage/Test/Unit/Model/GetImageListTest.php

@@ -70,11 +70,6 @@ class GetImageListTest extends TestCase
      */
     private $config;
 
-    /**
-     * @var bool $isAppliedGalleryFilter
-     */
-    private $isAppliedGalleryFilter = false;
-
     /**
      * @inheritdoc
      */
@@ -107,24 +102,78 @@ protected function setUp(): void
      */
     public function testWithDefaultFilters(array $appliedFilterNames): void
     {
-
         /** @var MockObject|SearchCriteriaInterface $searchCriteria */
         $searchCriteria = $this->createMock(SearchCriteriaInterface::class);
         $appliedFilterGroup = $this->getAppliedFilterGroup($appliedFilterNames);
         $this->config->expects($this->once())->method('getDefaultGalleryId')->willReturn('galleryidvalue');
+        $searchCriteriaSetFilterGroupsWith = [];
+        $filterBuilderMockSetFieldWith = [];
+        $filterBuilderMockSetConditionTypeWith = [];
+        $filterBuilderMockSetValueWith = [];
+        $filterBuilderMockCreateReturn = [];
+        $filterGroupBuilderMockSetFiltersWith = [];
+        $filterGroupBuilderMockCreateReturn = [];
 
         foreach ($appliedFilterNames as $appliedFilter) {
             if ($appliedFilter !== 'words') {
-                $this->applyDefaultGalleryFilter($searchCriteria, $appliedFilterGroup);
+                $this->applyDefaultGalleryFilter(
+                    $searchCriteriaSetFilterGroupsWith,
+                    $filterBuilderMockSetFieldWith,
+                    $filterBuilderMockSetConditionTypeWith,
+                    $filterBuilderMockSetValueWith,
+                    $filterBuilderMockCreateReturn,
+                    $filterGroupBuilderMockSetFiltersWith,
+                    $filterGroupBuilderMockCreateReturn,
+                    $appliedFilterGroup
+                );
             }
         }
 
         $searchCriteria->expects($this->any())
             ->method('getFilterGroups')
             ->willReturn([$appliedFilterGroup]);
-        $searchCriteria->expects($this->at($this->isAppliedGalleryFilter ? 1 : 2))
+
+        $searchCriteriaSetFilterGroupsWith[] = [
+            [
+                $appliedFilterGroup,
+                $this->getDefaultFilterGroup(
+                    $appliedFilterNames,
+                    $filterBuilderMockSetFieldWith,
+                    $filterBuilderMockSetConditionTypeWith,
+                    $filterBuilderMockSetValueWith,
+                    $filterBuilderMockCreateReturn,
+                    $filterGroupBuilderMockSetFiltersWith,
+                    $filterGroupBuilderMockCreateReturn
+                )
+            ]
+        ];
+        $this->filterBuilderMock
+            ->method('setField')
+            ->withConsecutive(...$filterBuilderMockSetFieldWith)
+            ->willReturnSelf();
+        $this->filterBuilderMock
+            ->method('setConditionType')
+            ->withConsecutive(...$filterBuilderMockSetConditionTypeWith)
+            ->willReturnSelf();
+        $this->filterBuilderMock
+            ->method('setValue')
+            ->withConsecutive(...$filterBuilderMockSetValueWith)
+            ->willReturnSelf();
+        $this->filterBuilderMock
+            ->method('create')
+            ->willReturnOnConsecutiveCalls(...$filterBuilderMockCreateReturn);
+
+        $this->filterGroupBuilderMock
+            ->method('setFilters')
+            ->withConsecutive(...$filterGroupBuilderMockSetFiltersWith)
+            ->willReturnSelf();
+        $this->filterGroupBuilderMock
+            ->method('create')
+            ->willReturnOnConsecutiveCalls(...$filterGroupBuilderMockCreateReturn);
+
+        $searchCriteria
             ->method('setFilterGroups')
-            ->with([$appliedFilterGroup, $this->getDefaultFilterGroup($appliedFilterNames)]);
+            ->withConsecutive(...$searchCriteriaSetFilterGroupsWith);
 
         $searchResult = $this->createMock(SearchResultInterface::class);
 
@@ -188,95 +237,90 @@ private function getAppliedFilterGroup(array $appliedFilterNames): FilterGroup
     }
 
     /**
-     * Get filter group with default filters that should be applied
+     * Get filter group with default filters that should be applied.
      *
      * @param array $appliedFilterNames
+     * @param array $filterBuilderMockSetFieldWith
+     * @param array $filterBuilderMockSetConditionTypeWith
+     * @param array $filterBuilderMockSetValueWith
+     * @param array $filterBuilderMockCreateReturn
+     * @param array $filterGroupBuilderMockSetFiltersWith
+     * @param array $filterGroupBuilderMockCreateReturn
+     *
      * @return FilterGroup
      */
-    private function getDefaultFilterGroup(array $appliedFilterNames): FilterGroup
-    {
+    private function getDefaultFilterGroup(
+        array $appliedFilterNames,
+        array &$filterBuilderMockSetFieldWith,
+        array &$filterBuilderMockSetConditionTypeWith,
+        array &$filterBuilderMockSetValueWith,
+        array &$filterBuilderMockCreateReturn,
+        array &$filterGroupBuilderMockSetFiltersWith,
+        array &$filterGroupBuilderMockCreateReturn
+    ): FilterGroup {
         $filters = [];
-        $filterBuilderCallIndex = $this->isAppliedGalleryFilter ? 4 : 0;
 
         foreach (self::DEFAULT_FILTERS as $defaultFilter) {
             if (!in_array($defaultFilter['type'], $appliedFilterNames)) {
-                $this->filterBuilderMock->expects($this->at($filterBuilderCallIndex++))
-                    ->method('setField')
-                    ->with($defaultFilter['type'])
-                    ->willReturnSelf();
-                $this->filterBuilderMock->expects($this->at($filterBuilderCallIndex++))
-                    ->method('setConditionType')
-                    ->with($defaultFilter['condition'])
-                    ->willReturnSelf();
-                $this->filterBuilderMock->expects($this->at($filterBuilderCallIndex++))
-                    ->method('setValue')
-                    ->with($defaultFilter['field'])
-                    ->willReturnSelf();
+                $filterBuilderMockSetFieldWith[] = [$defaultFilter['type']];
+                $filterBuilderMockSetConditionTypeWith[] = [$defaultFilter['condition']];
+                $filterBuilderMockSetValueWith[] = [$defaultFilter['field']];
 
                 $filter = $this->createMock(Filter::class);
-
-                $this->filterBuilderMock->expects($this->at($filterBuilderCallIndex++))
-                    ->method('create')
-                    ->willReturn($filter);
-
+                $filterBuilderMockCreateReturn[] = $filter;
                 $filters[] = $filter;
             }
         }
 
         /** @var FilterGroup|MockObject $filterGroup */
         $filterGroup = $this->createMock(FilterGroup::class);
-
-        $this->filterGroupBuilderMock->expects($this->at($this->isAppliedGalleryFilter ? 2 : 0))
-            ->method('setFilters')
-            ->with($filters)
-            ->willReturnSelf();
-        $this->filterGroupBuilderMock->expects($this->at($this->isAppliedGalleryFilter ? 3 : 1))
-            ->method('create')
-            ->willReturn($filterGroup);
+        $filterGroupBuilderMockSetFiltersWith[] = [$filters];
+        $filterGroupBuilderMockCreateReturn[] = $filterGroup;
 
         return $filterGroup;
     }
 
     /**
-     * Set's filter group with 'gallery_id' filter
+     * Set's filter group with 'gallery_id' filter.
      *
-     * @param MockObject $searchCriteria
+     * @param array $searchCriteriaSetFilterGroupsWith
+     * @param array $filterBuilderMockSetFieldWith
+     * @param array $filterBuilderMockSetConditionTypeWith
+     * @param array $filterBuilderMockSetValueWith
+     * @param array $filterBuilderMockCreateReturn
+     * @param array $filterGroupBuilderMockSetFiltersWith
+     * @param array $filterGroupBuilderMockCreateReturn
      * @param FilterGroup $appliedFilters
+     *
      * @return void
      */
     private function applyDefaultGalleryFilter(
-        MockObject $searchCriteria,
+        array &$searchCriteriaSetFilterGroupsWith,
+        array &$filterBuilderMockSetFieldWith,
+        array &$filterBuilderMockSetConditionTypeWith,
+        array &$filterBuilderMockSetValueWith,
+        array &$filterBuilderMockCreateReturn,
+        array &$filterGroupBuilderMockSetFiltersWith,
+        array &$filterGroupBuilderMockCreateReturn,
         FilterGroup $appliedFilters
     ): void {
-        $this->filterBuilderMock->expects($this->at(0))
-            ->method('setField')
-            ->willReturnSelf();
-        $this->filterBuilderMock->expects($this->at(1))
-            ->method('setConditionType')
-            ->willReturnSelf();
-        $this->filterBuilderMock->expects($this->at(2))
-            ->method('setValue')
-            ->willReturnSelf();
+        $filterBuilderMockSetFieldWith[] = [];
+        $filterBuilderMockSetConditionTypeWith[] = [];
+        $filterBuilderMockSetValueWith[] = [];
 
         $filter = $this->createMock(Filter::class);
-
-        $this->filterBuilderMock->expects($this->at(3))
-            ->method('create')
-            ->willReturn($filter);
+        $filterBuilderMockCreateReturn[] = $filter;
 
         $filterGroup = $this->createMock(FilterGroup::class);
 
-        $this->filterGroupBuilderMock->expects($this->at(0))
-            ->method('setFilters')
-            ->with([$filter])
-            ->willReturnSelf();
-        $this->filterGroupBuilderMock->expects($this->at(1))
-            ->method('create')
-            ->willReturn($filterGroup);
-        $searchCriteria->expects($this->at(1))
-            ->method('setFilterGroups')
-            ->with([$filterGroup, $appliedFilters]);
+        $filterGroupBuilderMockSetFiltersWith[] = [[$filter]];
+        $filterGroupBuilderMockCreateReturn[] = $filterGroup;
 
-        $this->isAppliedGalleryFilter = true;
+        $searchCriteriaSetFilterGroupsWith[] = [
+            [
+                $filterGroup,
+                $appliedFilters
+            ]
+        ];
     }
 }