Skip to content
Browse files

psr

  • Loading branch information...
1 parent de69ead commit b3942278c73bb1a6519ac53391725f0897228dc7 @marc-mabe committed Jan 6, 2013
View
1 library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
@@ -90,7 +90,6 @@ public function setEncoding($encoding, $convertEncoding = null)
return $this;
}
-
/**
* Get the defined character encoding to work with
*
View
149 library/Zend/Stdlib/StringWrapper/Iconv.php
@@ -28,83 +28,167 @@ class Iconv extends AbstractStringWrapper
protected static $encodings = array(
// European languages
'ASCII',
- 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4', 'ISO-8859-5', 'ISO-8859-7',
- 'ISO-8859-9', 'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
- 'KOI8-R', 'KOI8-U', 'KOI8-RU',
- 'CP1250', 'CP1251', 'CP1252', 'CP1253', 'CP1254', 'CP1257', 'CP850', 'CP866', 'CP1131',
- 'MACROMAN', 'MACCENTRALEUROPE', 'MACICELAND', 'MACCROATIAN', 'MACROMANIA',
- 'MACCYRILLIC', 'MACUKRAINE', 'MACGREEK', 'MACTURKISH', 'MACINTOSH',
+ 'ISO-8859-1',
+ 'ISO-8859-2',
+ 'ISO-8859-3',
+ 'ISO-8859-4',
+ 'ISO-8859-5',
+ 'ISO-8859-7',
+ 'ISO-8859-9',
+ 'ISO-8859-10',
+ 'ISO-8859-13',
+ 'ISO-8859-14',
+ 'ISO-8859-15',
+ 'ISO-8859-16',
+ 'KOI8-R',
+ 'KOI8-U',
+ 'KOI8-RU',
+ 'CP1250',
+ 'CP1251',
+ 'CP1252',
+ 'CP1253',
+ 'CP1254',
+ 'CP1257',
+ 'CP850',
+ 'CP866',
+ 'CP1131',
+ 'MACROMAN',
+ 'MACCENTRALEUROPE',
+ 'MACICELAND',
+ 'MACCROATIAN',
+ 'MACROMANIA',
+ 'MACCYRILLIC',
+ 'MACUKRAINE',
+ 'MACGREEK',
+ 'MACTURKISH',
+ 'MACINTOSH',
// Semitic languages
- 'ISO-8859-6', 'ISO-8859-8',
- 'CP1255', 'CP1256', 'CP862',
- 'MACHEBREW', 'MACARABIC',
+ 'ISO-8859-6',
+ 'ISO-8859-8',
+ 'CP1255',
+ 'CP1256',
+ 'CP862',
+ 'MACHEBREW',
+ 'MACARABIC',
// Japanese
- 'EUC-JP', 'SHIFT_JIS', 'CP932',
- 'ISO-2022-JP', 'ISO-2022-JP-2', 'ISO-2022-JP-1',
+ 'EUC-JP',
+ 'SHIFT_JIS',
+ 'CP932',
+ 'ISO-2022-JP',
+ 'ISO-2022-JP-2',
+ 'ISO-2022-JP-1',
// Chinese
- 'EUC-CN', 'HZ', 'GBK', 'CP936', 'GB18030', 'EUC-TW', 'BIG5', 'CP950',
- 'BIG5-HKSCS', 'BIG5-HKSCS:2004', 'BIG5-HKSCS:2001', 'BIG5-HKSCS:1999',
- 'ISO-2022-CN', 'ISO-2022-CN-EXT',
+ 'EUC-CN',
+ 'HZ',
+ 'GBK',
+ 'CP936',
+ 'GB18030',
+ 'EUC-TW',
+ 'BIG5',
+ 'CP950',
+ 'BIG5-HKSCS',
+ 'BIG5-HKSCS:2004',
+ 'BIG5-HKSCS:2001',
+ 'BIG5-HKSCS:1999',
+ 'ISO-2022-CN',
+ 'ISO-2022-CN-EXT',
// Korean
- 'EUC-KR', 'CP949', 'ISO-2022-KR', 'JOHAB',
+ 'EUC-KR',
+ 'CP949',
+ 'ISO-2022-KR',
+ 'JOHAB',
// Armenian
'ARMSCII-8',
// Georgian
- 'GEORGIAN-ACADEMY', 'GEORGIAN-PS',
+ 'GEORGIAN-ACADEMY',
+ 'GEORGIAN-PS',
// Tajik
'KOI8-T',
// Kazakh
- 'PT154', 'RK1048',
+ 'PT154',
+ 'RK1048',
// Thai
- 'ISO-8859-11', 'TIS-620', 'CP874', 'MACTHAI',
+ 'ISO-8859-11',
+ 'TIS-620',
+ 'CP874',
+ 'MACTHAI',
// Laotian
- 'MULELAO-1', 'CP1133',
+ 'MULELAO-1',
+ 'CP1133',
// Vietnamese
- 'VISCII', 'TCVN', 'CP1258',
+ 'VISCII',
+ 'TCVN',
+ 'CP1258',
// Platform specifics
- 'HP-ROMAN8', 'NEXTSTEP',
+ 'HP-ROMAN8',
+ 'NEXTSTEP',
// Full Unicode
'UTF-8',
- 'UCS-2', 'UCS-2BE', 'UCS-2LE',
- 'UCS-4', 'UCS-4BE', 'UCS-4LE',
- 'UTF-16', 'UTF-16BE', 'UTF-16LE',
- 'UTF-32', 'UTF-32BE', 'UTF-32LE',
+ 'UCS-2',
+ 'UCS-2BE',
+ 'UCS-2LE',
+ 'UCS-4',
+ 'UCS-4BE',
+ 'UCS-4LE',
+ 'UTF-16',
+ 'UTF-16BE',
+ 'UTF-16LE',
+ 'UTF-32',
+ 'UTF-32BE',
+ 'UTF-32LE',
'UTF-7',
- 'C99', 'JAVA',
+ 'C99',
+ 'JAVA',
// Full Unicode, in terms of uint16_t or uint32_t (with machine dependent endianness and alignment)
- // 'UCS-2-INTERNAL', 'UCS-4-INTERNAL',
+ // 'UCS-2-INTERNAL',
+ // 'UCS-4-INTERNAL',
// Locale dependent, in terms of `char' or `wchar_t' (with machine dependent endianness and alignment,
// and with OS and locale dependent semantics)
- // 'char', 'wchar_t',
+ // 'char',
+ // 'wchar_t',
// '', // The empty encoding name is equivalent to "char": it denotes the locale dependent character encoding.
// When configured with the option --enable-extra-encodings,
// it also provides support for a few extra encodings:
// European languages
- 'CP437', 'CP737', 'CP775', 'CP852', 'CP853', 'CP855', 'CP857', 'CP858',
- 'CP860', 'CP861', 'CP863', 'CP865', 'CP869', 'CP1125',
+ 'CP437',
+ 'CP737',
+ 'CP775',
+ 'CP852',
+ 'CP853',
+ 'CP855',
+ 'CP857',
+ 'CP858',
+ 'CP860',
+ 'CP861',
+ 'CP863',
+ 'CP865',
+ 'CP869',
+ 'CP1125',
// Semitic languages
'CP864',
// Japanese
- 'EUC-JISX0213', 'Shift_JISX0213', 'ISO-2022-JP-3',
+ 'EUC-JISX0213',
+ 'Shift_JISX0213',
+ 'ISO-2022-JP-3',
// Chinese
'BIG5-2003', // (experimental)
@@ -113,7 +197,8 @@ class Iconv extends AbstractStringWrapper
'TDS565',
// Platform specifics
- 'ATARIST', 'RISCOS-LATIN1',
+ 'ATARIST',
+ 'RISCOS-LATIN1',
);
/**

0 comments on commit b394227

Please sign in to comment.
Something went wrong with that request. Please try again.