Commit graph

107 commits

Author SHA1 Message Date
Anatol Belski
83a77383b9 Fix test for libtidy 5.6.0
libtidy 5.6.0 remove the language option from the library, it is only
supported on cli. Prior to that, this option was not used in the
library. Thus, exclude the option presence from test.
2018-01-11 14:29:49 +01:00
Michael Orlitzky
6319a35849 ext/tidy: work around a legacy libtidy bug in a test.
Our existing test 024.phpt actually tests incorrect behavior. There is
a self-closing tag present in the input, but the expected output has
that same tag half-open (i.e. open but never closed). To support
tidy-html5, which does the right thing, that test needed to be
changed. The self-closing tag was replaced by an explicit pair of
tags, and some extra whitespace fudging was done.
2016-07-11 14:05:43 +02:00
Michael Orlitzky
a467a42dd1 ext/tidy: update the configuration file test to not inspect output.
One of the tests for tidy (016.phpt) is testing that we can use a
configuration file (016.tcfg) instead of a string to configure
tidy. It was observing the output of an API call, which proved too
fragile now that we support tidy-html5 as well. Instead, the test was
updated to inspect $tidy->getConfig() to ensure that the config file
was actually processed and will be respected.
2016-07-11 14:05:43 +02:00
Michael Orlitzky
846c72a3b8 ext/tidy: fix expected test output with tidy-html5.
One of the tidy tests expects some output that has (harmlessly)
changed in tidy-html5. The "EXPECT" block for that test was changed to
"EXPECTF" and mangled to accept both the old and new outputs.
2016-07-11 14:05:43 +02:00
Michael Orlitzky
08b10f17f1 ext/tidy: fix non-deterministic expected output in two tests.
Some of the tidy tests expect output that can change. The motivating
example is an object "id" that is some integer, but no integer in
particular. Those hard-coded values have been changed to accept any
integer so that the test suite passes when tidy-html5 is used.
2016-07-11 14:05:43 +02:00
Michael Orlitzky
0e3e132a8a ext/tidy: fix DOCTYPE definitions in expected test output.
The test suite for the tidy extension was written before HTML5 was
"standardized". The new tidy-html5 library will output an HTML5
DOCTYPE in the absence of any other information, so the expected test
outputs have been updated to accomodate the absense of an HTML version
(which is how you declare "HTML5").
2016-07-11 14:05:43 +02:00
Anatol Belski
3d3f11ede4 Fixed the UTF-8 and long path support in the streams on Windows.
Since long the default PHP charset is UTF-8, however the Windows part is
out of step with this important point. The current implementation in PHP
doesn't technically permit to handle UTF-8 filepath and several other
things. Till now, only the ANSI compatible APIs are being used. Here is more
about it

dd317752%28v=vs.85%29.aspx

The patch fixes not only issues with multibyte filenames under
incompatible codepages, but indirectly also issues with some other multibyte
encodings like BIG5, Shift-JIS, etc. by providing a clean way to access
filenames in UTF-8. Below is a small list of issues from the bug tracker,
that are getting fixed:

https://bugs.php.net/63401
https://bugs.php.net/41199
https://bugs.php.net/50203
https://bugs.php.net/71509
https://bugs.php.net/64699
https://bugs.php.net/64506
https://bugs.php.net/30195
https://bugs.php.net/65358
https://bugs.php.net/61315
https://bugs.php.net/70943
https://bugs.php.net/70903
https://bugs.php.net/63593
https://bugs.php.net/54977
https://bugs.php.net/54028
https://bugs.php.net/43148
https://bugs.php.net/30730
https://bugs.php.net/33350
https://bugs.php.net/35300
https://bugs.php.net/46990
https://bugs.php.net/61309
https://bugs.php.net/69333
https://bugs.php.net/45517
https://bugs.php.net/70551
https://bugs.php.net/50197
https://bugs.php.net/72200
https://bugs.php.net/37672

Yet more related tickets can for sure be found - on bugs.php.net, Stackoverflow
and Github. Some of the bugs are pretty recent, some descend to early
2000th, but  the user comments in there last even till today. Just for example,
bug #30195 was opened in 2004, the latest comment in there was made in 2014. It
is certain, that these bugs descend not only to pure PHP use cases, but get also
redirected from the popular PHP based projects. Given the modern systems (and
those supported by PHP) are always based on NTFS, there is no excuse to keep
these issues unresolved.

