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

Commit

Permalink
Merge branch 'hotfix/5111' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#5111

Conflicts:
	tests/ZendTest/I18n/Translator/Loader/GettextTest.php
	tests/ZendTest/I18n/Translator/Loader/PhpArrayTest.php
  • Loading branch information
@weierophinney
weierophinney committed Oct 22, 2013
2 parents 7b9c0f0 + 80d00fa commit 39d06a8
Show file tree
Hide file tree
Showing 16 changed files with 142 additions and 12 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
11 changes: 8 additions & 3 deletions test/Translator/Loader/GettextTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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 @@ -32,9 +36,10 @@ public function setUp()

public function tearDown()
{
Locale::setDefault($this->originalLocale);

set_include_path($this->originalIncludePath);
if (extension_loaded('intl')) {
Locale::setDefault($this->originalLocale);
set_include_path($this->originalIncludePath);
}
}

public function testLoaderFailsToLoadMissingFile()
Expand Down
11 changes: 8 additions & 3 deletions test/Translator/Loader/PhpArrayTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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 @@ -32,9 +36,10 @@ public function setUp()

public function tearDown()
{
Locale::setDefault($this->originalLocale);

set_include_path($this->originalIncludePath);
if (extension_loaded('intl')) {
Locale::setDefault($this->originalLocale);
set_include_path($this->originalIncludePath);
}
}

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 39d06a8

Please sign in to comment.