Make strict typing

FastyBird · Oct 21, 2022 · 9dbcb4f · 9dbcb4f
1 parent aab2fd9
commit 9dbcb4f
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 65 deletions.
diff --git a/src/Models/Channels/ChannelsRepository.php b/src/Models/Channels/ChannelsRepository.php
@@ -91,17 +91,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Channels\Channel> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Channels\Channel>
 	 */
 	private function getRepository(string $type = Entities\Channels\Channel::class): ORM\EntityRepository
 	{
 		if ($this->repository === null) {
-			/** @var ORM\EntityRepository<Entities\Channels\Channel> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository = $repository;
+			$this->repository = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository;

diff --git a/src/Models/Channels/Controls/ControlsRepository.php b/src/Models/Channels/Controls/ControlsRepository.php
@@ -91,17 +91,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Channels\Controls\Control> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Channels\Controls\Control>
 	 */
 	private function getRepository(string $type = Entities\Channels\Controls\Control::class): ORM\EntityRepository
 	{
 		if ($this->repository === null) {
-			/** @var ORM\EntityRepository<Entities\Channels\Controls\Control> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository = $repository;
+			$this->repository = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository;

diff --git a/src/Models/Channels/Properties/PropertiesRepository.php b/src/Models/Channels/Properties/PropertiesRepository.php
@@ -46,7 +46,7 @@ public function __construct(private readonly Persistence\ManagerRegistry $manage
 	}
 
 	/**
-	 * @param class-string $type
+	 * @phpstan-param class-string<Entities\Channels\Properties\Property> $type
 	 *
 	 * @throws DoctrineOrmQueryExceptions\InvalidStateException
 	 * @throws DoctrineOrmQueryExceptions\QueryException
@@ -60,7 +60,7 @@ public function findOneBy(
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Channels\Properties\Property> $type
 	 *
 	 * @phpstan-return Array<Entities\Channels\Properties\Property>
 	 *
@@ -86,7 +86,7 @@ public function findAllBy(
 	}
 
 	/**
-	 * @phpstan-param  class-string $type
+	 * @phpstan-param class-string<Entities\Channels\Properties\Property> $type
 	 *
 	 * @phpstan-return DoctrineOrmQuery\ResultSet<Entities\Channels\Properties\Property>
 	 *
@@ -104,17 +104,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Channels\Properties\Property> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Channels\Properties\Property>
 	 */
 	private function getRepository(string $type): ORM\EntityRepository
 	{
 		if (!isset($this->repository[$type])) {
-			/** @var ORM\EntityRepository<Entities\Channels\Properties\Property> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository[$type] = $repository;
+			$this->repository[$type] = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository[$type];

diff --git a/src/Models/Connectors/ConnectorsRepository.php b/src/Models/Connectors/ConnectorsRepository.php
@@ -46,7 +46,7 @@ public function __construct(private readonly Persistence\ManagerRegistry $manage
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Connectors\Connector> $type
 	 *
 	 * @throws DoctrineOrmQueryExceptions\InvalidStateException
 	 * @throws DoctrineOrmQueryExceptions\QueryException
@@ -60,7 +60,7 @@ public function findOneBy(
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Connectors\Connector> $type
 	 *
 	 * @phpstan-return Array<Entities\Connectors\Connector>
 	 *
@@ -86,7 +86,7 @@ public function findAllBy(
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Connectors\Connector> $type
 	 *
 	 * @phpstan-return DoctrineOrmQuery\ResultSet<Entities\Connectors\Connector>
 	 *
@@ -104,17 +104,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Connectors\Connector> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Connectors\Connector>
 	 */
 	private function getRepository(string $type): ORM\EntityRepository
 	{
 		if (!isset($this->repository[$type])) {
-			/** @var ORM\EntityRepository<Entities\Connectors\Connector> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository[$type] = $repository;
+			$this->repository[$type] = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository[$type];

diff --git a/src/Models/Connectors/Controls/ControlsRepository.php b/src/Models/Connectors/Controls/ControlsRepository.php
@@ -91,17 +91,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Connectors\Controls\Control> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Connectors\Controls\Control>
 	 */
 	private function getRepository(string $type = Entities\Connectors\Controls\Control::class): ORM\EntityRepository
 	{
 		if ($this->repository === null) {
-			/** @var ORM\EntityRepository<Entities\Connectors\Controls\Control> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository = $repository;
+			$this->repository = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository;

diff --git a/src/Models/Connectors/Properties/PropertiesRepository.php b/src/Models/Connectors/Properties/PropertiesRepository.php
@@ -46,7 +46,7 @@ public function __construct(private readonly Persistence\ManagerRegistry $manage
 	}
 
 	/**
-	 * @param class-string $type
+	 * @phpstan-param class-string<Entities\Connectors\Properties\Property> $type
 	 *
 	 * @throws DoctrineOrmQueryExceptions\InvalidStateException
 	 * @throws DoctrineOrmQueryExceptions\QueryException
@@ -60,7 +60,7 @@ public function findOneBy(
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Connectors\Properties\Property> $type
 	 *
 	 * @phpstan-return Array<Entities\Connectors\Properties\Property>
 	 *
@@ -86,7 +86,7 @@ public function findAllBy(
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Connectors\Properties\Property> $type
 	 *
 	 * @phpstan-return DoctrineOrmQuery\ResultSet<Entities\Connectors\Properties\Property>
 	 *
@@ -104,17 +104,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Connectors\Properties\Property> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Connectors\Properties\Property>
 	 */
 	private function getRepository(string $type): ORM\EntityRepository
 	{
 		if (!isset($this->repository[$type])) {
-			/** @var ORM\EntityRepository<Entities\Connectors\Properties\Property> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository[$type] = $repository;
+			$this->repository[$type] = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository[$type];

diff --git a/src/Models/Devices/Attributes/AttributesRepository.php b/src/Models/Devices/Attributes/AttributesRepository.php
@@ -91,17 +91,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Devices\Attributes\Attribute> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Devices\Attributes\Attribute>
 	 */
 	private function getRepository(string $type = Entities\Devices\Attributes\Attribute::class): ORM\EntityRepository
 	{
 		if ($this->repository === null) {
-			/** @var ORM\EntityRepository<Entities\Devices\Attributes\Attribute> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository = $repository;
+			$this->repository = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository;

diff --git a/src/Models/Devices/Controls/ControlsRepository.php b/src/Models/Devices/Controls/ControlsRepository.php
@@ -91,17 +91,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Devices\Controls\Control> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Devices\Controls\Control>
 	 */
 	private function getRepository(string $type = Entities\Devices\Controls\Control::class): ORM\EntityRepository
 	{
 		if ($this->repository === null) {
-			/** @var ORM\EntityRepository<Entities\Devices\Controls\Control> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository = $repository;
+			$this->repository = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository;

diff --git a/src/Models/Devices/DevicesRepository.php b/src/Models/Devices/DevicesRepository.php
@@ -46,7 +46,7 @@ public function __construct(private readonly Persistence\ManagerRegistry $manage
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Devices\Device> $type
 	 *
 	 * @throws DoctrineOrmQueryExceptions\InvalidStateException
 	 * @throws DoctrineOrmQueryExceptions\QueryException
@@ -60,7 +60,7 @@ public function findOneBy(
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Devices\Device> $type
 	 *
 	 * @phpstan-return Array<Entities\Devices\Device>
 	 *
@@ -86,7 +86,7 @@ public function findAllBy(
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Devices\Device> $type
 	 *
 	 * @phpstan-return DoctrineOrmQuery\ResultSet<Entities\Devices\Device>
 	 *
@@ -104,17 +104,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Devices\Device> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Devices\Device>
 	 */
 	private function getRepository(string $type): ORM\EntityRepository
 	{
 		if (!isset($this->repository[$type])) {
-			/** @var ORM\EntityRepository<Entities\Devices\Device> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository[$type] = $repository;
+			$this->repository[$type] = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository[$type];

diff --git a/src/Models/Devices/Properties/PropertiesRepository.php b/src/Models/Devices/Properties/PropertiesRepository.php
@@ -46,7 +46,7 @@ public function __construct(private readonly Persistence\ManagerRegistry $manage
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Devices\Properties\Property> $type
 	 *
 	 * @throws DoctrineOrmQueryExceptions\InvalidStateException
 	 * @throws DoctrineOrmQueryExceptions\QueryException
@@ -60,7 +60,7 @@ public function findOneBy(
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Devices\Properties\Property> $type
 	 *
 	 * @phpstan-return  Array<Entities\Devices\Properties\Property>
 	 *
@@ -86,7 +86,7 @@ public function findAllBy(
 	}
 
 	/**
-	 * @phpstan-param class-string $type
+	 * @phpstan-param class-string<Entities\Devices\Properties\Property> $type
 	 *
 	 * @phpstan-return DoctrineOrmQuery\ResultSet<Entities\Devices\Properties\Property>
 	 *
@@ -104,17 +104,14 @@ public function getResultSet(
 	}
 
 	/**
-	 * @param class-string $type
+	 * @param class-string<Entities\Devices\Properties\Property> $type
 	 *
 	 * @return ORM\EntityRepository<Entities\Devices\Properties\Property>
 	 */
 	private function getRepository(string $type): ORM\EntityRepository
 	{
 		if (!isset($this->repository[$type])) {
-			/** @var  ORM\EntityRepository<Entities\Devices\Properties\Property> $repository */
-			$repository = $this->managerRegistry->getRepository($type);
-
-			$this->repository[$type] = $repository;
+			$this->repository[$type] = $this->managerRegistry->getRepository($type);
 		}
 
 		return $this->repository[$type];