Simplify tests (#301)

composer.json

@@ -22,16 +22,15 @@
         "php": "^8.1",
         "yiisoft/friendly-exception": "^1.0",
         "yiisoft/html": "^3.3",
-        "yiisoft/widget": "^2.1"
+        "yiisoft/widget": "^2.2"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.7",
         "phpunit/phpunit": "^10.5",
         "rector/rector": "^0.18.11",
         "roave/infection-static-analysis-plugin": "^1.34",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^5.16",
-        "yiisoft/test-support": " ^3.0"
+        "vimeo/psalm": "^5.16"
     },
     "autoload": {
         "psr-4": {

config/bootstrap.php

@@ -2,15 +2,14 @@
 
 declare(strict_types=1);
 
-use Psr\Container\ContainerInterface;
 use Yiisoft\Form\ThemeContainer;
 
 /**
  * @var array $params
  */
 
 return [
-    static function (ContainerInterface $container) use ($params) {
+    static function () use ($params) {
         ThemeContainer::initialize(
             $params['yiisoft/form']['themes'],
             $params['yiisoft/form']['defaultTheme'],

tests/ConfigTest.php

@@ -8,15 +8,12 @@
 use Yiisoft\Form\PureField;
 use Yiisoft\Form\ThemeContainer;
 use Yiisoft\Form\Field\Hidden;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class ConfigTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 
@@ -30,7 +27,7 @@ public function testBase(): void
 
         $this->assertIsCallable($bootstrap);
 
-        $bootstrap(new SimpleContainer());
+        $bootstrap();
     }
 
     public function testCustomParams(): void
@@ -49,7 +46,7 @@ public function testCustomParams(): void
 
         $bootstrapList = $this->getBootstrapList($params);
         $bootstrap = array_shift($bootstrapList);
-        $bootstrap(new SimpleContainer());
+        $bootstrap();
 
         $input = PureField::hidden('key', 'x100');
 

tests/Field/Base/BaseFieldTest.php

@@ -8,15 +8,12 @@
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\Tests\Support\StubBaseField;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class BaseFieldTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 
@@ -151,7 +148,6 @@ public function testBeginEndWithoutContainer(): void
 
     public function testCustomTheme(): void
     {
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize(
             configs: [
                 'default' => [

tests/Field/Base/ButtonFieldTest.php

@@ -9,15 +9,12 @@
 use Yiisoft\Form\Tests\Support\StubButtonField;
 use Yiisoft\Form\ThemeContainer;
 use Yiisoft\Html\Tag\Button as ButtonTag;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class ButtonFieldTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/Base/DateTimeInputFieldTest.php

@@ -11,15 +11,12 @@
 use Yiisoft\Form\Tests\Support\StubDateTimeInputField;
 use Yiisoft\Form\Tests\Support\StubValidationRulesEnricher;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class DateTimeInputFieldTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/Base/FieldContentTraitTest.php

@@ -11,15 +11,12 @@
 use Yiisoft\Form\ThemeContainer;
 use Yiisoft\Html\Tag\P;
 use Yiisoft\Html\Tag\Span;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class FieldContentTraitTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/Base/InputFieldTest.php

@@ -10,15 +10,12 @@
 use Yiisoft\Form\Tests\Support\StringableObject;
 use Yiisoft\Form\Tests\Support\StubInputField;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class InputFieldTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/Base/PartsFieldTest.php

@@ -10,15 +10,12 @@
 use stdClass;
 use Yiisoft\Form\Tests\Support\StubPartsField;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class PartsFieldTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/Base/Placeholder/PlaceholderTraitTest.php

@@ -8,15 +8,12 @@
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\Tests\Support\Placeholder\PlaceholderField;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class PlaceholderTraitTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/Base/ValidationClass/ValidationClassTraitTest.php

@@ -9,15 +9,12 @@
 use Yiisoft\Form\Field\Base\InputData\PureInputData;
 use Yiisoft\Form\Tests\Support\ValidationClass\ValidationClassField;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class ValidationClassTraitTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/ButtonGroupTest.php

@@ -8,15 +8,12 @@
 use Yiisoft\Form\Field\ButtonGroup;
 use Yiisoft\Form\ThemeContainer;
 use Yiisoft\Html\Html;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class ButtonGroupTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/ButtonTest.php

@@ -7,15 +7,12 @@
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\Field\Button;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class ButtonTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/CheckboxListTest.php

@@ -13,15 +13,12 @@
 use Yiisoft\Form\ThemeContainer;
 use Yiisoft\Html\Html;
 use Yiisoft\Html\Widget\CheckboxList\CheckboxItem;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class CheckboxListTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/CheckboxTest.php

@@ -12,15 +12,12 @@
 use Yiisoft\Form\Field\Checkbox;
 use Yiisoft\Form\Tests\Support\StringableObject;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class CheckboxTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/DateTest.php

@@ -8,15 +8,12 @@
 use Yiisoft\Form\Field\Base\InputData\PureInputData;
 use Yiisoft\Form\Field\Date;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class DateTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/DateTimeLocalTest.php

@@ -8,15 +8,12 @@
 use Yiisoft\Form\Field\Base\InputData\PureInputData;
 use Yiisoft\Form\Field\DateTimeLocal;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class DateTimeLocalTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/DateTimeTest.php

@@ -8,15 +8,12 @@
 use Yiisoft\Form\Field\Base\InputData\PureInputData;
 use Yiisoft\Form\Field\DateTime;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class DateTimeTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/EmailTest.php

@@ -11,15 +11,12 @@
 use Yiisoft\Form\Field\Email;
 use Yiisoft\Form\Tests\Support\StubValidationRulesEnricher;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class EmailTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/ErrorSummaryTest.php

@@ -2,21 +2,18 @@
 
 declare(strict_types=1);
 
-namespace Field;
+namespace Yiisoft\Form\Tests\Field;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Form\Field\ErrorSummary;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class ErrorSummaryTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/FieldsetTest.php

@@ -9,15 +9,12 @@
 use Yiisoft\Form\PureField;
 use Yiisoft\Form\ThemeContainer;
 use Yiisoft\Html\Tag\Legend;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class FieldsetTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }
 

tests/Field/FileTest.php

@@ -10,15 +10,12 @@
 use Yiisoft\Form\Field\File;
 use Yiisoft\Form\Tests\Support\StubValidationRulesEnricher;
 use Yiisoft\Form\ThemeContainer;
-use Yiisoft\Test\Support\Container\SimpleContainer;
-use Yiisoft\Widget\WidgetFactory;
 
 final class FileTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        WidgetFactory::initialize(new SimpleContainer());
         ThemeContainer::initialize();
     }