updated tests

sreichel · sreichel · commit 82c5d79947dc · 2025-04-14T09:17:46.000+02:00
diff --git a/tests/unit/Base/DefaultConfigTest.php b/tests/unit/Base/DefaultConfigTest.php
@@ -20,6 +20,7 @@
 use Generator;
 use Mage;
 use Mage_Adminhtml_Helper_Dashboard_Data;
+use Mage_Core_Model_Store;
 use PHPUnit\Framework\TestCase;
 
 class DefaultConfigTest extends TestCase
@@ -29,7 +30,7 @@ class DefaultConfigTest extends TestCase
      * @group Base
      * @group Default_Config
      */
-    public function testGetStoreConfig(string $expectedResult, string $path, $store = null): void
+    public function testGetStoreConfig(string $expectedResult, string $path, bool|int|Mage_Core_Model_Store|null|string $store = null): void
     {
         static::assertSame($expectedResult, Mage::getStoreConfig($path, $store));
     }
diff --git a/tests/unit/Mage/Admin/Model/BlockTest.php b/tests/unit/Mage/Admin/Model/BlockTest.php
@@ -35,13 +35,13 @@ public static function setUpBeforeClass(): void
 
     /**
      * @dataProvider provideValidateAdminBlockData
-     * @param array<int, string> $expectedResult
+     * @param true|array<int, string> $expectedResult
      *
      * @group Mage_Admin
      * @group Mage_Admin_Model
      * @throws Exception
      */