The internalization approach on Windows is in many ways different from
UNIX and Linux, while it supports and is based on Unicode. It depends on the
current system code page, APIs used and exact kind how the binary was compiled
The locale doesn't affect the way Unicode or ANSI API work. PHP in particular
is being compiled without _UNICODE defined and this is conditioned by the
way we handle strings. Here is more about it

https://msdn.microsoft.com/en-us/library/tsbaswba.aspx

However, with any system code page ANSI functions automatically convert
paths to UTF-16. Paths in some encodings incompatible with the
current system code page, won't work correctly with ANSI APIs. PHP
till now only uses the ANSI Windows APIs.

For example, on a system with the current code page 1252, the paths
in cp1252 are supported and transparently converted to UTF-16 by the
ANSI functions. Once one wants to handle a filepath encoded with cp932 on
that particular system, an ANSI or a POSIX compatible function used in
PHP will produce an erroneous result. When trying to convert that cp932 path
to UTF-8 and passing to the ANSI functions, an ANSI function would
likely interpret the UTF-8 string as some string in the current code page and
create a filepath that represents every single byte of the UTF-8 string.
These behaviors are not only broken but also disregard the documented
INI settings.

This patch solves the issies with the multibyte paths on Windows by
intelligently enforcing the usage of the Unicode aware APIs. For
functions expect Unicode (fe CreateFileW, FindFirstFileW, etc.), arguments
will be converted to UTF-16 wide chars. For functions returning Unicode
aware data (fe GetCurrentDirectoryW, etc.), resulting wide string is
converted back to char's depending on the current PHP charset settings,
either to the current ANSI codepage (this is the behavior prior to this patch)
or to UTF-8 (the default behavior).

In a particular case, users might have to explicitly set
internal_encoding or default_charset, if filenames in ANSI codepage are
necessary. Current tests show no regressions and witness that this will be an
exotic case, the current default UTF-8 encoding is compatible with any
supported system. The dependency libraries are long switching to Unicode APIs,
so some tests were also added for extensions not directly related to streams.
At large, the patch brings over 150 related tests into the core. Those target
and was run on various environments with European, Asian, etc. codepages.
General PHP frameworks was tested and showed no regressions.

The impact on the current C code base is low, the most places affected
are the Windows only places in the three files tsrm_win32.c, zend_virtual_cwd.c
and plain_wrapper.c. The actual implementation of the most of the wide
char supporting functionality is in win32/ioutil.* and win32/codepage.*,
several  low level functionsare extended in place to avoid reimplementation for
now. No performance impact was sighted. As previously mentioned, the ANSI APIs
used prior the patch perform Unicode conversions internally. Using the
Unicode  APIs directly while doing custom conversions just retains the status
quo. The ways to optimize it are open (fe. by implementing caching for the
strings converted to wide variants).

The long path implementation is user transparent. If a path exceeds the
length of _MAX_PATH, it'll be automatically prefixed with \\?\. The MAXPATHLEN
is set to 2048 bytes.

Appreciation to Pierre Joye, Matt Ficken, @algo13 and others for tips, ideas
and testing.

Thanks.
2016-06-20 12:45:39 +02:00
Aaron Piotrowski
e97d5fab35 Update exception names in tests after formatting changes. 2015-05-17 17:31:43 -05:00
Nikita Popov
3ae995f03c Tweak uncaught exception message display
This implements a reduced variant of #1226 with just the following
change:

-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d

The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
2015-05-17 18:47:06 +02:00
Nikita Popov
c9f27ee422 Display EngineExceptions like ordinary exceptions
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.

closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
2015-05-15 23:40:32 +02:00
Andrea Faulds
db76b708cf Deprecate PHP 4 constructors 2015-03-31 17:55:27 +02:00
Xinchen Hui
0f6c93d620 Refactored tidy (all tests passes) 2014-05-14 16:44:07 +08:00
Anatoliy Belsky
fbb86bd7b3 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt
2012-05-21 12:52:10 +02:00
Matt Ficken
c973fef48d Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt 2012-05-21 12:51:24 +02:00
Anatoliy Belsky
ede519d1d6 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61676 ext\tidy\tests\bug54682.phpt fails

Conflicts:
	ext/tidy/tests/bug54682.phpt
