rkrx / php-service-dispatcher

src/Common/IntervalParser.php

Doc Comments +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
 	
 	/**
 	 * @param $interval
-	 * @param DateTimeInterface|null $now
-	 * @return Generator|DateTimeImmutable
+	 * @param DateTimeInterface $now
+	 * @return Generator
 	 */
 	private static function parse($interval, DateTimeInterface $now) {
 		if(is_array($interval)) {

Spacing +12 added lines, -12 removed lines

@@ -15,7 +15,7 @@ 
 	 * @return DateTimeImmutable
 	 */
 	public static function getNext($interval, DateTimeInterface $now = null): DateTimeImmutable {
-		if($now === null) {
+		if ($now === null) {
 			try {
 				$now = new DateTimeImmutable();
 			} catch (Throwable $e) {
@@ -23,10 +23,10 @@ 
 			}
 		}
 		$result = null;
-		foreach(self::parse($interval, $now) as $date) {
-			if($result === null) {
+		foreach (self::parse($interval, $now) as $date) {
+			if ($result === null) {
 				$result = $date;
-			} elseif($date < $result) {
+			} elseif ($date < $result) {
 				$result = $date;
 			}
 		}
@@ -39,11 +39,11 @@ 
 	 * @return Generator|DateTimeImmutable
 	 */
 	private static function parse($interval, DateTimeInterface $now) {
-		if(is_array($interval)) {
-			foreach($interval as $inner) {
+		if (is_array($interval)) {
+			foreach ($interval as $inner) {
 				yield from self::parse($inner, $now);
 			}
-		} elseif(ctype_digit($interval)) {
+		} elseif (ctype_digit($interval)) {
 			yield self::parseInt($interval, $now);
 		} else {
 			yield self::parseString($interval, $now);
@@ -65,7 +65,7 @@ 
 	 * @return DateTimeInterface
 	 */
 	private static function parseString(string $interval, DateTimeInterface $now): DateTimeInterface {
-		if(preg_match('/^(\\d{1,2}|\\*):(\\d{1,2}|\\*)(?::(\\d{1,2}|\\*))?$/', $interval, $matches)) {
+		if (preg_match('/^(\\d{1,2}|\\*):(\\d{1,2}|\\*)(?::(\\d{1,2}|\\*))?$/', $interval, $matches)) {
 			$matches[] = 0;
 			[$hours, $minutes, $seconds] = array_slice($matches, 1);
 			$today = date_create_immutable($now->format('c'))->setTime((int) $hours, (int) $minutes, (int) $seconds);
@@ -88,15 +88,15 @@ 
 	 */
 	private static function nearst(array $possibleDates, DateTimeInterface $now) {
 		$current = null;
-		foreach($possibleDates as $possibleDate) {
-			if($now > $possibleDate) { // The current date is in the past
+		foreach ($possibleDates as $possibleDate) {
+			if ($now > $possibleDate) { // The current date is in the past
 				continue;
 			}
-			if($current === null || $possibleDate < $current) {
+			if ($current === null || $possibleDate < $current) {
 				$current = $possibleDate;
 			}
 		}
-		if($current !== null) {
+		if ($current !== null) {
 			return $current;
 		}
 		throw new RuntimeException('No alternative lays in the future');

src/AttributeRepositories/MySQLAttributeRepository.php

Spacing +26 added lines, -26 removed lines

@@ -54,7 +54,7 @@ 
 		$this->tableName = $tableName;
 		$this->options = $options;
 		$this->pdo = $pdo;
-		if($options['use-locking'] ?? true) {
+		if ($options['use-locking'] ?? true) {
 			$this->lock = $pdo->prepare('SELECT GET_LOCK(:name, 0)');
 			$this->unlock = $pdo->prepare('SELECT RELEASE_LOCK(:name)');
 		}
@@ -65,7 +65,7 @@ 
 	 * @return bool
 	 */
 	public function has(string $key) {
-		if($this->hasService === null) {
+		if ($this->hasService === null) {
 			$this->hasService = $this->pdo->prepare("SELECT COUNT(*) FROM `{$this->tableName}` WHERE service_key=:key;");
 		}
 		$this->hasService->execute(['key' => $key]);
@@ -78,9 +78,9 @@ 
 	 * @return MySQLAttributeRepository|void
 	 */
 	public function register(string $key) {
-		$this->handleException(function () use ($key) {
-			if($this->services === null) {
-				if($this->getServiceKeys === null) {
+		$this->handleException(function() use ($key) {
+			if ($this->services === null) {
+				if ($this->getServiceKeys === null) {
 					$this->getServiceKeys = $this->pdo->prepare("SELECT `service_key` FROM `{$this->tableName}`;");
 				}
 				try {
@@ -90,8 +90,8 @@ 
 					$this->getServiceKeys->closeCursor();
 				}
 			}
-			if(!in_array($key, $this->services, true)) {
-				if($this->registerRow === null) {
+			if (!in_array($key, $this->services, true)) {
+				if ($this->registerRow === null) {
 					$this->registerRow = $this->pdo->prepare("INSERT INTO `{$this->tableName}` (`service_key`) VALUES (:key)");
 				}
 				$this->registerRow->execute(['key' => $key]);
@@ -104,15 +104,15 @@ 
 	 * @return object
 	 */
 	public function getRowByKey(string $key) {
-		if($this->getData === null) {
+		if ($this->getData === null) {
 			$this->getData = $this->pdo->prepare("SELECT service_key, service_last_try, service_last_run, service_next_run FROM `{$this->tableName}` WHERE service_key=:key;");
 		}
 		try {
-			$this->handleException(function () use ($key) {
+			$this->handleException(function() use ($key) {
 				$this->getData->execute(['key' => $key]);
 			});
 			$result = $this->getData->fetchObject();
-			if(!is_object($result)) {
+			if (!is_object($result)) {
 				throw new RuntimeException('Row not found');
 			}
 			return $result;
@@ -127,10 +127,10 @@ 
 	 * @return MySQLAttributeRepository|void
 	 */
 	public function setLastTryDate(string $key, DateTimeInterface $datetime) {
-		if($this->updateTryDate === null) {
+		if ($this->updateTryDate === null) {
 			$this->updateTryDate = $this->pdo->prepare("INSERT INTO `{$this->tableName}` (service_key, service_last_try) VALUES (:key, :dt) ON DUPLICATE KEY UPDATE service_last_try=:dt");
 		}
-		$this->handleException(function () use ($key, $datetime) {
+		$this->handleException(function() use ($key, $datetime) {
 			$this->updateTryDate->execute(['key' => $key, 'dt' => $datetime->format('Y-m-d H:i:s')]);
 		});
 	}
@@ -141,10 +141,10 @@ 
 	 * @return MySQLAttributeRepository|void
 	 */
 	public function setLastRunDate(string $key, DateTimeInterface $datetime) {
-		if($this->updateRunDate === null) {
+		if ($this->updateRunDate === null) {
 			$this->updateRunDate = $this->pdo->prepare("INSERT INTO `{$this->tableName}` (service_key, service_last_run) VALUES (:key, :dt) ON DUPLICATE KEY UPDATE service_last_run=:dt");
 		}
-		$this->handleException(function () use ($key, $datetime) {
+		$this->handleException(function() use ($key, $datetime) {
 			$this->updateRunDate->execute(['key' => $key, 'dt' => $datetime->format('Y-m-d H:i:s')]);
 		});
 	}
@@ -155,10 +155,10 @@ 
 	 * @return MySQLAttributeRepository|void
 	 */
 	public function setNextRunDate(string $key, DateTimeInterface $datetime) {
-		if($this->updateNextDate === null) {
+		if ($this->updateNextDate === null) {
 			$this->updateNextDate = $this->pdo->prepare("INSERT INTO `{$this->tableName}` (service_key, service_next_run) VALUES (:key, :dt) ON DUPLICATE KEY UPDATE service_next_run=:dt");
 		}
-		$this->handleException(function () use ($key, $datetime) {
+		$this->handleException(function() use ($key, $datetime) {
 			$this->updateNextDate->execute(['key' => $key, 'dt' => $datetime->format('Y-m-d H:i:s')]);
 		});
 	}
@@ -172,7 +172,7 @@ 
 	public function lockAndIterateServices(?DateTimeInterface $now, callable $fn): int {
 		$data = (object) ['count' => 0];
 			$services = $this->fetchServices($now);
-			foreach($services as $service) {
+			foreach ($services as $service) {
 				try {
 					$this->lock($service->getKey());
 					$fn($service);
@@ -189,15 +189,15 @@ 
 	 * @return Service[]
 	 */
 	private function fetchServices(DateTimeInterface $now) {
-		if($this->selectOverdueServices === null) {
+		if ($this->selectOverdueServices === null) {
 			$this->selectOverdueServices = $this->pdo->prepare("SELECT service_key, service_last_try, service_last_run, service_next_run FROM `{$this->tableName}` WHERE IFNULL(service_next_run, DATE('2000-01-01')) <= :dt;");
 		}
-		return $this->handleException(function () use ($now) {
+		return $this->handleException(function() use ($now) {
 			$this->selectOverdueServices->execute(['dt' => $now->format('Y-m-d H:i:d')]);
 			try {
 				$services = $this->selectOverdueServices->fetchAll(PDO::FETCH_ASSOC);
 				$result = [];
-				foreach($services as $service) {
+				foreach ($services as $service) {
 					$result[] = new Service($service['service_key']);
 				}
 				return $result;
@@ -217,7 +217,7 @@ 
 			$lockName = sprintf('%s%s', $this->options['lock-prefix'] ?? '', $key);
 			$this->lock->execute(['name' => $lockName]);
 			$lockObtained = $this->lock->fetchColumn(0);
-			if(!$lockObtained) {
+			if (!$lockObtained) {
 				throw new RuntimeException(sprintf('Could not obtain lock "%s"', $lockName));
 			}
 		} finally {
@@ -240,13 +240,13 @@ 
 		try {
 			return $fn();
 		} catch (PDOException $e) {
-			if($e->getCode() === self::MYSQL_ERR_TABLE_MSSING) {
+			if ($e->getCode() === self::MYSQL_ERR_TABLE_MSSING) {
 				// Field is missing, let's have a look what is going on...
 				$this->pdo->exec("CREATE TABLE IF NOT EXISTS `{$this->tableName}` (`service_key` VARCHAR(255) NOT NULL DEFAULT '', `service_last_try` DATETIME NULL DEFAULT NULL, `service_last_run` DATETIME NULL DEFAULT NULL, `service_next_run` DATETIME NULL DEFAULT NULL, PRIMARY KEY (`service_key`));");
 				return $this->retry($fn);
 			}
 			
-			if($e->getCode() === self::MYSQL_ERR_TABLE_COLUMN_MSSING) {
+			if ($e->getCode() === self::MYSQL_ERR_TABLE_COLUMN_MSSING) {
 				// Field is missing, let's have a look what is going on...
 				$this->checkIfOldTableVersion();
 				return $this->retry($fn);
@@ -261,7 +261,7 @@ 
 	 * @return mixed
 	 */
 	private function retry(Closure $fn) {
-		return $this->handleException(function () use ($fn) {
+		return $this->handleException(function() use ($fn) {
 			return $fn();
 		});
 	}
@@ -271,10 +271,10 @@ 
 	private function checkIfOldTableVersion() {
 		$serviceNextRunField = $this->pdo->query("SHOW COLUMNS FROM `{$this->tableName}` LIKE 'service_next_run';")->fetchAll(PDO::FETCH_ASSOC);
 
-		if(!count($serviceNextRunField)) {
+		if (!count($serviceNextRunField)) {
 			$this->pdo->exec("ALTER TABLE `{$this->tableName}` ADD COLUMN `service_next_run` DATETIME NULL DEFAULT NULL AFTER `service_last_run`;");
 			$serviceTimeoutField = $this->pdo->query("SHOW COLUMNS FROM `{$this->tableName}` LIKE 'service_timeout';")->fetchAll(PDO::FETCH_ASSOC);
-			if(count($serviceTimeoutField)) {
+			if (count($serviceTimeoutField)) {
 				$this->pdo->exec("UPDATE `{$this->tableName}` SET service_next_run = DATE_ADD(service_last_run, INTERVAL service_timeout SECOND)");
 				$this->pdo->exec("ALTER TABLE `{$this->tableName}` DROP COLUMN `service_timeout`;");
 			}

src/AttributeRepositories/SqliteAttributeRepository.php

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 		try {
 			$this->getData->execute(['key' => $key]);
 			$result = $this->getData->fetchObject();
-			if(!is_object($result)) {
+			if (!is_object($result)) {
 				throw new RuntimeException('Row not found');
 			}
 			return $result;
@@ -97,7 +97,7 @@ 
 	public function lockAndIterateServices(DateTimeInterface $now, callable $fn): int {
 		$count = 0;
 		$services = $this->fetchServices($now);
-		foreach($services as $service) {
+		foreach ($services as $service) {
 			$fn($service);
 		}
 		return $count;
@@ -111,7 +111,7 @@ 
 		$this->selectServices->execute(['dt' => $now->format(self::SQLITE_DATETIME_FORMAT)]);
 		try {
 			$services = $this->selectServices->fetchAll(PDO::FETCH_ASSOC);
-			foreach($services as $service) {
+			foreach ($services as $service) {
 				yield new Service($service['service_key']);
 			}
 		} finally {
@@ -125,7 +125,7 @@ 
 	 */
 	private function migrate(int $version, string $statement): void {
 		$currentVersion = (int) $this->pdo->query('PRAGMA user_version')->fetchColumn(0);
-		if($currentVersion < $version) {
+		if ($currentVersion < $version) {
 			$this->pdo->exec($statement);
 			$this->pdo->exec("PRAGMA user_version={$version}");
 		}

src/Dispatchers/DefaultDispatcher.php

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
 	 * @return $this
 	 */
 	public function on(string $event, callable $fn) {
-		if(!array_key_exists($event, $this->listeners)) {
+		if (!array_key_exists($event, $this->listeners)) {
 			$this->listeners[$event] = [];
 		}
 		$this->listeners[$event][] = $fn;
@@ -70,8 +70,8 @@ 
 	 */
 	public function run(DateTimeInterface $now = null) {
 		$now = $now ?? date_create_immutable();
-		return $this->attributeRepository->lockAndIterateServices($now, function (Service $service) {
-			if(!array_key_exists($service->getKey(), $this->services)) {
+		return $this->attributeRepository->lockAndIterateServices($now, function(Service $service) {
+			if (!array_key_exists($service->getKey(), $this->services)) {
 				return;
 			}
 			$eventParams = ['serviceName' => $service->getKey()];
@@ -79,7 +79,7 @@ 
 				$this->fireEvent('service-start', $eventParams);
 				$serviceData = $this->services[$service->getKey()];
 				$this->attributeRepository->setLastTryDate($service->getKey(), date_create_immutable());
-				if($this->methodInvoker !== null) {
+				if ($this->methodInvoker !== null) {
 					$result = $this->methodInvoker->invoke($serviceData->fn, $eventParams);
 				} else {
 					$result = call_user_func($serviceData->fn, $service);
@@ -87,13 +87,13 @@ 
 				$this->attributeRepository->setLastRunDate($service->getKey(), date_create_immutable());
 				$nextRunDate = IntervalParser::getNext($serviceData->interval);
 				$this->attributeRepository->setNextRunDate($serviceData->key, $nextRunDate);
-				if($result !== false) {
+				if ($result !== false) {
 					$this->fireEvent('service-success', $eventParams);
 				}
 			} catch (Throwable $e) {
 				$eventParams['exception'] = $e;
 				$this->fireEvent('service-failure', $eventParams);
-				if($this->logger !== null) {
+				if ($this->logger !== null) {
 					$this->logger->critical("{$service}: {$e->getMessage()}", ['exception' => $e]);
 				} else {
 					throw new RuntimeException("{$service}: {$e->getMessage()}", (int) $e->getCode(), $e);
@@ -107,14 +107,14 @@ 
 	 * @param array $params
 	 */
 	private function fireEvent($event, $params) {
-		if(array_key_exists($event, $this->listeners)) {
+		if (array_key_exists($event, $this->listeners)) {
 			try {
-				foreach($this->listeners[$event] as $listener) {
+				foreach ($this->listeners[$event] as $listener) {
 					$this->methodInvoker->invoke($listener, $params);
 				}
 			} catch (Exception $e) {
 				// Supress exceptions emitted by events
-				if($this->logger !== null) {
+				if ($this->logger !== null) {
 					$this->logger->critical($e->getMessage(), array('exception' => $e));
 				}
 			}

src/Builder/MySQLBuilder.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php

 namespace Kir\Services\Cmd\Dispatcher\Builder;

 

-use Ioc\MethodInvoker;

-use Kir\Services\Cmd\Dispatcher\AttributeRepositories\MySQLAttributeRepository;

-use Kir\Services\Cmd\Dispatcher\Dispatchers\DefaultDispatcher;

+use Ioc\MethodInvoker;
+use Kir\Services\Cmd\Dispatcher\AttributeRepositories\MySQLAttributeRepository;
+use Kir\Services\Cmd\Dispatcher\Dispatchers\DefaultDispatcher;
 use PDO;

 

 class MySQLBuilder {