Commit Graph

269 Commits

Author SHA1 Message Date
Marcus Boerger
b4ad6bbc82 - Protect against some edge case that is currently imossible, but will be 2005-10-30 00:38:39 +00:00
Marcus Boerger
378d5b764f - Simplify & speedup, once more 2005-10-30 00:35:55 +00:00
Marcus Boerger
b5c08eab91 - Simplify & speedup 2005-10-30 00:20:35 +00:00
Marcus Boerger
29be6e9b51 - Fix attribute handling when using xpath expressions that lead to attributes 2005-10-29 21:16:17 +00:00
Marcus Boerger
b4762f13f1 - Change var_dump to include all that is reachable, incl. @attributes
- Adapt tests and add new one
2005-10-29 16:12:57 +00:00
Marcus Boerger
f7459bad30 - Fix issue with entities in attributes 2005-10-23 23:41:20 +00:00
Dmitry Stogov
362f3fd7ea Fixed compilation error 2005-10-06 06:27:27 +00:00
Marcus Boerger
6ccd7ef74d - Update cast_object handlers 2005-10-05 19:12:44 +00:00
Marcus Boerger
a0674235e3 - Really allow SXE being shared by not using anything from it directly in SPL 2005-10-03 16:04:50 +00:00
Derick Rethans
0f391bb0b3 - Add E_RECOVERABLE.
#- Thought I did this before already actually...
2005-09-15 16:19:48 +00:00
Rob Richards
af7f90f6c7 make sxe_properties_get respect namespace scope 2005-08-31 17:00:22 +00:00
Dmitry Stogov
f4b8f4e958 Unicode support cleanup 2005-08-23 09:33:46 +00:00
foobar
03cec74a0d Nuked EOLs from error messages 2005-08-18 13:34:04 +00:00
Dmitry Stogov
d0944d74f4 Unicode support 2005-08-16 15:09:51 +00:00
Rolland Santimano
bc87019a80 Updated calls to php_trim() to provide arg for returned string type 2005-08-16 06:04:59 +00:00
Sebastian Bergmann
52b001cc05 ZTS fixes. 2005-08-12 14:08:28 +00:00
Dmitry Stogov
21c1109e0c Unicode support 2005-08-12 11:29:33 +00:00
Andrei Zmievski
264cec8be6 Unicode support. 2005-08-11 23:36:07 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Rasmus Lerdorf
3064cb787d Missing closing folding marker 2005-07-07 03:53:47 +00:00
foobar
340bcffdf0 - Unify (+ spl can't be build shared so COMPILE_DL_SPL 2005-06-30 11:15:00 +00:00
foobar
78a5b7693c Use the new dependency system 2005-06-17 11:35:22 +00:00
Rob Richards
cb72e23c14 add optional parameter to pass libxml document load options 2004-12-05 12:02:35 +00:00
Rob Richards
a50166004d remove cloning under ze1_compatibility_mode
- minor BC break but doesnt work right under compat mode anyways
2004-08-30 17:29:22 +00:00
Sara Golemon
b48af415cd ZTS Fix 2004-08-06 16:36:00 +00:00
Ilia Alshanetsky
ee656c4b32 php_error() -> php_error_docref() 2004-08-05 23:57:51 +00:00
Antony Dovgal
58f9ed3a8e nuke unused variable 2004-08-04 14:57:40 +00:00
Zeev Suraski
84e6f8f075 Fix prototypes 2004-08-04 14:41:56 +00:00
Christian Stocker
0936bfa42c renamed registerNamespace() to registerXPathNamespace() 2004-07-25 14:59:21 +00:00
Christian Stocker
0b244def73 added new method SimpleXMLElement->registerNamespace(string prefix, string uri)
"registers a prefix <-> namespaceURI combination for use in a later xpath query. "
2004-07-25 11:02:43 +00:00
Wez Furlong
263723ec9b Update for count_elements handler for overloaded objects. 2004-05-04 15:03:48 +00:00
Marcus Boerger
b6321d4e8a Fix class names 2004-03-29 19:58:01 +00:00
Marcus Boerger
f8ff2ccf20 Fix writing of SQLite and SimpleXMl extension and add Rob to the credits
line of the latter. Add ext/SPL.
2004-03-28 20:27:18 +00:00
George Schlossnagle
b9c04fe19a fixed non-existent elements check
ref: http://news.php.net/article.php?group=php.internals&article=8660
2004-03-24 05:04:26 +00:00
Stanislav Malyshev
5b0f6b1f34 Update for new read_property API 2004-03-21 18:28:38 +00:00
Derick Rethans
f66c62cef8 - Fixed compilation on the 'broken' IRIX native compiler. 2004-03-16 21:39:43 +00:00
Marcus Boerger
6b0f57ee50 Rename hasMore() to valid() as discussed. (Part II) 2004-03-08 18:05:41 +00:00
Rob Richards
76ee5707f7 Fix bug #27436 dom_import_simplexml innaccurate
extensions register callbacks to export nodes
prevents segfault passing invalid objects to import functions
2004-03-01 12:09:24 +00:00
Rob Richards
16136dfe93 Fix bug #27237: Working with simplexml crashes apache2
object dtor must be used to cleanup iterator data correctly
Fix asXML() outputing incorrect node
2004-02-13 15:05:18 +00:00
Derick Rethans
cd4a39edf9 - Fixed start-up problem if both SPL and SimpleXML were enabled. The
double initialization of apache 1.3 was causing problems here.
2004-02-12 23:39:46 +00:00
Zeev Suraski
30171a7590 zend_default_classes.h -> zend_exceptions.h 2004-02-12 10:43:27 +00:00
Zeev Suraski
c8c0e97982 Prevent SimpleXML from silently modifying types of variables that are
assigned to its objects.

Implementation notes for overloaded object modules:

- If you return a zval which is not otherwise referenced by the extension
  or the engine's symbol table, its reference count should be 0.
- If you receive a value zval in write_property/write_dimension, you
  may only modify it if its reference count is 1.  Otherwise, you must
  create a copy of that zval before making any changes.  You should NOT
  modify the reference count of the value passed to you.

Have fun!
2004-02-11 19:15:30 +00:00
Rob Richards
6e4a4e8a9a Fix compiler warnings
Update tests
2004-02-11 12:19:26 +00:00
Zeev Suraski
e8e9b2afee Implement get callback for SimpleXML (it now supports pre/post increment
as well as binary-assign-ops)
2004-02-10 09:30:38 +00:00
Zeev Suraski
2a9e1294bc Update to new API 2004-02-08 17:25:54 +00:00
Zeev Suraski
8424be849f - Update with new destructor code 2004-02-04 11:14:47 +00:00
foobar
7ad385b109 CS fix (functions should not be available if they are not available :) 2004-02-02 08:10:31 +00:00
Rob Richards
bc2521b662 Fix bug #27010: segfault after returning nodes with children()
Fix segfault in match_ns when matching prefix and node without ns
some general cleanup and code consilidation
better write handling - engine support dependent
better isset handling - engine support dependent
namespace fixes for reading/writing
2004-01-22 21:30:14 +00:00
Rob Richards
a4c2f31751 Fix namespace regression bug
Read attributes correctly
Update sxe_prop_dim_exists logic
Update profile
2004-01-21 14:04:47 +00:00
Rob Richards
500fa86c1b Fix Bug #26976 (Can not access array elements using array indices)
return index 0 as non iterable object
update test
2004-01-21 11:32:30 +00:00
foobar
bdd3b13c53 Goto targets should not be indented (some compilers choke on this, iirc) 2004-01-21 01:09:41 +00:00
Sterling Hughes
bd306c8b52 - 2004-01-20 05:31:50 +00:00
Frank M. Kromann
0d6fcd02cb Fix compilation of simplexml when spl is build as shared object 2004-01-19 23:44:03 +00:00
Marcus Boerger
b0620b27be Rename header to prevent name clashes with external files 2004-01-18 23:35:13 +00:00
Marcus Boerger
517c5f5fc5 Necessary as long as SPL is shared/dll 2004-01-18 22:20:54 +00:00
Marcus Boerger
913f5ce8ec Fix Warning 2004-01-18 15:21:49 +00:00
Marcus Boerger
8f4e9d9e42 Enable inherited classes inside SPL and respect order of module init. 2004-01-18 15:16:26 +00:00
Marcus Boerger
9d5ef0070f Export access to class_entry by function. 2004-01-18 13:19:41 +00:00
Sterling Hughes
cb7e90119f namespace accesses are now soley URI based as opposed to prefix based. 2004-01-17 21:22:26 +00:00
Marcus Boerger
9e29f17493 Major bugfix for consistency.
# After long discussions we came to a conclusion on how to make this
# extension consistent in itself.
# Thanks to Rob for all the work
2004-01-17 19:41:32 +00:00
Marcus Boerger
665a834a76 Fix parameter list and protos 2004-01-17 16:36:04 +00:00
Marcus Boerger
9df72efb7c Make inherited sxe classes work 2004-01-17 15:56:29 +00:00
Marcus Boerger
43b0a9e96b Drop userspace iteration correctly.
# People if you do such things then please fix the class tree.
2004-01-15 09:28:01 +00:00
Marcus Boerger
6915f5a2f5 This is no longer usefull in any way. 2004-01-14 22:07:28 +00:00
Rob Richards
8a40a946de test user define namespace aliases 2004-01-14 19:00:16 +00:00
Rob Richards
ad47abf0f6 add support for $foo["a:bar"]
fix xsearch to only return values for text,element and attribute nodes
fix getChildren and return array
remove most methods
update test
2004-01-13 21:28:41 +00:00
Marcus Boerger
fffdd96865 - Cleanup class_entry
- allow derived classes
- fix new SimpleXML_Element()
2004-01-10 13:25:31 +00:00
Sterling Hughes
5ca7c382c9 Remove these initializers as they are unused. 2004-01-09 06:12:29 +00:00
Sterling Hughes
406c2156d1 Fix dumping, when dumping a text element, for example:
<?php
$doc = simplexml_load_string('<?xml version="1.0"?>
<namelist>
 <name>
  <first>helly</first>
 </name>
 <name>
  <first>sterling</first>
 </name>
</namelist>');
var_dump($doc->name[0]->first);

Used to not display the node's content, now it does.
2004-01-08 22:40:08 +00:00
Marcus Boerger
526c6bd09c Fix windows build issue 2004-01-08 20:27:35 +00:00
Marcus Boerger
fb38ee26a4 Cannot use shared SPL 2004-01-08 19:30:37 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Dmitry Stogov
eb973da1d3 two new methods were added
$node->count($subnode_name) - returns count of subnodes with specified name
  $node->attributes() - returns array of attributes
2003-12-18 13:28:00 +00:00
Dmitry Stogov
4fd476ee43 accessing singular subnode as array 2003-12-17 15:06:40 +00:00
Rob Richards
094861db8c free nodes correctly to clear node proxies 2003-12-17 10:28:29 +00:00
Marcus Boerger
a08a37dda3 Better comment 2003-12-16 20:40:24 +00:00
Marcus Boerger
4dd4bcdbb5 Add error handling for element/attribute creation/changing 2003-12-16 20:34:19 +00:00
Ilia Alshanetsky
bf36e351ba Removed duplicate php_libxml_(init|shutdown) they are already done by
ext/libxml.
2003-12-16 17:14:06 +00:00
foobar
63df219b31 - Update header + added missing Id tags. 2003-12-09 16:29:54 +00:00
Wez Furlong
a98892900b allow $node['not_yet_existing_attribute'] = $value; to work 2003-12-07 11:32:40 +00:00
Marcus Boerger
fd7b38d752 Fix return value. 2003-11-29 18:16:03 +00:00
Marcus Boerger
68e218e85c Remove test code 2003-11-29 17:48:44 +00:00
Rob Richards
be974aff6e Fix bug #26159 - SimpleXML XPath support (patch by Adam Trachtenberg)
a few fixes to memory corruption
2003-11-24 11:24:40 +00:00
Marcus Boerger
fc117add30 Several improvements to the simplexml_element object:
- Allow to use it as an instance of Iterator
- Prepareto use it as a normal object, including spcialization
2003-11-23 16:20:58 +00:00
Marcus Boerger
86676d4d12 Adjust to latest conversion cast changes 2003-11-14 07:41:05 +00:00
Marcus Boerger
2b35596d7f Fix classname, CDATA handling (semantically identical to text) and
iterators (Return sub elements as objects, converted to string you get
the text).
2003-11-13 20:32:38 +00:00
Marcus Boerger
bfb73676de Split into element=property and attribute=dimension overloading. 2003-11-10 20:27:16 +00:00
Ilia Alshanetsky
f884a5b437 Kill unused variables. 2003-11-05 23:44:09 +00:00
Sterling Hughes
040d945fb7 make this macro safe 2003-11-03 13:55:19 +00:00
Sterling Hughes
6ab221b3f6 remove attributes from this check 2003-11-03 13:50:43 +00:00
Sterling Hughes
e963f0b168 - Stop a crash in xpath
- Remove the ability to access attributes via the -> operator, attributes
are accessed via the array indicators
2003-11-03 13:36:23 +00:00
Moriyoshi Koizumi
9547ac2dde Oops. 2003-10-29 18:04:24 +00:00
Moriyoshi Koizumi
734254513c Do not use convert_to_*_ex() for ordinary zval pointers. 2003-10-29 17:50:56 +00:00
Marcus Boerger
6b57bb1675 Add simplexml array handlers that allow to explicitly work with attributes. 2003-10-29 12:06:52 +00:00
Rob Richards
a807b34427 cannot import nodes without document 2003-10-27 01:12:53 +00:00
Rob Richards
5191cd3e99 add interop with dom - simplexml_import_dom
change write behavior on elements to change actual contents
change clone method to clone node and not document
fix a few libxml mem leaks
2003-10-26 16:00:58 +00:00
Marcus Boerger
14911a136f Fix memory corruption 2003-10-26 13:27:03 +00:00
Marcus Boerger
6131454cca Add iterator to make foreach work 2003-10-26 13:11:56 +00:00
Marcus Boerger
869ce07c96 And get the last thing working 2003-10-26 01:17:51 +00:00
Marcus Boerger
0d95b23a51 Fix casting (the question is when & what should be freed here). 2003-10-26 00:39:48 +00:00
Marcus Boerger
07d94c2410 Fix test 4 with the help of Rob 2003-10-25 23:06:23 +00:00
Marcus Boerger
46251fa3f8 Show if Schemas are supported 2003-10-25 21:28:01 +00:00
Marcus Boerger
873bcefa52 Fix memleaks 2003-10-25 21:08:33 +00:00
Marcus Boerger
0a68fb0222 Fix warning 2003-10-25 20:28:39 +00:00
Shane Caraveo
052f9378b2 add global init/shutdown functions for libxml. this is required as
shutdown is not safe to call multiple times, and to make streams work
correctly some init stuff has to happen in a specific order
2003-10-19 23:17:56 +00:00
Zeev Suraski
2cc9511cc7 Fix cast callbacks 2003-10-07 15:47:25 +00:00
Moriyoshi Koizumi
506136f9c6 Forgot about this one 2003-10-06 01:04:49 +00:00
Moriyoshi Koizumi
503d74aa29 Fixed bug #25756 (SimpleXML's validate_schema_file() broken) 2003-10-06 01:02:28 +00:00
Zeev Suraski
c6c240a455 Sync with new API 2003-10-05 08:08:49 +00:00
Moriyoshi Koizumi
d7398813c3 A temporary voodoo hack to avoid memory leaks.
# Stuff of this kind must be removed if any neater way is out there.
2003-10-02 19:45:05 +00:00
Wez Furlong
21329c5e0c allow building without libxml2 under win32 2003-08-22 15:04:29 +00:00
Wez Furlong
9ada9e5767 fix build 2003-08-19 01:30:27 +00:00
Zeev Suraski
ed21ddd4f3 Fix a gazillion leaks in SimpleXML. One gazillion to go ;) 2003-08-18 22:33:15 +00:00
Zeev Suraski
1fb9d4896a WTF was that doing here? :)
Fix crash
2003-08-18 11:26:12 +00:00
Rob Richards
6fae803c12 fix bug #24957 (var_dump of object segfaults) 2003-08-07 21:39:00 +00:00
Zeev Suraski
538d58dd5f Use new infrastructure.
There are bound to be some messups, please report build/runtime bugs!
2003-08-03 17:44:39 +00:00
Zeev Suraski
785130c09c Fix interface 2003-07-23 08:53:23 +00:00
Zeev Suraski
d6320007e0 Add missing elements 2003-07-07 12:07:02 +00:00
foobar
f55b83cb18 ws + missing fold tag 2003-07-07 11:43:34 +00:00
Sterling Hughes
73d98824d7 not a temp var unless its a singular var 2003-07-05 00:33:13 +00:00
Sterling Hughes
e0347ab2c4 "real" fix 2003-07-04 22:21:23 +00:00
Sterling Hughes
2935efb446 fix memory cverrun when accessing an empty xml element.
guess how many lines it took me to write a basic WSDL parser + API?  20 using
curl + simplexml
2003-07-04 21:58:09 +00:00
Marcus Boerger
a6d0972c05 Fix warnings 2003-07-01 00:49:25 +00:00
Sterling Hughes
57e1c829aa and my first user doesn't even like goto's. sniffle 2003-06-30 03:11:03 +00:00
Sterling Hughes
2505cf7c2c satisfy my very first user :) 2003-06-30 03:08:48 +00:00
Rob Richards
a225934450 fix mem leak in sxe_property_read
fix compiler warning
2003-06-28 21:38:44 +00:00
Sterling Hughes
3e67c2a63a for now we let xml support build with versions older than 2.5.7, as we want
users to actually test this...
2003-06-28 07:46:03 +00:00
Sterling Hughes
a4f41fbb26 allow the root element to be accessed as a text node 2003-06-25 16:26:32 +00:00
Rob Richards
d1bfc58aee use xmlInitParser instead of xmlInitThreads
reentrant safe as well no need for xml_parser_inited
2003-06-14 18:15:50 +00:00
Rob Richards
09eb38ec10 interoperability support
fix some memleak scenarios
2003-06-14 15:32:23 +00:00
Sterling Hughes
e4db6159f2 make alan happy 2003-06-14 04:40:58 +00:00
Sterling Hughes
34b36fd50f delete + no C++ comments 2003-06-14 04:17:59 +00:00
Sterling Hughes
ec3823a5d2 fix some more leaks 2003-06-14 04:15:57 +00:00
Sterling Hughes
cc0c4e4981 This shouldn't be refcount = 0, causes a memory overrun 2003-06-14 04:02:12 +00:00
Rob Richards
785bc24a9b fix compile when ZTS enabled
fix bunch of memory leaks
2003-06-13 19:58:56 +00:00
Sterling Hughes
21d90d6ac4 ok, this is a zend bug. 2003-06-09 04:01:11 +00:00
Sterling Hughes
6fc9fdeefc simon says leaking is better than crashing 2003-06-09 03:29:33 +00:00
Sterling Hughes
568aecd973 get rid of a memleak
make namespaces work properly
2003-06-09 03:11:28 +00:00
Sterling Hughes
a148878752 god bless valgrind.
fix double free where object is prematurely dtor'd. I should probably convert
the simplexml nodes over to this system too.  Actually the new dom extension
and everywhere else should use the same type of methods.. :)
2003-06-03 19:36:20 +00:00
Sterling Hughes
0ecbdc55a1 earn my keep and allow one to register a namespace name to access a namespace
value.
2003-06-01 19:46:19 +00:00
Sterling Hughes
94136f0ccd fix __clone()
add schema support
2003-05-27 22:15:17 +00:00
Sterling Hughes
c60879dbb9 plane hacking 2003-05-27 18:41:02 +00:00
Sterling Hughes
afc2196715 add support for querying nodes with xpath expressions. 2003-05-26 03:57:41 +00:00
Sterling Hughes
3c511d9f24 add namespace support 2003-05-26 02:42:41 +00:00
Shane Caraveo
ea1437d711 get rid of crudy stuff 2003-05-26 02:19:14 +00:00
Shane Caraveo
8e58169364 now builds on windows 2003-05-26 02:18:38 +00:00
Sterling Hughes
fb14866796 add a new function simplexml_load_string() 2003-05-26 01:41:25 +00:00
Sterling Hughes
1410e81847 several changes improvements, including the new
simplexml_save_document_string() function which saves a XML document to a
string variable
2003-05-26 01:37:02 +00:00
Sterling Hughes
97b5a5df4f sascha points out this is more purdy-like 2003-05-26 01:03:51 +00:00
Sterling Hughes
3192da2d2b this is right
but it shouldn't be
2003-05-26 00:27:30 +00:00