From 838798f2f3fe26652cd626e8b9a00ffc60dc1193 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Fri, 15 Mar 2013 14:19:02 +0100 Subject: [PATCH] [Intl] Removed method IntlTestCase::skipIfInsufficientIcuVersion() --- .../Intl/Tests/Collator/Verification/CollatorTest.php | 1 - .../DateFormatter/Verification/IntlDateFormatterTest.php | 1 - .../Intl/Tests/Globals/Verification/IntlGlobalsTest.php | 1 - src/Symfony/Component/Intl/Tests/IntlTestCase.php | 3 --- .../Component/Intl/Tests/Locale/Verification/LocaleTest.php | 1 - .../NumberFormatter/Verification/NumberFormatterTest.php | 1 - .../Tests/ResourceBundle/Reader/BinaryBundleReaderTest.php | 5 ++++- 7 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/Intl/Tests/Collator/Verification/CollatorTest.php b/src/Symfony/Component/Intl/Tests/Collator/Verification/CollatorTest.php index 10da9e3b19..1add4da466 100644 --- a/src/Symfony/Component/Intl/Tests/Collator/Verification/CollatorTest.php +++ b/src/Symfony/Component/Intl/Tests/Collator/Verification/CollatorTest.php @@ -25,7 +25,6 @@ class CollatorTest extends AbstractCollatorTest protected function setUp() { $this->skipIfIntlExtensionNotLoaded(); - $this->skipIfInsufficientIcuVersion(); parent::setUp(); } diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php index 432976ea55..25be488e37 100644 --- a/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php +++ b/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php @@ -25,7 +25,6 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest protected function setUp() { $this->skipIfIntlExtensionNotLoaded(); - $this->skipIfInsufficientIcuVersion(); parent::setUp(); } diff --git a/src/Symfony/Component/Intl/Tests/Globals/Verification/IntlGlobalsTest.php b/src/Symfony/Component/Intl/Tests/Globals/Verification/IntlGlobalsTest.php index 307bad6b9c..1b1869ca42 100644 --- a/src/Symfony/Component/Intl/Tests/Globals/Verification/IntlGlobalsTest.php +++ b/src/Symfony/Component/Intl/Tests/Globals/Verification/IntlGlobalsTest.php @@ -24,7 +24,6 @@ class IntlGlobalsTest extends AbstractIntlGlobalsTest protected function setUp() { $this->skipIfIntlExtensionNotLoaded(); - $this->skipIfInsufficientIcuVersion(); parent::setUp(); } diff --git a/src/Symfony/Component/Intl/Tests/IntlTestCase.php b/src/Symfony/Component/Intl/Tests/IntlTestCase.php index 104197d12d..3c1740aa22 100644 --- a/src/Symfony/Component/Intl/Tests/IntlTestCase.php +++ b/src/Symfony/Component/Intl/Tests/IntlTestCase.php @@ -43,10 +43,7 @@ abstract class IntlTestCase extends \PHPUnit_Framework_TestCase if (!Intl::isExtensionLoaded()) { $this->markTestSkipped('The intl extension is not available.'); } - } - protected function skipIfInsufficientIcuVersion() - { if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) { $this->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion()); } diff --git a/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php index 2765164fa1..c85fb4e511 100644 --- a/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php +++ b/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php @@ -24,7 +24,6 @@ class LocaleTest extends AbstractLocaleTest protected function setUp() { $this->skipIfIntlExtensionNotLoaded(); - $this->skipIfInsufficientIcuVersion(); parent::setUp(); } diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php index d413674a6c..5154e63c01 100644 --- a/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php +++ b/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php @@ -22,7 +22,6 @@ class NumberFormatterTest extends AbstractNumberFormatterTest protected function setUp() { $this->skipIfIntlExtensionNotLoaded(); - $this->skipIfInsufficientIcuVersion(); parent::setUp(); } diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BinaryBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BinaryBundleReaderTest.php index ca6ea4a6b3..037e1a3cd7 100644 --- a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BinaryBundleReaderTest.php +++ b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BinaryBundleReaderTest.php @@ -12,11 +12,12 @@ namespace Symfony\Component\Intl\Tests\ResourceBundle\Reader; use Symfony\Component\Intl\ResourceBundle\Reader\BinaryBundleReader; +use Symfony\Component\Intl\Tests\IntlTestCase; /** * @author Bernhard Schussek */ -class BinaryBundleReaderTest extends \PHPUnit_Framework_TestCase +class BinaryBundleReaderTest extends IntlTestCase { /** * @var BinaryBundleReader @@ -25,6 +26,8 @@ class BinaryBundleReaderTest extends \PHPUnit_Framework_TestCase protected function setUp() { + $this->skipIfIntlExtensionNotLoaded(); + $this->reader = new BinaryBundleReader(); }