Merge branch '5.1' into 5.2

nicolas-grekas · nicolas-grekas · commit b8de1a80d274 · 2020-12-08T18:03:37.000+01:00
* 5.1:
  Update .php_cs.dist
  Apply "visibility_required" CS rule to constants
diff --git a/AbstractRendererEngine.php b/AbstractRendererEngine.php
@@ -21,7 +21,7 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
     /**
      * The variable in {@link FormView} used as cache key.
      */
-    const CACHE_KEY_VAR = 'cache_key';
+    public const CACHE_KEY_VAR = 'cache_key';
 
     protected $defaultThemes;
     protected $themes = [];
diff --git a/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php b/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
@@ -22,13 +22,13 @@
  */
 class DateIntervalToArrayTransformer implements DataTransformerInterface
 {
-    const YEARS = 'years';
-    const MONTHS = 'months';
-    const DAYS = 'days';
-    const HOURS = 'hours';
-    const MINUTES = 'minutes';
-    const SECONDS = 'seconds';
-    const INVERT = 'invert';
+    public const YEARS = 'years';
+    public const MONTHS = 'months';
+    public const DAYS = 'days';
+    public const HOURS = 'hours';
+    public const MINUTES = 'minutes';
+    public const SECONDS = 'seconds';
+    public const INVERT = 'invert';
 
     private static $availableFields = [
         self::YEARS => 'y',
diff --git a/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php b/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php
@@ -20,7 +20,7 @@
  */
 class DateTimeToHtml5LocalDateTimeTransformer extends BaseDateTimeTransformer
 {
-    const HTML5_FORMAT = 'Y-m-d\\TH:i:s';
+    public const HTML5_FORMAT = 'Y-m-d\\TH:i:s';
 
     /**
      * Transforms a \DateTime into a local date and time string.
diff --git a/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -26,37 +26,37 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
     /**
      * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_CEILING instead.
      */
-    const ROUND_CEILING = \NumberFormatter::ROUND_CEILING;
+    public const ROUND_CEILING = \NumberFormatter::ROUND_CEILING;
 
     /**
      * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_FLOOR instead.
      */
-    const ROUND_FLOOR = \NumberFormatter::ROUND_FLOOR;
+    public const ROUND_FLOOR = \NumberFormatter::ROUND_FLOOR;
 
     /**
      * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_UP instead.
      */
-    const ROUND_UP = \NumberFormatter::ROUND_UP;
+    public const ROUND_UP = \NumberFormatter::ROUND_UP;
 
     /**
      * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_DOWN instead.
      */
-    const ROUND_DOWN = \NumberFormatter::ROUND_DOWN;
+    public const ROUND_DOWN = \NumberFormatter::ROUND_DOWN;
 
     /**
      * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_HALFEVEN instead.
      */
-    const ROUND_HALF_EVEN = \NumberFormatter::ROUND_HALFEVEN;
+    public const ROUND_HALF_EVEN = \NumberFormatter::ROUND_HALFEVEN;
 
     /**
      * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_HALFUP instead.
      */
-    const ROUND_HALF_UP = \NumberFormatter::ROUND_HALFUP;
+    public const ROUND_HALF_UP = \NumberFormatter::ROUND_HALFUP;
 
     /**
      * @deprecated since Symfony 5.1, use \NumberFormatter::ROUND_HALFDOWN instead.
      */
-    const ROUND_HALF_DOWN = \NumberFormatter::ROUND_HALFDOWN;
+    public const ROUND_HALF_DOWN = \NumberFormatter::ROUND_HALFDOWN;
 
     protected $grouping;
 
diff --git a/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -23,8 +23,8 @@
  */
 class PercentToLocalizedStringTransformer implements DataTransformerInterface
 {
-    const FRACTIONAL = 'fractional';
-    const INTEGER = 'integer';
+    public const FRACTIONAL = 'fractional';
+    public const INTEGER = 'integer';
 
     protected static $types = [
         self::FRACTIONAL,
diff --git a/Extension/Core/Type/DateTimeType.php b/Extension/Core/Type/DateTimeType.php
@@ -31,14 +31,14 @@
 
 class DateTimeType extends AbstractType
 {
-    const DEFAULT_DATE_FORMAT = \IntlDateFormatter::MEDIUM;
-    const DEFAULT_TIME_FORMAT = \IntlDateFormatter::MEDIUM;
+    public const DEFAULT_DATE_FORMAT = \IntlDateFormatter::MEDIUM;
+    public const DEFAULT_TIME_FORMAT = \IntlDateFormatter::MEDIUM;
 
     /**
      * The HTML5 datetime-local format as defined in
      * http://w3c.github.io/html-reference/datatypes.html#form.data.datetime-local.
      */
-    const HTML5_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
+    public const HTML5_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
 
     private static $acceptedFormats = [
         \IntlDateFormatter::FULL,
diff --git a/Extension/Core/Type/DateType.php b/Extension/Core/Type/DateType.php
@@ -28,8 +28,8 @@
 
 class DateType extends AbstractType
 {
-    const DEFAULT_FORMAT = \IntlDateFormatter::MEDIUM;
-    const HTML5_FORMAT = 'yyyy-MM-dd';
+    public const DEFAULT_FORMAT = \IntlDateFormatter::MEDIUM;
+    public const HTML5_FORMAT = 'yyyy-MM-dd';
 
     private static $acceptedFormats = [
         \IntlDateFormatter::FULL,
diff --git a/Extension/Core/Type/FileType.php b/Extension/Core/Type/FileType.php
@@ -24,8 +24,8 @@
 
 class FileType extends AbstractType
 {
-    const KIB_BYTES = 1024;
-    const MIB_BYTES = 1048576;
+    public const KIB_BYTES = 1024;
+    public const MIB_BYTES = 1048576;
 
     private static $suffixes = [
         1 => 'bytes',
diff --git a/Extension/Validator/Constraints/Form.php b/Extension/Validator/Constraints/Form.php
@@ -18,8 +18,8 @@
  */
 class Form extends Constraint
 {
-    const NOT_SYNCHRONIZED_ERROR = '1dafa156-89e1-4736-b832-419c2e501fca';
-    const NO_SUCH_FIELD_ERROR = '6e5212ed-a197-4339-99aa-5654798a4854';
+    public const NOT_SYNCHRONIZED_ERROR = '1dafa156-89e1-4736-b832-419c2e501fca';
+    public const NO_SUCH_FIELD_ERROR = '6e5212ed-a197-4339-99aa-5654798a4854';
 
     protected static $errorNames = [
         self::NOT_SYNCHRONIZED_ERROR => 'NOT_SYNCHRONIZED_ERROR',
diff --git a/FormErrorIterator.php b/FormErrorIterator.php
@@ -33,7 +33,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
     /**
      * The prefix used for indenting nested error messages.
      */
-    const INDENTATION = '    ';
+    public const INDENTATION = '    ';
 
     private $form;
     private $errors;
diff --git a/FormEvents.php b/FormEvents.php
@@ -37,7 +37,7 @@ final class FormEvents
      *
      * @Event("Symfony\Component\Form\Event\PreSubmitEvent")
      */
-    const PRE_SUBMIT = 'form.pre_submit';
+    public const PRE_SUBMIT = 'form.pre_submit';
 
     /**
      * The SUBMIT event is dispatched after the Form::submit() method
@@ -56,7 +56,7 @@ final class FormEvents
      *
      * @Event("Symfony\Component\Form\Event\SubmitEvent")
      */
-    const SUBMIT = 'form.submit';
+    public const SUBMIT = 'form.submit';
 
     /**
      * The FormEvents::POST_SUBMIT event is dispatched at the very end of the Form::submit().
@@ -71,7 +71,7 @@ final class FormEvents
      *
      * @Event("Symfony\Component\Form\Event\PostSubmitEvent")
      */
-    const POST_SUBMIT = 'form.post_submit';
+    public const POST_SUBMIT = 'form.post_submit';
 
     /**
      * The FormEvents::PRE_SET_DATA event is dispatched at the beginning of the Form::setData() method.
@@ -82,7 +82,7 @@ final class FormEvents
      *
      * @Event("Symfony\Component\Form\Event\PreSetDataEvent")
      */
-    const PRE_SET_DATA = 'form.pre_set_data';
+    public const PRE_SET_DATA = 'form.pre_set_data';
 
     /**
      * The FormEvents::POST_SET_DATA event is dispatched at the end of the Form::setData() method.
@@ -92,14 +92,14 @@ final class FormEvents
      *
      * @Event("Symfony\Component\Form\Event\PostSetDataEvent")
      */
-    const POST_SET_DATA = 'form.post_set_data';
+    public const POST_SET_DATA = 'form.post_set_data';
 
     /**
      * Event aliases.
      *
      * These aliases can be consumed by RegisterListenersPass.
      */
-    const ALIASES = [
+    public const ALIASES = [
         PreSubmitEvent::class => self::PRE_SUBMIT,
         SubmitEvent::class => self::SUBMIT,
         PostSubmitEvent::class => self::POST_SUBMIT,
diff --git a/FormRenderer.php b/FormRenderer.php
@@ -23,7 +23,7 @@
  */
 class FormRenderer implements FormRendererInterface
 {
-    const CACHE_KEY_VAR = 'unique_block_prefix';
+    public const CACHE_KEY_VAR = 'unique_block_prefix';
 
     private $engine;
     private $csrfTokenManager;
diff --git a/Guess/Guess.php b/Guess/Guess.php
@@ -27,22 +27,22 @@ abstract class Guess
     /**
      * Marks an instance with a value that is extremely likely to be correct.
      */
-    const VERY_HIGH_CONFIDENCE = 3;
+    public const VERY_HIGH_CONFIDENCE = 3;
 
     /**
      * Marks an instance with a value that is very likely to be correct.
      */
-    const HIGH_CONFIDENCE = 2;
+    public const HIGH_CONFIDENCE = 2;
 
     /**
      * Marks an instance with a value that is likely to be correct.
      */
-    const MEDIUM_CONFIDENCE = 1;
+    public const MEDIUM_CONFIDENCE = 1;
 
     /**
      * Marks an instance with a value that may be correct.
      */
-    const LOW_CONFIDENCE = 0;
+    public const LOW_CONFIDENCE = 0;
 
     /**
      * The confidence about the correctness of the value.
diff --git a/Tests/Extension/Core/Type/BaseTypeTest.php b/Tests/Extension/Core/Type/BaseTypeTest.php
@@ -21,7 +21,7 @@ abstract class BaseTypeTest extends TypeTestCase
 {
     use VersionAwareTest;
 
-    const TESTED_TYPE = '';
+    public const TESTED_TYPE = '';
 
     public function testPassDisabledAsOption()
     {
diff --git a/Tests/Extension/Core/Type/BirthdayTypeTest.php b/Tests/Extension/Core/Type/BirthdayTypeTest.php
@@ -16,7 +16,7 @@
  */
 class BirthdayTypeTest extends DateTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\BirthdayType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\BirthdayType';
 
     public function testSetInvalidYearsOption()
     {
diff --git a/Tests/Extension/Core/Type/ButtonTypeTest.php b/Tests/Extension/Core/Type/ButtonTypeTest.php
@@ -16,7 +16,7 @@
  */
 class ButtonTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ButtonType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ButtonType';
 
     public function testCreateButtonInstances()
     {
diff --git a/Tests/Extension/Core/Type/CheckboxTypeTest.php b/Tests/Extension/Core/Type/CheckboxTypeTest.php
@@ -15,7 +15,7 @@
 
 class CheckboxTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CheckboxType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CheckboxType';
 
     public function testDataIsFalseByDefault()
     {
diff --git a/Tests/Extension/Core/Type/ChoiceTypeTest.php b/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -22,7 +22,7 @@ class ChoiceTypeTest extends BaseTypeTest
 {
     use ExpectDeprecationTrait;
 
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ChoiceType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ChoiceType';
 
     private $choices = [
         'Bernhard' => 'a',
diff --git a/Tests/Extension/Core/Type/CollectionTypeTest.php b/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -17,7 +17,7 @@
 
 class CollectionTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CollectionType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CollectionType';
 
     public function testContainsNoChildByDefault()
     {
diff --git a/Tests/Extension/Core/Type/ColorTypeTest.php b/Tests/Extension/Core/Type/ColorTypeTest.php
@@ -16,7 +16,7 @@
 
 final class ColorTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = ColorType::class;
+    public const TESTED_TYPE = ColorType::class;
 
     /**
      * @dataProvider validationShouldPassProvider
diff --git a/Tests/Extension/Core/Type/CountryTypeTest.php b/Tests/Extension/Core/Type/CountryTypeTest.php
@@ -16,7 +16,7 @@
 
 class CountryTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CountryType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CountryType';
 
     protected function setUp(): void
     {
diff --git a/Tests/Extension/Core/Type/CurrencyTypeTest.php b/Tests/Extension/Core/Type/CurrencyTypeTest.php
@@ -16,7 +16,7 @@
 
 class CurrencyTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CurrencyType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CurrencyType';
 
     protected function setUp(): void
     {
diff --git a/Tests/Extension/Core/Type/DateIntervalTypeTest.php b/Tests/Extension/Core/Type/DateIntervalTypeTest.php
@@ -17,7 +17,7 @@
 
 class DateIntervalTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = DateIntervalType::class;
+    public const TESTED_TYPE = DateIntervalType::class;
 
     public function testSubmitDateInterval()
     {
diff --git a/Tests/Extension/Core/Type/DateTimeTypeTest.php b/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -16,7 +16,7 @@
 
 class DateTimeTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateTimeType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateTimeType';
 
     protected function setUp(): void
     {
diff --git a/Tests/Extension/Core/Type/DateTypeTest.php b/Tests/Extension/Core/Type/DateTypeTest.php
@@ -18,7 +18,7 @@
 
 class DateTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateType';
 
     private $defaultTimezone;
     private $defaultLocale;
diff --git a/Tests/Extension/Core/Type/FileTypeTest.php b/Tests/Extension/Core/Type/FileTypeTest.php
@@ -21,7 +21,7 @@
 
 class FileTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FileType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FileType';
 
     protected function getExtensions()
     {
diff --git a/Tests/Extension/Core/Type/FormTypeTest.php b/Tests/Extension/Core/Type/FormTypeTest.php
@@ -59,7 +59,7 @@ public function setReferenceCopy($reference)
 
 class FormTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FormType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FormType';
 
     public function testCreateFormInstances()
     {
diff --git a/Tests/Extension/Core/Type/IntegerTypeTest.php b/Tests/Extension/Core/Type/IntegerTypeTest.php
@@ -15,7 +15,7 @@
 
 class IntegerTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\IntegerType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\IntegerType';
 
     protected function setUp(): void
     {
diff --git a/Tests/Extension/Core/Type/LanguageTypeTest.php b/Tests/Extension/Core/Type/LanguageTypeTest.php
@@ -17,7 +17,7 @@
 
 class LanguageTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\LanguageType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\LanguageType';
 
     protected function setUp(): void
     {
diff --git a/Tests/Extension/Core/Type/LocaleTypeTest.php b/Tests/Extension/Core/Type/LocaleTypeTest.php
@@ -16,7 +16,7 @@
 
 class LocaleTypeTest extends BaseTypeTest
 {
-    const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\LocaleType';
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\LocaleType';
 
     protected function setUp(): void
     {
diff --git a/Tests/Extension/Core/Type/MoneyTypeTest.php b/Tests/Extension/Core/Type/MoneyTypeTest.php
diff --git a/Tests/Extension/Core/Type/NumberTypeTest.php b/Tests/Extension/Core/Type/NumberTypeTest.php
diff --git a/Tests/Extension/Core/Type/PasswordTypeTest.php b/Tests/Extension/Core/Type/PasswordTypeTest.php
diff --git a/Tests/Extension/Core/Type/PercentTypeTest.php b/Tests/Extension/Core/Type/PercentTypeTest.php
diff --git a/Tests/Extension/Core/Type/RepeatedTypeTest.php b/Tests/Extension/Core/Type/RepeatedTypeTest.php
diff --git a/Tests/Extension/Core/Type/SubmitTypeTest.php b/Tests/Extension/Core/Type/SubmitTypeTest.php
diff --git a/Tests/Extension/Core/Type/TextTypeTest.php b/Tests/Extension/Core/Type/TextTypeTest.php
diff --git a/Tests/Extension/Core/Type/TimeTypeTest.php b/Tests/Extension/Core/Type/TimeTypeTest.php
diff --git a/Tests/Extension/Core/Type/TimezoneTypeTest.php b/Tests/Extension/Core/Type/TimezoneTypeTest.php
diff --git a/Tests/Extension/Core/Type/UrlTypeTest.php b/Tests/Extension/Core/Type/UrlTypeTest.php
diff --git a/Tests/Extension/Core/Type/WeekTypeTest.php b/Tests/Extension/Core/Type/WeekTypeTest.php
diff --git a/Tests/Extension/Validator/ValidatorTypeGuesserTest.php b/Tests/Extension/Validator/ValidatorTypeGuesserTest.php

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class DateTimeToHtml5LocalDateTimeTransformer extends BaseDateTimeTransformer`
`22`	`22`	`{`
`23`		`- const HTML5_FORMAT = 'Y-m-d\\TH:i:s';`
	`23`	`+ public const HTML5_FORMAT = 'Y-m-d\\TH:i:s';`
`24`	`24`
`25`	`25`	`/**`
`26`	`26`	`* Transforms a \DateTime into a local date and time string.`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@`
`28`	`28`
`29`	`29`	`class DateType extends AbstractType`
`30`	`30`	`{`
`31`		`- const DEFAULT_FORMAT = \IntlDateFormatter::MEDIUM;`
`32`		`- const HTML5_FORMAT = 'yyyy-MM-dd';`
	`31`	`+ public const DEFAULT_FORMAT = \IntlDateFormatter::MEDIUM;`
	`32`	`+ public const HTML5_FORMAT = 'yyyy-MM-dd';`
`33`	`33`
`34`	`34`	`private static $acceptedFormats = [`
`35`	`35`	`\IntlDateFormatter::FULL,`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`
`25`	`25`	`class FileType extends AbstractType`
`26`	`26`	`{`
`27`		`- const KIB_BYTES = 1024;`
`28`		`- const MIB_BYTES = 1048576;`
	`27`	`+ public const KIB_BYTES = 1024;`
	`28`	`+ public const MIB_BYTES = 1048576;`
`29`	`29`
`30`	`30`	`private static $suffixes = [`
`31`	`31`	`1 => 'bytes',`