Commit be655d4f by Carsten Brandt

extracted date format converting to a helper class

adding and reworking the conversion of: - ICU to PHP - PHP to ICU - ICU to JUI - PHP to JUI
parent 583c660c
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\helpers;
/**
* FormatConverter provides functionality to convert between different formatting pattern formats.
*
* It provides functions to convert date format patterns between different conventions.
*
* @author Carsten Brandt <mail@cebe.cc>
* @author Enrica Ruedin <e.ruedin@guggach.com>
* @since 2.0
*/
class FormatConverter extends BaseFormatConverter
{
}
<?php
// override information about intl
namespace yii\helpers {
use yiiunit\framework\i18n\FormatterTest;
if (!function_exists('yii\helpers\extension_loaded')) {
function extension_loaded($name)
{
if ($name === 'intl' && FormatterTest::$enableIntl !== null) {
return FormatterTest::$enableIntl;
}
return \extension_loaded($name);
}
}
}
namespace yiiunit\framework\helpers {
use Yii;
use yii\helpers\FormatConverter;
use yii\i18n\Formatter;
use yiiunit\framework\i18n\FormatterTest;
use yiiunit\TestCase;
/**
* @group helpers
*/
class FormatConverterTest extends TestCase
{
protected function setUp()
{
parent::setUp();
// emulate disabled intl extension
// enable it only for tests prefixed with testIntl
FormatterTest::$enableIntl = null;
if (strncmp($this->getName(false), 'testIntl', 8) === 0) {
if (!extension_loaded('intl')) {
$this->markTestSkipped('intl extension is not installed.');
}
FormatterTest::$enableIntl = true;
} else {
FormatterTest::$enableIntl = false;
}
$this->mockApplication([
'timeZone' => 'UTC',
'language' => 'ru-RU',
]);
}
protected function tearDown()
{
parent::tearDown();
FormatterTest::$enableIntl = null;
}
public function testIntlIcuToPhpShortForm()
{
$this->assertEquals('m/j/y', FormatConverter::convertDateIcuToPhp('short', 'date', 'en-US'));
$this->assertEquals('d.m.y', FormatConverter::convertDateIcuToPhp('short', 'date', 'de-DE'));
}
public function testIntlOneDigitIcu()
{
$formatter = new Formatter(['locale' => 'en-US']);
$this->assertEquals('24.8.2014', $formatter->asDate('2014-8-24', 'php:d.n.Y'));
$this->assertEquals('24.8.2014', $formatter->asDate('2014-8-24', 'd.M.yyyy'));
}
public function testOneDigitIcu()
{
$formatter = new Formatter(['locale' => 'en-US']);
$this->assertEquals('24.8.2014', $formatter->asDate('2014-8-24', 'php:d.n.Y'));
$this->assertEquals('24.8.2014', $formatter->asDate('2014-8-24', 'd.M.yyyy'));
}
}
}
\ No newline at end of file
<?php <?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\i18n; // override information about intl
namespace yii\helpers {
use yiiunit\framework\i18n\FormatterTest;
if (!function_exists('yii\helpers\extension_loaded')) {
function extension_loaded($name)
{
if ($name === 'intl' && FormatterTest::$enableIntl !== null) {
return FormatterTest::$enableIntl;
}
return \extension_loaded($name);
}
}
}
// override information about intl // override information about intl
use yiiunit\framework\i18n\FormatterTest; namespace yii\i18n {
use yiiunit\framework\i18n\FormatterTest;
function extension_loaded($name) function extension_loaded($name)
{ {
if ($name === 'intl' && FormatterTest::$enableIntl !== null) { if ($name === 'intl' && FormatterTest::$enableIntl !== null) {
return FormatterTest::$enableIntl; return FormatterTest::$enableIntl;
} }
return \extension_loaded($name); return \extension_loaded($name);
}
} }
namespace yiiunit\framework\i18n; namespace yiiunit\framework\i18n {
use yii\base\InvalidParamException; use yii\base\InvalidParamException;
use yii\i18n\Formatter; use yii\i18n\Formatter;
...@@ -64,6 +73,7 @@ class FormatterTest extends TestCase ...@@ -64,6 +73,7 @@ class FormatterTest extends TestCase
protected function tearDown() protected function tearDown()
{ {
parent::tearDown(); parent::tearDown();
static::$enableIntl = null;
$this->formatter = null; $this->formatter = null;
} }
...@@ -794,3 +804,4 @@ class FormatterTest extends TestCase ...@@ -794,3 +804,4 @@ class FormatterTest extends TestCase
$this->assertSame("1023 bytes", $this->formatter->asSize(1023)); $this->assertSame("1023 bytes", $this->formatter->asSize(1023));
} }
} }
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment