Fix remaining mutants (#354)

* Fix remaining mutants * Apply fixes from StyleCI * Comment (temp) * WIP * MSI 100% * Fix Psalm * Review fix * Fix new mutant --------- Co-authored-by: StyleCI Bot <[email protected]>
yiisoft · Jul 18, 2024 · b65954f · b65954f
1 parent dd0c4e1
commit b65954f
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 38 deletions.
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -29,7 +29,7 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.2']
+        ['8.3']
       bin-name: infection
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
diff --git a/src/Field/Base/PartsField.php b/src/Field/Base/PartsField.php
@@ -70,7 +70,7 @@ final public function tokens(array $tokens): static
                 throw new InvalidArgumentException(
                     sprintf(
                         'Token should be string. %s given.',
-                        $token,
+                        get_debug_type($token),
                     )
                 );
             }

diff --git a/src/Field/Checkbox.php b/src/Field/Checkbox.php
@@ -12,7 +12,6 @@
 use Yiisoft\Html\Html;
 
 use function is_bool;
-use function is_object;
 use function is_string;
 
 /**
@@ -211,15 +210,15 @@ public function uncheckValue(bool|float|int|string|Stringable|null $value): self
     protected function generateInput(): string
     {
         $value = $this->getValue();
-
-        if (!is_bool($value)
+        if (
+            !is_bool($value)
             && !is_string($value)
+            && !$value instanceof Stringable
             && !is_numeric($value)
             && $value !== null
-            && (!is_object($value) || !method_exists($value, '__toString'))
         ) {
             throw new InvalidArgumentException(
-                'Checkbox widget requires a string, numeric, bool, Stringable or null value.'
+                'Checkbox widget requires a string, Stringable, numeric, bool or null value.'
             );
         }
 

diff --git a/src/Field/RadioList.php b/src/Field/RadioList.php
@@ -163,15 +163,15 @@ protected function generateInput(): string
         }
 
         $value = $this->getValue();
-
-        if (!is_bool($value)
+        if (
+            !is_bool($value)
             && !is_string($value)
+            && !$value instanceof Stringable
             && !is_numeric($value)
             && $value !== null
-            && (!is_object($value) || !method_exists($value, '__toString'))
         ) {
             throw new InvalidArgumentException(
-                '"RadioList" field requires a string, numeric, bool, Stringable or null value.'
+                '"RadioList" field requires a string, Stringable, numeric, bool or null value.'
             );
         }
         /** @psalm-var Stringable|scalar $value */

diff --git a/src/Field/Select.php b/src/Field/Select.php
@@ -260,14 +260,15 @@ protected function generateInput(): string
                 );
             }
         } else {
-            if (!is_bool($value)
+            if (
+                !is_bool($value)
                 && !is_string($value)
+                && !$value instanceof Stringable
                 && !is_numeric($value)
                 && $value !== null
-                && (!is_object($value) || !method_exists($value, '__toString'))
             ) {
                 throw new InvalidArgumentException(
-                    'Non-multiple Select field requires a string, numeric, bool, Stringable or null value.'
+                    'Non-multiple Select field requires a string, Stringable, numeric, bool or null value.'
                 );
             }
             $value = $value === null ? [] : [$value];

diff --git a/tests/Field/Base/PartsFieldTest.php b/tests/Field/Base/PartsFieldTest.php
@@ -8,6 +8,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use stdClass;
+use Yiisoft\Form\Tests\Support\StringableObject;
 use Yiisoft\Form\Tests\Support\StubPartsField;
 use Yiisoft\Form\Theme\ThemeContainer;
 
@@ -120,6 +121,15 @@ public function testBuiltinToken(): void
         $field->token('{hint}', 'hello');
     }
 
+    public function testBuiltinTokens(): void
+    {
+        $field = StubPartsField::widget();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Token name "{hint}" is built-in.');
+        $field->tokens(['{hint}' => 'hello']);
+    }
+
     public function testEmptyToken(): void
     {
         $field = StubPartsField::widget();
@@ -129,12 +139,21 @@ public function testEmptyToken(): void
         $field->token('', 'hello');
     }
 
+    public function testEmptyTokens(): void
+    {
+        $field = StubPartsField::widget();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Token must be non-empty string.');
+        $field->tokens(['' => 'hello']);
+    }
+
     public function testNonStringTokenName(): void
     {
         $field = StubPartsField::widget();
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Token should be string. 0 given.');
+        $this->expectExceptionMessage('Token should be string. int given.');
         $field->tokens(['hello']);
     }
 
@@ -147,6 +166,16 @@ public function testNonStringTokenValue(): void
         $field->tokens(['{before}' => new stdClass()]);
     }
 
