Merge branch '5.4' into 6.0

* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface

Author: nicolas-grekas

AbstractUriElement.php

@@ -63,8 +63,6 @@ public function getNode(): \DOMElement
 
     /**
      * Gets the method associated with this link.
-     *
-     * @return string The method
      */
     public function getMethod(): string
     {
@@ -73,8 +71,6 @@ public function getMethod(): string
 
     /**
      * Gets the URI associated with this link.
-     *
-     * @return string The URI
      */
     public function getUri(): string
     {

Crawler.php

@@ -510,8 +510,6 @@ public function children(string $selector = null): static
     /**
      * Returns the attribute value of the first node of the list.
      *
-     * @return string|null The attribute value or null if the attribute does not exist
-     *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function attr(string $attribute): ?string
@@ -528,8 +526,6 @@ public function attr(string $attribute): ?string
     /**
      * Returns the node name of the first node of the list.
      *
-     * @return string The node name
-     *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function nodeName(): string
@@ -549,8 +545,6 @@ public function nodeName(): string
      * @param string|null $default             When not null: the value to return when the current node is empty
      * @param bool        $normalizeWhitespace Whether whitespaces should be trimmed and normalized to single spaces
      *
-     * @return string The node value
-     *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function text(string $default = null, bool $normalizeWhitespace = true): string
@@ -577,8 +571,6 @@ public function text(string $default = null, bool $normalizeWhitespace = true):
      *
      * @param string|null $default When not null: the value to return when the current node is empty
      *
-     * @return string The node html
-     *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function html(string $default = null): string
@@ -658,8 +650,6 @@ public function evaluate(string $xpath): array|Crawler
      * Example:
      *
      *     $crawler->filter('h1 a')->extract(['_text', 'href']);
-     *
-     * @return array An array of extracted values
      */
     public function extract(array $attributes): array
     {
@@ -883,8 +873,6 @@ public function registerNamespace(string $prefix, string $namespace)
      *
      *     echo Crawler::xpathLiteral('a\'b"c');
      *     //prints concat('a', "'", 'b"c')
-     *
-     * @return string Converted string
      */
     public static function xpathLiteral(string $s): string
     {

Field/ChoiceFormField.php

@@ -157,8 +157,6 @@ public function addChoice(\DOMElement $node)
 
     /**
      * Returns the type of the choice field (radio, select, or checkbox).
-     *
-     * @return string The type
      */
     public function getType(): string
     {
@@ -167,8 +165,6 @@ public function getType(): string
 
     /**
      * Returns true if the field accepts multiple values.
-     *
-     * @return bool true if the field accepts multiple values, false otherwise
      */
     public function isMultiple(): bool
     {

Field/FormField.php

@@ -76,8 +76,6 @@ public function getLabel(): ?\DOMElement
 
     /**
      * Returns the name of the field.
-     *
-     * @return string The name of the field
      */
     public function getName(): string
     {
@@ -102,8 +100,6 @@ public function setValue(?string $value)
 
     /**
      * Returns true if the field should be included in the submitted values.
-     *
-     * @return bool true if the field should be included in the submitted values, false otherwise
      */
     public function hasValue(): bool
     {

Form.php

@@ -69,8 +69,6 @@ public function setValues(array $values): static
      * Gets the field values.
      *
      * The returned array does not include file fields (@see getFiles).
-     *
-     * @return array An array of field values
      */
     public function getValues(): array
     {
@@ -90,8 +88,6 @@ public function getValues(): array
 
     /**
      * Gets the file field values.
-     *
-     * @return array An array of file field values
      */
     public function getFiles(): array
     {
@@ -119,8 +115,6 @@ public function getFiles(): array
      *
      * This method converts fields with the array notation
      * (like foo[bar] to arrays) like PHP does.
-     *
-     * @return array An array of field values
      */
     public function getPhpValues(): array
     {
@@ -146,8 +140,6 @@ public function getPhpValues(): array
      * (@see getPhpValues), rather than uploaded files found in $_FILES.
      * For a compound file field foo[bar] it will create foo[bar][name],
      * instead of foo[name][bar] which would be found in $_FILES.
-     *
-     * @return array An array of file field values
      */
     public function getPhpFiles(): array
     {
@@ -182,8 +174,6 @@ function (&$value, $key) {
      * The returned URI is not the same as the form "action" attribute.
      * This method merges the value if the method is GET to mimics
      * browser behavior.
-     *
-     * @return string The URI
      */
     public function getUri(): string
     {
@@ -220,8 +210,6 @@ protected function getRawUri(): string
      * Gets the form method.
      *
      * If no method is defined in the form, GET is returned.
-     *
-     * @return string The method
      */
     public function getMethod(): string
     {
@@ -249,8 +237,6 @@ public function getName(): string
 
     /**
      * Returns true if the named field exists.
-     *
-     * @return bool true if the field exists, false otherwise
      */
     public function has(string $name): bool
     {
@@ -268,7 +254,7 @@ public function remove(string $name)
     /**
      * Gets a named field.
      *
-     * @return FormField|FormField[]|FormField[][] The value of the field
+     * @return FormField|FormField[]|FormField[][]
      *
      * @throws \InvalidArgumentException When field is not present in this form
      */
@@ -310,7 +296,7 @@ public function offsetExists(mixed $name): bool
      *
      * @param string $name The field name
      *
-     * @return FormField|FormField[]|FormField[][] The value of the field
+     * @return FormField|FormField[]|FormField[][]
      *
      * @throws \InvalidArgumentException if the field does not exist
      */

FormFieldRegistry.php

@@ -65,7 +65,7 @@ public function remove(string $name)
     /**
      * Returns the value of the field based on the fully qualifed name and its children.
      *
-     * @return FormField|FormField[]|FormField[][] The value of the field
+     * @return FormField|FormField[]|FormField[][]
      *
      * @throws \InvalidArgumentException if the field does not exist
      */
@@ -86,8 +86,6 @@ public function &get(string $name): FormField|array
 
     /**
      * Tests whether the form has the given field based on the fully qualified name.
-     *
-     * @return bool Whether the form has the given field
      */
     public function has(string $name): bool
     {
@@ -154,7 +152,7 @@ private function walk(array $array, ?string $base = '', array &$output = []): ar
      *
      *     getSegments('base[foo][3][]') = ['base', 'foo, '3', ''];
      *
-     * @return string[] The list of segments
+     * @return string[]
      */
     private function getSegments(string $name): array
     {