composer: Update Nette to 3.2

.php-cs-fixer.dist.php

@@ -12,8 +12,7 @@
 $rules = [
 	'@Symfony' => true,
 	'@Symfony:risky' => true,
-	'@PHP81Migration' => true,
-	'@PHP80Migration:risky' => true,
+	'@autoPHPMigration:risky' => true,
 
 	// overwrite some Symfony rules
 	'braces_position' => [

README.md

@@ -21,7 +21,7 @@ Then you will need to build the assets with `npm run build` or `npm run dev`. Th
 2. Run SQL from `install.sql`.
 3. Configure the event information in `app/Config/local.neon` as described in the [configuration documentation](docs/configuration.md). Do not forget to set up admin password and database credentials in either `app/Config/local.neon` or `app/Config/private.neon`.
 4. Make `temp` and `log` directories writeable.
-5. Change e-mail templates in `app/Templates/Mail`.
+5. Change e-mail templates in `app/Presenters/templates/Mail`.
 6. The entry point of the application is in the `www` directory, configure your web server accordingly.
 
 ## Thanks

app/Components/BootstrapRadioList.php

@@ -12,8 +12,7 @@
  * Because Bs5FormRenderer only gets us so far.
  */
 final class BootstrapRadioList extends Controls\RadioList {
-	/** @var bool */
-	public $generateId = true;
+	public bool $generateId = true;
 
 	public function getControl(): Html {
 		if ($this->hasErrors()) {

app/Components/Helpers.php

@@ -12,10 +12,12 @@
 use Stringable;
 
 /**
- * Nette forms helper modified to work better with Bootstrap styles.
+ * A subset of `Nette\Forms\Helpers` modified to work better with Bootstrap styles.
  */
-class Helpers extends Nette\Forms\Helpers {
+final class Helpers {
 	/**
+	 * The difference from `Nette\Forms\Helpers` is that we move `label` tag after the `input` tag, instead of having the former wrap the latter.
+	 *
 	 * @param array<string, mixed> $inputAttrs
 	 * @param array<string, mixed> $labelAttrs
 	 * @param Html|Stringable|null $wrapper
@@ -24,7 +26,7 @@ public static function createInputList(
 		array $items,
 		?array $inputAttrs = null,
 		?array $labelAttrs = null,
-		$wrapper = null
+		$wrapper = null,
 	): string {
 		[$inputAttrs, $inputTag] = self::prepareAttrs($inputAttrs, 'input');
 		[$labelAttrs, $labelTag] = self::prepareAttrs($labelAttrs, 'label');
@@ -44,7 +46,7 @@ public static function createInputList(
 
 			$input->value = $value;
 			$res .= ($res === '' && $wrapperEnd === '' ? '' : $wrapper)
-				. $inputTag . $input->attributes() . (Html::$xhtml ? ' />' : '>')
+				. $inputTag . $input->attributes() . '>'
 				. $labelTag . $label->attributes() . '>'
 				. ($caption instanceof Nette\HtmlStringable ? $caption : htmlspecialchars((string) $caption, \ENT_NOQUOTES, 'UTF-8'))
 				. '</label>'
@@ -55,6 +57,8 @@ public static function createInputList(
 	}
 
 	/**
+	 * This is copied as is from `Nette\Forms\Helpers` since we cannot access it from here.
+	 *
 	 * @param array<string, mixed> $attrs
 	 *
 	 * @return array{array<string, array<string, mixed>>, string}
@@ -66,7 +70,7 @@ private static function prepareAttrs(?array $attrs, string $name): array {
 				$p = substr($k, 0, -1);
 				unset($attrs[$k], $attrs[$p]);
 				if ($k[-1] === '?') {
-					$dynamic[$p] = array_fill_keys((array) $v, true);
+					$dynamic[$p] = array_fill_keys((array) $v, value: true);
 				} elseif (\is_array($v) && $v) {
 					$dynamic[$p] = $v;
 				} else {

app/Config/common.neon

@@ -15,8 +15,7 @@ parameters:
 
 application:
 	errorPresenter: Error
-	mapping:
-		*: App\*Module\Presenters\*Presenter
+	mapping: App\*Module\Presenters\*Presenter
 
 di:
 	export:
@@ -31,7 +30,7 @@ latte:
 	strictTypes: true
 	strictParsing: true
 	extensions:
-		- App\Templates\Accessory\LatteExtension
+		- App\Presenters\Accessory\LatteExtension
 
 session:
 	autoStart: yes
@@ -60,17 +59,17 @@ orm:
 
 services:
 	- App\Helpers\EmailFactory(%appDir%)
-	- App\Helpers\Parameters(%parameters%)
+	- App\Helpers\Parameters(@container::getParameters())
 	- App\Helpers\SpaydQrGenerator
 	- App\Model\Configuration\Entries::from(%entries%)
 	- App\Model\TeamManager(%adminPassword%)
 	- App\Forms\FormFactory
 	- App\Forms\TeamFormFactory
 	- App\Router\RouterFactory::createRouter
-	- App\Templates\Filters\CategoryFormatFilter
-	- App\Templates\Filters\CurrencyExchangeFilter
-	- App\Templates\Filters\PriceFilter
-	- App\Templates\Filters\WrapInParagraphsFilter
+	- App\Presenters\Accessory\Filters\CategoryFormatFilter
+	- App\Presenters\Accessory\Filters\CurrencyExchangeFilter
+	- App\Presenters\Accessory\Filters\PriceFilter
+	- App\Presenters\Accessory\Filters\WrapInParagraphsFilter
 	exchange: Money\Exchange\FixedExchange([])
 
 translation:

app/Exporters/CsvExporter.php

@@ -10,7 +10,7 @@
 use App\Model\Configuration\Fields;
 use App\Model\Orm\Person\Person;
 use App\Model\Orm\Team\Team;
-use App\Templates\Filters\CategoryFormatFilter;
+use App\Presenters\Accessory\Filters\CategoryFormatFilter;
 use Nextras\Orm\Collection\ICollection;
 use SplFileObject;
 

app/Exporters/MeosExporter.php

@@ -5,7 +5,7 @@
 namespace App\Exporters;
 
 use App\Model\Orm\Team\Team;
-use App\Templates\Filters\CategoryFormatFilter;
+use App\Presenters\Accessory\Filters\CategoryFormatFilter;
 use Nette\Utils\Strings;
 use Nextras\Orm\Collection\ICollection;
 use SplFileObject;

app/Helpers/EmailFactory.php

@@ -17,8 +17,11 @@ public function __construct(
 	) {
 	}
 
+	/**
+	 * @param non-empty-string $mailHtml
+	 */
 	public function create(string $mailHtml): string {
-		$css = @file_get_contents($this->appDir . '/Templates/Mail/style.css');
+		$css = @file_get_contents($this->appDir . '/Presenters/templates/Mail/style.css');
 		\assert($css !== false, 'E-mail stylesheet must be readable');
 		$domDocument = CssInliner::fromHtml($mailHtml)
 			->inlineCss($css)

app/Helpers/NeonIntlLoader.php

@@ -11,7 +11,7 @@ final class NeonIntlLoader extends Translation\Loaders\Neon {
 	public function load(
 		mixed $resource,
 		string $locale,
-		string $domain = 'messages'
+		string $domain = 'messages',
 	): MessageCatalogue {
 		return parent::load($resource, $locale, $domain . '+intl-icu');
 	}

app/Locale/Translated.php

@@ -7,6 +7,14 @@
 
 namespace App\Locale;
 
-interface Translated {
-	public function getMessage(string $locale): string;
+use Exception;
+use Stringable;
+
+abstract class Translated implements Stringable {
+	abstract public function getMessage(string $locale): string;
+
+	public function __toString(): string {
+		// We rely on custom Translator to call getMessage instead.
+		throw new Exception(__CLASS__ . ' should not be Stringified');
+	}
 }

app/Locale/Translator.php

@@ -12,7 +12,7 @@
 class Translator extends ContributeTranslator {
 	public function translate(
 		$message,
-		...$parameters
+		...$parameters,
 	): string {
 		if ($message instanceof Translated) {
 			return $message->getMessage($this->getLocale());

app/Model/Configuration/Category.php

@@ -38,7 +38,7 @@ public static function from(
 		string $key,
 		array $category,
 		Fees $parentFees,
-		DateTimeInterface $eventDate
+		DateTimeInterface $eventDate,
 	): self {
 		$fees = Fees::from($category['fees'] ?? [], $parentFees);
 		if ($fees->person === null) {

app/Model/Configuration/Helpers.php

@@ -32,7 +32,7 @@ public static function parseTranslatable(string $context, mixed $translatable, a
 		if (\is_array($translatable)) {
 			self::checkAllLocalesPresent($context, $translatable, $allLocales);
 
-			return new class($translatable) implements Translated {
+			return new class($translatable) extends Translated {
 				public function __construct(
 					private readonly array $translatable,
 				) {

app/Templates/Filters/CategoryFormatFilter.php → app/Presenters/Accessory/Filters/CategoryFormatFilter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Templates\Filters;
+namespace App\Presenters\Accessory\Filters;
 
 use App\Model\Configuration\Entries;
 use App\Model\Orm\Team\Team;

app/Templates/Filters/CurrencyExchangeFilter.php → app/Presenters/Accessory/Filters/CurrencyExchangeFilter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Templates\Filters;
+namespace App\Presenters\Accessory\Filters;
 
 use Money\Converter;
 use Money\Currencies\ISOCurrencies;

app/Templates/Filters/PriceFilter.php → app/Presenters/Accessory/Filters/PriceFilter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Templates\Filters;
+namespace App\Presenters\Accessory\Filters;
 
 use Contributte\Translation\Translator;
 use Money\Currencies\ISOCurrencies;

app/Templates/Filters/WrapInParagraphsFilter.php → app/Presenters/Accessory/Filters/WrapInParagraphsFilter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Templates\Filters;
+namespace App\Presenters\Accessory\Filters;
 
 final class WrapInParagraphsFilter {
 	/**

app/Templates/Accessory/LatteExtension.php → app/Presenters/Accessory/LatteExtension.php

@@ -2,9 +2,8 @@
 
 declare(strict_types=1);
 
-namespace App\Templates\Accessory;
+namespace App\Presenters\Accessory;
 
-use App\Templates\Filters;
 use Latte\Extension;
 
 final class LatteExtension extends Extension {

app/Presenters/BasePresenter.php

@@ -41,32 +41,4 @@ protected function startup(): void {
 			throw new Nette\InvalidStateException('Missing siteTitle argument');
 		}
 	}
-
-	/**
-	 * Formats layout template file names.
-	 *
-	 * @return string[]
-	 */
-	public function formatLayoutTemplateFiles(): array {
-		$list = array_map(
-			fn(string $path): string => str_replace('/templates/', '/Templates/', $path),
-			parent::formatLayoutTemplateFiles(),
-		);
-
-		return $list;
-	}
-
-	/**
-	 * Formats view template file names.
-	 *
-	 * @return string[]
-	 */
-	public function formatTemplateFiles(): array {
-		$list = array_map(
-			fn(string $path): string => str_replace('/templates/', '/Templates/', $path),
-			parent::formatTemplateFiles(),
-		);
-
-		return $list;
-	}
 }

app/Presenters/CommunicationPresenter.php

@@ -148,7 +148,7 @@ private function composeFormPreview(SubmitButton $button): void {
 			foreach ($teams as $id => $team) {
 				\assert($team !== null); // For PHPStan.
 				$grant = $this->tokens->createForTeam($team);
-				$this->template->previewMessage = $this->renderMessageBody(
+				$this->template->previewMessage = $this->_renderMessageBody(
 					team: $team,
 					subject: $values['subject'],
 					grant: $grant,
@@ -231,7 +231,7 @@ private function composeFormEnqueue(SubmitButton $button): void {
 				\assert($team !== null); // For PHPStan.
 
 				$grant = $this->tokens->createForTeam($team);
-				$body = $this->renderMessageBody(
+				$body = $this->_renderMessageBody(
 					team: $team,
 					subject: $subject,
 					grant: $grant,
@@ -275,11 +275,10 @@ private function composeFormEnqueue(SubmitButton $button): void {
 		}
 	}
 
-	private function renderMessageBody(Team $team, string $subject, string $grant, string $body): string {
+	private function _renderMessageBody(Team $team, string $subject, string $grant, string $body): string {
 		$latte = $this->latteFactory->create();
 
-		$appDir = $this->parameters->getAppDir();
-		$layout = file_get_contents($appDir . '/Templates/Mail/@layout.latte');
+		$layout = file_get_contents(__DIR__ . '/templates/Mail/@layout.latte');
 		\assert(\is_string($layout));
 
 		$latte->setLoader(new Latte\Loaders\StringLoader([
@@ -291,7 +290,7 @@ private function renderMessageBody(Team $team, string $subject, string $grant, s
 
 		$messageHtml = $latte->renderToString(
 			'message.latte',
-			new App\Templates\Mail\Message(
+			new templates\Mail\Message(
 				// Define variables for use in the e-mail template.
 				accountNumber: $this->parameters->accountNumber,
 				accountNumberIban: $this->parameters->accountNumberIban !== null ? $this->parameters->accountNumberIban->asString() : null,
@@ -314,6 +313,8 @@ private function renderMessageBody(Team $team, string $subject, string $grant, s
 			),
 		);
 
+		\assert($messageHtml !== '');
+
 		// Inline styles into the e-mail
 		$messageHtml = $this->emailFactory->create($messageHtml);
 
@@ -385,8 +386,6 @@ public function actionSend(): void {
 			throw new ForbiddenRequestException();
 		}
 
-		$appDir = $this->parameters->getAppDir();
-
 		$total = null;
 		$count = 0;
 		try {
@@ -399,7 +398,9 @@ public function actionSend(): void {
 
 			foreach ($messages as $message) {
 				// Inline styles into the e-mail
-				$mailHtml = $this->emailFactory->create($message->body);
+				$mailHtml = $message->body;
+				\assert($mailHtml !== '');
+				$mailHtml = $this->emailFactory->create($mailHtml);
 
 				$mail = new Nette\Mail\Message();
 				$firstMemberAddress = iterator_to_array($message->team->persons)[0]->email;

app/Presenters/Error4xxPresenter.php

@@ -22,9 +22,9 @@ protected function checkHttpMethod(): void {
 	public function renderDefault(Nette\Application\BadRequestException $exception): void {
 		// renders the appropriate error template based on the HTTP status code
 		$code = $exception->getCode();
-		$file = is_file($file = __DIR__ . "/../Templates/Error/$code.latte")
+		$file = is_file($file = __DIR__ . "/templates/Error/$code.latte")
 			? $file
-			: __DIR__ . '/../Templates/Error/4xx.latte';
+			: __DIR__ . '/templates/Error/4xx.latte';
 		$this->template->httpCode = $code;
 		$this->template->setFile($file);
 	}

app/Presenters/ErrorAccessPresenter.php

@@ -33,7 +33,7 @@ public function renderDefault(LimitedAccessException $exception): void {
 
 		$this->template->errorType = $errorType;
 
-		$file = __DIR__ . '/../Templates/Error/access.latte';
+		$file = __DIR__ . '/templates/Error/access.latte';
 		$this->template->setFile($file);
 	}
 }

app/Presenters/ErrorPresenter.php

@@ -42,7 +42,7 @@ public function run(Nette\Application\Request $request): Nette\Application\Respo
 
 		return new Responses\CallbackResponse(function(Http\IRequest $httpRequest, Http\IResponse $httpResponse): void {
 			if (preg_match('#^text/html(?:;|$)#', (string) $httpResponse->getHeader('Content-Type')) === 1) {
-				require __DIR__ . '/../Templates/Error/500.phtml';
+				require __DIR__ . '/templates/Error/500.phtml';
 			}
 		});
 	}