diff --git a/framework/helpers/BaseFormatConverter.php b/framework/helpers/BaseFormatConverter.php index 1a96120..340f7d4 100644 --- a/framework/helpers/BaseFormatConverter.php +++ b/framework/helpers/BaseFormatConverter.php @@ -335,7 +335,7 @@ class BaseFormatConverter '\\\\' => '\\', ]); - // remove `''` - the're result of consecutive escaped chars (`\A\B` will be `'A''B'`, but should be `'AB'`) + // remove `''` - they're result of consecutive escaped chars (`\A\B` will be `'A''B'`, but should be `'AB'`) // real `'` are encoded as `''''` return strtr($result, [ "''''" => "''", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1796662..34e150e 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -17,16 +17,9 @@ framework/ - framework/helpers/Json.php - framework/helpers/StringHelper.php - framework/helpers/VarDumper.php - framework/helpers/Html.php - framework/helpers/Inflector.php - framework/helpers/FileHelper.php - framework/helpers/ArrayHelper.php - framework/helpers/Console.php framework/i18n/GettextFile.php framework/web/ResponseFormatterInterface.php + framework/.phpstorm.meta.php framework/base framework/db/mssql framework/bootstrap diff --git a/tests/framework/helpers/ArrayHelperTest.php b/tests/framework/helpers/ArrayHelperTest.php index fae9d02..538bb8a 100644 --- a/tests/framework/helpers/ArrayHelperTest.php +++ b/tests/framework/helpers/ArrayHelperTest.php @@ -15,131 +15,6 @@ use yii\data\Sort; use yii\helpers\ArrayHelper; use yiiunit\TestCase; -class Post1 -{ - public $id = 23; - public $title = 'tt'; -} - -class Post2 extends BaseObject -{ - public $id = 123; - public $content = 'test'; - private $secret = 's'; - public function getSecret() - { - return $this->secret; - } -} - -class Post3 extends BaseObject -{ - public $id = 33; - /** @var BaseObject */ - public $subObject; - - public function init() - { - $this->subObject = new Post2(); - } -} - -class ArrayAccessibleObject implements ArrayAccess -{ - public $name = 'bar1'; - protected $container = []; - - public function __construct($container) - { - $this->container = $container; - } - - public function offsetSet($offset, $value) - { - if (is_null($offset)) { - $this->container[] = $value; - } else { - $this->container[$offset] = $value; - } - } - - public function offsetExists($offset) - { - return array_key_exists($offset, $this->container); - } - - public function offsetUnset($offset) - { - unset($this->container[$offset]); - } - - public function offsetGet($offset) - { - return $this->offsetExists($offset) ? $this->container[$offset] : null; - } -} - -class TraversableArrayAccessibleObject extends ArrayAccessibleObject implements Iterator -{ - private $position = 0; - - public function __construct($container) - { - $this->position = 0; - - parent::__construct($container); - } - - protected function getContainerKey($keyIndex) - { - $keys = array_keys($this->container); - return array_key_exists($keyIndex, $keys) ? $keys[$keyIndex] : false; - } - - public function rewind() - { - $this->position = 0; - } - - public function current() - { - return $this->offsetGet($this->getContainerKey($this->position)); - } - - public function key() - { - return $this->getContainerKey($this->position); - } - - public function next() - { - ++$this->position; - } - - public function valid() - { - $key = $this->getContainerKey($this->position); - return !(!$key || !$this->offsetExists($key)); - } -} - -class MagicModel extends Model -{ - protected $magic; - - public function getMagic() - { - return 42; - } - - private $moreMagic; - - public function getMoreMagic() - { - return 'ta-da'; - } -} - /** * @group helpers */ @@ -181,7 +56,7 @@ class ArrayHelperTest extends TestCase '_content' => 'test', 'length' => 4, ], ArrayHelper::toArray($object, [ - $object->className() => [ + $object::className() => [ 'id', 'secret', '_content' => 'content', 'length' => function ($post) { @@ -200,7 +75,8 @@ class ArrayHelperTest extends TestCase ], ], ArrayHelper::toArray($object)); - //recursive with attributes of object and subobject + //recursive with attributes of object and sub-object + $subObject = $object->subObject; $this->assertEquals([ 'id' => 33, 'id_plus_1' => 34, @@ -209,13 +85,13 @@ class ArrayHelperTest extends TestCase 'id_plus_1' => 124, ], ], ArrayHelper::toArray($object, [ - $object->className() => [ + $object::className() => [ 'id', 'subObject', 'id_plus_1' => function ($post) { return $post->id + 1; }, ], - $object->subObject->className() => [ + $subObject::className() => [ 'id', 'id_plus_1' => function ($post) { return $post->id + 1; @@ -231,7 +107,7 @@ class ArrayHelperTest extends TestCase 'id_plus_1' => 124, ], ], ArrayHelper::toArray($object, [ - $object->subObject->className() => [ + $subObject::className() => [ 'id', 'id_plus_1' => function ($post) { return $post->id + 1; @@ -442,20 +318,16 @@ class ArrayHelperTest extends TestCase ], $changelog); } - /** - * @expectedException \yii\base\InvalidParamException - */ public function testMultisortInvalidParamExceptionDirection() { + $this->expectException('yii\base\InvalidParamException'); $data = ['foo' => 'bar']; ArrayHelper::multisort($data, ['foo'], []); } - /** - * @expectedException \yii\base\InvalidParamException - */ public function testMultisortInvalidParamExceptionSortFlag() { + $this->expectException('yii\base\InvalidParamException'); $data = ['foo' => 'bar']; ArrayHelper::multisort($data, ['foo'], ['foo'], []); } @@ -857,12 +729,10 @@ class ArrayHelperTest extends TestCase $this->assertFalse(ArrayHelper::keyExists('c', $array)); } - /** - * @expectedException \yii\base\InvalidArgumentException - * @expectedExceptionMessage Second parameter($array) cannot be ArrayAccess in case insensitive mode - */ public function testKeyExistsArrayAccessCaseInsensitiveThrowsError() { + $this->expectException('yii\base\InvalidArgumentException'); + $this->expectExceptionMessage('Second parameter($array) cannot be ArrayAccess in case insensitive mode'); $array = new TraversableArrayAccessibleObject([ 'a' => 1, 'B' => 2, @@ -945,26 +815,21 @@ class ArrayHelperTest extends TestCase $this->assertEquals(23, ArrayHelper::getValue($object, 'id')); } - /** - * This is expected to result in a PHP error. - * @requires PHPUnit 6.0 - */ public function testGetValueNonexistingProperties1() { - $this->expectException('PHPUnit\Framework\Error\Notice'); + if (PHP_VERSION_ID < 80000) { + $this->expectException('PHPUnit_Framework_Error_Notice'); + } else { + $this->expectException('PHPUnit_Framework_Error_Warning'); + } $object = new Post1(); - $this->assertNull(ArrayHelper::getValue($object, 'nonExisting')); + ArrayHelper::getValue($object, 'nonExisting'); } - /** - * This is expected to result in a PHP error. - * @requires PHPUnit 6.0 - */ - public function testGetValueNonexistingProperties2() + public function testGetValueNonexistingPropertiesForArrayObject() { - $this->expectException('PHPUnit\Framework\Error\Notice'); $arrayObject = new \ArrayObject(['id' => 23], \ArrayObject::ARRAY_AS_PROPS); - $this->assertEquals(23, ArrayHelper::getValue($arrayObject, 'nonExisting')); + $this->assertNull(ArrayHelper::getValue($arrayObject, 'nonExisting')); } public function testGetValueFromArrayAccess() @@ -1364,12 +1229,10 @@ class ArrayHelperTest extends TestCase $this->assertFalse(ArrayHelper::isIn('1', [1, 'a'], true)); } - /** - * @expectedException \yii\base\InvalidParamException - * @expectedExceptionMessage Argument $haystack must be an array or implement Traversable - */ public function testInException() { + $this->expectException('yii\base\InvalidParamException'); + $this->expectExceptionMessage('Argument $haystack must be an array or implement Traversable'); ArrayHelper::isIn('value', null); } @@ -1385,12 +1248,10 @@ class ArrayHelperTest extends TestCase $this->assertFalse(ArrayHelper::isSubset(new \ArrayObject([1]), ['1', 'b'], true)); } - /** - * @expectedException \yii\base\InvalidParamException - * @expectedExceptionMessage Argument $needles must be an array or implement Traversable - */ public function testIsSubsetException() { + $this->expectException('yii\base\InvalidParamException'); + $this->expectExceptionMessage('Argument $needles must be an array or implement Traversable'); ArrayHelper::isSubset('a', new \ArrayObject(['a', 'b'])); } @@ -1504,6 +1365,9 @@ class ArrayHelperTest extends TestCase 'C' => 2, ], ], ArrayHelper::filter($array, ['A', '!A.D'])); + $this->assertEquals([ + 'G' => 1 + ], ArrayHelper::filter($array, ['G', '!Z', '!X.A'])); //Non existing keys tests $this->assertEquals([], ArrayHelper::filter($array, ['X'])); @@ -1566,3 +1430,128 @@ class ArrayHelperTest extends TestCase $this->assertEquals('ta-da', ArrayHelper::getValue($model, 'moreMagic')); } } + +class Post1 +{ + public $id = 23; + public $title = 'tt'; +} + +class Post2 extends BaseObject +{ + public $id = 123; + public $content = 'test'; + private $secret = 's'; + public function getSecret() + { + return $this->secret; + } +} + +class Post3 extends BaseObject +{ + public $id = 33; + /** @var BaseObject */ + public $subObject; + + public function init() + { + $this->subObject = new Post2(); + } +} + +class ArrayAccessibleObject implements ArrayAccess +{ + public $name = 'bar1'; + protected $container = []; + + public function __construct($container) + { + $this->container = $container; + } + + public function offsetSet($offset, $value) + { + if (is_null($offset)) { + $this->container[] = $value; + } else { + $this->container[$offset] = $value; + } + } + + public function offsetExists($offset) + { + return array_key_exists($offset, $this->container); + } + + public function offsetUnset($offset) + { + unset($this->container[$offset]); + } + + public function offsetGet($offset) + { + return $this->offsetExists($offset) ? $this->container[$offset] : null; + } +} + +class TraversableArrayAccessibleObject extends ArrayAccessibleObject implements Iterator +{ + private $position = 0; + + public function __construct($container) + { + $this->position = 0; + + parent::__construct($container); + } + + protected function getContainerKey($keyIndex) + { + $keys = array_keys($this->container); + return array_key_exists($keyIndex, $keys) ? $keys[$keyIndex] : false; + } + + public function rewind() + { + $this->position = 0; + } + + public function current() + { + return $this->offsetGet($this->getContainerKey($this->position)); + } + + public function key() + { + return $this->getContainerKey($this->position); + } + + public function next() + { + ++$this->position; + } + + public function valid() + { + $key = $this->getContainerKey($this->position); + return !(!$key || !$this->offsetExists($key)); + } +} + +class MagicModel extends Model +{ + protected $magic; + + public function getMagic() + { + return 42; + } + + private $moreMagic; + + public function getMoreMagic() + { + return 'ta-da'; + } +} diff --git a/tests/framework/helpers/BaseConsoleTest.php b/tests/framework/helpers/BaseConsoleTest.php index 0a655df..d9a4391 100644 --- a/tests/framework/helpers/BaseConsoleTest.php +++ b/tests/framework/helpers/BaseConsoleTest.php @@ -80,4 +80,10 @@ class BaseConsoleTest extends TestCase ['Foo%yBar%nYes', 5, 3, '%yr%nYe'], ]; } + + public function testAnsiStrlen() + { + $this->assertSame(3, BaseConsole::ansiStrlen('Foo')); + $this->assertSame(3, BaseConsole::ansiStrlen(BaseConsole::renderColoredString('Bar%y'))); + } } diff --git a/tests/framework/helpers/FormatConverterTest.php b/tests/framework/helpers/FormatConverterTest.php index cd06418..ecd2d70 100644 --- a/tests/framework/helpers/FormatConverterTest.php +++ b/tests/framework/helpers/FormatConverterTest.php @@ -43,18 +43,297 @@ class FormatConverterTest extends TestCase $this->assertEquals('d.m.y', FormatConverter::convertDateIcuToPhp('short', 'date', 'de-DE')); } - public function testEscapedIcuToPhp() + public function testIntlIcuToPhpShortFormDefaultLang() + { + Yii::$app->language = 'en'; + $this->assertEquals('n/j/y', FormatConverter::convertDateIcuToPhp('short', 'date')); + Yii::$app->language = 'de'; + $this->assertEquals('d.m.y', FormatConverter::convertDateIcuToPhp('short', 'date')); + } + + public function testIntlIcuToPhpShortFormTime() + { + $this->assertEquals('g:i A', FormatConverter::convertDateIcuToPhp('short', 'time', 'en-US')); + $this->assertEquals('H:i', FormatConverter::convertDateIcuToPhp('short', 'time', 'de-DE')); + } + + public function testIntlIcuToPhpShortFormDateTime() + { + $this->assertEquals('n/j/y, g:i A', FormatConverter::convertDateIcuToPhp('short', 'datetime', 'en-US')); + $this->assertEquals( + PHP_VERSION_ID < 50600 ? 'd.m.y H:i' : 'd.m.y, H:i', + FormatConverter::convertDateIcuToPhp('short', 'datetime', 'de-DE') + ); + } + + public function testEscapedIcuToPhpMixedPatterns() { $this->assertEquals('l, F j, Y \\a\\t g:i:s A T', FormatConverter::convertDateIcuToPhp('EEEE, MMMM d, y \'at\' h:mm:ss a zzzz')); $this->assertEquals('\\o\\\'\\c\\l\\o\\c\\k', FormatConverter::convertDateIcuToPhp('\'o\'\'clock\'')); } + public function providerForICU2PHPPatterns() + { + return [ + 'two single quotes produce one' => ["''", "\\'"], + 'era designator like (Anno Domini)' => ['G', ''], + '4digit year of "Week of Year"' => ['Y', 'o'], + '4digit year #1' => ['y', 'Y'], + '4digit year #2' => ['yyyy', 'Y'], + '2digit year number' => ['yy', 'y'], + 'extended year e.g. 4601' => ['u', ''], + 'cyclic year name, as in Chinese lunar calendar' => ['U', ''], + 'related Gregorian year e.g. 1996' => ['r', ''], + 'number of quarter' => ['Q', ''], + 'number of quarter "02"' => ['QQ', ''], + 'quarter "Q2"' => ['QQQ', ''], + 'quarter 2nd quarter' => ['QQQQ', ''], + 'number of quarter 2' => ['QQQQQ', ''], + 'number of Stand Alone quarter' => ['q', ''], + 'number of Stand Alone quarter "02"' => ['qq', ''], + 'Stand Alone quarter "Q2"' => ['qqq', ''], + 'Stand Alone quarter "2nd quarter"' => ['qqqq', ''], + 'number of Stand Alone quarter "2"' => ['qqqqq', ''], + 'Numeric representation of a month, without leading zeros' => ['M', 'n'], + 'Numeric representation of a month, with leading zeros' => ['MM', 'm'], + 'A short textual representation of a month, three letters' => ['MMM', 'M'], + 'A full textual representation of a month, such as January or March' => ['MMMM', 'F'], + 'MMMMM' => ['MMMMM', ''], + 'Stand alone month in year #1' => ['L', 'n'], + 'Stand alone month in year #2' => ['LL', 'm'], + 'Stand alone month in year #3' => ['LLL', 'M'], + 'Stand alone month in year #4' => ['LLLL', 'F'], + 'Stand alone month in year #5' => ['LLLLL', ''], + 'ISO-8601 week number of year #1' => ['w', 'W'], + 'ISO-8601 week number of year #2' => ['ww', 'W'], + 'week of the current month' => ['W', ''], + 'day without leading zeros' => ['d', 'j'], + 'day with leading zeros' => ['dd', 'd'], + 'day of the year 0 to 365' => ['D', 'z'], + 'Day of Week in Month. eg. 2nd Wednesday in July' => ['F', ''], + 'Modified Julian day. This is different from the conventional Julian day number in two regards.' => ['g', ''], + 'day of week written in short form eg. Sun' => ['E', 'D'], + 'EE' => ['EE', 'D'], + 'EEE' => ['EEE', 'D'], + 'day of week fully written eg. Sunday' => ['EEEE', 'l'], + 'EEEEE' => ['EEEEE', ''], + 'EEEEEE' => ['EEEEEE', ''], + 'ISO-8601 numeric representation of the day of the week 1=Mon to 7=Sun #1' => ['e', 'N'], + 'php "w" 0=Sun to 6=Sat isn`t supported by ICU -> "w" means week number of year #1' => ['ee', 'N'], + 'eee' => ['eee', 'D'], + 'eeee' => ['eeee', 'l'], + 'eeeee' => ['eeeee', ''], + 'eeeeee' => ['eeeeee', ''], + 'ISO-8601 numeric representation of the day of the week 1=Mon to 7=Sun #2' => ['c', 'N'], + 'php "w" 0=Sun to 6=Sat isn`t supported by ICU -> "w" means week number of year #2' => ['cc', 'N'], + 'ccc' => ['ccc', 'D'], + 'cccc' => ['cccc', 'l'], + 'ccccc' => ['ccccc', ''], + 'cccccc' => ['cccccc', ''], + 'AM/PM marker' => ['a', 'A'], + '12-hour format of an hour without leading zeros 1 to 12h' => ['h', 'g'], + '12-hour format of an hour with leading zeros, 01 to 12 h' => ['hh', 'h'], + '24-hour format of an hour without leading zeros 0 to 23h' => ['H', 'G'], + '24-hour format of an hour with leading zeros, 00 to 23 h' => ['HH', 'H'], + 'hour in day (1~24) #1' => ['k', ''], + 'hour in day (1~24) #2' => ['kk', ''], + 'hour in am/pm (0~11) #1' => ['K', ''], + 'hour in am/pm (0~11) #2' => ['KK', ''], + 'Minutes without leading zeros, not supported by php but we fallback' => ['m', 'i'], + 'Minutes with leading zeros' => ['mm', 'i'], + 'Seconds, without leading zeros, not supported by php but we fallback' => ['s', 's'], + 'Seconds, with leading zeros' => ['ss', 's'], + 'fractional second #1' => ['S', ''], + 'fractional second #2' => ['SS', ''], + 'fractional second #3' => ['SSS', ''], + 'fractional second #4' => ['SSSS', ''], + 'milliseconds in day' => ['A', ''], + 'Timezone abbreviation #1' => ['z', 'T'], + 'Timezone abbreviation #2' => ['zz', 'T'], + 'Timezone abbreviation #3' => ['zzz', 'T'], + 'Timezone full name, not supported by php but we fallback' => ['zzzz', 'T'], + 'Difference to Greenwich time (GMT) in hours #1' => ['Z', 'O'], + 'Difference to Greenwich time (GMT) in hours #2' => ['ZZ', 'O'], + 'Difference to Greenwich time (GMT) in hours #3' => ['ZZZ', 'O'], + 'Time Zone: long localized GMT (=OOOO) e.g. GMT-08:00' => ['ZZZZ', '\G\M\TP'], + 'TIme Zone: ISO8601 extended hms? (=XXXXX)' => ['ZZZZZ', ''], + 'Time Zone: short localized GMT e.g. GMT-8' => ['O', ''], + 'Time Zone: long localized GMT (=ZZZZ) e.g. GMT-08:00' => ['OOOO', '\G\M\TP'], + 'Time Zone: generic non-location (falls back first to VVVV and then to OOOO) using the ICU defined fallback here #1' => ['v', '\G\M\TP'], + 'Time Zone: generic non-location (falls back first to VVVV and then to OOOO) using the ICU defined fallback here #2' => ['vvvv', '\G\M\TP'], + 'Time Zone: short time zone ID' => ['V', ''], + 'Time Zone: long time zone ID' => ['VV', 'e'], + 'Time Zone: time zone exemplar city' => ['VVV', ''], + 'Time Zone: generic location (falls back to OOOO) using the ICU defined fallback here' => ['VVVV', '\G\M\TP'], + 'Time Zone: ISO8601 basic hm?, with Z for 0, e.g. -08, +0530, Z' => ['X', ''], + 'Time Zone: ISO8601 basic hm, with Z, e.g. -0800, Z' => ['XX', 'O, \Z'], + 'Time Zone: ISO8601 extended hm, with Z, e.g. -08:00, Z' => ['XXX', 'P, \Z'], + 'Time Zone: ISO8601 basic hms?, with Z, e.g. -0800, -075258, Z' => ['XXXX', ''], + 'Time Zone: ISO8601 extended hms?, with Z, e.g. -08:00, -07:52:58, Z' => ['XXXXX', ''], + 'Time Zone: ISO8601 basic hm?, without Z for 0, e.g. -08, +0530' => ['x', ''], + 'Time Zone: ISO8601 basic hm, without Z, e.g. -0800' => ['xx', 'O'], + 'Time Zone: ISO8601 extended hm, without Z, e.g. -08:00' => ['xxx', 'P'], + 'Time Zone: ISO8601 basic hms?, without Z, e.g. -0800, -075258' => ['xxxx', ''], + 'Time Zone: ISO8601 extended hms?, without Z, e.g. -08:00, -07:52:58' => ['xxxxx', ''], + ]; + } + + /** + * @dataProvider providerForICU2PHPPatterns + */ + public function testEscapedIcuToPhpSinglePattern($pattern, $expected) + { + $this->assertEquals($expected, FormatConverter::convertDateIcuToPhp($pattern)); + } + public function testEscapedIcuToJui() { - $this->assertEquals('l, F j, Y \\a\\t g:i:s A T', FormatConverter::convertDateIcuToPhp('EEEE, MMMM d, y \'at\' h:mm:ss a zzzz')); + $this->assertEquals('DD, MM d, yy \'at\' ', FormatConverter::convertDateIcuToJui('EEEE, MMMM d, y \'at\' zzzz')); $this->assertEquals('\'o\'\'clock\'', FormatConverter::convertDateIcuToJui('\'o\'\'clock\'')); } + public function testIntlIcuToJuiShortForm() + { + $this->assertEquals('m/d/y', FormatConverter::convertDateIcuToJui('short', 'date', 'en-US')); + $this->assertEquals('dd.mm.y', FormatConverter::convertDateIcuToJui('short', 'date', 'de-DE')); + } + + public function testIntlIcuToJuiShortFormDefaultLang() + { + Yii::$app->language = 'en'; + $this->assertEquals('m/d/y', FormatConverter::convertDateIcuToJui('short', 'date')); + Yii::$app->language = 'de'; + $this->assertEquals('dd.mm.y', FormatConverter::convertDateIcuToJui('short', 'date')); + } + + public function testIntlIcuToJuiShortFormTime() + { + $this->assertEquals(': ', FormatConverter::convertDateIcuToJui('short', 'time', 'en-US')); + $this->assertEquals(':', FormatConverter::convertDateIcuToJui('short', 'time', 'de-DE')); + } + + public function testIntlIcuToJuiShortFormDateTime() + { + $this->assertEquals('m/d/y, : ', FormatConverter::convertDateIcuToJui('short', 'datetime', 'en-US')); + $this->assertEquals( + PHP_VERSION_ID < 50600 ? 'dd.mm.y :' : 'dd.mm.y, :', + FormatConverter::convertDateIcuToJui('short', 'datetime', 'de-DE') + ); + } + + public function providerForICU2JUIPatterns() + { + return [ + 'era designator like (Anno Domini)' => ['G', ''], + '4digit year of "Week of Year"' => ['Y', ''], + '4digit year e.g. 2014 #1' => ['y', 'yy'], + '4digit year e.g. 2014 #2' => ['yyyy', 'yy'], + '2digit year number eg. 14' => ['yy', 'y'], + 'extended year e.g. 4601' => ['u', ''], + 'cyclic year name, as in Chinese lunar calendar' => ['U', ''], + 'related Gregorian year e.g. 1996' => ['r', ''], + 'number of quarter' => ['Q', ''], + 'number of quarter "02"' => ['QQ', ''], + 'quarter "Q2"' => ['QQQ', ''], + 'quarter "2nd quarter"' => ['QQQQ', ''], + 'number of quarter "2"' => ['QQQQQ', ''], + 'number of Stand Alone quarter' => ['q', ''], + 'number of Stand Alone quarter "02"' => ['qq', ''], + 'Stand Alone quarter "Q2"' => ['qqq', ''], + 'Stand Alone quarter "2nd quarter"' => ['qqqq', ''], + 'number of Stand Alone quarter "2"' => ['qqqqq', ''], + 'Numeric representation of a month, without leading zeros' => ['M', 'm'], + 'Numeric representation of a month, with leading zeros' => ['MM', 'mm'], + 'A short textual representation of a month, three letters' => ['MMM', 'M'], + 'A full textual representation of a month, such as January or March' => ['MMMM', 'MM'], + 'MMMMM' => ['MMMMM', ''], + 'Stand alone month in year #1' => ['L', 'm'], + 'Stand alone month in year #2' => ['LL', 'mm'], + 'Stand alone month in year #3' => ['LLL', 'M'], + 'Stand alone month in year #4' => ['LLLL', 'MM'], + 'Stand alone month in year #5' => ['LLLLL', ''], + 'ISO-8601 week number of year #1' => ['w', ''], + 'ISO-8601 week number of year #2' => ['ww', ''], + 'week of the current month' => ['W', ''], + 'day without leading zeros' => ['d', 'd'], + 'day with leading zeros' => ['dd', 'dd'], + 'day of the year 0 to 365' => ['D', 'o'], + 'Day of Week in Month. eg. 2nd Wednesday in July' => ['F', ''], + 'Modified Julian day. This is different from the conventional Julian day number in two regards.' => ['g', ''], + 'day of week written in short form eg. Sun' => ['E', 'D'], + 'EE' => ['EE', 'D'], + 'EEE' => ['EEE', 'D'], + 'day of week fully written eg. Sunday' => ['EEEE', 'DD'], + 'EEEEE' => ['EEEEE', ''], + 'EEEEEE' => ['EEEEEE', ''], + 'ISO-8601 numeric representation of the day of the week 1=Mon to 7=Sun #1' => ['e', ''], + 'php "w" 0=Sun to 6=Sat isn`t supported by ICU -> "w" means week number of year #1' => ['ee', ''], + 'eee' => ['eee', 'D'], + 'eeee' => ['eeee', ''], + 'eeeee' => ['eeeee', ''], + 'eeeeee' => ['eeeeee', ''], + 'ISO-8601 numeric representation of the day of the week 1=Mon to 7=Sun #2' => ['c', ''], + 'php "w" 0=Sun to 6=Sat isn`t supported by ICU -> "w" means week number of year #2' => ['cc', ''], + 'ccc' => ['ccc', 'D'], + 'cccc' => ['cccc', 'DD'], + 'ccccc' => ['ccccc', ''], + 'cccccc' => ['cccccc', ''], + 'am/pm marker' => ['a', ''], + '12-hour format of an hour without leading zeros 1 to 12h' => ['h', ''], + '12-hour format of an hour with leading zeros, 01 to 12 h' => ['hh', ''], + '24-hour format of an hour without leading zeros 0 to 23h' => ['H', ''], + '24-hour format of an hour with leading zeros, 00 to 23 h' => ['HH', ''], + 'hour in day (1~24) #1' => ['k', ''], + 'hour in day (1~24) #2' => ['kk', ''], + 'hour in am/pm (0~11) #1' => ['K', ''], + 'hour in am/pm (0~11) #2' => ['KK', ''], + 'Minutes without leading zeros, not supported by php but we fallback' => ['m', ''], + 'Minutes with leading zeros' => ['mm', ''], + 'Seconds, without leading zeros, not supported by php but we fallback' => ['s', ''], + 'Seconds, with leading zeros' => ['ss', ''], + 'fractional second #1' => ['S', ''], + 'fractional second #2' => ['SS', ''], + 'fractional second #3' => ['SSS', ''], + 'fractional second #4' => ['SSSS', ''], + 'milliseconds in day' => ['A', ''], + 'Timezone abbreviation #1' => ['z', ''], + 'Timezone abbreviation #2' => ['zz', ''], + 'Timezone abbreviation #3' => ['zzz', ''], + 'Timezone full name, not supported by php but we fallback' => ['zzzz', ''], + 'Difference to Greenwich time (GMT) in hours #1' => ['Z', ''], + 'Difference to Greenwich time (GMT) in hours #2' => ['ZZ', ''], + 'Difference to Greenwich time (GMT) in hours #3' => ['ZZZ', ''], + 'Time Zone: long localized GMT (=OOOO) e.g. GMT-08:00' => ['ZZZZ', ''], + 'Time Zone: ISO8601 extended hms? (=XXXXX)' => ['ZZZZZ', ''], + 'Time Zone: short localized GMT e.g. GMT-8' => ['O', ''], + 'Time Zone: long localized GMT (=ZZZZ) e.g. GMT-08:00' => ['OOOO', ''], + 'Time Zone: generic non-location (falls back first to VVVV and then to OOOO) using the ICU defined fallback here #1' => ['v', ''], + 'Time Zone: generic non-location (falls back first to VVVV and then to OOOO) using the ICU defined fallback here #2' => ['vvvv', ''], + 'Time Zone: short time zone ID' => ['V', ''], + 'Time Zone: long time zone ID' => ['VV', ''], + 'Time Zone: time zone exemplar city' => ['VVV', ''], + 'Time Zone: generic location (falls back to OOOO) using the ICU defined fallback here' => ['VVVV', ''], + 'Time Zone: ISO8601 basic hm?, with Z for 0, e.g. -08, +0530, Z' => ['X', ''], + 'Time Zone: ISO8601 basic hm, with Z, e.g. -0800, Z' => ['XX', ''], + 'Time Zone: ISO8601 extended hm, with Z, e.g. -08:00, Z' => ['XXX', ''], + 'Time Zone: ISO8601 basic hms?, with Z, e.g. -0800, -075258, Z' => ['XXXX', ''], + 'Time Zone: ISO8601 extended hms?, with Z, e.g. -08:00, -07:52:58, Z' => ['XXXXX', ''], + 'Time Zone: ISO8601 basic hm?, without Z for 0, e.g. -08, +0530' => ['x', ''], + 'Time Zone: ISO8601 basic hm, without Z, e.g. -0800' => ['xx', ''], + 'Time Zone: ISO8601 extended hm, without Z, e.g. -08:00' => ['xxx', ''], + 'Time Zone: ISO8601 basic hms?, without Z, e.g. -0800, -075258' => ['xxxx', ''], + 'Time Zone: ISO8601 extended hms?, without Z, e.g. -08:00, -07:52:58' => ['xxxxx', ''], + ]; + } + + /** + * @dataProvider providerForICU2JUIPatterns + */ + public function testEscapedIcuToJuiSinglePattern($pattern, $expected) + { + $this->assertEquals($expected, FormatConverter::convertDateIcuToJui($pattern)); + } + public function testIntlOneDigitIcu() { $formatter = new Formatter(['locale' => 'en-US']); @@ -82,7 +361,7 @@ class FormatConverterTest extends TestCase $this->assertRegExp('/24 авг\.? 2014 г\./', $formatter->asDate('2014-8-24', "dd MMM y 'г'.")); } - public function testPhpToICU() + public function testPhpToICUMixedPatterns() { $expected = "yyyy-MM-dd'T'HH:mm:ssxxx"; $actual = FormatConverter::convertDatePhpToIcu('Y-m-d\TH:i:sP'); @@ -109,6 +388,97 @@ class FormatConverterTest extends TestCase $this->assertEquals($expected, $actual); } + public function providerForPHP2ICUPatterns() + { + return [ + 'single \' should be encoded as \'\', which internally should be encoded as \'\'\'\'' => ["'", "''"], + '\d' => ['\d', "'d'"], + 'Day of the month, 2 digits with leading zeros 01 to 31' => ['d', 'dd'], + '\D' => ['\D', "'D'"], + 'A textual representation of a day, three letters Mon through Sun' => ['D', 'eee'], + '\j' => ['\j', "'j'"], + 'Day of the month without leading zeros 1 to 31' => ['j', 'd'], + '\l' => ['\l', "'l'"], + 'A full textual representation of the day of the week Sunday through Saturday' => ['l', 'eeee'], + '\N' => ['\N', "'N'"], + 'ISO-8601 numeric representation of the day of the week, 1 (for Monday) through 7 (for Sunday)' => ['N', 'e'], + '\S' => ['\S', "'S'"], + 'English ordinal suffix for the day of the month, 2 characters st, nd, rd or th. Works well with j' => ['S', ''], + '\w' => ['\w', "'w'"], + 'Numeric representation of the day of the week 0 (for Sunday) through 6 (for Saturday)' => ['w', ''], + '\z' => ['\z', "'z'"], + 'The day of the year (starting from 0) 0 through 365' => ['z', 'D'], + '\W' => ['\W', "'W'"], + 'ISO-8601 week number of year, weeks starting on Monday (added in PHP 4.1.0) Example: 42 (the 42nd week in the year)' => ['W', 'w'], + '\F' => ['\F', "'F'"], + 'A full textual representation of a month, January through December' => ['F', 'MMMM'], + '\m' => ['\m', "'m'"], + 'Numeric representation of a month, with leading zeros 01 through 12' => ['m', 'MM'], + '\M' => ['\M', "'M'"], + 'A short textual representation of a month, three letters Jan through Dec' => ['M', 'MMM'], + '\n' => ['\n', "'n'"], + 'Numeric representation of a month, without leading zeros 1 through 12, not supported by ICU but we fallback to "with leading zero"' => ['n', 'M'], + '\t' => ['\t', "'t'"], + 'Number of days in the given month 28 through 31' => ['t', ''], + '\L' => ['\L', "'L'"], + 'Whether it`s a leap year, 1 if it is a leap year, 0 otherwise.' => ['L', ''], + '\o' => ['\o', "'o'"], + 'ISO-8601 year number. This has the same value as Y, except that if the ISO week number (W) belongs to the previous or next year, that year is used instead.' => ['o', 'Y'], + '\Y' => ['\Y', "'Y'"], + 'A full numeric representation of a year, 4 digits Examples: 1999 or 2003' => ['Y', 'yyyy'], + '\y' => ['\y', "'y'"], + 'A two digit representation of a year Examples: 99 or 03' => ['y', 'yy'], + '\a' => ['\a', "'a'"], + 'Lowercase Ante meridiem and Post meridiem, am or pm' => ['a', 'a'], + '\A' => ['\A', "'A'"], + 'Uppercase Ante meridiem and Post meridiem, AM or PM, not supported by ICU but we fallback to lowercase' => ['A', 'a'], + '\B' => ['\B', "'B'"], + '\A\B' => ['\A\B', "'AB'"], + 'Swatch Internet time 000 through 999' => ['B', ''], + '\g' => ['\g', "'g'"], + '12-hour format of an hour without leading zeros 1 through 12' => ['g', 'h'], + '\G' => ['\G', "'G'"], + '24-hour format of an hour without leading zeros 0 to 23h' => ['G', 'H'], + '\h' => ['\h', "'h'"], + '12-hour format of an hour with leading zeros, 01 to 12 h' => ['h', 'hh'], + '\H' => ['\H', "'H'"], + '24-hour format of an hour with leading zeros, 00 to 23 h' => ['H', 'HH'], + '\i' => ['\i', "'i'"], + 'Minutes with leading zeros 00 to 59' => ['i', 'mm'], + '\s' => ['\s', "'s'"], + 'Seconds, with leading zeros 00 through 59' => ['s', 'ss'], + '\u' => ['\u', "'u'"], + 'Microseconds. Example: 654321' => ['u', ''], + '\e' => ['\e', "'e'"], + 'Timezone identifier. Examples: UTC, GMT, Atlantic/Azores' => ['e', 'VV'], + '\I' => ['\I', "'I'"], + 'Whether or not the date is in daylight saving time, 1 if Daylight Saving Time, 0 otherwise.' => ['I', ''], + '\O' => ['\O', "'O'"], + 'Difference to Greenwich time (GMT) in hours, Example: +0200' => ['O', 'xx'], + '\P' => ['\P', "'P'"], + 'Difference to Greenwich time (GMT) with colon between hours and minutes, Example: +02:00' => ['P', 'xxx'], + '\T' => ['\T', "'T'"], + 'Timezone abbreviation, Examples: EST, MDT ...' => ['T', 'zzz'], + '\Z' => ['\Z', "'Z'"], + 'Timezone offset in seconds. The offset for timezones west of UTC is always negative, and for those east of UTC is always positive. -43200 through 50400' => ['Z', ''], + '\c' => ['\c', "'c'"], + 'ISO 8601 date, e.g. 2004-02-12T15:19:21+00:00' => ['c', "yyyy-MM-dd'T'HH:mm:ssxxx"], + '\r' => ['\r', "'r'"], + 'RFC 2822 formatted date, Example: Thu, 21 Dec 2000 16:01:07 +0200' => ['r', 'eee, dd MMM yyyy HH:mm:ss xx'], + '\U' => ['\U', "'U'"], + 'Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)' => ['U', ''], + '\\' => ['\\\\', '\\'], + ]; + } + + /** + * @dataProvider providerForPHP2ICUPatterns + */ + public function testPhpToICUSinglePattern($pattern, $expected) + { + $this->assertEquals($expected, FormatConverter::convertDatePhpToIcu($pattern)); + } + public function testPhpFormatC() { $time = time(); @@ -120,4 +490,60 @@ class FormatConverterTest extends TestCase $formatter = new Formatter(['locale' => 'ru-RU', 'timeZone' => 'Europe/Moscow']); $this->assertEquals(date('c', $time), $formatter->asDatetime($time, 'php:c')); } + + public function testEscapedPhpToJuiMixedPatterns() + { + $this->assertEquals('dd-mm-yy', FormatConverter::convertDatePhpToJui('d-m-Y')); + } + + public function providerForPHP2JUIPatterns() + { + return [ + 'Day of the month, 2 digits with leading zeros 01 to 31' => ['d', 'dd'], + 'A textual representation of a day, three letters Mon through Sun' => ['D', 'D'], + 'Day of the month without leading zeros 1 to 31' => ['j', 'd'], + 'A full textual representation of the day of the week Sunday through Saturday' => ['l', 'DD'], + 'ISO-8601 numeric representation of the day of the week, 1 (for Monday) through 7 (for Sunday)' => ['N', ''], + 'English ordinal suffix for the day of the month, 2 characters st, nd, rd or th. Works well with j' => ['S', ''], + 'Numeric representation of the day of the week 0 (for Sunday) through 6 (for Saturday)' => ['w', ''], + 'The day of the year (starting from 0) 0 through 365' => ['z', 'o'], + 'ISO-8601 week number of year, weeks starting on Monday (added in PHP 4.1.0) Example: 42 (the 42nd week in the year)' => ['W', ''], + 'A full textual representation of a month, January through December' => ['F', 'MM'], + 'Numeric representation of a month, with leading zeros 01 through 12' => ['m', 'mm'], + 'A short textual representation of a month, three letters Jan through Dec' => ['M', 'M'], + 'Numeric representation of a month, without leading zeros 1 through 12' => ['n', 'm'], + 'Number of days in the given month 28 through 31' => ['t', ''], + 'Whether it`s a leap year, 1 if it is a leap year, 0 otherwise.' => ['L', ''], + 'ISO-8601 year number. This has the same value as Y, except that if the ISO week number (W) belongs to the previous or next year, that year is used instead.' => ['o', ''], + 'A full numeric representation of a year, 4 digits Examples: 1999 or 2003' => ['Y', 'yy'], + 'A two digit representation of a year Examples: 99 or 03' => ['y', 'y'], + 'Lowercase Ante meridiem and Post meridiem, am or pm' => ['a', ''], + 'Uppercase Ante meridiem and Post meridiem, AM or PM, not supported by ICU but we fallback to lowercase' => ['A', ''], + 'Swatch Internet time 000 through 999' => ['B', ''], + '12-hour format of an hour without leading zeros 1 through 12' => ['g', ''], + '24-hour format of an hour without leading zeros 0 to 23h' => ['G', ''], + '12-hour format of an hour with leading zeros, 01 to 12 h' => ['h', ''], + '24-hour format of an hour with leading zeros, 00 to 23 h' => ['H', ''], + 'Minutes with leading zeros 00 to 59' => ['i', ''], + 'Seconds, with leading zeros 00 through 59' => ['s', ''], + 'Microseconds. Example: 654321' => ['u', ''], + 'Timezone identifier. Examples: UTC, GMT, Atlantic/Azores' => ['e', ''], + 'Whether or not the date is in daylight saving time, 1 if Daylight Saving Time, 0 otherwise.' => ['I', ''], + 'Difference to Greenwich time (GMT) in hours, Example: +0200' => ['O', ''], + 'Difference to Greenwich time (GMT) with colon between hours and minutes, Example: +02:00' => ['P', ''], + 'Timezone abbreviation, Examples: EST, MDT ...' => ['T', ''], + 'Timezone offset in seconds. The offset for timezones west of UTC is always negative, and for those east of UTC is always positive. -43200 through 50400' => ['Z', ''], + 'ISO 8601 date, e.g. 2004-02-12T15:19:21+00:00, skipping the time here because it is not supported' => ['c', 'yyyy-MM-dd'], + 'RFC 2822 formatted date, Example: Thu, 21 Dec 2000 16:01:07 +0200, skipping the time here because it is not supported' => ['r', 'D, d M yy'], + 'Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)' => ['U', '@'], + ]; + } + + /** + * @dataProvider providerForPHP2JUIPatterns + */ + public function testEscapedPhpToJuiSinglePattern($pattern, $expected) + { + $this->assertEquals($expected, FormatConverter::convertDatePhpToJui($pattern)); + } } diff --git a/tests/framework/helpers/MimeTest.php b/tests/framework/helpers/MimeTest.php new file mode 100644 index 0000000..fd9d848 --- /dev/null +++ b/tests/framework/helpers/MimeTest.php @@ -0,0 +1,1031 @@ +assertSame( + [ + 'text/xml' => 'application/xml', + 'image/svg' => 'image/svg+xml', + 'image/x-bmp' => 'image/bmp', + 'image/x-bitmap' => 'image/bmp', + 'image/x-xbitmap' => 'image/bmp', + 'image/x-win-bitmap' => 'image/bmp', + 'image/x-windows-bmp' => 'image/bmp', + 'image/ms-bmp' => 'image/bmp', + 'image/x-ms-bmp' => 'image/bmp', + 'application/bmp' => 'image/bmp', + 'application/x-bmp' => 'image/bmp', + 'application/x-win-bitmap' => 'image/bmp', + ], + require __DIR__ . '/../../../framework/helpers/mimeAliases.php' + ); + } + + public function testMimeTypes() + { + $this->assertSame( + [ + '3dml' => 'text/vnd.in3d.3dml', + '3ds' => 'image/x-3ds', + '3g2' => 'video/3gpp2', + '3gp' => 'video/3gpp', + '7z' => 'application/x-7z-compressed', + 'aab' => 'application/x-authorware-bin', + 'aac' => 'audio/x-aac', + 'aam' => 'application/x-authorware-map', + 'aas' => 'application/x-authorware-seg', + 'abw' => 'application/x-abiword', + 'ac' => 'application/pkix-attr-cert', + 'acc' => 'application/vnd.americandynamics.acc', + 'ace' => 'application/x-ace-compressed', + 'acu' => 'application/vnd.acucobol', + 'acutc' => 'application/vnd.acucorp', + 'adp' => 'audio/adpcm', + 'aep' => 'application/vnd.audiograph', + 'afm' => 'application/x-font-type1', + 'afp' => 'application/vnd.ibm.modcap', + 'ahead' => 'application/vnd.ahead.space', + 'ai' => 'application/postscript', + 'aif' => 'audio/x-aiff', + 'aifc' => 'audio/x-aiff', + 'aiff' => 'audio/x-aiff', + 'air' => 'application/vnd.adobe.air-application-installer-package+zip', + 'ait' => 'application/vnd.dvb.ait', + 'ami' => 'application/vnd.amiga.ami', + 'apk' => 'application/vnd.android.package-archive', + 'appcache' => 'text/cache-manifest', + 'application' => 'application/x-ms-application', + 'apr' => 'application/vnd.lotus-approach', + 'arc' => 'application/x-freearc', + 'asc' => 'application/pgp-signature', + 'asf' => 'video/x-ms-asf', + 'asm' => 'text/x-asm', + 'aso' => 'application/vnd.accpac.simply.aso', + 'asx' => 'video/x-ms-asf', + 'atc' => 'application/vnd.acucorp', + 'atom' => 'application/atom+xml', + 'atomcat' => 'application/atomcat+xml', + 'atomsvc' => 'application/atomsvc+xml', + 'atx' => 'application/vnd.antix.game-component', + 'au' => 'audio/basic', + 'avi' => 'video/x-msvideo', + 'aw' => 'application/applixware', + 'azf' => 'application/vnd.airzip.filesecure.azf', + 'azs' => 'application/vnd.airzip.filesecure.azs', + 'azw' => 'application/vnd.amazon.ebook', + 'bat' => 'application/x-msdownload', + 'bcpio' => 'application/x-bcpio', + 'bdf' => 'application/x-font-bdf', + 'bdm' => 'application/vnd.syncml.dm+wbxml', + 'bed' => 'application/vnd.realvnc.bed', + 'bh2' => 'application/vnd.fujitsu.oasysprs', + 'bin' => 'application/octet-stream', + 'blb' => 'application/x-blorb', + 'blorb' => 'application/x-blorb', + 'bmi' => 'application/vnd.bmi', + 'bmp' => 'image/bmp', + 'book' => 'application/vnd.framemaker', + 'box' => 'application/vnd.previewsystems.box', + 'boz' => 'application/x-bzip2', + 'bpk' => 'application/octet-stream', + 'btif' => 'image/prs.btif', + 'bz' => 'application/x-bzip', + 'bz2' => 'application/x-bzip2', + 'c' => 'text/x-c', + 'c11amc' => 'application/vnd.cluetrust.cartomobile-config', + 'c11amz' => 'application/vnd.cluetrust.cartomobile-config-pkg', + 'c4d' => 'application/vnd.clonk.c4group', + 'c4f' => 'application/vnd.clonk.c4group', + 'c4g' => 'application/vnd.clonk.c4group', + 'c4p' => 'application/vnd.clonk.c4group', + 'c4u' => 'application/vnd.clonk.c4group', + 'cab' => 'application/vnd.ms-cab-compressed', + 'caf' => 'audio/x-caf', + 'cap' => 'application/vnd.tcpdump.pcap', + 'car' => 'application/vnd.curl.car', + 'cat' => 'application/vnd.ms-pki.seccat', + 'cb7' => 'application/x-cbr', + 'cba' => 'application/x-cbr', + 'cbr' => 'application/x-cbr', + 'cbt' => 'application/x-cbr', + 'cbz' => 'application/x-cbr', + 'cc' => 'text/x-c', + 'cct' => 'application/x-director', + 'ccxml' => 'application/ccxml+xml', + 'cdbcmsg' => 'application/vnd.contact.cmsg', + 'cdf' => 'application/x-netcdf', + 'cdkey' => 'application/vnd.mediastation.cdkey', + 'cdmia' => 'application/cdmi-capability', + 'cdmic' => 'application/cdmi-container', + 'cdmid' => 'application/cdmi-domain', + 'cdmio' => 'application/cdmi-object', + 'cdmiq' => 'application/cdmi-queue', + 'cdx' => 'chemical/x-cdx', + 'cdxml' => 'application/vnd.chemdraw+xml', + 'cdy' => 'application/vnd.cinderella', + 'cer' => 'application/pkix-cert', + 'cfs' => 'application/x-cfs-compressed', + 'cgm' => 'image/cgm', + 'chat' => 'application/x-chat', + 'chm' => 'application/vnd.ms-htmlhelp', + 'chrt' => 'application/vnd.kde.kchart', + 'cif' => 'chemical/x-cif', + 'cii' => 'application/vnd.anser-web-certificate-issue-initiation', + 'cil' => 'application/vnd.ms-artgalry', + 'cla' => 'application/vnd.claymore', + 'class' => 'application/java-vm', + 'clkk' => 'application/vnd.crick.clicker.keyboard', + 'clkp' => 'application/vnd.crick.clicker.palette', + 'clkt' => 'application/vnd.crick.clicker.template', + 'clkw' => 'application/vnd.crick.clicker.wordbank', + 'clkx' => 'application/vnd.crick.clicker', + 'clp' => 'application/x-msclip', + 'cmc' => 'application/vnd.cosmocaller', + 'cmdf' => 'chemical/x-cmdf', + 'cml' => 'chemical/x-cml', + 'cmp' => 'application/vnd.yellowriver-custom-menu', + 'cmx' => 'image/x-cmx', + 'cod' => 'application/vnd.rim.cod', + 'com' => 'application/x-msdownload', + 'conf' => 'text/plain', + 'cpio' => 'application/x-cpio', + 'cpp' => 'text/x-c', + 'cpt' => 'application/mac-compactpro', + 'crd' => 'application/x-mscardfile', + 'crl' => 'application/pkix-crl', + 'crt' => 'application/x-x509-ca-cert', + 'cryptonote' => 'application/vnd.rig.cryptonote', + 'csh' => 'application/x-csh', + 'csml' => 'chemical/x-csml', + 'csp' => 'application/vnd.commonspace', + 'css' => 'text/css', + 'cst' => 'application/x-director', + 'csv' => 'text/csv', + 'cu' => 'application/cu-seeme', + 'curl' => 'text/vnd.curl', + 'cww' => 'application/prs.cww', + 'cxt' => 'application/x-director', + 'cxx' => 'text/x-c', + 'dae' => 'model/vnd.collada+xml', + 'daf' => 'application/vnd.mobius.daf', + 'dart' => 'application/vnd.dart', + 'dataless' => 'application/vnd.fdsn.seed', + 'davmount' => 'application/davmount+xml', + 'dbk' => 'application/docbook+xml', + 'dcr' => 'application/x-director', + 'dcurl' => 'text/vnd.curl.dcurl', + 'dd2' => 'application/vnd.oma.dd2+xml', + 'ddd' => 'application/vnd.fujixerox.ddd', + 'deb' => 'application/x-debian-package', + 'def' => 'text/plain', + 'deploy' => 'application/octet-stream', + 'der' => 'application/x-x509-ca-cert', + 'dfac' => 'application/vnd.dreamfactory', + 'dgc' => 'application/x-dgc-compressed', + 'dic' => 'text/x-c', + 'dir' => 'application/x-director', + 'dis' => 'application/vnd.mobius.dis', + 'dist' => 'application/octet-stream', + 'distz' => 'application/octet-stream', + 'djv' => 'image/vnd.djvu', + 'djvu' => 'image/vnd.djvu', + 'dll' => 'application/x-msdownload', + 'dmg' => 'application/x-apple-diskimage', + 'dmp' => 'application/vnd.tcpdump.pcap', + 'dms' => 'application/octet-stream', + 'dna' => 'application/vnd.dna', + 'doc' => 'application/msword', + 'docm' => 'application/vnd.ms-word.document.macroenabled.12', + 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'dot' => 'application/msword', + 'dotm' => 'application/vnd.ms-word.template.macroenabled.12', + 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', + 'dp' => 'application/vnd.osgi.dp', + 'dpg' => 'application/vnd.dpgraph', + 'dra' => 'audio/vnd.dra', + 'dsc' => 'text/prs.lines.tag', + 'dssc' => 'application/dssc+der', + 'dtb' => 'application/x-dtbook+xml', + 'dtd' => 'application/xml-dtd', + 'dts' => 'audio/vnd.dts', + 'dtshd' => 'audio/vnd.dts.hd', + 'dump' => 'application/octet-stream', + 'dvb' => 'video/vnd.dvb.file', + 'dvi' => 'application/x-dvi', + 'dwf' => 'model/vnd.dwf', + 'dwg' => 'image/vnd.dwg', + 'dxf' => 'image/vnd.dxf', + 'dxp' => 'application/vnd.spotfire.dxp', + 'dxr' => 'application/x-director', + 'ecelp4800' => 'audio/vnd.nuera.ecelp4800', + 'ecelp7470' => 'audio/vnd.nuera.ecelp7470', + 'ecelp9600' => 'audio/vnd.nuera.ecelp9600', + 'ecma' => 'application/ecmascript', + 'edm' => 'application/vnd.novadigm.edm', + 'edx' => 'application/vnd.novadigm.edx', + 'efif' => 'application/vnd.picsel', + 'ei6' => 'application/vnd.pg.osasli', + 'elc' => 'application/octet-stream', + 'emf' => 'application/x-msmetafile', + 'eml' => 'message/rfc822', + 'emma' => 'application/emma+xml', + 'emz' => 'application/x-msmetafile', + 'eol' => 'audio/vnd.digital-winds', + 'eot' => 'application/vnd.ms-fontobject', + 'eps' => 'application/postscript', + 'epub' => 'application/epub+zip', + 'es3' => 'application/vnd.eszigno3+xml', + 'esa' => 'application/vnd.osgi.subsystem', + 'esf' => 'application/vnd.epson.esf', + 'et3' => 'application/vnd.eszigno3+xml', + 'etx' => 'text/x-setext', + 'eva' => 'application/x-eva', + 'evy' => 'application/x-envoy', + 'exe' => 'application/x-msdownload', + 'exi' => 'application/exi', + 'ext' => 'application/vnd.novadigm.ext', + 'ez' => 'application/andrew-inset', + 'ez2' => 'application/vnd.ezpix-album', + 'ez3' => 'application/vnd.ezpix-package', + 'f' => 'text/x-fortran', + 'f4v' => 'video/x-f4v', + 'f77' => 'text/x-fortran', + 'f90' => 'text/x-fortran', + 'fbs' => 'image/vnd.fastbidsheet', + 'fcdt' => 'application/vnd.adobe.formscentral.fcdt', + 'fcs' => 'application/vnd.isac.fcs', + 'fdf' => 'application/vnd.fdf', + 'fe_launch' => 'application/vnd.denovo.fcselayout-link', + 'fg5' => 'application/vnd.fujitsu.oasysgp', + 'fgd' => 'application/x-director', + 'fh' => 'image/x-freehand', + 'fh4' => 'image/x-freehand', + 'fh5' => 'image/x-freehand', + 'fh7' => 'image/x-freehand', + 'fhc' => 'image/x-freehand', + 'fig' => 'application/x-xfig', + 'flac' => 'audio/x-flac', + 'fli' => 'video/x-fli', + 'flo' => 'application/vnd.micrografx.flo', + 'flv' => 'video/x-flv', + 'flw' => 'application/vnd.kde.kivio', + 'flx' => 'text/vnd.fmi.flexstor', + 'fly' => 'text/vnd.fly', + 'fm' => 'application/vnd.framemaker', + 'fnc' => 'application/vnd.frogans.fnc', + 'for' => 'text/x-fortran', + 'fpx' => 'image/vnd.fpx', + 'frame' => 'application/vnd.framemaker', + 'fsc' => 'application/vnd.fsc.weblaunch', + 'fst' => 'image/vnd.fst', + 'ftc' => 'application/vnd.fluxtime.clip', + 'fti' => 'application/vnd.anser-web-funds-transfer-initiation', + 'fvt' => 'video/vnd.fvt', + 'fxp' => 'application/vnd.adobe.fxp', + 'fxpl' => 'application/vnd.adobe.fxp', + 'fzs' => 'application/vnd.fuzzysheet', + 'g2w' => 'application/vnd.geoplan', + 'g3' => 'image/g3fax', + 'g3w' => 'application/vnd.geospace', + 'gac' => 'application/vnd.groove-account', + 'gam' => 'application/x-tads', + 'gbr' => 'application/rpki-ghostbusters', + 'gca' => 'application/x-gca-compressed', + 'gdl' => 'model/vnd.gdl', + 'geo' => 'application/vnd.dynageo', + 'gex' => 'application/vnd.geometry-explorer', + 'ggb' => 'application/vnd.geogebra.file', + 'ggt' => 'application/vnd.geogebra.tool', + 'ghf' => 'application/vnd.groove-help', + 'gif' => 'image/gif', + 'gim' => 'application/vnd.groove-identity-message', + 'gml' => 'application/gml+xml', + 'gmx' => 'application/vnd.gmx', + 'gnumeric' => 'application/x-gnumeric', + 'gph' => 'application/vnd.flographit', + 'gpx' => 'application/gpx+xml', + 'gqf' => 'application/vnd.grafeq', + 'gqs' => 'application/vnd.grafeq', + 'gram' => 'application/srgs', + 'gramps' => 'application/x-gramps-xml', + 'gre' => 'application/vnd.geometry-explorer', + 'grv' => 'application/vnd.groove-injector', + 'grxml' => 'application/srgs+xml', + 'gsf' => 'application/x-font-ghostscript', + 'gtar' => 'application/x-gtar', + 'gtm' => 'application/vnd.groove-tool-message', + 'gtw' => 'model/vnd.gtw', + 'gv' => 'text/vnd.graphviz', + 'gxf' => 'application/gxf', + 'gxt' => 'application/vnd.geonext', + 'h' => 'text/x-c', + 'h261' => 'video/h261', + 'h263' => 'video/h263', + 'h264' => 'video/h264', + 'hal' => 'application/vnd.hal+xml', + 'hbci' => 'application/vnd.hbci', + 'hdf' => 'application/x-hdf', + 'hh' => 'text/x-c', + 'hlp' => 'application/winhlp', + 'hpgl' => 'application/vnd.hp-hpgl', + 'hpid' => 'application/vnd.hp-hpid', + 'hps' => 'application/vnd.hp-hps', + 'hqx' => 'application/mac-binhex40', + 'htke' => 'application/vnd.kenameaapp', + 'htm' => 'text/html', + 'html' => 'text/html', + 'hvd' => 'application/vnd.yamaha.hv-dic', + 'hvp' => 'application/vnd.yamaha.hv-voice', + 'hvs' => 'application/vnd.yamaha.hv-script', + 'i2g' => 'application/vnd.intergeo', + 'icc' => 'application/vnd.iccprofile', + 'ice' => 'x-conference/x-cooltalk', + 'icm' => 'application/vnd.iccprofile', + 'ico' => 'image/x-icon', + 'ics' => 'text/calendar', + 'ief' => 'image/ief', + 'ifb' => 'text/calendar', + 'ifm' => 'application/vnd.shana.informed.formdata', + 'iges' => 'model/iges', + 'igl' => 'application/vnd.igloader', + 'igm' => 'application/vnd.insors.igm', + 'igs' => 'model/iges', + 'igx' => 'application/vnd.micrografx.igx', + 'iif' => 'application/vnd.shana.informed.interchange', + 'imp' => 'application/vnd.accpac.simply.imp', + 'ims' => 'application/vnd.ms-ims', + 'in' => 'text/plain', + 'ink' => 'application/inkml+xml', + 'inkml' => 'application/inkml+xml', + 'install' => 'application/x-install-instructions', + 'iota' => 'application/vnd.astraea-software.iota', + 'ipfix' => 'application/ipfix', + 'ipk' => 'application/vnd.shana.informed.package', + 'irm' => 'application/vnd.ibm.rights-management', + 'irp' => 'application/vnd.irepository.package+xml', + 'iso' => 'application/x-iso9660-image', + 'itp' => 'application/vnd.shana.informed.formtemplate', + 'ivp' => 'application/vnd.immervision-ivp', + 'ivu' => 'application/vnd.immervision-ivu', + 'jad' => 'text/vnd.sun.j2me.app-descriptor', + 'jam' => 'application/vnd.jam', + 'jar' => 'application/java-archive', + 'java' => 'text/x-java-source', + 'jisp' => 'application/vnd.jisp', + 'jlt' => 'application/vnd.hp-jlyt', + 'jnlp' => 'application/x-java-jnlp-file', + 'joda' => 'application/vnd.joost.joda-archive', + 'jpe' => 'image/jpeg', + 'jpeg' => 'image/jpeg', + 'jpg' => 'image/jpeg', + 'jpgm' => 'video/jpm', + 'jpgv' => 'video/jpeg', + 'jpm' => 'video/jpm', + 'js' => 'application/javascript', + 'json' => 'application/json', + 'jsonml' => 'application/jsonml+json', + 'kar' => 'audio/midi', + 'karbon' => 'application/vnd.kde.karbon', + 'kfo' => 'application/vnd.kde.kformula', + 'kia' => 'application/vnd.kidspiration', + 'kml' => 'application/vnd.google-earth.kml+xml', + 'kmz' => 'application/vnd.google-earth.kmz', + 'kne' => 'application/vnd.kinar', + 'knp' => 'application/vnd.kinar', + 'kon' => 'application/vnd.kde.kontour', + 'kpr' => 'application/vnd.kde.kpresenter', + 'kpt' => 'application/vnd.kde.kpresenter', + 'kpxx' => 'application/vnd.ds-keypoint', + 'ksp' => 'application/vnd.kde.kspread', + 'ktr' => 'application/vnd.kahootz', + 'ktx' => 'image/ktx', + 'ktz' => 'application/vnd.kahootz', + 'kwd' => 'application/vnd.kde.kword', + 'kwt' => 'application/vnd.kde.kword', + 'lasxml' => 'application/vnd.las.las+xml', + 'latex' => 'application/x-latex', + 'lbd' => 'application/vnd.llamagraphics.life-balance.desktop', + 'lbe' => 'application/vnd.llamagraphics.life-balance.exchange+xml', + 'les' => 'application/vnd.hhe.lesson-player', + 'lha' => 'application/x-lzh-compressed', + 'link66' => 'application/vnd.route66.link66+xml', + 'list' => 'text/plain', + 'list3820' => 'application/vnd.ibm.modcap', + 'listafp' => 'application/vnd.ibm.modcap', + 'lnk' => 'application/x-ms-shortcut', + 'log' => 'text/plain', + 'lostxml' => 'application/lost+xml', + 'lrf' => 'application/octet-stream', + 'lrm' => 'application/vnd.ms-lrm', + 'ltf' => 'application/vnd.frogans.ltf', + 'lvp' => 'audio/vnd.lucent.voice', + 'lwp' => 'application/vnd.lotus-wordpro', + 'lzh' => 'application/x-lzh-compressed', + 'm13' => 'application/x-msmediaview', + 'm14' => 'application/x-msmediaview', + 'm1v' => 'video/mpeg', + 'm21' => 'application/mp21', + 'm2a' => 'audio/mpeg', + 'm2v' => 'video/mpeg', + 'm3a' => 'audio/mpeg', + 'm3u' => 'audio/x-mpegurl', + 'm3u8' => 'application/vnd.apple.mpegurl', + 'm4a' => 'audio/mp4', + 'm4u' => 'video/vnd.mpegurl', + 'm4v' => 'video/x-m4v', + 'ma' => 'application/mathematica', + 'mads' => 'application/mads+xml', + 'mag' => 'application/vnd.ecowin.chart', + 'maker' => 'application/vnd.framemaker', + 'man' => 'text/troff', + 'mar' => 'application/octet-stream', + 'mathml' => 'application/mathml+xml', + 'mb' => 'application/mathematica', + 'mbk' => 'application/vnd.mobius.mbk', + 'mbox' => 'application/mbox', + 'mc1' => 'application/vnd.medcalcdata', + 'mcd' => 'application/vnd.mcd', + 'mcurl' => 'text/vnd.curl.mcurl', + 'mdb' => 'application/x-msaccess', + 'mdi' => 'image/vnd.ms-modi', + 'me' => 'text/troff', + 'mesh' => 'model/mesh', + 'meta4' => 'application/metalink4+xml', + 'metalink' => 'application/metalink+xml', + 'mets' => 'application/mets+xml', + 'mfm' => 'application/vnd.mfmp', + 'mft' => 'application/rpki-manifest', + 'mgp' => 'application/vnd.osgeo.mapguide.package', + 'mgz' => 'application/vnd.proteus.magazine', + 'mid' => 'audio/midi', + 'midi' => 'audio/midi', + 'mie' => 'application/x-mie', + 'mif' => 'application/vnd.mif', + 'mime' => 'message/rfc822', + 'mj2' => 'video/mj2', + 'mjp2' => 'video/mj2', + 'mjs' => 'text/javascript', + 'mk3d' => 'video/x-matroska', + 'mka' => 'audio/x-matroska', + 'mks' => 'video/x-matroska', + 'mkv' => 'video/x-matroska', + 'mlp' => 'application/vnd.dolby.mlp', + 'mmd' => 'application/vnd.chipnuts.karaoke-mmd', + 'mmf' => 'application/vnd.smaf', + 'mmr' => 'image/vnd.fujixerox.edmics-mmr', + 'mng' => 'video/x-mng', + 'mny' => 'application/x-msmoney', + 'mobi' => 'application/x-mobipocket-ebook', + 'mods' => 'application/mods+xml', + 'mov' => 'video/quicktime', + 'movie' => 'video/x-sgi-movie', + 'mp2' => 'audio/mpeg', + 'mp21' => 'application/mp21', + 'mp2a' => 'audio/mpeg', + 'mp3' => 'audio/mpeg', + 'mp4' => 'video/mp4', + 'mp4a' => 'audio/mp4', + 'mp4s' => 'application/mp4', + 'mp4v' => 'video/mp4', + 'mpc' => 'application/vnd.mophun.certificate', + 'mpe' => 'video/mpeg', + 'mpeg' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'mpg4' => 'video/mp4', + 'mpga' => 'audio/mpeg', + 'mpkg' => 'application/vnd.apple.installer+xml', + 'mpm' => 'application/vnd.blueice.multipass', + 'mpn' => 'application/vnd.mophun.application', + 'mpp' => 'application/vnd.ms-project', + 'mpt' => 'application/vnd.ms-project', + 'mpy' => 'application/vnd.ibm.minipay', + 'mqy' => 'application/vnd.mobius.mqy', + 'mrc' => 'application/marc', + 'mrcx' => 'application/marcxml+xml', + 'ms' => 'text/troff', + 'mscml' => 'application/mediaservercontrol+xml', + 'mseed' => 'application/vnd.fdsn.mseed', + 'mseq' => 'application/vnd.mseq', + 'msf' => 'application/vnd.epson.msf', + 0 => 'application/vnd.lotus-1-2-3', + 'msh' => 'model/mesh', + 'msi' => 'application/x-msdownload', + 'msl' => 'application/vnd.mobius.msl', + 'msty' => 'application/vnd.muvee.style', + 'mts' => 'model/vnd.mts', + 'mus' => 'application/vnd.musician', + 'musicxml' => 'application/vnd.recordare.musicxml+xml', + 'mvb' => 'application/x-msmediaview', + 'mwf' => 'application/vnd.mfer', + 'mxf' => 'application/mxf', + 'mxl' => 'application/vnd.recordare.musicxml', + 'mxml' => 'application/xv+xml', + 'mxs' => 'application/vnd.triscape.mxs', + 'mxu' => 'video/vnd.mpegurl', + 'n-gage' => 'application/vnd.nokia.n-gage.symbian.install', + 'n3' => 'text/n3', + 'nb' => 'application/mathematica', + 'nbp' => 'application/vnd.wolfram.player', + 'nc' => 'application/x-netcdf', + 'ncx' => 'application/x-dtbncx+xml', + 'nfo' => 'text/x-nfo', + 'ngdat' => 'application/vnd.nokia.n-gage.data', + 'nitf' => 'application/vnd.nitf', + 'nlu' => 'application/vnd.neurolanguage.nlu', + 'nml' => 'application/vnd.enliven', + 'nnd' => 'application/vnd.noblenet-directory', + 'nns' => 'application/vnd.noblenet-sealer', + 'nnw' => 'application/vnd.noblenet-web', + 'npx' => 'image/vnd.net-fpx', + 'nsc' => 'application/x-conference', + 'nsf' => 'application/vnd.lotus-notes', + 'ntf' => 'application/vnd.nitf', + 'nzb' => 'application/x-nzb', + 'oa2' => 'application/vnd.fujitsu.oasys2', + 'oa3' => 'application/vnd.fujitsu.oasys3', + 'oas' => 'application/vnd.fujitsu.oasys', + 'obd' => 'application/x-msbinder', + 'obj' => 'application/x-tgif', + 'oda' => 'application/oda', + 'odb' => 'application/vnd.oasis.opendocument.database', + 'odc' => 'application/vnd.oasis.opendocument.chart', + 'odf' => 'application/vnd.oasis.opendocument.formula', + 'odft' => 'application/vnd.oasis.opendocument.formula-template', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'odi' => 'application/vnd.oasis.opendocument.image', + 'odm' => 'application/vnd.oasis.opendocument.text-master', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'odt' => 'application/vnd.oasis.opendocument.text', + 'oga' => 'audio/ogg', + 'ogg' => 'audio/ogg', + 'ogv' => 'video/ogg', + 'ogx' => 'application/ogg', + 'omdoc' => 'application/omdoc+xml', + 'onepkg' => 'application/onenote', + 'onetmp' => 'application/onenote', + 'onetoc' => 'application/onenote', + 'onetoc2' => 'application/onenote', + 'opf' => 'application/oebps-package+xml', + 'opml' => 'text/x-opml', + 'oprc' => 'application/vnd.palm', + 'opus' => 'audio/ogg', + 'org' => 'application/vnd.lotus-organizer', + 'osf' => 'application/vnd.yamaha.openscoreformat', + 'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml', + 'otc' => 'application/vnd.oasis.opendocument.chart-template', + 'otf' => 'font/otf', + 'otg' => 'application/vnd.oasis.opendocument.graphics-template', + 'oth' => 'application/vnd.oasis.opendocument.text-web', + 'oti' => 'application/vnd.oasis.opendocument.image-template', + 'otp' => 'application/vnd.oasis.opendocument.presentation-template', + 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template', + 'ott' => 'application/vnd.oasis.opendocument.text-template', + 'oxps' => 'application/oxps', + 'oxt' => 'application/vnd.openofficeorg.extension', + 'p' => 'text/x-pascal', + 'p10' => 'application/pkcs10', + 'p12' => 'application/x-pkcs12', + 'p7b' => 'application/x-pkcs7-certificates', + 'p7c' => 'application/pkcs7-mime', + 'p7m' => 'application/pkcs7-mime', + 'p7r' => 'application/x-pkcs7-certreqresp', + 'p7s' => 'application/pkcs7-signature', + 'p8' => 'application/pkcs8', + 'pas' => 'text/x-pascal', + 'paw' => 'application/vnd.pawaafile', + 'pbd' => 'application/vnd.powerbuilder6', + 'pbm' => 'image/x-portable-bitmap', + 'pcap' => 'application/vnd.tcpdump.pcap', + 'pcf' => 'application/x-font-pcf', + 'pcl' => 'application/vnd.hp-pcl', + 'pclxl' => 'application/vnd.hp-pclxl', + 'pct' => 'image/x-pict', + 'pcurl' => 'application/vnd.curl.pcurl', + 'pcx' => 'image/x-pcx', + 'pdb' => 'application/vnd.palm', + 'pdf' => 'application/pdf', + 'pfa' => 'application/x-font-type1', + 'pfb' => 'application/x-font-type1', + 'pfm' => 'application/x-font-type1', + 'pfr' => 'application/font-tdpfr', + 'pfx' => 'application/x-pkcs12', + 'pgm' => 'image/x-portable-graymap', + 'pgn' => 'application/x-chess-pgn', + 'pgp' => 'application/pgp-encrypted', + 'pic' => 'image/x-pict', + 'pkg' => 'application/octet-stream', + 'pki' => 'application/pkixcmp', + 'pkipath' => 'application/pkix-pkipath', + 'plb' => 'application/vnd.3gpp.pic-bw-large', + 'plc' => 'application/vnd.mobius.plc', + 'plf' => 'application/vnd.pocketlearn', + 'pls' => 'application/pls+xml', + 'pml' => 'application/vnd.ctc-posml', + 'png' => 'image/png', + 'pnm' => 'image/x-portable-anymap', + 'portpkg' => 'application/vnd.macports.portpkg', + 'pot' => 'application/vnd.ms-powerpoint', + 'potm' => 'application/vnd.ms-powerpoint.template.macroenabled.12', + 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template', + 'ppam' => 'application/vnd.ms-powerpoint.addin.macroenabled.12', + 'ppd' => 'application/vnd.cups-ppd', + 'ppm' => 'image/x-portable-pixmap', + 'pps' => 'application/vnd.ms-powerpoint', + 'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroenabled.12', + 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow', + 'ppt' => 'application/vnd.ms-powerpoint', + 'pptm' => 'application/vnd.ms-powerpoint.presentation.macroenabled.12', + 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + 'pqa' => 'application/vnd.palm', + 'prc' => 'application/x-mobipocket-ebook', + 'pre' => 'application/vnd.lotus-freelance', + 'prf' => 'application/pics-rules', + 'ps' => 'application/postscript', + 'psb' => 'application/vnd.3gpp.pic-bw-small', + 'psd' => 'image/vnd.adobe.photoshop', + 'psf' => 'application/x-font-linux-psf', + 'pskcxml' => 'application/pskc+xml', + 'ptid' => 'application/vnd.pvi.ptid1', + 'pub' => 'application/x-mspublisher', + 'pvb' => 'application/vnd.3gpp.pic-bw-var', + 'pwn' => 'application/vnd.3m.post-it-notes', + 'pya' => 'audio/vnd.ms-playready.media.pya', + 'pyv' => 'video/vnd.ms-playready.media.pyv', + 'qam' => 'application/vnd.epson.quickanime', + 'qbo' => 'application/vnd.intu.qbo', + 'qfx' => 'application/vnd.intu.qfx', + 'qps' => 'application/vnd.publishare-delta-tree', + 'qt' => 'video/quicktime', + 'qwd' => 'application/vnd.quark.quarkxpress', + 'qwt' => 'application/vnd.quark.quarkxpress', + 'qxb' => 'application/vnd.quark.quarkxpress', + 'qxd' => 'application/vnd.quark.quarkxpress', + 'qxl' => 'application/vnd.quark.quarkxpress', + 'qxt' => 'application/vnd.quark.quarkxpress', + 'ra' => 'audio/x-pn-realaudio', + 'ram' => 'audio/x-pn-realaudio', + 'rar' => 'application/x-rar-compressed', + 'ras' => 'image/x-cmu-raster', + 'rcprofile' => 'application/vnd.ipunplugged.rcprofile', + 'rdf' => 'application/rdf+xml', + 'rdz' => 'application/vnd.data-vision.rdz', + 'rep' => 'application/vnd.businessobjects', + 'res' => 'application/x-dtbresource+xml', + 'rgb' => 'image/x-rgb', + 'rif' => 'application/reginfo+xml', + 'rip' => 'audio/vnd.rip', + 'ris' => 'application/x-research-info-systems', + 'rl' => 'application/resource-lists+xml', + 'rlc' => 'image/vnd.fujixerox.edmics-rlc', + 'rld' => 'application/resource-lists-diff+xml', + 'rm' => 'application/vnd.rn-realmedia', + 'rmi' => 'audio/midi', + 'rmp' => 'audio/x-pn-realaudio-plugin', + 'rms' => 'application/vnd.jcp.javame.midlet-rms', + 'rmvb' => 'application/vnd.rn-realmedia-vbr', + 'rnc' => 'application/relax-ng-compact-syntax', + 'roa' => 'application/rpki-roa', + 'roff' => 'text/troff', + 'rp9' => 'application/vnd.cloanto.rp9', + 'rpss' => 'application/vnd.nokia.radio-presets', + 'rpst' => 'application/vnd.nokia.radio-preset', + 'rq' => 'application/sparql-query', + 'rs' => 'application/rls-services+xml', + 'rsd' => 'application/rsd+xml', + 'rss' => 'application/rss+xml', + 'rtf' => 'application/rtf', + 'rtx' => 'text/richtext', + 's' => 'text/x-asm', + 's3m' => 'audio/s3m', + 'saf' => 'application/vnd.yamaha.smaf-audio', + 'sbml' => 'application/sbml+xml', + 'sc' => 'application/vnd.ibm.secure-container', + 'scd' => 'application/x-msschedule', + 'scm' => 'application/vnd.lotus-screencam', + 'scq' => 'application/scvp-cv-request', + 'scs' => 'application/scvp-cv-response', + 'scurl' => 'text/vnd.curl.scurl', + 'sda' => 'application/vnd.stardivision.draw', + 'sdc' => 'application/vnd.stardivision.calc', + 'sdd' => 'application/vnd.stardivision.impress', + 'sdkd' => 'application/vnd.solent.sdkm+xml', + 'sdkm' => 'application/vnd.solent.sdkm+xml', + 'sdp' => 'application/sdp', + 'sdw' => 'application/vnd.stardivision.writer', + 'see' => 'application/vnd.seemail', + 'seed' => 'application/vnd.fdsn.seed', + 'sema' => 'application/vnd.sema', + 'semd' => 'application/vnd.semd', + 'semf' => 'application/vnd.semf', + 'ser' => 'application/java-serialized-object', + 'setpay' => 'application/set-payment-initiation', + 'setreg' => 'application/set-registration-initiation', + 'sfd-hdstx' => 'application/vnd.hydrostatix.sof-data', + 'sfs' => 'application/vnd.spotfire.sfs', + 'sfv' => 'text/x-sfv', + 'sgi' => 'image/sgi', + 'sgl' => 'application/vnd.stardivision.writer-global', + 'sgm' => 'text/sgml', + 'sgml' => 'text/sgml', + 'sh' => 'application/x-sh', + 'shar' => 'application/x-shar', + 'shf' => 'application/shf+xml', + 'sid' => 'image/x-mrsid-image', + 'sig' => 'application/pgp-signature', + 'sil' => 'audio/silk', + 'silo' => 'model/mesh', + 'sis' => 'application/vnd.symbian.install', + 'sisx' => 'application/vnd.symbian.install', + 'sit' => 'application/x-stuffit', + 'sitx' => 'application/x-stuffitx', + 'skd' => 'application/vnd.koan', + 'skm' => 'application/vnd.koan', + 'skp' => 'application/vnd.koan', + 'skt' => 'application/vnd.koan', + 'sldm' => 'application/vnd.ms-powerpoint.slide.macroenabled.12', + 'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide', + 'slt' => 'application/vnd.epson.salt', + 'sm' => 'application/vnd.stepmania.stepchart', + 'smf' => 'application/vnd.stardivision.math', + 'smi' => 'application/smil+xml', + 'smil' => 'application/smil+xml', + 'smv' => 'video/x-smv', + 'smzip' => 'application/vnd.stepmania.package', + 'snd' => 'audio/basic', + 'snf' => 'application/x-font-snf', + 'so' => 'application/octet-stream', + 'spc' => 'application/x-pkcs7-certificates', + 'spf' => 'application/vnd.yamaha.smaf-phrase', + 'spl' => 'application/x-futuresplash', + 'spot' => 'text/vnd.in3d.spot', + 'spp' => 'application/scvp-vp-response', + 'spq' => 'application/scvp-vp-request', + 'spx' => 'audio/ogg', + 'sql' => 'application/x-sql', + 'src' => 'application/x-wais-source', + 'srt' => 'application/x-subrip', + 'sru' => 'application/sru+xml', + 'srx' => 'application/sparql-results+xml', + 'ssdl' => 'application/ssdl+xml', + 'sse' => 'application/vnd.kodak-descriptor', + 'ssf' => 'application/vnd.epson.ssf', + 'ssml' => 'application/ssml+xml', + 'st' => 'application/vnd.sailingtracker.track', + 'stc' => 'application/vnd.sun.xml.calc.template', + 'std' => 'application/vnd.sun.xml.draw.template', + 'stf' => 'application/vnd.wt.stf', + 'sti' => 'application/vnd.sun.xml.impress.template', + 'stk' => 'application/hyperstudio', + 'stl' => 'application/vnd.ms-pki.stl', + 'str' => 'application/vnd.pg.format', + 'stw' => 'application/vnd.sun.xml.writer.template', + 'sub' => 'text/vnd.dvb.subtitle', + 'sus' => 'application/vnd.sus-calendar', + 'susp' => 'application/vnd.sus-calendar', + 'sv4cpio' => 'application/x-sv4cpio', + 'sv4crc' => 'application/x-sv4crc', + 'svc' => 'application/vnd.dvb.service', + 'svd' => 'application/vnd.svd', + 'svg' => 'image/svg+xml', + 'svgz' => 'image/svg+xml', + 'swa' => 'application/x-director', + 'swf' => 'application/x-shockwave-flash', + 'swi' => 'application/vnd.aristanetworks.swi', + 'sxc' => 'application/vnd.sun.xml.calc', + 'sxd' => 'application/vnd.sun.xml.draw', + 'sxg' => 'application/vnd.sun.xml.writer.global', + 'sxi' => 'application/vnd.sun.xml.impress', + 'sxm' => 'application/vnd.sun.xml.math', + 'sxw' => 'application/vnd.sun.xml.writer', + 't' => 'text/troff', + 't3' => 'application/x-t3vm-image', + 'taglet' => 'application/vnd.mynfc', + 'tao' => 'application/vnd.tao.intent-module-archive', + 'tar' => 'application/x-tar', + 'tcap' => 'application/vnd.3gpp2.tcap', + 'tcl' => 'application/x-tcl', + 'teacher' => 'application/vnd.smart.teacher', + 'tei' => 'application/tei+xml', + 'teicorpus' => 'application/tei+xml', + 'tex' => 'application/x-tex', + 'texi' => 'application/x-texinfo', + 'texinfo' => 'application/x-texinfo', + 'text' => 'text/plain', + 'tfi' => 'application/thraud+xml', + 'tfm' => 'application/x-tex-tfm', + 'tga' => 'image/x-tga', + 'thmx' => 'application/vnd.ms-officetheme', + 'tif' => 'image/tiff', + 'tiff' => 'image/tiff', + 'tmo' => 'application/vnd.tmobile-livetv', + 'torrent' => 'application/x-bittorrent', + 'tpl' => 'application/vnd.groove-tool-template', + 'tpt' => 'application/vnd.trid.tpt', + 'tr' => 'text/troff', + 'tra' => 'application/vnd.trueapp', + 'trm' => 'application/x-msterminal', + 'tsd' => 'application/timestamped-data', + 'tsv' => 'text/tab-separated-values', + 'ttc' => 'font/collection', + 'ttf' => 'font/ttf', + 'ttl' => 'text/turtle', + 'twd' => 'application/vnd.simtech-mindmapper', + 'twds' => 'application/vnd.simtech-mindmapper', + 'txd' => 'application/vnd.genomatix.tuxedo', + 'txf' => 'application/vnd.mobius.txf', + 'txt' => 'text/plain', + 'u32' => 'application/x-authorware-bin', + 'udeb' => 'application/x-debian-package', + 'ufd' => 'application/vnd.ufdl', + 'ufdl' => 'application/vnd.ufdl', + 'ulx' => 'application/x-glulx', + 'umj' => 'application/vnd.umajin', + 'unityweb' => 'application/vnd.unity', + 'uoml' => 'application/vnd.uoml+xml', + 'uri' => 'text/uri-list', + 'uris' => 'text/uri-list', + 'urls' => 'text/uri-list', + 'ustar' => 'application/x-ustar', + 'utz' => 'application/vnd.uiq.theme', + 'uu' => 'text/x-uuencode', + 'uva' => 'audio/vnd.dece.audio', + 'uvd' => 'application/vnd.dece.data', + 'uvf' => 'application/vnd.dece.data', + 'uvg' => 'image/vnd.dece.graphic', + 'uvh' => 'video/vnd.dece.hd', + 'uvi' => 'image/vnd.dece.graphic', + 'uvm' => 'video/vnd.dece.mobile', + 'uvp' => 'video/vnd.dece.pd', + 'uvs' => 'video/vnd.dece.sd', + 'uvt' => 'application/vnd.dece.ttml+xml', + 'uvu' => 'video/vnd.uvvu.mp4', + 'uvv' => 'video/vnd.dece.video', + 'uvva' => 'audio/vnd.dece.audio', + 'uvvd' => 'application/vnd.dece.data', + 'uvvf' => 'application/vnd.dece.data', + 'uvvg' => 'image/vnd.dece.graphic', + 'uvvh' => 'video/vnd.dece.hd', + 'uvvi' => 'image/vnd.dece.graphic', + 'uvvm' => 'video/vnd.dece.mobile', + 'uvvp' => 'video/vnd.dece.pd', + 'uvvs' => 'video/vnd.dece.sd', + 'uvvt' => 'application/vnd.dece.ttml+xml', + 'uvvu' => 'video/vnd.uvvu.mp4', + 'uvvv' => 'video/vnd.dece.video', + 'uvvx' => 'application/vnd.dece.unspecified', + 'uvvz' => 'application/vnd.dece.zip', + 'uvx' => 'application/vnd.dece.unspecified', + 'uvz' => 'application/vnd.dece.zip', + 'vcard' => 'text/vcard', + 'vcd' => 'application/x-cdlink', + 'vcf' => 'text/x-vcard', + 'vcg' => 'application/vnd.groove-vcard', + 'vcs' => 'text/x-vcalendar', + 'vcx' => 'application/vnd.vcx', + 'vis' => 'application/vnd.visionary', + 'viv' => 'video/vnd.vivo', + 'vob' => 'video/x-ms-vob', + 'vor' => 'application/vnd.stardivision.writer', + 'vox' => 'application/x-authorware-bin', + 'vrml' => 'model/vrml', + 'vsd' => 'application/vnd.visio', + 'vsf' => 'application/vnd.vsf', + 'vss' => 'application/vnd.visio', + 'vst' => 'application/vnd.visio', + 'vsw' => 'application/vnd.visio', + 'vtu' => 'model/vnd.vtu', + 'vxml' => 'application/voicexml+xml', + 'w3d' => 'application/x-director', + 'wad' => 'application/x-doom', + 'wav' => 'audio/x-wav', + 'wax' => 'audio/x-ms-wax', + 'wbmp' => 'image/vnd.wap.wbmp', + 'wbs' => 'application/vnd.criticaltools.wbs+xml', + 'wbxml' => 'application/vnd.wap.wbxml', + 'wcm' => 'application/vnd.ms-works', + 'wdb' => 'application/vnd.ms-works', + 'wdp' => 'image/vnd.ms-photo', + 'weba' => 'audio/webm', + 'webm' => 'video/webm', + 'webp' => 'image/webp', + 'wg' => 'application/vnd.pmi.widget', + 'wgt' => 'application/widget', + 'wks' => 'application/vnd.ms-works', + 'wm' => 'video/x-ms-wm', + 'wma' => 'audio/x-ms-wma', + 'wmd' => 'application/x-ms-wmd', + 'wmf' => 'application/x-msmetafile', + 'wml' => 'text/vnd.wap.wml', + 'wmlc' => 'application/vnd.wap.wmlc', + 'wmls' => 'text/vnd.wap.wmlscript', + 'wmlsc' => 'application/vnd.wap.wmlscriptc', + 'wmv' => 'video/x-ms-wmv', + 'wmx' => 'video/x-ms-wmx', + 'wmz' => 'application/x-msmetafile', + 'woff' => 'font/woff', + 'woff2' => 'font/woff2', + 'wpd' => 'application/vnd.wordperfect', + 'wpl' => 'application/vnd.ms-wpl', + 'wps' => 'application/vnd.ms-works', + 'wqd' => 'application/vnd.wqd', + 'wri' => 'application/x-mswrite', + 'wrl' => 'model/vrml', + 'wsdl' => 'application/wsdl+xml', + 'wspolicy' => 'application/wspolicy+xml', + 'wtb' => 'application/vnd.webturbo', + 'wvx' => 'video/x-ms-wvx', + 'x32' => 'application/x-authorware-bin', + 'x3d' => 'model/x3d+xml', + 'x3db' => 'model/x3d+binary', + 'x3dbz' => 'model/x3d+binary', + 'x3dv' => 'model/x3d+vrml', + 'x3dvz' => 'model/x3d+vrml', + 'x3dz' => 'model/x3d+xml', + 'xaml' => 'application/xaml+xml', + 'xap' => 'application/x-silverlight-app', + 'xar' => 'application/vnd.xara', + 'xbap' => 'application/x-ms-xbap', + 'xbd' => 'application/vnd.fujixerox.docuworks.binder', + 'xbm' => 'image/x-xbitmap', + 'xdf' => 'application/xcap-diff+xml', + 'xdm' => 'application/vnd.syncml.dm+xml', + 'xdp' => 'application/vnd.adobe.xdp+xml', + 'xdssc' => 'application/dssc+xml', + 'xdw' => 'application/vnd.fujixerox.docuworks', + 'xenc' => 'application/xenc+xml', + 'xer' => 'application/patch-ops-error+xml', + 'xfdf' => 'application/vnd.adobe.xfdf', + 'xfdl' => 'application/vnd.xfdl', + 'xht' => 'application/xhtml+xml', + 'xhtml' => 'application/xhtml+xml', + 'xhvml' => 'application/xv+xml', + 'xif' => 'image/vnd.xiff', + 'xla' => 'application/vnd.ms-excel', + 'xlam' => 'application/vnd.ms-excel.addin.macroenabled.12', + 'xlc' => 'application/vnd.ms-excel', + 'xlf' => 'application/x-xliff+xml', + 'xlm' => 'application/vnd.ms-excel', + 'xls' => 'application/vnd.ms-excel', + 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroenabled.12', + 'xlsm' => 'application/vnd.ms-excel.sheet.macroenabled.12', + 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'xlt' => 'application/vnd.ms-excel', + 'xltm' => 'application/vnd.ms-excel.template.macroenabled.12', + 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', + 'xlw' => 'application/vnd.ms-excel', + 'xm' => 'audio/xm', + 'xml' => 'application/xml', + 'xo' => 'application/vnd.olpc-sugar', + 'xop' => 'application/xop+xml', + 'xpi' => 'application/x-xpinstall', + 'xpl' => 'application/xproc+xml', + 'xpm' => 'image/x-xpixmap', + 'xpr' => 'application/vnd.is-xpr', + 'xps' => 'application/vnd.ms-xpsdocument', + 'xpw' => 'application/vnd.intercon.formnet', + 'xpx' => 'application/vnd.intercon.formnet', + 'xsl' => 'application/xml', + 'xslt' => 'application/xslt+xml', + 'xsm' => 'application/vnd.syncml+xml', + 'xspf' => 'application/xspf+xml', + 'xul' => 'application/vnd.mozilla.xul+xml', + 'xvm' => 'application/xv+xml', + 'xvml' => 'application/xv+xml', + 'xwd' => 'image/x-xwindowdump', + 'xyz' => 'chemical/x-xyz', + 'xz' => 'application/x-xz', + 'yang' => 'application/yang', + 'yin' => 'application/yin+xml', + 'z1' => 'application/x-zmachine', + 'z2' => 'application/x-zmachine', + 'z3' => 'application/x-zmachine', + 'z4' => 'application/x-zmachine', + 'z5' => 'application/x-zmachine', + 'z6' => 'application/x-zmachine', + 'z7' => 'application/x-zmachine', + 'z8' => 'application/x-zmachine', + 'zaz' => 'application/vnd.zzazz.deck+xml', + 'zip' => 'application/zip', + 'zir' => 'application/vnd.zul', + 'zirz' => 'application/vnd.zul', + 'zmm' => 'application/vnd.handheld-entertainment+xml', + ], + require __DIR__ . '/../../../framework/helpers/mimeTypes.php' + ); + } +} diff --git a/tests/framework/helpers/ReplaceArrayValueTest.php b/tests/framework/helpers/ReplaceArrayValueTest.php new file mode 100644 index 0000000..d055483 --- /dev/null +++ b/tests/framework/helpers/ReplaceArrayValueTest.php @@ -0,0 +1,33 @@ +expectException('yii\base\InvalidConfigException'); + $this->expectExceptionMessage('Failed to instantiate class "ReplaceArrayValue". Required parameter "value" is missing'); + $object = new ReplaceArrayValue('test'); + $object::__set_state([]); + } + + public function testSetStateWithValue() + { + $object = new ReplaceArrayValue('test'); + $result = $object::__set_state(['value' => 'test2']); + $this->assertInstanceOf('yii\helpers\ReplaceArrayValue', $result); + $this->assertSame('test2', $result->value); + } +} diff --git a/tests/framework/helpers/UnsetArrayValueTest.php b/tests/framework/helpers/UnsetArrayValueTest.php new file mode 100644 index 0000000..6d3b943 --- /dev/null +++ b/tests/framework/helpers/UnsetArrayValueTest.php @@ -0,0 +1,24 @@ +assertInstanceOf('yii\helpers\UnsetArrayValue', $result); + } +} diff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php index cf57f15..e8c1185 100644 --- a/tests/framework/helpers/UrlTest.php +++ b/tests/framework/helpers/UrlTest.php @@ -303,4 +303,17 @@ class UrlTest extends TestCase $this->assertFalse(Url::isRelative('http://example.com/')); $this->assertFalse(Url::isRelative('https://example.com/')); } + + public function testRemember() + { + Yii::$app->getUser()->login(UserIdentity::findIdentity('user1')); + + Url::remember('test'); + $this->assertSame('test', Yii::$app->getUser()->getReturnUrl()); + $this->assertSame('test', Yii::$app->getSession()->get(Yii::$app->getUser()->returnUrlParam)); + + Yii::$app->getUser()->setReturnUrl(null); + Url::remember('test', 'remember-test'); + $this->assertSame('test', Yii::$app->getSession()->get('remember-test')); + } }