Skip to content

Commit 844741a

Browse files
committed
minor symfony#13165 Fix the implementation of deprecated Locale classes (stof)
This PR was merged into the 2.3 branch. Discussion ---------- Fix the implementation of deprecated Locale classes | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a The ICU component does not exist anymore, but the BC layer was still referencing it. Commits ------- eb0637f Fix the implementation of deprecated Locale classes
2 parents f239920 + eb0637f commit 844741a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/Symfony/Component/Locale/Locale.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Locale;
1313

14-
use Symfony\Component\Icu\IcuData;
1514
use Symfony\Component\Intl\Intl;
1615

1716
/**
@@ -173,7 +172,7 @@ public static function getIcuDataVersion()
173172
*/
174173
public static function getIcuDataDirectory()
175174
{
176-
return IcuData::getResourceDirectory();
175+
return Intl::getDataDirectory();
177176
}
178177

179178
/**

src/Symfony/Component/Locale/Stub/StubLocale.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Locale\Stub;
1313

14-
use Symfony\Component\Icu\IcuData;
1514
use Symfony\Component\Intl\Intl;
1615
use Symfony\Component\Intl\Locale\Locale;
1716

@@ -86,7 +85,7 @@ public static function getCurrencies()
8685

8786
public static function getDataDirectory()
8887
{
89-
return IcuData::getResourceDirectory();
88+
return Intl::getDataDirectory();
9089
}
9190

9291
private static function prepareCurrencies($locale)

0 commit comments

Comments
 (0)