subject:"\[PHP\-CVS\] cvs\: php\-src \/ext\/simplexml CREDITS"

Re: [PHP-CVS] cvs: php-src /ext/simplexml CREDITS simplexml.c /ext/sqlite CREDITS sqlite.c /ext/standard credits_ext.h

2004-03-29 Thread Wez Furlong

Won't this break scripts that do extension_loaded(sqlite)
or extension_loaded(simplexml) ?

--Wez.

  #if ZEND_MODULE_API_NO = 20010901
   STANDARD_MODULE_HEADER,
  #endif
 - sqlite,
 + SQLite,
   sqlite_functions,
   PHP_MINIT(sqlite),
   NULL,

  zend_module_entry simplexml_module_entry = {
   STANDARD_MODULE_HEADER,
 - simplexml,
 + SimpleXML,
   simplexml_functions,
   PHP_MINIT(simplexml),
   PHP_MSHUTDOWN(simplexml),

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/simplexml CREDITS simplexml.c /ext/sqlite CREDITS sqlite.c /ext/standard credits_ext.h

2004-03-28 Thread Marcus Boerger

helly   Sun Mar 28 15:27:18 2004 EDT

  Modified files:  
/php-src/ext/standard   credits_ext.h 
/php-src/ext/sqlite CREDITS sqlite.c 
/php-src/ext/simplexml  CREDITS simplexml.c 
  Log:
  Fix writing of SQLite and SimpleXMl extension and add Rob to the credits
  line of the latter. Add ext/SPL.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/credits_ext.h?r1=1.23r2=1.24ty=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.23 php-src/ext/standard/credits_ext.h:1.24
--- php-src/ext/standard/credits_ext.h:1.23 Sat Jan 17 07:59:51 2004
+++ php-src/ext/standard/credits_ext.h  Sun Mar 28 15:27:18 2004
@@ -69,10 +69,11 @@
 CREDIT_LINE(Recode, Kristian Köhntopp);
 CREDIT_LINE(Sessions, Sascha Schumann, Andrei Zmievski);
 CREDIT_LINE(Shared Memory Operations, Slava Poliakov, Ilia Alshanetsky);
-CREDIT_LINE(simplexml, Sterling Hughes, Marcus Boerger);
+CREDIT_LINE(SimpleXML, Sterling Hughes, Marcus Boerger, Rob Richards);
 CREDIT_LINE(SNMP, Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven 
Lawrance, Johann Hanne);
 CREDIT_LINE(Sockets, Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, Jason 
Greene);
-CREDIT_LINE(sqlite, Wez Furlong, Tal Peer, Marcus Börger, Ilia Alshanetsky);
+CREDIT_LINE(SPL, Marcus Boerger);
+CREDIT_LINE(SQLite, Wez Furlong, Tal Peer, Marcus Börger, Ilia Alshanetsky);
 CREDIT_LINE(Sybase-CT, Zeev Suraski, Tom May, Timm Friebe);
 CREDIT_LINE(Sybase-DB, Zeev Suraski);
 CREDIT_LINE(System V Message based IPC, Wez Furlong);
http://cvs.php.net/diff.php/php-src/ext/sqlite/CREDITS?r1=1.5r2=1.6ty=u
Index: php-src/ext/sqlite/CREDITS
diff -u php-src/ext/sqlite/CREDITS:1.5 php-src/ext/sqlite/CREDITS:1.6
--- php-src/ext/sqlite/CREDITS:1.5  Sun Nov 16 15:43:57 2003
+++ php-src/ext/sqlite/CREDITS  Sun Mar 28 15:27:18 2004
@@ -1,2 +1,2 @@
-sqlite
+SQLite
 Wez Furlong, Tal Peer, Marcus Börger, Ilia Alshanetsky
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.136r2=1.137ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.136 php-src/ext/sqlite/sqlite.c:1.137
--- php-src/ext/sqlite/sqlite.c:1.136   Fri Mar 26 16:16:50 2004
+++ php-src/ext/sqlite/sqlite.c Sun Mar 28 15:27:18 2004
@@ -17,7 +17,7 @@
|  Marcus Boerger [EMAIL PROTECTED]  |
+--+
 
-   $Id: sqlite.c,v 1.136 2004/03/26 21:16:50 helly Exp $ 
+   $Id: sqlite.c,v 1.137 2004/03/28 20:27:18 helly Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -252,7 +252,7 @@
 #if ZEND_MODULE_API_NO = 20010901
STANDARD_MODULE_HEADER,
 #endif
-   sqlite,
+   SQLite,
sqlite_functions,
PHP_MINIT(sqlite),
NULL,
@@ -1055,7 +1055,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
-   php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION  
$Id: sqlite.c,v 1.136 2004/03/26 21:16:50 helly Exp $);
+   php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION  
$Id: sqlite.c,v 1.137 2004/03/28 20:27:18 helly Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
http://cvs.php.net/diff.php/php-src/ext/simplexml/CREDITS?r1=1.4r2=1.5ty=u
Index: php-src/ext/simplexml/CREDITS
diff -u php-src/ext/simplexml/CREDITS:1.4 php-src/ext/simplexml/CREDITS:1.5
--- php-src/ext/simplexml/CREDITS:1.4   Sat Jan 17 14:41:31 2004
+++ php-src/ext/simplexml/CREDITS   Sun Mar 28 15:27:18 2004
@@ -1,2 +1,2 @@
-simplexml
+SimpleXML
 Sterling Hughes, Marcus Boerger, Rob Richards
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.136r2=1.137ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.136 php-src/ext/simplexml/simplexml.c:1.137
--- php-src/ext/simplexml/simplexml.c:1.136 Wed Mar 24 00:04:26 2004
+++ php-src/ext/simplexml/simplexml.c   Sun Mar 28 15:27:18 2004
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.136 2004/03/24 05:04:26 gschlossnagle Exp $ */
+/* $Id: simplexml.c,v 1.137 2004/03/28 20:27:18 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1582,7 +1582,7 @@
 
 zend_module_entry simplexml_module_entry = {
STANDARD_MODULE_HEADER,
-   simplexml,
+   SimpleXML,
simplexml_functions,
PHP_MINIT(simplexml),
PHP_MSHUTDOWN(simplexml),
@@ -1650,7 +1650,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.136 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.137 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED

[PHP-CVS] cvs: php-src /ext/simplexml CREDITS README php_simplexml.h simplexml.c /ext/simplexml/tests 006.phpt 007.phpt 008.phpt 011.phpt 012.phpt 014.phpt 014a.phpt 014b.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt bug25756.phpt

2004-01-17 Thread Marcus Boerger

helly   Sat Jan 17 14:41:33 2004 EDT

  Added files: 
/php-src/ext/simplexml/tests019.phpt 

  Removed files:   
/php-src/ext/simplexml/testsbug25756.phpt 

  Modified files:  
/php-src/ext/simplexml  CREDITS README php_simplexml.h simplexml.c 
/php-src/ext/simplexml/tests006.phpt 007.phpt 008.phpt 011.phpt 
012.phpt 014.phpt 014a.phpt 014b.phpt 
015.phpt 016.phpt 017.phpt 018.phpt 
  Log:
  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
  
  Index: php-src/ext/simplexml/CREDITS
diff -u php-src/ext/simplexml/CREDITS:1.3 php-src/ext/simplexml/CREDITS:1.4
--- php-src/ext/simplexml/CREDITS:1.3   Tue Dec 16 15:36:46 2003
+++ php-src/ext/simplexml/CREDITS   Sat Jan 17 14:41:31 2004
@@ -1,2 +1,2 @@
 simplexml
-Sterling Hughes, Marcus Boerger
+Sterling Hughes, Marcus Boerger, Rob Richards
Index: php-src/ext/simplexml/README
diff -u php-src/ext/simplexml/README:1.1 php-src/ext/simplexml/README:1.2
--- php-src/ext/simplexml/README:1.1Thu Jan  8 16:14:38 2004
+++ php-src/ext/simplexml/READMESat Jan 17 14:41:31 2004
@@ -2,18 +2,23 @@
 
 SimpleXML objects follow four basic rules:
 
-1) properties denote elements
+1) properties denote element iterators
 2) numeric indices denote elements
 3) non numeric indices denote attributes
 4) string conversion allows to access TEXT data
 
+When iterating proerties then the extension always iterates over
+all nodes with that elemtnt name. Thus method childen() must be 
+called to iterate over subnodes. But also doing the following:
+foreach $obj-node_name as $elem) {
+  // do something with $elem
+}
+Always result in iteration of 'node_name' elements. So no further 
+check is needed to distinguish the number of nodes of that type.
+
 When an elements TEXT data is being accessed through a property
 then the result does not include the TEXT data of subelements.
 
-If PHP is compiled with ext/SPL being compiled into the binary
-then SimpleXML objects implement the interface RecursiveIterator 
-so that they can be iterated recursively (http://pecl.php.net/spl).
-
 Known issues
 
 
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.12 
php-src/ext/simplexml/php_simplexml.h:1.13
--- php-src/ext/simplexml/php_simplexml.h:1.12  Fri Jan  9 01:12:29 2004
+++ php-src/ext/simplexml/php_simplexml.h   Sat Jan 17 14:41:31 2004
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_simplexml.h,v 1.12 2004/01/09 06:12:29 sterling Exp $ */
+/* $Id: php_simplexml.h,v 1.13 2004/01/17 19:41:31 helly Exp $ */
 
 #ifndef PHP_SIMPLEXML_H
 #define PHP_SIMPLEXML_H
