From d3890aadfcb7ce63b5ca7ab301708926fbe46ebe Mon Sep 17 00:00:00 2001
From: Jaroslav Hanslik <kukulich@kukulich.cz>
Date: Fri, 8 Jul 2016 22:24:17 +0200
Subject: [PATCH] Fixed compatibility with Nette 2.4.0

---
 src/Nella/Forms/DateTime/DateInput.php         |  4 ++--
 src/Nella/Forms/DateTime/DateTimeInput.php     |  2 +-
 tests/Nella/Forms/DateTime/DateInputTest.phpt  | 18 +++++++++++++++++-
 .../Forms/DateTime/DateTimeInputTest.phpt      | 18 +++++++++++++++++-
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/Nella/Forms/DateTime/DateInput.php b/src/Nella/Forms/DateTime/DateInput.php
index 89caf87..2c8652a 100644
--- a/src/Nella/Forms/DateTime/DateInput.php
+++ b/src/Nella/Forms/DateTime/DateInput.php
@@ -169,12 +169,12 @@ private function normalizeFormat($input)
 	}
 
 	/**
-	 * @param string $message
+	 * @param string|bool $message
 	 * @return \Nella\Forms\DateTime\DateInput
 	 */
 	public function setRequired($message = TRUE)
 	{
-		if (!is_string($message)) {
+		if (!is_bool($message) && !is_string($message)) {
 			throw new \Nette\InvalidArgumentException('Message must be string');
 		}
 
diff --git a/src/Nella/Forms/DateTime/DateTimeInput.php b/src/Nella/Forms/DateTime/DateTimeInput.php
index 5e23a66..80ac4e6 100644
--- a/src/Nella/Forms/DateTime/DateTimeInput.php
+++ b/src/Nella/Forms/DateTime/DateTimeInput.php
@@ -322,7 +322,7 @@ private function normalizeFormat($input)
 	 */
 	public function setRequired($message = TRUE)
 	{
-		if (!is_string($message)) {
+		if (!is_bool($message) && !is_string($message)) {
 			throw new \Nette\InvalidArgumentException('Message must be string');
 		}
 
diff --git a/tests/Nella/Forms/DateTime/DateInputTest.phpt b/tests/Nella/Forms/DateTime/DateInputTest.phpt
index 021a2c6..91a1dc7 100644
--- a/tests/Nella/Forms/DateTime/DateInputTest.phpt
+++ b/tests/Nella/Forms/DateTime/DateInputTest.phpt
@@ -257,7 +257,23 @@ class DateInputTest extends \Tester\TestCase
 	{
 		$control = $this->createControl();
 
-		$control->setRequired();
+		$control->setRequired([]);
+	}
+
+	public function testRequired()
+	{
+		$control = $this->createControl();
+
+		$control->setRequired(TRUE);
+		Assert::true($control->isRequired());
+	}
+
+	public function testOptional()
+	{
+		$control = $this->createControl();
+
+		$control->setRequired(FALSE);
+		Assert::false($control->isRequired());
 	}
 
 	/**
diff --git a/tests/Nella/Forms/DateTime/DateTimeInputTest.phpt b/tests/Nella/Forms/DateTime/DateTimeInputTest.phpt
index 10a671d..716cf98 100644
--- a/tests/Nella/Forms/DateTime/DateTimeInputTest.phpt
+++ b/tests/Nella/Forms/DateTime/DateTimeInputTest.phpt
@@ -503,7 +503,23 @@ class DateTimeInputTest extends \Tester\TestCase
 	{
 		$control = $this->createControl();
 
-		$control->setRequired();
+		$control->setRequired([]);
+	}
+
+	public function testRequired()
+	{
+		$control = $this->createControl();
+
+		$control->setRequired(TRUE);
+		Assert::true($control->isRequired());
+	}
+
+	public function testOptional()
+	{
+		$control = $this->createControl();
+
+		$control->setRequired(FALSE);
+		Assert::false($control->isRequired());
 	}
 
 	/**