Comment-only (empty) crontabs do not break (#13)

* Update dependencies

* Don't test the language for type safety

* Isolate bug #10

* Typo

* Skip comments earlier
Fix #10

* No need to double check line length

* Update Cli release

* Improve type safety

composer.json

@@ -3,7 +3,7 @@
 	"description": "Run scripts or static functions at regular intervals.",
 
 	"require": {
-		"php": ">=7.2",
+		"php": ">=7.4",
 		"phpgt/cli": "1.*",
 		"dragonmantank/cron-expression": "^2.2"
 	},

src/Command/RunCommand.php

@@ -69,7 +69,7 @@ public function cronRunStep(
 		int $jobsRan,
 		?DateTime $wait,
 		bool $continue
-	) {
+	):void {
 		$message = "";
 		$now = new DateTime();
 
@@ -157,4 +157,4 @@ public function getOptionalParameterList():array {
 			)
 		];
 	}
-}
+}

src/Job.php

@@ -5,12 +5,12 @@
 use DateTime;
 
 class Job {
-	protected $expression;
-	protected $command;
-	protected $hasRun;
+	protected CronExpression $expression;
+	protected string $command;
+	protected bool $hasRun;
 
-	public function __construct(CronExpression $factory, string $command) {
-		$this->expression = $factory;
+	public function __construct(CronExpression $expression, string $command) {
+		$this->expression = $expression;
 		$this->command = $command;
 		$this->hasRun = false;
 	}
@@ -133,4 +133,4 @@ protected function executeScript():void {
 			proc_close($proc);
 		}
 	}
-}
+}

src/JobRepository.php

@@ -4,7 +4,7 @@
 use Cron\CronExpression;
 
 class JobRepository {
-	public function create(CronExpression $expression, $command):Job {
+	public function create(CronExpression $expression, string $command):Job {
 		return new Job($expression, $command);
 	}
-}
+}

src/QueueRepository.php

@@ -4,7 +4,7 @@
 use DateTime;
 
 class QueueRepository {
-	protected $className;
+	protected string $className;
 
 	public function __construct(string $className = Queue::class) {
 		$this->className = $className;
@@ -13,4 +13,4 @@ public function __construct(string $className = Queue::class) {
 	public function createAtTime(DateTime $now):Queue {
 		return new $this->className($now);
 	}
-}
+}

src/Runner.php

@@ -34,6 +34,10 @@ public function __construct(
 				continue;
 			}
 
+			if($line[0] === "#") {
+				continue;
+			}
+
 			preg_match(
 				"/(?P<crontab>\S+\s\S+\s\S+\s\S+\s\S+)\s(?P<command>.+)/",
 				$line,
@@ -46,11 +50,6 @@ public function __construct(
 			$crontab = trim($crontab);
 			$command = trim($command);
 
-			if(strlen($crontab) > 0
-			&& $crontab[0] === "#") {
-				continue;
-			}
-
 			try {
 				$job = call_user_func(
 					[$jobRepository, "create"],
@@ -107,4 +106,4 @@ public function run(bool $continue = false):int {
 	public function runAll():int {
 		return $this->queue->runAllJobs();
 	}
-}
+}

test/phpunit/JobRepositoryTest.php

@@ -16,7 +16,6 @@ public function testCreate() {
 			$command
 		);
 
-		self::assertInstanceOf(Job::class, $job);
 		self::assertEquals($command, $job->getCommand());
 	}
 
@@ -25,4 +24,4 @@ protected function mockExpression():CronExpression {
 		/** @var CronExpression $expression */
 		return $expression;
 	}
-}
+}

test/phpunit/RunnerTest.php

@@ -265,6 +265,20 @@ public function testComments() {
 		self::assertEquals(2, $runner->getNumJobs());
 	}
 
+	public function testOnlyComments() {
+		$cronContents = <<<CRON
+# List your background tasks here in normal crontab syntax
+# and they will be run with `gt run`
+# More info: https://www.php.gt/cron
+CRON;
+		$runner = new Runner(
+			$this->mockJobRepository(0),
+			$this->mockQueueRepository(0),
+			$cronContents
+		);
+		self::assertEquals(0, $runner->getNumJobs());
+	}
+
 	protected function mockJobRepository(int...$wait):JobRepository {
 		$isDue = [];
 		$runDate = [];
@@ -319,4 +333,4 @@ protected function mockQueueRepository(int...$wait):QueueRepository {
 		/** @var QueueRepository $repository */
 		return $repository;
 	}
-}
+}