Modernize code base and fix issues reported by linters

Signed-off-by: Roman Ondráček <[email protected]>

Author: Roman3349

.github/workflows/tests.yml

@@ -35,15 +35,9 @@ jobs:
     with:
       php: "8.2"
 
-  test81:
-    name: "Nette Tester"
-    uses: contributte/.github/.github/workflows/nette-tester.yml@master
-    with:
-      php: "8.1"
-
   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

@@ -19,7 +19,7 @@
     }
   ],
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.2",
     "ext-json": "*",
     "nette/di": "^3.1.8",
     "contributte/psr7-http-message": "^0.9.0 || ^0.10.0",
@@ -33,16 +33,16 @@
     "contributte/qa": "^0.4",
     "contributte/dev": "^0.4",
     "contributte/tester": "^0.3",
-    "contributte/phpstan": "^0.1",
+    "contributte/phpstan": "^0.2",
     "mockery/mockery": "^1.6.6",
     "nette/application": "^3.1.4",
     "nette/di": "^3.1.8",
     "nette/http": "^3.2.3",
     "psr/log": "^2.0.0 || ^3.0.0",
-    "symfony/console": "^6.4.0 || ^7.0.0",
-    "symfony/translation": "^6.4.0 | ^7.0.0",
-    "symfony/validator": "^6.4.0 || ^7.0.0",
-    "symfony/yaml": "^6.4.0 || ^7.0.0",
+    "symfony/console": "^6.4.0 || ^7.0.0 || ^8.0.0",
+    "symfony/translation": "^6.4.0 | ^7.0.0 || ^8.0.0",
+    "symfony/validator": "^6.4.0 || ^7.0.0 || ^8.0.0",
+    "symfony/yaml": "^6.4.0 || ^7.0.0 || ^8.0.0",
     "tracy/tracy": "^2.10.5"
   },
   "provide": {

phpstan.neon

@@ -50,3 +50,7 @@ parameters:
 		# Support for doctrine/annotations ^1
 		- message: "#^Call to function method_exists\\(\\) with 'Doctrine\\\\\\\\Common\\\\\\\\Annotations\\\\\\\\AnnotationRegistry' and 'registerUniqueLoader' will always evaluate to false\\.$#"
 		  path: src/Core/DI/LoaderFactory/DualReaderFactory.php
+
+		- message: "#^Dead catch - TypeError is never thrown in the try block.$#"
+		  path: src/Core/Mapping/Parameter/DateTimeTypeMapper.php
+		  count: 1

ruleset.xml

@@ -3,7 +3,7 @@
 	<description>Contributte</description>
 
 	<!-- Extending rulesets -->
-	<rule ref="./vendor/contributte/qa/ruleset-8.0.xml"/>
+	<rule ref="./vendor/contributte/qa/ruleset-8.2.xml"/>
 
 	<!-- Specific rules -->
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
@@ -26,7 +26,7 @@
 	</rule>
 
 	<rule ref="SlevomatCodingStandard.PHP.DisallowReference">
-		<exclude-pattern>src/Core/Schema/Serialization/ArraySerializator.php</exclude-pattern>
+		<exclude-pattern>src/Core/Schema/Serialization/ArraySerializer.php</exclude-pattern>
 		<exclude-pattern>tests/Cases/OpenApi/Schema/ExamplesTest.php</exclude-pattern>
 	</rule>
 

src/Console/Command/RouteDumpCommand.php

@@ -21,13 +21,11 @@ class RouteDumpCommand extends Command
 
 	private const TABLE_HEADER = ['Method', 'Path', 'Handler', ' ', 'Parameters'];
 
-	private Schema $schema;
-
-	public function __construct(Schema $schema)
+	public function __construct(
+		private readonly Schema $schema,
+	)
 	{
 		parent::__construct();
-
-		$this->schema = $schema;
 	}
 
 	protected function configure(): void
@@ -59,6 +57,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		/** @var Endpoint[][] $endpointsByHandler */
 		$endpointsByHandler = [];
+
 		foreach ($endpoints as $endpoint) {
 			$endpointsByHandler[$endpoint->getHandler()->getClass()][] = $endpoint;
 		}
@@ -115,6 +114,7 @@ private function formatParameters(array $parameters): string
 
 		foreach ($paramsByIn as $in => $params) {
 			$result .= sprintf('<fg=cyan>%s</>', $in) . ': ' . implode(', ', $params);
+
 			if ($params !== end($paramsByIn)) {
 				$result .= ' | ';
 			}

src/Core/Annotation/Controller/Id.php

@@ -16,15 +16,13 @@
 class Id
 {
 
-	private string $name;
-
-	public function __construct(string $name)
+	public function __construct(
+		private readonly string $name,
+	)
 	{
 		if ($name === '') {
 			throw new AnnotationException('Empty @Id given');
 		}
-
-		$this->name = $name;
 	}
 
 	public function getName(): string

src/Core/Annotation/Controller/Method.php

@@ -17,7 +17,7 @@ class Method
 {
 
 	/** @var string[] */
-	private array $methods = [];
+	private readonly array $methods;
 
 	/**
 	 * @param string[]|string $methods
@@ -29,7 +29,7 @@ public function __construct(array|string $methods)
 		}
 
 		// Wrap single given method into array
-		if (! is_array($methods)) {
+		if (!is_array($methods)) {
 			$methods = [$methods];
 		}
 

src/Core/Annotation/Controller/Negotiation.php

@@ -15,17 +15,12 @@
 class Negotiation
 {
 
-	private string $suffix;
-
-	private bool $default;
-
-	private ?string $renderer;
-
-	public function __construct(string $suffix, bool $default = false, ?string $renderer = null)
+	public function __construct(
+		private readonly string $suffix,
+		private readonly bool $default = false,
+		private readonly ?string $renderer = null,
+	)
 	{
-		$this->suffix = $suffix;
-		$this->default = $default;
-		$this->renderer = $renderer;
 	}
 
 	public function getSuffix(): string

src/Core/Annotation/Controller/Negotiations.php

@@ -15,7 +15,7 @@ class Negotiations
 {
 
 	/** @var Negotiation[] */
-	private array $negotiations = [];
+	private readonly array $negotiations;
 
 	/**
 	 * @param Negotiation[]|Negotiation $negotiations

src/Core/Annotation/Controller/OpenApi.php

@@ -15,7 +15,7 @@
 class OpenApi
 {
 
-	private string $data;
+	private readonly string $data;
 
 	public function __construct(string $data)
 	{