From f3124aafdf986ef0a8305906ee9baf680bcc8d46 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 30 Sep 2022 14:14:41 +0200 Subject: [PATCH] test fixes --- Utils/TaskSchedule/CronJob.php | 4 +++- tests/Uri/ArgumentTest.php | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Utils/TaskSchedule/CronJob.php b/Utils/TaskSchedule/CronJob.php index f7698c428..46a90ed14 100644 --- a/Utils/TaskSchedule/CronJob.php +++ b/Utils/TaskSchedule/CronJob.php @@ -29,7 +29,9 @@ class CronJob extends TaskAbstract */ public function __toString() : string { - return $this->command . ' # name="' . $this->id . '" ' . $this->comment; + return $this->id === '' || $this->command === '' + ? '' + : $this->interval . ' ' . $this->command . ' # name="' . $this->id . '" ' . $this->comment; } /** diff --git a/tests/Uri/ArgumentTest.php b/tests/Uri/ArgumentTest.php index 56433fdd3..6b658ca65 100644 --- a/tests/Uri/ArgumentTest.php +++ b/tests/Uri/ArgumentTest.php @@ -70,9 +70,9 @@ final class ArgumentTest extends \PHPUnit\Framework\TestCase $obj = new Argument(':modules/admin/test/path.php ?para1=abc ?para2=2 #frag'); self::assertEquals(':modules/admin/test/path.php', $obj->getPath()); - self::assertEquals('modules', $obj->getPathElement(0)); + self::assertEquals(':modules', $obj->getPathElement(0)); self::assertEquals( - ['modules', 'admin', 'test', 'path'], + [':modules', 'admin', 'test', 'path'], $obj->getPathElements() ); } @@ -184,7 +184,7 @@ final class ArgumentTest extends \PHPUnit\Framework\TestCase $obj = new Argument(':modules/admin/test/path.php ?para1=abc ?para2=2 #frag'); self::assertEquals('?para1=abc ?para2=2 #frag', $obj->getQuery()); - self::assertEquals(['para1' => 'abc', 'para2' => '2'], $obj->getQueryArray()); + self::assertEquals(['?para1=abc', '?para2=2', '#frag'], $obj->getQueryArray()); self::assertEquals('2', $obj->getQuery('para2')); }