Commit f283e9b

committed

fix: unify the logged output of the task result

1 parent ec717c4 commit f283e9bCopy full SHA for f283e9b

File tree

+29

-6

lines changed

+29

-6

lines changed

Lines changed: 21 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,9 @@ class TaskLog`
`41`	`41`	`public function __construct(array $data)`
`42`	`42`	`{`
`43`	`43`	`foreach ($data as $key => $value) {`
`44`		`- if (property_exists($this, $key)) {`
	`44`	`+ if ($key === 'output') {`
	`45`	`+ $this->output = $this->setOutput($value);`
	`46`	`+ } elseif (property_exists($this, $key)) {`
`45`	`47`	`$this->{$key} = $value;`
`46`	`48`	`}`
`47`	`49`	`}`
`@@ -68,4 +70,22 @@ public function __get(string $key)`
`68`	`70`	`return $this->{$key};`
`69`	`71`	`}`
`70`	`72`	`}`
	`73`	`+`
	`74`	`+ /**`
	`75`	`+ * Unify output to string.`
	`76`	`+ *`
	`77`	`+ * @param array\|bool\|int\|string\|null $value`
	`78`	`+ */`
	`79`	`+ protected function setOutput($value): ?string`
	`80`	`+ {`
	`81`	`+ if (is_string($value) \|\| $value === null) {`
	`82`	`+ return $value;`
	`83`	`+ }`
	`84`	`+`
	`85`	`+ if (is_array($value)) {`
	`86`	`+ return implode(PHP_EOL, $value);`
	`87`	`+ }`
	`88`	`+`
	`89`	`+ return (string) $value;`
	`90`	`+ }`
`71`	`91`	`}`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,35 +28,38 @@ public static function provideDuration(): iterable`
`28`	`28`	`'2021年01月21日 12:00:00',`
`29`	`29`	`'2021年01月21日 12:00:00',`
`30`	`30`	`'0.00',`
	`31`	`+ ['first item', 'second item'],`
`31`	`32`	`],`
`32`	`33`	`[`
`33`	`34`	`'2021年01月21日 12:00:00',`
`34`	`35`	`'2021年01月21日 12:00:01',`
`35`	`36`	`'1.00',`
	`37`	`+ true,`
`36`	`38`	`],`
`37`	`39`	`[`
`38`	`40`	`'2021年01月21日 12:00:00',`
`39`	`41`	`'2021年01月21日 12:05:12',`
`40`	`42`	`'312.00',`
	`43`	`+ null,`
`41`	`44`	`],`
`42`	`45`	`];`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`/**`
`46`	`49`	`* @dataProvider provideDuration`
`47`	`50`	`*`
`48`		`- * @param mixed $start`
`49`		`- * @param mixed $end`
`50`		`- * @param mixed $expected`
	`51`	`+ * @param array\|bool\|int\|string\|null $output`
	`52`	`+ *`
	`53`	`+ * @throws Exception`
`51`	`54`	`*/`
`52`		`- public function testDuration($start, $end, $expected)`
	`55`	`+ public function testDuration(string$start, string$end, string$expected, $output)`
`53`	`56`	`{`
`54`	`57`	`$start = new Time($start);`
`55`	`58`	`$end = new Time($end);`
`56`	`59`
`57`	`60`	`$log = new TaskLog([`
`58`	`61`	`'task' => new Task('closure', static function () {}),`
`59`		`- 'output' => '',`
	`62`	`+ 'output' => $output,`
`60`	`63`	`'runStart' => $start,`
`61`	`64`	`'runEnd' => $end,`
`62`	`65`	`'error' => null,`

Comments

(0)