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

On 20.10.2016 at 14:24, Kalle Sommer Nielsen wrote: > Commit: aeeaedeeb7bdf7df3f0885a62e8d317762e88bf8 > Author: Kalle Sommer Nielsen <kalle@php.net> Thu, 20 Oct 2016 14:24:01 +0200 > Parents: 66b2c5c5a4d217d28601ae40227cce76c75f9ce6 > Branches: master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=aeeaedeeb7bdf7df3f0885a62e8d317762e88bf8 > > Log: > Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up > line endings What about fixing the line endings in adjustDoctype()? It's already there, and it already does more than the name says. Cheers, Christoph > Changed paths: > M ext/dom/tests/dom005.phpt > > > Diff: > diff --git a/ext/dom/tests/dom005.phpt b/ext/dom/tests/dom005.phpt > index 715aec4..3766df0 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); > } > > ---EXPECT-- > +--EXPECTF-- > --- 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> > -This is a not well-formed<br/> > -html files with undeclared entities&#xA0; > +<html><head><title>Hello world</title></head><body>%s > +This is a not well-formed<br/>%s > +html files with undeclared entities&#xA0;%s > </body></html> > --- save as HTML > <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > "http://www.w3.org/TR/REC-html40/loose.dtd"> >