Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 7ca50e2324b6 · 2018-10-02T14:28:39.000+02:00
* 2.8:
  [php_cs] disable fopen_flags
  [CS] Remove unused variables passed to closures
  [CS] Remove empty comment
  [CS] Enforces null type hint on last position in phpDocs
  [CS] Use combined assignment operators when possible
  Fix a typo in error messages
  [Console] Add missing null to input values allowed types
  [PHPUnitBridge] Fix microtime() format
  bumped Symfony version to 2.8.47
  update CONTRIBUTORS for 2.8.46
  updated VERSION for 2.8.46
  updated CHANGELOG for 2.8.46
diff --git a/Button.php b/Button.php
@@ -368,7 +368,7 @@ public function handleRequest($request = null)
     /**
      * Submits data to the button.
      *
-     * @param null|string $submittedData The data
+     * @param string|null $submittedData The data
      * @param bool        $clearMissing  Not used
      *
      * @return $this
diff --git a/ChoiceList/Factory/ChoiceListFactoryInterface.php b/ChoiceList/Factory/ChoiceListFactoryInterface.php
@@ -32,7 +32,7 @@ interface ChoiceListFactoryInterface
      * argument.
      *
      * @param iterable      $choices The choices
-     * @param null|callable $value   The callable generating the choice
+     * @param callable|null $value   The callable generating the choice
      *                               values
      *
      * @return ChoiceListInterface The choice list
@@ -47,7 +47,7 @@ public function createListFromChoices($choices, $value = null);
      * argument.
      *
      * @param ChoiceLoaderInterface $loader The choice loader
-     * @param null|callable         $value  The callable generating the choice
+     * @param callable|null         $value  The callable generating the choice
      *                                      values
      *
      * @return ChoiceListInterface The choice list
@@ -81,14 +81,14 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
      * attributes that should be added to the respective choice.
      *
      * @param ChoiceListInterface $list             The choice list
-     * @param null|array|callable $preferredChoices The preferred choices
-     * @param null|callable       $label            The callable generating the
+     * @param array|callable|null $preferredChoices The preferred choices
+     * @param callable|null       $label            The callable generating the
      *                                              choice labels
-     * @param null|callable       $index            The callable generating the
+     * @param callable|null       $index            The callable generating the
      *                                              view indices
-     * @param null|callable       $groupBy          The callable generating the
+     * @param callable|null       $groupBy          The callable generating the
      *                                              group names
-     * @param null|array|callable $attr             The callable generating the
+     * @param array|callable|null $attr             The callable generating the
      *                                              HTML attributes
      *
      * @return ChoiceListView The choice list view
diff --git a/ChoiceList/Factory/PropertyAccessDecorator.php b/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -60,7 +60,7 @@ public function getDecoratedFactory()
      * {@inheritdoc}
      *
      * @param iterable                          $choices The choices
-     * @param null|callable|string|PropertyPath $value   The callable or path for
+     * @param callable|string|PropertyPath|null $value   The callable or path for
      *                                                   generating the choice values
      *
      * @return ChoiceListInterface The choice list
@@ -93,7 +93,7 @@ public function createListFromChoices($choices, $value = null)
      * {@inheritdoc}
      *
      * @param ChoiceLoaderInterface             $loader The choice loader
-     * @param null|callable|string|PropertyPath $value  The callable or path for
+     * @param callable|string|PropertyPath|null $value  The callable or path for
      *                                                  generating the choice values
      *
      * @return ChoiceListInterface The choice list
@@ -126,11 +126,11 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
      * {@inheritdoc}
      *
      * @param ChoiceListInterface                     $list             The choice list
-     * @param null|array|callable|string|PropertyPath $preferredChoices The preferred choices
-     * @param null|callable|string|PropertyPath       $label            The callable or path generating the choice labels
-     * @param null|callable|string|PropertyPath       $index            The callable or path generating the view indices
-     * @param null|callable|string|PropertyPath       $groupBy          The callable or path generating the group names
-     * @param null|array|callable|string|PropertyPath $attr             The callable or path generating the HTML attributes
+     * @param array|callable|string|PropertyPath|null $preferredChoices The preferred choices
+     * @param callable|string|PropertyPath|null       $label            The callable or path generating the choice labels
+     * @param callable|string|PropertyPath|null       $index            The callable or path generating the view indices
+     * @param callable|string|PropertyPath|null       $groupBy          The callable or path generating the group names
+     * @param array|callable|string|PropertyPath|null $attr             The callable or path generating the HTML attributes
      *
      * @return ChoiceListView The choice list view
      */
diff --git a/ChoiceList/LazyChoiceList.php b/ChoiceList/LazyChoiceList.php
@@ -34,7 +34,7 @@ class LazyChoiceList implements ChoiceListInterface
      *
      * If null, choices are simply cast to strings.
      *
