Jalle19 / tvheadend-status-manager

src/cli/Jalle19/StatusManager/Database/Base/ConnectionQuery.php

Doc Comments +3 added lines, -3 removed lines

@@ -425,7 +425,7 @@ 
      * $query->filterByStarted(array('max' => 'yesterday')); // WHERE started > '2011-03-13'
      * </code>
      *
-     * @param     mixed $started The value to use as filter.
+     * @param     integer $started The value to use as filter.
      *              Values can be integers (unix timestamps), DateTime objects, or strings.
      *              Empty strings are treated as NULL.
      *              Use scalar values for equality.
@@ -490,7 +490,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\Instance object
      *
-     * @param \Jalle19\StatusManager\Database\Instance|ObjectCollection $instance The related object(s) to use as filter
+     * @param Instance $instance The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException
@@ -567,7 +567,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\User object
      *
-     * @param \Jalle19\StatusManager\Database\User|ObjectCollection $user The related object(s) to use as filter
+     * @param User $user The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException

src/cli/Jalle19/StatusManager/Database/Base/Instance.php

Doc Comments +4 added lines, -4 removed lines

@@ -314,7 +314,7 @@ 
      *
      * @param  string  $msg
      * @param  int     $priority One of the Propel::LOG_* logging levels
-     * @return boolean
+     * @return boolean|null
      */
     protected function log($msg, $priority = Propel::LOG_INFO)
     {
@@ -758,7 +758,7 @@ 
      *                     one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
      *                     TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      *                     Defaults to TableMap::TYPE_PHPNAME.
-     * @return mixed Value of field.
+     * @return string|null Value of field.
      */
     public function getByName($name, $type = TableMap::TYPE_PHPNAME)
     {
@@ -773,7 +773,7 @@ 
      * Zero-based.
      *
      * @param      int $pos position in xml schema
-     * @return mixed Value of field at $pos
+     * @return string|null Value of field at $pos
      */
     public function getByPosition($pos)
     {
@@ -959,7 +959,7 @@ 
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param mixed $parser A AbstractParser instance,
+     * @param string $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
      * @param string $data The source data to import from
      * @param string $keyType The type of keys the array uses.

src/cli/Jalle19/StatusManager/Database/Base/InstanceQuery.php

Doc Comments +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed $key Primary key to use for the query
+     * @param string $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildInstance|array|mixed the result, formatted by the current formatter

src/cli/Jalle19/StatusManager/Database/Base/SubscriptionQuery.php

Doc Comments +5 added lines, -5 removed lines

@@ -464,7 +464,7 @@ 
      * $query->filterBySubscriptionId(array('min' => 12)); // WHERE subscription_id > 12
      * </code>
      *
-     * @param     mixed $subscriptionId The value to use as filter.
+     * @param     integer $subscriptionId The value to use as filter.
      *              Use scalar values for equality.
      *              Use array values for in_array() equivalent.
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
@@ -505,7 +505,7 @@ 
      * $query->filterByStarted(array('max' => 'yesterday')); // WHERE started > '2011-03-13'
      * </code>
      *
-     * @param     mixed $started The value to use as filter.
+     * @param     integer $started The value to use as filter.
      *              Values can be integers (unix timestamps), DateTime objects, or strings.
      *              Empty strings are treated as NULL.
      *              Use scalar values for equality.
@@ -642,7 +642,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\Instance object
      *
-     * @param \Jalle19\StatusManager\Database\Instance|ObjectCollection $instance The related object(s) to use as filter
+     * @param Instance $instance The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException
@@ -719,7 +719,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\User object
      *
-     * @param \Jalle19\StatusManager\Database\User|ObjectCollection $user The related object(s) to use as filter
+     * @param User $user The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException
@@ -796,7 +796,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\Channel object
      *
-     * @param \Jalle19\StatusManager\Database\Channel|ObjectCollection $channel The related object(s) to use as filter
+     * @param Channel $channel The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException

src/cli/Jalle19/StatusManager/Database/Base/User.php

Doc Comments +2 added lines, -2 removed lines

@@ -305,7 +305,7 @@ 
      *
      * @param  string  $msg
      * @param  int     $priority One of the Propel::LOG_* logging levels
-     * @return boolean
+     * @return boolean|null
      */
     protected function log($msg, $priority = Propel::LOG_INFO)
     {
@@ -1028,7 +1028,7 @@ 
      * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
      * The default key type is the column's TableMap::TYPE_PHPNAME.
      *
-     * @param mixed $parser A AbstractParser instance,
+     * @param string $parser A AbstractParser instance,
      *                       or a format name ('XML', 'YAML', 'JSON', 'CSV')
      * @param string $data The source data to import from
      * @param string $keyType The type of keys the array uses.

src/cli/Jalle19/StatusManager/Database/Base/UserQuery.php

Doc Comments +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed $key Primary key to use for the query
+     * @param integer $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildUser|array|mixed the result, formatted by the current formatter

src/cli/Jalle19/StatusManager/PersistenceManager.php

Doc Comments +2 added lines, -2 removed lines

@@ -251,7 +251,7 @@ 
 
 
 	/**
-	 * @param                  $instanceName
+	 * @param                  string $instanceName
 	 * @param ConnectionStatus $connectionStatus
 	 *
 	 * @return bool whether the connection exists in the database
@@ -290,7 +290,7 @@ 
 
 	/**
 	 * @param Database\Instance  $instance
-	 * @param                    $user
+	 * @param                    User $user
 	 * @param Channel            $channel
 	 * @param SubscriptionStatus $subscription
 	 *

Braces +21 added lines, -14 removed lines

@@ -50,8 +50,9 @@ 
 	 */
 	public function onInstanceSeen(Tvheadend $instance)
 	{
-		if ($this->hasInstance($instance))
-			return;
+		if ($this->hasInstance($instance)) {
+					return;
+		}
 
 		$instanceModel = new Database\Instance();
 		$instanceModel->setPrimaryKey($instance->getHostname());
@@ -80,8 +81,9 @@ 
 	 */
 	public function onConnectionSeen($instanceName, ConnectionStatus $connectionStatus)
 	{
-		if ($this->hasConnection($instanceName, $connectionStatus))
-			return;
+		if ($this->hasConnection($instanceName, $connectionStatus)) {
+					return;
+		}
 
 		$user = null;
 
@@ -114,8 +116,9 @@ 
 	 */
 	public function onUserSeen($instanceName, $userName)
 	{
-		if ($this->hasUser($instanceName, $userName))
-			return;
+		if ($this->hasUser($instanceName, $userName)) {
+					return;
+		}
 
 		$user = new User();
 		$user->setInstanceName($instanceName)->setName($userName);
@@ -136,8 +139,9 @@ 
 	 */
 	public function onChannelSeen($instanceName, $channelName)
 	{
-		if ($this->hasChannel($instanceName, $channelName))
-			return;
+		if ($this->hasChannel($instanceName, $channelName)) {
+					return;
+		}
 
 		$channel = new Channel();
 		$channel->setInstanceName($instanceName)->setName($channelName);
@@ -159,8 +163,9 @@ 
 	public function onSubscriptionSeen($instanceName, SubscriptionStatus $status)
 	{
 		// Ignore EPG grabber subscriptions
-		if ($status->getType() === SubscriptionStatus::TYPE_EPGGRAB)
-			return;
+		if ($status->getType() === SubscriptionStatus::TYPE_EPGGRAB) {
+					return;
+		}
 
 		// Determine the username to store for the subscription
 		$username = $status->username;
@@ -180,8 +185,9 @@ 
 		$this->onChannelSeen($instanceName, $status->channel);
 		$channel = ChannelQuery::create()->filterByInstance($instance)->filterByName($status->channel)->findOne();
 
-		if ($this->hasSubscription($instance, $user, $channel, $status))
-			return;
+		if ($this->hasSubscription($instance, $user, $channel, $status)) {
+					return;
+		}
 
 		$subscription = new Subscription();
 		$subscription->setInstance($instance)->setUser($user)->setChannel($channel)
@@ -205,8 +211,9 @@ 
 	public function onSubscriptionStateChange($instanceName, StateChange $stateChange)
 	{
 		// We only need to persist subscription stops
-		if ($stateChange->getState() === StateChange::STATE_SUBSCRIPTION_STARTED)
-			return;
+		if ($stateChange->getState() === StateChange::STATE_SUBSCRIPTION_STARTED) {
+					return;
+		}
 
 		// Find the latest matching subscription
 		$subscription = SubscriptionQuery::create()->filterByInstanceName($instanceName)

src/cli/Jalle19/StatusManager/Configuration.php

Braces +6 added lines, -4 removed lines

@@ -92,8 +92,9 @@ 
 	 */
 	public function setUpdateInterval($updateInterval)
 	{
-		if ($updateInterval <= 0)
-			throw new \RuntimeException('Invalid update interval specified');
+		if ($updateInterval <= 0) {
+					throw new \RuntimeException('Invalid update interval specified');
+		}
 
 		$this->_updateInterval = $updateInterval;
 	}
@@ -133,8 +134,9 @@ 
 	 */
 	public function setListenPort($listenPort)
 	{
-		if ($listenPort < 1 || $listenPort > 65535)
-			throw new \RuntimeException('Invalid port specified');
+		if ($listenPort < 1 || $listenPort > 65535) {
+					throw new \RuntimeException('Invalid port specified');
+		}
 
 		$this->_listenPort = $listenPort;
 	}

src/cli/Jalle19/StatusManager/Console/Commands/TvheadendStatusManagerCommand.php

Braces +20 added lines, -14 removed lines

@@ -124,23 +124,26 @@ 
 	private function parseConfiguration(InputInterface $input)
 	{
 		// Check that the configuration file exists
-		if (!file_exists($input->getArgument('configFile')))
-			throw new InvalidConfigurationException('The specified configuration file does not exist');
+		if (!file_exists($input->getArgument('configFile'))) {
+					throw new InvalidConfigurationException('The specified configuration file does not exist');
+		}
 
 		// Check that the database exists and is writable
 		$databasePath = $input->getArgument('databaseFile');
 
-		if (!file_exists($databasePath))
-			throw new InvalidConfigurationException('The specified database path does not exist');
-		else if (!is_writable($databasePath))
-			throw new InvalidConfigurationException('The specified database path is not writable');
+		if (!file_exists($databasePath)) {
+					throw new InvalidConfigurationException('The specified database path does not exist');
+		} else if (!is_writable($databasePath)) {
+					throw new InvalidConfigurationException('The specified database path is not writable');
+		}
 
 		// Parse the configuration file
 		$configuration = parse_ini_file($input->getArgument('configFile'), true);
 
 		// Check that the file was parsed
-		if ($configuration === false)
-			throw new InvalidConfigurationException('Failed to parse the specified configuration file');
+		if ($configuration === false) {
+					throw new InvalidConfigurationException('Failed to parse the specified configuration file');
+		}
 
 		$instances    = [];
 
@@ -157,8 +160,9 @@ 
 					$instance = new Instance($name, $address, $port);
 
 					// Optionally set credentials
-					if (isset($values['username']) && isset($values['password']))
-						$instance->setCredentials($values['username'], $values['password']);
+					if (isset($values['username']) && isset($values['password'])) {
+											$instance->setCredentials($values['username'], $values['password']);
+					}
 
 					$instances[] = $instance;
 					break;
@@ -166,8 +170,9 @@ 
 		}
 
 		// Validate the configuration. We need at least one instance.
-		if (empty($instances))
-			throw new InvalidConfigurationException('No instances defined, you need to specify at least one instance');
+		if (empty($instances)) {
+					throw new InvalidConfigurationException('No instances defined, you need to specify at least one instance');
+		}
 
 		// Create the configuration object
 		$config = new Configuration($databasePath, $instances);
@@ -196,8 +201,9 @@ 
 	 */
 	private static function getSectionType($section)
 	{
-		if (substr($section, 0, 8) === 'instance')
-			return Configuration::SECTION_TYPE_INSTANCE;
+		if (substr($section, 0, 8) === 'instance') {
+					return Configuration::SECTION_TYPE_INSTANCE;
+		}
 
 		throw new InvalidConfigurationException('Unknown section "' . $section . '"');
 	}