@@ -65,14 +65,20 @@
simplexml_nsmap *nsmapptr;
xmlXPathContextPtr xpath;
struct {
-   xmlNodePtrnode;
+   php_libxml_node_ptr   *node;
+   int   itertype;
char  *name;
-   int   namelen;
+   char  *nsprefix;
+   int   type;
zval  *data;
} iter;
 } php_sxe_object;
 
-
+#define SXE_ITER_NONE 0
+#define SXE_ITER_ELEMENT 1
+#define SXE_ITER_ATTR 2
+#define SXE_ITER_CHILD 3
+#define SXE_ITER_ATTRLIST 4
 
 #ifdef ZTS
 #define SIMPLEXML_G(v) TSRMG(simplexml_globals_id, zend_simplexml_globals *, v)
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.109 php-src/ext/simplexml/simplexml.c:1.110
--- php-src/ext/simplexml/simplexml.c:1.109 Sat Jan 17 11:36:04 2004
+++ php-src/ext/simplexml/simplexml.c   Sat Jan 17 14:41:31 2004
@@ -14,10 +14,11 @@
   +--+
   | Author: Sterling Hughes [EMAIL PROTECTED]   |
   | Marcus Boerger [EMAIL PROTECTED]   |
+  | Rob Richards [EMAIL PROTECTED] |
   +--+
 */
 
