Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit a627373f7c94 · 2021-08-17T17:35:52.000+02:00
* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface
diff --git a/Parser/TokenStream.php b/Parser/TokenStream.php
@@ -107,9 +107,7 @@ public function getUsed(): array
     }
 
     /**
-     * Returns nex identifier token.
-     *
-     * @return string The identifier token value
+     * Returns next identifier token.
      *
      * @throws SyntaxErrorException If next token is not an identifier
      */
@@ -125,9 +123,7 @@ public function getNextIdentifier(): string
     }
 
     /**
-     * Returns nex identifier or star delimiter token.
-     *
-     * @return string|null The identifier token value or null if star found
+     * Returns next identifier or null if star delimiter token is found.
      *
      * @throws SyntaxErrorException If next token is not an identifier or a star delimiter
      */

Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,7 @@ public function getUsed(): array`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/**`
`110`		`- * Returns nex identifier token.`
`111`		`- *`
`112`		`- * @return string The identifier token value`
	`110`	`+ * Returns next identifier token.`
`113`	`111`	`*`
`114`	`112`	`* @throws SyntaxErrorException If next token is not an identifier`
`115`	`113`	`*/`
`@@ -125,9 +123,7 @@ public function getNextIdentifier(): string`
`125`	`123`	`}`
`126`	`124`
`127`	`125`	`/**`
`128`		`- * Returns nex identifier or star delimiter token.`
`129`		`- *`
`130`		`- * @return string\|null The identifier token value or null if star found`
	`126`	`+ * Returns next identifier or null if star delimiter token is found.`
`131`	`127`	`*`
`132`	`128`	`* @throws SyntaxErrorException If next token is not an identifier or a star delimiter`
`133`	`129`	`*/`