Christopher Jones
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
Antonio Diaz Ruiz
1a5c460ea2
Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
2013-08-10 18:02:08 -07:00
Antonio Diaz Ruiz
5f5ff92bc0
Adds 2 new xml files which include the dtd path relative to the base directory for the php source code.
...
It fixs the fail on the load of the dtd in the tests modified by this commit.
2013-08-10 18:02:00 -07:00
Antonio Diaz Ruiz
24f36934ad
Adds files: error 1 to 5 and variation 1 to 4
...
tests for error1: not well formed xml
tests for error2: not well formed xml attribute without colon
tests for error2: not well formed xml, typo
tests for error4: wrong xml version
tests for error5: extra content at the end of the doc
tests libxml_dtd_load
tests libxml_dtd_valid
tests for libdtd_noerror
tests for LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT and LIBXML_NOBLANKS
the basic behavior
fix comments
2013-08-10 18:01:54 -07:00
Stanislav Malyshev
473d66553d
Merge branch 'pull-request/325' into PHP-5.5
...
* pull-request/325:
Add schema default/fixed value support
2013-08-10 17:56:23 -07:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Stanislav Malyshev
7a2d9690fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
2013-06-10 01:53:29 -07:00
Antonio Diaz Ruiz
8a8bef1b73
PHPTests for the DOMDocument::loadHTMLfile method.
...
They cover
- The basic behaviour
- When the method receives as argument a file which doesn't exist
- When the argument is an empty string
- When an empty file is loaded
- When a not-well formed html file is loaded
It also includes 2 auxilary files
- An empty html file
- A not well formed html file
2013-06-10 01:50:00 -07:00
Xinchen Hui
6b1928ba0b
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-21 11:09:18 +08:00
Antonio Diaz Ruiz
92bbe6be72
Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
...
Each file covers a different test case
DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
2013-04-21 11:05:59 +08:00
Chris Wright
c091819f40
Add schema default/fixed value support
...
Added support for adding fixed/default values during XSD validation
and added/updated associated tests
2013-04-12 09:50:14 +01:00
Nikita Popov
fcc6611de9
Add support for non-scalar Iterator keys in foreach
...
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Stanislav Malyshev
0c6d903ce7
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-18 20:56:02 -08:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Rob Richards
ffa72707c8
fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
2012-09-20 02:34:07 -04:00
Felipe Pena
6513ca85c2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never read
2012-08-19 12:13:59 -03:00
Felipe Pena
dc1138b102
- Value stored to var is never read
2012-08-19 12:13:48 -03:00
Rob Richards
c5a611b257
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Daniel Veillard
* PHP-5.3:
Update to work with libxml 2.9.0
2012-08-09 14:24:50 -04:00
Daniel Veillard
c4b26cc1b0
Update to work with libxml 2.9.0
2012-08-09 14:02:33 -04:00
Felipe Pena
d640e446ab
- Fixed conflict
2012-07-14 13:16:35 -03:00
Felipe Pena
864575251a
- Fixed memory leak when extending DOMXPath
2012-07-14 13:13:31 -03:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
zoe slattery
d99203d44b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Small fixes to tests, see #62022
2012-05-15 11:43:28 +01:00
zoe slattery
e35f09d774
Small fixes to tests, see #62022
2012-05-15 11:42:14 +01:00
Christopher Jones
93192ec56d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Make output order for dom007.phpt platform independent
2012-05-01 15:49:19 -07:00
Christopher Jones
d14f23365c
Make output order for dom007.phpt platform independent
...
This test has long been near the top of the reported output diffs.
For example, on http://qa.php.net/reports/?version=5.4.0 it has diffed
1307 times out of 3543 reports, at time of this commit. (The second
highest diff has occurred 710 times.)
2012-05-01 15:43:31 -07:00
Anatoliy Belsky
47c8b6039a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
2012-04-30 17:25:11 +02:00
Anatoliy Belsky
d26e006d7f
Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
2012-04-30 17:23:49 +02:00
Xinchen Hui
503e9d955c
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
2012-03-24 14:22:53 +08:00
Xinchen Hui
56dac369ab
Fix ZTS build
2012-03-24 14:22:04 +08:00
Gustavo André dos Santos Lopes
e018e2ae86
Merge branch '5.3' into 5.4
2012-03-23 22:14:36 +00:00
Gustavo André dos Santos Lopes
372801d94c
Fixed tests that var_dump/print_r DOM objects.
2012-03-23 22:08:33 +00:00
Gustavo André dos Santos Lopes
b61017c9b6
Improved on DOM object debug info handler. Added test.
2012-03-23 21:23:24 +00:00
Joey Smith
d04682766d
Added DOM Debug handler
2012-03-23 21:23:23 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Dmitry Stogov
4a25a7740d
Fixed ZE specific compile warnings (Bug #55629 )
2011-09-13 13:29:35 +00:00
Pierre Joye
8fca015947
- fix test for OS where dir sep is \
2011-09-07 09:03:07 +00:00
Pierre Joye
6ee31df599
- fix test for OS where dir sep is \
2011-09-07 09:03:07 +00:00
Shein Alexey
6feb8cb74b
Fixed failed test to take into account printed warnings like in 5.4 and trunk branches.
2011-08-24 12:25:30 +00:00
Ilia Alshanetsky
3726c5c67a
Removal of deadcode identified by coverity
2011-08-08 13:45:18 +00:00