Skip to content

Commit 4707b7a

Browse files
Merge branch '5.3' into 5.4
* 5.3: CS fix CS fix CS fixes Bump Symfony version to 5.3.4 Update VERSION for 5.3.3 Update CHANGELOG for 5.3.3 Bump Symfony version to 5.2.12 Update VERSION for 5.2.11 Update CHANGELOG for 5.2.11 Bump Symfony version to 4.4.27 Update VERSION for 4.4.26 Update CONTRIBUTORS for 4.4.26 Update CHANGELOG for 4.4.26
2 parents bb7376e + 5151b64 commit 4707b7a

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

Data/Bundle/Reader/PhpBundleReader.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Intl\Data\Bundle\Reader;
1313

1414
use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
15-
use Symfony\Component\Intl\Exception\RuntimeException;
1615

1716
/**
1817
* Reads .php resource bundles.

DateFormatter/IntlDateFormatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public function __construct(?string $locale, ?int $datetype, ?int $timetype, $ti
174174
* @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
175175
* @throws MethodArgumentValueNotImplementedException When $calendar different than GREGORIAN is passed
176176
*/
177-
public static function create(?string $locale, ?int $datetype, ?int $timetype, $timezone = null, int $calendar = self::GREGORIAN, ?string $pattern = null)
177+
public static function create(?string $locale, ?int $datetype, ?int $timetype, $timezone = null, int $calendar = self::GREGORIAN, string $pattern = null)
178178
{
179179
return new static($locale, $datetype, $timetype, $timezone, $calendar, $pattern);
180180
}

Util/IcuVersion.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class IcuVersion
5050
*
5151
* @see normalize()
5252
*/
53-
public static function compare(string $version1, string $version2, string $operator, ?int $precision = null)
53+
public static function compare(string $version1, string $version2, string $operator, int $precision = null)
5454
{
5555
$version1 = self::normalize($version1, $precision);
5656
$version2 = self::normalize($version2, $precision);

Util/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Version
4040
*
4141
* @see normalize()
4242
*/
43-
public static function compare(string $version1, string $version2, string $operator, ?int $precision = null)
43+
public static function compare(string $version1, string $version2, string $operator, int $precision = null)
4444
{
4545
$version1 = self::normalize($version1, $precision);
4646
$version2 = self::normalize($version2, $precision);

0 commit comments

Comments
 (0)