Skip to content

Commit 727fed5

Browse files
author
Robin Chalas
committed
Merge branch '4.3' into 4.4
* 4.3: [FWBundle] Remove unused parameter [Intl] [Workflow] fixes English grammar typos [Filesystem] [Serializer] fixes English grammar typo [Messenger] Adding exception to amqp transport in case amqp ext is not installed [Monolog Bridge] Fixed accessing static property as non static. Improve Symfony description Add DateTimeZoneNormalizer into Dependency Injection [Messenger] Error when specified default bus is not among the configured [Validator] Add Japanese translation [Workflow] Apply the same logic of precedence between the apply() and the buildTransitionBlockerList() method Remove some unused methods parameters Avoid empty \"If-Modified-Since\" header in validation request [Security] Fix SwitchUser is broken when the User Provider always returns a valid user Fix error message according to the new regex compatibility with DoctrineBundle 2 [Validator] ConstraintValidatorTestCase: add missing return value to mocked validate method calls
2 parents 299cbfd + 7d3fdbf commit 727fed5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Currencies.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static function exists(string $currency): bool
4646
}
4747

4848
/**
49-
* @throws MissingResourceException if the currency code does not exists
49+
* @throws MissingResourceException if the currency code does not exist
5050
*/
5151
public static function getName(string $currency, string $displayLocale = null): string
5252
{
@@ -78,7 +78,7 @@ public static function getNames(string $displayLocale = null): array
7878
}
7979

8080
/**
81-
* @throws MissingResourceException if the currency code does not exists
81+
* @throws MissingResourceException if the currency code does not exist
8282
*/
8383
public static function getSymbol(string $currency, string $displayLocale = null): string
8484
{
@@ -115,7 +115,7 @@ public static function getNumericCode(string $currency): int
115115
}
116116

117117
/**
118-
* @throws MissingResourceException if the numeric code does not exists
118+
* @throws MissingResourceException if the numeric code does not exist
119119
*/
120120
public static function forNumericCode(int $numericCode): array
121121
{

Locales.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static function exists(string $locale): bool
4949
}
5050

5151
/**
52-
* @throws MissingResourceException if the locale does not exists
52+
* @throws MissingResourceException if the locale does not exist
5353
*/
5454
public static function getName(string $locale, string $displayLocale = null): string
5555
{

Scripts.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static function exists(string $script): bool
4141
}
4242

4343
/**
44-
* @throws MissingResourceException if the script code does not exists
44+
* @throws MissingResourceException if the script code does not exist
4545
*/
4646
public static function getName(string $script, string $displayLocale = null): string
4747
{

0 commit comments

Comments
 (0)