+    public function testStringableTokenValue(): void
+    {
+        $actualHtml = StubPartsField::widget()
+            ->tokens(['{custom}' => new StringableObject('value')])
+            ->template('{custom}')
+            ->useContainer(false)
+            ->render();
+        $this->assertSame('value', $actualHtml);
+    }
+
     public function testHideLabel(): void
     {
         $result = StubPartsField::widget()

diff --git a/tests/Field/CheckboxTest.php b/tests/Field/CheckboxTest.php
@@ -615,10 +615,25 @@ public function testInvalidValue(): void
         $field = Checkbox::widget()->value(new stdClass());
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Checkbox widget requires a string, numeric, bool, Stringable or null value.');
+        $this->expectExceptionMessage('Checkbox widget requires a string, Stringable, numeric, bool or null value.');
         $field->render();
     }
 
+    public function testStringableValue(): void
+    {
+        $actualHtml = Checkbox::widget()
+            ->inputValue('value')
+            ->value(new StringableObject('value'))
+            ->render();
+        $expectedHtml = <<<HTML
+        <div>
+        <input type="checkbox" value="value" checked>
+        </div>
+        HTML;
+
+        $this->assertSame($expectedHtml, $actualHtml);
+    }
+
     public function testInvalidClassesWithCustomError(): void
     {
         $inputData = new InputData('company', '');

diff --git a/tests/Field/RadioListTest.php b/tests/Field/RadioListTest.php
@@ -587,35 +587,54 @@ public function testDisabled(): void
         $this->assertSame($expected, $result);
     }
 
-    public function testWithStringableValue(): void
-    {
-        $result = RadioList::widget()
-            ->name('number')
-            ->useContainer(false)
-            ->hideLabel()
-            ->items([1 => 'One', 2 => 'Two'])
-            ->value(new StringableObject('2'))
-            ->render();
-
-        $expected = <<<HTML
-            <div>
-            <label><input type="radio" name="number" value="1"> One</label>
-            <label><input type="radio" name="number" value="2" checked> Two</label>
-            </div>
-            HTML;
-
-        $this->assertSame($expected, $result);
-    }
-
     public function testInvalidValue(): void
     {
         $field = RadioList::widget()->name('test')->value([]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('"RadioList" field requires a string, numeric, bool, Stringable or null value.');
+        $this->expectExceptionMessage('"RadioList" field requires a string, Stringable, numeric, bool or null value.');
         $field->render();
     }
 
+    public static function dataValue(): array
+    {
+        return [
+            'bool' => [
+                true,
+                <<<HTML
+                <div>
+                <label><input type="radio" name="number" value="1" checked> One</label>
+                <label><input type="radio" name="number" value="2"> Two</label>
+                </div>
+                HTML,
+            ],
+            'stringable' => [
+                new StringableObject('1'),
+                <<<HTML
+                <div>
+                <label><input type="radio" name="number" value="1" checked> One</label>
+                <label><input type="radio" name="number" value="2"> Two</label>
+                </div>
+                HTML,
+            ],
+        ];
+    }
+
+    #[DataProvider('dataValue')]
+    public function testValue(mixed $value, string $expectedHtml): void
+    {
+        $actualHtml = RadioList::widget()
+            ->name('number')
+            ->value($value)
+            ->items([
+                '1' => 'One',
+                '2' => 'Two',
+            ])
+            ->useContainer(false)
+            ->render();
+        $this->assertSame($expectedHtml, $actualHtml);
+    }
+
     public function testWithoutName(): void
     {
         $field = RadioList::widget();

diff --git a/tests/Field/SelectTest.php b/tests/Field/SelectTest.php
@@ -12,6 +12,7 @@
 use Yiisoft\Form\PureField\InputData;
 use Yiisoft\Form\Tests\Support\NullValidationRulesEnricher;
 use Yiisoft\Form\Tests\Support\RequiredValidationRulesEnricher;
+use Yiisoft\Form\Tests\Support\StringableObject;
 use Yiisoft\Form\Tests\Support\StubValidationRulesEnricher;
 use Yiisoft\Form\Theme\ThemeContainer;
 use Yiisoft\Html\Tag\Optgroup;
@@ -659,7 +660,7 @@ public function testSingleInvalidValue(): void
 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(
-            'Non-multiple Select field requires a string, numeric, bool, Stringable or null value.'
+            'Non-multiple Select field requires a string, Stringable, numeric, bool or null value.'
         );
         $widget->render();
     }
@@ -673,6 +674,21 @@ public function testMultipleInvalidValue(): void
         $widget->render();
     }
 
+    public function testStringableValue(): void
+    {
+        $actualHtml = Select::widget()
+            ->optionsData(['1' => 'One'])
+            ->value(new StringableObject('1'))
+            ->useContainer(false)
+            ->render();
+        $expectedHtml = <<<HTML
+        <select>
+        <option value="1" selected>One</option>
+        </select>
+        HTML;
+        $this->assertSame($expectedHtml, $actualHtml);
+    }
+
     public function testEnrichFromValidationRulesEnabled(): void
     {
         $html = Select::widget()