[zigbee2mqtt-connector] Zigbee2MQTT integration (#225)

FastyBird · Jan 7, 2024 · 7596217 · 7596217
1 parent d1978cf
commit 7596217
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 21 deletions.
diff --git a/src/Queue/Consumers/StoreDeviceConnectionState.php b/src/Queue/Consumers/StoreDeviceConnectionState.php
@@ -19,7 +19,7 @@
 use FastyBird\Connector\Virtual;
 use FastyBird\Connector\Virtual\Entities;
 use FastyBird\Connector\Virtual\Queue;
-use FastyBird\Library\Metadata;
+use FastyBird\Library\Metadata\Documents as MetadataDocuments;
 use FastyBird\Library\Metadata\Exceptions as MetadataExceptions;
 use FastyBird\Library\Metadata\Types as MetadataTypes;
 use FastyBird\Module\Devices\Exceptions as DevicesExceptions;
@@ -105,16 +105,16 @@ public function consume(Entities\Messages\Entity $entity): bool
 			);
 
 			if (
-				$entity->getState()->equalsValue(Metadata\Types\ConnectionState::STATE_DISCONNECTED)
-				|| $entity->getState()->equalsValue(Metadata\Types\ConnectionState::STATE_ALERT)
-				|| $entity->getState()->equalsValue(Metadata\Types\ConnectionState::STATE_UNKNOWN)
+				$entity->getState()->equalsValue(MetadataTypes\ConnectionState::STATE_DISCONNECTED)
+				|| $entity->getState()->equalsValue(MetadataTypes\ConnectionState::STATE_ALERT)
+				|| $entity->getState()->equalsValue(MetadataTypes\ConnectionState::STATE_UNKNOWN)
 			) {
 				$findDevicePropertiesQuery = new DevicesQueries\Configuration\FindDeviceDynamicProperties();
 				$findDevicePropertiesQuery->forDevice($device);
 
 				foreach ($this->devicesPropertiesConfigurationRepository->findAllBy(
 					$findDevicePropertiesQuery,
-					Metadata\Documents\DevicesModule\DeviceDynamicProperty::class,
+					MetadataDocuments\DevicesModule\DeviceDynamicProperty::class,
 				) as $property) {
 					$this->devicePropertiesStatesManager->setValidState($property, false);
 				}
@@ -130,7 +130,7 @@ public function consume(Entities\Messages\Entity $entity): bool
 
 					foreach ($this->channelsPropertiesConfigurationRepository->findAllBy(
 						$findChannelPropertiesQuery,
-						Metadata\Documents\DevicesModule\ChannelDynamicProperty::class,
+						MetadataDocuments\DevicesModule\ChannelDynamicProperty::class,
 					) as $property) {
 						$this->channelPropertiesStatesManager->setValidState($property, false);
 					}

diff --git a/src/Writers/Periodic.php b/src/Writers/Periodic.php
@@ -104,15 +104,14 @@ public function connect(): void
 
 			$findDevicePropertiesQuery = new DevicesQueries\Configuration\FindDeviceProperties();
 			$findDevicePropertiesQuery->forDevice($device);
+			$findDevicePropertiesQuery->settable(true);
 
 			$properties = $this->devicesPropertiesConfigurationRepository->findAllBy($findDevicePropertiesQuery);
 
 			foreach ($properties as $property) {
 				if (
-					(
-						$property instanceof MetadataDocuments\DevicesModule\DeviceDynamicProperty
-						|| $property instanceof MetadataDocuments\DevicesModule\DeviceMappedProperty
-					) && $property->isSettable()
+					$property instanceof MetadataDocuments\DevicesModule\DeviceDynamicProperty
+					|| $property instanceof MetadataDocuments\DevicesModule\DeviceMappedProperty
 				) {
 					$this->properties[$device->getId()->toString()][$property->getId()->toString()] = $property;
 				}
@@ -126,15 +125,14 @@ public function connect(): void
 			foreach ($channels as $channel) {
 				$findChannelPropertiesQuery = new DevicesQueries\Configuration\FindChannelProperties();
 				$findChannelPropertiesQuery->forChannel($channel);
+				$findChannelPropertiesQuery->settable(true);
 
 				$properties = $this->channelsPropertiesConfigurationRepository->findAllBy($findChannelPropertiesQuery);
 
 				foreach ($properties as $property) {
 					if (
-						(
-							$property instanceof MetadataDocuments\DevicesModule\ChannelDynamicProperty
-							|| $property instanceof MetadataDocuments\DevicesModule\ChannelMappedProperty
-						) && $property->isSettable()
+						$property instanceof MetadataDocuments\DevicesModule\ChannelDynamicProperty
+						|| $property instanceof MetadataDocuments\DevicesModule\ChannelMappedProperty
 					) {
 						$this->properties[$device->getId()->toString()][$property->getId()->toString()] = $property;
 					}

diff --git a/tests/common.neon b/tests/common.neon
@@ -40,18 +40,14 @@ services:
         factory: IPub\SlimRouter\Routing\Router
         setup:
             - addMiddleware(@fbJsonApi.middlewares.jsonapi)
-    - {
-      create: React\EventLoop\Factory::create()
-      type: React\EventLoop\LoopInterface
-    }
 
     -
         factory: FastyBird\Connector\Virtual\Tests\Fixtures\Dummy\DummyConnectorFactory
         tags: [connector_type: dummy]
     - {factory: FastyBird\Connector\Virtual\Tests\Fixtures\Dummy\DummyConnectorSchema}
     - {factory: FastyBird\Connector\Virtual\Tests\Fixtures\Dummy\DummyDeviceSchema}
 
-    cache.storage: Nette\Caching\Storages\MemoryStorage
+    cache.storage: Nette\Caching\Storages\DevNullStorage
 
 decorator:
     Doctrine\Persistence\Mapping\Driver\MappingDriverChain:

diff --git a/tests/tools/ConnectionWrapper.php b/tests/tools/ConnectionWrapper.php
@@ -32,7 +32,7 @@ public function __construct(
 	)
 	{
 		$this->dbName = is_string(getenv('TEST_TOKEN'))
-			? 'fb_test_' . getmypid() . md5((string) time()) . getenv('TEST_TOKEN') ?? ''
+			? 'fb_test_' . getmypid() . md5((string) time()) . getenv('TEST_TOKEN')
 			: 'fb_test_' . getmypid() . md5((string) time());
 
 		unset($params['dbname']);

diff --git a/tests/tools/JsonAssert.php b/tests/tools/JsonAssert.php
@@ -3,6 +3,7 @@
 namespace FastyBird\Connector\Virtual\Tests\Tools;
 
 use Closure;
+use Nette;
 use Nette\StaticClass;
 use Nette\Utils;
 use PHPUnit\Framework\ExpectationFailedException;
@@ -17,6 +18,7 @@ class JsonAssert
 
 	/**
 	 * @throws ExpectationFailedException
+	 * @throws Nette\IOException
 	 *
 	 * @throws Utils\JsonException
 	 */
@@ -76,7 +78,7 @@ public static function jsonDecode(string $input, string $nameForMessage): array
 		}
 
 		try {
-			return Utils\Json::decode($input, Utils\Json::FORCE_ARRAY);
+			return (array) Utils\Json::decode($input, Utils\Json::FORCE_ARRAY);
 		} catch (Utils\JsonException $e) {
 			throw new Utils\JsonException(
 				sprintf('%s is invalid: "%s"', $nameForMessage, $e->getMessage()),