diff --git a/src/Symfony/Components/Form/Field.php b/src/Symfony/Components/Form/Field.php index 2467a9558e..5da5d0e9f8 100644 --- a/src/Symfony/Components/Form/Field.php +++ b/src/Symfony/Components/Form/Field.php @@ -42,7 +42,7 @@ abstract class Field extends Configurable implements FieldInterface $this->addOption('property_path', (string)$key); $this->key = (string)$key; - $this->locale = \Locale::getDefault(); + $this->locale = class_exists('\Locale', false) ? \Locale::getDefault() : 'en'; $this->generator = new HtmlGenerator(); parent::__construct($options); diff --git a/src/Symfony/Components/Form/ValueTransformer/BaseValueTransformer.php b/src/Symfony/Components/Form/ValueTransformer/BaseValueTransformer.php index 680a713536..346fb7795a 100644 --- a/src/Symfony/Components/Form/ValueTransformer/BaseValueTransformer.php +++ b/src/Symfony/Components/Form/ValueTransformer/BaseValueTransformer.php @@ -27,7 +27,7 @@ abstract class BaseValueTransformer extends Configurable implements ValueTransfo */ public function __construct(array $options = array()) { - $this->locale = \Locale::getDefault(); + $this->locale = class_exists('\Locale', false) ? \Locale::getDefault() : 'en'; parent::__construct($options); } diff --git a/tests/Symfony/Tests/Components/Form/DateTimeTestCase.php b/tests/Symfony/Tests/Components/Form/DateTimeTestCase.php index 29f3602449..dcacdfacc3 100644 --- a/tests/Symfony/Tests/Components/Form/DateTimeTestCase.php +++ b/tests/Symfony/Tests/Components/Form/DateTimeTestCase.php @@ -2,7 +2,9 @@ namespace Symfony\Tests\Components\Form; -class DateTimeTestCase extends \PHPUnit_Framework_TestCase +require_once __DIR__ . '/LocalizedTestCase.php'; + +class DateTimeTestCase extends LocalizedTestCase { public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual) { diff --git a/tests/Symfony/Tests/Components/Form/FieldGroupTest.php b/tests/Symfony/Tests/Components/Form/FieldGroupTest.php index a5e8bdc19d..a6e3db3cdb 100644 --- a/tests/Symfony/Tests/Components/Form/FieldGroupTest.php +++ b/tests/Symfony/Tests/Components/Form/FieldGroupTest.php @@ -634,7 +634,7 @@ class FieldGroupTest extends \PHPUnit_Framework_TestCase $group->add($field); $group->setLocale('de_DE'); - $this->assertEquals(array(\Locale::getDefault(), 'de_DE'), $field->locales); + $this->assertEquals(array(class_exists('\Locale', false) ? \Locale::getDefault() : 'en', 'de_DE'), $field->locales); } public function testTranslatorIsPassedToField_SetBeforeAddingTheField() diff --git a/tests/Symfony/Tests/Components/Form/IntegerFieldTest.php b/tests/Symfony/Tests/Components/Form/IntegerFieldTest.php index d35b6e8ee2..ac4aa465ed 100644 --- a/tests/Symfony/Tests/Components/Form/IntegerFieldTest.php +++ b/tests/Symfony/Tests/Components/Form/IntegerFieldTest.php @@ -3,10 +3,11 @@ namespace Symfony\Tests\Components\Form; require_once __DIR__ . '/../../../../bootstrap.php'; +require_once __DIR__ . '/LocalizedTestCase.php'; use Symfony\Components\Form\IntegerField; -class IntegerFieldTest extends \PHPUnit_Framework_TestCase +class IntegerFieldTest extends LocalizedTestCase { public function testBindCastsToInteger() { diff --git a/tests/Symfony/Tests/Components/Form/LocalizedTestCase.php b/tests/Symfony/Tests/Components/Form/LocalizedTestCase.php new file mode 100644 index 0000000000..c97a19a6ab --- /dev/null +++ b/tests/Symfony/Tests/Components/Form/LocalizedTestCase.php @@ -0,0 +1,13 @@ +markTestSkipped('The "intl" extension is not available'); + } + } +} \ No newline at end of file diff --git a/tests/Symfony/Tests/Components/Form/MoneyFieldTest.php b/tests/Symfony/Tests/Components/Form/MoneyFieldTest.php index 86c51b3788..6b227ec4d3 100644 --- a/tests/Symfony/Tests/Components/Form/MoneyFieldTest.php +++ b/tests/Symfony/Tests/Components/Form/MoneyFieldTest.php @@ -3,10 +3,11 @@ namespace Symfony\Tests\Components\Form; require_once __DIR__ . '/../../../../bootstrap.php'; +require_once __DIR__ . '/LocalizedTestCase.php'; use Symfony\Components\Form\MoneyField; -class MoneyFieldTest extends \PHPUnit_Framework_TestCase +class MoneyFieldTest extends LocalizedTestCase { public function testRenderWithoutCurrency() { diff --git a/tests/Symfony/Tests/Components/Form/NumberFieldTest.php b/tests/Symfony/Tests/Components/Form/NumberFieldTest.php index dc2934b34a..838c29acd9 100644 --- a/tests/Symfony/Tests/Components/Form/NumberFieldTest.php +++ b/tests/Symfony/Tests/Components/Form/NumberFieldTest.php @@ -3,10 +3,11 @@ namespace Symfony\Tests\Components\Form; require_once __DIR__ . '/../../../../bootstrap.php'; +require_once __DIR__ . '/LocalizedTestCase.php'; use Symfony\Components\Form\NumberField; -class NumberFieldTest extends \PHPUnit_Framework_TestCase +class NumberFieldTest extends LocalizedTestCase { public function testRender() { diff --git a/tests/Symfony/Tests/Components/Form/PercentFieldTest.php b/tests/Symfony/Tests/Components/Form/PercentFieldTest.php index 531041bd15..0aa631f37d 100644 --- a/tests/Symfony/Tests/Components/Form/PercentFieldTest.php +++ b/tests/Symfony/Tests/Components/Form/PercentFieldTest.php @@ -3,10 +3,11 @@ namespace Symfony\Tests\Components\Form; require_once __DIR__ . '/../../../../bootstrap.php'; +require_once __DIR__ . '/LocalizedTestCase.php'; use Symfony\Components\Form\PercentField; -class PercentFieldTest extends \PHPUnit_Framework_TestCase +class PercentFieldTest extends LocalizedTestCase { public function testRender() { diff --git a/tests/Symfony/Tests/Components/Form/ValueTransformer/DateTimeToLocalizedStringTransformerTest.php b/tests/Symfony/Tests/Components/Form/ValueTransformer/DateTimeToLocalizedStringTransformerTest.php index dda3da248a..fc90cf98c6 100644 --- a/tests/Symfony/Tests/Components/Form/ValueTransformer/DateTimeToLocalizedStringTransformerTest.php +++ b/tests/Symfony/Tests/Components/Form/ValueTransformer/DateTimeToLocalizedStringTransformerTest.php @@ -15,6 +15,8 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase public function setUp() { + parent::setUp(); + $this->dateTime = new \DateTime('2010-02-03 04:05:06 UTC'); $this->dateTimeWithoutSeconds = new \DateTime('2010-02-03 04:05:00 UTC'); } diff --git a/tests/Symfony/Tests/Components/Form/ValueTransformer/NumberToLocalizedStringTransformerTest.php b/tests/Symfony/Tests/Components/Form/ValueTransformer/NumberToLocalizedStringTransformerTest.php index 52012e2f31..ba70c75249 100644 --- a/tests/Symfony/Tests/Components/Form/ValueTransformer/NumberToLocalizedStringTransformerTest.php +++ b/tests/Symfony/Tests/Components/Form/ValueTransformer/NumberToLocalizedStringTransformerTest.php @@ -3,11 +3,13 @@ namespace Symfony\Tests\Components\Form\ValueTransformer; require_once __DIR__ . '/../../../../../bootstrap.php'; +require_once __DIR__ . '/../LocalizedTestCase.php'; use Symfony\Components\Form\ValueTransformer\NumberToLocalizedStringTransformer; +use Symfony\Tests\Components\Form\LocalizedTestCase; -class NumberToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase +class NumberToLocalizedStringTransformerTest extends LocalizedTestCase { public function testTransform() { diff --git a/tests/Symfony/Tests/Components/Form/ValueTransformer/PercentToLocalizedStringTransformerTest.php b/tests/Symfony/Tests/Components/Form/ValueTransformer/PercentToLocalizedStringTransformerTest.php index a4e1663408..f70c8aaed0 100644 --- a/tests/Symfony/Tests/Components/Form/ValueTransformer/PercentToLocalizedStringTransformerTest.php +++ b/tests/Symfony/Tests/Components/Form/ValueTransformer/PercentToLocalizedStringTransformerTest.php @@ -3,11 +3,13 @@ namespace Symfony\Tests\Components\Form\ValueTransformer; require_once __DIR__ . '/../../../../../bootstrap.php'; +require_once __DIR__ . '/../LocalizedTestCase.php'; use Symfony\Components\Form\ValueTransformer\PercentToLocalizedStringTransformer; +use Symfony\Tests\Components\Form\LocalizedTestCase; -class PercentToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase +class PercentToLocalizedStringTransformerTest extends LocalizedTestCase { public function testTransform() {