diff --git a/src/View/Helper/CrudViewHelper.php b/src/View/Helper/CrudViewHelper.php index 6bcbe73e..7b537d79 100644 --- a/src/View/Helper/CrudViewHelper.php +++ b/src/View/Helper/CrudViewHelper.php @@ -231,7 +231,7 @@ public function formatTime(string $field, $value, array $options): string if ($value === null) { return $this->Html->badge(__d('crud', 'N/A'), ['class' => 'info']); } - $format = $options['format'] ?? null; + $format = $options['format'] ?? 'KK:mm:ss a'; /** @psalm-suppress ArgumentTypeCoercion */ if ( @@ -239,7 +239,7 @@ public function formatTime(string $field, $value, array $options): string || is_string($value) || $value instanceof DateTimeInterface ) { - return $this->Time->nice($value, $format); + return (string)$this->Time->format($value, $format); } return $this->Html->badge(__d('crud', 'N/A'), ['class' => 'info']); diff --git a/tests/TestCase/View/Helper/CrudViewHelperTest.php b/tests/TestCase/View/Helper/CrudViewHelperTest.php index 70998e9a..bb7427a8 100644 --- a/tests/TestCase/View/Helper/CrudViewHelperTest.php +++ b/tests/TestCase/View/Helper/CrudViewHelperTest.php @@ -17,7 +17,7 @@ class CrudViewHelperTest extends TestCase /** * Helper to be tested * - * @var \Cake\View\Helper\CrudViewHelper + * @var \Crud\View\Helper\CrudViewHelper */ public $CrudView; @@ -70,7 +70,7 @@ public function testIntrospect() 'datetime' => 'formatTime', ]); $result = $this->CrudView->introspect('created', $value); - $this->assertEquals($this->CrudView->Time->nice($value), $result); + $this->assertEquals($this->CrudView->Time->format($value, 'KK:mm:ss a'), $result); $this->CrudView->setConfig('fieldFormatters', [ 'datetime' => function () {