Upgrade PHP minimum version to 8.2 and modernize test suite

.github/workflows/tests.yml

@@ -5,33 +5,39 @@ on:
   workflow_dispatch:
 
   push:
-    branches: [ "*" ]
+    branches: ["*"]
 
   schedule:
     - cron: "0 8 * * 1"
 
 jobs:
-  test83:
+  test85:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.3"
+      php: "8.5"
 
-  test82:
+  test84:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.2"
+      php: "8.4"
 
-  test81:
+  test83:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.1"
+      php: "8.3"
+
+  test82:
+    name: "Nette Tester"
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
+    with:
+      php: "8.2"
 
   testlower:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.1"
+      php: "8.2"
       composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest"

composer.json

@@ -17,17 +17,17 @@
     }
   ],
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.2",
     "nette/forms": "^3.1.14",
     "nette/http": "^3.2.3"
   },
   "require-dev": {
     "latte/latte": "^3.0.12",
     "nette/application": "^3.2.0",
     "nette/di": "^3.1.8",
-    "contributte/qa": "^0.4",
-    "contributte/tester": "^0.3",
-    "contributte/phpstan": "^0.1",
+    "contributte/qa": "~0.4.0",
+    "contributte/tester": "~0.3.0",
+    "contributte/phpstan": "~0.1.0",
     "mockery/mockery": "^1.6.7"
   },
   "conflict": {

phpstan.neon

@@ -3,7 +3,7 @@ includes:
 
 parameters:
 	level: 8
-	phpVersion: 80100
+	phpVersion: 80200
 
 	scanDirectories:
 		- src
@@ -14,8 +14,3 @@ parameters:
 	paths:
 		- src
 		- .docs
-
-	ignoreErrors:
-
-	excludePaths:
-		- src/Latte/WizardMacros.php

ruleset.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
 	<!-- Rulesets -->
-	<rule ref="./vendor/contributte/qa/ruleset-8.0.xml">
+	<rule ref="./vendor/contributte/qa/ruleset-8.2.xml">
 		<exclude name="SlevomatCodingStandard.PHP.DisallowReference.DisallowedReturningReference"/>
 	</rule>
 

tests/Cases/WizardTest.DefaultValues.phpt

@@ -0,0 +1,61 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Cases;
+
+use Contributte\Tester\Toolkit;
+use Nette\Application\Request as AppRequest;
+use Nette\Http\Request as HttpRequest;
+use Nette\Http\UrlScript;
+use Tester\Assert;
+use Tests\Fixtures\DummyWizard;
+use Tests\Fixtures\DummyWizardPresenter;
+use Tests\Fixtures\WizardPresenterFactory;
+
+require_once __DIR__ . '/../bootstrap.php';
+
+Toolkit::test(function (): void {
+	$presenter = WizardPresenterFactory::create(
+		httpRequest: new HttpRequest(
+			url: new UrlScript('http://localhost'),
+			method: 'POST',
+			post: [
+				'_do' => 'wizard-step1-submit',
+				'name' => 'This is default name',
+				'skip' => '0',
+				DummyWizard::NEXT_SUBMIT_NAME => 'submit',
+			]
+		)
+	);
+
+	$presenter->onStartup[] = function (DummyWizardPresenter $presenter): void {
+		/** @var DummyWizard $wizard */
+		$wizard = $presenter->getComponent('wizard');
+
+		$defaultValues = $wizard->create()->getValues('array');
+		Assert::same([
+			'name' => 'This is default name',
+			'skip' => false,
+		], $defaultValues);
+	};
+
+	$presenter->onShutdown[] = function (DummyWizardPresenter $presenter): void {
+		/** @var DummyWizard $wizard */
+		$wizard = $presenter->getComponent('wizard');
+
+		Assert::false($wizard->isSuccess());
+
+		Assert::same(0, DummyWizard::$called);
+		Assert::same([
+			'name' => 'This is default name',
+			'skip' => false,
+		], $wizard->getValues(true));
+		Assert::same(2, $wizard->getCurrentStep());
+		Assert::same(2, $wizard->getLastStep());
+	};
+
+	$presenter->run(new AppRequest(
+		name: 'test',
+		method: $presenter->getHttpRequest()->getMethod(),
+		post: $presenter->getHttpRequest()->getPost(),
+	));
+});

tests/Cases/WizardTest.Finish.phpt

@@ -0,0 +1,81 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Cases;
+
+use Contributte\Tester\Toolkit;
+use Nette\Application\Request as AppRequest;
+use Nette\Application\Responses\TextResponse;
+use Nette\Application\UI\Form;
+use Nette\Http\Request as HttpRequest;
+use Nette\Http\UrlScript;
+use Tester\Assert;
+use Tester\DomQuery;
+use Tests\Fixtures\DummyWizard;
+use Tests\Fixtures\DummyWizardPresenter;
+use Tests\Fixtures\WizardPresenterFactory;
+
+require_once __DIR__ . '/../bootstrap.php';
+
+Toolkit::test(function (): void {
+	$presenter = WizardPresenterFactory::create(
+		httpRequest: new HttpRequest(
+			url: new UrlScript('http://localhost'),
+			method: 'POST',
+			post: [
+				'_do' => 'wizard-step3-submit',
+				'skip' => 'false',
+				'email' => 'email',
+				DummyWizard::FINISH_SUBMIT_NAME => 'submit',
+			]
+		)
+	);
+
+	$presenter->onStartup[] = function (DummyWizardPresenter $presenter): void {
+		/** @var DummyWizard $wizard */
+		$wizard = $presenter->getComponent('wizard');
+
+		/** @var Form $step1 */
+		$step1 = $wizard->getComponent('step1');
+		$step1->setValues(['name' => 'Name']);
+		$step1->setSubmittedBy($step1['next']);
+		$step1->fireEvents();
+
+		/** @var Form $step2 */
+		$step2 = $wizard->getComponent('step2');
+		$step2->setValues(['optional' => 'Optional']);
+		$step2->setSubmittedBy($step2['next']);
+		$step2->fireEvents();
+	};
+
+	$presenter->onShutdown[] = function (DummyWizardPresenter $presenter): void {
+		/** @var DummyWizard $wizard */
+		$wizard = $presenter->getComponent('wizard');
+
+		Assert::true($wizard->isSuccess());
+		Assert::same(1, DummyWizard::$called);
+		Assert::same([
+			'name' => 'Name',
+			'skip' => false,
+			'optional' => 'Optional',
+			'email' => 'email',
+		], $wizard->getValues(true));
+		Assert::same([
+			'name' => 'Name',
+			'skip' => false,
+			'optional' => 'Optional',
+			'email' => 'email',
+		], DummyWizard::$values);
+		Assert::same(1, $wizard->getCurrentStep());
+		Assert::same(1, $wizard->getLastStep());
+	};
+
+	/** @var TextResponse $response */
+	$response = $presenter->run(new AppRequest(
+		name: 'test',
+		method: $presenter->getHttpRequest()->getMethod(),
+		post: $presenter->getHttpRequest()->getPost(),
+	));
+
+	$dom = DomQuery::fromHtml((string) $response->getSource());
+	Assert::true($dom->has('#success'));
+});

tests/Cases/WizardTest.InvalidSubmit.phpt

@@ -0,0 +1,46 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Cases;
+
+use Contributte\Tester\Toolkit;
+use Nette\Application\Request as AppRequest;
+use Nette\Application\Responses\TextResponse;
+use Nette\Http\Request as HttpRequest;
+use Nette\Http\UrlScript;
+use Tester\Assert;
+use Tester\DomQuery;
+use Tests\Fixtures\DummyWizard;
+use Tests\Fixtures\WizardPresenterFactory;
+
+require_once __DIR__ . '/../bootstrap.php';
+
+Toolkit::test(function (): void {
+	$presenter = WizardPresenterFactory::create(
+		httpRequest: new HttpRequest(
+			url: new UrlScript('http://localhost'),
+			method: 'POST',
+			post: [
+				'_do' => 'wizard-step1-submit',
+				DummyWizard::NEXT_SUBMIT_NAME => 'true',
+			]
+		)
+	);
+
+	/** @var TextResponse $response */
+	$response = $presenter->run(new AppRequest(
+		name: 'test',
+		method: $presenter->getHttpRequest()->getMethod(),
+		post: $presenter->getHttpRequest()->getPost(),
+	));
+
+	/** @var DummyWizard $wizard */
+	$wizard = $presenter->getComponent('wizard');
+
+	$dom = DomQuery::fromHtml((string) $response->getSource());
+	Assert::true($dom->has('#frm-wizard-step1'));
+
+	Assert::same(1, $wizard->getCurrentStep());
+	Assert::same(0, DummyWizard::$called);
+	Assert::same($wizard->create('1'), $wizard->create());
+	Assert::same(1, $wizard->getLastStep());
+});

tests/Cases/WizardTest.OptionalStep.phpt

@@ -0,0 +1,76 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Cases;
+
+use Contributte\Tester\Toolkit;
+use Nette\Application\Request as AppRequest;
+use Nette\Application\Responses\TextResponse;
+use Nette\Application\UI\Form;
+use Nette\Http\Request as HttpRequest;
+use Nette\Http\UrlScript;
+use Tester\Assert;
+use Tester\DomQuery;
+use Tests\Fixtures\DummyWizard;
+use Tests\Fixtures\DummyWizardPresenter;
+use Tests\Fixtures\WizardPresenterFactory;
+
+require_once __DIR__ . '/../bootstrap.php';
+
+Toolkit::test(function (): void {
+	$presenter = WizardPresenterFactory::create(
+		httpRequest: new HttpRequest(
+			url: new UrlScript('http://localhost'),
+			method: 'POST',
+			post: [
+				'_do' => 'wizard-step3-submit',
+				'skip' => 'false',
+				'email' => 'email',
+				DummyWizard::FINISH_SUBMIT_NAME => 'submit',
+			]
+		)
+	);
+
+	$presenter->onStartup[] = function (DummyWizardPresenter $presenter): void {
+		/** @var DummyWizard $wizard */
+		$wizard = $presenter->getComponent('wizard');
+
+		/** @var Form $step1 */
+		$step1 = $wizard->getComponent('step1');
+		$step1->setValues([
+			'name' => 'Name',
+			'skip' => '1',
+		]);
+		$step1->setSubmittedBy($step1['next']);
+		$step1->fireEvents();
+	};
+
+	$presenter->onShutdown[] = function (DummyWizardPresenter $presenter): void {
+		/** @var DummyWizard $wizard */
+		$wizard = $presenter->getComponent('wizard');
+
+		Assert::true($wizard->isSuccess());
+		Assert::same(1, DummyWizard::$called);
+		Assert::same([
+			'name' => 'Name',
+			'skip' => true,
+			'email' => 'email',
+		], $wizard->getValues(true));
+		Assert::same([
+			'name' => 'Name',
+			'skip' => true,
+			'email' => 'email',
+		], DummyWizard::$values);
+		Assert::same(1, $wizard->getCurrentStep());
+		Assert::same(1, $wizard->getLastStep());
+	};
+
+	/** @var TextResponse $response */
+	$response = $presenter->run(new AppRequest(
+		name: 'test',
+		method: $presenter->getHttpRequest()->getMethod(),
+		post: $presenter->getHttpRequest()->getPost(),
+	));
+
+	$dom = DomQuery::fromHtml((string) $response->getSource());
+	Assert::true($dom->has('#success'));
+});