Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#5111 from dshafik/fix/…
Browse files Browse the repository at this point in the history 
…ext-intl-missing-failure

Fix test suite when ext/intl isn't available
  • Loading branch information
@weierophinney
weierophinney committed Oct 22, 2013
154 parents 08d26c4 + a5cc444 + fe92acf + 740abb6 + 9b5478d + 91a23e2 + 8649d44 + 3f353b0 + d340adb + 1e0e8f4 + 5c4289e + fb94cca + 2a3844c + 906bbcf + 3d9b8bb + 84844ae + 62fc651 + b0a3dd4 + 0dca0ef + 910bbbf + e574b9b + f30ec7d + 1fa84de + 41b8543 + 9e2c9d5 + 913f51c + 39924f3 + c2a11e1 + 61b9322 + 413a38b + e51b2b8 + 20e328b + 6437ec0 + e9b8476 + 95e54a0 + 7ea3aed + df6a706 + a82fc82 + 7c2a059 + 4fefb53 + 599ee3a + ea3fc65 + f6c04c2 + 6591e3d + a4f76e3 + 33c7531 + 2d59782 + 8152327 + e56ce9b + db9b18f + b88635a + a262823 + b79aef6 + c2284e4 + 70193eb + 96acf77 + 9675426 + 5f02411 + 0dafea7 + 15dc674 + 4a2447d + e6eb7f3 + e9499c5 + 272b15f + 11c7758 + 6f0e918 + 5f4980a + ecca95a + 88b5971 + ecb8d13 + 9de1c08 + 44aad17 + 13269e9 + 654cdb6 + dc708db + 380ffba + ff67e7f + fe2e025 + 95f0efa + 68cc4b3 + bf13b96 + 8870381 + 56480f4 + 1fa90d7 + 5c7fe1f + abe9bc1 + a33cacd + cdd7d9f + 6a261b1 + 5e594c4 + 01c1241 + 30d1dd2 + d4af079 + c9aa9b4 + 10f47ca + ef20fa1 + 2187ae2 + e7f3993 + db93d37 + aa57612 + 4af81d8 + 2f90998 + 3013404 + 69d83fe + f383ca9 + 1b26f48 + 054f09d + 0c86829 + f22d81a + e7ebffe + 72a7a54 + cc09223 + ab99f58 + 2c69e37 + b6ccfbc + b92a5da + 773a133 + 9ee28ff + 5865e20 + 63c7303 + 73371d0 + b96f402 + b36e36b + 60fa081 + a1d27a6 + 43e9240 + 9e59ae6 + be1ce44 + 5a6465d + 7e455b4 + 83d837e + 28bc01e + 215be48 + efcc8e0 + 5192ae6 + 7e1ba0f + dec8ccf + 94afc0f + 8c3ea5f + d680762 + 9092473 + 041fc63 + ea6499d + 1f59300 + a75142b + f592cc2 + f523aef + 2d12221 + 34ad758 + 23cc229 + 1fa15a0 + 6b74fc7 + d10d55c + 819e764 commit 80d00fa
Show file tree
Hide file tree
Showing 16 changed files with 140 additions and 8 deletions.
4 changes: 4 additions & 0 deletions test/Filter/AlnumTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ class AlnumTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->filter = new AlnumFilter();

$this->locale = Locale::getDefault();
Expand Down
4 changes: 4 additions & 0 deletions test/Filter/AlphaTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ class AlphaTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->filter = new AlphaFilter();

$this->locale = Locale::getDefault();
Expand Down
27 changes: 25 additions & 2 deletions test/Filter/NumberFormatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@

class NumberFormatTest extends TestCase
{
public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}
}

