From 7ef0d56868ba106660df29f904a11f7d2be9ea31 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Mon, 11 Mar 2019 23:56:08 +0100 Subject: [PATCH] FormsExtension: uses configuration Schema --- composer.json | 3 +++ src/Bridges/FormsDI/FormsExtension.php | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index faf6ca9f7..586c63dad 100644 --- 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 index 1b37fd878..56434e672 100644 --- 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)) {