diff --git a/composer.json b/composer.json index 0d1d9f6e95..9676fd0afa 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,7 @@ "phpstan/phpstan": "^1.0", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-strict-rules": "^1.3", - "phpunit/phpunit": "^9.5.5 || ^10.0", + "phpunit/phpunit": "^9.5.5 || ^10.0 || ^11.0", "symfony/process": "^4.4.30 || ^5.3.7 || ^6.0" }, "conflict": { diff --git a/tests/ButtonTest.php b/tests/ButtonTest.php index a102945ade..9cf3a35be6 100644 --- a/tests/ButtonTest.php +++ b/tests/ButtonTest.php @@ -20,6 +20,6 @@ public function testButtonIcon(): void { $button = new Button(['Load', 'icon' => 'pause']); $button->setApp($this->createApp()); - $button->renderToHtml(); + $button->renderAll(); } } diff --git a/tests/FormTest.php b/tests/FormTest.php index f00f3617c4..ec58968438 100644 --- a/tests/FormTest.php +++ b/tests/FormTest.php @@ -86,7 +86,7 @@ protected function assertFormSubmit(\Closure $createFormFx, array $postData, ?\C } }); - $form->renderToHtml(); + $form->renderAll(); $res = AppFormTestMock::assertInstanceOf($form->getApp())->output; if ($checkExpectedErrorsFx !== null) { @@ -377,7 +377,7 @@ public function testCheckboxWithNonBooleanException(): void $this->expectException(Exception::class); $this->expectExceptionMessage('Checkbox form control requires field with boolean type'); - $input->renderToHtml(); + $input->renderAll(); } public function testUploadNoUploadCallbackException(): void @@ -396,7 +396,7 @@ public function testUploadNoUploadCallbackException(): void $this->expectException(Exception::class); $this->expectExceptionMessage('Missing onUpload callback'); - $input->renderToHtml(); + $input->renderAll(); } public function testUploadNoDeleteCallbackException(): void @@ -415,7 +415,7 @@ public function testUploadNoDeleteCallbackException(): void $this->expectException(Exception::class); $this->expectExceptionMessage('Missing onDelete callback'); - $input->renderToHtml(); + $input->renderAll(); } } diff --git a/tests/JsIntegrationTest.php b/tests/JsIntegrationTest.php index 273492c637..73b2a36a99 100644 --- a/tests/JsIntegrationTest.php +++ b/tests/JsIntegrationTest.php @@ -19,7 +19,7 @@ public function testUniqueId1(): void { $v = new Button(['icon' => 'pencil']); $v->setApp($this->createApp()); - $v->renderToHtml(); + $v->renderAll(); self::assertNotEmpty($v->icon); self::assertNotEmpty($v->icon->name); // @phpstan-ignore-line @@ -32,7 +32,7 @@ public function testUniqueId2(): void $b1 = Button::addTo($v); $b2 = Button::addTo($v); $v->setApp($this->createApp()); - $v->renderToHtml(); + $v->renderAll(); self::assertNotSame($b1->name, $b2->name); } @@ -42,7 +42,7 @@ public function testChainFalse(): void $v = new Button(['name' => 'b']); $j = $v->js()->hide(); $v->setApp($this->createApp()); - $v->renderToHtml(); + $v->renderAll(); self::assertSame('$(\'#b\').hide()', $j->jsRender()); } diff --git a/tests/RenderTreeTest.php b/tests/RenderTreeTest.php index 07e66f9a5e..e86cb00927 100644 --- a/tests/RenderTreeTest.php +++ b/tests/RenderTreeTest.php @@ -19,7 +19,7 @@ public function testBasic(): void { $view = new View(); $view->setApp($this->createApp()); - $view->renderToHtml(); + $view->renderAll(); $view->getApp(); self::assertNotNull($view->template); @@ -30,7 +30,7 @@ public function testBasicNested(): void $view = new View(); $view2 = View::addTo($view); $view->setApp($this->createApp()); - $view->renderToHtml(); + $view->renderAll(); $view2->getApp(); self::assertNotNull($view2->template); diff --git a/tests/TableTest.php b/tests/TableTest.php index 3ef7311cdd..270e7c704d 100644 --- a/tests/TableTest.php +++ b/tests/TableTest.php @@ -36,7 +36,7 @@ public function testAddColumnWithoutModel(): void $table->addColumn('eight', [Table\Column\Link::class, ['id' => 3]]); $table->addColumn('nine'); - $table->renderToHtml(); + $table->renderAll(); } public function testAddColumnAlreadyExistsException(): void diff --git a/tests/ViewTest.php b/tests/ViewTest.php index 5a580e6ff0..23353d633b 100644 --- a/tests/ViewTest.php +++ b/tests/ViewTest.php @@ -41,7 +41,7 @@ public function testAddAfterRenderException(): void $v->set('foo'); $v->setApp($this->createApp()); - $v->renderToHtml(); + $v->renderAll(); $this->expectException(Exception::class); View::addTo($v);