summaryrefslogtreecommitdiff
path: root/ext/tidy
Commit message (Collapse)AuthorAgeFilesLines
* Fix arginfo for tidy::__construct()Tyson Andre2018-08-131-1/+1
| | | | | | | | | | This was split out of PR #3439 Previously, the arginfo was wrong for these methods. getNumberOfRequiredParameters() was 4 for that method. Compare with http://php.net/manual/en/tidy.construct.php) This fixes the arginfo added to PHP 7.3 in 97353cda99
* Remove unused Git attributes identPeter Kokot2018-07-253-6/+1
| | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
* Sync tidy phpinfo extension versionPeter Kokot2018-06-041-4/+1
| | | | | | This patch removes the tidy extension Git ident attribute blob name from the phpinfo output to be synced with other extensions versioning system and replaces table header with normal row in the first tidy info table.
* Export standard object handlers, to avoid indirect accessDmitry Stogov2018-05-311-1/+1
|
* Use zend_string_release_ex() instread of zend_string_release() in places, ↵Dmitry Stogov2018-05-281-4/+4
| | | | where we sure about string persistence.
* Remove return types from some magic method in protosGabriel Caruso2018-03-091-1/+1
| | | | __construct, __destruct, __wakeup does not have return types defined.
* Remove duplicated testsGabriel Caruso2018-02-221-42/+0
|
* Use EXPECT instead of EXPECTF when possibleGabriel Caruso2018-02-201-1/+1
| | | | EXPECTF logic in run-tests.php is considerable, so let's avoid it.
* Fixes for #74707 some methods of tidy class didn't have arginfo declaredGabriel Caruso2018-02-121-7/+18
|
* Fixed bug #74707Gabriel Caruso2018-02-101-25/+38
| | | | Several tidy functions receive a tidy object as mandatory parameter
* Use bool instead of boolean in protoGabriel Caruso2018-02-041-15/+15
|
* Show the tidyp name, if it was usedAnatol Belski2018-01-251-1/+1
|
* Add missing define after e7da9685Anatol Belski2018-01-251-0/+1
|
* Tidy extension update to be able to either use tidy or tidyp at configure timeDavid Carlier2018-01-253-9/+38
|
* Merge branch 'PHP-7.2'Anatol Belski2018-01-111-4/+1
|\ | | | | | | | | * PHP-7.2: Fix test for libtidy 5.6.0
| * Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-01-111-4/+1
| |\ | | | | | | | | | | | | * PHP-7.1: Fix test for libtidy 5.6.0
| | * Fix test for libtidy 5.6.0Anatol Belski2018-01-111-4/+1
| | | | | | | | | | | | | | | | | | 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.
| | * year++Xinchen Hui2018-01-022-2/+2
| | |
| | * Update copyright headers to 2017Sammy Kaye Powers2017-01-042-2/+2
| | |
| * | year++Xinchen Hui2018-01-022-2/+2
| | |
* | | year++Xinchen Hui2018-01-022-2/+2
| | |
* | | Add _IS_NUMBER as cast_object() target typeNikita Popov2017-12-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert_scalar_to_number() will now call cast_object() with an _IS_NUMBER argument, in which case the cast handler should return either an integer or floating point number, whichever is more appropriate. Previously convert_scalar_to_number() unconditionally converted objects to integers instead. Fixes bug #53033. Fixes bug #54973. Fixes bug #73108.
* | | Cleanup type conversionDmitry Stogov2017-12-071-24/+10
| | |
* | | Add zend_object_alloc() APINikita Popov2017-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using ecalloc() to create objects is expensive, because the dynamic-size memset() is unreasonably slow. Make sure we only zero the main object structure with known size, as the properties are intialized separately anyway. Technically we do not need to zero the embedded zend_object structure either, but as long as the memset argument is constant, a couple more bytes don't really matter.
* | | Remove tidy examplesPeter Kokot2017-10-194-202/+0
| | | | | | | | | | | | | | | | | | PHP documentation already includes explanations and examples for most of tidy extension. Tidy PHP functions and methods used in the examples are also already used in the tests.
* | | Remove README from ext/tidy in favor of the PHP docsPeter Kokot2017-10-081-7/+0
| | | | | | | | | | | | | | | The tidy introduction includes an outdated link to tidy HTML library homepage, and PHP documentation presents the tidy PHP extension better instead.
* | | Get rid of all these old package[2].xml files, most of these had no had a ↵Kalle Sommer Nielsen2017-08-171-65/+0
|/ / | | | | | | | | | | release since PHP4, or any release at all in close to 10 years, some even did not have a package registered at pecl OCI, PDO_OCI and zip are left as they are actively developed and released there
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-022-2/+2
| |
* | further normalizations, uint vs uint32_tAnatol Belski2016-11-261-8/+8
|/ | | | | | fix merge mistake yet one more replacement run
* improve lib name guessing for newer libtidyAnatol Belski2016-11-091-5/+12
| | | | | | FreeBSD calls it tidy5. Still, the check is not perfect, as both old and new lib can coexist. ATM, the preference is to pick up the old lib, still. In it's absense the new one will be looked up.
* show libtidy version in the info, if availableAnatol Belski2016-07-111-0/+3
|
* fix config.w32 for new libtidy supportAnatol Belski2016-07-111-1/+6
|
* ext/tidy: work around a legacy libtidy bug in a test.Michael Orlitzky2016-07-111-7/+6
| | | | | | | | | 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.
* ext/tidy: update the configuration file test to not inspect output.Michael Orlitzky2016-07-111-16/+5
| | | | | | | | | 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.
* ext/tidy: fix expected test output with tidy-html5.Michael Orlitzky2016-07-111-3/+3
| | | | | | 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.
* ext/tidy: fix non-deterministic expected output in two tests.Michael Orlitzky2016-07-112-10/+10
| | | | | | | 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.
* ext/tidy: fix DOCTYPE definitions in expected test output.Michael Orlitzky2016-07-114-9/+8
| | | | | | | | 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").
* ext/tidy: add support for the new tidy-html5 library.Michael Orlitzky2016-07-112-0/+13
| | | | | | | | | | | | | | | | | | | | | | | Our existing libtidy support is based on the legacy "HTML tidy" project. That project now has a successor called tidy-html5, where all new features and bugfixes happen. Of particular note are the fixes for two security vulnerabilities, CVE-2015-5522 and CVE-2015-5523. The API is largely unchanged in the new project (which is truly the successor of the original -- not a fork), and so it is almost a drop-in replacement as far as PHP is concerned. However, one file has changed in the new project: "buffio.h" has been moved to "tidybuffio.h". This commit detects the presence of tidybuffio.h at build time, and then adjusts the import statement in tidy.c accordingly. The result is a build that works against either the legacy project or the new tidy-html5 project, although the test suite for the tidy extension now fails. Those failures are not critical and will be fixed. Gentoo-Bug: 561452 Gentoo-Bug: 585474 PHP-Bug: 72379
* Merge branch 'throw-error-in-extensions'Aaron Piotrowski2016-07-051-1/+1
|\
| * Replace zend_ce_error with NULL and replace more E_ERROR with thrown ErrorAaron Piotrowski2016-06-131-2/+1
| |
| * Merge branch 'master' into throw-error-in-extensionsAaron Piotrowski2016-06-102-23/+53
| |\
| * | Convert E_ERROR to thrown Error in extensionsAaron Piotrowski2015-07-051-1/+2
| | |
* | | Fixed the UTF-8 and long path support in the streams on Windows.Anatol Belski2016-06-202-0/+19
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 https://msdn.microsoft.com/en-us/library/windows/desktop/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.
* | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| | | | | | | | Also re bug #71575.
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-012-2/+2
|\ \ | | | | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-012-2/+2
| | |
| * | bump yearXinchen Hui2015-01-152-2/+2
| | |
* | | Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more ↵Dmitry Stogov2015-09-241-1/+1
| | | | | | | | | | | | appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
* | | more range checks in ext/tidyAnatol Belski2015-08-261-3/+13
| | |
* | | add range checks to ext/tidyAnatol Belski2015-08-261-6/+31
| | |
View Lorry Controller Status