Repository navigation
Conversation
| return $this->parseAndRefineDateTime( | ||
| $io, | ||
| $io->ask(\sprintf('Value "%s" for field "%s" is not a valid DateTime. Please refine:', $value, $valueName), $value), | ||
| $valueName, | ||
| $timezone, | ||
| ); |
There was a problem hiding this comment.
I know this was in the original PR, but I would propose to use something like this instead (untested code!)
$io->error((\sprintf('Value "%s" for field "%s" is not a valid DateTime.', $value, $valueName));
return Command::ERROR;There was a problem hiding this comment.
Addressed and tested. Thanks for the review.
dd26444 to
6c99e23
Compare
|
@kevinpapst Please revisit and thanks |
kevinpapst
left a comment
kevinpapst
left a comment
There was a problem hiding this comment.
Thanks for owning the PR and taking over!
| $form->setDescription($description); | ||
| } | ||
|
|
||
| $timezone = $input->getOption('timezone'); |
There was a problem hiding this comment.
Timezone: is only validated if either begin or end are passed. always execute the resolveTimezone() - otherwise the user won't recognize some broken value (e.g. --timezone=foo would be silently ignored currently).
Add a try & catch and show an error + Command::FAILURE if parsing fails
There was a problem hiding this comment.
Done. The timezone is now always validated, and an invalid one fails with an error and Command::FAILURE.
| return null; | ||
| } | ||
|
|
||
| private function parseAndRefineDateTime(string $value, string $valueName, ?string $timezone = null): \DateTime |
There was a problem hiding this comment.
parseAndRefineDateTime() should be renamed to parseDateTime()
There was a problem hiding this comment.
The message still says "Started timesheet" when the record is already ended.
There was a problem hiding this comment.
Fixed. It now says "Created timesheet" when an end is set.
| if (null !== ($end = $input->getOption('end'))) { | ||
| $end = $this->parseAndRefineDateTime((string) $end, 'end', $timezone); | ||
| $form->setEnd($end); | ||
| } |
There was a problem hiding this comment.
two issues:
- end could be before begin: this is validated in Kimai, but we should catch it early here
- end could be passed without begin, which shouldn't be possible
There was a problem hiding this comment.
Both are now rejected before any API call: --end requires --begin, and end must not be earlier than begin.
Allow creating timesheet records with explicit begin/end times, and a -z/--timezone to name the IANA zone used to read them (falls back to the PHP default). Invalid zone fails cleanly without entering the refine prompt. Co-authored-by: webemerge <office@web-emerge.com> Signed-off-by: webemerge <office@web-emerge.com> Signed-off-by: Parthiban Nallathambi <parthiban@linumiz.com>
6c99e23 to
91943c7
Compare
Also fixed a phpstan level-7 error: the getEnd()?-> nullsafe call is now an explicit null check. Please revisit. |
2 participants
Allow creating timesheet records with explicit begin/end times, and a -z/--timezone to name the IANA zone used to read them (falls back to the PHP default). Invalid zone fails cleanly without entering the refine prompt.
Co-authored-by: webemerge office@web-emerge.com
Signed-off-by: webemerge office@web-emerge.com
Signed-off-by: Parthiban Nallathambi parthiban@linumiz.com