public function testConstructWithOptions()
{
$filter = new NumberFormatFilter(array(
Expand Down Expand Up @@ -63,8 +70,16 @@ public function testFormattedToNumber($locale, $style, $type, $value, $expected)
$this->assertEquals($expected, $filter->filter($value));
}

public static function numberToFormattedProvider()
public function numberToFormattedProvider()
{
if (!extension_loaded('intl')) {
if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
$this->markTestSkipped('ext/intl not enabled');
} else {
return array(array());
}
}

return array(
array(
'en_US',
Expand All @@ -90,8 +105,16 @@ public static function numberToFormattedProvider()
);
}

public static function formattedToNumberProvider()
public function formattedToNumberProvider()
{
if (!extension_loaded('intl')) {
if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
$this->markTestSkipped('ext/intl not enabled');
} else {
return array(array());
}
}

return array(
array(
'en_US',
Expand Down
8 changes: 7 additions & 1 deletion test/Translator/Loader/GettextTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ class GettextTest extends TestCase

public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->originalLocale = Locale::getDefault();
Locale::setDefault('en_EN');

Expand All @@ -28,7 +32,9 @@ public function setUp()

public function tearDown()
{
Locale::setDefault($this->originalLocale);
if (extension_loaded('intl')) {
Locale::setDefault($this->originalLocale);
}
}

public function testLoaderFailsToLoadMissingFile()
Expand Down
8 changes: 7 additions & 1 deletion test/Translator/Loader/PhpArrayTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ class PhpArrayTest extends TestCase

public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->originalLocale = Locale::getDefault();
Locale::setDefault('en_EN');

Expand All @@ -28,7 +32,9 @@ public function setUp()

public function tearDown()
{
Locale::setDefault($this->originalLocale);
if (extension_loaded('intl')) {
Locale::setDefault($this->originalLocale);
}
}

public function testLoaderFailsToLoadMissingFile()
Expand Down
8 changes: 7 additions & 1 deletion test/Translator/TranslatorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ class TranslatorTest extends TestCase

public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->originalLocale = Locale::getDefault();
$this->translator = new Translator();

Expand All @@ -45,7 +49,9 @@ public function setUp()

public function tearDown()
{
Locale::setDefault($this->originalLocale);
if (extension_loaded('intl')) {
Locale::setDefault($this->originalLocale);
}
}

public function testFactoryCreatesTranslator()
Expand Down
4 changes: 4 additions & 0 deletions test/Validator/AlnumTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ class AlnumTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->validator = new AlnumValidator();
}

Expand Down
4 changes: 4 additions & 0 deletions test/Validator/AlphaTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ class AlphaTest extends \PHPUnit_Framework_TestCase

public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->validator = new AlphaValidator();
}

Expand Down
16 changes: 15 additions & 1 deletion test/Validator/DateTimeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase

public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->locale = Locale::getDefault();
$this->timezone = date_default_timezone_get();

Expand All @@ -36,7 +40,9 @@ public function setUp()

public function tearDown()
{
Locale::setDefault($this->locale);
if (extension_loaded('intl')) {
Locale::setDefault($this->locale);
}
date_default_timezone_set($this->timezone);
}

Expand All @@ -61,6 +67,14 @@ public function testBasic($value, $expected, $options = array())

public function basicProvider()
{
if (!extension_loaded('intl')) {
if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
$this->markTestSkipped('ext/intl not enabled');
} else {
return array(array());
}
}

return array(
array('May 30, 2013', true, array('locale'=>'en', 'dateType' => \IntlDateFormatter::MEDIUM, 'timeType' => \IntlDateFormatter::NONE)),
array('30.Mai.2013', true, array('locale'=>'de', 'dateType' => \IntlDateFormatter::MEDIUM, 'timeType' => \IntlDateFormatter::NONE)),
Expand Down
8 changes: 7 additions & 1 deletion test/Validator/FloatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,19 @@ class FloatTest extends \PHPUnit_Framework_TestCase

public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->locale = Locale::getDefault();
$this->validator = new FloatValidator(array('locale' => 'en'));
}

public function tearDown()
{
Locale::setDefault($this->locale);
if (extension_loaded('intl')) {
Locale::setDefault($this->locale);
}
}

/**
Expand Down
13 changes: 12 additions & 1 deletion test/Validator/IntTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,26 @@ class IntTest extends \PHPUnit_Framework_TestCase
*/
protected $validator;

/**
* @var string
*/
protected $locale;

public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->locale = Locale::getDefault();
$this->validator = new IntValidator();
}

public function tearDown()
{
Locale::setDefault($this->locale);
if (extension_loaded('intl')) {
Locale::setDefault($this->locale);
}
}

public function intDataProvider()
Expand Down
4 changes: 4 additions & 0 deletions test/Validator/PostCodeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ class PostCodeTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->validator = new PostCodeValidator(array('locale' => 'de_AT'));
}

Expand Down
4 changes: 4 additions & 0 deletions test/View/Helper/CurrencyFormatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ class CurrencyFormatTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->helper = new CurrencyFormatHelper();
}

Expand Down
20 changes: 20 additions & 0 deletions test/View/Helper/DateFormatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ class DateFormatTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->helper = new DateFormatHelper();
}

Expand All @@ -51,6 +55,14 @@ public function tearDown()

public function dateTestsDataProvider()
{
if (!extension_loaded('intl')) {
if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
$this->markTestSkipped('ext/intl not enabled');
} else {
return array(array());
}
}

$date = new DateTime('2012-07-02T22:44:03Z');

return array(
Expand Down Expand Up @@ -143,6 +155,14 @@ public function dateTestsDataProvider()

public function dateTestsDataProviderWithPattern()
{
if (!extension_loaded('intl')) {
if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
$this->markTestSkipped('ext/intl not enabled');
} else {
return array(array());
}
}

$date = new DateTime('2012-07-02T22:44:03Z');

return array(
Expand Down
12 changes: 12 additions & 0 deletions test/View/Helper/NumberFormatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->helper = new NumberFormatHelper();
}

Expand All @@ -50,6 +54,14 @@ public function tearDown()

public function currencyTestsDataProvider()
{
if (!extension_loaded('intl')) {
if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
$this->markTestSkipped('ext/intl not enabled');
} else {
return array(array());
}
}

return array(
array(
'de_DE',
Expand Down
4 changes: 4 additions & 0 deletions test/View/Helper/PluralTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ class PluralTest extends \PHPUnit_Framework_TestCase
*/
public function setUp()
{
if (!extension_loaded('intl')) {
$this->markTestSkipped('ext/intl not enabled');
}

$this->helper = new PluralHelper();
}

Expand Down

0 comments on commit 80d00fa

Please sign in to comment.