-/* $Id: simplexml.c,v 1.109 2004/01/17 16:36:04 helly Exp $ */
+/* $Id: simplexml.c,v 1.110 2004/01/17 19:41:31 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -58,7 +59,7 @@
 
 /* {{{ _node_as_zval()
  */
-static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value TSRMLS_DC)
+static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, int 
itertype, char *name, char *prefix TSRMLS_DC)
 {
php_sxe_object *subnode;
 
@@ -67,6 +68,13 @@
subnode-document-refcount++;
subnode-nsmapptr = sxe-nsmapptr;
subnode-nsmapptr-refcount++;
+   subnode-iter.type = itertype;

[PHP-CVS] cvs: php-src /ext/simplexml CREDITS

2003-12-16 Thread Marcus Boerger

helly   Tue Dec 16 15:36:47 2003 EDT

  Modified files:  
/php-src/ext/simplexml  CREDITS 
  Log:
  Add myself
  
Index: php-src/ext/simplexml/CREDITS
diff -u php-src/ext/simplexml/CREDITS:1.2 php-src/ext/simplexml/CREDITS:1.3
--- php-src/ext/simplexml/CREDITS:1.2   Fri Jul 11 03:44:56 2003
+++ php-src/ext/simplexml/CREDITS   Tue Dec 16 15:36:46 2003
@@ -1,2 +1,2 @@
 simplexml
-Sterling Hughes
+Sterling Hughes, Marcus Boerger

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/simplexml CREDITS /ext/standard credits_ext.h

2003-07-11 Thread Jani Taskinen

sniper  Fri Jul 11 03:44:56 2003 EDT

  Modified files:  
/php-src/ext/standard   credits_ext.h 
/php-src/ext/simplexml  CREDITS 
  Log:
  update credits.
  
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.17 php-src/ext/standard/credits_ext.h:1.18
--- php-src/ext/standard/credits_ext.h:1.17 Mon Mar  3 19:10:10 2003
+++ php-src/ext/standard/credits_ext.h  Fri Jul 11 03:44:56 2003
@@ -18,39 +18,36 @@
 CREDIT_LINE(crack, Alexander Feldman);
 CREDIT_LINE(ctype, Hartmut Holzgraefe);
 CREDIT_LINE(cURL, Sterling Hughes);
-CREDIT_LINE(Cyrus, Sterling Hughes);
 CREDIT_LINE(DBA, Sascha Schumann, Marcus Boerger);
 CREDIT_LINE(dBase, Jim Winstead);
-CREDIT_LINE(DBM, Rasmus Lerdorf, Jim Winstead);
+CREDIT_LINE(DBM, Rasmus Lerdorf, Jim Winstead, Marcus Boerger);
 CREDIT_LINE(dbx (database abstraction), Marc Boeren, Rui Hirokawa, Frank M. 
Kromann);
-CREDIT_LINE(domxml, Uwe Steinmann, Christian Stocker);
-CREDIT_LINE(dotnet, Sam Ruby);
+CREDIT_LINE(DOM, Christian Stocker, Rob Richards, Marcus Boerger);
 CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger);
 CREDIT_LINE(fam, Sascha Schumann);
 CREDIT_LINE(FBSQL, Frank M. Kromann);
 CREDIT_LINE(FDF, Uwe Steinmann);
 CREDIT_LINE(FilePro, Chad Robinson);
 CREDIT_LINE(FTP, Stefan Esser, Andrew Skalski);
-CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, 
Ilia Alshanetsky, Pierre-Alain Joye);
+CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, 
Ilia Alshanetsky, Pierre-Alain Joye, Marcus Boerger);
 CREDIT_LINE(GetText, Alex Plotnick);
 CREDIT_LINE(GNU GMP support, Stanislav Malyshev);
 CREDIT_LINE(HwAPI, Uwe Steinmann);
-CREDIT_LINE(HyperWave, Uwe Steinmann);
 CREDIT_LINE(Iconv, Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi );
 CREDIT_LINE(IMAP, Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, Antoni 
Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R Kalowsky);
 CREDIT_LINE(Informix, Danny Heijl, Christian Cartus, Corne' Cornelius);
 CREDIT_LINE(Ingres II, David Hénot);
 CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev);
 CREDIT_LINE(IRCG, Sascha Schumann);
-CREDIT_LINE(Java, Sam Ruby);
 CREDIT_LINE(LDAP, Amitay Isaacs, Eric Warnke, Rasmus Lerdorf, Gerrit Thomson, Stig 
Venaas);
 CREDIT_LINE(MCAL, Mark Musone, Chuck Hagenbuch);
 CREDIT_LINE(mcrypt, Sascha Schumann, Derick Rethans);
 CREDIT_LINE(MCVE, Brad House, Chris Faulhaber, Steven Schoch);
 CREDIT_LINE(mhash, Sascha Schumann);
 CREDIT_LINE(mime_magic, Hartmut Holzgraefe);
