From 2ba36356d20ed3f9f2e34ce7dacb361fb984eeb3 Mon Sep 17 00:00:00 2001 From: Olha Livitchuk <77281282+olhalivitchuk@users.noreply.github.com> Date: Mon, 4 Nov 2024 15:07:47 +0100 Subject: [PATCH] FRW-8773 Added PHPUnit 11 support. (#11131) FRW-8773 Added PHP Unit 11 support. --- .../Product/Business/ProductFacadeTest.php | 6 +-- .../Business/ProductUrlGeneratorTest.php | 49 +++++++++++++------ 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/tests/SprykerTest/Zed/Product/Business/ProductFacadeTest.php b/tests/SprykerTest/Zed/Product/Business/ProductFacadeTest.php index 7253d65b5e..fbf1fc0df1 100644 --- a/tests/SprykerTest/Zed/Product/Business/ProductFacadeTest.php +++ b/tests/SprykerTest/Zed/Product/Business/ProductFacadeTest.php @@ -731,13 +731,13 @@ public function triggerProductExportEventsTriggerFailsDataProvider(): array { return [ 'store reference is null' => [ - 'export criteria' => (new ProductExportCriteriaTransfer())->setStoreReference(null), + 'productExportCriteriaTransfer' => (new ProductExportCriteriaTransfer())->setStoreReference(null), ], 'store reference is empty' => [ - 'export criteria' => (new ProductExportCriteriaTransfer())->setStoreReference(''), + 'productExportCriteriaTransfer' => (new ProductExportCriteriaTransfer())->setStoreReference(''), ], 'store with given reference doesn\'t exist' => [ - 'export criteria' => (new ProductExportCriteriaTransfer()) + 'productExportCriteriaTransfer' => (new ProductExportCriteriaTransfer()) ->setStoreReference(static::UNEXISTING_STORE_REFERENCE), ], ]; diff --git a/tests/SprykerTest/Zed/Product/Business/ProductUrlGeneratorTest.php b/tests/SprykerTest/Zed/Product/Business/ProductUrlGeneratorTest.php index d83ae39e80..b77971cb9e 100644 --- a/tests/SprykerTest/Zed/Product/Business/ProductUrlGeneratorTest.php +++ b/tests/SprykerTest/Zed/Product/Business/ProductUrlGeneratorTest.php @@ -104,20 +104,25 @@ protected function setUp(): void $this->productAbstractNameGenerator = $this->getMockBuilder(ProductAbstractNameGeneratorInterface::class) ->disableOriginalConstructor()->getMock(); + $invocationIndex = 0; + $expectedCalls = [ + [$this->productAbstractTransfer, $this->locales['de_DE']], + [$this->productAbstractTransfer, $this->locales['en_US']], + ]; + $returnValues = [ + static::PRODUCT_NAME['de_DE'], + static::PRODUCT_NAME['en_US'], + ]; + $this->productAbstractNameGenerator ->expects($this->exactly(2)) ->method('getLocalizedProductAbstractName') - ->withConsecutive( - [ - $this->productAbstractTransfer, - $this->locales['de_DE'], - ], - [ - $this->productAbstractTransfer, - $this->locales['en_US'], - ], - ) - ->willReturn(static::PRODUCT_NAME['de_DE'], static::PRODUCT_NAME['en_US']); + ->willReturnCallback(function ($productAbstractTransfer, $locale) use (&$invocationIndex, $expectedCalls, $returnValues) { + $this->assertSame($expectedCalls[$invocationIndex][0], $productAbstractTransfer); + $this->assertSame($expectedCalls[$invocationIndex][1], $locale); + + return $returnValues[$invocationIndex++]; + }); } /** @@ -182,11 +187,18 @@ public function testGetProductUrlShouldReturnTransfer(): void new ArrayObject([$expectedDEUrl, $expectedENUrl]), ); + $invocationIndex = 0; + $expectedValues = [static::PRODUCT_NAME['de_DE'], static::PRODUCT_NAME['en_US']]; + $returnValues = ['product-name-dede', 'product-name-enus']; + $this->utilTextService ->expects($this->exactly(2)) ->method('generateSlug') - ->withConsecutive([static::PRODUCT_NAME['de_DE']], [static::PRODUCT_NAME['en_US']]) - ->willReturnOnConsecutiveCalls('product-name-dede', 'product-name-enus'); + ->willReturnCallback(function ($value) use (&$invocationIndex, $expectedValues, $returnValues) { + $this->assertSame($expectedValues[$invocationIndex], $value); + + return $returnValues[$invocationIndex++]; + }); $configMock = $this->createMock(ProductConfig::class); $configMock->method('isFullLocaleNamesInUrlEnabled')->willReturn(true); @@ -219,11 +231,18 @@ public function testGetProductUrlShouldReturnTransferBCCheck(): void new ArrayObject([$expectedDEUrl, $expectedENUrl]), ); + $expectedCalls = [static::PRODUCT_NAME['de_DE'], static::PRODUCT_NAME['en_US']]; + $returnValues = ['product-name-dede', 'product-name-enus']; + $callIndex = 0; + $this->utilTextService ->expects($this->exactly(2)) ->method('generateSlug') - ->withConsecutive([static::PRODUCT_NAME['de_DE']], [static::PRODUCT_NAME['en_US']]) - ->willReturnOnConsecutiveCalls('product-name-dede', 'product-name-enus'); + ->willReturnCallback(function ($value) use (&$callIndex, $expectedCalls, $returnValues) { + $this->assertSame($expectedCalls[$callIndex], $value); + + return $returnValues[$callIndex++]; + }); $configMock = $this->createMock(ProductConfig::class); $configMock->method('isFullLocaleNamesInUrlEnabled')->willReturn(false);