Completed
Push — master ( bbe9f1...aaef45 )
by Sam
03:16
created
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/Console/Commands/TvheadendStatusManagerCommand.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -79,9 +79,9 @@
 block discarded – undo
79 79
 		$aliases         = [':logger' => $logger, ':loop' => $eventLoop];
80 80
 
81 81
 		$injector->share($configuration)
82
-		         ->share($logger)
83
-		         ->share($eventDispatcher)
84
-		         ->share($eventLoop);
82
+				 ->share($logger)
83
+				 ->share($eventDispatcher)
84
+				 ->share($eventLoop);
85 85
 
86 86
 		// Create managers
87 87
 		$statusManager        = $injector->make('Jalle19\StatusManager\Manager\StatusManager', $aliases);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 		$eventDispatcher->addSubscriber($inputErrorManager);
101 101
 
102 102
 		// Configure the event loop and start the application
103
-		$eventLoop->addPeriodicTimer($configuration->getUpdateInterval(), function () use ($eventDispatcher)
103
+		$eventLoop->addPeriodicTimer($configuration->getUpdateInterval(), function() use ($eventDispatcher)
104 104
 		{
105 105
 			// Emit an event on each tick
106 106
 			$eventDispatcher->dispatch(Events::MAIN_LOOP_TICK);
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 		$manager = new ConnectionManagerSingle();
154 154
 		$manager->setConfiguration([
155 155
 			'classname'  => 'Propel\\Runtime\\Connection\\ConnectionWrapper',
156
-			'dsn'        => 'sqlite:' . $configuration->getDatabasePath(),
156
+			'dsn'        => 'sqlite:'.$configuration->getDatabasePath(),
157 157
 			'user'       => null,
158 158
 			'password'   => '',
159 159
 			'attributes' => [
Please login to merge, or discard this patch.
src/cli/Database/ConnectionQuery.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,9 +22,9 @@
 block discarded – undo
22 22
 	public function hasConnection($instanceName, ConnectionStatus $connectionStatus)
23 23
 	{
24 24
 		return $this->filterByInstanceName($instanceName)
25
-		            ->filterByPeer($connectionStatus->peer)
26
-		            ->filterByStarted($connectionStatus->started)
27
-		            ->findOne() !== null;
25
+					->filterByPeer($connectionStatus->peer)
26
+					->filterByStarted($connectionStatus->started)
27
+					->findOne() !== null;
28 28
 	}
29 29
 
30 30
 }
Please login to merge, or discard this patch.
src/cli/Database/ChannelQuery.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 	public function hasChannel($instanceName, $channelName)
22 22
 	{
23 23
 		return $this->filterByInstanceName($instanceName)->filterByName($channelName)
24
-		            ->findOne() !== null;
24
+					->findOne() !== null;
25 25
 	}
26 26
 
27 27
 }
Please login to merge, or discard this patch.
src/cli/Database/Input.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -23,9 +23,9 @@
 block discarded – undo
23 23
 		$this->setPrimaryKey($inputStatus->uuid);
24 24
 
25 25
 		return $this->setInput($inputStatus->input)
26
-		            ->setWeight($inputStatus->weight)
27
-		            ->setNetwork(self::parseNetwork($inputStatus))
28
-		            ->setMux(self::parseMux($inputStatus));
26
+					->setWeight($inputStatus->weight)
27
+					->setNetwork(self::parseNetwork($inputStatus))
28
+					->setMux(self::parseMux($inputStatus));
29 29
 	}
30 30
 
31 31
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 	 */
35 35
 	public function getFriendlyName()
36 36
 	{
37
-		return $this->getNetwork() . '/' . $this->getMux();
37
+		return $this->getNetwork().'/'.$this->getMux();
38 38
 	}
39 39
 
40 40
 
Please login to merge, or discard this patch.
src/cli/Database/SubscriptionQuery.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 		$userId = $user !== null ? $user->getId() : null;
35 35
 
36 36
 		return $this->filterByInstance($instance)->filterByUserId($userId)
37
-		            ->filterByChannel($channel)
38
-		            ->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
39
-		            ->findOne() !== null;
37
+					->filterByChannel($channel)
38
+					->filterBySubscriptionId($subscription->id)->filterByStarted($subscription->start)
39
+					->findOne() !== null;
40 40
 	}
41 41
 
42 42
 
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 	public function getNewestMatching($instanceName, $subscriptionId)
50 50
 	{
51 51
 		return $this->filterByInstanceName($instanceName)
52
-		            ->filterBySubscriptionId($subscriptionId)
53
-		            ->addDescendingOrderByColumn('started')->findOne();
52
+					->filterBySubscriptionId($subscriptionId)
53
+					->addDescendingOrderByColumn('started')->findOne();
54 54
 	}
55 55
 
56 56
 
Please login to merge, or discard this patch.
src/cli/Manager/PersistenceManager.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 			$this->onUserSeen($instanceName, $connectionStatus->user);
117 117
 
118 118
 			$user = UserQuery::create()->filterByInstanceName($instanceName)->filterByName($connectionStatus->user)
119
-			                 ->findOne();
119
+							 ->findOne();
120 120
 		}
121 121
 
122 122
 		$connection = new Connection();
123 123
 		$connection->setInstanceName($instanceName)->setPeer($connectionStatus->peer)
124
-		           ->setUser($user)
125
-		           ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
124
+				   ->setUser($user)
125
+				   ->setStarted($connectionStatus->started)->setType($connectionStatus->type)->save();
126 126
 
127 127
 		$this->logger->info('Stored new connection (instance: {instanceName}, peer: {peer})', [
128 128
 			'instanceName' => $instanceName,
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 
151 151
 		$input = new Input();
152 152
 		$input->setInstanceName($instanceName)
153
-		      ->setStarted(new \DateTime())
154
-		      ->setFromInputStatus($inputStatus)->save();
153
+			  ->setStarted(new \DateTime())
154
+			  ->setFromInputStatus($inputStatus)->save();
155 155
 
156 156
 		$this->logger
157 157
 			->info('Stored new input (instance: {instanceName}, network: {network}, mux: {mux}, weight: {weight})',
@@ -215,8 +215,8 @@  discard block
 block discarded – undo
215 215
 
216 216
 		$subscription = new Subscription();
217 217
 		$subscription->setInstance($instance)->setInput($input)->setUser($user)->setChannel($channel)
218
-		             ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
219
-		             ->setService($status->service);
218
+					 ->setSubscriptionId($status->id)->setStarted($status->start)->setTitle($status->title)
219
+					 ->setService($status->service);
220 220
 		$subscription->save();
221 221
 
222 222
 		$this->logger
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 
244 244
 		// Find the latest matching subscription
245 245
 		$subscription = SubscriptionQuery::create()
246
-		                                 ->getNewestMatching($instanceName, $stateChange->getSubscriptionId());
246
+										 ->getNewestMatching($instanceName, $stateChange->getSubscriptionId());
247 247
 
248 248
 		// EPG grab subscriptions are not stored so we don't want to log these with a high level
249 249
 		if ($subscription === null)
Please login to merge, or discard this patch.
tests/cli/Manager/StatusManagerTest.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,14 +21,14 @@
 block discarded – undo
21 21
 	{
22 22
 		/* @var EventSubscriberInterface|\PHPUnit_Framework_MockObject_MockObject $statusManager */
23 23
 		$statusManager = $this->getMockBuilder('\Jalle19\StatusManager\Manager\StatusManager')
24
-		                      ->setConstructorArgs([$this->configuration, $this->logger, $this->eventDispatcher])
25
-		                      ->setMethods(['onMainLoopStarted', 'onMainLoopTick'])
26
-		                      ->getMock();
24
+							  ->setConstructorArgs([$this->configuration, $this->logger, $this->eventDispatcher])
25
+							  ->setMethods(['onMainLoopStarted', 'onMainLoopTick'])
26
+							  ->getMock();
27 27
 
28 28
 		$statusManager->expects($this->once())
29
-		              ->method('onMainLoopStarted');
29
+					  ->method('onMainLoopStarted');
30 30
 		$statusManager->expects($this->once())
31
-		              ->method('onMainLoopTick');
31
+					  ->method('onMainLoopTick');
32 32
 
33 33
 		$this->eventDispatcher->addSubscriber($statusManager);
34 34
 		$this->eventDispatcher->dispatch(Events::MAIN_LOOP_STARTING);
Please login to merge, or discard this patch.
tests/cli/Manager/InstanceStateManagerTest.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -25,23 +25,23 @@
 block discarded – undo
25 25
 	{
26 26
 		/* @var EventSubscriberInterface|\PHPUnit_Framework_MockObject_MockObject|InstanceStateManager $instanceStateManager */
27 27
 		$instanceStateManager = $this->getMockBuilder('\Jalle19\StatusManager\Manager\InstanceStateManager')
28
-		                             ->setConstructorArgs([$this->configuration, $this->logger, $this->eventDispatcher])
29
-		                             ->setMethods([
30
-			                             'onInstanceStatusCollectionRequest',
31
-			                             'onInstanceReachable',
32
-			                             'onInstanceUnreachable',
33
-			                             'onInstanceMaybeReachable',
34
-		                             ])
35
-		                             ->getMock();
28
+									 ->setConstructorArgs([$this->configuration, $this->logger, $this->eventDispatcher])
29
+									 ->setMethods([
30
+										 'onInstanceStatusCollectionRequest',
31
+										 'onInstanceReachable',
32
+										 'onInstanceUnreachable',
33
+										 'onInstanceMaybeReachable',
34
+									 ])
35
+									 ->getMock();
36 36
 
37 37
 		$instanceStateManager->expects($this->once())
38
-		                     ->method('onInstanceStatusCollectionRequest');
38
+							 ->method('onInstanceStatusCollectionRequest');
39 39
 		$instanceStateManager->expects($this->once())
40
-		                     ->method('onInstanceReachable');
40
+							 ->method('onInstanceReachable');
41 41
 		$instanceStateManager->expects($this->once())
42
-		                     ->method('onInstanceUnreachable');
42
+							 ->method('onInstanceUnreachable');
43 43
 		$instanceStateManager->expects($this->once())
44
-		                     ->method('onInstanceMaybeReachable');
44
+							 ->method('onInstanceMaybeReachable');
45 45
 
46 46
 		// Start triggering events and assert that the instance state is as expected
47 47
 		$this->eventDispatcher->addSubscriber($instanceStateManager);
Please login to merge, or discard this patch.