Clear models (#231)

FastyBird · Jan 9, 2024 · 9997ac4 · 9997ac4
1 parent a35dcd4
commit 9997ac4
Showing 1 changed file with 24 additions and 23 deletions.
diff --git a/src/Helpers/Device.php b/src/Helpers/Device.php
@@ -62,12 +62,12 @@ public function getIpAddress(MetadataDocuments\DevicesModule\Device $device): st
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		if ($property === null) {
+		if ($property?->getValue() === null) {
 			return null;
 		}
 
 		$value = $property->getValue();
-		assert(is_string($value) || $value === null);
+		assert(is_string($value));
 
 		return $value;
 	}
@@ -88,14 +88,14 @@ public function getPort(MetadataDocuments\DevicesModule\Device $device): int
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		if ($property === null) {
+		if ($property?->getValue() === null) {
 			return Entities\VieraDevice::DEFAULT_PORT;
 		}
 
 		$value = $property->getValue();
-		assert(is_int($value) || $value === null);
+		assert(is_int($value));
 
-		return $value ?? Entities\VieraDevice::DEFAULT_PORT;
+		return $value;
 	}
 
 	/**
@@ -114,14 +114,14 @@ public function isEncrypted(MetadataDocuments\DevicesModule\Device $device): boo
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		if ($property === null) {
+		if ($property?->getValue() === null) {
 			return false;
 		}
 
 		$value = $property->getValue();
-		assert(is_bool($value) || $value === null);
+		assert(is_bool($value));
 
-		return $value ?? false;
+		return $value;
 	}
 
 	/**
@@ -140,12 +140,12 @@ public function getAppId(MetadataDocuments\DevicesModule\Device $device): string
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		if ($property === null) {
+		if ($property?->getValue() === null) {
 			return null;
 		}
 
 		$value = $property->getValue();
-		assert(is_string($value) || $value === null);
+		assert(is_string($value));
 
 		return $value;
 	}
@@ -166,12 +166,12 @@ public function getEncryptionKey(MetadataDocuments\DevicesModule\Device $device)
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		if ($property === null) {
+		if ($property?->getValue() === null) {
 			return null;
 		}
 
 		$value = $property->getValue();
-		assert(is_string($value) || $value === null);
+		assert(is_string($value));
 
 		return $value;
 	}
@@ -192,12 +192,12 @@ public function getModel(MetadataDocuments\DevicesModule\Device $device): string
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		if ($property === null) {
+		if ($property?->getValue() === null) {
 			return null;
 		}
 
 		$value = $property->getValue();
-		assert(is_string($value) || $value === null);
+		assert(is_string($value));
 
 		return $value;
 	}
@@ -218,12 +218,12 @@ public function getManufacturer(MetadataDocuments\DevicesModule\Device $device):
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		if ($property === null) {
+		if ($property?->getValue() === null) {
 			return null;
 		}
 
 		$value = $property->getValue();
-		assert(is_string($value) || $value === null);
+		assert(is_string($value));
 
 		return $value;
 	}
@@ -244,12 +244,12 @@ public function getMacAddress(MetadataDocuments\DevicesModule\Device $device): s
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		if ($property === null) {
+		if ($property?->getValue() === null) {
 			return null;
 		}
 
 		$value = $property->getValue();
-		assert(is_string($value) || $value === null);
+		assert(is_string($value));
 
 		return $value;
 	}
@@ -270,12 +270,12 @@ public function getSerialNumber(MetadataDocuments\DevicesModule\Device $device):
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		if ($property === null) {
+		if ($property?->getValue() === null) {
 			return null;
 		}
 
 		$value = $property->getValue();
-		assert(is_string($value) || $value === null);
+		assert(is_string($value));
 
 		return $value;
 	}
@@ -296,12 +296,13 @@ public function getStateReadingDelay(MetadataDocuments\DevicesModule\Device $dev
 			MetadataDocuments\DevicesModule\DeviceVariableProperty::class,
 		);
 
-		$value = $property?->getValue();
-
-		if (!is_numeric($value)) {
+		if ($property?->getValue() === null) {
 			return Entities\VieraDevice::STATE_READING_DELAY;
 		}
 
+		$value = $property->getValue();
+		assert(is_numeric($value));
+
 		return floatval($value);
 	}