Completed
Push — master ( a8c8e0...eca973 )
by Sam
16:55 queued 01:57
created
src/cli/PersistenceManager.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -251,7 +251,7 @@
 block discarded – undo
251 251
 
252 252
 
253 253
 	/**
254
-	 * @param                  $instanceName
254
+	 * @param                  string $instanceName
255 255
 	 * @param ConnectionStatus $connectionStatus
256 256
 	 *
257 257
 	 * @return bool whether the connection exists in the database
Please login to merge, or discard this patch.
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -94,13 +94,13 @@  discard block
 block discarded – undo
94 94
 			$this->onUserSeen($instanceName, $connectionStatus->user);
95 95
 
96 96
 			$user = UserQuery::create()->filterByInstanceName($instanceName)->filterByName($connectionStatus->user)
97
-			                 ->findOne();
97
+							 ->findOne();
98 98
 		}
99 99
 
100 100
 		$connection = new Connection();
101 101
 		$connection->setInstanceName($instanceName)->setPeer($connectionStatus->peer)
102
-		           ->setUser($user)
103
-		           ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
102
+				   ->setUser($user)
103
+				   ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
104 104
 
105 105
 		$this->_logger->info('Stored new connection (instance: {instanceName}, peer: {peer})', [
106 106
 			'instanceName' => $instanceName,
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 		$input = new Input();
128 128
 		$input->setPrimaryKey($inputStatus->uuid);
129 129
 		$input->setInstanceName($instanceName)
130
-		      ->setStarted(new \DateTime())
131
-		      ->setInput($inputStatus->input)
132
-		      ->setWeight($inputStatus->weight)
133
-		      ->setNetwork(Input::parseNetwork($inputStatus))
134
-		      ->setMux(Input::parseMux($inputStatus))->save();
130
+			  ->setStarted(new \DateTime())
131
+			  ->setInput($inputStatus->input)
132
+			  ->setWeight($inputStatus->weight)
133
+			  ->setNetwork(Input::parseNetwork($inputStatus))
134
+			  ->setMux(Input::parseMux($inputStatus))->save();
135 135
 
136 136
 		$this->_logger->info('Stored new input (instance: {instanceName}, network: {network}, mux: {mux}, weight: {weight})',
137 137
 			[
@@ -237,8 +237,8 @@  discard block
 block discarded – undo
237 237
 
238 238
 		$subscription = new Subscription();
239 239
 		$subscription->setInstance($instance)->setInput($input)->setUser($user)->setChannel($channel)
240
-		             ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
241
-		             ->setService($status->service);
240
+					 ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
241
+					 ->setService($status->service);
242 242
 		$subscription->save();
243 243
 
244 244
 		$this->_logger->info('Stored new subscription (instance: {instanceName}, user: {userName}, channel: {channelName})',
@@ -262,8 +262,8 @@  discard block
 block discarded – undo
262 262
 
263 263
 		// Find the latest matching subscription
264 264
 		$subscription = SubscriptionQuery::create()->filterByInstanceName($instanceName)
265
-		                                 ->filterBySubscriptionId($stateChange->getSubscriptionId())
266
-		                                 ->addDescendingOrderByColumn('started')->findOne();
265
+										 ->filterBySubscriptionId($stateChange->getSubscriptionId())
266
+										 ->addDescendingOrderByColumn('started')->findOne();
267 267
 
268 268
 		// EPG grab subscriptions are not stored so we don't want to log these with a high level
269 269
 		if ($subscription === null)
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 	private function hasConnection($instanceName, ConnectionStatus $connectionStatus)
313 313
 	{
314 314
 		return ConnectionQuery::create()->filterByInstanceName($instanceName)->filterByPeer($connectionStatus->peer)
315
-		                      ->filterByStarted($connectionStatus->started)->findOne() !== null;
315
+							  ->filterByStarted($connectionStatus->started)->findOne() !== null;
316 316
 	}
317 317
 
318 318
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 	private function hasChannel($instanceName, $channelName)
349 349
 	{
350 350
 		return ChannelQuery::create()->filterByInstanceName($instanceName)->filterByName($channelName)
351
-		                   ->findOne() !== null;
351
+						   ->findOne() !== null;
352 352
 	}
353 353
 
354 354
 
@@ -371,9 +371,9 @@  discard block
 block discarded – undo
371 371
 		$userId = $user !== null ? $user->getId() : null;
372 372
 
373 373
 		return SubscriptionQuery::create()->filterByInstance($instance)->filterByUserId($userId)
374
-		                        ->filterByChannel($channel)
375
-		                        ->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
376
-		                        ->findOne() !== null;
374
+								->filterByChannel($channel)
375
+								->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
376
+								->findOne() !== null;
377 377
 	}
378 378
 
379 379
 }
Please login to merge, or discard this patch.
src/cli/Database/InputQuery.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,9 +27,9 @@
 block discarded – undo
27 27
 	public function filterBySubscriptionStatus($instanceName, SubscriptionStatus $status)
28 28
 	{
29 29
 		return $this->filterByInstanceName($instanceName)
30
-		            ->filterByNetwork(Subscription::parseNetwork($status))
31
-		            ->filterByMux(Subscription::parseMux($status))
32
-		            ->addDescendingOrderByColumn('started');
30
+					->filterByNetwork(Subscription::parseNetwork($status))
31
+					->filterByMux(Subscription::parseMux($status))
32
+					->addDescendingOrderByColumn('started');
33 33
 	}
34 34
 
35 35
 }
Please login to merge, or discard this patch.
src/cli/StatusManager.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -224,8 +224,7 @@
 block discarded – undo
224 224
 
225 225
 					$this->_eventDispatcher->dispatch(Events::INSTANCE_STATE_REACHABLE,
226 226
 						new InstanceStateEvent($instance));
227
-				}
228
-				catch (\Exception $e)
227
+				} catch (\Exception $e)
229 228
 				{
230 229
 					$this->_eventDispatcher->dispatch(Events::INSTANCE_STATE_UNREACHABLE,
231 230
 						new InstanceStateEvent($instance));
Please login to merge, or discard this patch.