| @@ -34,7 +34,7 @@ | ||
| 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 | |
| @@ -52,7 +52,7 @@ | ||
| 52 | 52 | } | 
| 53 | 53 | catch (PropelException $e) | 
| 54 | 54 |  		{ | 
| 55 | -			throw new RequestFailedException('A database error occured: ' . $e->getMessage()); | |
| 55 | +			throw new RequestFailedException('A database error occured: '.$e->getMessage()); | |
| 56 | 56 | } | 
| 57 | 57 | |
| 58 | 58 | return false; | 
| @@ -51,7 +51,7 @@ | ||
| 51 | 51 | // Check that all mandatory values are defined | 
| 52 | 52 | foreach (self::$mandatoryValues as $mandatoryValue) | 
| 53 | 53 | if (!isset($this->_configuration[$mandatoryValue]) || ($this->_configuration[$mandatoryValue] != '0' && empty($this->_configuration[$mandatoryValue]))) | 
| 54 | -				throw new InvalidConfigurationException('Mandatory configuration value "' . $mandatoryValue . '" is missing'); | |
| 54 | +				throw new InvalidConfigurationException('Mandatory configuration value "'.$mandatoryValue.'" is missing'); | |
| 55 | 55 | |
| 56 | 56 | if (!is_readable($this->_configuration['database_path'])) | 
| 57 | 57 |  			throw new InvalidConfigurationException('The database path does not exist or is not writable'); | 
| @@ -44,11 +44,11 @@ | ||
| 44 | 44 | // Parse the configuration file | 
| 45 | 45 | try | 
| 46 | 46 |  		{ | 
| 47 | - return (array)Yaml::parse(file_get_contents($this->_file)); | |
| 47 | + return (array) Yaml::parse(file_get_contents($this->_file)); | |
| 48 | 48 | } | 
| 49 | 49 | catch (ParseException $e) | 
| 50 | 50 |  		{ | 
| 51 | -			throw new InvalidConfigurationException('Failed to parse the specified configuration file: ' . $e->getMessage()); | |
| 51 | +			throw new InvalidConfigurationException('Failed to parse the specified configuration file: '.$e->getMessage()); | |
| 52 | 52 | } | 
| 53 | 53 | } | 
| 54 | 54 | |
| @@ -209,7 +209,7 @@ | ||
| 209 | 209 | } | 
| 210 | 210 | catch (RequestFailedException $e) | 
| 211 | 211 |  			{ | 
| 212 | -				$this->logger->error('The request failed: ' . $e->getMessage()); | |
| 212 | +				$this->logger->error('The request failed: '.$e->getMessage()); | |
| 213 | 213 | } | 
| 214 | 214 | catch (UnhandledMessageException $e) | 
| 215 | 215 |  			{ | 
| @@ -43,7 +43,7 @@ | ||
| 43 | 43 | $socket->listen($configuration->getHttpListenPort(), $configuration->getListenAddress()); | 
| 44 | 44 | |
| 45 | 45 | // Configure the web server | 
| 46 | - $webroot = realpath(__DIR__ . '/../../client/app'); | |
| 46 | + $webroot = realpath(__DIR__.'/../../client/app'); | |
| 47 | 47 | $this->_staticWebServer = new StaticWebServer(new HttpServer($socket), $webroot, $logger); | 
| 48 | 48 | |
| 49 | 49 | // Configure the authentication handler | 
| @@ -94,7 +94,7 @@ discard block | ||
| 94 | 94 | $eventDispatcher->addSubscriber($httpRequestManager); | 
| 95 | 95 | |
| 96 | 96 | // Configure the event loop and start the application | 
| 97 | - $eventLoop->addPeriodicTimer($configuration->getUpdateInterval(), function () use ($eventDispatcher) | |
| 97 | + $eventLoop->addPeriodicTimer($configuration->getUpdateInterval(), function() use ($eventDispatcher) | |
| 98 | 98 |  		{ | 
| 99 | 99 | // Emit an event on each tick | 
| 100 | 100 | $eventDispatcher->dispatch(Events::MAIN_LOOP_TICK); | 
| @@ -150,7 +150,7 @@ discard block | ||
| 150 | 150 | $manager->setConfiguration([ | 
| 151 | 151 | 'classname' => 'Propel\\Runtime\\Connection\\ConnectionWrapper', | 
| 152 | 152 | //'classname' => 'Propel\\Runtime\\Connection\\DebugPDO', | 
| 153 | - 'dsn' => 'sqlite:' . $configuration->getDatabasePath(), | |
| 153 | + 'dsn' => 'sqlite:'.$configuration->getDatabasePath(), | |
| 154 | 154 | 'user' => null, | 
| 155 | 155 | 'password' => '', | 
| 156 | 156 | 'attributes' => [ | 
| @@ -47,7 +47,7 @@ | ||
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | /** | 
| 50 | - * @return \PHPUnit_Framework_MockObject_MockObject|UserQuery | |
| 50 | + * @return \PHPUnit\Framework\MockObject\MockObject | |
| 51 | 51 | */ | 
| 52 | 52 | private function getMockedUserQuery() | 
| 53 | 53 |  	{ | 
| @@ -50,7 +50,7 @@ | ||
| 50 | 50 | |
| 51 | 51 | // Remove the channel name and the beginning slash from the service string | 
| 52 | 52 | $channel = $subscriptionStatus->channel; | 
| 53 | -		$service = preg_replace('/\/' . preg_quote($channel, '/') . '$/', '', $service); | |
| 53 | +		$service = preg_replace('/\/'.preg_quote($channel, '/').'$/', '', $service); | |
| 54 | 54 | |
| 55 | 55 |  		return explode('/', $service); | 
| 56 | 56 | } |