Merge pull request #35 from peckadesign/pdp-3110-nette3

Dopredne upravy pro nette 3.0
peckadesign · Dec 11, 2020 · fd3e426 · fd3e426
2 parents a5e8bbd + bdb8566
commit fd3e426
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -20,11 +20,11 @@
 	"require": {
 		"php": "^7.1",
 		"ext-json": "*",
-		"nette/application": "~2.4",
-		"nette/forms": "~2.4",
-		"contributte/recaptcha": "3.1.*",
-		"nette/di": "~2.4",
-		"nette/utils": "~2.4",
+		"nette/application": "~2.4|~3.0.0",
+		"nette/forms": "~2.4|~3.0.0",
+		"contributte/recaptcha": "3.1.* | 3.2.*",
+		"nette/di": "~2.4|~3.0.0",
+		"nette/utils": "~2.4|~3.0.0",
 		"pd/utils": "^1.0"
 	},
 	"require-dev": {

diff --git a/tests/Unit/Forms/RuleOptionsFactoryTest.php b/tests/Unit/Forms/RuleOptionsFactoryTest.php
@@ -37,11 +37,20 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
-		$translator = new class() implements \Nette\Localization\ITranslator {
-			public function translate($message, $count = NULL)
-			{
-			}
-		};
+		if (\interface_exists(\Nette\Schema\Schema::class)) { //nette 3.0
+			$translator = new class() implements \Nette\Localization\ITranslator {
+				function translate($message, ...$parameters): string
+				{
+					return '';
+				}
+			};
+		} else {
+			$translator = new class() implements \Nette\Localization\ITranslator {
+				public function translate($message, $count = NULL)
+				{
+				}
+			};
+		}
 
 		$this->ruleOptionsFactory = new \Pd\Forms\RuleOptionsFactory($translator);
 	}

diff --git a/tests/Unit/Forms/RuleOptionsTest.php b/tests/Unit/Forms/RuleOptionsTest.php
@@ -127,12 +127,23 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
-		$translator = new class() implements \Nette\Localization\ITranslator {
-			public function translate($message, $count = NULL)
-			{
-				return $message;
-			}
-		};
+		if (\interface_exists(\Nette\Schema\Schema::class)) { //nette 3.0
+			$translator = new class() implements \Nette\Localization\ITranslator {
+				function translate($message, ...$parameters): string
+				{
+					return $message;
+				}
+			};
+		} else {
+			$translator = new class() implements \Nette\Localization\ITranslator {
+				public function translate($message, $count = NULL)
+				{
+					return $message;
+				}
+			};
+		}
+
+
 
 		$this->ruleOptionsFactory = new \Pd\Forms\RuleOptionsFactory($translator);