From e325c204eb86fca93b223b79388708aa4e0d3824 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 18 Apr 2013 15:59:20 +0200
Subject: [PATCH] PSR-0 autoloading and manual bootup configuration is now
 required

---
 README.md                       |  16 +-
 bootup.utf8.php                 |  16 +-
 class/Patchwork/Utf8/Bootup.php | 292 +++++++++++++++++++++++++++++
 class/Patchwork/Utf8/bootup.php | 319 --------------------------------
 composer.json                   |   4 +-
 tests/bootstrap.php             |  19 +-
 6 files changed, 323 insertions(+), 343 deletions(-)
 create mode 100644 class/Patchwork/Utf8/Bootup.php
 delete mode 100644 class/Patchwork/Utf8/bootup.php

diff --git a/README.md b/README.md
index b8ebd33..b909a30 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Here is the set of portability-fallbacks that are currently implemented:
   grapheme_strlen, grapheme_strpos, grapheme_strripos, grapheme_strrpos,
   grapheme_strstr, grapheme_substr*.
 
-`pcre` compiled with unicode support is currently required.
+`pcre` compiled with unicode support is required.
 
 Patchwork\Utf8
 --------------
@@ -61,6 +61,7 @@ trim, str_ireplace, str_pad, str_shuffle, str_split, str_word_count, strcmp,
 strnatcmp, strcasecmp, strnatcasecmp, strncasecmp, strncmp, strcspn, strpbrk,
 strrev, strspn, strtr, substr_compare, substr_count, substr_replace, ucfirst,
 lcfirst, ucwords, number_format, utf8_encode, utf8_decode*.
+
 Missing are *printf*-family functions.
 
 Usage
@@ -72,22 +73,21 @@ the `php composer.phar install` command to install it:
 
     {
         "require": {
-            "patchwork/utf8": "1.0.*"
+            "patchwork/utf8": "1.1.*"
         }
     }
 
-Otherwise, including the `bootup.utf8.php` file is the easiest way to enable the
-portability layer and configure PHP for an UTF-8 aware and portable application.
-
-Classes are named following PSR-0 autoloader interoperability recommandations,
-so other loading scheme are easy to implement.
+Then, early in your bootstrap sequence, you have to configure your environment.
+The easiest way to do so is by taking inspiration from or just including the
+`bootup.utf8.php` file. This will enable the portability layer and configure PHP
+for an UTF-8 aware and portable application.
 
 The `Patchwork\Utf8` class exposes its features through static methods. Just
 add a `use Patchwork\Utf8 as u;` at the beginning of your files, then when UTF-8
 awareness is required, prefix the string function by `u::`:
 `echo strlen("déjà");` may become `echo u::strlen("déjà");` eg.
 
