diff --git a/src/Bridges/NetteDI/DIRepositoryFinder.php b/src/Bridges/NetteDI/DIRepositoryFinder.php
index 045bdf8f..035cd463 100644
--- a/src/Bridges/NetteDI/DIRepositoryFinder.php
+++ b/src/Bridges/NetteDI/DIRepositoryFinder.php
@@ -13,11 +13,8 @@
 
 class DIRepositoryFinder implements IRepositoryFinder
 {
-	/** @var ContainerBuilder */
-	private $builder;
-
-	/** @var OrmExtension */
-	private $extension;
+	private ContainerBuilder $builder;
+	private OrmExtension $extension;
 
 
 	// @phpstan-ignore-next-line https://github.com/phpstan/phpstan/issues/587
diff --git a/src/Bridges/NetteDI/DependencyProvider.php b/src/Bridges/NetteDI/DependencyProvider.php
index ab4a7618..8ec6c4b0 100644
--- a/src/Bridges/NetteDI/DependencyProvider.php
+++ b/src/Bridges/NetteDI/DependencyProvider.php
@@ -10,13 +10,10 @@
 
 class DependencyProvider implements IDependencyProvider
 {
-	/** @var Container */
-	private $container;
-
-
-	public function __construct(Container $container)
+	public function __construct(
+		private readonly Container $container,
+	)
 	{
-		$this->container = $container;
 	}
 
 
diff --git a/src/Bridges/NetteDI/PhpDocRepositoryFinder.php b/src/Bridges/NetteDI/PhpDocRepositoryFinder.php
index e18fdffc..64786259 100644
--- a/src/Bridges/NetteDI/PhpDocRepositoryFinder.php
+++ b/src/Bridges/NetteDI/PhpDocRepositoryFinder.php
@@ -16,21 +16,12 @@
 
 class PhpDocRepositoryFinder implements IRepositoryFinder
 {
-	/** @var class-string<IModel> */
-	protected $modelClass;
-
-	/** @var ContainerBuilder */
-	protected $builder;
-
-	/** @var OrmExtension */
-	protected $extension;
-
-
-	public function __construct(string $modelClass, ContainerBuilder $containerBuilder, OrmExtension $extension)
+	public function __construct(
+		protected readonly string $modelClass,
+		protected readonly ContainerBuilder $builder,
+		protected readonly OrmExtension $extension,
+	)
 	{
-		$this->modelClass = $modelClass;
-		$this->builder = $containerBuilder;
-		$this->extension = $extension;
 	}
 
 
diff --git a/src/Bridges/NetteDI/RepositoryLoader.php b/src/Bridges/NetteDI/RepositoryLoader.php
index 1d6a9a8e..2a9fafa9 100644
--- a/src/Bridges/NetteDI/RepositoryLoader.php
+++ b/src/Bridges/NetteDI/RepositoryLoader.php
@@ -11,20 +11,14 @@
 
 class RepositoryLoader implements IRepositoryLoader
 {
-	/** @var Container */
-	private $container;
-
-	/** @var array<class-string<IRepository<IEntity>>, string> */
-	private $repositoryNamesMap;
-
-
 	/**
 	 * @param array<class-string<IRepository<IEntity>>, string> $repositoryNamesMap
 	 */
-	public function __construct(Container $container, array $repositoryNamesMap)
+	public function __construct(
+		private readonly Container $container,
+		private readonly array $repositoryNamesMap,
+	)
 	{
-		$this->container = $container;
-		$this->repositoryNamesMap = $repositoryNamesMap;
 	}
 
 
diff --git a/src/Collection/ArrayCollection.php b/src/Collection/ArrayCollection.php
index 4abb1e89..b5ab777d 100644
--- a/src/Collection/ArrayCollection.php
+++ b/src/Collection/ArrayCollection.php
@@ -27,50 +27,43 @@
 class ArrayCollection implements ICollection, MemoryCollection
 {
 	/** @var list<callable(\Traversable<E> $entities): void> */
-	public $onEntityFetch = [];
+	public array $onEntityFetch = [];
 
 	/** @var list<E> */
-	protected $data;
+	protected array $data;
 
-	/** @var IRelationshipMapper|null */
-	protected $relationshipMapper;
-
-	/** @var IEntity|null */
-	protected $relationshipParent;
+	protected IRelationshipMapper|null $relationshipMapper = null;
+	protected IEntity|null $relationshipParent = null;
 
 	/** @var Iterator<E>|null */
-	protected $fetchIterator;
-
-	/** @var IRepository<E> */
-	protected $repository;
+	protected Iterator|null $fetchIterator = null;
 
-	/** @var ArrayCollectionHelper */
-	protected $helper;
+	protected ArrayCollectionHelper|null $helper = null;
 
 	/** @var array<Closure(E): ArrayExpressionResult> */
-	protected $collectionFilter = [];
+	protected array $collectionFilter = [];
 
 	/** @var list<array{mixed, string}> */
-	protected $collectionSorter = [];
+	protected array $collectionSorter = [];
 
 	/** @var null|array{int, int|null} */
-	protected $collectionLimit;
-
-	/** @var bool */
-	protected $entityFetchEventTriggered = false;
+	protected ?array $collectionLimit = null;
+	protected bool $entityFetchEventTriggered = false;
 
 
 	/**
 	 * @param list<E> $entities
 	 * @param IRepository<E> $repository
 	 */
-	public function __construct(array $entities, IRepository $repository)
+	public function __construct(
+		array $entities,
+		protected readonly IRepository $repository,
+	)
 	{
 		if (!Arrays::isList($entities)) {
 			throw new InvalidArgumentException('Entities has to be passed as a list.');
 		}
 		$this->data = $entities;
-		$this->repository = $repository;
 	}
 
 
diff --git a/src/Collection/DbalCollection.php b/src/Collection/DbalCollection.php
index 3e06cbf3..72e6a500 100644
--- a/src/Collection/DbalCollection.php
+++ b/src/Collection/DbalCollection.php
@@ -28,53 +28,36 @@
 class DbalCollection implements ICollection
 {
 	/** @var list<callable(\Traversable<E> $entities): void> */
-	public $onEntityFetch = [];
+	public array $onEntityFetch = [];
 
-	/** @var IRelationshipMapper|null */
-	protected $relationshipMapper;
-
-	/** @var IEntity|null */
-	protected $relationshipParent;
+	protected IRelationshipMapper|null $relationshipMapper = null;
+	protected IEntity|null $relationshipParent = null;
 
 	/** @var Iterator<E>|null */
-	protected $fetchIterator;
-
-	/** @var DbalMapper<E> */
-	protected $mapper;
-
-	/** @var IConnection */
-	protected $connection;
-
-	/** @var QueryBuilder */
-	protected $queryBuilder;
+	protected Iterator|null $fetchIterator = null;
 
 	/** @var array<mixed> FindBy expressions for deferred processing */
-	protected $filtering = [];
+	protected array $filtering = [];
 
 	/** @var array<array{DbalExpressionResult, string}> OrderBy expression result & sorting direction */
-	protected $ordering = [];
-
-	/** @var DbalQueryBuilderHelper */
-	protected $helper;
+	protected array $ordering = [];
+	protected DbalQueryBuilderHelper|null $helper = null;
 
 	/** @var list<E>|null */
-	protected $result;
-
-	/** @var int|null */
-	protected $resultCount;
-
-	/** @var bool */
-	protected $entityFetchEventTriggered = false;
+	protected ?array $result = null;
+	protected ?int $resultCount = null;
+	protected bool $entityFetchEventTriggered = false;
 
 
 	/**
 	 * @param DbalMapper<E> $mapper
 	 */
-	public function __construct(DbalMapper $mapper, IConnection $connection, QueryBuilder $queryBuilder)
+	public function __construct(
+		protected readonly DbalMapper $mapper,
+		protected readonly IConnection $connection,
+		protected QueryBuilder $queryBuilder,
+	)
 	{
-		$this->mapper = $mapper;
-		$this->connection = $connection;
-		$this->queryBuilder = $queryBuilder;
 	}
 
 
diff --git a/src/Collection/EmptyCollection.php b/src/Collection/EmptyCollection.php
index d0e8f4c4..42a7a057 100644
--- a/src/Collection/EmptyCollection.php
+++ b/src/Collection/EmptyCollection.php
@@ -17,8 +17,7 @@
  */
 final class EmptyCollection implements ICollection, MemoryCollection
 {
-	/** @var IRelationshipMapper|null */
-	private $relationshipMapper;
+	private ?IRelationshipMapper $relationshipMapper = null;
 
 
 	public function getBy(array $conds): ?IEntity
diff --git a/src/Collection/EntityIterator.php b/src/Collection/EntityIterator.php
index f81dcf71..4c2ee693 100644
--- a/src/Collection/EntityIterator.php
+++ b/src/Collection/EntityIterator.php
@@ -16,14 +16,13 @@
  */
 class EntityIterator implements IEntityPreloadContainer, Iterator, Countable
 {
-	/** @var int */
-	private $position = 0;
+	private int $position = 0;
 
 	/** @var list<IEntity> */
-	private $iteratable;
+	private array $iteratable;
 
 	/** @var array<string, list<mixed>> */
-	private $preloadCache;
+	private array $preloadCache = [];
 
 
 	/**
diff --git a/src/Collection/Expression/ExpressionContext.php b/src/Collection/Expression/ExpressionContext.php
index 5e1c0368..9cd78d3a 100644
--- a/src/Collection/Expression/ExpressionContext.php
+++ b/src/Collection/Expression/ExpressionContext.php
@@ -6,7 +6,9 @@
 /**
  * @internal
  *
- * Determines if the expression is processed for AND subtree, OR subtree or pure expression, e.g., a sorting expression.
+ * Determines if the expression is processed for AND subtree, OR subtree or as a pure expression,
+ * e.g., a sorting expression.
+ *
  * OR subtree requires more complex SQL construction, in other modes we may optimize the resulting SQL.
  */
 enum ExpressionContext
diff --git a/src/Collection/HasManyCollection.php b/src/Collection/HasManyCollection.php
index 3e1e0d53..06302c0e 100644
--- a/src/Collection/HasManyCollection.php
+++ b/src/Collection/HasManyCollection.php
@@ -27,20 +27,17 @@ class HasManyCollection implements ICollection
 	/** @var array<callable(\Traversable<E>):void> */
 	public $onEntityFetch = [];
 
-	/** @var IRepository<E> */
-	private $repository;
-
 	/** @var ICollection<E> */
-	private $storageCollection;
+	private ICollection $storageCollection;
 
 	/** @var MutableArrayCollection<E> */
-	private $inMemoryCollection;
+	private MutableArrayCollection $inMemoryCollection;
 
 	/** @var callable(): array{array<array-key, E>, array<array-key, E>} */
 	private $diffCallback;
 
 	/** @var Iterator<mixed, mixed>|null */
-	private $fetchIterator;
+	private ?Iterator $fetchIterator = null;
 
 
 	/**
@@ -49,12 +46,11 @@ class HasManyCollection implements ICollection
 	 * @param callable():array{array<array-key, E>, array<array-key, E>} $diffCallback
 	 */
 	public function __construct(
-		IRepository $repository,
+		private readonly IRepository $repository,
 		ICollection $innerCollection,
 		callable $diffCallback,
 	)
 	{
-		$this->repository = $repository;
 		$this->storageCollection = $innerCollection;
 		$this->diffCallback = $diffCallback;
 		$this->inMemoryCollection = new MutableArrayCollection([], $repository); // @phpstan-ignore-line
diff --git a/src/Collection/MultiEntityIterator.php b/src/Collection/MultiEntityIterator.php
index b04b3434..b1c6b241 100644
--- a/src/Collection/MultiEntityIterator.php
+++ b/src/Collection/MultiEntityIterator.php
@@ -16,25 +16,22 @@
  */
 class MultiEntityIterator implements IEntityPreloadContainer, Iterator, Countable
 {
-	/** @var int */
-	private $position = 0;
-
-	/** @var array<int|string, list<IEntity>> */
-	private $data;
+	private int $position = 0;
 
 	/** @var list<IEntity> */
-	private $iterable;
+	private array $iterable;
 
 	/** @var array<string, list<mixed>> */
-	private $preloadCache;
+	private array $preloadCache;
 
 
 	/**
 	 * @param array<int|string, list<IEntity>> $data
 	 */
-	public function __construct(array $data)
+	public function __construct(
+		private array $data,
+	)
 	{
-		$this->data = $data;
 	}
 
 
diff --git a/src/Entity/AbstractEntity.php b/src/Entity/AbstractEntity.php
index 01bdcf2b..ddcdbb96 100644
--- a/src/Entity/AbstractEntity.php
+++ b/src/Entity/AbstractEntity.php
@@ -23,10 +23,10 @@ abstract class AbstractEntity implements IEntity
 
 
 	/** @var IRepository<IEntity>|null */
-	private $repository;
+	private IRepository|null $repository = null;
 
 	/** @var array<string, bool> */
-	private $modified = [];
+	private array $modified = [];
 
 	/** @var mixed */
 	private $persistedId = null;
diff --git a/src/Entity/Embeddable/Embeddable.php b/src/Entity/Embeddable/Embeddable.php
index 270cf7b1..3423f2ee 100644
--- a/src/Entity/Embeddable/Embeddable.php
+++ b/src/Entity/Embeddable/Embeddable.php
@@ -24,8 +24,7 @@ abstract class Embeddable implements IEmbeddable
 	use ImmutableDataTrait;
 
 
-	/** @var IEntity|null */
-	protected $parentEntity;
+	protected IEntity|null $parentEntity = null;
 
 
 	/**
diff --git a/src/Entity/Embeddable/EmbeddableContainer.php b/src/Entity/Embeddable/EmbeddableContainer.php
index d6d4a543..57303f55 100644
--- a/src/Entity/Embeddable/EmbeddableContainer.php
+++ b/src/Entity/Embeddable/EmbeddableContainer.php
@@ -25,27 +25,20 @@ class EmbeddableContainer implements IPropertyContainer, IEntityAwareProperty
 	use SmartObject;
 
 
-	/** @var PropertyMetadata */
-	private $metadata;
-
-	/** @var IEntity|null */
-	private $entity;
-
-	/** @var IEmbeddable|null */
-	private $value;
+	private IEntity|null $entity = null;
+	private IEmbeddable|null $value = null;
 
 	/** @var array<string, PropertyMetadata> */
-	private $propertiesMetadata = [];
-
-	/** @var string */
-	private $instanceType;
+	private array $propertiesMetadata = [];
+	private string $instanceType;
 
 
-	public function __construct(PropertyMetadata $propertyMetadata)
+	public function __construct(
+		private readonly PropertyMetadata $metadata,
+	)
 	{
-		assert($propertyMetadata->args !== null);
-		$this->metadata = $propertyMetadata;
-		$this->instanceType = $propertyMetadata->args[EmbeddableContainer::class]['class'];
+		assert($metadata->args !== null);
+		$this->instanceType = $metadata->args[EmbeddableContainer::class]['class'];
 		$this->propertiesMetadata = MetadataStorage::get($this->instanceType)->getProperties();
 	}
 
diff --git a/src/Entity/Entity.php b/src/Entity/Entity.php
index 53d85f48..a35f03b2 100644
--- a/src/Entity/Entity.php
+++ b/src/Entity/Entity.php
@@ -9,8 +9,7 @@
 
 class Entity extends AbstractEntity implements IEntityHasPreloadContainer
 {
-	/** @var IEntityPreloadContainer|null */
-	private $preloadContainer;
+	private IEntityPreloadContainer|null $preloadContainer = null;
 
 
 	/**
diff --git a/src/Entity/ImmutableDataTrait.php b/src/Entity/ImmutableDataTrait.php
index 9ec400ad..fd6eb417 100644
--- a/src/Entity/ImmutableDataTrait.php
+++ b/src/Entity/ImmutableDataTrait.php
@@ -13,13 +13,13 @@
 trait ImmutableDataTrait
 {
 	/** @var EntityMetadata */
-	protected $metadata;
+	protected EntityMetadata $metadata;
 
 	/** @var array<string, mixed> */
-	private $data = [];
+	private array $data = [];
 
 	/** @var array<string, bool> */
-	private $validated = [];
+	private array $validated = [];
 
 
 	public function &getValue(string $name)
diff --git a/src/Entity/ImmutableValuePropertyWrapper.php b/src/Entity/ImmutableValuePropertyWrapper.php
index a31142d8..4560b0be 100644
--- a/src/Entity/ImmutableValuePropertyWrapper.php
+++ b/src/Entity/ImmutableValuePropertyWrapper.php
@@ -11,13 +11,11 @@ abstract class ImmutableValuePropertyWrapper implements IPropertyContainer
 	/** @var mixed */
 	protected $value;
 
-	/** @var PropertyMetadata */
-	protected $propertyMetadata;
 
-
-	public function __construct(PropertyMetadata $propertyMetadata)
+	public function __construct(
+		protected readonly PropertyMetadata $propertyMetadata,
+	)
 	{
-		$this->propertyMetadata = $propertyMetadata;
 	}
 
 
diff --git a/src/Entity/Reflection/EntityMetadata.php b/src/Entity/Reflection/EntityMetadata.php
index 1605f86a..0c0abce4 100644
--- a/src/Entity/Reflection/EntityMetadata.php
+++ b/src/Entity/Reflection/EntityMetadata.php
@@ -15,23 +15,20 @@ class EntityMetadata
 {
 	use SmartObject;
 
-
-	/** @var class-string */
-	private $className;
-
 	/** @var list<string> */
-	private $primaryKey = [];
+	private array $primaryKey = [];
 
 	/** @var array<string, PropertyMetadata> */
-	private $properties = [];
+	private array $properties = [];
 
 
 	/**
 	 * @param class-string $className
 	 */
-	public function __construct(string $className)
+	public function __construct(
+		private readonly string $className,
+	)
 	{
-		$this->className = $className;
 	}
 
 
diff --git a/src/Entity/Reflection/MetadataParser.php b/src/Entity/Reflection/MetadataParser.php
index 2b920ffc..4c00eeea 100644
--- a/src/Entity/Reflection/MetadataParser.php
+++ b/src/Entity/Reflection/MetadataParser.php
@@ -1,5 +1,7 @@
 <?php declare(strict_types = 1);
 
+/** @noinspection PhpUnused */
+
 namespace Nextras\Orm\Entity\Reflection;
 
 
@@ -50,7 +52,7 @@
 class MetadataParser implements IMetadataParser
 {
 	/** @var array<string, callable|string> */
-	protected $modifiers = [
+	protected array $modifiers = [
 		'1:1' => 'parseOneHasOneModifier',
 		'1:m' => 'parseOneHasManyModifier',
 		'm:1' => 'parseManyHasOneModifier',
diff --git a/src/Entity/Reflection/PropertyRelationshipMetadata.php b/src/Entity/Reflection/PropertyRelationshipMetadata.php
index db51275d..4eb81812 100644
--- a/src/Entity/Reflection/PropertyRelationshipMetadata.php
+++ b/src/Entity/Reflection/PropertyRelationshipMetadata.php
@@ -15,26 +15,19 @@ class PropertyRelationshipMetadata
 	public const MANY_HAS_MANY = 4;
 
 	/** @var class-string<IRepository<IEntity>> */
-	public $repository;
+	public string $repository;
 
 	/** @var class-string<IEntity> */
-	public $entity;
+	public string $entity;
 
-	/** @var EntityMetadata */
-	public $entityMetadata;
-
-	/** @var string|null */
-	public $property;
-
-	/** @var bool */
-	public $isMain = false;
-
-	/** @var int */
-	public $type;
+	public EntityMetadata $entityMetadata;
+	public string|null $property;
+	public bool $isMain = false;
+	public int $type;
 
 	/** @var array<string, string>|null */
-	public $order;
+	public ?array $order = null;
 
 	/** @var bool[] */
-	public $cascade;
+	public array $cascade = [];
 }
diff --git a/src/Entity/ToArrayConverter.php b/src/Entity/ToArrayConverter.php
index b1ab5768..d112f688 100644
--- a/src/Entity/ToArrayConverter.php
+++ b/src/Entity/ToArrayConverter.php
@@ -40,7 +40,7 @@ class ToArrayConverter
 	public const RELATIONSHIP_AS_ARRAY = 3;
 
 	/** @var int Maximum recursion level. */
-	public static $maxRecursionLevel = 3;
+	public static int $maxRecursionLevel = 3;
 
 
 	/**
diff --git a/src/Mapper/Dbal/Conventions/Conventions.php b/src/Mapper/Dbal/Conventions/Conventions.php
index 2223e966..c7f30a95 100644
--- a/src/Mapper/Dbal/Conventions/Conventions.php
+++ b/src/Mapper/Dbal/Conventions/Conventions.php
@@ -41,11 +41,9 @@ class Conventions implements IConventions
 	public string $manyHasManyStorageNamePattern = '%s_x_%s';
 	public string $embeddableSeparatorPattern = '_';
 
-	protected IInflector $inflector;
 	protected CachedPlatform $platform;
-	protected Table $storageTable;
-	protected EntityMetadata $entityMetadata;
 	protected bool $storageNameWithSchema;
+	protected Table $storageTable;
 
 	/**
 	 * @var array{
@@ -67,16 +65,14 @@ class Conventions implements IConventions
 	 * @param literal-string|Fqn $storageName
 	 */
 	public function __construct(
-		IInflector $inflector,
+		protected readonly IInflector $inflector,
 		IConnection $connection,
 		string|Fqn $storageName,
-		EntityMetadata $entityMetadata,
+		protected readonly EntityMetadata $entityMetadata,
 		Cache $cache,
 	)
 	{
-		$this->inflector = $inflector;
 		$this->platform = new CachedPlatform($connection->getPlatform(), $cache->derive('orm.db_reflection'));
-		$this->entityMetadata = $entityMetadata;
 		$this->storageNameWithSchema = $storageName instanceof Fqn;
 		$this->storageTable = $this->findStorageTable($storageName);
 
diff --git a/src/Mapper/Dbal/Conventions/Inflector/CamelCaseInflector.php b/src/Mapper/Dbal/Conventions/Inflector/CamelCaseInflector.php
index 4750ead3..e65926a9 100644
--- a/src/Mapper/Dbal/Conventions/Inflector/CamelCaseInflector.php
+++ b/src/Mapper/Dbal/Conventions/Inflector/CamelCaseInflector.php
@@ -19,7 +19,7 @@ public function formatAsProperty(string $column): string
 
 	public function formatAsRelationshipProperty(string $column): string
 	{
-		if (substr($column, -2) === 'Id') {
+		if (str_ends_with($column, 'Id')) {
 			$column = substr($column, 0, -2);
 		}
 		return $this->formatAsProperty($column);
diff --git a/src/Mapper/Dbal/Conventions/Inflector/SnakeCaseInflector.php b/src/Mapper/Dbal/Conventions/Inflector/SnakeCaseInflector.php
index f7f97b00..5a993897 100644
--- a/src/Mapper/Dbal/Conventions/Inflector/SnakeCaseInflector.php
+++ b/src/Mapper/Dbal/Conventions/Inflector/SnakeCaseInflector.php
@@ -22,7 +22,7 @@ public function formatAsProperty(string $column): string
 
 	public function formatAsRelationshipProperty(string $column): string
 	{
-		if (substr($column, -3) === '_id') {
+		if (str_ends_with($column, '_id')) {
 			$column = substr($column, 0, -3);
 		}
 		return $this->formatAsProperty($column);
diff --git a/src/Mapper/Dbal/DbalMapper.php b/src/Mapper/Dbal/DbalMapper.php
index 1c9dfc20..8effe8da 100644
--- a/src/Mapper/Dbal/DbalMapper.php
+++ b/src/Mapper/Dbal/DbalMapper.php
@@ -36,40 +36,33 @@
  */
 abstract class DbalMapper implements IMapper
 {
-	/** @var IConnection */
-	protected $connection;
-
 	/**
 	 * Database table name.
 	 *
 	 * The must be in unescaped raw form. If you need to pass a database name/schema name,
-	 * define this property with Fqn instance. Use null for autodetection.
+	 * define this property with Fqn instance. Use null for auto-detection.
 	 *
 	 * @var literal-string|Fqn|null
 	 */
 	protected string|Fqn|null $tableName = null;
 
-	/** @var Cache */
-	protected $cache;
+	protected Cache $cache;
+	private IConventions|null $conventions = null;
 
 	/** @var IRepository<E>|null */
-	private $repository;
+	private IRepository|null $repository = null;
 
 	/** @var array<string, IRelationshipMapper> */
-	private $cacheRM = [];
-
-	/** @var DbalMapperCoordinator */
-	private $mapperCoordinator;
-
-	/** @var IConventions */
-	private $conventions;
+	private array $cacheRM = [];
 
 
-	public function __construct(IConnection $connection, DbalMapperCoordinator $mapperCoordinator, Cache $cache)
+	public function __construct(
+		protected readonly IConnection $connection,
+		protected readonly DbalMapperCoordinator $mapperCoordinator,
+		Cache $cache,
+	)
 	{
 		$key = md5(Json::encode($connection->getConfig()));
-		$this->connection = $connection;
-		$this->mapperCoordinator = $mapperCoordinator;
 		$this->cache = $cache->derive('orm.mapper.' . $key);
 	}
 
diff --git a/src/Mapper/Dbal/DbalMapperCoordinator.php b/src/Mapper/Dbal/DbalMapperCoordinator.php
index 40108e01..98b01182 100644
--- a/src/Mapper/Dbal/DbalMapperCoordinator.php
+++ b/src/Mapper/Dbal/DbalMapperCoordinator.php
@@ -8,16 +8,13 @@
 
 class DbalMapperCoordinator
 {
-	/** @var IConnection */
-	private $connection;
+	private bool $transactionActive = false;
 
-	/** @var bool */
-	private $transactionActive = false;
 
-
-	public function __construct(IConnection $connection)
+	public function __construct(
+		private readonly IConnection $connection,
+	)
 	{
-		$this->connection = $connection;
 	}
 
 
diff --git a/src/Mapper/Dbal/RelationshipMapperManyHasMany.php b/src/Mapper/Dbal/RelationshipMapperManyHasMany.php
index b52d29f2..d66e8aa3 100644
--- a/src/Mapper/Dbal/RelationshipMapperManyHasMany.php
+++ b/src/Mapper/Dbal/RelationshipMapperManyHasMany.php
@@ -30,58 +30,38 @@
 
 class RelationshipMapperManyHasMany implements IRelationshipMapperManyHasMany
 {
-	/** @var IConnection */
-	protected $connection;
-
-	/** @var PropertyMetadata */
-	protected $metadata;
-
 	protected string|Fqn $joinTable;
-
-	/** @var string */
-	protected $primaryKeyFrom;
-
-	/** @var string */
-	protected $primaryKeyTo;
-
-	/** @var DbalMapper<IEntity> */
-	protected $targetMapper;
+	protected string $primaryKeyFrom;
+	protected string $primaryKeyTo;
 
 	/** @var array<string, MultiEntityIterator> */
-	protected $cacheEntityIterators;
+	protected array $cacheEntityIterators;
 
 	/** @var array<string, array<int>> */
-	protected $cacheCounts;
-
-	/** @var DbalMapperCoordinator */
-	private $mapperCoordinator;
+	protected array $cacheCounts;
 
 
 	/**
-	 * @param DbalMapper<IEntity> $mapper
+	 * @param DbalMapper<IEntity> $targetMapper
 	 * @param DbalMapper<IEntity> $sourceMapper
 	 */
 	public function __construct(
-		IConnection $connection,
-		DbalMapper $mapper,
+		protected readonly IConnection $connection,
+		protected readonly DbalMapper $targetMapper,
 		DbalMapper $sourceMapper,
-		DbalMapperCoordinator $mapperCoordinator,
-		PropertyMetadata $metadata,
+		protected readonly DbalMapperCoordinator $mapperCoordinator,
+		protected readonly PropertyMetadata $metadata,
 	)
 	{
 		assert($metadata->relationship !== null);
-		$this->connection = $connection;
-		$this->targetMapper = $mapper;
-		$this->metadata = $metadata;
-		$this->mapperCoordinator = $mapperCoordinator;
 
 		if ($metadata->relationship->isMain) {
-			$parameters = $sourceMapper->getManyHasManyParameters($metadata, $mapper);
+			$parameters = $sourceMapper->getManyHasManyParameters($metadata, $targetMapper);
 			$this->joinTable = $parameters[0];
 			[$this->primaryKeyFrom, $this->primaryKeyTo] = $parameters[1];
 		} else {
 			assert($metadata->relationship->property !== null);
-			$parameters = $mapper->getManyHasManyParameters(
+			$parameters = $targetMapper->getManyHasManyParameters(
 				$metadata->relationship->entityMetadata->getProperty($metadata->relationship->property),
 				$sourceMapper,
 			);
diff --git a/src/Mapper/Dbal/RelationshipMapperManyHasOne.php b/src/Mapper/Dbal/RelationshipMapperManyHasOne.php
index fe54f929..0a6d0d30 100644
--- a/src/Mapper/Dbal/RelationshipMapperManyHasOne.php
+++ b/src/Mapper/Dbal/RelationshipMapperManyHasOne.php
@@ -19,27 +19,19 @@
 
 class RelationshipMapperManyHasOne implements IRelationshipMapper
 {
-	/** @var IConnection */
-	protected $connection;
-
-	/** @var PropertyMetadata */
-	protected $metadata;
-
 	/** @var array<string, MultiEntityIterator> */
-	protected $cacheEntityIterators;
-
-	/** @var DbalMapper<IEntity> */
-	private $targetMapper;
+	protected array $cacheEntityIterators;
 
 
 	/**
 	 * @param DbalMapper<IEntity> $targetMapper
 	 */
-	public function __construct(IConnection $connection, DbalMapper $targetMapper, PropertyMetadata $metadata)
+	public function __construct(
+		protected readonly IConnection $connection,
+		protected readonly DbalMapper $targetMapper,
+		protected readonly PropertyMetadata $metadata,
+	)
 	{
-		$this->connection = $connection;
-		$this->metadata = $metadata;
-		$this->targetMapper = $targetMapper;
 	}
 
 
diff --git a/src/Mapper/Dbal/RelationshipMapperOneHasMany.php b/src/Mapper/Dbal/RelationshipMapperOneHasMany.php
index 094c8997..d4ae1e35 100644
--- a/src/Mapper/Dbal/RelationshipMapperOneHasMany.php
+++ b/src/Mapper/Dbal/RelationshipMapperOneHasMany.php
@@ -29,38 +29,27 @@
 
 class RelationshipMapperOneHasMany implements IRelationshipMapper
 {
-	/** @var IConnection */
-	protected $connection;
-
-	/** @var PropertyMetadata */
-	protected $metadata;
-
-	/** @var PropertyRelationshipMetadata */
-	protected $metadataRelationship;
-
-	/** @var DbalMapper<IEntity> */
-	protected $targetMapper;
-
-	/** @var string */
-	protected $joinStorageKey;
+	protected PropertyRelationshipMetadata $metadataRelationship;
+	protected string $joinStorageKey;
 
 	/** @var array<string, MultiEntityIterator> */
-	protected $cacheEntityIterators;
+	protected array $cacheEntityIterators;
 
 	/** @var array<string, array<int>> */
-	protected $cacheCounts;
+	protected array $cacheCounts;
 
 
 	/**
 	 * @param DbalMapper<IEntity> $targetMapper
 	 */
-	public function __construct(IConnection $connection, DbalMapper $targetMapper, PropertyMetadata $metadata)
+	public function __construct(
+		protected readonly  IConnection $connection,
+		protected readonly DbalMapper $targetMapper,
+		protected readonly PropertyMetadata $metadata,
+	)
 	{
 		assert($metadata->relationship !== null);
 		assert($metadata->relationship->property !== null);
-		$this->connection = $connection;
-		$this->targetMapper = $targetMapper;
-		$this->metadata = $metadata;
 		$this->metadataRelationship = $metadata->relationship;
 		$this->joinStorageKey = $targetMapper->getConventions()
 			->convertEntityToStorageKey($metadata->relationship->property);
diff --git a/src/Mapper/Memory/ArrayMapper.php b/src/Mapper/Memory/ArrayMapper.php
index 92744266..c71db417 100644
--- a/src/Mapper/Memory/ArrayMapper.php
+++ b/src/Mapper/Memory/ArrayMapper.php
@@ -27,16 +27,15 @@
 abstract class ArrayMapper implements IMapper
 {
 	/** @var array<int|string, mixed>|null */
-	protected $data;
+	protected array|null $data = null;
 
 	/** @var array<string, array<int|string, mixed>> */
-	protected $relationshipData = [];
+	protected array $relationshipData = [];
 
-	/** @var IConventions */
-	protected $conventions;
+	protected IConventions|null $conventions = null;
 
 	/** @var IRepository<IEntity>|null */
-	private $repository;
+	private IRepository|null $repository = null;
 
 	/** @var resource|null */
 	static protected $lock;
@@ -179,7 +178,7 @@ public function flush(): void
 	{
 		try {
 			$this->lock();
-			if ($this->data === null || $this->relationshipData === null) {
+			if ($this->data === null) {
 				return;
 			}
 			$this->saveData([$this->data, $this->relationshipData]);
diff --git a/src/Mapper/Memory/Conventions/Conventions.php b/src/Mapper/Memory/Conventions/Conventions.php
index fba91bcf..1f3f795a 100644
--- a/src/Mapper/Memory/Conventions/Conventions.php
+++ b/src/Mapper/Memory/Conventions/Conventions.php
@@ -11,16 +11,13 @@ class Conventions implements IConventions
 	use SmartObject;
 
 
-	/** @var list<string> */
-	private $primaryKeys;
-
-
 	/**
 	 * @param list<string> $primaryKeys
 	 */
-	public function __construct(array $primaryKeys)
+	public function __construct(
+		private readonly array $primaryKeys,
+	)
 	{
-		$this->primaryKeys = $primaryKeys;
 	}
 
 
diff --git a/src/Mapper/Memory/RelationshipMapperManyHasMany.php b/src/Mapper/Memory/RelationshipMapperManyHasMany.php
index d1abf17e..df2c01e2 100644
--- a/src/Mapper/Memory/RelationshipMapperManyHasMany.php
+++ b/src/Mapper/Memory/RelationshipMapperManyHasMany.php
@@ -16,17 +16,18 @@
 class RelationshipMapperManyHasMany implements IRelationshipMapperManyHasMany
 {
 	/** @var ArrayMapper<IEntity> */
-	protected $mapper;
-
-	/** @var PropertyMetadata */
-	protected $metadata;
+	protected ArrayMapper $mapper;
 
 
 	/**
 	 * @param ArrayMapper<IEntity> $mapper
 	 * @param ArrayMapper<IEntity> $sourceMapper
 	 */
-	public function __construct(ArrayMapper $mapper, ArrayMapper $sourceMapper, PropertyMetadata $metadata)
+	public function __construct(
+		ArrayMapper $mapper,
+		ArrayMapper $sourceMapper,
+		protected readonly PropertyMetadata $metadata,
+	)
 	{
 		assert($metadata->relationship !== null);
 		if ($metadata->relationship->isMain) {
@@ -34,7 +35,6 @@ public function __construct(ArrayMapper $mapper, ArrayMapper $sourceMapper, Prop
 		} else {
 			$this->mapper = $mapper;
 		}
-		$this->metadata = $metadata;
 	}
 
 
diff --git a/src/Mapper/Memory/RelationshipMapperManyHasOne.php b/src/Mapper/Memory/RelationshipMapperManyHasOne.php
index e068e7a8..d15b8c63 100644
--- a/src/Mapper/Memory/RelationshipMapperManyHasOne.php
+++ b/src/Mapper/Memory/RelationshipMapperManyHasOne.php
@@ -14,13 +14,9 @@
 
 class RelationshipMapperManyHasOne implements IRelationshipMapper
 {
-	/** @var PropertyMetadata */
-	protected $metadata;
-
-
-	public function __construct(PropertyMetadata $metadata)
+	public function __construct(
+		protected readonly PropertyMetadata $metadata,)
 	{
-		$this->metadata = $metadata;
 	}
 
 
diff --git a/src/Mapper/Memory/RelationshipMapperOneHasMany.php b/src/Mapper/Memory/RelationshipMapperOneHasMany.php
index e220a38d..d1a6737f 100644
--- a/src/Mapper/Memory/RelationshipMapperOneHasMany.php
+++ b/src/Mapper/Memory/RelationshipMapperOneHasMany.php
@@ -14,21 +14,19 @@
 
 class RelationshipMapperOneHasMany implements IRelationshipMapper
 {
-	/** @var PropertyMetadata */
-	protected $metadata;
-
-	/** @var string */
-	protected $joinStorageKey;
+	protected string $joinStorageKey;
 
 
 	/**
 	 * @param ArrayMapper<IEntity> $targetMapper
 	 */
-	public function __construct(ArrayMapper $targetMapper, PropertyMetadata $metadata)
+	public function __construct(
+		ArrayMapper $targetMapper,
+		protected readonly PropertyMetadata $metadata,
+	)
 	{
 		assert($metadata->relationship !== null);
 		assert($metadata->relationship->property !== null);
-		$this->metadata = $metadata;
 		$this->joinStorageKey = $targetMapper->getConventions()
 			->convertEntityToStorageKey($metadata->relationship->property);
 	}
diff --git a/src/Model/MetadataStorage.php b/src/Model/MetadataStorage.php
index e170e6b7..ab233302 100644
--- a/src/Model/MetadataStorage.php
+++ b/src/Model/MetadataStorage.php
@@ -21,7 +21,7 @@
 class MetadataStorage
 {
 	/** @var EntityMetadata[] */
-	private static $metadata = [];
+	private static array $metadata = [];
 
 
 	public static function get(string $className): EntityMetadata
diff --git a/src/Model/Model.php b/src/Model/Model.php
index c1103dff..e5a50591 100644
--- a/src/Model/Model.php
+++ b/src/Model/Model.php
@@ -22,25 +22,9 @@ class Model implements IModel
 {
 	use SmartObject;
 
-
 	/** @var list<callable(IEntity[] $persisted, IEntity[] $removed): void> */
 	public $onFlush = [];
 
-	/** @var IRepositoryLoader */
-	private $loader;
-
-	/** @var MetadataStorage */
-	private $metadataStorage;
-
-	/**
-	 * @var array{
-	 *     array<class-string<IRepository<IEntity>>, true>,
-	 *     array<string, class-string<IRepository<IEntity>>>,
-	 *     array<class-string<IEntity>, class-string<IRepository<IEntity>>>
-	 *     }
-	 */
-	private $configuration;
-
 
 	/**
 	 * Creates repository list configuration.
@@ -77,14 +61,11 @@ public static function getConfiguration(array $repositories): array
 	 *     } $configuration
 	 */
 	public function __construct(
-		array $configuration,
-		IRepositoryLoader $repositoryLoader,
-		MetadataStorage $metadataStorage
+		private readonly array $configuration,
+		private readonly IRepositoryLoader $repositoryLoader,
+		private readonly MetadataStorage $metadataStorage
 	)
 	{
-		$this->loader = $repositoryLoader;
-		$this->metadataStorage = $metadataStorage;
-		$this->configuration = $configuration;
 	}
 
 
@@ -121,7 +102,7 @@ public function getRepository(string $className): IRepository
 		if (!isset($this->configuration[0][$className])) {
 			throw new InvalidArgumentException("Repository '$className' does not exist.");
 		}
-		$repository = $this->loader->getRepository($className);
+		$repository = $this->repositoryLoader->getRepository($className);
 		return $repository;
 	}
 
@@ -154,7 +135,7 @@ public function persist(IEntity $entity, bool $withCascade = true): IEntity
 		foreach ($queue as $object) {
 			if ($object instanceof IEntity) {
 				$repository = $this->configuration[2][get_class($object)];
-				$this->loader->getRepository($repository)->doPersist($object);
+				$this->repositoryLoader->getRepository($repository)->doPersist($object);
 			} elseif ($object instanceof IRelationshipCollection) {
 				$object->doPersist();
 			} elseif ($object instanceof IRelationshipContainer) {
@@ -180,7 +161,7 @@ public function remove(IEntity $entity, bool $withCascade = true): IEntity
 		foreach ($queuePersist as $object) {
 			if ($object instanceof IEntity) {
 				$repository = $this->configuration[2][get_class($object)];
-				$this->loader->getRepository($repository)->doPersist($object);
+				$this->repositoryLoader->getRepository($repository)->doPersist($object);
 			} elseif ($object instanceof IRelationshipCollection) {
 				$object->doPersist();
 			} elseif ($object instanceof IRelationshipContainer) {
@@ -189,7 +170,7 @@ public function remove(IEntity $entity, bool $withCascade = true): IEntity
 		}
 		foreach ($queueRemove as $object) {
 			$repository = $this->configuration[2][get_class($object)];
-			$this->loader->getRepository($repository)->doRemove($object);
+			$this->repositoryLoader->getRepository($repository)->doRemove($object);
 		}
 		return $entity;
 	}
@@ -251,8 +232,8 @@ private function getLoadedRepositories(): array
 	{
 		$repositories = [];
 		foreach (array_keys($this->configuration[0]) as $className) {
-			if ($this->loader->isCreated($className)) {
-				$repositories[] = $this->loader->getRepository($className);
+			if ($this->repositoryLoader->isCreated($className)) {
+				$repositories[] = $this->repositoryLoader->getRepository($className);
 			}
 		}
 
diff --git a/src/Model/SimpleModelFactory.php b/src/Model/SimpleModelFactory.php
index aa3d31ce..40558b78 100644
--- a/src/Model/SimpleModelFactory.php
+++ b/src/Model/SimpleModelFactory.php
@@ -13,25 +13,16 @@
 
 class SimpleModelFactory
 {
-	/** @var Cache */
-	private $cache;
-
-	/** @var array<string, IRepository<IEntity>> */
-	private $repositories;
-
-	/** @var IMetadataParserFactory|null */
-	private $metadataParserFactory;
-
-
 	/**
 	 * @template E of IEntity
 	 * @param array<string, IRepository<E>> $repositories
 	 */
-	public function __construct(Cache $cache, array $repositories, IMetadataParserFactory $metadataParserFactory = null)
+	public function __construct(
+		private readonly Cache $cache,
+		private readonly array $repositories,
+		private readonly IMetadataParserFactory|null $metadataParserFactory = null,
+	)
 	{
-		$this->cache = $cache;
-		$this->repositories = $repositories;
-		$this->metadataParserFactory = $metadataParserFactory;
 	}
 
 
diff --git a/src/Model/SimpleRepositoryLoader.php b/src/Model/SimpleRepositoryLoader.php
index 24b99ba6..d4aae9a2 100644
--- a/src/Model/SimpleRepositoryLoader.php
+++ b/src/Model/SimpleRepositoryLoader.php
@@ -11,7 +11,7 @@
 class SimpleRepositoryLoader implements IRepositoryLoader
 {
 	/** @var array<class-string<IRepository<IEntity>>, IRepository<IEntity>> */
-	private $repositories = [];
+	private array $repositories = [];
 
 
 	/**
diff --git a/src/Relationships/HasMany.php b/src/Relationships/HasMany.php
index f6f72ab3..3f61fe30 100644
--- a/src/Relationships/HasMany.php
+++ b/src/Relationships/HasMany.php
@@ -52,15 +52,15 @@ abstract class HasMany implements IRelationshipCollection
 	protected bool $isModified = false;
 	protected bool $exposeCollection;
 
-	protected PropertyMetadata $metadata;
 	protected PropertyRelationshipMetadata $metadataRelationship;
 	protected ?IRelationshipMapper $relationshipMapper = null;
 
 
-	public function __construct(PropertyMetadata $metadata)
+	public function __construct(
+		protected readonly PropertyMetadata $metadata,
+	)
 	{
 		assert($metadata->relationship !== null);
-		$this->metadata = $metadata;
 		$this->metadataRelationship = $metadata->relationship;
 		$this->exposeCollection = (bool) ($this->metadata->args[HasMany::class]['exposeCollection'] ?? false);
 	}
diff --git a/src/Relationships/HasOne.php b/src/Relationships/HasOne.php
index 93dff880..078b46d1 100644
--- a/src/Relationships/HasOne.php
+++ b/src/Relationships/HasOne.php
@@ -48,14 +48,14 @@ abstract class HasOne implements IRelationshipContainer
 	protected bool $updatingReverseRelationship = false;
 	protected bool $isModified = false;
 
-	protected PropertyMetadata $metadata;
 	protected PropertyRelationshipMetadata $metadataRelationship;
 
 
-	public function __construct(PropertyMetadata $metadata)
+	public function __construct(
+		protected readonly PropertyMetadata $metadata,
+	)
 	{
 		assert($metadata->relationship !== null);
-		$this->metadata = $metadata;
 		$this->metadataRelationship = $metadata->relationship;
 	}
 
diff --git a/src/Repository/IdentityMap.php b/src/Repository/IdentityMap.php
index eaa4910e..65fe5a1b 100644
--- a/src/Repository/IdentityMap.php
+++ b/src/Repository/IdentityMap.php
@@ -22,25 +22,23 @@
  */
 class IdentityMap
 {
-	/** @var IRepository<E> */
-	private $repository;
-
 	/** @var array<int|string, E|false> */
-	private $entities = [];
+	private array $entities = [];
 
 	/** @var array<int|string, bool> */
-	private $entitiesForRefresh = [];
+	private array $entitiesForRefresh = [];
 
 	/** @var array<class-string<E>, ReflectionClass<E>> */
-	private $entityReflections;
+	private array $entityReflections = [];
 
 
 	/**
 	 * @param IRepository<E> $repository
 	 */
-	public function __construct(IRepository $repository)
+	public function __construct(
+		private readonly IRepository $repository,
+	)
 	{
-		$this->repository = $repository;
 	}
 
 
diff --git a/src/Repository/PersistenceHelper.php b/src/Repository/PersistenceHelper.php
index 7b2c7d2d..c718ff15 100644
--- a/src/Repository/PersistenceHelper.php
+++ b/src/Repository/PersistenceHelper.php
@@ -15,10 +15,10 @@
 class PersistenceHelper
 {
 	/** @var array<int, IRelationshipCollection<IEntity>|IRelationshipContainer<IEntity>> */
-	protected static $inputQueue = [];
+	protected static array $inputQueue = [];
 
 	/** @var array<int, IEntity|IRelationshipCollection<IEntity>|IRelationshipContainer<IEntity>|true> */
-	protected static $outputQueue = [];
+	protected static array $outputQueue = [];
 
 
 	/**
diff --git a/src/Repository/Repository.php b/src/Repository/Repository.php
index 7b6520e8..4ee6d795 100644
--- a/src/Repository/Repository.php
+++ b/src/Repository/Repository.php
@@ -52,68 +52,60 @@
 abstract class Repository implements IRepository
 {
 	/** @var array<mixed, callable(E $entity): void> */
-	public $onBeforePersist = [];
+	public array $onBeforePersist = [];
 
 	/** @var array<mixed, callable(E $entity): void> */
-	public $onAfterPersist = [];
+	public array $onAfterPersist = [];
 
 	/** @var array<mixed, callable(E $entity): void> */
-	public $onBeforeInsert = [];
+	public array $onBeforeInsert = [];
 
 	/** @var array<mixed, callable(E $entity): void> */
-	public $onAfterInsert = [];
+	public array $onAfterInsert = [];
 
 	/** @var array<mixed, callable(E $entity): void> */
-	public $onBeforeUpdate = [];
+	public array $onBeforeUpdate = [];
 
 	/** @var array<mixed, callable(E $entity): void> */
-	public $onAfterUpdate = [];
+	public array $onAfterUpdate = [];
 
 	/** @var array<mixed, callable(E $entity): void> */
-	public $onBeforeRemove = [];
+	public array $onBeforeRemove = [];
 
 	/** @var array<mixed, callable(E $entity): void> */
-	public $onAfterRemove = [];
+	public array $onAfterRemove = [];
 
 	/** @var array<mixed, callable(E[] $persisted, E[] $removed): void> */
-	public $onFlush = [];
-
-	/** @var IMapper<E> */
-	protected $mapper;
+	public array $onFlush = [];
 
 	/** @var class-string<E>|null */
-	protected $entityClassName;
+	protected string|null $entityClassName = null;
 
-	/** @var IModel|null */
-	private $model;
+	private ?IModel $model = null;
+	private ConditionParser|null $conditionParser = null;
 
 	/** @var IdentityMap<E> */
-	private $identityMap;
+	private IdentityMap $identityMap;
 
 	/** @var array<string, bool> */
-	private $proxyMethods;
+	private array $proxyMethods = [];
 
 	/** @var array{list<E>, list<E>} */
-	private $entitiesToFlush = [[], []];
-
-	/** @var IDependencyProvider|null */
-	private $dependencyProvider;
+	private array $entitiesToFlush = [[], []];
 
 	/** @var array<string, CollectionFunction> Collection functions cache */
 	private array $collectionFunctions = [];
 
-	/** @var ConditionParser|null */
-	private $conditionParser;
-
 
 	/**
 	 * @param IMapper<E> $mapper
 	 */
-	public function __construct(IMapper $mapper, IDependencyProvider $dependencyProvider = null)
+	public function __construct(
+		protected readonly IMapper $mapper,
+		protected readonly IDependencyProvider|null $dependencyProvider = null,
+	)
 	{
-		$this->mapper = $mapper;
 		$this->mapper->setRepository($this);
-		$this->dependencyProvider = $dependencyProvider;
 
 		/** @var IdentityMap<E> $identityMap */
 		$identityMap = new IdentityMap($this);
diff --git a/src/TestHelper/EntityCreator.php b/src/TestHelper/EntityCreator.php
index 0b93fd33..41481466 100644
--- a/src/TestHelper/EntityCreator.php
+++ b/src/TestHelper/EntityCreator.php
@@ -14,13 +14,10 @@
 
 class EntityCreator
 {
-	/** @var IModel */
-	private $model;
-
-
-	public function __construct(IModel $model)
+	public function __construct(
+		private readonly IModel $model,
+	)
 	{
-		$this->model = $model;
 	}
 
 
diff --git a/src/TestHelper/TestMapper.php b/src/TestHelper/TestMapper.php
index f95ebaae..10a8bda4 100644
--- a/src/TestHelper/TestMapper.php
+++ b/src/TestHelper/TestMapper.php
@@ -14,10 +14,10 @@
 class TestMapper extends ArrayMapper
 {
 	/** @var string */
-	protected $storage = '';
+	protected string $storage = '';
 
 	/** @var mixed[] array of callbacks */
-	protected $methods = [];
+	protected array $methods = [];
 
 
 	public function addMethod(string $name, callable $callback): void