[ui-module][general] Move widgets data sources into bridges (#281)

FastyBird · Aug 5, 2024 · ee2f123 · ee2f123
1 parent b7d973b
commit ee2f123
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/src/Hydrators/Channels/Channel.php b/src/Hydrators/Channels/Channel.php
@@ -15,7 +15,6 @@
 
 namespace FastyBird\Connector\Sonoff\Hydrators\Channels;
 
-use Doctrine\Common;
 use Doctrine\Persistence;
 use FastyBird\Connector\Sonoff\Entities;
 use FastyBird\Connector\Sonoff\Schemas;
@@ -29,6 +28,7 @@
 use Nette\Localization;
 use Ramsey\Uuid;
 use function is_string;
+use function strval;
 
 /**
  * Sonoff channel entity hydrator
@@ -47,10 +47,9 @@ public function __construct(
 		Persistence\ManagerRegistry $managerRegistry,
 		Localization\Translator $translator,
 		Helpers\CrudReader|null $crudReader = null,
-		Common\Cache\Cache|null $cache = null,
 	)
 	{
-		parent::__construct($managerRegistry, $translator, $crudReader, $cache);
+		parent::__construct($managerRegistry, $translator, $crudReader);
 	}
 
 	public function getEntityName(): string
@@ -85,8 +84,8 @@ protected function hydrateDeviceRelationship(
 
 		throw new JsonApiExceptions\JsonApiError(
 			StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY,
-			$this->translator->translate('//sonoff-connector.base.messages.invalidRelation.heading'),
-			$this->translator->translate('//sonoff-connector.base.messages.invalidRelation.message'),
+			strval($this->translator->translate('//sonoff-connector.base.messages.invalidRelation.heading')),
+			strval($this->translator->translate('//sonoff-connector.base.messages.invalidRelation.message')),
 			[
 				'pointer' => '/data/relationships/' . Schemas\Channels\Channel::RELATIONSHIPS_DEVICE . '/data/id',
 			],

diff --git a/src/Hydrators/Devices/Device.php b/src/Hydrators/Devices/Device.php
@@ -15,7 +15,6 @@
 
 namespace FastyBird\Connector\Sonoff\Hydrators\Devices;
 
-use Doctrine\Common;
 use Doctrine\Persistence;
 use FastyBird\Connector\Sonoff\Entities;
 use FastyBird\Connector\Sonoff\Schemas;
@@ -29,6 +28,7 @@
 use Nette\Localization;
 use Ramsey\Uuid;
 use function is_string;
+use function strval;
 
 /**
  * Sonoff device entity hydrator
@@ -47,10 +47,9 @@ public function __construct(
 		Persistence\ManagerRegistry $managerRegistry,
 		Localization\Translator $translator,
 		Helpers\CrudReader|null $crudReader = null,
-		Common\Cache\Cache|null $cache = null,
 	)
 	{
-		parent::__construct($managerRegistry, $translator, $crudReader, $cache);
+		parent::__construct($managerRegistry, $translator, $crudReader);
 	}
 
 	public function getEntityName(): string
@@ -85,8 +84,8 @@ protected function hydrateConnectorRelationship(
 
 		throw new JsonApiExceptions\JsonApiError(
 			StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY,
-			$this->translator->translate('//sonoff-connector.base.messages.invalidRelation.heading'),
-			$this->translator->translate('//sonoff-connector.base.messages.invalidRelation.message'),
+			strval($this->translator->translate('//sonoff-connector.base.messages.invalidRelation.heading')),
+			strval($this->translator->translate('//sonoff-connector.base.messages.invalidRelation.message')),
 			[
 				'pointer' => '/data/relationships/' . Schemas\Devices\Device::RELATIONSHIPS_CONNECTOR . '/data/id',
 			],

diff --git a/src/Queue/Consumers/ChannelProperty.php b/src/Queue/Consumers/ChannelProperty.php
@@ -63,7 +63,7 @@ private function setChannelProperty(
 		array|string|null $format = null,
 		string|null $unit = null,
 		float|int|string|null $invalid = null,
-		float|int|null $scale = null,
+		int|null $scale = null,
 		bool $settable = false,
 		bool $queryable = false,
 	): void

diff --git a/src/Subscribers/Controls.php b/src/Subscribers/Controls.php
@@ -16,13 +16,15 @@
 namespace FastyBird\Connector\Sonoff\Subscribers;
 
 use Doctrine\Common;
+use Doctrine\DBAL;
 use Doctrine\ORM;
 use Doctrine\Persistence;
 use FastyBird\Connector\Sonoff\Entities;
 use FastyBird\Library\Application\Exceptions as ApplicationExceptions;
 use FastyBird\Module\Devices\Models as DevicesModels;
 use FastyBird\Module\Devices\Queries as DevicesQueries;
 use FastyBird\Module\Devices\Types as DevicesTypes;
+use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions;
 use Nette;
 use Nette\Utils;
 
@@ -57,6 +59,10 @@ public function getSubscribedEvents(): array
 	 * @param Persistence\Event\LifecycleEventArgs<ORM\EntityManagerInterface> $eventArgs
 	 *
 	 * @throws ApplicationExceptions\InvalidState
+	 * @throws DBAL\Exception\UniqueConstraintViolationException
+	 * @throws DoctrineCrudExceptions\EntityCreation
+	 * @throws DoctrineCrudExceptions\InvalidArgument
+	 * @throws DoctrineCrudExceptions\InvalidState
 	 */
 	public function postPersist(Persistence\Event\LifecycleEventArgs $eventArgs): void
 	{

diff --git a/src/Subscribers/Properties.php b/src/Subscribers/Properties.php
@@ -16,6 +16,7 @@
 namespace FastyBird\Connector\Sonoff\Subscribers;
 
 use Doctrine\Common;
+use Doctrine\DBAL;
 use Doctrine\ORM;
 use Doctrine\Persistence;
 use FastyBird\Connector\Sonoff\Entities;
@@ -28,7 +29,7 @@
 use FastyBird\Module\Devices\Models as DevicesModels;
 use FastyBird\Module\Devices\Types as DevicesTypes;
 use FastyBird\Module\Devices\Utilities as DevicesUtilities;
-use IPub\DoctrineCrud;
+use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions;
 use Nette;
 use Nette\Utils;
 
@@ -63,8 +64,11 @@ public function getSubscribedEvents(): array
 	 * @param Persistence\Event\LifecycleEventArgs<ORM\EntityManagerInterface> $eventArgs
 	 *
 	 * @throws ApplicationExceptions\InvalidState
+	 * @throws DBAL\Exception\UniqueConstraintViolationException
+	 * @throws DoctrineCrudExceptions\EntityCreation
+	 * @throws DoctrineCrudExceptions\InvalidArgument
+	 * @throws DoctrineCrudExceptions\InvalidState
 	 * @throws Exceptions\InvalidArgument
-	 * @throws DoctrineCrud\Exceptions\InvalidArgumentException
 	 */
 	public function postPersist(Persistence\Event\LifecycleEventArgs $eventArgs): void
 	{