-Just run `phpunit` in the `tests/` directory to see the code in action.
+Run `phpunit` in the `tests/` directory to see the code in action.
 
 Make sure that you are confident about using UTF-8 by reading
 [Character Sets / Character Encoding Issues](http://www.phpwact.org/php/i18n/charsets)
diff --git a/bootup.utf8.php b/bootup.utf8.php
index dedff60..dfe918c 100644
--- a/bootup.utf8.php
+++ b/bootup.utf8.php
@@ -8,12 +8,14 @@
  * GNU General Public License v2.0 (http://gnu.org/licenses/gpl-2.0.txt).
  */
 
-use Patchwork\Utf8 as u;
+use Patchwork\Utf8\Bootup as b;
 
-if (function_exists('Patchwork\Utf8\initAll')) return;
+b::initUtf8Encode();
+b::initMbstring();
+b::initIconv();
+b::initExif();
+b::initIntl();
+b::initLocale();
 
-require __DIR__ . '/class/Patchwork/Utf8/bootup.php';
-
-u\initAll();
-u\filterRequestUri();
-u\filterRequestInputs();
+b::filterRequestUri();
+b::filterRequestInputs();
diff --git a/class/Patchwork/Utf8/Bootup.php b/class/Patchwork/Utf8/Bootup.php
new file mode 100644
index 0000000..db1b296
--- /dev/null
+++ b/class/Patchwork/Utf8/Bootup.php
@@ -0,0 +1,292 @@
+<?php // vi: set fenc=utf-8 ts=4 sw=4 et:
+/*
+ * Copyright (C) 2012 Nicolas Grekas - p@tchwork.com
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the (at your option):
+ * Apache License v2.0 (http://apache.org/licenses/LICENSE-2.0.txt), or
+ * GNU General Public License v2.0 (http://gnu.org/licenses/gpl-2.0.txt).
+ */
+
+namespace Patchwork\Utf8;
+
+use Normalizer as n;
+use Patchwork\Utf8 as u;
+use Patchwork\PHP\Shim as s;
+
+
+class Bootup
+{
+    static function initUtf8Encode()
+    {
+        if (!function_exists('utf8_encode'))
+        {
+            function utf8_encode($s) {return s\Xml::utf8_encode($s);};
+            function utf8_decode($s) {return s\Xml::utf8_decode($s);};
+        }
+    }
+
+    static function initMbstring()
+    {
+        if (extension_loaded('mbstring'))
+        {
+            if ( ((int) ini_get('mbstring.encoding_translation') || in_array(strtolower(ini_get('mbstring.encoding_translation')), array('on', 'yes', 'true')))
+                && !in_array(strtolower(ini_get('mbstring.http_input')), array('pass', '8bit', 'utf-8')) )
+            {
+                user_error('php.ini settings: Please disable mbstring.encoding_translation or set mbstring.http_input to "pass"',  E_USER_WARNING);
+            }
+
+            if (MB_OVERLOAD_STRING & (int) ini_get('mbstring.func_overload'))
+            {
+                user_error('php.ini settings: Please disable mbstring.func_overload', E_USER_WARNING);
+            }
+
+            mb_regex_encoding('UTF-8');
+            ini_set('mbstring.script_encoding', 'pass');
+
+            if ('utf-8' !== strtolower(mb_internal_encoding()))
+            {
+                mb_internal_encoding('UTF-8');
+                ini_set('mbstring.internal_encoding', 'UTF-8');
+            }
+
+            if ('none' !== strtolower(mb_substitute_character()))
+            {
+                mb_substitute_character('none');
+                ini_set('mbstring.substitute_character', 'none');
+            }
+
+            if (!in_array(strtolower(mb_http_output()), array('pass', '8bit')))
+            {
+                mb_http_output('pass');
+                ini_set('mbstring.http_output', 'pass');
+            }
+
+            if (!in_array(strtolower(mb_language()), array('uni', 'neutral')))
+            {
+                mb_language('uni');
+                ini_set('mbstring.language', 'uni');
+            }
+        }
+        else if (!defined('MB_OVERLOAD_MAIL'))
+        {
+            define('MB_OVERLOAD_MAIL', 1);
+            define('MB_OVERLOAD_STRING', 2);
+            define('MB_OVERLOAD_REGEX', 4);
+            define('MB_CASE_UPPER', 0);
+            define('MB_CASE_LOWER',1);
+            define('MB_CASE_TITLE', 2);
+
+            function mb_convert_encoding($s, $to, $from = INF) {return s\Mbstring::mb_convert_encoding($s, $to, $from);};
+            function mb_decode_mimeheader($s) {return s\Mbstring::mb_decode_mimeheader($s);};
+            function mb_encode_mimeheader($s, $charset = INF, $transfer_enc = INF, $lf = INF, $indent = INF) {return s\Mbstring::mb_encode_mimeheader($s, $charset, $transfer_enc, $lf, $indent);};
+            function mb_convert_case($s, $mode, $enc = INF) {return s\Mbstring::mb_convert_case($s, $mode, $enc);};
+            function mb_internal_encoding($enc = INF) {return s\Mbstring::mb_internal_encoding($enc);};
+            function mb_list_encodings() {return s\Mbstring::mb_list_encodings();};
+            function mb_parse_str($s, &$result = array()) {return parse_str($s, $result);};
+            function mb_strlen($s, $enc = INF) {return s\Mbstring::mb_strlen($s, $enc);};
+            function mb_strpos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_strpos($s, $needle, $offset, $enc);};
+            function mb_strtolower($s, $enc = INF) {return s\Mbstring::mb_strtolower($s, $enc);};
+            function mb_strtoupper($s, $enc = INF) {return s\Mbstring::mb_strtoupper($s, $enc);};
+            function mb_substitute_character($char = INF) {return s\Mbstring::mb_substitute_character($char);};
+            function mb_substr_count($s, $needle) {return substr_count($s, $needle);};
+            function mb_substr($s, $start, $length = 2147483647, $enc = INF) {return s\Mbstring::mb_substr($s, $start, $length, $enc);};
+            function mb_stripos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_stripos($s, $needle, $offset, $enc);};
+            function mb_stristr($s, $needle, $part = false, $enc = INF) {return s\Mbstring::mb_stristr($s, $needle, $part, $enc);};
+            function mb_strrchr($s, $needle, $part = false, $enc = INF) {return s\Mbstring::mb_strrchr($s, $needle, $part, $enc);};
+            function mb_strrichr($s, $needle, $part = false, $enc = INF) {return s\Mbstring::mb_strrichr($s, $needle, $part, $enc);};
+            function mb_strripos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_strripos($s, $needle, $offset, $enc);};
+            function mb_strrpos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_strrpos($s, $needle, $offset, $enc);};
+            function mb_strstr($s, $needle, $part = false, $enc = INF) {return s\Mbstring::mb_strstr($s, $needle, $part, $enc);};
+        }
+    }
+
+    static function initIconv()
+    {
+        if (!function_exists('iconv') && function_exists('libiconv'))
+        {
+            // See http://php.net/manual/en/function.iconv.php#47428
+            function iconv($from, $to, $s) {return libiconv($from, $to, $s);};
+        }
+
+        if (extension_loaded('iconv'))
+        {
+            if ('UTF-8' !== iconv_get_encoding('input_encoding'))
+            {
+                iconv_set_encoding('input_encoding', 'UTF-8');
+                ini_set('iconv.input_encoding', 'UTF-8');
+            }
+
+            if ('UTF-8' !== iconv_get_encoding('internal_encoding'))
+            {
+                iconv_set_encoding('internal_encoding', 'UTF-8');
+                ini_set('iconv.internal_encoding', 'UTF-8');
+            }
+
+            if ('UTF-8' !== iconv_get_encoding('output_encoding'))
+            {
+                iconv_set_encoding('output_encoding' , 'UTF-8');
+                ini_set('iconv.output_encoding', 'UTF-8');
+            }
+        }
+        else if (!defined('ICONV_IMPL'))
+        {
+            define('ICONV_IMPL', 'Patchwork');
+            define('ICONV_VERSION', '1.0');
+            define('ICONV_MIME_DECODE_STRICT', 1);
+            define('ICONV_MIME_DECODE_CONTINUE_ON_ERROR', 2);
+
+            function iconv($from, $to, $s) {return s\Iconv::iconv($from, $to, $s);};
+            function iconv_get_encoding($type = 'all') {return s\Iconv::iconv_get_encoding($type);};
+            function iconv_set_encoding($type, $charset) {return s\Iconv::iconv_set_encoding($type, $charset);};
+            function iconv_mime_encode($name, $value, $pref = INF) {return s\Iconv::iconv_mime_encode($name, $value, $pref);};
+            function ob_iconv_handler($buffer, $mode) {return s\Iconv::ob_iconv_handler($buffer, $mode);};
+            function iconv_mime_decode_headers($encoded_headers, $mode = 0, $charset = INF) {return s\Iconv::iconv_mime_decode_headers($encoded_headers, $mode, $charset);};
+
+            if (extension_loaded('mbstring'))
+            {
+                function iconv_strlen($s, $enc = INF) {return mb_strlen($s, $enc);};
+                function iconv_strpos($s, $needle, $offset = 0, $enc = INF) {return mb_strpos($s, $needle, $offset, $enc);};
+                function iconv_strrpos($s, $needle, $enc = INF) {return mb_strrpos($s, $needle, $enc);};
+                function iconv_substr($s, $start, $length = 2147483647, $enc = INF) {return mb_substr($s, $start, $length, $enc);};
+                function iconv_mime_decode($encoded_headers, $mode = 0, $charset = INF) {return mb_decode_mimeheader($encoded_headers, $mode, $charset);};
+            }
+            else
+            {
+                if (extension_loaded('xml'))
+                {
+                    function iconv_strlen($s, $enc = INF) {return s\Iconv::strlen1($s, $enc);};
+                }
+                else
+                {
+                    function iconv_strlen($s, $enc = INF) {return s\Iconv::strlen2($s, $enc);};
+                }
+
+                function iconv_strpos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_strpos($s, $needle, $offset, $enc);};
+                function iconv_strrpos($s, $needle, $enc = INF) {return s\Mbstring::mb_strrpos($s, $needle, $enc);};
+                function iconv_substr($s, $start, $length = 2147483647, $enc = INF) {return s\Mbstring::mb_substr($s, $start, $length, $enc);};
+                function iconv_mime_decode($encoded_headers, $mode = 0, $charset = INF) {return s\Iconv::iconv_mime_decode($encoded_headers, $mode, $charset);};
+            }
+        }
+    }
+
+    static function initExif()
+    {
+        if (extension_loaded('exif'))
+        {
+            if (ini_get('exif.encode_unicode') && 'UTF-8' !== strtoupper(ini_get('exif.encode_unicode')))
+            {
+                ini_set('exif.encode_unicode', 'UTF-8');
+            }
+
+            if (ini_get('exif.encode_jis') && 'UTF-8' !== strtoupper(ini_get('exif.encode_jis')))
+            {
+                ini_set('exif.encode_jis', 'UTF-8');
+            }
+        }
+    }
+
+    static function initIntl()
+    {
+        if (defined('GRAPHEME_CLUSTER_RX')) return;
+
+        preg_match('/^.$/u', '§') or user_error('PCRE is compiled without UTF-8 support', E_USER_WARNING);
+
+        if (!extension_loaded('intl'))
+        {
+            function normalizer_is_normalized($s, $form = s\Normalizer::NFC) {return s\Normalizer::isNormalized($s, $form);};
+            function normalizer_normalize($s, $form = s\Normalizer::NFC) {return s\Normalizer::normalize($s, $form);};
+
+            define('GRAPHEME_EXTR_COUNT', 0);
+            define('GRAPHEME_EXTR_MAXBYTES', 1);
+            define('GRAPHEME_EXTR_MAXCHARS', 2);
+
+            function grapheme_extract($s, $size, $type = 0, $start = 0, &$next = 0) {return s\Intl::grapheme_extract($s, $size, $type, $start, $next);};
+            function grapheme_stripos($s, $needle, $offset = 0) {return s\Intl::grapheme_stripos($s, $needle, $offset);};
+            function grapheme_stristr($s, $needle, $before_needle = false) {return s\Intl::grapheme_stristr($s, $needle, $before_needle);};
+            function grapheme_strlen($s) {return s\Intl::grapheme_strlen($s);};
+            function grapheme_strpos($s, $needle, $offset = 0) {return s\Intl::grapheme_strpos($s, $needle, $offset);};
+            function grapheme_strripos($s, $needle, $offset = 0) {return s\Intl::grapheme_strripos($s, $needle, $offset);};
+            function grapheme_strrpos($s, $needle, $offset = 0) {return s\Intl::grapheme_strrpos($s, $needle, $offset);};
+            function grapheme_strstr($s, $needle, $before_needle = false) {return s\Intl::grapheme_strstr($s, $needle, $before_needle);};
+            function grapheme_substr($s, $start, $len = 2147483647) {return s\Intl::grapheme_substr($s, $start, $len);};
+        }
+
+        if (PCRE_VERSION < '8.32')
+        {
+            // (CRLF|([ZWNJ-ZWJ]|T+|L*(LV?V+|LV|LVT)T*|L+|[^Control])[Extend]*|[Control])
+            // This regular expression is not up to date with the latest unicode grapheme cluster definition.
+            // However, until http://bugs.exim.org/show_bug.cgi?id=1279 is fixed, it's still better than \X
+
+            define('GRAPHEME_CLUSTER_RX', '(?:\r\n|(?:[ -~\x{200C}\x{200D}]|[ᆨ-ᇹ]+|[ᄀ-ᅟ]*(?:[가개갸걔거게겨계고과괘괴교구궈궤귀규그긔기까깨꺄꺠꺼께껴꼐꼬꽈꽤꾀꾜꾸꿔꿰뀌뀨끄끠끼나내냐냬너네녀녜노놔놰뇌뇨누눠눼뉘뉴느늬니다대댜댸더데뎌뎨도돠돼되됴두둬뒈뒤듀드듸디따때땨떄떠떼뗘뗴또똬뙈뙤뚀뚜뚸뛔뛰뜌뜨띄띠라래랴럐러레려례로롸뢔뢰료루뤄뤠뤼류르릐리마매먀먜머메며몌모뫄뫠뫼묘무뭐뭬뮈뮤므믜미바배뱌뱨버베벼볘보봐봬뵈뵤부붜붸뷔뷰브븨비빠빼뺘뺴뻐뻬뼈뼤뽀뽜뽸뾔뾰뿌뿨쀄쀠쀼쁘쁴삐사새샤섀서세셔셰소솨쇄쇠쇼수숴쉐쉬슈스싀시싸쌔쌰썌써쎄쎠쎼쏘쏴쐐쐬쑈쑤쒀쒜쒸쓔쓰씌씨아애야얘어에여예오와왜외요우워웨위유으의이자재쟈쟤저제져졔조좌좨죄죠주줘줴쥐쥬즈즤지짜째쨔쨰쩌쩨쪄쪠쪼쫘쫴쬐쬬쭈쭤쮀쮜쮸쯔쯰찌차채챠챼처체쳐쳬초촤쵀최쵸추춰췌취츄츠츼치카캐캬컈커케켜켸코콰쾌쾨쿄쿠쿼퀘퀴큐크킈키타태탸턔터테텨톄토톼퇘퇴툐투퉈퉤튀튜트틔티파패퍄퍠퍼페펴폐포퐈퐤푀표푸풔풰퓌퓨프픠피하해햐햬허헤혀혜호화홰회효후훠훼휘휴흐희히]?[ᅠ-ᆢ]+|[가-힣])[ᆨ-ᇹ]*|[ᄀ-ᅟ]+|[^\p{Cc}\p{Cf}\p{Zl}\p{Zp}])[\p{Mn}\p{Me}\x{09BE}\x{09D7}\x{0B3E}\x{0B57}\x{0BBE}\x{0BD7}\x{0CC2}\x{0CD5}\x{0CD6}\x{0D3E}\x{0D57}\x{0DCF}\x{0DDF}\x{200C}\x{200D}\x{1D165}\x{1D16E}-\x{1D172}]*|[\p{Cc}\p{Cf}\p{Zl}\p{Zp}])');
+        }
+        else
+        {
+            define('GRAPHEME_CLUSTER_RX', '\X');
+        }
+    }
+
+    static function initLocale()
+    {
+        // With non-UTF-8 locale, basename() bugs.
+        // Be aware that setlocale() can be slow.
+        // You'd better properly configure your LANG environment variable to an UTF-8 locale.
+
+        if ('' === basename('§'))
+        {
+            setlocale(LC_ALL, 'C.UTF-8', 'C');
+            setlocale(LC_CTYPE, 'en_US.UTF-8', 'fr_FR.UTF-8', 'es_ES.UTF-8', 'de_DE.UTF-8', 'ru_RU.UTF-8', 'pt_BR.UTF-8', 'it_IT.UTF-8', 'ja_JP.UTF-8', 'zh_CN.UTF-8', 0);
+        }
+    }
+
+    static function filterRequestUri()
+    {
+        // Ensures the URL is well formed UTF-8
+        // When not, assumes Windows-1252 and redirects to the corresponding UTF-8 encoded URL
+
+        if (isset($_SERVER['REQUEST_URI']) && !preg_match('//u', urldecode($a = $_SERVER['REQUEST_URI'])))
+        {
+            if ($a === u::utf8_decode($a))
+            {
+                $a = preg_replace_callback(
+                    '/(?:%[89A-F][0-9A-F])+/i',
+                    function($m) {return urlencode(u::utf8_encode(urldecode($m[0])));},
+                    $a
+                );
+            }
+            else $a = '/';
+
+            header('HTTP/1.1 301 Moved Permanently');
+            header('Location: ' . $a);
+
+            exit;
+        }
+    }
+
+    static function filterRequestInputs($normalization_form = n::NFC)
+    {
+        // Ensures inputs are well formed UTF-8
+        // When not, assumes Windows-1252 and converts to UTF-8
+        // Tests only values, not keys
+
+        $a = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST, &$_ENV);
+        foreach ($_FILES as &$v) $a[] = array(&$v['name'], &$v['type']);
+
+        $len = count($a);
+        for ($i = 0; $i < $len; ++$i)
+        {
+            foreach ($a[$i] as &$v)
+            {
+                if (is_array($v)) $a[$len++] =& $v;
+                else if (!n::isNormalized($v, $normalization_form))
+                {
+                    if (preg_match('//u', $v)) $v = n::normalize($v, $normalization_form);
+                    else $v = u::utf8_encode($v);
+                }
+            }
+
+            reset($a[$i]);
+            unset($a[$i]);
+        }
+    }
+}
diff --git a/class/Patchwork/Utf8/bootup.php b/class/Patchwork/Utf8/bootup.php
deleted file mode 100644
index 565f8ef..0000000
--- a/class/Patchwork/Utf8/bootup.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php // vi: set fenc=utf-8 ts=4 sw=4 et:
-/*
- * Copyright (C) 2012 Nicolas Grekas - p@tchwork.com
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the (at your option):
- * Apache License v2.0 (http://apache.org/licenses/LICENSE-2.0.txt), or
- * GNU General Public License v2.0 (http://gnu.org/licenses/gpl-2.0.txt).
- */
-
-namespace Patchwork\Utf8;
-
-use Normalizer as n;
-use Patchwork\Utf8 as u;
-use Patchwork\PHP\Shim as s;
-
-
-function initAll()
-{
-    preg_match('/^.$/u', '§') or user_error('PCRE is compiled without UTF-8 support', E_USER_WARNING);
-
-    u\initUtf8Encode();
-    u\initMbstring();
-    u\initIconv();
-    u\initExif();
-    u\initIntl();
-    u\initLocale();
-
-    require __DIR__ . '.php';
-}
-
-function initUtf8Encode()
-{
-    if (!function_exists('utf8_encode'))
-    {
-        require dirname(__DIR__) . '/PHP/Shim/Xml.php';
-
-        function utf8_encode($s) {return s\Xml::utf8_encode($s);};
-        function utf8_decode($s) {return s\Xml::utf8_decode($s);};
-    }
-}
-
-function initMbstring()
-{
-    if (extension_loaded('mbstring'))
-    {
-        if ( ((int) ini_get('mbstring.encoding_translation') || in_array(strtolower(ini_get('mbstring.encoding_translation')), array('on', 'yes', 'true')))
-            && !in_array(strtolower(ini_get('mbstring.http_input')), array('pass', '8bit', 'utf-8')) )
-        {
-            user_error('php.ini settings: Please disable mbstring.encoding_translation or set mbstring.http_input to "pass"',  E_USER_WARNING);
-        }
-
-        if (MB_OVERLOAD_STRING & (int) ini_get('mbstring.func_overload'))
-        {
-            user_error('php.ini settings: Please disable mbstring.func_overload', E_USER_WARNING);
-        }
-
-        mb_regex_encoding('UTF-8');
-        ini_set('mbstring.script_encoding', 'pass');
-
-        if ('utf-8' !== strtolower(mb_internal_encoding()))
-        {
-            mb_internal_encoding('UTF-8');
-            ini_set('mbstring.internal_encoding', 'UTF-8');
-        }
-
-        if ('none' !== strtolower(mb_substitute_character()))
-        {
-            mb_substitute_character('none');
-            ini_set('mbstring.substitute_character', 'none');
-        }
-
-        if (!in_array(strtolower(mb_http_output()), array('pass', '8bit')))
-        {
-            mb_http_output('pass');
-            ini_set('mbstring.http_output', 'pass');
-        }
-
-        if (!in_array(strtolower(mb_language()), array('uni', 'neutral')))
-        {
-            mb_language('uni');
-            ini_set('mbstring.language', 'uni');
-        }
-    }
-    else if (!defined('MB_OVERLOAD_MAIL'))
-    {
-        require dirname(__DIR__) . '/PHP/Shim/Mbstring.php';
-
-        define('MB_OVERLOAD_MAIL', 1);
-        define('MB_OVERLOAD_STRING', 2);
-        define('MB_OVERLOAD_REGEX', 4);
-        define('MB_CASE_UPPER', 0);
-        define('MB_CASE_LOWER',1);
-        define('MB_CASE_TITLE', 2);
-
-        function mb_convert_encoding($s, $to, $from = INF) {return s\Mbstring::mb_convert_encoding($s, $to, $from);};
-        function mb_decode_mimeheader($s) {return s\Mbstring::mb_decode_mimeheader($s);};
-        function mb_encode_mimeheader($s, $charset = INF, $transfer_enc = INF, $lf = INF, $indent = INF) {return s\Mbstring::mb_encode_mimeheader($s, $charset, $transfer_enc, $lf, $indent);};
-        function mb_convert_case($s, $mode, $enc = INF) {return s\Mbstring::mb_convert_case($s, $mode, $enc);};
-        function mb_internal_encoding($enc = INF) {return s\Mbstring::mb_internal_encoding($enc);};
-        function mb_list_encodings() {return s\Mbstring::mb_list_encodings();};
-        function mb_parse_str($s, &$result = array()) {return parse_str($s, $result);};
-        function mb_strlen($s, $enc = INF) {return s\Mbstring::mb_strlen($s, $enc);};
-        function mb_strpos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_strpos($s, $needle, $offset, $enc);};
-        function mb_strtolower($s, $enc = INF) {return s\Mbstring::mb_strtolower($s, $enc);};
-        function mb_strtoupper($s, $enc = INF) {return s\Mbstring::mb_strtoupper($s, $enc);};
-        function mb_substitute_character($char = INF) {return s\Mbstring::mb_substitute_character($char);};
-        function mb_substr_count($s, $needle) {return substr_count($s, $needle);};
-        function mb_substr($s, $start, $length = 2147483647, $enc = INF) {return s\Mbstring::mb_substr($s, $start, $length, $enc);};
-        function mb_stripos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_stripos($s, $needle, $offset, $enc);};
-        function mb_stristr($s, $needle, $part = false, $enc = INF) {return s\Mbstring::mb_stristr($s, $needle, $part, $enc);};
-        function mb_strrchr($s, $needle, $part = false, $enc = INF) {return s\Mbstring::mb_strrchr($s, $needle, $part, $enc);};
-        function mb_strrichr($s, $needle, $part = false, $enc = INF) {return s\Mbstring::mb_strrichr($s, $needle, $part, $enc);};
-        function mb_strripos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_strripos($s, $needle, $offset, $enc);};
-        function mb_strrpos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_strrpos($s, $needle, $offset, $enc);};
-        function mb_strstr($s, $needle, $part = false, $enc = INF) {return s\Mbstring::mb_strstr($s, $needle, $part, $enc);};
-    }
-}
-
-function initIconv()
-{
-    if (!function_exists('iconv') && function_exists('libiconv'))
-    {
-        // See http://php.net/manual/en/function.iconv.php#47428
-        function iconv($from, $to, $s) {return libiconv($from, $to, $s);};
-    }
-
-    if (extension_loaded('iconv'))
-    {
-        if ('UTF-8' !== iconv_get_encoding('input_encoding'))
-        {
-            iconv_set_encoding('input_encoding', 'UTF-8');
-            ini_set('iconv.input_encoding', 'UTF-8');
-        }
-
-        if ('UTF-8' !== iconv_get_encoding('internal_encoding'))
-        {
-            iconv_set_encoding('internal_encoding', 'UTF-8');
-            ini_set('iconv.internal_encoding', 'UTF-8');
-        }
-
-        if ('UTF-8' !== iconv_get_encoding('output_encoding'))
-        {
-            iconv_set_encoding('output_encoding' , 'UTF-8');
-            ini_set('iconv.output_encoding', 'UTF-8');
-        }
-    }
-    else if (!defined('ICONV_IMPL'))
-    {
-        require dirname(__DIR__) . '/PHP/Shim/Iconv.php';
-
-        define('ICONV_IMPL', 'Patchwork');
-        define('ICONV_VERSION', '1.0');
-        define('ICONV_MIME_DECODE_STRICT', 1);
-        define('ICONV_MIME_DECODE_CONTINUE_ON_ERROR', 2);
-
-        function iconv($from, $to, $s) {return s\Iconv::iconv($from, $to, $s);};
-        function iconv_get_encoding($type = 'all') {return s\Iconv::iconv_get_encoding($type);};
-        function iconv_set_encoding($type, $charset) {return s\Iconv::iconv_set_encoding($type, $charset);};
-        function iconv_mime_encode($name, $value, $pref = INF) {return s\Iconv::iconv_mime_encode($name, $value, $pref);};
-        function ob_iconv_handler($buffer, $mode) {return s\Iconv::ob_iconv_handler($buffer, $mode);};
-        function iconv_mime_decode_headers($encoded_headers, $mode = 0, $charset = INF) {return s\Iconv::iconv_mime_decode_headers($encoded_headers, $mode, $charset);};
-
-        if (extension_loaded('mbstring'))
-        {
-            function iconv_strlen($s, $enc = INF) {return mb_strlen($s, $enc);};
-            function iconv_strpos($s, $needle, $offset = 0, $enc = INF) {return mb_strpos($s, $needle, $offset, $enc);};
-            function iconv_strrpos($s, $needle, $enc = INF) {return mb_strrpos($s, $needle, $enc);};
-            function iconv_substr($s, $start, $length = 2147483647, $enc = INF) {return mb_substr($s, $start, $length, $enc);};
-            function iconv_mime_decode($encoded_headers, $mode = 0, $charset = INF) {return mb_decode_mimeheader($encoded_headers, $mode, $charset);};
-        }
-        else
-        {
-            if (extension_loaded('xml'))
-            {
-                function iconv_strlen($s, $enc = INF) {return s\Iconv::strlen1($s, $enc);};
-            }
-            else
-            {
-                function iconv_strlen($s, $enc = INF) {return s\Iconv::strlen2($s, $enc);};
-            }
-
-            function iconv_strpos($s, $needle, $offset = 0, $enc = INF) {return s\Mbstring::mb_strpos($s, $needle, $offset, $enc);};
-            function iconv_strrpos($s, $needle, $enc = INF) {return s\Mbstring::mb_strrpos($s, $needle, $enc);};
-            function iconv_substr($s, $start, $length = 2147483647, $enc = INF) {return s\Mbstring::mb_substr($s, $start, $length, $enc);};
-            function iconv_mime_decode($encoded_headers, $mode = 0, $charset = INF) {return s\Iconv::iconv_mime_decode($encoded_headers, $mode, $charset);};
-        }
-    }
-}
-
-function initExif()
-{
-    if (extension_loaded('exif'))
-    {
-        if (ini_get('exif.encode_unicode') && 'UTF-8' !== strtoupper(ini_get('exif.encode_unicode')))
-        {
-            ini_set('exif.encode_unicode', 'UTF-8');
-        }
-
-        if (ini_get('exif.encode_jis') && 'UTF-8' !== strtoupper(ini_get('exif.encode_jis')))
-        {
-            ini_set('exif.encode_jis', 'UTF-8');
-        }
-    }
-}
-
-function initIntl()
-{
-    if (defined('GRAPHEME_CLUSTER_RX')) return;
-
-    if (!extension_loaded('intl'))
-    {
-        require dirname(__DIR__) . '/PHP/Shim/Normalizer.php';
-        require dirname(__DIR__) . '/PHP/Shim/Intl.php';
-
-        class Normalizer extends s\Normalizer {}
-
-        function normalizer_is_normalized($s, $form = s\Normalizer::NFC) {return s\Normalizer::isNormalized($s, $form);};
-        function normalizer_normalize($s, $form = s\Normalizer::NFC) {return s\Normalizer::normalize($s, $form);};
-
-        define('GRAPHEME_EXTR_COUNT', 0);
-        define('GRAPHEME_EXTR_MAXBYTES', 1);
-        define('GRAPHEME_EXTR_MAXCHARS', 2);
-
-        function grapheme_extract($s, $size, $type = 0, $start = 0, &$next = 0) {return s\Intl::grapheme_extract($s, $size, $type, $start, $next);};
-        function grapheme_stripos($s, $needle, $offset = 0) {return s\Intl::grapheme_stripos($s, $needle, $offset);};
-        function grapheme_stristr($s, $needle, $before_needle = false) {return s\Intl::grapheme_stristr($s, $needle, $before_needle);};
-        function grapheme_strlen($s) {return s\Intl::grapheme_strlen($s);};
-        function grapheme_strpos($s, $needle, $offset = 0) {return s\Intl::grapheme_strpos($s, $needle, $offset);};
-        function grapheme_strripos($s, $needle, $offset = 0) {return s\Intl::grapheme_strripos($s, $needle, $offset);};
-        function grapheme_strrpos($s, $needle, $offset = 0) {return s\Intl::grapheme_strrpos($s, $needle, $offset);};
-        function grapheme_strstr($s, $needle, $before_needle = false) {return s\Intl::grapheme_strstr($s, $needle, $before_needle);};
-        function grapheme_substr($s, $start, $len = 2147483647) {return s\Intl::grapheme_substr($s, $start, $len);};
-    }
-    else if ('à' === grapheme_substr('éà', 1, -2))
-    {
-        // Loads s\Intl::grapheme_substr_workaround62759()
-        // when the native grapheme_substr() is buggy
-        // so that u::substr() can use it.
-        require dirname(__DIR__) . '/PHP/Shim/Intl.php';
-    }
-
-    if (PCRE_VERSION < '8.32')
-    {
-        // (CRLF|([ZWNJ-ZWJ]|T+|L*(LV?V+|LV|LVT)T*|L+|[^Control])[Extend]*|[Control])
-        // This regular expression is not up to date with the latest unicode grapheme cluster definition.
-        // However, until http://bugs.exim.org/show_bug.cgi?id=1279 is fixed, it's still better than \X
-
-        define('GRAPHEME_CLUSTER_RX', '(?:\r\n|(?:[ -~\x{200C}\x{200D}]|[ᆨ-ᇹ]+|[ᄀ-ᅟ]*(?:[가개갸걔거게겨계고과괘괴교구궈궤귀규그긔기까깨꺄꺠꺼께껴꼐꼬꽈꽤꾀꾜꾸꿔꿰뀌뀨끄끠끼나내냐냬너네녀녜노놔놰뇌뇨누눠눼뉘뉴느늬니다대댜댸더데뎌뎨도돠돼되됴두둬뒈뒤듀드듸디따때땨떄떠떼뗘뗴또똬뙈뙤뚀뚜뚸뛔뛰뜌뜨띄띠라래랴럐러레려례로롸뢔뢰료루뤄뤠뤼류르릐리마매먀먜머메며몌모뫄뫠뫼묘무뭐뭬뮈뮤므믜미바배뱌뱨버베벼볘보봐봬뵈뵤부붜붸뷔뷰브븨비빠빼뺘뺴뻐뻬뼈뼤뽀뽜뽸뾔뾰뿌뿨쀄쀠쀼쁘쁴삐사새샤섀서세셔셰소솨쇄쇠쇼수숴쉐쉬슈스싀시싸쌔쌰썌써쎄쎠쎼쏘쏴쐐쐬쑈쑤쒀쒜쒸쓔쓰씌씨아애야얘어에여예오와왜외요우워웨위유으의이자재쟈쟤저제져졔조좌좨죄죠주줘줴쥐쥬즈즤지짜째쨔쨰쩌쩨쪄쪠쪼쫘쫴쬐쬬쭈쭤쮀쮜쮸쯔쯰찌차채챠챼처체쳐쳬초촤쵀최쵸추춰췌취츄츠츼치카캐캬컈커케켜켸코콰쾌쾨쿄쿠쿼퀘퀴큐크킈키타태탸턔터테텨톄토톼퇘퇴툐투퉈퉤튀튜트틔티파패퍄퍠퍼페펴폐포퐈퐤푀표푸풔풰퓌퓨프픠피하해햐햬허헤혀혜호화홰회효후훠훼휘휴흐희히]?[ᅠ-ᆢ]+|[가-힣])[ᆨ-ᇹ]*|[ᄀ-ᅟ]+|[^\p{Cc}\p{Cf}\p{Zl}\p{Zp}])[\p{Mn}\p{Me}\x{09BE}\x{09D7}\x{0B3E}\x{0B57}\x{0BBE}\x{0BD7}\x{0CC2}\x{0CD5}\x{0CD6}\x{0D3E}\x{0D57}\x{0DCF}\x{0DDF}\x{200C}\x{200D}\x{1D165}\x{1D16E}-\x{1D172}]*|[\p{Cc}\p{Cf}\p{Zl}\p{Zp}])');
-    }
-    else
-    {
-        define('GRAPHEME_CLUSTER_RX', '\X');
-    }
-}
-
-function initLocale()
-{
-    // With non-UTF-8 locale, basename() bugs.
-    // Be aware that setlocale() can be slow.
-    // You'd better properly configure your LANG environment variable to an UTF-8 locale.
-
-    if ('' === basename('§'))
-    {
-        setlocale(LC_ALL, 'C.UTF-8', 'C');
-        setlocale(LC_CTYPE, 'en_US.UTF-8', 'fr_FR.UTF-8', 'es_ES.UTF-8', 'de_DE.UTF-8', 'ru_RU.UTF-8', 'pt_BR.UTF-8', 'it_IT.UTF-8', 'ja_JP.UTF-8', 'zh_CN.UTF-8', 0);
-    }
-}
-
-function filterRequestUri()
-{
-    // Ensures the URL is well formed UTF-8
-    // When not, assumes Windows-1252 and redirects to the corresponding UTF-8 encoded URL
-
-    if (isset($_SERVER['REQUEST_URI']) && !preg_match('//u', urldecode($a = $_SERVER['REQUEST_URI'])))
-    {
-        if ($a === u::utf8_decode($a))
-        {
-            $a = preg_replace_callback(
-                '/(?:%[89A-F][0-9A-F])+/i',
-                function($m) {return urlencode(u::utf8_encode(urldecode($m[0])));},
-                $a
-            );
-        }
-        else $a = '/';
-
-        header('HTTP/1.1 301 Moved Permanently');
-        header('Location: ' . $a);
-
-        exit;
-    }
-}
-
-function filterRequestInputs($normalization_form = n::NFC)
-{
-    // Ensures inputs are well formed UTF-8
-    // When not, assumes Windows-1252 and converts to UTF-8
-    // Tests only values, not keys
-
-    $a = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST, &$_ENV);
-    foreach ($_FILES as &$v) $a[] = array(&$v['name'], &$v['type']);
-
-    $len = count($a);
-    for ($i = 0; $i < $len; ++$i)
-    {
-        foreach ($a[$i] as &$v)
-        {
-            if (is_array($v)) $a[$len++] =& $v;
-            else if (!n::isNormalized($v, $normalization_form))
-            {
-                if (preg_match('//u', $v)) $v = n::normalize($v, $normalization_form);
-                else $v = u::utf8_encode($v);
-            }
-        }
-
-        reset($a[$i]);
-        unset($a[$i]);
-    }
-}
diff --git a/composer.json b/composer.json
index ef4218c..c464bb6 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,8 @@
         "php": ">=5.3.0"
     },
     "autoload": {
-        "files": ["bootup.utf8.php"]
+        "psr-0": {
+            "Patchwork": "class/"
+        }
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 7e52a0d..d92e7d5 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,12 +1,15 @@
 <?php
 
-$dir = dirname(dirname(__FILE__));
+$dir = dirname(__DIR__);
 
-require $dir . '/bootup.utf8.php';
+require $dir . '/class/Patchwork/Utf8.php';
+require $dir . '/class/Patchwork/Utf8/Bootup.php';
+require $dir . '/class/Patchwork/PHP/Shim/Xml.php';
+require $dir . '/class/Patchwork/PHP/Shim/Intl.php';
+require $dir . '/class/Patchwork/PHP/Shim/Iconv.php';
+require $dir . '/class/Patchwork/PHP/Shim/Mbstring.php';
+require $dir . '/class/Patchwork/PHP/Shim/Normalizer.php';
+
+class_exists('Normalizer', false) or require $dir . '/class/Normalizer.php';
 
-require_once $dir . '/class/Patchwork/Utf8.php';
-require_once $dir . '/class/Patchwork/PHP/Shim/Xml.php';
-require_once $dir . '/class/Patchwork/PHP/Shim/Intl.php';
-require_once $dir . '/class/Patchwork/PHP/Shim/Iconv.php';
-require_once $dir . '/class/Patchwork/PHP/Shim/Mbstring.php';
-require_once $dir . '/class/Patchwork/PHP/Shim/Normalizer.php';
+require $dir . '/bootup.utf8.php';