[Intl] Removed method IntlTestCase::skipIfInsufficientIcuVersion()
This commit is contained in:
parent
dde1d3462f
commit
838798f2f3
@ -25,7 +25,6 @@ class CollatorTest extends AbstractCollatorTest
|
|||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
$this->skipIfIntlExtensionNotLoaded();
|
$this->skipIfIntlExtensionNotLoaded();
|
||||||
$this->skipIfInsufficientIcuVersion();
|
|
||||||
|
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,6 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest
|
|||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
$this->skipIfIntlExtensionNotLoaded();
|
$this->skipIfIntlExtensionNotLoaded();
|
||||||
$this->skipIfInsufficientIcuVersion();
|
|
||||||
|
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,6 @@ class IntlGlobalsTest extends AbstractIntlGlobalsTest
|
|||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
$this->skipIfIntlExtensionNotLoaded();
|
$this->skipIfIntlExtensionNotLoaded();
|
||||||
$this->skipIfInsufficientIcuVersion();
|
|
||||||
|
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
@ -43,10 +43,7 @@ abstract class IntlTestCase extends \PHPUnit_Framework_TestCase
|
|||||||
if (!Intl::isExtensionLoaded()) {
|
if (!Intl::isExtensionLoaded()) {
|
||||||
$this->markTestSkipped('The intl extension is not available.');
|
$this->markTestSkipped('The intl extension is not available.');
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
protected function skipIfInsufficientIcuVersion()
|
|
||||||
{
|
|
||||||
if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
|
if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
|
||||||
$this->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());
|
$this->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,6 @@ class LocaleTest extends AbstractLocaleTest
|
|||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
$this->skipIfIntlExtensionNotLoaded();
|
$this->skipIfIntlExtensionNotLoaded();
|
||||||
$this->skipIfInsufficientIcuVersion();
|
|
||||||
|
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,6 @@ class NumberFormatterTest extends AbstractNumberFormatterTest
|
|||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
$this->skipIfIntlExtensionNotLoaded();
|
$this->skipIfIntlExtensionNotLoaded();
|
||||||
$this->skipIfInsufficientIcuVersion();
|
|
||||||
|
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
@ -12,11 +12,12 @@
|
|||||||
namespace Symfony\Component\Intl\Tests\ResourceBundle\Reader;
|
namespace Symfony\Component\Intl\Tests\ResourceBundle\Reader;
|
||||||
|
|
||||||
use Symfony\Component\Intl\ResourceBundle\Reader\BinaryBundleReader;
|
use Symfony\Component\Intl\ResourceBundle\Reader\BinaryBundleReader;
|
||||||
|
use Symfony\Component\Intl\Tests\IntlTestCase;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
*/
|
*/
|
||||||
class BinaryBundleReaderTest extends \PHPUnit_Framework_TestCase
|
class BinaryBundleReaderTest extends IntlTestCase
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var BinaryBundleReader
|
* @var BinaryBundleReader
|
||||||
@ -25,6 +26,8 @@ class BinaryBundleReaderTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
|
$this->skipIfIntlExtensionNotLoaded();
|
||||||
|
|
||||||
$this->reader = new BinaryBundleReader();
|
$this->reader = new BinaryBundleReader();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user