-CREDIT_LINE(MING, Dave Hayden);
+CREDIT_LINE(MING, Dave Hayden, Frank M. Kromann);
 CREDIT_LINE(mnoGoSearch, Sergey Kartashoff, Alex Barkov, Ramil Kalimullin);
+CREDIT_LINE(mono, Sterling Hughes);
 CREDIT_LINE(msession, Mark L. Woodward);
 CREDIT_LINE(mSQL, Zeev Suraski);
 CREDIT_LINE(MS SQL, Frank M. Kromann);
@@ -74,9 +71,10 @@
 CREDIT_LINE(Recode, Kristian Köhntopp);
 CREDIT_LINE(Sessions, Sascha Schumann, Andrei Zmievski);
 CREDIT_LINE(Shared Memory Operations, Slava Poliakov, Ilia Alshanetsky);
+CREDIT_LINE(simplexml, Sterling Hughes);
 CREDIT_LINE(SNMP, Rasmus Lerdorf);
 CREDIT_LINE(Sockets, Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, Jason 
Greene);
-CREDIT_LINE(SWF, Sterling Hughes);
+CREDIT_LINE(sqlite, Wez Furlong, Tal Peer, Marcus Börger);
 CREDIT_LINE(Sybase-CT, Zeev Suraski, Tom May, Timm Friebe);
 CREDIT_LINE(Sybase-DB, Zeev Suraski);
 CREDIT_LINE(System V Message based IPC, Wez Furlong);
@@ -86,10 +84,9 @@
 CREDIT_LINE(Verisign Payflow Pro, John Donagher, David Croft);
 CREDIT_LINE(W32API, James Moore);
 CREDIT_LINE(WDDX, Andrei Zmievski);
-CREDIT_LINE(Win32 COM, Alan Brown, Wez Furlong, Harald Radi, Zeev Suraski);
 CREDIT_LINE(xmlrpc, Dan Libby);
-CREDIT_LINE(XML, Stig Bakken, Thies C. Arntzen);
+CREDIT_LINE(XML, Stig Bakken, Thies C. Arntzen, Sterling Hughes);
+CREDIT_LINE(XSL, Christian Stocker, Rob Richards);
 CREDIT_LINE(YAZ, Adam Dickmeiss);
 CREDIT_LINE(Yellow Pages, Stephanie Wehner, Fredrik Ohrn);
-CREDIT_LINE(Zip, Sterling Hughes);
 CREDIT_LINE(Zlib, Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti);
Index: php-src/ext/simplexml/CREDITS
diff -u php-src/ext/simplexml/CREDITS:1.1 php-src/ext/simplexml/CREDITS:1.2
--- php-src/ext/simplexml/CREDITS:1.1   Sun May 18 16:33:26 2003
+++ php-src/ext/simplexml/CREDITS   Fri Jul 11 03:44:56 2003
@@ -1 +1,2 @@
-simplexml
\ No newline at end of file
+simplexml
+Sterling Hughes



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/simplexml CREDITS simplexml.c /ext/sqlite CREDITS sqlite.c /ext/standard credits_ext.h

[PHP-CVS] cvs: php-src /ext/simplexml CREDITS simplexml.c /ext/sqlite CREDITS sqlite.c /ext/standard credits_ext.h

[PHP-CVS] cvs: php-src /ext/simplexml CREDITS README php_simplexml.h simplexml.c /ext/simplexml/tests 006.phpt 007.phpt 008.phpt 011.phpt 012.phpt 014.phpt 014a.phpt 014b.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt bug25756.phpt

[PHP-CVS] cvs: php-src /ext/simplexml CREDITS

[PHP-CVS] cvs: php-src /ext/simplexml CREDITS /ext/standard credits_ext.h

5 matches

Site Navigation

Mail list logo

Footer information