fix(queue): "Cron\CronExpression::__construct(): Argument \#1 ($expre…

…ssion) must be of type string, null given".
LastDragon-ru · Dec 25, 2021 · d936445 · d936445
1 parent cd3be87
commit d936445
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/packages/queue/src/CronableRegistrator.php b/packages/queue/src/CronableRegistrator.php
@@ -48,7 +48,7 @@ public function register(string $cronable): void {
         $timezone = $config->get(CronableConfig::Timezone);
 
         // Enabled?
-        if (!$enabled) {
+        if (!$enabled || $cron === null) {
             if ($this->isDue($cron)) {
                 $this->jobDisabled($cronable, $job, $config);
             }

diff --git a/packages/queue/src/CronableRegistratorTest.php b/packages/queue/src/CronableRegistratorTest.php
@@ -125,6 +125,35 @@ public function getQueueConfig(): array {
         $registrator->register($cronable::class);
     }
 
+    /**
+     * @covers ::register
+     */
+    public function testRegisterCronIsNull(): void {
+        $cronable = new class() implements Cronable {
+            /**
+             * @inheritDoc
+             */
+            public function getQueueConfig(): array {
+                return [];
+            }
+        };
+
+        $this->override(Schedule::class, static function (MockInterface $mock): void {
+            $mock
+                ->shouldReceive('call')
+                ->never();
+        });
+
+        $this->setQueueableConfig($cronable, [
+            CronableConfig::Cron    => null,
+            CronableConfig::Enabled => true,
+        ]);
+
+        $registrator = $this->app->make(CronableRegistrator::class);
+
+        $registrator->register($cronable::class);
+    }
+
     /**
      * @covers ::isDue
      *