Removing useless trait Nette\StaticClass

app/Bootstrap.php

@@ -4,28 +4,47 @@
 
 namespace App;
 
+use Nette;
 use Nette\Bootstrap\Configurator;
 
 
 class Bootstrap
 {
-	public static function boot(): Configurator
+	private Configurator $configurator;
+	private string $rootDir;
+
+
+	public function __construct()
+	{
+		$this->rootDir = dirname(__DIR__);
+		$this->configurator = new Configurator;
+		$this->configurator->setTempDirectory($this->rootDir . '/temp');
+	}
+
+
+	public function bootWebApplication(): Nette\DI\Container
 	{
-		$configurator = new Configurator;
-		$appDir = dirname(__DIR__);
+		$this->initializeEnvironment();
+		$this->setupContainer();
+		return $this->configurator->createContainer();
+	}
 
-		//$configurator->setDebugMode('secret@23.75.345.200'); // enable for your remote IP
-		$configurator->enableTracy($appDir . '/log');
 
-		$configurator->setTempDirectory($appDir . '/temp');
+	public function initializeEnvironment(): void
+	{
+		//$this->configurator->setDebugMode('secret@23.75.345.200'); // enable for your remote IP
+		$this->configurator->enableTracy($this->rootDir . '/log');
 
-		$configurator->createRobotLoader()
+		$this->configurator->createRobotLoader()
 			->addDirectory(__DIR__)
 			->register();
+	}
 
-		$configurator->addConfig($appDir . '/config/common.neon');
-		$configurator->addConfig($appDir . '/config/services.neon');
 
-		return $configurator;
+	private function setupContainer(): void
+	{
+		$configDir = $this->rootDir . '/config';
+		$this->configurator->addConfig($configDir . '/common.neon');
+		$this->configurator->addConfig($configDir . '/services.neon');
 	}
 }

app/Router/RouterFactory.php → app/Core/RouterFactory.php

@@ -2,15 +2,13 @@
 
 declare(strict_types=1);
 
-namespace App\Router;
+namespace App\Core;
 
-use Nette;
 use Nette\Application\Routers\RouteList;
 
 
 final class RouterFactory
 {
-	use Nette\StaticClass;
 
 	public static function createRouter(): RouteList
 	{

app/Presenters/templates/@layout.latte → app/UI/@layout.latte

@@ -13,7 +13,7 @@
 	{include content}
 
 	{block scripts}
-	<script src="https://unpkg.com/nette-forms@3/src/assets/netteForms.js"></script>
+	<script src="https://unpkg.com/nette-forms@3"></script>
 	{/block}
 </body>
 </html>

app/UI/Accessory/LatteExtension.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\UI\Accessory;
+
+use Latte\Extension;
+
+
+final class LatteExtension extends Extension
+{
+	public function getFilters(): array
+	{
+		return [];
+	}
+
+
+	public function getFunctions(): array
+	{
+		return [];
+	}
+}

app/Presenters/Error4xxPresenter.php → app/UI/Error/Error4xx/Error4xxPresenter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Presenters;
+namespace App\UI\Error\Error4xx;
 
 use Nette;
 use Nette\Application\Attributes\Requires;
@@ -18,9 +18,9 @@ public function renderDefault(Nette\Application\BadRequestException $exception):
 	{
 		// 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__ . "/$code.latte")
 			? $file
-			: __DIR__ . '/templates/Error/4xx.latte';
+			: __DIR__ . '/4xx.latte';
 		$this->template->httpCode = $code;
 		$this->template->setFile($file);
 	}

app/Presenters/Error5xxPresenter.php → app/UI/Error/Error5xx/Error5xxPresenter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Presenters;
+namespace App\UI\Error\Error5xx;
 
 use Nette;
 use Nette\Application\Attributes\Requires;
@@ -32,7 +32,7 @@ public function run(Nette\Application\Request $request): Nette\Application\Respo
 		// Display a generic error message to the user
 		return new Responses\CallbackResponse(function (Http\IRequest $httpRequest, Http\IResponse $httpResponse): void {
 			if (preg_match('#^text/html(?:;|$)#', (string) $httpResponse->getHeader('Content-Type'))) {
-				require __DIR__ . '/templates/Error/500.phtml';
+				require __DIR__ . '/500.phtml';
 			}
 		});
 	}

app/Presenters/HomePresenter.php → app/UI/Home/HomePresenter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Presenters;
+namespace App\UI\Home;
 
 use Nette;
 

composer.json

@@ -3,7 +3,7 @@
 	"description": "Nette: Standard Web Project",
 	"keywords": ["nette"],
 	"type": "project",
-	"license": ["MIT", "BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
+	"license": ["MIT", "BSD-3-Clause", "GPL-2.0-only", "GPL-3.0-only"],
 	"require": {
 		"php": ">= 8.1",
 		"nette/application": "^3.2.3",

config/common.neon

@@ -3,9 +3,9 @@ parameters:
 
 application:
 	errorPresenter:
-		4xx: Error4xx
-		5xx: Error5xx
-	mapping: App\*Module\Presenters\*Presenter
+		4xx: Error:Error4xx
+		5xx: Error:Error5xx
+	mapping: App\UI\*\**Presenter
 
 
 database:
@@ -16,6 +16,9 @@ database:
 
 latte:
 	strictTypes: yes
+	strictParsing: yes
+	extensions:
+		- App\UI\Accessory\LatteExtension
 
 
 di:

config/services.neon

@@ -1,5 +1,5 @@
 services:
-	- App\Router\RouterFactory::createRouter
+	- App\Core\RouterFactory::createRouter
 
 
 search:

www/index.php

@@ -4,7 +4,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$configurator = App\Bootstrap::boot();
-$container = $configurator->createContainer();
+$bootstrap = new App\Bootstrap;
+$container = $bootstrap->bootWebApplication();
 $application = $container->getByType(Nette\Application\Application::class);
 $application->run();