Fixed compatibility with Nette 2.4.0

nella · Jul 8, 2016 · d3890aa · d3890aa
1 parent f9b1cad
commit d3890aa
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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());
 	}
 
 	/**