com php-src: Revert "Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings":
ext/dom/tests/dom005.phpt

Commit: c0d4e72a684a1ceb69ad5e28dfdf2e0694055c93 Author: Kalle Sommer Nielsen <kalle@php.net> Thu, 20 Oct 2016 16:02:37 +0200 Parents: 61f524b3701bc64753e115040f140d0c9f82e77a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c0d4e72a684a1ceb69ad5e28dfdf2e0694055c93 Log: Revert "Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings" This reverts commit aeeaedeeb7bdf7df3f0885a62e8d317762e88bf8. This seems to make Travis unhappy (shocker), so revert for now until we find a better fix Changed paths: M ext/dom/tests/dom005.phpt Diff: diff --git a/ext/dom/tests/dom005.phpt b/ext/dom/tests/dom005.phpt index 3766df0..715aec4 100644 --- a/ext/dom/tests/dom005.phpt +++ b/ext/dom/tests/dom005.phpt @@ -17,13 +17,13 @@ function adjustDoctype($xml) { return str_replace(array("DOCTYPE HTML",'<p>','</p>'),array("DOCTYPE html",'',''),$xml); } ---EXPECTF-- +--EXPECT-- --- save as XML <?xml version="1.0" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> -<html><head><title>Hello world</title></head><body>%s -This is a not well-formed<br/>%s -html files with undeclared entities&#xA0;%s +<html><head><title>Hello world</title></head><body> +This is a not well-formed<br/> +html files with undeclared entities&#xA0; </body></html> --- save as HTML <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">