2012-04-16 13:42:52 +02:00
Anatoliy Belsky
c981016e41 Fix bug 61676 ext\tidy\tests\bug54682.phpt fails 2012-04-16 13:38:13 +02:00
Antony Dovgal
ce1a1f5f49 fix bug #54682 (tidy null pointer dereference) 2012-02-07 20:49:10 +00:00
Nuno Lopes
e718c53223 revert r319254 (fix bug #54682) since it is not correct
add test that was broken with that patch.
this bug is probably in libtidy itself and not in PHP. I didn't investigate it enough to confirm, though
2012-01-21 11:32:56 +00:00
Nuno Lopes
4dd01451dd revert r319254 (fix bug #54682) since it is not correct
add test that was broken with that patch.
this bug is probably in libtidy itself and not in PHP. I didn't investigate it enough to confirm, though
2012-01-21 11:32:56 +00:00
Felipe Pena
bb6835f727 - Fixed bug #54682 (Tidy::diagnose() NULL pointer dereference) 2011-11-15 15:16:20 +00:00
Felipe Pena
236120d80e - Fixed bug #54682 (Tidy::diagnose() NULL pointer dereference) 2011-11-15 15:16:20 +00:00
Pierre Joye
4426bfee51 - force LF (svn prop and config) 2011-09-07 10:14:18 +00:00
Pierre Joye
828cf36a7f - force LF (svn prop and config) 2011-09-07 10:12:04 +00:00
Rasmus Lerdorf
fb2ce0bb00 Don't expect a path for tidy_repair_string() and fix the tests 2011-06-12 14:49:10 +00:00
Pierrick Charron
eac3e3e4a4 Add a test for tidyNode::__construct() 2009-12-29 16:06:27 +00:00
Pierrick Charron
832eb472c5 Changed tidyNode class to disallow manual node creation. 2009-12-25 21:24:36 +00:00
Pierrick Charron
3cc801b9b0 Fixed bug #50558 (Broken object model when extending tidy) 2009-12-25 01:35:57 +00:00
Patrick Allaert
74560ac75e Merging last tests made in HEAD 2009-09-01 13:41:18 +00:00
Zoe Slattery
467dbf859a test for /ext/tidy from stefan priebsch 2009-03-16 20:38:19 +00:00
Felipe Pena
857959838f - Fixed tests 2009-01-09 02:11:54 +00:00
Nuno Lopes
fa0efe45e0 fix crash when fetching a node type that doesnt exist
# reported in a manual user note
2007-09-20 22:25:06 +00:00
Ilia Alshanetsky
44aefd1ea0 Fixed test to work with new version of libtidy that strips spaces 2007-02-24 15:35:04 +00:00
Nuno Lopes
8b9f475ac6 merge the tidyNode::getParent() patch from HEAD 2007-02-11 16:07:30 +00:00
Nuno Lopes
a2b7b84685 add test 2007-01-23 19:26:24 +00:00
Nuno Lopes
65975bfc15 new tests. bump code coverage to 81% 2007-01-20 12:50:19 +00:00
Nuno Lopes
aa6593f984 sync code and tests between HEAD and PHP_5_2 branches. what a confusion... 2006-09-05 15:23:26 +00:00
Nuno Lopes
dc8895ed82 finish the cleaning. also add a new test 2006-09-05 14:55:56 +00:00
Antony Dovgal
434d5e9be4 MFH: fix leak, add test 2006-08-30 22:34:48 +00:00
Michael Wallner
a329ecd8c4 fix bug #34965 tidy is not binary safe 2005-10-25 18:04:59 +00:00
foobar
b543778fed fix tests 2005-04-02 22:57:42 +00:00
Ilia Alshanetsky
46745e31ed This test is conditional on the libTidy library. On some configurations
tidy crashes due to a bug in the lib.
2004-11-30 00:01:30 +00:00
Dmitry Stogov
c6fad655a0 Tests were fixed. 2004-11-22 15:12:32 +00:00
Ilia Alshanetsky
d5bac133ee Return FALSE when file cannot be found.
Specify full paths to the files used for the test.
2004-09-26 19:24:18 +00:00
Marcus Boerger
d94136fc30 - Remove unused blocks 2004-05-19 08:45:46 +00:00
John Coggeshall
399022f3c5 Renamed tidy_node to tidyNode, removed the tidy_exception class and updated
the tests.
2004-05-09 14:00:14 +00:00
Ilia Alshanetsky
be901ebeaf Fixed test. 2004-04-25 16:50:47 +00:00
John Coggeshall
544cdffd90 Fixing a tidy_getopt() bug, and converting all exceptions to E_WARNING 2004-04-18 07:58:19 +00:00
John Coggeshall
fac5939f42 Updating tests that got left behind when we changed to studlyCaps
and fixed another test
2004-02-05 01:38:59 +00:00
John Coggeshall
0878fa901f Doh.. snuck by me! 2004-01-14 06:57:51 +00:00
John Coggeshall
a06377c32d Forgot to add these tests 2004-01-14 06:57:23 +00:00