-     * @var null|callable
+     * @var callable|null
      */
     private $value;
 
@@ -60,7 +60,7 @@ class LazyChoiceList implements ChoiceListInterface
      * argument.
      *
      * @param ChoiceLoaderInterface $loader The choice loader
-     * @param null|callable         $value  The callable generating the choice values
+     * @param callable|null         $value  The callable generating the choice values
      */
     public function __construct(ChoiceLoaderInterface $loader, callable $value = null)
     {
diff --git a/ChoiceList/Loader/ChoiceLoaderInterface.php b/ChoiceList/Loader/ChoiceLoaderInterface.php
@@ -31,7 +31,7 @@ interface ChoiceLoaderInterface
      * The callable receives the choice as first and the array key as the second
      * argument.
      *
-     * @param null|callable $value The callable which generates the values
+     * @param callable|null $value The callable which generates the values
      *                             from choices
      *
      * @return ChoiceListInterface The loaded choice list
@@ -50,7 +50,7 @@ public function loadChoiceList($value = null);
      *
      * @param string[]      $values An array of choice values. Non-existing
      *                              values in this array are ignored
-     * @param null|callable $value  The callable generating the choice values
+     * @param callable|null $value  The callable generating the choice values
      *
      * @return array An array of choices
      */
@@ -68,7 +68,7 @@ public function loadChoicesForValues(array $values, $value = null);
      *
      * @param array         $choices An array of choices. Non-existing choices in
      *                               this array are ignored
-     * @param null|callable $value   The callable generating the choice values
+     * @param callable|null $value   The callable generating the choice values
      *
      * @return string[] An array of choice values
      */
diff --git a/Extension/Csrf/CsrfExtension.php b/Extension/Csrf/CsrfExtension.php
@@ -29,7 +29,7 @@ class CsrfExtension extends AbstractExtension
     /**
      * @param CsrfTokenManagerInterface $tokenManager      The CSRF token manager
      * @param TranslatorInterface       $translator        The translator for translating error messages
-     * @param null|string               $translationDomain The translation domain for translating
+     * @param string|null               $translationDomain The translation domain for translating
      */
     public function __construct(CsrfTokenManagerInterface $tokenManager, TranslatorInterface $translator = null, $translationDomain = null)
     {
diff --git a/Extension/Csrf/Type/FormTypeCsrfExtension.php b/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -38,7 +38,7 @@ class FormTypeCsrfExtension extends AbstractTypeExtension
      * @param bool                      $defaultEnabled
      * @param string                    $defaultFieldName
      * @param TranslatorInterface       $translator
-     * @param null|string               $translationDomain
+     * @param string|null               $translationDomain
      * @param ServerParams              $serverParams
      */
     public function __construct(CsrfTokenManagerInterface $defaultTokenManager, $defaultEnabled = true, $defaultFieldName = '_token', TranslatorInterface $translator = null, $translationDomain = null, ServerParams $serverParams = null)
diff --git a/Extension/Validator/Type/UploadValidatorExtension.php b/Extension/Validator/Type/UploadValidatorExtension.php
@@ -27,7 +27,7 @@ class UploadValidatorExtension extends AbstractTypeExtension
 
     /**
      * @param TranslatorInterface $translator        The translator for translating error messages
-     * @param null|string         $translationDomain The translation domain for translating
+     * @param string|null         $translationDomain The translation domain for translating
      */
     public function __construct(TranslatorInterface $translator, $translationDomain = null)
     {
diff --git a/Extension/Validator/ViolationMapper/MappingRule.php b/Extension/Validator/ViolationMapper/MappingRule.php
@@ -51,7 +51,7 @@ public function getOrigin()
      *
      * @param string $propertyPath The property path to match against the rule
      *
-     * @return null|FormInterface The mapped form or null
+     * @return FormInterface|null The mapped form or null
      */
     public function match($propertyPath)
     {
diff --git a/Extension/Validator/ViolationMapper/ViolationMapper.php b/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -144,7 +144,7 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form
      * @param FormInterface                 $form The form to search
      * @param PropertyPathIteratorInterface $it   The iterator at its current position
      *
-     * @return null|FormInterface The found match or null
+     * @return FormInterface|null The found match or null
      */
     private function matchChild(FormInterface $form, PropertyPathIteratorInterface $it)
     {
diff --git a/FormConfigBuilderInterface.php b/FormConfigBuilderInterface.php
@@ -146,7 +146,7 @@ public function setRequired($required);
     /**
      * Sets the property path that the form should be mapped to.
      *
-     * @param null|string|PropertyPathInterface $propertyPath The property path or null if the path should be set
+     * @param string|PropertyPathInterface|null $propertyPath The property path or null if the path should be set
      *                                                        automatically based on the form's name
      *
      * @return $this The configuration object
diff --git a/FormConfigInterface.php b/FormConfigInterface.php
@@ -38,7 +38,7 @@ public function getName();
     /**
      * Returns the property path that the form should be mapped to.
      *
-     * @return null|PropertyPathInterface The property path
+     * @return PropertyPathInterface|null The property path
      */
     public function getPropertyPath();
 
@@ -167,7 +167,7 @@ public function getData();
     /**
      * Returns the class of the form data or null if the data is scalar or an array.
      *
-     * @return null|string The data class or null
+     * @return string|null The data class or null
      */
     public function getDataClass();
 
diff --git a/SubmitButton.php b/SubmitButton.php
@@ -34,7 +34,7 @@ public function isClicked()
     /**
      * Submits data to the button.
      *
-     * @param null|string $submittedData The data
+     * @param string|null $submittedData The data
      * @param bool        $clearMissing  Not used
      *
      * @return $this
diff --git a/Tests/Fixtures/AlternatingRowType.php b/Tests/Fixtures/AlternatingRowType.php
@@ -11,9 +11,7 @@ class AlternatingRowType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $formFactory = $builder->getFormFactory();
-
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($formFactory) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
             $form = $event->getForm();
             $type = 0 === $form->getName() % 2
                 ? 'Symfony\Component\Form\Extension\Core\Type\TextType'
diff --git a/Tests/Util/StringUtilTest.php b/Tests/Util/StringUtilTest.php
@@ -35,7 +35,7 @@ public function testTrimUtf8Separators($hex)
 
         // Convert UCS-2BE to UTF-8
         $symbol = mb_convert_encoding($binary, 'UTF-8', 'UCS-2BE');
-        $symbol = $symbol."ab\ncd".$symbol;
+        $symbol .= "ab\ncd".$symbol;
 
         $this->assertSame("ab\ncd", StringUtil::trim($symbol));
     }
diff --git a/Util/ServerParams.php b/Util/ServerParams.php
@@ -41,7 +41,7 @@ public function hasPostMaxSizeBeenExceeded()
     /**
      * Returns maximum post size in bytes.
      *
-     * @return null|int The maximum post size in bytes
+     * @return int|null The maximum post size in bytes
      */
     public function getPostMaxSize()
     {

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ public function handleRequest($request = null)`
`368`	`368`	`/**`
`369`	`369`	`* Submits data to the button.`
`370`	`370`	`*`
`371`		`- * @param null\|string $submittedData The data`
	`371`	`+ * @param string\|null $submittedData The data`
`372`	`372`	`* @param bool $clearMissing Not used`
`373`	`373`	`*`
`374`	`374`	`* @return $this`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function getDecoratedFactory()`
`60`	`60`	`* {@inheritdoc}`
`61`	`61`	`*`
`62`	`62`	`* @param iterable $choices The choices`
`63`		`- * @param null\|callable\|string\|PropertyPath $value The callable or path for`
	`63`	`+ * @param callable\|string\|PropertyPath\|null $value The callable or path for`
`64`	`64`	`* generating the choice values`
`65`	`65`	`*`
`66`	`66`	`* @return ChoiceListInterface The choice list`
`@@ -93,7 +93,7 @@ public function createListFromChoices($choices, $value = null)`
`93`	`93`	`* {@inheritdoc}`
`94`	`94`	`*`
`95`	`95`	`* @param ChoiceLoaderInterface $loader The choice loader`
`96`		`- * @param null\|callable\|string\|PropertyPath $value The callable or path for`
	`96`	`+ * @param callable\|string\|PropertyPath\|null $value The callable or path for`
`97`	`97`	`* generating the choice values`
`98`	`98`	`*`
`99`	`99`	`* @return ChoiceListInterface The choice list`
`@@ -126,11 +126,11 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul`
`126`	`126`	`* {@inheritdoc}`
`127`	`127`	`*`
`128`	`128`	`* @param ChoiceListInterface $list The choice list`
`129`		`- * @param null\|array\|callable\|string\|PropertyPath $preferredChoices The preferred choices`
`130`		`- * @param null\|callable\|string\|PropertyPath $label The callable or path generating the choice labels`
`131`		`- * @param null\|callable\|string\|PropertyPath $index The callable or path generating the view indices`
`132`		`- * @param null\|callable\|string\|PropertyPath $groupBy The callable or path generating the group names`
`133`		`- * @param null\|array\|callable\|string\|PropertyPath $attr The callable or path generating the HTML attributes`
	`129`	`+ * @param array\|callable\|string\|PropertyPath\|null $preferredChoices The preferred choices`
	`130`	`+ * @param callable\|string\|PropertyPath\|null $label The callable or path generating the choice labels`
	`131`	`+ * @param callable\|string\|PropertyPath\|null $index The callable or path generating the view indices`
	`132`	`+ * @param callable\|string\|PropertyPath\|null $groupBy The callable or path generating the group names`
	`133`	`+ * @param array\|callable\|string\|PropertyPath\|null $attr The callable or path generating the HTML attributes`
`134`	`134`	`*`
`135`	`135`	`* @return ChoiceListView The choice list view`
`136`	`136`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class LazyChoiceList implements ChoiceListInterface`
`34`	`34`	`*`
`35`	`35`	`* If null, choices are simply cast to strings.`
`36`	`36`	`*`
`37`		`- * @var null\|callable`
	`37`	`+ * @var callable\|null`
`38`	`38`	`*/`
`39`	`39`	`private $value;`
`40`	`40`
`@@ -60,7 +60,7 @@ class LazyChoiceList implements ChoiceListInterface`
`60`	`60`	`* argument.`
`61`	`61`	`*`
`62`	`62`	`* @param ChoiceLoaderInterface $loader The choice loader`
`63`		`- * @param null\|callable $value The callable generating the choice values`
	`63`	`+ * @param callable\|null $value The callable generating the choice values`
`64`	`64`	`*/`
`65`	`65`	`public function __construct(ChoiceLoaderInterface $loader, callable $value = null)`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ interface ChoiceLoaderInterface`
`31`	`31`	`* The callable receives the choice as first and the array key as the second`
`32`	`32`	`* argument.`
`33`	`33`	`*`
`34`		`- * @param null\|callable $value The callable which generates the values`
	`34`	`+ * @param callable\|null $value The callable which generates the values`
`35`	`35`	`* from choices`
`36`	`36`	`*`
`37`	`37`	`* @return ChoiceListInterface The loaded choice list`
`@@ -50,7 +50,7 @@ public function loadChoiceList($value = null);`
`50`	`50`	`*`
`51`	`51`	`* @param string[] $values An array of choice values. Non-existing`
`52`	`52`	`* values in this array are ignored`
`53`		`- * @param null\|callable $value The callable generating the choice values`
	`53`	`+ * @param callable\|null $value The callable generating the choice values`
`54`	`54`	`*`
`55`	`55`	`* @return array An array of choices`
`56`	`56`	`*/`
`@@ -68,7 +68,7 @@ public function loadChoicesForValues(array $values, $value = null);`
`68`	`68`	`*`
`69`	`69`	`* @param array $choices An array of choices. Non-existing choices in`
`70`	`70`	`* this array are ignored`
`71`		`- * @param null\|callable $value The callable generating the choice values`
	`71`	`+ * @param callable\|null $value The callable generating the choice values`
`72`	`72`	`*`
`73`	`73`	`* @return string[] An array of choice values`
`74`	`74`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class CsrfExtension extends AbstractExtension`
`29`	`29`	`/**`
`30`	`30`	`* @param CsrfTokenManagerInterface $tokenManager The CSRF token manager`
`31`	`31`	`* @param TranslatorInterface $translator The translator for translating error messages`
`32`		`- * @param null\|string $translationDomain The translation domain for translating`
	`32`	`+ * @param string\|null $translationDomain The translation domain for translating`
`33`	`33`	`*/`
`34`	`34`	`public function __construct(CsrfTokenManagerInterface $tokenManager, TranslatorInterface $translator = null, $translationDomain = null)`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class UploadValidatorExtension extends AbstractTypeExtension`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* @param TranslatorInterface $translator The translator for translating error messages`
`30`		`- * @param null\|string $translationDomain The translation domain for translating`
	`30`	`+ * @param string\|null $translationDomain The translation domain for translating`
`31`	`31`	`*/`
`32`	`32`	`public function __construct(TranslatorInterface $translator, $translationDomain = null)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function getOrigin()`
`51`	`51`	`*`
`52`	`52`	`* @param string $propertyPath The property path to match against the rule`
`53`	`53`	`*`
`54`		`- * @return null\|FormInterface The mapped form or null`
	`54`	`+ * @return FormInterface\|null The mapped form or null`
`55`	`55`	`*/`
`56`	`56`	`public function match($propertyPath)`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form`
`144`	`144`	`* @param FormInterface $form The form to search`
`145`	`145`	`* @param PropertyPathIteratorInterface $it The iterator at its current position`
`146`	`146`	`*`
`147`		`- * @return null\|FormInterface The found match or null`
	`147`	`+ * @return FormInterface\|null The found match or null`
`148`	`148`	`*/`
`149`	`149`	`private function matchChild(FormInterface $form, PropertyPathIteratorInterface $it)`
`150`	`150`	`{`