FormsExtension: uses configuration Schema

nette · Apr 9, 2019 · 7ef0d56 · 7ef0d56
1 parent c30df77
commit 7ef0d56
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -26,6 +26,9 @@
 		"latte/latte": "^2.4.1",
 		"tracy/tracy": "^2.4"
 	},
+	"conflict": {
+		"nette/di": "<3.0-stable"
+	},
 	"autoload": {
 		"classmap": ["src/"]
 	},

diff --git a/src/Bridges/FormsDI/FormsExtension.php b/src/Bridges/FormsDI/FormsExtension.php
@@ -17,17 +17,20 @@
  */
 class FormsExtension extends Nette\DI\CompilerExtension
 {
-	private $defaults = [
-		'messages' => [],
-	];
+	public function __construct()
+	{
+		$this->config = new class {
+			/** @var string[] */
+			public $messages = [];
+		};
+	}
 
 
 	public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	{
 		$initialize = $class->getMethod('initialize');
-		$config = $this->validateConfig($this->defaults);
 
-		foreach ((array) $config['messages'] as $name => $text) {
+		foreach ($this->config->messages as $name => $text) {
 			if (defined('Nette\Forms\Form::' . $name)) {
 				$initialize->addBody('Nette\Forms\Validator::$messages[Nette\Forms\Form::?] = ?;', [$name, $text]);
 			} elseif (defined($name)) {