phpstan level 6

Author: jakubkulhan

composer.json

@@ -41,6 +41,6 @@
             "@test:database:postgres",
             "@test:database:sqlite"
         ],
-        "test:phpstan": "./vendor/bin/phpstan analyse data-access-kit/src data-access-kit-symfony/src --memory-limit=512M"
+        "test:phpstan": "./vendor/bin/phpstan analyse --memory-limit=512M"
     }
 }

data-access-kit-symfony/src/DataAccessKitBundle.php

@@ -88,6 +88,9 @@ public function configure(DefinitionConfigurator $definition): void
 			->end();
 	}
 
+	/**
+	 * @param array<string, mixed> $config
+	 */
 	public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
 	{
 		$services = $container->services();
@@ -104,6 +107,9 @@ private function persistenceId(string $name): string
 		return "data_access_kit.{$name}_persistence";
 	}
 
+	/**
+	 * @param array<string, mixed> $config
+	 */
 	private function configureGlobalServices(array $config, ServicesConfigurator $services, ContainerBuilder $builder): void
 	{
 		$services->set($config["name_converter"])->autowire();
@@ -117,6 +123,9 @@ private function configureGlobalServices(array $config, ServicesConfigurator $se
 		$services->alias(ValueConverterInterface::class, $config["value_converter"]);
 	}
 
+	/**
+	 * @param array<string, mixed> $config
+	 */
 	private function configureDatabaseServices(array $config, ServicesConfigurator $services): void
 	{
 		foreach ($config["databases"] as $name => $database) {
@@ -130,6 +139,9 @@ private function configureDatabaseServices(array $config, ServicesConfigurator $
 		}
 	}
 
+	/**
+	 * @param array<string, mixed> $config
+	 */
 	private function configureRepositoryServices(array $config, ServicesConfigurator $services, ContainerBuilder $builder): void
 	{
 		$nameConverter = new $config["name_converter"]();
@@ -169,6 +181,9 @@ private function configureRepositoryServices(array $config, ServicesConfigurator
 		}
 	}
 
+	/**
+	 * @return array{0: \DataAccessKit\Repository\Result|null, 1: string|null}
+	 */
 	private function compileRepository(string $className, Compiler $compiler, ContainerBuilder $builder, string $outputDir, bool $debug): array
 	{
 		try {

data-access-kit/src/Attribute/Table.php

@@ -8,6 +8,7 @@
 #[Attribute(Attribute::TARGET_CLASS)]
 class Table
 {
+	/** @var ReflectionClass<object> */
 	public ReflectionClass $reflection;
 
 	/** @var Column[] */
@@ -19,11 +20,17 @@ public function __construct(
 	{
 	}
 
+	/**
+	 * @param ReflectionClass<object> $reflection
+	 */
 	public function setReflection(ReflectionClass $reflection): void
 	{
 		$this->reflection = $reflection;
 	}
 
+	/**
+	 * @param array<string, Column> $columns
+	 */
 	public function setColumns(array $columns): void
 	{
 		$this->columns = $columns;

data-access-kit/src/Converter/DefaultNameConverter.php

@@ -14,6 +14,9 @@ public function __construct()
 	{
 	}
 
+	/**
+	 * @param ReflectionClass<object>|string $reflection
+	 */
 	public function classToTable(ReflectionClass|string $reflection): string
 	{
 		if ($reflection instanceof ReflectionClass) {

data-access-kit/src/Converter/NameConverterInterface.php

@@ -8,6 +8,9 @@
 interface NameConverterInterface
 {
 	public function __construct();
+	/**
+	 * @param ReflectionClass<object> $reflection
+	 */
 	public function classToTable(ReflectionClass $reflection): string;
 	public function propertyToColumn(ReflectionProperty $reflection): string;
 }

data-access-kit/src/Persistence.php

@@ -85,6 +85,10 @@ public function upsert(object|array $data, ?array $columns = null): void
 		$this->doInsert($data, $columns);
 	}
 
+	/**
+	 * @param array<object> $objects
+	 * @param array<string>|null $upsertColumns
+	 */
 	private function doInsert(array $objects, ?array $upsertColumns = null): void
 	{
 		if (count($objects) === 0) {
@@ -417,7 +421,7 @@ public function toRow(object $object): array
 		return $row;
 	}
 
-	private function determineValueType(mixed $value)
+	private function determineValueType(mixed $value): ParameterType
 	{
 		return match (true) {
 			is_bool($value) => ParameterType::BOOLEAN,

data-access-kit/src/PersistenceInterface.php

@@ -19,7 +19,7 @@ public function select(string $className, string $sql, array $parameters = []):
 	 * Run SELECT $sql with $parameters and return a scalar value.
 	 *
 	 * @param string $sql
-	 * @param array $parameters
+	 * @param array<int|string, mixed> $parameters
 	 * @return scalar
 	 */
 	public function selectScalar(string $sql, array $parameters = []): mixed;
@@ -28,42 +28,46 @@ public function selectScalar(string $sql, array $parameters = []): mixed;
 	 * Run INSERT, UPDATE, or DELETE $sql with $parameters and return the number of affected rows.
 	 *
 	 * @param string $sql
-	 * @param array $parameters
+	 * @param array<int|string, mixed> $parameters
 	 * @return int
 	 */
 	public function execute(string $sql, array $parameters = []): int;
 
 	/**
 	 * Insert data into the database.
 	 *
-	 * @param object|array $data
+	 * @param object|array<string, mixed> $data
 	 */
 	public function insert(object|array $data): void;
 
 	/**
 	 * Insert or update data in the database.
 	 *
-	 * @param object|array $data
+	 * @param object|array<string, mixed> $data
+	 * @param array<string>|null $columns
 	 */
 	public function upsert(object|array $data, ?array $columns = null): void;
 
 	/**
 	 * Update data in the database based on its primary key.
+	 *
+	 * @param object $data
+	 * @param array<string>|null $columns
 	 */
 	public function update(object $data, ?array $columns = null): void;
 
 	/**
 	 * Delete data from the database based on its primary key.
 	 *
-	 * @param object|array $data
+	 * @param object|array<string, mixed> $data
 	 */
 	public function delete(object|array $data): void;
 
 	/**
 	 * Convert $object to an associative array.
 	 *
 	 * @param object $object
-	 * @return array
+	 * @return array<string, mixed>
 	 */
 	public function toRow(object $object): array;
 }

data-access-kit/src/Registry.php

@@ -36,7 +36,7 @@ public function get(object|string $objectOrClass, bool $requireTable = false): T
 
 		if (isset($this->tablesByClassName[$className])) {
 			if ($requireTable && $this->tablesByClassName[$className]->name === null) {
-				throw static::missingTableException($className);
+				throw self::missingTableException($className);
 			}
 			return $this->tablesByClassName[$className];
 		}
@@ -51,7 +51,7 @@ public function get(object|string $objectOrClass, bool $requireTable = false): T
 		$tableRA = $rc->getAttributes(Table::class)[0] ?? null;
 		if ($tableRA === null) {
 			if ($requireTable) {
-				throw static::missingTableException($className);
+				throw self::missingTableException($className);
 			}
 
 			$table = new Table();

data-access-kit/src/Repository/Attribute/Update.php

@@ -7,6 +7,9 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 class Update
 {
+	/**
+	 * @param array<string>|null $columns
+	 */
 	public function __construct(
 		public readonly ?array $columns = null,
 	)

data-access-kit/src/Repository/Attribute/Upsert.php

@@ -7,6 +7,9 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 class Upsert
 {
+	/**
+	 * @param array<string>|null $columns
+	 */
 	public function __construct(
 		public readonly ?array $columns = null,
 	)