Skip to content

Commit 72d67d2

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Serializer] cs fix Cleanup more `@return` annotations [Form] Fix phpdoc on FormBuilderInterface
2 parents a282031 + 8eca69c commit 72d67d2

File tree

6 files changed

+2
-28
lines changed

6 files changed

+2
-28
lines changed

Countries.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class Countries extends ResourceBundle
3131
*
3232
* This list only contains "officially assigned ISO 3166-1 alpha-2" country codes.
3333
*
34-
* @return string[] an array of canonical ISO 3166 alpha-2 country codes
34+
* @return string[]
3535
*/
3636
public static function getCountryCodes(): array
3737
{
@@ -45,7 +45,7 @@ public static function getCountryCodes(): array
4545
*
4646
* This list only contains "officially assigned ISO 3166-1 alpha-3" country codes.
4747
*
48-
* @return string[] an array of canonical ISO 3166 alpha-3 country codes
48+
* @return string[]
4949
*/
5050
public static function getAlpha3Codes(): array
5151
{

Data/Generator/GeneratorConfig.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ public function getBundleWriters(): array
5757
/**
5858
* Returns the directory where the source versions of the resource bundles
5959
* are stored.
60-
*
61-
* @return string An absolute path to a directory
6260
*/
6361
public function getSourceDir(): string
6462
{
@@ -67,8 +65,6 @@ public function getSourceDir(): string
6765

6866
/**
6967
* Returns the ICU version of the bundles being converted.
70-
*
71-
* @return string The ICU version string
7268
*/
7369
public function getIcuVersion(): string
7470
{

Intl.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ final class Intl
6666

6767
/**
6868
* Returns whether the intl extension is installed.
69-
*
70-
* @return bool Returns true if the intl extension is installed, false otherwise
7169
*/
7270
public static function isExtensionLoaded(): bool
7371
{
@@ -76,8 +74,6 @@ public static function isExtensionLoaded(): bool
7674

7775
/**
7876
* Returns the version of the installed ICU library.
79-
*
80-
* @return string|null The ICU version or NULL if it could not be determined
8177
*/
8278
public static function getIcuVersion(): ?string
8379
{
@@ -106,8 +102,6 @@ public static function getIcuVersion(): ?string
106102

107103
/**
108104
* Returns the version of the installed ICU data.
109-
*
110-
* @return string The version of the installed ICU data
111105
*/
112106
public static function getIcuDataVersion(): string
113107
{
@@ -120,8 +114,6 @@ public static function getIcuDataVersion(): string
120114

121115
/**
122116
* Returns the ICU version that the stub classes mimic.
123-
*
124-
* @return string The ICU version of the stub classes
125117
*/
126118
public static function getIcuStubVersion(): string
127119
{
@@ -130,8 +122,6 @@ public static function getIcuStubVersion(): string
130122

131123
/**
132124
* Returns the absolute path to the data directory.
133-
*
134-
* @return string The absolute path to the data directory
135125
*/
136126
public static function getDataDirectory(): string
137127
{

Locale.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ public static function setDefaultFallback(?string $locale)
4343
/**
4444
* Returns the default fallback locale.
4545
*
46-
* @return string|null The default fallback locale
47-
*
4846
* @see setDefaultFallback()
4947
* @see getFallback()
5048
*/

Util/IcuVersion.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ class IcuVersion
4646
* @param int|null $precision The number of components to compare. Pass
4747
* NULL to compare the versions unchanged.
4848
*
49-
* @return bool Whether the comparison succeeded
50-
*
5149
* @see normalize()
5250
*/
5351
public static function compare(string $version1, string $version2, string $operator, int $precision = null): bool
@@ -79,9 +77,6 @@ public static function compare(string $version1, string $version2, string $opera
7977
*
8078
* @param int|null $precision The number of components to include. Pass
8179
* NULL to return the version unchanged.
82-
*
83-
* @return string|null the normalized ICU version or NULL if it couldn't be
84-
* normalized
8580
*/
8681
public static function normalize(string $version, ?int $precision): ?string
8782
{

Util/Version.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class Version
3636
* @param int|null $precision The number of components to compare. Pass
3737
* NULL to compare the versions unchanged.
3838
*
39-
* @return bool Whether the comparison succeeded
40-
*
4139
* @see normalize()
4240
*/
4341
public static function compare(string $version1, string $version2, string $operator, int $precision = null): bool
@@ -62,9 +60,6 @@ public static function compare(string $version1, string $version2, string $opera
6260
*
6361
* @param int|null $precision The number of components to include. Pass
6462
* NULL to return the version unchanged.
65-
*
66-
* @return string|null the normalized version or NULL if it couldn't be
67-
* normalized
6863
*/
6964
public static function normalize(string $version, ?int $precision): ?string
7065
{

0 commit comments

Comments
 (0)