[Intl] Changed Intl::getStubIcuVersion() to Intl::getIcuStubVersion()
This commit is contained in:
parent
b902b6ba90
commit
b60866c8ab
@ -48,7 +48,7 @@ To update the stub files, run the update-stubs.php script:
|
|||||||
|
|
||||||
The script will fail if you don't have the latest ICU version. If you want to
|
The script will fail if you don't have the latest ICU version. If you want to
|
||||||
upgrade the ICU version, adjust the return value of the
|
upgrade the ICU version, adjust the return value of the
|
||||||
`Intl::getStubIcuVersion()` before you run the script.
|
`Intl::getIcuStubVersion()` before you run the script.
|
||||||
|
|
||||||
The script creates copies of the binary resource bundles in the Icu component
|
The script creates copies of the binary resource bundles in the Icu component
|
||||||
and stores them in the Resources/ directory of the Intl component. The copies
|
and stores them in the Resources/ directory of the Intl component. The copies
|
||||||
|
@ -286,7 +286,7 @@ class Intl
|
|||||||
*
|
*
|
||||||
* @return string The ICU version of the stub classes.
|
* @return string The ICU version of the stub classes.
|
||||||
*/
|
*/
|
||||||
public static function getStubIcuVersion()
|
public static function getIcuStubVersion()
|
||||||
{
|
{
|
||||||
return '50.1.0';
|
return '50.1.0';
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ if (!class_exists('\Symfony\Component\Icu\IcuData')) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$shortIcuVersionInPhp = strip_minor_versions(Intl::getIcuVersion());
|
$shortIcuVersionInPhp = strip_minor_versions(Intl::getIcuVersion());
|
||||||
$shortIcuVersionInIntlComponent = strip_minor_versions(Intl::getStubIcuVersion());
|
$shortIcuVersionInIntlComponent = strip_minor_versions(Intl::getIcuStubVersion());
|
||||||
$shortIcuVersionInIcuComponent = strip_minor_versions(IcuData::getVersion());
|
$shortIcuVersionInIcuComponent = strip_minor_versions(IcuData::getVersion());
|
||||||
|
|
||||||
if ($shortIcuVersionInPhp !== $shortIcuVersionInIcuComponent) {
|
if ($shortIcuVersionInPhp !== $shortIcuVersionInIcuComponent) {
|
||||||
|
@ -47,8 +47,8 @@ abstract class IntlTestCase extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
protected function skipIfInsufficientIcuVersion()
|
protected function skipIfInsufficientIcuVersion()
|
||||||
{
|
{
|
||||||
if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getStubIcuVersion(), '!=', $precision = 1)) {
|
if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
|
||||||
$this->markTestSkipped('Please change ICU version to ' . Intl::getStubIcuVersion());
|
$this->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user