Merge pull request #6 from jinovak/nette-compatibility

Compatibility with Nette 2.4

.travis.yml

@@ -8,6 +8,8 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - 7.1
   - hhvm
 
 matrix:

src/IPub/FormDateTime/Controls/BaseControl.php

@@ -287,7 +287,7 @@ public function getControl()
 		$this->template->showCancelButton	= $this->cancelButton ? TRUE : FALSE;
 
 		return FormDateTime\Utils\Html::el()
-			->add($this->template);
+			->insert(NULL, $this->template);
 	}
 
 	/**

src/IPub/FormDateTime/Controls/Date.php

@@ -20,7 +20,6 @@
 
 use IPub;
 use IPub\FormDateTime;
-use Tracy\Debugger;
 
 class Date extends BaseControl
 {
@@ -324,9 +323,9 @@ public function getControlPart()
 
 		if ($key === static::FIELD_NAME_DATE) {
 			if (method_exists('Nette\Forms\Helpers', 'exportRules')) {
-				$exportedRules = Forms\Helpers::exportRules($this->rules);
+				$exportedRules = Forms\Helpers::exportRules($this->getRules());
 			} else {
-				$exportedRules = self::exportRules($this->rules);
+				$exportedRules = self::exportRules($this->getRules());
 			}
 
 			$control = Utils\Html::el('input');

src/IPub/FormDateTime/Controls/DateTime.php

@@ -136,9 +136,9 @@ public function getControlPart()
 
 		if ($key === static::FIELD_NAME_TIME) {
 			if (method_exists('Nette\Forms\Helpers', 'exportRules')) {
-				$exportedRules = Forms\Helpers::exportRules($this->rules);
+				$exportedRules = Forms\Helpers::exportRules($this->getRules());
 			} else {
-				$exportedRules = self::exportRules($this->rules);
+				$exportedRules = self::exportRules($this->getRules());
 			}
 
 			$control = Utils\Html::el('input');

src/IPub/FormDateTime/Controls/Time.php

@@ -143,9 +143,9 @@ public function getControlPart()
 
 		if ($key === static::FIELD_NAME_TIME) {
 			if (method_exists('Nette\Forms\Helpers', 'exportRules')) {
-				$exportedRules = Forms\Helpers::exportRules($this->rules);
+				$exportedRules = Forms\Helpers::exportRules($this->getRules());
 			} else {
-				$exportedRules = self::exportRules($this->rules);
+				$exportedRules = self::exportRules($this->getRules());
 			}
 
 			$control = Utils\Html::el('input');

src/IPub/FormDateTime/Utils/Html.php

@@ -17,7 +17,6 @@
 use Nette;
 use Nette\Utils;
 use Nette\Bridges;
-use Tracy\Debugger;
 
 class Html extends Utils\Html
 {
@@ -103,4 +102,4 @@ public function render($indent = NULL)
 
 		return $s;
 	}
-}
+}

tests/IPubTests/Forms/DatePicker/DateInputTest.phpt

@@ -208,4 +208,4 @@ class DateInputTest extends Tester\TestCase
 	}
 }
 
-\run(new DateInputTest());
+(new DateInputTest)->run();

tests/IPubTests/Forms/DatePicker/DateTimeInputTest.phpt

@@ -213,4 +213,4 @@ class DateTimeInputTest extends Tester\TestCase
 	}
 }
 
-\run(new DateTimeInputTest());
+(new DateTimeInputTest)->run();

tests/IPubTests/Forms/DatePicker/TimeInputTest.phpt

@@ -209,4 +209,4 @@ class TimeInputTest extends Tester\TestCase
 	}
 }
 
-\run(new TimeInputTest());
+(new TimeInputTest)->run();

tests/IPubTests/bootstrap.php

@@ -18,7 +18,3 @@
 function id($val) {
 	return $val;
 }
-
-function run(Tester\TestCase $testCase) {
-	$testCase->run(isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : NULL);
-}