[Intl] Changed Intl::getStubIcuVersion() to Intl::getIcuStubVersion()

webmozart · webmozart · commit b60866c8aba9 · 2013-04-05T10:11:14.000+02:00
diff --git a/src/Symfony/Component/Intl/CONTRIBUTING.md b/src/Symfony/Component/Intl/CONTRIBUTING.md
@@ -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
 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
 and stores them in the Resources/ directory of the Intl component. The copies
diff --git a/src/Symfony/Component/Intl/Intl.php b/src/Symfony/Component/Intl/Intl.php
@@ -286,7 +286,7 @@ public static function getIcuDataVersion()
      *
      * @return string The ICU version of the stub classes.
      */
-    public static function getStubIcuVersion()
+    public static function getIcuStubVersion()
     {
         return '50.1.0';
     }
diff --git a/src/Symfony/Component/Intl/Resources/bin/update-stubs.php b/src/Symfony/Component/Intl/Resources/bin/update-stubs.php
@@ -50,7 +50,7 @@
 }
 
 $shortIcuVersionInPhp = strip_minor_versions(Intl::getIcuVersion());
-$shortIcuVersionInIntlComponent = strip_minor_versions(Intl::getStubIcuVersion());
+$shortIcuVersionInIntlComponent = strip_minor_versions(Intl::getIcuStubVersion());
 $shortIcuVersionInIcuComponent = strip_minor_versions(IcuData::getVersion());
 
 if ($shortIcuVersionInPhp !== $shortIcuVersionInIcuComponent) {
diff --git a/src/Symfony/Component/Intl/Tests/IntlTestCase.php b/src/Symfony/Component/Intl/Tests/IntlTestCase.php
@@ -47,8 +47,8 @@ protected function skipIfIntlExtensionNotLoaded()
 
     protected function skipIfInsufficientIcuVersion()
     {
-        if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getStubIcuVersion(), '!=', $precision = 1)) {
-            $this->markTestSkipped('Please change ICU version to ' . Intl::getStubIcuVersion());
+        if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
+            $this->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public static function getIcuDataVersion()`
`286`	`286`	`*`
`287`	`287`	`* @return string The ICU version of the stub classes.`
`288`	`288`	`*/`
`289`		`- public static function getStubIcuVersion()`
	`289`	`+ public static function getIcuStubVersion()`
`290`	`290`	`{`
`291`	`291`	`return '50.1.0';`
`292`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`$shortIcuVersionInPhp = strip_minor_versions(Intl::getIcuVersion());`
`53`		`-$shortIcuVersionInIntlComponent = strip_minor_versions(Intl::getStubIcuVersion());`
	`53`	`+$shortIcuVersionInIntlComponent = strip_mino 8000 r_versions(Intl::getIcuStubVersion());`
`54`	`54`	`$shortIcuVersionInIcuComponent = strip_minor_versions(IcuData::getVersion());`
`55`	`55`
`56`	`56`	`if ($shortIcuVersionInPhp !== $shortIcuVersionInIcuComponent) {`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ protected function skipIfIntlExtensionNotLoaded()`
`47`	`47`
`48`	`48`	`protected function skipIfInsufficientIcuVersion()`
`49`	`49`	`{`
`50`		`- if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getStubIcuVersion(), '!=', $precision = 1)) {`
`51`		`- $this->markTestSkipped('Please change ICU version to ' . Intl::getStubIcuVersion());`
	`50`	`+ if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {`
	`51`	`+ $this->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`