Moving doctrine classes into separate namespaces (#161)

FastyBird · Nov 7, 2023 · e1b5ce8 · e1b5ce8
1 parent 60d812f
commit e1b5ce8
Showing 22 changed files with 95 additions and 95 deletions.
diff --git a/src/Commands/Devices.php b/src/Commands/Devices.php
@@ -204,7 +204,7 @@ private function createNewDevice(Style\SymfonyStyle $io, Entities\HomeKitConnect
 
 		$question->setValidator(function (string|null $answer) {
 			if ($answer !== '' && $answer !== null) {
-				$findDeviceQuery = new Queries\FindDevices();
+				$findDeviceQuery = new Queries\Entities\FindDevices();
 				$findDeviceQuery->byIdentifier($answer);
 
 				if (
@@ -227,7 +227,7 @@ private function createNewDevice(Style\SymfonyStyle $io, Entities\HomeKitConnect
 			for ($i = 1; $i <= 100; $i++) {
 				$identifier = sprintf($identifierPattern, $i);
 
-				$findDeviceQuery = new Queries\FindDevices();
+				$findDeviceQuery = new Queries\Entities\FindDevices();
 				$findDeviceQuery->byIdentifier($identifier);
 
 				if (
@@ -334,7 +334,7 @@ private function editExistingDevice(Style\SymfonyStyle $io, Entities\HomeKitConn
 
 		$name = $this->askDeviceName($io, $device);
 
-		$findDevicePropertyQuery = new DevicesQueries\FindDeviceProperties();
+		$findDevicePropertyQuery = new DevicesQueries\Entities\FindDeviceProperties();
 		$findDevicePropertyQuery->forDevice($device);
 		$findDevicePropertyQuery->byIdentifier(Types\DevicePropertyIdentifier::CATEGORY);
 
@@ -405,7 +405,7 @@ private function editExistingDevice(Style\SymfonyStyle $io, Entities\HomeKitConn
 			return;
 		}
 
-		$findChannelsQuery = new Queries\FindChannels();
+		$findChannelsQuery = new Queries\Entities\FindChannels();
 		$findChannelsQuery->forDevice($device);
 
 		$channels = $this->channelsRepository->findAllBy($findChannelsQuery, Entities\HomeKitChannel::class);
@@ -510,7 +510,7 @@ private function createService(Style\SymfonyStyle $io, Entities\HomeKitDevice $d
 		for ($i = 1; $i <= 100; $i++) {
 			$identifier = sprintf($identifierPattern, $i);
 
-			$findChannelQuery = new Queries\FindChannels();
+			$findChannelQuery = new Queries\Entities\FindChannels();
 			$findChannelQuery->forDevice($device);
 			$findChannelQuery->byIdentifier($identifier);
 
@@ -708,7 +708,7 @@ private function editService(Style\SymfonyStyle $io, Entities\HomeKitDevice $dev
 		$missingRequired = [];
 
 		foreach ($requiredCharacteristics as $requiredCharacteristic) {
-			$findPropertyQuery = new DevicesQueries\FindChannelProperties();
+			$findPropertyQuery = new DevicesQueries\Entities\FindChannelProperties();
 			$findPropertyQuery->forChannel($channel);
 			$findPropertyQuery->byIdentifier(
 				strtolower(strval(preg_replace('/(?<!^)[A-Z]/', '_$0', $requiredCharacteristic))),
@@ -724,7 +724,7 @@ private function editService(Style\SymfonyStyle $io, Entities\HomeKitDevice $dev
 		$missingOptional = [];
 
 		foreach (array_merge($optionalCharacteristics, $virtualCharacteristics) as $optionalCharacteristic) {
-			$findPropertyQuery = new DevicesQueries\FindChannelProperties();
+			$findPropertyQuery = new DevicesQueries\Entities\FindChannelProperties();
 			$findPropertyQuery->forChannel($channel);
 			$findPropertyQuery->byIdentifier(
 				strtolower(strval(preg_replace('/(?<!^)[A-Z]/', '_$0', $optionalCharacteristic))),
@@ -849,7 +849,7 @@ private function deleteService(Style\SymfonyStyle $io, Entities\HomeKitDevice $d
 			}
 		}
 
-		$findChannelsQuery = new Queries\FindChannels();
+		$findChannelsQuery = new Queries\Entities\FindChannels();
 		$findChannelsQuery->forDevice($device);
 
 		$channels = $this->channelsRepository->findAllBy($findChannelsQuery, Entities\HomeKitChannel::class);
@@ -871,7 +871,7 @@ private function deleteService(Style\SymfonyStyle $io, Entities\HomeKitDevice $d
 	 */
 	private function listServices(Style\SymfonyStyle $io, Entities\HomeKitDevice $device): void
 	{
-		$findChannelsQuery = new Queries\FindChannels();
+		$findChannelsQuery = new Queries\Entities\FindChannels();
 		$findChannelsQuery->forDevice($device);
 
 		$deviceChannels = $this->channelsRepository->findAllBy($findChannelsQuery, Entities\HomeKitChannel::class);
@@ -895,7 +895,7 @@ static function (DevicesEntities\Channels\Channel $a, DevicesEntities\Channels\C
 		]);
 
 		foreach ($deviceChannels as $index => $channel) {
-			$findChannelPropertiesQuery = new DevicesQueries\FindChannelProperties();
+			$findChannelPropertiesQuery = new DevicesQueries\Entities\FindChannelProperties();
 			$findChannelPropertiesQuery->forChannel($channel);
 
 			$table->addRow([
@@ -920,7 +920,7 @@ static function (DevicesEntities\Channels\Channel $a, DevicesEntities\Channels\C
 
 		$io->newLine();
 
-		$findChannelsQuery = new Queries\FindChannels();
+		$findChannelsQuery = new Queries\Entities\FindChannels();
 		$findChannelsQuery->forDevice($device);
 
 		$channels = $this->channelsRepository->findAllBy($findChannelsQuery, Entities\HomeKitChannel::class);
@@ -1272,7 +1272,7 @@ private function deleteCharacteristic(Style\SymfonyStyle $io, Entities\HomeKitCh
 			}
 		}
 
-		$findChannelPropertiesQuery = new DevicesQueries\FindChannelProperties();
+		$findChannelPropertiesQuery = new DevicesQueries\Entities\FindChannelProperties();
 		$findChannelPropertiesQuery->forChannel($channel);
 
 		if (count($this->channelsPropertiesRepository->findAllBy($findChannelPropertiesQuery)) > 0) {
@@ -1292,7 +1292,7 @@ private function deleteCharacteristic(Style\SymfonyStyle $io, Entities\HomeKitCh
 	 */
 	private function listCharacteristics(Style\SymfonyStyle $io, Entities\HomeKitChannel $channel): void
 	{
-		$findPropertiesQuery = new DevicesQueries\FindChannelProperties();
+		$findPropertiesQuery = new DevicesQueries\Entities\FindChannelProperties();
 		$findPropertiesQuery->forChannel($channel);
 
 		$channelProperties = $this->channelsPropertiesRepository->findAllBy($findPropertiesQuery);
@@ -1352,7 +1352,7 @@ static function (DevicesEntities\Channels\Properties\Property $a, DevicesEntitie
 
 		$io->newLine();
 
-		$findChannelPropertiesQuery = new DevicesQueries\FindChannelProperties();
+		$findChannelPropertiesQuery = new DevicesQueries\Entities\FindChannelProperties();
 		$findChannelPropertiesQuery->forChannel($channel);
 
 		if (count($this->channelsPropertiesRepository->findAllBy($findChannelPropertiesQuery)) > 0) {
@@ -1590,7 +1590,7 @@ private function askServiceType(
 		Entities\HomeKitDevice $device,
 	): string
 	{
-		$findPropertyQuery = new DevicesQueries\FindDeviceProperties();
+		$findPropertyQuery = new DevicesQueries\Entities\FindDeviceProperties();
 		$findPropertyQuery->forDevice($device);
 		$findPropertyQuery->byIdentifier(Types\DevicePropertyIdentifier::CATEGORY);
 
@@ -1760,7 +1760,7 @@ private function askProperty(
 			$connectedDevice = $connectedProperty->getChannel()->getDevice();
 		}
 
-		$findDevicesQuery = new DevicesQueries\FindDevices();
+		$findDevicesQuery = new DevicesQueries\Entities\FindDevices();
 
 		$systemDevices = $this->devicesRepository->findAllBy($findDevicesQuery);
 		usort(
@@ -1822,7 +1822,7 @@ private function askProperty(
 			$identifier = array_search($answer, $devices, true);
 
 			if ($identifier !== false) {
-				$findDeviceQuery = new DevicesQueries\FindDevices();
+				$findDeviceQuery = new DevicesQueries\Entities\FindDevices();
 				$findDeviceQuery->byId(Uuid\Uuid::fromString($identifier));
 
 				$device = $this->devicesRepository->findOneBy($findDeviceQuery);
@@ -1902,7 +1902,7 @@ private function askProperty(
 		if ($type === 0) {
 			$properties = [];
 
-			$findDevicePropertiesQuery = new DevicesQueries\FindDeviceProperties();
+			$findDevicePropertiesQuery = new DevicesQueries\Entities\FindDeviceProperties();
 			$findDevicePropertiesQuery->forDevice($device);
 
 			$deviceProperties = $this->devicesPropertiesRepository->findAllBy(
@@ -1970,7 +1970,7 @@ function (string|null $answer) use ($device, $properties): DevicesEntities\Devic
 					$identifier = array_search($answer, $properties, true);
 
 					if ($identifier !== false) {
-						$findPropertyQuery = new DevicesQueries\FindDeviceProperties();
+						$findPropertyQuery = new DevicesQueries\Entities\FindDeviceProperties();
 						$findPropertyQuery->byIdentifier($identifier);
 						$findPropertyQuery->forDevice($device);
 
@@ -2002,7 +2002,7 @@ function (string|null $answer) use ($device, $properties): DevicesEntities\Devic
 		} else {
 			$channels = [];
 
-			$findChannelsQuery = new DevicesQueries\FindChannels();
+			$findChannelsQuery = new DevicesQueries\Entities\FindChannels();
 			$findChannelsQuery->forDevice($device);
 			$findChannelsQuery->withProperties();
 
@@ -2064,7 +2064,7 @@ function (string|null $answer) use ($device, $channels): DevicesEntities\Channel
 					$identifier = array_search($answer, $channels, true);
 
 					if ($identifier !== false) {
-						$findChannelQuery = new DevicesQueries\FindChannels();
+						$findChannelQuery = new DevicesQueries\Entities\FindChannels();
 						$findChannelQuery->byIdentifier($identifier);
 						$findChannelQuery->forDevice($device);
 
@@ -2089,7 +2089,7 @@ function (string|null $answer) use ($device, $channels): DevicesEntities\Channel
 
 			$properties = [];
 
-			$findDevicePropertiesQuery = new DevicesQueries\FindChannelProperties();
+			$findDevicePropertiesQuery = new DevicesQueries\Entities\FindChannelProperties();
 			$findDevicePropertiesQuery->forChannel($channel);
 
 			$channelProperties = $this->channelsPropertiesRepository->findAllBy(
@@ -2157,7 +2157,7 @@ function (string|null $answer) use ($channel, $properties): DevicesEntities\Chan
 					$identifier = array_search($answer, $properties, true);
 
 					if ($identifier !== false) {
-						$findPropertyQuery = new DevicesQueries\FindChannelProperties();
+						$findPropertyQuery = new DevicesQueries\Entities\FindChannelProperties();
 						$findPropertyQuery->byIdentifier($identifier);
 						$findPropertyQuery->forChannel($channel);
 
@@ -2614,7 +2614,7 @@ private function askWhichConnector(Style\SymfonyStyle $io): Entities\HomeKitConn
 	{
 		$connectors = [];
 
-		$findConnectorsQuery = new Queries\FindConnectors();
+		$findConnectorsQuery = new Queries\Entities\FindConnectors();
 
 		$systemConnectors = $this->connectorsRepository->findAllBy(
 			$findConnectorsQuery,
@@ -2660,7 +2660,7 @@ private function askWhichConnector(Style\SymfonyStyle $io): Entities\HomeKitConn
 			$identifier = array_search($answer, $connectors, true);
 
 			if ($identifier !== false) {
-				$findConnectorQuery = new Queries\FindConnectors();
+				$findConnectorQuery = new Queries\Entities\FindConnectors();
 				$findConnectorQuery->byIdentifier($identifier);
 
 				$connector = $this->connectorsRepository->findOneBy(
@@ -2697,7 +2697,7 @@ private function askWhichDevice(
 	{
 		$devices = [];
 
-		$findDevicesQuery = new Queries\FindDevices();
+		$findDevicesQuery = new Queries\Entities\FindDevices();
 		$findDevicesQuery->forConnector($connector);
 
 		$connectorDevices = $this->devicesRepository->findAllBy($findDevicesQuery, Entities\HomeKitDevice::class);
@@ -2740,7 +2740,7 @@ private function askWhichDevice(
 			$identifier = array_search($answer, $devices, true);
 
 			if ($identifier !== false) {
-				$findDeviceQuery = new Queries\FindDevices();
+				$findDeviceQuery = new Queries\Entities\FindDevices();
 				$findDeviceQuery->byIdentifier($identifier);
 				$findDeviceQuery->forConnector($connector);
 
@@ -2801,7 +2801,7 @@ private function askWhichService(
 			return null;
 		}
 
-		$findChannelQuery = new Queries\FindChannels();
+		$findChannelQuery = new Queries\Entities\FindChannels();
 		$findChannelQuery->forDevice($device);
 		$findChannelQuery->byIdentifier($serviceIdentifier);
 
@@ -2859,7 +2859,7 @@ private function askWhichCharacteristic(
 			return null;
 		}
 
-		$findPropertyQuery = new DevicesQueries\FindChannelProperties();
+		$findPropertyQuery = new DevicesQueries\Entities\FindChannelProperties();
 		$findPropertyQuery->forChannel($channel);
 		$findPropertyQuery->byIdentifier($characteristicIdentifier);
 
@@ -2895,7 +2895,7 @@ private function getServicesList(Entities\HomeKitDevice $device): array
 	{
 		$channels = [];
 
-		$findChannelsQuery = new Queries\FindChannels();
+		$findChannelsQuery = new Queries\Entities\FindChannels();
 		$findChannelsQuery->forDevice($device);
 
 		$deviceChannels = $this->channelsRepository->findAllBy($findChannelsQuery, Entities\HomeKitChannel::class);
@@ -2930,7 +2930,7 @@ private function getCharacteristicsList(Entities\HomeKitChannel $channel): array
 	{
 		$properties = [];
 
-		$findPropertiesQuery = new DevicesQueries\FindChannelProperties();
+		$findPropertiesQuery = new DevicesQueries\Entities\FindChannelProperties();
 		$findPropertiesQuery->forChannel($channel);
 
 		$channelProperties = $this->channelsPropertiesRepository->findAllBy($findPropertiesQuery);

diff --git a/src/Commands/Execute.php b/src/Commands/Execute.php
@@ -128,7 +128,7 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 		) {
 			$connectorId = $input->getOption('connector');
 
-			$findConnectorQuery = new Queries\FindConnectors();
+			$findConnectorQuery = new Queries\Entities\FindConnectors();
 
 			if (Uuid\Uuid::isValid($connectorId)) {
 				$findConnectorQuery->byId(Uuid\Uuid::fromString($connectorId));
@@ -148,7 +148,7 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 		} else {
 			$connectors = [];
 
-			$findConnectorsQuery = new Queries\FindConnectors();
+			$findConnectorsQuery = new Queries\Entities\FindConnectors();
 
 			$systemConnectors = $this->connectorsRepository->findAllBy(
 				$findConnectorsQuery,
@@ -174,7 +174,7 @@ protected function execute(Input\InputInterface $input, Output\OutputInterface $
 			if (count($connectors) === 1) {
 				$connectorIdentifier = array_key_first($connectors);
 
-				$findConnectorQuery = new Queries\FindConnectors();
+				$findConnectorQuery = new Queries\Entities\FindConnectors();
 				$findConnectorQuery->byIdentifier($connectorIdentifier);
 
 				$connector = $this->connectorsRepository->findOneBy(
@@ -231,7 +231,7 @@ function (string|int|null $answer) use ($connectors): Entities\HomeKitConnector
 						$identifier = array_search($answer, $connectors, true);
 
 						if ($identifier !== false) {
-							$findConnectorQuery = new Queries\FindConnectors();
+							$findConnectorQuery = new Queries\Entities\FindConnectors();
 							$findConnectorQuery->byIdentifier($identifier);
 
 							$connector = $this->connectorsRepository->findOneBy(

diff --git a/src/Commands/Initialize.php b/src/Commands/Initialize.php
@@ -133,7 +133,7 @@ private function createConfiguration(Style\SymfonyStyle $io): void
 
 		$question->setValidator(function ($answer) {
 			if ($answer !== null) {
-				$findConnectorQuery = new Queries\FindConnectors();
+				$findConnectorQuery = new Queries\Entities\FindConnectors();
 				$findConnectorQuery->byIdentifier($answer);
 
 				if ($this->connectorsRepository->findOneBy(
@@ -157,7 +157,7 @@ private function createConfiguration(Style\SymfonyStyle $io): void
 			for ($i = 1; $i <= 100; $i++) {
 				$identifier = sprintf($identifierPattern, $i);
 
-				$findConnectorQuery = new Queries\FindConnectors();
+				$findConnectorQuery = new Queries\Entities\FindConnectors();
 				$findConnectorQuery->byIdentifier($identifier);
 
 				if ($this->connectorsRepository->findOneBy(
@@ -280,7 +280,7 @@ private function editConfiguration(Style\SymfonyStyle $io): void
 
 		$port = $this->askPort($io, $connector);
 
-		$findConnectorPropertyQuery = new DevicesQueries\FindConnectorProperties();
+		$findConnectorPropertyQuery = new DevicesQueries\Entities\FindConnectorProperties();
 		$findConnectorPropertyQuery->forConnector($connector);
 		$findConnectorPropertyQuery->byIdentifier(Types\ConnectorPropertyIdentifier::PORT);
 
@@ -404,7 +404,7 @@ private function deleteConfiguration(Style\SymfonyStyle $io): void
 	 */
 	private function listConfigurations(Style\SymfonyStyle $io): void
 	{
-		$findConnectorsQuery = new Queries\FindConnectors();
+		$findConnectorsQuery = new Queries\Entities\FindConnectors();
 
 		$connectors = $this->connectorsRepository->findAllBy($findConnectorsQuery, Entities\HomeKitConnector::class);
 		usort(
@@ -426,7 +426,7 @@ static function (Entities\HomeKitConnector $a, Entities\HomeKitConnector $b): in
 		]);
 
 		foreach ($connectors as $index => $connector) {
-			$findDevicesQuery = new Queries\FindDevices();
+			$findDevicesQuery = new Queries\Entities\FindDevices();
 			$findDevicesQuery->forConnector($connector);
 
 			$devices = $this->devicesRepository->findAllBy($findDevicesQuery, Entities\HomeKitDevice::class);
@@ -475,7 +475,7 @@ private function askPort(Style\SymfonyStyle $io, Entities\HomeKitConnector|null
 				);
 			}
 
-			$findConnectorPropertiesQuery = new DevicesQueries\FindConnectorProperties();
+			$findConnectorPropertiesQuery = new DevicesQueries\Entities\FindConnectorProperties();
 			$findConnectorPropertiesQuery->byIdentifier(Types\ConnectorPropertyIdentifier::PORT);
 
 			$properties = $this->propertiesRepository->findAllBy(
@@ -513,7 +513,7 @@ private function askWhichConnector(Style\SymfonyStyle $io): Entities\HomeKitConn
 	{
 		$connectors = [];
 
-		$findConnectorsQuery = new Queries\FindConnectors();
+		$findConnectorsQuery = new Queries\Entities\FindConnectors();
 
 		$systemConnectors = $this->connectorsRepository->findAllBy(
 			$findConnectorsQuery,
@@ -559,7 +559,7 @@ private function askWhichConnector(Style\SymfonyStyle $io): Entities\HomeKitConn
 			$identifier = array_search($answer, $connectors, true);
 
 			if ($identifier !== false) {
-				$findConnectorQuery = new Queries\FindConnectors();
+				$findConnectorQuery = new Queries\Entities\FindConnectors();
 				$findConnectorQuery->byIdentifier($identifier);
 
 				$connector = $this->connectorsRepository->findOneBy(

diff --git a/src/Controllers/AccessoriesController.php b/src/Controllers/AccessoriesController.php
@@ -127,7 +127,7 @@ public function identify(
 
 		$connectorId = Uuid\Uuid::fromString($connectorId);
 
-		$findConnectorPropertyQuery = new DevicesQueries\FindConnectorProperties();
+		$findConnectorPropertyQuery = new DevicesQueries\Entities\FindConnectorProperties();
 		$findConnectorPropertyQuery->byConnectorId($connectorId);
 		$findConnectorPropertyQuery->byIdentifier(Types\ConnectorPropertyIdentifier::PAIRED);