Include max date in error msg for date.between

getkirby · Nov 4, 2023 · 07cd602 · 07cd602
1 parent 977cd5e
commit 07cd602
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/config/fields/date.php b/config/fields/date.php
@@ -129,7 +129,7 @@
 					'key' => 'validation.date.between',
 					'data' => [
 						'min' => $min->format($format),
-						'max' => $min->format($format)
+						'max' => $max->format($format)
 					]
 				]);
 			} elseif ($min && $value->isMin($min) === false) {

diff --git a/tests/Form/Fields/DateFieldTest.php b/tests/Form/Fields/DateFieldTest.php
@@ -80,6 +80,24 @@ public function testMinMax()
 		$field->validate();
 		$this->assertFalse($field->isValid());
 		$this->assertTrue($field->isInvalid());
+		$this->assertSame([
+			'minMax' => 'Please enter a date between 01.10.2020 and 02.10.2020',
+		], $field->errors());
+
+		// min & max failed (with time)
+		$field = $this->field('date', [
+			'time'  => true,
+			'min'   => '2020-10-01 10:04',
+			'max'   => '2020-10-02 08:15',
+			'value' => '2020-10-03 12:34'
+		]);
+
+		$field->validate();
+		$this->assertFalse($field->isValid());
+		$this->assertTrue($field->isInvalid());
+		$this->assertSame([
+			'minMax' => 'Please enter a date between 01.10.2020 10:04 and 02.10.2020 08:15',
+		], $field->errors());
 
 		// min failed
 		$field = $this->field('date', [
@@ -90,16 +108,22 @@ public function testMinMax()
 		$field->validate();
 		$this->assertFalse($field->isValid());
 		$this->assertTrue($field->isInvalid());
+		$this->assertSame([
+			'minMax' => 'Please enter a date after 01.10.2020',
+		], $field->errors());
 
 		// max failed
 		$field = $this->field('date', [
-			'value' => '2020-11-10',
-			'max'   => '2020-10-31'
+			'max'   => '2020-10-31',
+			'value' => '2020-11-10'
 		]);
 
 		$field->validate();
 		$this->assertFalse($field->isValid());
 		$this->assertTrue($field->isInvalid());
+		$this->assertSame([
+			'minMax' => 'Please enter a date before 31.10.2020',
+		], $field->errors());
 	}
 
 	public function valueProvider()