Jalle19 / tvheadend-status-manager

src/cli/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 +17 added lines, -17 removed lines

@@ -94,13 +94,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->_logger->info('Stored new connection (instance: {instanceName}, peer: {peer})', [
 			'instanceName' => $instanceName,
@@ -127,11 +127,11 @@ 
 		$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->_logger->info('Stored new input (instance: {instanceName}, network: {network}, mux: {mux}, weight: {weight})',
 			[
@@ -237,8 +237,8 @@ 
 
 		$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->_logger->info('Stored new subscription (instance: {instanceName}, user: {userName}, channel: {channelName})',
@@ -262,8 +262,8 @@ 
 
 		// 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)
@@ -312,7 +312,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;
 	}
 
 
@@ -348,7 +348,7 @@ 
 	private function hasChannel($instanceName, $channelName)
 	{
 		return ChannelQuery::create()->filterByInstanceName($instanceName)->filterByName($channelName)
-		                   ->findOne() !== null;
+						   ->findOne() !== null;
 	}
 
 
@@ -371,9 +371,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/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/Event/Events.php

Indentation +7 added lines, -7 removed lines

@@ -12,13 +12,13 @@
 final class Events
 {
 
-    const MAIN_LOOP_STARTING      = 'mainLoop.starting';
-    const INSTANCE_STATUS_UPDATES = 'status.instanceUpdates';
+	const MAIN_LOOP_STARTING      = 'mainLoop.starting';
+	const INSTANCE_STATUS_UPDATES = 'status.instanceUpdates';
 
-    const INSTANCE_SEEN             = 'persistence.instanceSeen';
-    const CONNECTION_SEEN           = 'persistence.connectionSeen';
-    const INPUT_SEEN                = 'persistence.inputSeen';
-    const SUBSCRIPTION_SEEN         = 'persistence.subscriptionSeen';
-    const SUBSCRIPTION_STATE_CHANGE = 'persistence.subscriptionStateChange';
+	const INSTANCE_SEEN             = 'persistence.instanceSeen';
+	const CONNECTION_SEEN           = 'persistence.connectionSeen';
+	const INPUT_SEEN                = 'persistence.inputSeen';
+	const SUBSCRIPTION_SEEN         = 'persistence.subscriptionSeen';
+	const SUBSCRIPTION_STATE_CHANGE = 'persistence.subscriptionStateChange';
 
 }

src/cli/StatusManager.php

Braces +3 added lines, -6 removed lines

@@ -255,8 +255,7 @@ 
 
 						$instanceState->setReachability(InstanceState::REACHABLE);
 					}
-				}
-				catch (\Exception $e)
+				} catch (\Exception $e)
 				{
 					// Mark the instance as unreachable
 					$message = 'Instance {instanceName} not reachable, will wait for {cycles} cycles before retrying.
@@ -270,8 +269,7 @@ 
 
 					$instanceState->setReachability(InstanceState::UNREACHABLE);
 				}
-			}
-			else
+			} else
 			{
 				// Wait for some cycles and then mark unreachable instances as maybe reachable
 				if ($instanceState->getRetryCount() === self::UNREACHABLE_CYCLES_UNTIL_RETRY - 1)
@@ -282,8 +280,7 @@ 
 					$this->_logger->info('Retrying instance {instanceName} during next cycle', [
 						'instanceName' => $instanceName,
 					]);
-				}
-				else
+				} else
 					$instanceState->incrementRetryCount();
 			}
 		}