diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php index 7add269e308a..e209e34d5306 100644 --- a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php +++ b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php @@ -120,7 +120,7 @@ protected function getOptionDefinition(OptionsResolver $optionsResolver, $option 'lazy' => 'getLazyClosures', 'allowedTypes' => 'getAllowedTypes', 'allowedValues' => 'getAllowedValues', - 'normalizer' => 'getNormalizer', + 'normalizers' => 'getNormalizers', 'deprecationMessage' => 'getDeprecationMessage', ]; diff --git a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php index 18a288b444dd..62d035e0246a 100644 --- a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php +++ b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php @@ -87,7 +87,7 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio } } } - $data['has_normalizer'] = isset($definition['normalizer']); + $data['has_normalizer'] = isset($definition['normalizers']); $this->writeData($data, $options); } diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php index 176be3cd7b8d..219bd69c62c8 100644 --- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php @@ -118,7 +118,7 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio 'Default' => 'default', 'Allowed types' => 'allowedTypes', 'Allowed values' => 'allowedValues', - 'Normalizer' => 'normalizer', + 'Normalizers' => 'normalizers', ]; $rows = []; foreach ($map as $label => $name) { diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php index 71dedf67eaa4..16434073a548 100644 --- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php +++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php @@ -164,27 +164,29 @@ public function testDebugCustomFormTypeOption() Symfony\Component\Form\Tests\Command\FooType (foo) ================================================== - ---------------- -----------------------------------------------------------%s - Required true %w - ---------------- -----------------------------------------------------------%s - Default - %w - ---------------- -----------------------------------------------------------%s - Allowed types [ %w - "string" %w - ] %w - ---------------- -----------------------------------------------------------%s - Allowed values [ %w - "bar", %w - "baz" %w - ] %w - ---------------- -----------------------------------------------------------%s - Normalizer Closure(Options $options, $value) { %w - class: "Symfony\Component\Form\Tests\Command\FooType" %w - this: Symfony\Component\Form\Tests\Command\FooType { …} %w - file: "%s"%w - line: "%d to %d"%w - } %w - ---------------- -----------------------------------------------------------%s + ---------------- -----------%s + Required true %s + ---------------- -----------%s + Default - %s + ---------------- -----------%s + Allowed types [ %s + "string"%s + ] %s + ---------------- -----------%s + Allowed values [ %s + "bar", %s + "baz" %s + ] %s + ---------------- -----------%s + Normalizers [ %s + Closure(%s + class:%s + this: %s + file: %s + line: %s + } %s + ] %s + ---------------- -----------%s TXT , $tester->getDisplay(true)); diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt index 1824c46a7e5f..d02b0c02ae3a 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt @@ -2,22 +2,26 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (choice_translation_domain) ================================================================================= - ---------------- --------------------%s - Required false %s - ---------------- --------------------%s - Default true %s - ---------------- --------------------%s - Allowed types [ %s - "null", %s - "bool", %s - "string" %s - ] %s - ---------------- --------------------%s - Allowed values - %s - ---------------- --------------------%s - Normalizer Closure%s{%A - file: "%s%eExtension%eCore%eType%eChoiceType.php"%w - line: %s - } %s - ---------------- --------------------%s + ---------------- -----------%s + Required false %s + ---------------- -----------%s + Default true %s + ---------------- -----------%s + Allowed types [ %s + "null", %s + "bool", %s + "string"%s + ] %s + ---------------- -----------%s + Allowed values - %s + ---------------- -----------%s + Normalizers [ %s + Closure(%s + class:%s + this: %s + file: %s + line: %s + } %s + ] %s + ---------------- -----------%s diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/deprecated_option.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/deprecated_option.txt index 1ad6c50e4acd..e607f20b7375 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/deprecated_option.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/deprecated_option.txt @@ -14,5 +14,5 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (bar) --------------------- ----------------------------------- Allowed values - --------------------- ----------------------------------- - Normalizer - + Normalizers - --------------------- ----------------------------------- \ No newline at end of file diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt index 780a4e5cb358..b184d75a448e 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt @@ -1,4 +1,3 @@ - Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data) ==================================================================== @@ -22,6 +21,6 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data) ---------------- ----------------------%s Allowed values - %s ---------------- ----------------------%s - Normalizer - %s + Normalizers - %s ---------------- ----------------------%s diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt index ca203a285b2c..b42c10f5bd79 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt @@ -2,23 +2,27 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (foo) ============================================================= - ---------------- --------------------%s - Required true %s - ---------------- --------------------%s - Default - %s - ---------------- --------------------%s - Allowed types [ %s - "string" %s - ] %s - ---------------- --------------------%s - Allowed values [ %s - "bar", %s - "baz" %s - ] %s - ---------------- --------------------%s - Normalizer Closure%s{%A - file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"%w - line: %s - } %s - ---------------- --------------------%s + ---------------- -----------%s + Required true %s + ---------------- -----------%s + Default - %s + ---------------- -----------%s + Allowed types [ %s + "string"%s + ] %s + ---------------- -----------%s + Allowed values [ %s + "bar", %s + "baz" %s + ] %s + ---------------- -----------%s + Normalizers [ %s + Closure(%s + class:%s + this: %s + file: %s + line: %s + } %s + ] %s + ---------------- -----------%s diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index d448e77e5a7f..8e2f0989dfa4 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -19,7 +19,7 @@ "php": "^7.1.3", "symfony/event-dispatcher": "^4.3", "symfony/intl": "^4.3", - "symfony/options-resolver": "~4.2", + "symfony/options-resolver": "~4.3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0", "symfony/property-access": "~3.4|~4.0"