-    public function testValidate($expectedResult, array $methods): void
+    public function testValidate(bool|array $expectedResult, array $methods): void
     {
         $mock = $this->getMockBuilder(Subject::class)
             ->setMethods([
diff --git a/tests/unit/Mage/Admin/Model/UserTest.php b/tests/unit/Mage/Admin/Model/UserTest.php
@@ -35,13 +35,12 @@ public static function setUpBeforeClass(): void
 
     /**
      * @dataProvider provideAuthenticateData
-     * @param array|true $expectedResult
      * @group Mage_Admin
      * @group Mage_Admin_Model
      * @group runInSeparateProcess
      * @runInSeparateProcess
      */
-    public function testAuthenticate($expectedResult, array $methods): void
+    public function testAuthenticate(string $expectedResult, array $methods): void
     {
         $mock = $this->getMockBuilder(Subject::class)
             ->setMethods([
diff --git a/tests/unit/Mage/AdminNotification/Model/InboxTest.php b/tests/unit/Mage/AdminNotification/Model/InboxTest.php
@@ -42,7 +42,7 @@ public static function setUpBeforeClass(): void
      * @group Mage_AdminNotification
      * @group Mage_AdminNotification_Model
      */
-    public function testGetSeverities($expectedResult, ?int $severity): void
+    public function testGetSeverities(array|string|null $expectedResult, ?int $severity): void
     {
         static::assertSame($expectedResult, self::$subject->getSeverities($severity));
     }
diff --git a/tests/unit/Mage/Adminhtml/Helper/SalesTest.php b/tests/unit/Mage/Adminhtml/Helper/SalesTest.php
@@ -38,7 +38,7 @@ public static function setUpBeforeClass(): void
      * @group Mage_Adminhtml
      * @group Mage_Adminhtml_Helper
      */
-    public function testEscapeHtmlWithLinks($expectedResult, $data): void
+    public function testEscapeHtmlWithLinks(string $expectedResult, string $data): void
     {
         static::assertSame($expectedResult, self::$subject->escapeHtmlWithLinks($data, ['a']));
     }
diff --git a/tests/unit/Mage/Catalog/Helper/DataTest.php b/tests/unit/Mage/Catalog/Helper/DataTest.php
@@ -38,7 +38,7 @@ public static function setUpBeforeClass(): void
      * @group Mage_Catalog
      * @group Mage_Catalog_Helper
      */
-    public function testSplitSku($expectedResult, string $sku, int $length = 30): void
+    public function testSplitSku(array $expectedResult, string $sku, int $length = 30): void
     {
         static::assertSame($expectedResult, self::$subject->splitSku($sku, $length));
     }
diff --git a/tests/unit/Mage/Catalog/Helper/ProductTest.php b/tests/unit/Mage/Catalog/Helper/ProductTest.php
@@ -76,7 +76,7 @@ public function provideGetAttributeInputTypes(): Generator
      * @group Mage_Catalog
      * @group Mage_Catalog_Helper
      */
-    public function testGetAttributeBackendModelByInputType($expectedResult, string $inputType): void
+    public function testGetAttributeBackendModelByInputType(string $expectedResult, string $inputType): void
     {
         static::assertSame($expectedResult, self::$subject->getAttributeBackendModelByInputType($inputType));
     }
@@ -94,7 +94,7 @@ public function provideGetAttributeBackendModelByInputType(): Generator
      * @group Mage_Catalog
      * @group Mage_Catalog_Helper
      */
-    public function testGetAttributeSourceModelByInputType($expectedResult, string $inputType): void
+    public function testGetAttributeSourceModelByInputType(string $expectedResult, string $inputType): void
     {
         static::assertSame($expectedResult, self::$subject->getAttributeSourceModelByInputType($inputType));
     }
diff --git a/tests/unit/Mage/Catalog/Model/CategoryTest.php b/tests/unit/Mage/Catalog/Model/CategoryTest.php
@@ -119,7 +119,7 @@ public function testGetUrlModel(): void
      * @group Mage_Catalog
      * @group Mage_Catalog_Model
      */
-    public function testFormatUrlKey($expectedResult, string $locale): void
+    public function testFormatUrlKey(string $expectedResult, string $locale): void
     {
         self::$subject->setLocale($locale);
         static::assertSame($expectedResult, self::$subject->formatUrlKey($this->getTestString()));
diff --git a/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php b/tests/unit/Mage/Catalog/Model/Product/Option/Type/TextTest.php
@@ -51,7 +51,7 @@ public function testValidateUserValue(): void
      * @group Mage_Catalog
      * @group Mage_Catalog_Model
      */
-    public function testPrepareForCart($expectedResult, bool $setIsValid = true, $setUserValue = null): void
+    public function testPrepareForCart(?string $expectedResult, bool $setIsValid = true, ?string $setUserValue = null): void
     {
         self::$subject->setIsValid($setIsValid)->setUserValue($setUserValue);
         static::assertSame($expectedResult, self::$subject->prepareForCart());
diff --git a/tests/unit/Mage/Catalog/Model/ProductTest.php b/tests/unit/Mage/Catalog/Model/ProductTest.php
@@ -166,7 +166,7 @@ public function testAfterCommitCallback(): void
      * @group Mage_Catalog
      * @group Mage_Catalog_Model
      */
-    public function testFormatUrlKey($expectedResult, string $locale): void
+    public function testFormatUrlKey(string $expectedResult, string $locale): void
     {
         self::$subject->setLocale($locale);
         static::assertSame($expectedResult, self::$subject->formatUrlKey($this->getTestString()));
diff --git a/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php b/tests/unit/Mage/Catalog/Model/Resource/Eav/AttributeTest.php
@@ -44,7 +44,7 @@ public function setUp(): void
      * @group Mage_Catalog_Model
      * @group Mage_Catalog_Model_Resource
      */
-    public function testGetStoreId($expectedResult, $withStoreId): void
+    public function testGetStoreId(?int $expectedResult, int|string|null $withStoreId): void
     {
         if ($withStoreId) {
             self::$subject->setStoreId($withStoreId);
diff --git a/tests/unit/Mage/Catalog/Model/UrlTest.php b/tests/unit/Mage/Catalog/Model/UrlTest.php
@@ -129,7 +129,7 @@ public function provideGeneratePathData(): Generator
      * @group Mage_Catalog
      * @group Mage_Catalog_Model
      */
-    public function testFormatUrlKey($expectedResult, string $locale): void
+    public function testFormatUrlKey(string $expectedResult, string $locale): void
     {
         self::$subject->setLocale($locale);
         static::assertSame($expectedResult, self::$subject->formatUrlKey($this->getTestString()));
@@ -150,7 +150,7 @@ public function testFormatUrlKey($expectedResult, string $locale): void
      * @group Mage_Catalog
      * @group Mage_Catalog_Model
      */
-    public function testGetSluggerConfig($expectedResult, string $locale): void
+    public function testGetSluggerConfig(array $expectedResult, string $locale): void
     {
         $result = self::$subject->getSluggerConfig($locale);
 
diff --git a/tests/unit/Mage/Core/Block/Text/ListTest.php b/tests/unit/Mage/Core/Block/Text/ListTest.php
@@ -101,7 +101,7 @@ public function testUniqueBlockNameOrdering(): void
         static::assertSame('CD', $parentBlock->toHtml());
     }
 
-    public function testSortInstructionsAfterReplaceChild()
+    public function testSortInstructionsAfterReplaceChild(): void
     {
         $layout = Mage::getModel('core/layout');
 
diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php
@@ -81,7 +81,7 @@ public function testValidateKey(): void
      */
     public function testFormatTimezoneDate(
         string $expectedResult,
-        $data,
+        ?string $data,
         string $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT,
         bool $showTime = false,
         bool $useTimezone = false # disable timezone by default for tests
diff --git a/tests/unit/Mage/Core/Helper/PurifierTest.php b/tests/unit/Mage/Core/Helper/PurifierTest.php
@@ -37,7 +37,7 @@ public static function setUpBeforeClass(): void
      * @group Mage_Core
      * @group Mage_Core_Helper
      */
-    public function testPurify($expectedResult, $content): void
+    public function testPurify(array|string $expectedResult, array|string $content): void
     {
         static::assertSame($expectedResult, self::$subject->purify($content));
     }
diff --git a/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php b/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php
@@ -38,7 +38,7 @@ public static function setUpBeforeClass(): void
      * @group Mage_Core
      * @group Mage_Core_Helper
      */
-    public function testUnserialize($expectedTesult, $string): void
+    public function testUnserialize(array|string $expectedTesult, ?string $string): void
     {
         try {
             static::assertSame($expectedTesult, self::$subject->unserialize($string));
diff --git a/tests/unit/Mage/Core/Model/LayoutTest.php b/tests/unit/Mage/Core/Model/LayoutTest.php
@@ -41,7 +41,7 @@ public static function setUpBeforeClass(): void
      * @group Mage_Core
      * @group Mage_Core_Model
      */
-    public function testCreateBlock($expectedResult, bool $willReturnBlock, string $type, ?string $name, array $attributes): void
+    public function testCreateBlock(bool|string $expectedResult, bool $willReturnBlock, string $type, ?string $name, array $attributes): void
     {
         $result = self::$subject->createBlock($type, $name, $attributes);
 
@@ -77,7 +77,7 @@ public function provideCreateBlock(): Generator
      * @group Mage_Core_Model
      * @group pr4411
      */
-    public function testGetBlockSingleton($expectedResult, bool $isAbstractBlock, string $type): void
+    public function testGetBlockSingleton(string $expectedResult, bool $isAbstractBlock, string $type): void
     {
         $result = self::$subject->getBlockSingleton($type);
 
diff --git a/tests/unit/Mage/Directory/Helper/DataTest.php b/tests/unit/Mage/Directory/Helper/DataTest.php
@@ -78,7 +78,7 @@ public function testCurrencyConvert(): void
      * @group Mage_Directory
      * @group Mage_Directory_Helper
      */
-    public function testGetCountriesWithOptionalZip($expectedResult, bool $asJson): void
+    public function testGetCountriesWithOptionalZip(array|string $expectedResult, bool $asJson): void
     {
         static::assertSame($expectedResult, self::$subject->getCountriesWithOptionalZip($asJson));
     }
@@ -116,7 +116,7 @@ public function testIsZipCodeOptional(): void
      * @group Mage_Directory
      * @group Mage_Directory_Helper
      */
-    public function testGetCountriesWithStatesRequired($expectedResult, bool $asJson): void
+    public function testGetCountriesWithStatesRequired(array|string $expectedResult, bool $asJson): void
     {
         $result = self::$subject->getCountriesWithStatesRequired($asJson);
         if (defined('DATA_MAY_CHANGED')) {
diff --git a/tests/unit/Mage/GiftMessage/Helper/MessageTest.php b/tests/unit/Mage/GiftMessage/Helper/MessageTest.php
@@ -20,6 +20,7 @@
 use Generator;
 use Mage;
 use Mage_Catalog_Model_Product;
+use Mage_Core_Model_Store;
 use Mage_GiftMessage_Helper_Message as Subject;
 use PHPUnit\Framework\TestCase;
 use Varien_Object;
@@ -40,7 +41,7 @@ public static function setUpBeforeClass(): void
      * @group Mage_GiftMessage
      * @group Mage_GiftMessage_Helper
      */
-    public function testIsMessagesAvailable(string $type, Varien_Object $entity, $store = null): void
+    public function testIsMessagesAvailable(string $type, Varien_Object $entity, bool|int|Mage_Core_Model_Store|null|string $store = null): void
     {
         static::assertIsBool(self::$subject->isMessagesAvailable($type, $entity, $store));
     }
diff --git a/tests/unit/Mage/Reports/Helper/DataTest.php b/tests/unit/Mage/Reports/Helper/DataTest.php
@@ -63,7 +63,7 @@ public function testIsReportsEnabled(): void
      * @group Mage_Reports
      * @group Mage_Reports_Helper
      */
-    public function testGetIntervals($expectedResult, $from, $to, $period): void
+    public function testGetIntervals(int $expectedResult, string $from, string $to, string $period): void
     {
         if (PHP_VERSION_ID >= 80300 && version_compare(InstalledVersions::getPrettyVersion('shardj/zf1-future'), '1.24.2', '<=')) {
             static::markTestSkipped('see https://github.com/Shardj/zf1-future/pull/465');
@@ -83,7 +83,7 @@ public function testGetIntervals($expectedResult, $from, $to, $period): void
      * @group Mage_Reports
      * @group Mage_Reports_Helper
      */
-    public function testPrepareIntervalsCollection($expectedResult, $from, $to, $period): void
+    public function testPrepareIntervalsCollection(int $expectedResult, string $from, string $to, string $period): void
     {
         static::markTestIncomplete('Test needs to be reviewed.');
         // @phpstan-ignore-next-line
diff --git a/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php b/tests/unit/Mage/Reports/Model/Resource/Report/CollectionTest.php
@@ -50,7 +50,7 @@ public function setUp(): void
      */
     public function testSetPeriod(): void
     {
-        static::assertInstanceOf(Subject::class, self::$subject->setPeriod(1));
+        static::assertInstanceOf(Subject::class, self::$subject->setPeriod('1m'));
     }
 
     /**
@@ -68,7 +68,7 @@ public function testSetIntervals(): void
      * @group Mage_Reports
      * @group Mage_Reports_Model
      */
-    public function testGetIntervals($expectedResult, $from, $to, $period): void
+    public function testGetIntervals(int $expectedResult, string|Zend_Date $from, string|Zend_Date $to, string $period): void
     {
         self::$subject->setInterval($from, $to);
         self::$subject->setPeriod($period);
@@ -135,7 +135,7 @@ public function testGetPageSize(): void
      * @group Mage_Reports
      * @group Mage_Reports_Model
      */
-    public function testInitReport($modelClass = ''): void
+    public function testInitReport(string $modelClass = ''): void
     {
         static::assertInstanceOf(Subject::class, self::$subject->initReport($modelClass));
     }
diff --git a/tests/unit/Mage/Rule/Model/AbstractTest.php b/tests/unit/Mage/Rule/Model/AbstractTest.php
@@ -123,7 +123,7 @@ public function testLoadPost(array $data = []): void
      * @group Mage_Rule
      * @group Mage_Rule_Model
      */
-    public function testValidate($expectedResul, ?array $data = null): void
+    public function testValidate(bool|array $expectedResul, ?array $data = null): void
     {
         $object = new Varien_Object($data);
         try {
@@ -139,7 +139,7 @@ public function testValidate($expectedResul, ?array $data = null): void
      * @group Mage_Rule
      * @group Mage_Rule_Model
      */
-    public function testValidateData($expectedResul, ?array $data = null): void
+    public function testValidateData(bool|array $expectedResul, ?array $data = null): void
     {
         if (PHP_VERSION_ID >= 80300 && version_compare(InstalledVersions::getPrettyVersion('shardj/zf1-future'), '1.24.2', '<=')) {
             static::markTestSkipped('see https://github.com/Shardj/zf1-future/pull/465');
diff --git a/tests/unit/Mage/Tax/Helper/DataTest.php b/tests/unit/Mage/Tax/Helper/DataTest.php
@@ -225,7 +225,7 @@ public function testDisplayBothPrices(): void
      * @group Mage_Tax
      * @group Mage_Tax_Helper
      */
-    public function testGetIncExcTaxLabel($expectedResult, bool $flag): void
+    public function testGetIncExcTaxLabel(string $expectedResult, bool $flag): void
     {
         static::assertStringContainsString($expectedResult, self::$subject->getIncExcTaxLabel($flag));
     }
diff --git a/tests/unit/Traits/DataProvider/Mage/Rule/RuleTrait.php b/tests/unit/Traits/DataProvider/Mage/Rule/RuleTrait.php
@@ -43,7 +43,7 @@ public function provideValidateData(): Generator
         ];
         yield 'object with invalid date' => [
             [
-                0 => 'End Date must be greater than Start Date.',
+                'End Date must be greater than Start Date.',
             ],
             [
                 'from_date' => '2',
@@ -52,7 +52,7 @@ public function provideValidateData(): Generator
         ];
         yield 'object with empty website ids' => [
             [
-                0 => 'Websites must be specified.',
+                'Websites must be specified.',
             ],
             [
                 'website_ids' => '',
@@ -66,7 +66,7 @@ public function provideValidateData(): Generator
         ];
         yield 'object with empty customer group ids' => [
             [
-                0 => 'Customer Groups must be specified.',
+                'Customer Groups must be specified.',
             ],
             [
                 'customer_group_ids' => '',

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static function setUpBeforeClass(): void`
`42`	`42`	`* @group Mage_AdminNotification`
`43`	`43`	`* @group Mage_AdminNotification_Model`
`44`	`44`	`*/`
`45`		`- public function testGetSeverities($expectedResult, ?int $severity): void`
	`45`	`+ public function testGetSeverities(array\|string\|null $expectedResult, ?int $severity): void`
`46`	`46`	`{`
`47`	`47`	`static::assertSame($expectedResult, self::$subject->getSeverities($severity));`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static function setUpBeforeClass(): void`
`38`	`38`	`* @group Mage_Adminhtml`
`39`	`39`	`* @group Mage_Adminhtml_Helper`
`40`	`40`	`*/`
`41`		`- public function testEscapeHtmlWithLinks($expectedResult, $data): void`
	`41`	`+ public function testEscapeHtmlWithLinks(string $expectedResult, string $data): void`
`42`	`42`	`{`
`43`	`43`	`static::assertSame($expectedResult, self::$subject->escapeHtmlWithLinks($data, ['a']));`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function provideGetAttributeInputTypes(): Generator`
`76`	`76`	`* @group Mage_Catalog`
`77`	`77`	`* @group Mage_Catalog_Helper`
`78`	`78`	`*/`
`79`		`- public function testGetAttributeBackendModelByInputType($expectedResult, string $inputType): void`
	`79`	`+ public function testGetAttributeBackendModelByInputType(string $expectedResult, string $inputType): void`
`80`	`80`	`{`
`81`	`81`	`static::assertSame($expectedResult, self::$subject->getAttributeBackendModelByInputType($inputType));`
`82`	`82`	`}`
`@@ -94,7 +94,7 @@ public function provideGetAttributeBackendModelByInputType(): Generator`
`94`	`94`	`* @group Mage_Catalog`
`95`	`95`	`* @group Mage_Catalog_Helper`
`96`	`96`	`*/`
`97`		`- public function testGetAttributeSourceModelByInputType($expectedResult, string $inputType): void`
	`97`	`+ public function testGetAttributeSourceModelByInputType(string $expectedResult, string $inputType): void`
`98`	`98`	`{`
`99`	`99`	`static::assertSame($expectedResult, self::$subject->getAttributeSourceModelByInputType($inputType));`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function testGetUrlModel(): void`
`119`	`119`	`* @group Mage_Catalog`
`120`	`120`	`* @group Mage_Catalog_Model`
`121`	`121`	`*/`
`122`		`- public function testFormatUrlKey($expectedResult, string $locale): void`
	`122`	`+ public function testFormatUrlKey(string $expectedResult, string $locale): void`
`123`	`123`	`{`
`124`	`124`	`self::$subject->setLocale($locale);`
`125`	`125`	`static::assertSame($expectedResult, self::$subject->formatUrlKey($this->getTestString()));`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function testValidateUserValue(): void`
`51`	`51`	`* @group Mage_Catalog`
`52`	`52`	`* @group Mage_Catalog_Model`
`53`	`53`	`*/`
`54`		`- public function testPrepareForCart($expectedResult, bool $setIsValid = true, $setUserValue = null): void`
	`54`	`+ public function testPrepareForCart(?string $expectedResult, bool $setIsValid = true, ?string $setUserValue = null): void`
`55`	`55`	`{`
`56`	`56`	`self::$subject->setIsValid($setIsValid)->setUserValue($setUserValue);`
`57`	`57`	`static::assertSame($expectedResult, self::$subject->prepareForCart());`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public function testAfterCommitCallback(): void`
`166`	`166`	`* @group Mage_Catalog`
`167`	`167`	`* @group Mage_Catalog_Model`
`168`	`168`	`*/`
`169`		`- public function testFormatUrlKey($expectedResult, string $locale): void`
	`169`	`+ public function testFormatUrlKey(string $expectedResult, string $locale): void`
`170`	`170`	`{`
`171`	`171`	`self::$subject->setLocale($locale);`
`172`	`172`	`static::assertSame($expectedResult, self::$subject->formatUrlKey($this->getTestString()));`