Jalle19 / tvheadend-status-manager

src/cli/Database/InputQuery.php

Indentation +3 added lines, -3 removed lines

@@ -27,9 +27,9 @@
 	public function filterBySubscriptionStatus($instanceName, SubscriptionStatus $status)
 	{
 		return $this->filterByInstanceName($instanceName)
-		            ->filterByNetwork(Subscription::parseNetwork($status))
-		            ->filterByMux(Subscription::parseMux($status))
-		            ->addDescendingOrderByColumn('started');
+					->filterByNetwork(Subscription::parseNetwork($status))
+					->filterByMux(Subscription::parseMux($status))
+					->addDescendingOrderByColumn('started');
 	}
 
 }

src/cli/Manager/PersistenceManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 
 
 	/**
-	 * @param                  $instanceName
+	 * @param                  string $instanceName
 	 * @param ConnectionStatus $connectionStatus
 	 *
 	 * @return bool whether the connection exists in the database

Indentation +55 added lines, -55 removed lines

@@ -74,10 +74,10 @@ 
 		$user->save();
 
 		$this->getApplication()->getLogger()
-		     ->info('Stored new special user (instance: {instanceName}, user: {userName})', [
-			     'instanceName' => $instance->getHostname(),
-			     'userName'     => $user->getName(),
-		     ]);
+			 ->info('Stored new special user (instance: {instanceName}, user: {userName})', [
+				 'instanceName' => $instance->getHostname(),
+				 'userName'     => $user->getName(),
+			 ]);
 	}
 
 
@@ -100,13 +100,13 @@ 
 			$this->onUserSeen($instanceName, $connectionStatus->user);
 
 			$user = UserQuery::create()->filterByInstanceName($instanceName)->filterByName($connectionStatus->user)
-			                 ->findOne();
+							 ->findOne();
 		}
 
 		$connection = new Connection();
 		$connection->setInstanceName($instanceName)->setPeer($connectionStatus->peer)
-		           ->setUser($user)
-		           ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
+				   ->setUser($user)
+				   ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
 
 		$this->getApplication()->getLogger()->info('Stored new connection (instance: {instanceName}, peer: {peer})', [
 			'instanceName' => $instanceName,
@@ -135,20 +135,20 @@ 
 		$input = new Input();
 		$input->setPrimaryKey($inputStatus->uuid);
 		$input->setInstanceName($instanceName)
-		      ->setStarted(new \DateTime())
-		      ->setInput($inputStatus->input)
-		      ->setWeight($inputStatus->weight)
-		      ->setNetwork(Input::parseNetwork($inputStatus))
-		      ->setMux(Input::parseMux($inputStatus))->save();
+			  ->setStarted(new \DateTime())
+			  ->setInput($inputStatus->input)
+			  ->setWeight($inputStatus->weight)
+			  ->setNetwork(Input::parseNetwork($inputStatus))
+			  ->setMux(Input::parseMux($inputStatus))->save();
 
 		$this->getApplication()->getLogger()
-		     ->info('Stored new input (instance: {instanceName}, network: {network}, mux: {mux}, weight: {weight})',
-			     [
-				     'instanceName' => $instanceName,
-				     'network'      => $input->getNetwork(),
-				     'mux'          => $input->getMux(),
-				     'weight'       => $input->getWeight(),
-			     ]);
+			 ->info('Stored new input (instance: {instanceName}, network: {network}, mux: {mux}, weight: {weight})',
+				 [
+					 'instanceName' => $instanceName,
+					 'network'      => $input->getNetwork(),
+					 'mux'          => $input->getMux(),
+					 'weight'       => $input->getWeight(),
+				 ]);
 	}
 
 
@@ -193,27 +193,27 @@ 
 		if ($input === null)
 		{
 			$this->getApplication()->getLogger()
-			     ->warning('Got subscription that cannot be tied to an input ({instanceName}, user: {userName}, channel: {channelName})',
-				     [
-					     'instanceName' => $instanceName,
-					     'userName'     => $user !== null ? $user->getName() : 'N/A',
-					     'channelName'  => $channel->getName(),
-				     ]);
+				 ->warning('Got subscription that cannot be tied to an input ({instanceName}, user: {userName}, channel: {channelName})',
+					 [
+						 'instanceName' => $instanceName,
+						 'userName'     => $user !== null ? $user->getName() : 'N/A',
+						 'channelName'  => $channel->getName(),
+					 ]);
 		}
 
 		$subscription = new Subscription();
 		$subscription->setInstance($instance)->setInput($input)->setUser($user)->setChannel($channel)
-		             ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
-		             ->setService($status->service);
+					 ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
+					 ->setService($status->service);
 		$subscription->save();
 
 		$this->getApplication()->getLogger()
-		     ->info('Stored new subscription (instance: {instanceName}, user: {userName}, channel: {channelName})',
-			     [
-				     'instanceName' => $instanceName,
-				     'userName'     => $user !== null ? $user->getName() : 'N/A',
-				     'channelName'  => $channel->getName(),
-			     ]);
+			 ->info('Stored new subscription (instance: {instanceName}, user: {userName}, channel: {channelName})',
+				 [
+					 'instanceName' => $instanceName,
+					 'userName'     => $user !== null ? $user->getName() : 'N/A',
+					 'channelName'  => $channel->getName(),
+				 ]);
 	}
 
 
@@ -231,18 +231,18 @@ 
 
 		// Find the latest matching subscription
 		$subscription = SubscriptionQuery::create()->filterByInstanceName($instanceName)
-		                                 ->filterBySubscriptionId($stateChange->getSubscriptionId())
-		                                 ->addDescendingOrderByColumn('started')->findOne();
+										 ->filterBySubscriptionId($stateChange->getSubscriptionId())
+										 ->addDescendingOrderByColumn('started')->findOne();
 
 		// EPG grab subscriptions are not stored so we don't want to log these with a high level
 		if ($subscription === null)
 		{
 			$this->getApplication()->getLogger()
-			     ->debug('Got subscription stop without a matching start (instance: {instanceName}, subscription: {subscriptionId})',
-				     [
-					     'instanceName'   => $instanceName,
-					     'subscriptionId' => $stateChange->getSubscriptionId(),
-				     ]);
+				 ->debug('Got subscription stop without a matching start (instance: {instanceName}, subscription: {subscriptionId})',
+					 [
+						 'instanceName'   => $instanceName,
+						 'subscriptionId' => $stateChange->getSubscriptionId(),
+					 ]);
 
 			return;
 		}
@@ -254,12 +254,12 @@ 
 		$channel = $subscription->getChannel();
 
 		$this->getApplication()->getLogger()
-		     ->info('Stored subscription stop (instance: {instanceName}, user: {userName}, channel: {channelName})',
-			     [
-				     'instanceName' => $instanceName,
-				     'userName'     => $user !== null ? $user->getName() : 'N/A',
-				     'channelName'  => $channel->getName(),
-			     ]);
+			 ->info('Stored subscription stop (instance: {instanceName}, user: {userName}, channel: {channelName})',
+				 [
+					 'instanceName' => $instanceName,
+					 'userName'     => $user !== null ? $user->getName() : 'N/A',
+					 'channelName'  => $channel->getName(),
+				 ]);
 	}
 
 
@@ -301,10 +301,10 @@ 
 		$channel->save();
 
 		$this->getApplication()->getLogger()
-		     ->info('Stored new channel (instance: {instanceName}, name: {channelName})', [
-			     'instanceName' => $instanceName,
-			     'channelName'  => $channelName,
-		     ]);
+			 ->info('Stored new channel (instance: {instanceName}, name: {channelName})', [
+				 'instanceName' => $instanceName,
+				 'channelName'  => $channelName,
+			 ]);
 	}
 
 
@@ -328,7 +328,7 @@ 
 	private function hasConnection($instanceName, ConnectionStatus $connectionStatus)
 	{
 		return ConnectionQuery::create()->filterByInstanceName($instanceName)->filterByPeer($connectionStatus->peer)
-		                      ->filterByStarted($connectionStatus->started)->findOne() !== null;
+							  ->filterByStarted($connectionStatus->started)->findOne() !== null;
 	}
 
 
@@ -364,7 +364,7 @@ 
 	private function hasChannel($instanceName, $channelName)
 	{
 		return ChannelQuery::create()->filterByInstanceName($instanceName)->filterByName($channelName)
-		                   ->findOne() !== null;
+						   ->findOne() !== null;
 	}
 
 
@@ -387,9 +387,9 @@ 
 		$userId = $user !== null ? $user->getId() : null;
 
 		return SubscriptionQuery::create()->filterByInstance($instance)->filterByUserId($userId)
-		                        ->filterByChannel($channel)
-		                        ->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
-		                        ->findOne() !== null;
+								->filterByChannel($channel)
+								->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
+								->findOne() !== null;
 	}
 
 }

src/cli/Manager/WebSocketManager.php

Braces +2 added lines, -4 removed lines

@@ -136,14 +136,12 @@
 			$logger->debug('Got message from client (type: {messageType})', [
 				'messageType' => $message->getType(),
 			]);
-		}
-		catch (MalformedRequestException $e)
+		} catch (MalformedRequestException $e)
 		{
 			$logger->error('Got malformed message from client (reason: {reason})', [
 				'reason' => $e->getMessage(),
 			]);
-		}
-		catch (UnknownRequestException $e)
+		} catch (UnknownRequestException $e)
 		{
 			// The server itself sometimes sends out messages that are received here, hence debug
 			$logger->debug('Got unknown message from client');

src/cli/Manager/InstanceStateManager.php

Indentation +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
 	{
 		// Respond with the instances and their current state
 		$this->getApplication()->getEventDispatcher()
-		     ->dispatch(Events::INSTANCE_COLLECTION, new InstanceCollectionEvent($this->_instances));
+			 ->dispatch(Events::INSTANCE_COLLECTION, new InstanceCollectionEvent($this->_instances));
 	}
 
 
@@ -70,9 +70,9 @@ 
 		if ($instanceState->getReachability() === InstanceState::MAYBE_REACHABLE)
 		{
 			$this->getApplication()->getLogger()
-			     ->info('Instance {instanceName} is now reachable, will start polling for updates', [
-				     'instanceName' => $instance->getName(),
-			     ]);
+				 ->info('Instance {instanceName} is now reachable, will start polling for updates', [
+					 'instanceName' => $instance->getName(),
+				 ]);
 
 			$instanceState->setReachability(InstanceState::REACHABLE);
 		}

src/cli/Manager/StatusManager.php

Indentation +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 			]);
 
 			$this->getApplication()->getEventDispatcher()
-			     ->dispatch(Events::INSTANCE_SEEN, new InstanceSeenEvent($instance));
+				 ->dispatch(Events::INSTANCE_SEEN, new InstanceSeenEvent($instance));
 		}
 	}
 

Braces +1 added lines, -2 removed lines

@@ -224,8 +224,7 @@
 
 					$this->_eventDispatcher->dispatch(Events::INSTANCE_STATE_REACHABLE,
 						new InstanceStateEvent($instance));
-				}
-				catch (\Exception $e)
+				} catch (\Exception $e)
 				{
 					$this->_eventDispatcher->dispatch(Events::INSTANCE_STATE_UNREACHABLE,
 						new InstanceStateEvent($instance));