Ensured dates parsing does not mask actual validation errors

This commit is contained in:
Alejandro Celaya
2019-12-06 22:38:22 +01:00
parent 30780f9c5f
commit 05a64b8d9e
4 changed files with 22 additions and 18 deletions

View File

@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Shlinkio\Shlink\Core\Model;
use Cake\Chronos\Chronos;
use DateTimeInterface;
use Shlinkio\Shlink\Core\Exception\ValidationException;
use Shlinkio\Shlink\Core\Validation\ShortUrlMetaInputFilter;
@@ -96,7 +97,7 @@ final class ShortUrlMeta
}
/**
* @param string|Chronos|null $date
* @param string|DateTimeInterface|Chronos|null $date
*/
private function parseDateField($date): ?Chronos
{
@@ -104,6 +105,10 @@ final class ShortUrlMeta
return $date;
}
if ($date instanceof DateTimeInterface) {
return Chronos::instance($date);
}
return Chronos::parse($date);
}