[Intl] Added a check for the ICU data version to IntlTestHelper to prevent the stub class tests from failing

webmozart · webmozart · commit e2c11cb81af3 · 2013-04-05T10:14:38.000+02:00
diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
@@ -43,6 +43,10 @@ public static function requireIntl(\PhpUnit_Framework_TestCase $testCase)
             $testCase->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());
         }
 
+        if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
+            $testCase->markTestSkipped('Please change the Icu component to version 1.0.x or 1.' . IcuVersion::normalize(Intl::getIcuStubVersion(), 1) . '.x');
+        }
+
         // Normalize the default locale in case this is not done explicitly
         // in the test
         \Locale::setDefault('en');
@@ -70,11 +74,16 @@ public static function requireFullIntl(\PhpUnit_Framework_TestCase $testCase)
             $testCase->markTestSkipped('The intl extension is not available.');
         }
 
-        // ... and only if the version is *one specific version*.
+        // ... and only if the version is *one specific version* ...
         if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
             $testCase->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());
         }
 
+        // ... and only if the data in the Icu component matches that version.
+        if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
+            $testCase->markTestSkipped('Please change the Icu component to version 1.0.x or 1.' . IcuVersion::normalize(Intl::getIcuStubVersion(), 1) . '.x');
+        }
+
         // Normalize the default locale in case this is not done explicitly
         // in the test
         \Locale::setDefault('en');
