140 files changed, 16 insertions, 12 deletions
diff --git a/_testing/README b/_test/README
index 481f7906e..aadd819bf 100644
--- a/_testing/README
+++ b/_test/README
@@ -32,6 +32,11 @@ Running all Tests
   > cd _testing/
   > phpunit
 
+PHPUnit will fail on some systems with the error 'headers already sent'. The
+known workaround for that is to use the '--stderr' flag for PHPUnit:
+
+  > phpunit --stderr
+
 
 Create new Tests
 -----------------------------------------------------------------------------
@@ -42,13 +47,20 @@ file, implement a class, extending 'DokuWikiTest'. Every method, starting
 with 'test' will be called as a test (e.g. 'testIfThisIsValid');
 
 
-Known Bad Tests
+TODO for the test framework
 -----------------------------------------------------------------------------
 
-Every test should be green on every run but the following were broken after
-the PHPUnit migration and are disabled by default:
+  * test cross platform compatibility: especially test windows
+  * update http://www.dokuwiki.org/devel:unittesting
+  * optional: add helper methods to TestRequest for easy form submission
+    * createForm(), ...
+
+
+Migration Protocol
+-----------------------------------------------------------------------------
+
+The following tests were not migrated:
 
-  * inc/DifferenceEngine (removed FS#2161, FS#2223)
   * inc/html_hilight (runkit)
   * inc/indexer_idx_indexlengths (fs dependencies)
   * inc/mail_send (integration test)
@@ -56,11 +68,3 @@ the PHPUnit migration and are disabled by default:
   * inc/parser/xhtml_htmlphp (runkit)
   * inc/parser/xhtml_links
 
-
-TODO for the test framework
------------------------------------------------------------------------------
-
-  * test cross platform compatibility: especially test windows
-  * update http://www.dokuwiki.org/devel:unittesting
-  * optional: add helper methods to TestRequest for easy form submission
-    * createForm(), ...
diff --git a/_testing/bootstrap.php b/_test/bootstrap.php
index f8ca4d483..f8ca4d483 100644
--- a/_testing/bootstrap.php
+++ b/_test/bootstrap.php
diff --git a/_testing/conf/acl.auth.php.dist b/_test/conf/acl.auth.php.dist
index 14344d778..14344d778 100644
--- a/_testing/conf/acl.auth.php.dist
+++ b/_test/conf/acl.auth.php.dist
diff --git a/_testing/conf/acronyms.conf b/_test/conf/acronyms.conf
index 058e85550..058e85550 100644
--- a/_testing/conf/acronyms.conf
+++ b/_test/conf/acronyms.conf
diff --git a/_testing/conf/dokuwiki.php b/_test/conf/dokuwiki.php
index 5c0b28114..5c0b28114 100644
--- a/_testing/conf/dokuwiki.php
+++ b/_test/conf/dokuwiki.php
diff --git a/_testing/conf/entities.conf b/_test/conf/entities.conf
index be9ed6d40..be9ed6d40 100644
--- a/_testing/conf/entities.conf
+++ b/_test/conf/entities.conf
diff --git a/_testing/conf/interwiki.conf b/_test/conf/interwiki.conf
index 28d603de2..28d603de2 100644
--- a/_testing/conf/interwiki.conf
+++ b/_test/conf/interwiki.conf
diff --git a/_testing/conf/license.php b/_test/conf/license.php
index 89728ab57..89728ab57 100644
--- a/_testing/conf/license.php
+++ b/_test/conf/license.php
diff --git a/_testing/conf/local.php b/_test/conf/local.php
index 3de30ee21..3de30ee21 100644
--- a/_testing/conf/local.php
+++ b/_test/conf/local.php
diff --git a/_testing/conf/local.php.dist b/_test/conf/local.php.dist
index 0397954f4..0397954f4 100644
--- a/_testing/conf/local.php.dist
+++ b/_test/conf/local.php.dist
diff --git a/_testing/conf/mediameta.php b/_test/conf/mediameta.php
index 0428a4b88..0428a4b88 100644
--- a/_testing/conf/mediameta.php
+++ b/_test/conf/mediameta.php
diff --git a/_testing/conf/mime.conf b/_test/conf/mime.conf
index 24529b06c..24529b06c 100644
--- a/_testing/conf/mime.conf
+++ b/_test/conf/mime.conf
diff --git a/_testing/conf/mysql.conf.php.example b/_test/conf/mysql.conf.php.example
index 94bc14e1f..94bc14e1f 100644
--- a/_testing/conf/mysql.conf.php.example
+++ b/_test/conf/mysql.conf.php.example
diff --git a/_testing/conf/plugins.local.php b/_test/conf/plugins.local.php
index 00e8c10be..00e8c10be 100644
--- a/_testing/conf/plugins.local.php
+++ b/_test/conf/plugins.local.php
diff --git a/_testing/conf/plugins.php b/_test/conf/plugins.php
index b2c79970d..b2c79970d 100644
--- a/_testing/conf/plugins.php
+++ b/_test/conf/plugins.php
diff --git a/_testing/conf/plugins.required.php b/_test/conf/plugins.required.php
index 26eb8888b..26eb8888b 100644
--- a/_testing/conf/plugins.required.php
+++ b/_test/conf/plugins.required.php
diff --git a/_testing/conf/scheme.conf b/_test/conf/scheme.conf
index 88cb3c44d..88cb3c44d 100644
--- a/_testing/conf/scheme.conf
+++ b/_test/conf/scheme.conf
diff --git a/_testing/conf/smileys.conf b/_test/conf/smileys.conf
index 80daed57a..80daed57a 100644
--- a/_testing/conf/smileys.conf
+++ b/_test/conf/smileys.conf
diff --git a/_testing/conf/users.auth.php.dist b/_test/conf/users.auth.php.dist
index 6576eeb5f..6576eeb5f 100644
--- a/_testing/conf/users.auth.php.dist
+++ b/_test/conf/users.auth.php.dist
diff --git a/_testing/conf/wordblock.conf b/_test/conf/wordblock.conf
index fe451f278..fe451f278 100644
--- a/_testing/conf/wordblock.conf
+++ b/_test/conf/wordblock.conf
diff --git a/_testing/core/DokuWikiTest.php b/_test/core/DokuWikiTest.php
index e47c06329..e47c06329 100644
--- a/_testing/core/DokuWikiTest.php
+++ b/_test/core/DokuWikiTest.php
diff --git a/_testing/core/TestRequest.php b/_test/core/TestRequest.php
index fa3ddec90..fa3ddec90 100644
--- a/_testing/core/TestRequest.php
+++ b/_test/core/TestRequest.php
diff --git a/_testing/core/TestResponse.php b/_test/core/TestResponse.php
index 6d20afb28..6d20afb28 100644
--- a/_testing/core/TestResponse.php
+++ b/_test/core/TestResponse.php
diff --git a/_testing/core/TestUtils.php b/_test/core/TestUtils.php
index 64de62213..64de62213 100644
--- a/_testing/core/TestUtils.php
+++ b/_test/core/TestUtils.php
diff --git a/_testing/core/phpQuery-onefile.php b/_test/core/phpQuery-onefile.php
index 4c1dfa3da..4c1dfa3da 100644
--- a/_testing/core/phpQuery-onefile.php
+++ b/_test/core/phpQuery-onefile.php
diff --git a/_testing/data/_dummy b/_test/data/_dummy
index e69de29bb..e69de29bb 100644
--- a/_testing/data/_dummy
+++ b/_test/data/_dummy
diff --git a/_testing/data/attic/_dummy b/_test/data/attic/_dummy
index e69de29bb..e69de29bb 100644
--- a/_testing/data/attic/_dummy
+++ b/_test/data/attic/_dummy
diff --git a/_testing/data/cache/_dummy b/_test/data/cache/_dummy
index e69de29bb..e69de29bb 100644
--- a/_testing/data/cache/_dummy
+++ b/_test/data/cache/_dummy
diff --git a/_testing/data/deleted.files b/_test/data/deleted.files
index d034e1d5b..d034e1d5b 100644
--- a/_testing/data/deleted.files
+++ b/_test/data/deleted.files
diff --git a/_testing/data/index/_dummy b/_test/data/index/_dummy
index e69de29bb..e69de29bb 100644
--- a/_testing/data/index/_dummy
+++ b/_test/data/index/_dummy
diff --git a/_testing/data/locks/_dummy b/_test/data/locks/_dummy
index e69de29bb..e69de29bb 100644
--- a/_testing/data/locks/_dummy
+++ b/_test/data/locks/_dummy
diff --git a/_testing/data/media/wiki/dokuwiki-128.png b/_test/data/media/wiki/dokuwiki-128.png
index b2306ac95..b2306ac95 100644
--- a/_testing/data/media/wiki/dokuwiki-128.png
+++ b/_test/data/media/wiki/dokuwiki-128.png
diff --git a/_testing/data/media_attic/_dummy b/_test/data/media_attic/_dummy
index e69de29bb..e69de29bb 100644
--- a/_testing/data/media_attic/_dummy
+++ b/_test/data/media_attic/_dummy
diff --git a/_testing/data/media_meta/_dummy b/_test/data/media_meta/_dummy
index e69de29bb..e69de29bb 100644
--- a/_testing/data/media_meta/_dummy
+++ b/_test/data/media_meta/_dummy
diff --git a/_testing/data/meta/_dummy b/_test/data/meta/_dummy
index e69de29bb..e69de29bb 100644
--- a/_testing/data/meta/_dummy
+++ b/_test/data/meta/_dummy
diff --git a/_testing/data/pages/wiki/dokuwiki.txt b/_test/data/pages/wiki/dokuwiki.txt
index e6fac5b65..e6fac5b65 100644
--- a/_testing/data/pages/wiki/dokuwiki.txt
+++ b/_test/data/pages/wiki/dokuwiki.txt
diff --git a/_testing/data/pages/wiki/syntax.txt b/_test/data/pages/wiki/syntax.txt
index 0b5480949..0b5480949 100644
--- a/_testing/data/pages/wiki/syntax.txt
+++ b/_test/data/pages/wiki/syntax.txt
diff --git a/_testing/data/security.png b/_test/data/security.png
index c4f1a9771..c4f1a9771 100644
--- a/_testing/data/security.png
+++ b/_test/data/security.png
diff --git a/_testing/data/security.xcf b/_test/data/security.xcf
index 990287830..990287830 100644
--- a/_testing/data/security.xcf
+++ b/_test/data/security.xcf
diff --git a/_testing/data/tmp/_dummy b/_test/data/tmp/_dummy
index e69de29bb..e69de29bb 100644
--- a/_testing/data/tmp/_dummy
+++ b/_test/data/tmp/_dummy
diff --git a/_testing/phpunit.xml b/_test/phpunit.xml
index bb0768b90..bb0768b90 100644
--- a/_testing/phpunit.xml
+++ b/_test/phpunit.xml
diff --git a/_testing/tests/inc/auth_aclcheck.test.php b/_test/tests/inc/auth_aclcheck.test.php
index 837926904..837926904 100644
--- a/_testing/tests/inc/auth_aclcheck.test.php
+++ b/_test/tests/inc/auth_aclcheck.test.php
diff --git a/_testing/tests/inc/auth_admincheck.test.php b/_test/tests/inc/auth_admincheck.test.php
index c108c60c0..c108c60c0 100644
--- a/_testing/tests/inc/auth_admincheck.test.php
+++ b/_test/tests/inc/auth_admincheck.test.php
diff --git a/_testing/tests/inc/auth_nameencode.test.php b/_test/tests/inc/auth_nameencode.test.php
index a3df6ac8c..a3df6ac8c 100644
--- a/_testing/tests/inc/auth_nameencode.test.php
+++ b/_test/tests/inc/auth_nameencode.test.php
diff --git a/_testing/tests/inc/auth_password.cputest.php b/_test/tests/inc/auth_password.cputest.php
index 4c922d0e3..4c922d0e3 100644
--- a/_testing/tests/inc/auth_password.cputest.php
+++ b/_test/tests/inc/auth_password.cputest.php
diff --git a/_testing/tests/inc/common_cleanText.test.php b/_test/tests/inc/common_cleanText.test.php
index 58f38d9bf..58f38d9bf 100644
--- a/_testing/tests/inc/common_cleanText.test.php
+++ b/_test/tests/inc/common_cleanText.test.php
diff --git a/_testing/tests/inc/common_clientip.test.php b/_test/tests/inc/common_clientip.test.php
index 680050e42..680050e42 100644
--- a/_testing/tests/inc/common_clientip.test.php
+++ b/_test/tests/inc/common_clientip.test.php
diff --git a/_testing/tests/inc/common_obfuscate.test.php b/_test/tests/inc/common_obfuscate.test.php
index 19dd2ff2c..19dd2ff2c 100644
--- a/_testing/tests/inc/common_obfuscate.test.php
+++ b/_test/tests/inc/common_obfuscate.test.php
diff --git a/_testing/tests/inc/common_pagetemplate.test.php b/_test/tests/inc/common_pagetemplate.test.php
index c4a2dfdf9..c4a2dfdf9 100644
--- a/_testing/tests/inc/common_pagetemplate.test.php
+++ b/_test/tests/inc/common_pagetemplate.test.php
diff --git a/_testing/tests/inc/form_form.test.php b/_test/tests/inc/form_form.test.php
index f55f16106..f55f16106 100644
--- a/_testing/tests/inc/form_form.test.php
+++ b/_test/tests/inc/form_form.test.php
diff --git a/_testing/tests/inc/httpclient_http.test.php b/_test/tests/inc/httpclient_http.test.php
index 3857273f7..3857273f7 100644
--- a/_testing/tests/inc/httpclient_http.test.php
+++ b/_test/tests/inc/httpclient_http.test.php
diff --git a/_testing/tests/inc/httpclient_https.test.php b/_test/tests/inc/httpclient_https.test.php
index f19e7c6d6..f19e7c6d6 100644
--- a/_testing/tests/inc/httpclient_https.test.php
+++ b/_test/tests/inc/httpclient_https.test.php
diff --git a/_testing/tests/inc/init_fullpath.test.php b/_test/tests/inc/init_fullpath.test.php
index e5b322874..e5b322874 100644
--- a/_testing/tests/inc/init_fullpath.test.php
+++ b/_test/tests/inc/init_fullpath.test.php
diff --git a/_testing/tests/inc/init_getbaseurl.test.php b/_test/tests/inc/init_getbaseurl.test.php
index 9d1377b3c..9d1377b3c 100644
--- a/_testing/tests/inc/init_getbaseurl.test.php
+++ b/_test/tests/inc/init_getbaseurl.test.php
diff --git a/_testing/tests/inc/ixr_library_date.test.php b/_test/tests/inc/ixr_library_date.test.php
index 377b0fd33..377b0fd33 100644
--- a/_testing/tests/inc/ixr_library_date.test.php
+++ b/_test/tests/inc/ixr_library_date.test.php
diff --git a/_testing/tests/inc/ixr_library_ixr_message.test.php b/_test/tests/inc/ixr_library_ixr_message.test.php
index ea7646b6a..ea7646b6a 100644
--- a/_testing/tests/inc/ixr_library_ixr_message.test.php
+++ b/_test/tests/inc/ixr_library_ixr_message.test.php
diff --git a/_testing/tests/inc/mail_isvalid.test.php b/_test/tests/inc/mail_isvalid.test.php
index 58f8e69d7..58f8e69d7 100644
--- a/_testing/tests/inc/mail_isvalid.test.php
+++ b/_test/tests/inc/mail_isvalid.test.php
diff --git a/_testing/tests/inc/mail_quoted_printable_encode.test.php b/_test/tests/inc/mail_quoted_printable_encode.test.php
index 888b1d1bf..888b1d1bf 100644
--- a/_testing/tests/inc/mail_quoted_printable_encode.test.php
+++ b/_test/tests/inc/mail_quoted_printable_encode.test.php
diff --git a/_testing/tests/inc/pageutils_clean_id.test.php b/_test/tests/inc/pageutils_clean_id.test.php
index 37debfa0a..37debfa0a 100644
--- a/_testing/tests/inc/pageutils_clean_id.test.php
+++ b/_test/tests/inc/pageutils_clean_id.test.php
diff --git a/_testing/tests/inc/pageutils_getid.test.php b/_test/tests/inc/pageutils_getid.test.php
index 608760298..608760298 100644
--- a/_testing/tests/inc/pageutils_getid.test.php
+++ b/_test/tests/inc/pageutils_getid.test.php
diff --git a/_testing/tests/inc/pageutils_resolve_id.test.php b/_test/tests/inc/pageutils_resolve_id.test.php
index 91f8dc696..91f8dc696 100644
--- a/_testing/tests/inc/pageutils_resolve_id.test.php
+++ b/_test/tests/inc/pageutils_resolve_id.test.php
diff --git a/_testing/tests/inc/pageutils_resolve_pageid.test.php b/_test/tests/inc/pageutils_resolve_pageid.test.php
index 32e5f841f..32e5f841f 100644
--- a/_testing/tests/inc/pageutils_resolve_pageid.test.php
+++ b/_test/tests/inc/pageutils_resolve_pageid.test.php
diff --git a/_testing/tests/inc/parser/lexer.test.php b/_test/tests/inc/parser/lexer.test.php
index 9b914fbd4..9b914fbd4 100644
--- a/_testing/tests/inc/parser/lexer.test.php
+++ b/_test/tests/inc/parser/lexer.test.php
diff --git a/_testing/tests/inc/parser/parser.inc.php b/_test/tests/inc/parser/parser.inc.php
index 06c314ac6..06c314ac6 100644
--- a/_testing/tests/inc/parser/parser.inc.php
+++ b/_test/tests/inc/parser/parser.inc.php
diff --git a/_testing/tests/inc/parser/parser_eol.test.php b/_test/tests/inc/parser/parser_eol.test.php
index 03569bb62..03569bb62 100644
--- a/_testing/tests/inc/parser/parser_eol.test.php
+++ b/_test/tests/inc/parser/parser_eol.test.php
diff --git a/_testing/tests/inc/parser/parser_footnote.test.php b/_test/tests/inc/parser/parser_footnote.test.php
index f3b5ddf56..f3b5ddf56 100644
--- a/_testing/tests/inc/parser/parser_footnote.test.php
+++ b/_test/tests/inc/parser/parser_footnote.test.php
diff --git a/_testing/tests/inc/parser/parser_headers.test.php b/_test/tests/inc/parser/parser_headers.test.php
index d7e5f0e42..d7e5f0e42 100644
--- a/_testing/tests/inc/parser/parser_headers.test.php
+++ b/_test/tests/inc/parser/parser_headers.test.php
diff --git a/_testing/tests/inc/parser/parser_i18n.test.php b/_test/tests/inc/parser/parser_i18n.test.php
index 096f2e227..096f2e227 100644
--- a/_testing/tests/inc/parser/parser_i18n.test.php
+++ b/_test/tests/inc/parser/parser_i18n.test.php
diff --git a/_testing/tests/inc/parser/parser_links.test.php b/_test/tests/inc/parser/parser_links.test.php
index 529efac6e..529efac6e 100644
--- a/_testing/tests/inc/parser/parser_links.test.php
+++ b/_test/tests/inc/parser/parser_links.test.php
diff --git a/_testing/tests/inc/parser/parser_lists.test.php b/_test/tests/inc/parser/parser_lists.test.php
index e4ef1f83e..e4ef1f83e 100644
--- a/_testing/tests/inc/parser/parser_lists.test.php
+++ b/_test/tests/inc/parser/parser_lists.test.php
diff --git a/_testing/tests/inc/parser/parser_preformatted.test.php b/_test/tests/inc/parser/parser_preformatted.test.php
index f7a01a7e5..f7a01a7e5 100644
--- a/_testing/tests/inc/parser/parser_preformatted.test.php
+++ b/_test/tests/inc/parser/parser_preformatted.test.php
diff --git a/_testing/tests/inc/parser/parser_quote.test.php b/_test/tests/inc/parser/parser_quote.test.php
index 4d77f2a39..4d77f2a39 100644
--- a/_testing/tests/inc/parser/parser_quote.test.php
+++ b/_test/tests/inc/parser/parser_quote.test.php
diff --git a/_testing/tests/inc/parser/parser_quotes.test.php b/_test/tests/inc/parser/parser_quotes.test.php
index b2dae1039..b2dae1039 100644
--- a/_testing/tests/inc/parser/parser_quotes.test.php
+++ b/_test/tests/inc/parser/parser_quotes.test.php
diff --git a/_testing/tests/inc/parser/parser_replacements.test.php b/_test/tests/inc/parser/parser_replacements.test.php
index f0367dac0..f0367dac0 100644
--- a/_testing/tests/inc/parser/parser_replacements.test.php
+++ b/_test/tests/inc/parser/parser_replacements.test.php
diff --git a/_testing/tests/inc/parser/parser_table.test.php b/_test/tests/inc/parser/parser_table.test.php
index 96789c38c..96789c38c 100644
--- a/_testing/tests/inc/parser/parser_table.test.php
+++ b/_test/tests/inc/parser/parser_table.test.php
diff --git a/_testing/tests/inc/parser/parser_unformatted.test.php b/_test/tests/inc/parser/parser_unformatted.test.php
index 7608cfd1c..7608cfd1c 100644
--- a/_testing/tests/inc/parser/parser_unformatted.test.php
+++ b/_test/tests/inc/parser/parser_unformatted.test.php
diff --git a/_testing/tests/inc/parserutils_set_metadata_during_rendering.test.php b/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php
index 66371509c..66371509c 100644
--- a/_testing/tests/inc/parserutils_set_metadata_during_rendering.test.php
+++ b/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php
diff --git a/_testing/tests/inc/remote.test.php b/_test/tests/inc/remote.test.php
index 5dc868295..5dc868295 100644
--- a/_testing/tests/inc/remote.test.php
+++ b/_test/tests/inc/remote.test.php
diff --git a/_testing/tests/inc/safefn.test.php b/_test/tests/inc/safefn.test.php
index 78e08fec6..78e08fec6 100644
--- a/_testing/tests/inc/safefn.test.php
+++ b/_test/tests/inc/safefn.test.php
diff --git a/_testing/tests/inc/search/data/ns1/ns3/page3.txt b/_test/tests/inc/search/data/ns1/ns3/page3.txt
index e69de29bb..e69de29bb 100644
--- a/_testing/tests/inc/search/data/ns1/ns3/page3.txt
+++ b/_test/tests/inc/search/data/ns1/ns3/page3.txt
diff --git a/_testing/tests/inc/search/data/ns1/page1.txt b/_test/tests/inc/search/data/ns1/page1.txt
index e69de29bb..e69de29bb 100644
--- a/_testing/tests/inc/search/data/ns1/page1.txt
+++ b/_test/tests/inc/search/data/ns1/page1.txt
diff --git a/_testing/tests/inc/search/data/ns1/page2.txt b/_test/tests/inc/search/data/ns1/page2.txt
index e69de29bb..e69de29bb 100644
--- a/_testing/tests/inc/search/data/ns1/page2.txt
+++ b/_test/tests/inc/search/data/ns1/page2.txt
diff --git a/_testing/tests/inc/search/data/ns2/nopage.ext b/_test/tests/inc/search/data/ns2/nopage.ext
index e69de29bb..e69de29bb 100644
--- a/_testing/tests/inc/search/data/ns2/nopage.ext
+++ b/_test/tests/inc/search/data/ns2/nopage.ext
diff --git a/_testing/tests/inc/search/data/ns2/page1.txt b/_test/tests/inc/search/data/ns2/page1.txt
index e69de29bb..e69de29bb 100644
--- a/_testing/tests/inc/search/data/ns2/page1.txt
+++ b/_test/tests/inc/search/data/ns2/page1.txt
diff --git a/_testing/tests/inc/search/search.test.php b/_test/tests/inc/search/search.test.php
index f7ea469b9..f7ea469b9 100644
--- a/_testing/tests/inc/search/search.test.php
+++ b/_test/tests/inc/search/search.test.php
diff --git a/_testing/tests/inc/utf8_correctidx.test.php b/_test/tests/inc/utf8_correctidx.test.php
index 5c37627b6..5c37627b6 100644
--- a/_testing/tests/inc/utf8_correctidx.test.php
+++ b/_test/tests/inc/utf8_correctidx.test.php
diff --git a/_testing/tests/inc/utf8_html.test.php b/_test/tests/inc/utf8_html.test.php
index 94acc6d6c..94acc6d6c 100644
--- a/_testing/tests/inc/utf8_html.test.php
+++ b/_test/tests/inc/utf8_html.test.php
diff --git a/_testing/tests/inc/utf8_kanaromaji.txt b/_test/tests/inc/utf8_kanaromaji.txt
index d6bf51e95..d6bf51e95 100644
--- a/_testing/tests/inc/utf8_kanaromaji.txt
+++ b/_test/tests/inc/utf8_kanaromaji.txt
diff --git a/_testing/tests/inc/utf8_romanize.cputest.php b/_test/tests/inc/utf8_romanize.cputest.php
index 66e3b76c9..66e3b76c9 100644
--- a/_testing/tests/inc/utf8_romanize.cputest.php
+++ b/_test/tests/inc/utf8_romanize.cputest.php
diff --git a/_testing/tests/inc/utf8_stripspecials.test.php b/_test/tests/inc/utf8_stripspecials.test.php
index 532430b60..532430b60 100644
--- a/_testing/tests/inc/utf8_stripspecials.test.php
+++ b/_test/tests/inc/utf8_stripspecials.test.php
diff --git a/_testing/tests/inc/utf8_substr.test.php b/_test/tests/inc/utf8_substr.test.php
index 19eea4eb4..19eea4eb4 100644
--- a/_testing/tests/inc/utf8_substr.test.php
+++ b/_test/tests/inc/utf8_substr.test.php
diff --git a/_testing/tests/inc/utf8_unicode.test.php b/_test/tests/inc/utf8_unicode.test.php
index a34fec86d..a34fec86d 100644
--- a/_testing/tests/inc/utf8_unicode.test.php
+++ b/_test/tests/inc/utf8_unicode.test.php
diff --git a/_testing/tests/inc/utf8_utf16be.test.php b/_test/tests/inc/utf8_utf16be.test.php
index 0150a8e4a..0150a8e4a 100644
--- a/_testing/tests/inc/utf8_utf16be.test.php
+++ b/_test/tests/inc/utf8_utf16be.test.php
diff --git a/_testing/tests/lib/exe/css_css_compress.test.php b/_test/tests/lib/exe/css_css_compress.test.php
index 811b0cee8..811b0cee8 100644
--- a/_testing/tests/lib/exe/css_css_compress.test.php
+++ b/_test/tests/lib/exe/css_css_compress.test.php
diff --git a/_testing/tests/lib/exe/css_css_loadfile.test.php b/_test/tests/lib/exe/css_css_loadfile.test.php
index c89b69b2c..c89b69b2c 100644
--- a/_testing/tests/lib/exe/css_css_loadfile.test.php
+++ b/_test/tests/lib/exe/css_css_loadfile.test.php
diff --git a/_testing/tests/lib/exe/js_js_compress.test.php b/_test/tests/lib/exe/js_js_compress.test.php
index 75c69c347..75c69c347 100644
--- a/_testing/tests/lib/exe/js_js_compress.test.php
+++ b/_test/tests/lib/exe/js_js_compress.test.php
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes1-in.js b/_test/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes1-in.js
index 771dc1640..771dc1640 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes1-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes1-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes1-out.js b/_test/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes1-out.js
index 7d6a5346e..7d6a5346e 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes1-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes1-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes2-in.js b/_test/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes2-in.js
index a59f1b774..a59f1b774 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes2-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes2-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes2-out.js b/_test/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes2-out.js
index caa2fdca2..caa2fdca2 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes2-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentInDoubleQuotes2-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes1-in.js b/_test/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes1-in.js
index 845c59bdf..845c59bdf 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes1-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes1-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes1-out.js b/_test/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes1-out.js
index b2696cb98..b2696cb98 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes1-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes1-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes2-in.js b/_test/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes2-in.js
index 0459a4891..0459a4891 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes2-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes2-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes2-out.js b/_test/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes2-out.js
index 21b6a410e..21b6a410e 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes2-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentInSingleQuotes2-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentMultiline-in.js b/_test/tests/lib/exe/js_js_compress/test-CommentMultiline-in.js
index b9d16a7bd..b9d16a7bd 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentMultiline-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentMultiline-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentMultiline-out.js b/_test/tests/lib/exe/js_js_compress/test-CommentMultiline-out.js
index 8eed2e57a..8eed2e57a 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentMultiline-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentMultiline-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentSingleLine-in.js b/_test/tests/lib/exe/js_js_compress/test-CommentSingleLine-in.js
index 302d7160b..302d7160b 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentSingleLine-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentSingleLine-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-CommentSingleLine-out.js b/_test/tests/lib/exe/js_js_compress/test-CommentSingleLine-out.js
index 8eed2e57a..8eed2e57a 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-CommentSingleLine-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-CommentSingleLine-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-IfThenElseBraces-in.js b/_test/tests/lib/exe/js_js_compress/test-IfThenElseBraces-in.js
index afc824762..afc824762 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-IfThenElseBraces-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-IfThenElseBraces-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-IfThenElseBraces-out.js b/_test/tests/lib/exe/js_js_compress/test-IfThenElseBraces-out.js
index 2a982a98e..2a982a98e 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-IfThenElseBraces-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-IfThenElseBraces-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-IfThenElseNoBraces-in.js b/_test/tests/lib/exe/js_js_compress/test-IfThenElseNoBraces-in.js
index 79d10775e..79d10775e 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-IfThenElseNoBraces-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-IfThenElseNoBraces-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-IfThenElseNoBraces-out.js b/_test/tests/lib/exe/js_js_compress/test-IfThenElseNoBraces-out.js
index b087c42fc..b087c42fc 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-IfThenElseNoBraces-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-IfThenElseNoBraces-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-RegexpBackslash-in.js b/_test/tests/lib/exe/js_js_compress/test-RegexpBackslash-in.js
index 503e07283..503e07283 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-RegexpBackslash-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-RegexpBackslash-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-RegexpBackslash-out.js b/_test/tests/lib/exe/js_js_compress/test-RegexpBackslash-out.js
index e5c83770c..e5c83770c 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-RegexpBackslash-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-RegexpBackslash-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-RegexpSimple-in.js b/_test/tests/lib/exe/js_js_compress/test-RegexpSimple-in.js
index 2741e74c2..2741e74c2 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-RegexpSimple-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-RegexpSimple-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-RegexpSimple-out.js b/_test/tests/lib/exe/js_js_compress/test-RegexpSimple-out.js
index bb530b0a1..bb530b0a1 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-RegexpSimple-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-RegexpSimple-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-RegexpSimpleWhitespace-in.js b/_test/tests/lib/exe/js_js_compress/test-RegexpSimpleWhitespace-in.js
index c7dbdba3d..c7dbdba3d 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-RegexpSimpleWhitespace-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-RegexpSimpleWhitespace-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-RegexpSimpleWhitespace-out.js b/_test/tests/lib/exe/js_js_compress/test-RegexpSimpleWhitespace-out.js
index 5c2db510b..5c2db510b 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-RegexpSimpleWhitespace-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-RegexpSimpleWhitespace-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-RegexpString-in.js b/_test/tests/lib/exe/js_js_compress/test-RegexpString-in.js
index debb983e5..debb983e5 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-RegexpString-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-RegexpString-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-RegexpString-out.js b/_test/tests/lib/exe/js_js_compress/test-RegexpString-out.js
index 92ffc7d47..92ffc7d47 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-RegexpString-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-RegexpString-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StatementDoWhile-in.js b/_test/tests/lib/exe/js_js_compress/test-StatementDoWhile-in.js
index 0c84c66ec..0c84c66ec 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StatementDoWhile-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StatementDoWhile-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StatementDoWhile-out.js b/_test/tests/lib/exe/js_js_compress/test-StatementDoWhile-out.js
index 593e9a664..593e9a664 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StatementDoWhile-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StatementDoWhile-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StatementForIn-in.js b/_test/tests/lib/exe/js_js_compress/test-StatementForIn-in.js
index 1b0aeb6ff..1b0aeb6ff 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StatementForIn-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StatementForIn-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StatementForIn-out.js b/_test/tests/lib/exe/js_js_compress/test-StatementForIn-out.js
index 95c85871e..95c85871e 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StatementForIn-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StatementForIn-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StatementNew-in.js b/_test/tests/lib/exe/js_js_compress/test-StatementNew-in.js
index 61f357f34..61f357f34 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StatementNew-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StatementNew-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StatementNew-out.js b/_test/tests/lib/exe/js_js_compress/test-StatementNew-out.js
index 0d4ff7f58..0d4ff7f58 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StatementNew-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StatementNew-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StatementSwitchCase-in.js b/_test/tests/lib/exe/js_js_compress/test-StatementSwitchCase-in.js
index 39ffc1239..39ffc1239 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StatementSwitchCase-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StatementSwitchCase-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StatementSwitchCase-out.js b/_test/tests/lib/exe/js_js_compress/test-StatementSwitchCase-out.js
index e51c07371..e51c07371 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StatementSwitchCase-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StatementSwitchCase-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StringDoubleQuotes-in.js b/_test/tests/lib/exe/js_js_compress/test-StringDoubleQuotes-in.js
index 57fe13b90..57fe13b90 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StringDoubleQuotes-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StringDoubleQuotes-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StringDoubleQuotes-out.js b/_test/tests/lib/exe/js_js_compress/test-StringDoubleQuotes-out.js
index 9f91fc83d..9f91fc83d 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StringDoubleQuotes-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StringDoubleQuotes-out.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StringSingleQuotes-in.js b/_test/tests/lib/exe/js_js_compress/test-StringSingleQuotes-in.js
index bb5f9951a..bb5f9951a 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StringSingleQuotes-in.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StringSingleQuotes-in.js
diff --git a/_testing/tests/lib/exe/js_js_compress/test-StringSingleQuotes-out.js b/_test/tests/lib/exe/js_js_compress/test-StringSingleQuotes-out.js
index f38b26544..f38b26544 100644
--- a/_testing/tests/lib/exe/js_js_compress/test-StringSingleQuotes-out.js
+++ b/_test/tests/lib/exe/js_js_compress/test-StringSingleQuotes-out.js
diff --git a/_testing/tests/testing/inttests_basic.test.php b/_test/tests/test/basic.test.php
index ca788a91d..ca788a91d 100644
--- a/_testing/tests/testing/inttests_basic.test.php
+++ b/_test/tests/test/basic.test.php
diff --git a/_testing/tests/testing/inttests_globals.test.php b/_test/tests/test/globals.test.php
index b45b2bf83..b45b2bf83 100644
--- a/_testing/tests/testing/inttests_globals.test.php
+++ b/_test/tests/test/globals.test.php
diff --git a/_testing/tests/testing/inttests_hooks.test.php b/_test/tests/test/hooks.test.php
index 621b9f9b8..621b9f9b8 100644
--- a/_testing/tests/testing/inttests_hooks.test.php
+++ b/_test/tests/test/hooks.test.php
diff --git a/_testing/tests/testing/inttests_phpquery.test.php b/_test/tests/test/phpquery.test.php
index 188d834cb..188d834cb 100644
--- a/_testing/tests/testing/inttests_phpquery.test.php
+++ b/_test/tests/test/phpquery.test.php
diff --git a/_testing/tests/testing/inttests_plugins.test.php b/_test/tests/test/plugins.test.php
index ac6d1ee45..ac6d1ee45 100644
--- a/_testing/tests/testing/inttests_plugins.test.php
+++ b/_test/tests/test/plugins.test.php
diff --git a/_testing/tests/testing/inttests_plugins_default.test.php b/_test/tests/test/plugins_defaults.test.php
index a96dac931..a96dac931 100644
--- a/_testing/tests/testing/inttests_plugins_default.test.php
+++ b/_test/tests/test/plugins_defaults.test.php
diff --git a/_testing/tests/testing/inttests_reset.test.php b/_test/tests/test/reset.test.php
index 7c5978543..7c5978543 100644
--- a/_testing/tests/testing/inttests_reset.test.php
+++ b/_test/tests/test/reset.test.php
diff --git a/_testing/tests/testing/inttests_scope.test.php b/_test/tests/test/scope.test.php
index 9341ecef8..9341ecef8 100644
--- a/_testing/tests/testing/inttests_scope.test.php
+++ b/_test/tests/test/scope.test.php